diff --git a/src/Twilio/Base/IOptions.cs b/src/Twilio/Base/IOptions.cs
index b966f47cd..dd632c148 100644
--- a/src/Twilio/Base/IOptions.cs
+++ b/src/Twilio/Base/IOptions.cs
@@ -2,74 +2,74 @@
 using System.Collections.Generic;
 
 namespace Twilio.Base
-{
+{
+  /// <summary>
+  /// Interface to wrap parameters of a resource
+  /// </summary>
+  /// <typeparam name="T">Resource type</typeparam>
+  public interface IOptions<T> where T : Resource
+  {
     /// <summary>
-    /// Interface to wrap parameters of a resource
+    /// Generate the list of parameters for the request
     /// </summary>
-    /// <typeparam name="T">Resource type</typeparam>
-    public interface IOptions<T> where T : Resource
-    {
-        /// <summary>
-        /// Generate the list of parameters for the request
-        /// </summary>
-        ///
-        /// <returns>List of parameters for the request</returns>
-        List<KeyValuePair<string, string>> GetParams();
-    }
-
+    ///
+    /// <returns>List of parameters for the request</returns>
+    List<KeyValuePair<string, string>> GetParams();
+  }
+
+  /// <summary>
+  /// Parameters that are passed when reading resources
+  /// </summary>
+  /// <typeparam name="T">Resource type</typeparam>
+  public abstract class ReadOptions<T> : IOptions<T> where T : Resource
+  {
+    private int? _pageSize;
+
     /// <summary>
-    /// Parameters that are passed when reading resources
+    /// Page size to read
     /// </summary>
-    /// <typeparam name="T">Resource type</typeparam>
-    public abstract class ReadOptions<T> : IOptions<T> where T : Resource
-    {
-        private int? _pageSize;
-
-        /// <summary>
-        /// Page size to read
-        /// </summary>
-        public int? PageSize
-        {
-            get { return _pageSize; }
-            set
-            {
-                if (value == null)
-                {
-                    return;
-                }
-
-                _pageSize = value.Value;
-            }
-        }
-
-        private long? _limit;
-
-        /// <summary>
-        /// Maximum number of records to read
-        /// </summary>
-        public long? Limit
-        {
-            get { return _limit; }
-            set
-            {
-                if (value == null)
-                {
-                    return;
-                }
-
-                _limit = value;
-                if (_pageSize == null)
-                {
-                    _pageSize = (int) value.Value;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Generate the list of parameters for the request
-        /// </summary>
-        ///
-        /// <returns>List of parameters for the request</returns>
-        public abstract List<KeyValuePair<string, string>> GetParams();
-    }
+    public int? PageSize
+    {
+      get { return _pageSize; }
+      set
+      {
+        if (value == null)
+        {
+          return;
+        }
+
+        _pageSize = value.Value;
+      }
+    }
+
+    private long? _limit;
+
+    /// <summary>
+    /// Maximum number of records to read
+    /// </summary>
+    public long? Limit
+    {
+      get { return _limit; }
+      set
+      {
+        if (value == null)
+        {
+          return;
+        }
+
+        _limit = value;
+        if (_pageSize == null)
+        {
+          _pageSize = (int)value.Value;
+        }
+      }
+    }
+
+    /// <summary>
+    /// Generate the list of parameters for the request
+    /// </summary>
+    ///
+    /// <returns>List of parameters for the request</returns>
+    public abstract List<KeyValuePair<string, string>> GetParams();
+  }
 }
diff --git a/src/Twilio/Base/Page.cs b/src/Twilio/Base/Page.cs
index cf1a72234..18aa6d031 100644
--- a/src/Twilio/Base/Page.cs
+++ b/src/Twilio/Base/Page.cs
@@ -1,160 +1,160 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Twilio.Rest;
-using static System.String;
-
-namespace Twilio.Base
-{
-    /// <summary>
-    /// Page of resources
-    /// </summary>
-    /// <typeparam name="T">Resource type</typeparam>
-    public class Page<T> where T : Resource
-    {
-        /// <summary>
-        /// Records for this page
-        /// </summary>
-        public List<T> Records { get; }
-
-        /// <summary>
-        /// Page size
-        /// </summary>
-        public int PageSize { get; }
-
-        private readonly string _uri;
-        private readonly string _url;
-        private readonly string _firstPageUri;
-        private readonly string _firstPageUrl;
-        private readonly string _nextPageUri;
-        private readonly string _nextPageUrl;
-        private readonly string _previousPageUri;
-        private readonly string _previousPageUrl;
-
-        private Page(
-            List<T> records,
-            int pageSize,
-            string uri = null,
-            string url = null,
-            string firstPageUri = null,
-            string firstPageUrl = null,
-            string previousPageUri = null,
-            string previousPageUrl = null,
-            string nextPageUri = null,
-            string nextPageUrl = null
-        )
-        {
-            Records = records;
-            PageSize = pageSize;
-            _uri = uri;
-            _url = url;
-            _firstPageUri = firstPageUri;
-            _firstPageUrl = firstPageUrl;
-            _nextPageUri = nextPageUri;
-            _nextPageUrl = nextPageUrl;
-            _previousPageUri = previousPageUri;
-            _previousPageUrl = previousPageUrl;
-        }
-
-        private static string UrlFromUri(Domain domain, string uri)
-        {
-            return "https://" + domain + ".twilio.com" + uri;
-        }
-
-        /// <summary>
-        /// Generate the first page URL
-        /// </summary>
-        /// <param name="domain">Twilio subdomain</param>
-        /// <returns>URL for the first page of results</returns>
-        public string GetFirstPageUrl(Domain domain)
-        {
-            return _firstPageUrl ?? UrlFromUri(domain, _firstPageUri);
-        }
-
-        /// <summary>
-        /// Get the next page URL
-        /// </summary>
-        /// <param name="domain">Twilio subdomain</param>
-        /// <returns>URL for the next page of results</returns>
-        public string GetNextPageUrl(Domain domain)
-        {
-            return _nextPageUrl ?? UrlFromUri(domain, _nextPageUri);
-        }
-
-        /// <summary>
-        /// Get the previous page URL
-        /// </summary>
-        /// <param name="domain">Twilio subdomain</param>
-        /// <returns>URL for the previous page of results</returns>
-        public string GetPreviousPageUrl(Domain domain)
-        {
-            return _previousPageUrl ?? UrlFromUri(domain, _previousPageUri);
-        }
-
-        /// <summary>
-        /// Get the URL for the current page
-        /// </summary>
-        /// <param name="domain">Twilio subdomain</param>
-        /// <returns>URL for the current page of results</returns>
-        public string GetUrl(Domain domain)
-        {
-            return _url ?? UrlFromUri(domain, _uri);
-        }
-
-        /// <summary>
-        /// Determines if there is another page of results
-        /// </summary>
-        /// <returns>true if there is a next page; false otherwise</returns>
-        public bool HasNextPage()
-        {
-            return !IsNullOrEmpty(_nextPageUrl) || !IsNullOrEmpty(_nextPageUri);
-        }
-
-        /// <summary>
-        /// Converts a JSON payload to a Page of results
-        /// </summary>
-        /// <param name="recordKey">JSON key where the records are</param>
-        /// <param name="json">JSON payload</param>
-        /// <returns>Page of results</returns>
-        public static Page<T> FromJson(string recordKey, string json)
-        {
-            var root = JObject.Parse(json);
-            var records = root[recordKey];
-            var parsedRecords = records.Children().Select(
-                record => JsonConvert.DeserializeObject<T>(record.ToString())
-            ).ToList();
-
-            var uriNode = root["uri"];
-            if (uriNode != null)
-            {
-                JToken pageSize;
-                JToken firstPageUri;
-                JToken nextPageUri;
-                JToken previousPageUri;
-
-                // v2010 API
-                return new Page<T>(
-                    parsedRecords,
-                    root.TryGetValue("page_size", out pageSize) ? root["page_size"].Value<int>() : parsedRecords.Count,
-                    uri: uriNode.Value<string>(),
-                    firstPageUri: root.TryGetValue("first_page_uri", out firstPageUri) ? root["first_page_uri"].Value<string>() : null,
-                    nextPageUri: root.TryGetValue("next_page_uri", out nextPageUri) ? root["next_page_uri"].Value<string>() : null,
-                    previousPageUri: root.TryGetValue("previous_page_uri", out previousPageUri) ? root["previous_page_uri"].Value<string>() : null
-                );
-            }
-
-            // next-gen API
-            var meta = root["meta"];
-            return new Page<T>(
-                parsedRecords,
-                meta["page_size"].Value<int>(),
-                url: meta["url"].Value<string>(),
-                firstPageUrl: meta["first_page_url"].Value<string>(),
-                nextPageUrl: meta["next_page_url"].Value<string>(),
-                previousPageUrl: meta["previous_page_url"].Value<string>()
-            );
-        }
-    }
-}
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Twilio.Rest;
+using static System.String;
+
+namespace Twilio.Base
+{
+  /// <summary>
+  /// Page of resources
+  /// </summary>
+  /// <typeparam name="T">Resource type</typeparam>
+  public class Page<T> where T : Resource
+  {
+    /// <summary>
+    /// Records for this page
+    /// </summary>
+    public List<T> Records { get; }
+
+    /// <summary>
+    /// Page size
+    /// </summary>
+    public int PageSize { get; }
+
+    private readonly string _uri;
+    private readonly string _url;
+    private readonly string _firstPageUri;
+    private readonly string _firstPageUrl;
+    private readonly string _nextPageUri;
+    private readonly string _nextPageUrl;
+    private readonly string _previousPageUri;
+    private readonly string _previousPageUrl;
+
+    private Page(
+        List<T> records,
+        int pageSize,
+        string uri = null,
+        string url = null,
+        string firstPageUri = null,
+        string firstPageUrl = null,
+        string previousPageUri = null,
+        string previousPageUrl = null,
+        string nextPageUri = null,
+        string nextPageUrl = null
+    )
+    {
+      Records = records;
+      PageSize = pageSize;
+      _uri = uri;
+      _url = url;
+      _firstPageUri = firstPageUri;
+      _firstPageUrl = firstPageUrl;
+      _nextPageUri = nextPageUri;
+      _nextPageUrl = nextPageUrl;
+      _previousPageUri = previousPageUri;
+      _previousPageUrl = previousPageUrl;
+    }
+
+    private static string UrlFromUri(Domain domain, string uri)
+    {
+      return "https://" + domain + ".twilio.com" + uri;
+    }
+
+    /// <summary>
+    /// Generate the first page URL
+    /// </summary>
+    /// <param name="domain">Twilio subdomain</param>
+    /// <returns>URL for the first page of results</returns>
+    public string GetFirstPageUrl(Domain domain)
+    {
+      return _firstPageUrl ?? UrlFromUri(domain, _firstPageUri);
+    }
+
+    /// <summary>
+    /// Get the next page URL
+    /// </summary>
+    /// <param name="domain">Twilio subdomain</param>
+    /// <returns>URL for the next page of results</returns>
+    public string GetNextPageUrl(Domain domain)
+    {
+      return _nextPageUrl ?? UrlFromUri(domain, _nextPageUri);
+    }
+
+    /// <summary>
+    /// Get the previous page URL
+    /// </summary>
+    /// <param name="domain">Twilio subdomain</param>
+    /// <returns>URL for the previous page of results</returns>
+    public string GetPreviousPageUrl(Domain domain)
+    {
+      return _previousPageUrl ?? UrlFromUri(domain, _previousPageUri);
+    }
+
+    /// <summary>
+    /// Get the URL for the current page
+    /// </summary>
+    /// <param name="domain">Twilio subdomain</param>
+    /// <returns>URL for the current page of results</returns>
+    public string GetUrl(Domain domain)
+    {
+      return _url ?? UrlFromUri(domain, _uri);
+    }
+
+    /// <summary>
+    /// Determines if there is another page of results
+    /// </summary>
+    /// <returns>true if there is a next page; false otherwise</returns>
+    public bool HasNextPage()
+    {
+      return !IsNullOrEmpty(_nextPageUrl) || !IsNullOrEmpty(_nextPageUri);
+    }
+
+    /// <summary>
+    /// Converts a JSON payload to a Page of results
+    /// </summary>
+    /// <param name="recordKey">JSON key where the records are</param>
+    /// <param name="json">JSON payload</param>
+    /// <returns>Page of results</returns>
+    public static Page<T> FromJson(string recordKey, string json)
+    {
+      var root = JObject.Parse(json);
+      var records = root[recordKey];
+      var parsedRecords = records.Children().Select(
+          record => JsonConvert.DeserializeObject<T>(record.ToString())
+      ).ToList();
+
+      var uriNode = root["uri"];
+      if (uriNode != null)
+      {
+        JToken pageSize;
+        JToken firstPageUri;
+        JToken nextPageUri;
+        JToken previousPageUri;
+
+        // v2010 API
+        return new Page<T>(
+            parsedRecords,
+            root.TryGetValue("page_size", out pageSize) ? root["page_size"].Value<int>() : parsedRecords.Count,
+            uri: uriNode.Value<string>(),
+            firstPageUri: root.TryGetValue("first_page_uri", out firstPageUri) ? root["first_page_uri"].Value<string>() : null,
+            nextPageUri: root.TryGetValue("next_page_uri", out nextPageUri) ? root["next_page_uri"].Value<string>() : null,
+            previousPageUri: root.TryGetValue("previous_page_uri", out previousPageUri) ? root["previous_page_uri"].Value<string>() : null
+        );
+      }
+
+      // next-gen API
+      var meta = root["meta"];
+      return new Page<T>(
+          parsedRecords,
+          meta["page_size"].Value<int>(),
+          url: meta["url"].Value<string>(),
+          firstPageUrl: meta["first_page_url"].Value<string>(),
+          nextPageUrl: meta["next_page_url"].Value<string>(),
+          previousPageUrl: meta["previous_page_url"].Value<string>()
+      );
+    }
+  }
+}
diff --git a/src/Twilio/Base/Resource.cs b/src/Twilio/Base/Resource.cs
index 69354a900..0f0ae89a4 100644
--- a/src/Twilio/Base/Resource.cs
+++ b/src/Twilio/Base/Resource.cs
@@ -1,4 +1,4 @@
 namespace Twilio.Base
-{
-    public abstract class Resource {}
+{
+  public abstract class Resource { }
 }
\ No newline at end of file
diff --git a/src/Twilio/Base/ResourceSet.cs b/src/Twilio/Base/ResourceSet.cs
index 15110b7d8..d64879b1e 100644
--- a/src/Twilio/Base/ResourceSet.cs
+++ b/src/Twilio/Base/ResourceSet.cs
@@ -4,118 +4,118 @@
 using Twilio.Clients;
 
 namespace Twilio.Base
-{
+{
+  /// <summary>
+  /// A collection of resources of type T
+  /// </summary>
+  ///
+  /// <typeparam name="T">Resource Type</typeparam>
+  public class ResourceSet<T> : IEnumerable<T> where T : Resource
+  {
     /// <summary>
-    /// A collection of resources of type T
+    /// Automatically iterate through pages of results
+    /// </summary>
+    public bool AutoPaging { get; set; }
+
+    private readonly ITwilioRestClient _client;
+    private readonly ReadOptions<T> _options;
+    private readonly long _pageLimit;
+
+    private long _pages;
+    private long _processed;
+    private Page<T> _page;
+    private IEnumerator<T> _iterator;
+
+    /// <summary>
+    /// Create a new resource set
     /// </summary>
     ///
-    /// <typeparam name="T">Resource Type</typeparam>
-    public class ResourceSet<T> : IEnumerable<T> where T : Resource
-    {
-        /// <summary>
-        /// Automatically iterate through pages of results
-        /// </summary>
-        public bool AutoPaging { get; set; }
-
-        private readonly ITwilioRestClient _client;
-        private readonly ReadOptions<T> _options;
-        private readonly long _pageLimit;
-
-        private long _pages;
-        private long _processed;
-        private Page<T> _page;
-        private IEnumerator<T> _iterator;
-
-        /// <summary>
-        /// Create a new resource set
-        /// </summary>
-        ///
-        /// <param name="page">Page of resources</param>
-        /// <param name="options">Read options</param>
-        /// <param name="client">Client to make requests</param>
-        public ResourceSet(Page<T> page, ReadOptions<T> options, ITwilioRestClient client)
-        {
-            _page = page;
-            _options = options;
-            _client = client;
-
-            _iterator = page.Records.GetEnumerator();
-            _processed = 0;
-            _pages = 1;
-            _pageLimit = long.MaxValue;
-
-            AutoPaging = true;
-
-            if (_options.Limit != null)
-            {
-                _pageLimit = (long) (Math.Ceiling((double) _options.Limit.Value / page.PageSize));
-            }
-        }
-
-        /// <summary>
-        /// Get iterator for resources
-        /// </summary>
-        ///
-        /// <returns>IEnumerator of resources</returns>
-        public IEnumerator<T> GetEnumerator()
-        {
-            while (_page != null)
-            {
-                _iterator.Reset();
-                while (_iterator.MoveNext())
-                {
-                    // Exit if we've reached item limit
-                    if (_options.Limit != null && _processed > _options.Limit.Value)
-                    {
-                        yield break;
-                    }
-
-                    _processed++;
-                    yield return _iterator.Current;
-                }
-
-                if (AutoPaging && _page.HasNextPage())
-                {
-                    FetchNextPage();
-                }
-                else
-                {
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Get iterator for resources
-        /// </summary>
-        ///
-        /// <returns>IEnumerator of resources</returns>
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        private void FetchNextPage()
-        {
-            if (!_page.HasNextPage() || _pages >= _pageLimit)
-            {
-                _page = null;
-                _iterator = null;
-                return;
-            }
-
-            _pages++;
-            _page = (Page<T>)GetNextPage().Invoke(null, new object[]{ _page, _client });
-            _iterator = _page.Records.GetEnumerator();
-        }
-
-        private static MethodInfo GetNextPage()
-        {
+    /// <param name="page">Page of resources</param>
+    /// <param name="options">Read options</param>
+    /// <param name="client">Client to make requests</param>
+    public ResourceSet(Page<T> page, ReadOptions<T> options, ITwilioRestClient client)
+    {
+      _page = page;
+      _options = options;
+      _client = client;
+
+      _iterator = page.Records.GetEnumerator();
+      _processed = 0;
+      _pages = 1;
+      _pageLimit = long.MaxValue;
+
+      AutoPaging = true;
+
+      if (_options.Limit != null)
+      {
+        _pageLimit = (long)(Math.Ceiling((double)_options.Limit.Value / page.PageSize));
+      }
+    }
+
+    /// <summary>
+    /// Get iterator for resources
+    /// </summary>
+    ///
+    /// <returns>IEnumerator of resources</returns>
+    public IEnumerator<T> GetEnumerator()
+    {
+      while (_page != null)
+      {
+        _iterator.Reset();
+        while (_iterator.MoveNext())
+        {
+          // Exit if we've reached item limit
+          if (_options.Limit != null && _processed > _options.Limit.Value)
+          {
+            yield break;
+          }
+
+          _processed++;
+          yield return _iterator.Current;
+        }
+
+        if (AutoPaging && _page.HasNextPage())
+        {
+          FetchNextPage();
+        }
+        else
+        {
+          break;
+        }
+      }
+    }
+
+    /// <summary>
+    /// Get iterator for resources
+    /// </summary>
+    ///
+    /// <returns>IEnumerator of resources</returns>
+    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+    {
+      return GetEnumerator();
+    }
+
+    private void FetchNextPage()
+    {
+      if (!_page.HasNextPage() || _pages >= _pageLimit)
+      {
+        _page = null;
+        _iterator = null;
+        return;
+      }
+
+      _pages++;
+      _page = (Page<T>)GetNextPage().Invoke(null, new object[] { _page, _client });
+      _iterator = _page.Records.GetEnumerator();
+    }
+
+    private static MethodInfo GetNextPage()
+    {
 #if !NET35
-            return typeof(T).GetRuntimeMethod("NextPage", new[]{ typeof(Page<T>), typeof(ITwilioRestClient) });
+      return typeof(T).GetRuntimeMethod("NextPage", new[] { typeof(Page<T>), typeof(ITwilioRestClient) });
 #else
             return typeof(T).GetMethod("NextPage", new[]{ typeof(Page<T>), typeof(ITwilioRestClient) });
 #endif
-        }
-    }
+    }
+  }
 }
diff --git a/src/Twilio/Clients/ITwilioRestClient.cs b/src/Twilio/Clients/ITwilioRestClient.cs
index 496c03f9f..958f87a17 100644
--- a/src/Twilio/Clients/ITwilioRestClient.cs
+++ b/src/Twilio/Clients/ITwilioRestClient.cs
@@ -1,44 +1,44 @@
 using Twilio.Http;
 
 namespace Twilio.Clients
-{
+{
+  /// <summary>
+  /// Interface for a Twilio Client
+  /// </summary>
+  public interface ITwilioRestClient
+  {
     /// <summary>
-    /// Interface for a Twilio Client
+    /// Get the account sid all requests are made against
     /// </summary>
-    public interface ITwilioRestClient
-    {
-        /// <summary>
-        /// Get the account sid all requests are made against
-        /// </summary>
-        string AccountSid { get; }
-
-        /// <summary>
-        /// Get the region requests are made against
-        /// </summary>
-        string Region { get; }
-
-        /// <summary>
-        /// Get the http client that makes requests
-        /// </summary>
-        HttpClient HttpClient { get; }
-
-        /// <summary>
-        /// Make a request to Twilio
-        /// </summary>
-        ///
-        /// <param name="request">Request to make</param>
-        /// <returns>response of the request</returns>
-        Response Request(Request request);
-
+    string AccountSid { get; }
+
+    /// <summary>
+    /// Get the region requests are made against
+    /// </summary>
+    string Region { get; }
+
+    /// <summary>
+    /// Get the http client that makes requests
+    /// </summary>
+    HttpClient HttpClient { get; }
+
+    /// <summary>
+    /// Make a request to Twilio
+    /// </summary>
+    ///
+    /// <param name="request">Request to make</param>
+    /// <returns>response of the request</returns>
+    Response Request(Request request);
+
 #if !NET35
-        /// <summary>
-        /// Make a request to Twilio
-        /// </summary>
-        ///
-        /// <param name="request">Request to make</param>
-        /// <returns>response of the request</returns>
-        System.Threading.Tasks.Task<Response> RequestAsync(Request request);
+    /// <summary>
+    /// Make a request to Twilio
+    /// </summary>
+    ///
+    /// <param name="request">Request to make</param>
+    /// <returns>response of the request</returns>
+    System.Threading.Tasks.Task<Response> RequestAsync(Request request);
 #endif
-    }
+  }
 }
 
diff --git a/src/Twilio/Clients/TwilioRestClient.cs b/src/Twilio/Clients/TwilioRestClient.cs
index 641050a2d..139d60335 100644
--- a/src/Twilio/Clients/TwilioRestClient.cs
+++ b/src/Twilio/Clients/TwilioRestClient.cs
@@ -14,261 +14,261 @@
 #endif
 
 namespace Twilio.Clients
-{
+{
+  /// <summary>
+  /// Implementation of a TwilioRestClient.
+  /// </summary>
+  public class TwilioRestClient : ITwilioRestClient
+  {
     /// <summary>
-    /// Implementation of a TwilioRestClient.
+    /// Client to make HTTP requests
     /// </summary>
-    public class TwilioRestClient : ITwilioRestClient
-    {
-        /// <summary>
-        /// Client to make HTTP requests
-        /// </summary>
-        public HttpClient HttpClient { get; }
-
-        /// <summary>
-        /// Account SID to use for requests
-        /// </summary>
-        public string AccountSid { get; }
-
-        /// <summary>
-        /// Twilio region to make requests to
-        /// </summary>
-        public string Region { get; }
-
-        /// <summary>
-        /// Twilio edge to make requests to
-        /// </summary>
-        public string Edge { get; set; }
-
-        /// <summary>
-        /// Log level for logging
-        /// </summary>
-        public string LogLevel { get; set; } = Environment.GetEnvironmentVariable("TWILIO_LOG_LEVEL");
-        private readonly string _username;
-        private readonly string _password;
-
-        /// <summary>
-        /// Constructor for a TwilioRestClient
-        /// </summary>
-        ///
-        /// <param name="username">username for requests</param>
-        /// <param name="password">password for requests</param>
-        /// <param name="accountSid">account sid to make requests for</param>
-        /// <param name="region">region to make requests for</param>
-        /// <param name="httpClient">http client used to make the requests</param>
-        /// <param name="edge">edge to make requests for</param>
-        public TwilioRestClient(
-            string username,
-            string password,
-            string accountSid = null,
-            string region = null,
-            HttpClient httpClient = null,
-            string edge = null
-        )
-        {
-            _username = username;
-            _password = password;
-
-            AccountSid = accountSid ?? username;
-            HttpClient = httpClient ?? DefaultClient();
-
-            Region = region;
-            Edge = edge;
-        }
-
-        /// <summary>
-        /// Make a request to the Twilio API
-        /// </summary>
-        ///
-        /// <param name="request">request to make</param>
-        /// <returns>response of the request</returns>
-        public Response Request(Request request)
-        {
-            request.SetAuth(_username, _password);
-
-            if (LogLevel == "debug")
-                LogRequest(request);
-
-            if (Region != null)
-                request.Region = Region;
-
-            if (Edge != null)
-                request.Edge = Edge;
-
-            Response response;
-            try
-            {
-                response = HttpClient.MakeRequest(request);
-                if (LogLevel == "debug")
-                {
-                    Console.WriteLine("response.status: " + response.StatusCode);
-                    Console.WriteLine("response.headers: " + response.Headers);
-                }
-            }
-            catch (Exception clientException)
-            {
-                throw new ApiConnectionException(
-                    "Connection Error: " + request.Method + request.ConstructUrl(),
-                    clientException
-                );
-            }
-            return ProcessResponse(response);
-        }
-
+    public HttpClient HttpClient { get; }
+
+    /// <summary>
+    /// Account SID to use for requests
+    /// </summary>
+    public string AccountSid { get; }
+
+    /// <summary>
+    /// Twilio region to make requests to
+    /// </summary>
+    public string Region { get; }
+
+    /// <summary>
+    /// Twilio edge to make requests to
+    /// </summary>
+    public string Edge { get; set; }
+
+    /// <summary>
+    /// Log level for logging
+    /// </summary>
+    public string LogLevel { get; set; } = Environment.GetEnvironmentVariable("TWILIO_LOG_LEVEL");
+    private readonly string _username;
+    private readonly string _password;
+
+    /// <summary>
+    /// Constructor for a TwilioRestClient
+    /// </summary>
+    ///
+    /// <param name="username">username for requests</param>
+    /// <param name="password">password for requests</param>
+    /// <param name="accountSid">account sid to make requests for</param>
+    /// <param name="region">region to make requests for</param>
+    /// <param name="httpClient">http client used to make the requests</param>
+    /// <param name="edge">edge to make requests for</param>
+    public TwilioRestClient(
+        string username,
+        string password,
+        string accountSid = null,
+        string region = null,
+        HttpClient httpClient = null,
+        string edge = null
+    )
+    {
+      _username = username;
+      _password = password;
+
+      AccountSid = accountSid ?? username;
+      HttpClient = httpClient ?? DefaultClient();
+
+      Region = region;
+      Edge = edge;
+    }
+
+    /// <summary>
+    /// Make a request to the Twilio API
+    /// </summary>
+    ///
+    /// <param name="request">request to make</param>
+    /// <returns>response of the request</returns>
+    public Response Request(Request request)
+    {
+      request.SetAuth(_username, _password);
+
+      if (LogLevel == "debug")
+        LogRequest(request);
+
+      if (Region != null)
+        request.Region = Region;
+
+      if (Edge != null)
+        request.Edge = Edge;
+
+      Response response;
+      try
+      {
+        response = HttpClient.MakeRequest(request);
+        if (LogLevel == "debug")
+        {
+          Console.WriteLine("response.status: " + response.StatusCode);
+          Console.WriteLine("response.headers: " + response.Headers);
+        }
+      }
+      catch (Exception clientException)
+      {
+        throw new ApiConnectionException(
+            "Connection Error: " + request.Method + request.ConstructUrl(),
+            clientException
+        );
+      }
+      return ProcessResponse(response);
+    }
+
 #if !NET35
-        /// <summary>
-        /// Make a request to the Twilio API
-        /// </summary>
-        ///
-        /// <param name="request">request to make</param>
-        /// <returns>Task that resolves to the response of the request</returns>
-        public async Task<Response> RequestAsync(Request request)
-        {
-            request.SetAuth(_username, _password);
-
-            if (Region != null)
-                request.Region = Region;
-
-            if (Edge != null)
-                request.Edge = Edge;
-
-            Response response;
-            try
-            {
-                response = await HttpClient.MakeRequestAsync(request);
-            }
-            catch (Exception clientException)
-            {
-                throw new ApiConnectionException(
-                    "Connection Error: " + request.Method + request.ConstructUrl(),
-                    clientException
-                );
-            }
-            return ProcessResponse(response);
-        }
-
-        private static HttpClient DefaultClient()
-        {
-            return new SystemNetHttpClient();
-        }
+    /// <summary>
+    /// Make a request to the Twilio API
+    /// </summary>
+    ///
+    /// <param name="request">request to make</param>
+    /// <returns>Task that resolves to the response of the request</returns>
+    public async Task<Response> RequestAsync(Request request)
+    {
+      request.SetAuth(_username, _password);
+
+      if (Region != null)
+        request.Region = Region;
+
+      if (Edge != null)
+        request.Edge = Edge;
+
+      Response response;
+      try
+      {
+        response = await HttpClient.MakeRequestAsync(request);
+      }
+      catch (Exception clientException)
+      {
+        throw new ApiConnectionException(
+            "Connection Error: " + request.Method + request.ConstructUrl(),
+            clientException
+        );
+      }
+      return ProcessResponse(response);
+    }
+
+    private static HttpClient DefaultClient()
+    {
+      return new SystemNetHttpClient();
+    }
 #else
         private static HttpClient DefaultClient()
         {
             return new WebRequestClient();
         }
 #endif
-
-        private static Response ProcessResponse(Response response)
-        {
-            if (response == null)
-            {
-                throw new ApiConnectionException("Connection Error: No response received.");
-            }
-
-            if (response.StatusCode >= HttpStatusCode.OK && response.StatusCode < HttpStatusCode.BadRequest)
-            {
-                return response;
-            }
-
-            // Deserialize and throw exception
-            RestException restException = null;
-            try
-            {
-                restException = RestException.FromJson(response.Content);
-            }
-            catch (JsonReaderException) { /* Allow null check below to handle */ }
-
-            if (restException == null)
-            {
-                throw new ApiException("Api Error: " + response.StatusCode + " - " + (response.Content ?? "[no content]"));
-            }
-
-            throw new ApiException(
-                restException.Code,
-                (int)response.StatusCode,
-                restException.Message ?? "Unable to make request, " + response.StatusCode,
-                restException.MoreInfo,
-                restException.Details
-            );
-        }
-
-        /// <summary>
-        /// Test that this application can use updated SSL certificates on
-        /// api.twilio.com:8443. It's a bit easier to call this method from
-        /// TwilioClient.ValidateSslCertificate().
-        /// </summary>
-        public static void ValidateSslCertificate()
-        {
-            ValidateSslCertificate(DefaultClient());
-        }
-
-        /// <summary>
-        /// Test that this application can use updated SSL certificates on
-        /// api.twilio.com:8443. Generally, you'll want to use the version of this
-        /// function that takes no parameters unless you have a reason not to.
-        /// </summary>
-        ///
-        /// <param name="client">HTTP Client to use for testing the request</param>
-        public static void ValidateSslCertificate(HttpClient client)
-        {
-            Request request = new Request("GET", "api", ":8443/", null);
-
-            try
-            {
-                Response response = client.MakeRequest(request);
-
-                if (!response.StatusCode.Equals(HttpStatusCode.OK))
-                {
-                    throw new CertificateValidationException(
-                        "Unexpected response from certificate endpoint",
-                        request,
-                        response
-                    );
-                }
-            }
-            catch (CertificateValidationException e)
-            {
-                throw e;
-            }
-            catch (Exception e)
-            {
-                throw new CertificateValidationException(
-                    "Connection to api.twilio.com:8443 failed",
-                    e,
-                    request
-                );
-            }
-        }
-
-        /// <summary>
-        /// Format request information when LogLevel is set to debug
-        /// </summary>
-        ///
-        /// <param name="request">HTTP request</param>
-        private static void LogRequest(Request request)
-        {
-            Console.WriteLine("-- BEGIN Twilio API Request --");
-            Console.WriteLine("request.method: " + request.Method);
-            Console.WriteLine("request.URI: " + request.Uri);
-
-            if (request.QueryParams != null)
-            {
-                request.QueryParams.ForEach(parameter => Console.WriteLine(parameter.Key + ":" + parameter.Value));
-            }
-
-            if (request.HeaderParams != null)
-            {
-                for (int i = 0; i < request.HeaderParams.Count; i++)
-                {
-                    var lowercaseHeader = request.HeaderParams[i].Key.ToLower();
-                    if (lowercaseHeader.Contains("authorization") == false)
-                    {
-                        Console.WriteLine(request.HeaderParams[i].Key + ":" + request.HeaderParams[i].Value);
-                    }
-                }
-            }
-
-            Console.WriteLine("-- END Twilio API Request --");
-        }
-    }
+
+    private static Response ProcessResponse(Response response)
+    {
+      if (response == null)
+      {
+        throw new ApiConnectionException("Connection Error: No response received.");
+      }
+
+      if (response.StatusCode >= HttpStatusCode.OK && response.StatusCode < HttpStatusCode.BadRequest)
+      {
+        return response;
+      }
+
+      // Deserialize and throw exception
+      RestException restException = null;
+      try
+      {
+        restException = RestException.FromJson(response.Content);
+      }
+      catch (JsonReaderException) { /* Allow null check below to handle */ }
+
+      if (restException == null)
+      {
+        throw new ApiException("Api Error: " + response.StatusCode + " - " + (response.Content ?? "[no content]"));
+      }
+
+      throw new ApiException(
+          restException.Code,
+          (int)response.StatusCode,
+          restException.Message ?? "Unable to make request, " + response.StatusCode,
+          restException.MoreInfo,
+          restException.Details
+      );
+    }
+
+    /// <summary>
+    /// Test that this application can use updated SSL certificates on
+    /// api.twilio.com:8443. It's a bit easier to call this method from
+    /// TwilioClient.ValidateSslCertificate().
+    /// </summary>
+    public static void ValidateSslCertificate()
+    {
+      ValidateSslCertificate(DefaultClient());
+    }
+
+    /// <summary>
+    /// Test that this application can use updated SSL certificates on
+    /// api.twilio.com:8443. Generally, you'll want to use the version of this
+    /// function that takes no parameters unless you have a reason not to.
+    /// </summary>
+    ///
+    /// <param name="client">HTTP Client to use for testing the request</param>
+    public static void ValidateSslCertificate(HttpClient client)
+    {
+      Request request = new Request("GET", "api", ":8443/", null);
+
+      try
+      {
+        Response response = client.MakeRequest(request);
+
+        if (!response.StatusCode.Equals(HttpStatusCode.OK))
+        {
+          throw new CertificateValidationException(
+              "Unexpected response from certificate endpoint",
+              request,
+              response
+          );
+        }
+      }
+      catch (CertificateValidationException e)
+      {
+        throw e;
+      }
+      catch (Exception e)
+      {
+        throw new CertificateValidationException(
+            "Connection to api.twilio.com:8443 failed",
+            e,
+            request
+        );
+      }
+    }
+
+    /// <summary>
+    /// Format request information when LogLevel is set to debug
+    /// </summary>
+    ///
+    /// <param name="request">HTTP request</param>
+    private static void LogRequest(Request request)
+    {
+      Console.WriteLine("-- BEGIN Twilio API Request --");
+      Console.WriteLine("request.method: " + request.Method);
+      Console.WriteLine("request.URI: " + request.Uri);
+
+      if (request.QueryParams != null)
+      {
+        request.QueryParams.ForEach(parameter => Console.WriteLine(parameter.Key + ":" + parameter.Value));
+      }
+
+      if (request.HeaderParams != null)
+      {
+        for (int i = 0; i < request.HeaderParams.Count; i++)
+        {
+          var lowercaseHeader = request.HeaderParams[i].Key.ToLower();
+          if (lowercaseHeader.Contains("authorization") == false)
+          {
+            Console.WriteLine(request.HeaderParams[i].Key + ":" + request.HeaderParams[i].Value);
+          }
+        }
+      }
+
+      Console.WriteLine("-- END Twilio API Request --");
+    }
+  }
 }
diff --git a/src/Twilio/Converters/HttpMethodConverter.cs b/src/Twilio/Converters/HttpMethodConverter.cs
index 4aea19539..4c1616125 100644
--- a/src/Twilio/Converters/HttpMethodConverter.cs
+++ b/src/Twilio/Converters/HttpMethodConverter.cs
@@ -3,72 +3,72 @@
 using Newtonsoft.Json.Linq;
 
 namespace Twilio.Converters
-{
+{
+  /// <summary>
+  /// Convert between strings and HttpMethod
+  /// </summary>
+  public class HttpMethodConverter : JsonConverter
+  {
     /// <summary>
-    /// Convert between strings and HttpMethod
+    /// Write the HTTP method out to json
     /// </summary>
-    public class HttpMethodConverter : JsonConverter
-    {
-        /// <summary>
-        /// Write the HTTP method out to json
-        /// </summary>
-        ///
-        /// <param name="writer">json writer</param>
-        /// <param name="value">value to write serialize</param>
-        /// <param name="serializer">json serialize</param>
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var t = JToken.FromObject(value.ToString());
-            t.WriteTo(writer);
-        }
-
-        /// <summary>
-        /// Deserialize a string into a HttpMethod
-        /// </summary>
-        ///
-        /// <param name="reader">json reader</param>
-        /// <param name="objectType">type of object</param>
-        /// <param name="existingValue"></param>
-        /// <param name="serializer"></param>
-        ///
-        /// <returns>Deserialized HttpMethod</returns>
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            var token = reader.Value as string;
-            if (token == null)
-            {
-                return null;
-            }
-
-            switch (token.ToLower())
-            {
-                case "get":
-                    return Http.HttpMethod.Get;
-
-                case "post":
-                    return Http.HttpMethod.Post;
-
-                case "put":
-                    return Http.HttpMethod.Put;
-
-                case "delete":
-                    return Http.HttpMethod.Delete;
-
-                default:
-                    return null;
-            }
-        }
-
-        /// <summary>
-        /// Determine if an object can be converted to HttpMethod
-        /// </summary>
-        ///
-        /// <param name="objectType">object type</param>
-        /// <returns>true if the type is an HttpMethod; false otherwise</returns>
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == typeof(Http.HttpMethod);
-        }
-    }
+    ///
+    /// <param name="writer">json writer</param>
+    /// <param name="value">value to write serialize</param>
+    /// <param name="serializer">json serialize</param>
+    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+    {
+      var t = JToken.FromObject(value.ToString());
+      t.WriteTo(writer);
+    }
+
+    /// <summary>
+    /// Deserialize a string into a HttpMethod
+    /// </summary>
+    ///
+    /// <param name="reader">json reader</param>
+    /// <param name="objectType">type of object</param>
+    /// <param name="existingValue"></param>
+    /// <param name="serializer"></param>
+    ///
+    /// <returns>Deserialized HttpMethod</returns>
+    public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+    {
+      var token = reader.Value as string;
+      if (token == null)
+      {
+        return null;
+      }
+
+      switch (token.ToLower())
+      {
+        case "get":
+          return Http.HttpMethod.Get;
+
+        case "post":
+          return Http.HttpMethod.Post;
+
+        case "put":
+          return Http.HttpMethod.Put;
+
+        case "delete":
+          return Http.HttpMethod.Delete;
+
+        default:
+          return null;
+      }
+    }
+
+    /// <summary>
+    /// Determine if an object can be converted to HttpMethod
+    /// </summary>
+    ///
+    /// <param name="objectType">object type</param>
+    /// <returns>true if the type is an HttpMethod; false otherwise</returns>
+    public override bool CanConvert(Type objectType)
+    {
+      return objectType == typeof(Http.HttpMethod);
+    }
+  }
 }
 
diff --git a/src/Twilio/Converters/MarshalConverter.cs b/src/Twilio/Converters/MarshalConverter.cs
index 2e7f8d3f1..d4bbe5e9a 100644
--- a/src/Twilio/Converters/MarshalConverter.cs
+++ b/src/Twilio/Converters/MarshalConverter.cs
@@ -1,21 +1,21 @@
 using System;
 
 namespace Twilio.Converters
-{
+{
+  /// <summary>
+  /// Convert strings to objects
+  /// </summary>
+  public class MarshalConverter
+  {
     /// <summary>
-    /// Convert strings to objects
+    /// Convert a date time string to a DateTime object
     /// </summary>
-    public class MarshalConverter
-    {
-        /// <summary>
-        /// Convert a date time string to a DateTime object
-        /// </summary>
-        /// <param name="dateTimeString">date time string to convert</param>
-        /// <returns>Converted DateTime object</returns>
-        public static DateTime DateTimeFromString(string dateTimeString)
-        {
-            return DateTime.Parse(dateTimeString);
-        }
-    }
+    /// <param name="dateTimeString">date time string to convert</param>
+    /// <returns>Converted DateTime object</returns>
+    public static DateTime DateTimeFromString(string dateTimeString)
+    {
+      return DateTime.Parse(dateTimeString);
+    }
+  }
 }
 
diff --git a/src/Twilio/Converters/PhoneNumberConverter.cs b/src/Twilio/Converters/PhoneNumberConverter.cs
index ba158463d..7a744c59f 100644
--- a/src/Twilio/Converters/PhoneNumberConverter.cs
+++ b/src/Twilio/Converters/PhoneNumberConverter.cs
@@ -3,50 +3,50 @@
 using Newtonsoft.Json.Linq;
 
 namespace Twilio.Converters
-{
+{
+  /// <summary>
+  /// Convert between strings and a PhoneNumber
+  /// </summary>
+  public class PhoneNumberConverter : JsonConverter
+  {
     /// <summary>
-    /// Convert between strings and a PhoneNumber
+    /// Write value to JsonWriter
     /// </summary>
-    public class PhoneNumberConverter : JsonConverter
-    {
-        /// <summary>
-        /// Write value to JsonWriter
-        /// </summary>
-        /// <param name="writer">Writer to write to</param>
-        /// <param name="value">Value to write</param>
-        /// <param name="serializer">unsued</param>
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var t = JToken.FromObject(value.ToString());
-            t.WriteTo(writer);
-        }
-
-        /// <summary>
-        /// Convert a string to a PhoneNumber
-        /// </summary>
-        /// <param name="reader">JsonReader to read from</param>
-        /// <param name="objectType">unused</param>
-        /// <param name="existingValue">unused</param>
-        /// <param name="serializer">unsued</param>
-        /// <returns>Converted PhoneNumber</returns>
-        public override object ReadJson(
-            JsonReader reader,
-            Type objectType,
-            object existingValue,
-            JsonSerializer serializer
-        )
-        {
-            return new Types.PhoneNumber(reader.Value as string);
-        }
-
-        /// <summary>
-        /// Determines if an object converted to a PhoneNumber
-        /// </summary>
-        /// <param name="objectType">Type of object</param>
-        /// <returns>true if an object can be converted; false otherwise</returns>
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == typeof(Enum);
-        }
-    }
+    /// <param name="writer">Writer to write to</param>
+    /// <param name="value">Value to write</param>
+    /// <param name="serializer">unsued</param>
+    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+    {
+      var t = JToken.FromObject(value.ToString());
+      t.WriteTo(writer);
+    }
+
+    /// <summary>
+    /// Convert a string to a PhoneNumber
+    /// </summary>
+    /// <param name="reader">JsonReader to read from</param>
+    /// <param name="objectType">unused</param>
+    /// <param name="existingValue">unused</param>
+    /// <param name="serializer">unsued</param>
+    /// <returns>Converted PhoneNumber</returns>
+    public override object ReadJson(
+        JsonReader reader,
+        Type objectType,
+        object existingValue,
+        JsonSerializer serializer
+    )
+    {
+      return new Types.PhoneNumber(reader.Value as string);
+    }
+
+    /// <summary>
+    /// Determines if an object converted to a PhoneNumber
+    /// </summary>
+    /// <param name="objectType">Type of object</param>
+    /// <returns>true if an object can be converted; false otherwise</returns>
+    public override bool CanConvert(Type objectType)
+    {
+      return objectType == typeof(Enum);
+    }
+  }
 }
diff --git a/src/Twilio/Converters/PrefixedCollapsibleMap.cs b/src/Twilio/Converters/PrefixedCollapsibleMap.cs
index 5ca7bb96a..c5e5cf09d 100644
--- a/src/Twilio/Converters/PrefixedCollapsibleMap.cs
+++ b/src/Twilio/Converters/PrefixedCollapsibleMap.cs
@@ -2,54 +2,54 @@
 using System.Linq;
 
 namespace Twilio.Converters
-{
+{
+  /// <summary>
+  /// Flatten nested maps and give all entries a prefix
+  /// </summary>
+  public class PrefixedCollapsibleMap
+  {
+    private static Dictionary<string, string> Flatten(
+        Dictionary<string, object> dict,
+        Dictionary<string, string> result,
+        List<string> previous
+    )
+    {
+      foreach (var entry in dict)
+      {
+        var next = new List<string>(previous) { entry.Key };
+
+        if (entry.Value.GetType() == typeof(Dictionary<string, object>))
+        {
+          Flatten((Dictionary<string, object>)entry.Value, result, next);
+        }
+        else
+        {
+          result.Add(string.Join(".", next.ToArray()), entry.Value.ToString());
+        }
+      }
+
+      return result;
+    }
+
     /// <summary>
-    /// Flatten nested maps and give all entries a prefix
+    /// Flatten Dictionary separating nested keys with a .
     /// </summary>
-    public class PrefixedCollapsibleMap
-    {
-        private static Dictionary<string, string> Flatten(
-            Dictionary<string, object> dict, 
-            Dictionary<string, string> result,
-            List<string> previous
-        )
-        {
-            foreach (var entry in dict)
-            {
-                var next = new List<string>(previous) { entry.Key };
-
-                if (entry.Value.GetType() == typeof(Dictionary<string, object>))
-                {
-                    Flatten((Dictionary<string, object>)entry.Value, result, next);
-                }
-                else
-                {
-                    result.Add(string.Join(".", next.ToArray()), entry.Value.ToString());
-                }
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Flatten Dictionary separating nested keys with a .
-        /// </summary>
-        /// <param name="inputDict">Dictionary to flatten</param>
-        /// <param name="prefix">Prefix to give all entries</param>
-        /// <returns>Flattened Dictionary</returns>
-        public static Dictionary<string, string> Serialize(
-            Dictionary<string, object> inputDict,
-            string prefix
-        )
-        {
-            if (inputDict == null || !inputDict.Any())
-            {
-                return new Dictionary<string, string>();
-            }
-                
-            var flattened = Flatten(inputDict, new Dictionary<string, string>(), new List<string>());
-            return flattened.ToDictionary(entry => prefix + "." + entry.Key, entry => entry.Value);
-        }
-    }
+    /// <param name="inputDict">Dictionary to flatten</param>
+    /// <param name="prefix">Prefix to give all entries</param>
+    /// <returns>Flattened Dictionary</returns>
+    public static Dictionary<string, string> Serialize(
+        Dictionary<string, object> inputDict,
+        string prefix
+    )
+    {
+      if (inputDict == null || !inputDict.Any())
+      {
+        return new Dictionary<string, string>();
+      }
+
+      var flattened = Flatten(inputDict, new Dictionary<string, string>(), new List<string>());
+      return flattened.ToDictionary(entry => prefix + "." + entry.Key, entry => entry.Value);
+    }
+  }
 }
 
diff --git a/src/Twilio/Converters/Promoter.cs b/src/Twilio/Converters/Promoter.cs
index 04d62ce8c..c675e7e14 100644
--- a/src/Twilio/Converters/Promoter.cs
+++ b/src/Twilio/Converters/Promoter.cs
@@ -2,31 +2,31 @@
 using System.Collections.Generic;
 
 namespace Twilio.Converters
-{
+{
+  /// <summary>
+  /// Promote objects
+  /// </summary>
+  public class Promoter
+  {
     /// <summary>
-    /// Promote objects
+    /// Convert a string URL to a Uri object
     /// </summary>
-    public class Promoter
-    {
-        /// <summary>
-        /// Convert a string URL to a Uri object
-        /// </summary>
-        /// <param name="url">URL to convert</param>
-        /// <returns>Converted Uri</returns>
-        public static Uri UriFromString(string url)
-        {
-            return new Uri(url);
-        }
-
-        /// <summary>
-        /// Promote a single entry to a List of one
-        /// </summary>
-        /// <param name="one">single entry to promote</param>
-        /// <returns>List of the single object</returns>
-        public static List<T> ListOfOne<T>(T one)
-        {
-            return new List<T> {one};
-        }
-    }
+    /// <param name="url">URL to convert</param>
+    /// <returns>Converted Uri</returns>
+    public static Uri UriFromString(string url)
+    {
+      return new Uri(url);
+    }
+
+    /// <summary>
+    /// Promote a single entry to a List of one
+    /// </summary>
+    /// <param name="one">single entry to promote</param>
+    /// <returns>List of the single object</returns>
+    public static List<T> ListOfOne<T>(T one)
+    {
+      return new List<T> { one };
+    }
+  }
 }
 
diff --git a/src/Twilio/Converters/Serializers.cs b/src/Twilio/Converters/Serializers.cs
index f5360c35d..23a7c78ac 100644
--- a/src/Twilio/Converters/Serializers.cs
+++ b/src/Twilio/Converters/Serializers.cs
@@ -3,49 +3,49 @@
 using Newtonsoft.Json;
 
 namespace Twilio.Converters
-{
+{
+  /// <summary>
+  /// Serialization methods for various datatypes before making requests to the API
+  /// </summary>
+  public class Serializers
+  {
+
     /// <summary>
-    /// Serialization methods for various datatypes before making requests to the API
+    /// Produce a json string from input if possible
     /// </summary>
-    public class Serializers
-    {
-
-        /// <summary>
-        /// Produce a json string from input if possible
-        /// </summary>
-        /// <param name="input">Object to serialize to json</param>
-        /// <returns>A json string</returns>
-        public static string JsonObject(object input)
-        {
-            return (input is string) ? (string) input : JsonConvert.SerializeObject(input);
-        }
-
-        /// <summary>
-        /// Produce a ISO 8601 UTC compatible string from input if possible
-        /// </summary>
-        /// <param name="input">DateTime instance to serialize to string</param>
-        /// <returns>A string</returns>
-        public static string DateTimeIso8601(DateTime? input)
-        {
-            if (input == null) return null;
-
-            return input.Value.ToString("yyyy-MM-ddTHH:mm:ssZ");
-        }
-
-        public static string Url(Uri input) 
-        {
-            if (input == null) 
-            {
-                return null;
-            }
-
-            string originalString = input.OriginalString;
-            if (input is Types.EmptyUri && Types.EmptyUri.Uri.Equals(originalString))
-            {
-                return string.Empty;
-            }
-
-            return originalString;
-        }
-    }
+    /// <param name="input">Object to serialize to json</param>
+    /// <returns>A json string</returns>
+    public static string JsonObject(object input)
+    {
+      return (input is string) ? (string)input : JsonConvert.SerializeObject(input);
+    }
+
+    /// <summary>
+    /// Produce a ISO 8601 UTC compatible string from input if possible
+    /// </summary>
+    /// <param name="input">DateTime instance to serialize to string</param>
+    /// <returns>A string</returns>
+    public static string DateTimeIso8601(DateTime? input)
+    {
+      if (input == null) return null;
+
+      return input.Value.ToString("yyyy-MM-ddTHH:mm:ssZ");
+    }
+
+    public static string Url(Uri input)
+    {
+      if (input == null)
+      {
+        return null;
+      }
+
+      string originalString = input.OriginalString;
+      if (input is Types.EmptyUri && Types.EmptyUri.Uri.Equals(originalString))
+      {
+        return string.Empty;
+      }
+
+      return originalString;
+    }
+  }
 }
diff --git a/src/Twilio/Converters/StringEnumConverter.cs b/src/Twilio/Converters/StringEnumConverter.cs
index deb44ac00..071650819 100644
--- a/src/Twilio/Converters/StringEnumConverter.cs
+++ b/src/Twilio/Converters/StringEnumConverter.cs
@@ -6,105 +6,105 @@
 using Twilio.Types;
 
 namespace Twilio.Converters
-{
+{
+  /// <summary>
+  /// Converts between enums and strings
+  /// </summary>
+  public class StringEnumConverter : JsonConverter
+  {
     /// <summary>
-    /// Converts between enums and strings
+    /// Writes value to a JsonWriter
     /// </summary>
-    public class StringEnumConverter : JsonConverter
-    {
-        /// <summary>
-        /// Writes value to a JsonWriter
-        /// </summary>
-        /// <param name="writer">JsonWriter to use</param>
-        /// <param name="value">value to write</param>
-        /// <param name="serializer">unused</param>
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var t = JToken.FromObject(value.ToString());
-            t.WriteTo(writer);
-        }
-
-        /// <summary>
-        /// Converts string to an enum
-        /// </summary>
-        /// <param name="reader">JsonReader to read from</param>
-        /// <param name="objectType">unused</param>
-        /// <param name="existingValue">unused</param>
-        /// <param name="serializer">unused</param>
-        /// <returns>Converted object</returns>
-        public override object ReadJson(
-            JsonReader reader,
-            Type objectType,
-            object existingValue,
-            JsonSerializer serializer
-        )
-        {
-            if (reader.Value == null)
-            {
-                // Value is null for 'Null' tokens and 'StartArray' tokens. If it's the former, stop now!
-                if (reader.TokenType == JsonToken.Null)
-                {
-                    return null;
-                }
+    /// <param name="writer">JsonWriter to use</param>
+    /// <param name="value">value to write</param>
+    /// <param name="serializer">unused</param>
+    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+    {
+      var t = JToken.FromObject(value.ToString());
+      t.WriteTo(writer);
+    }
+
+    /// <summary>
+    /// Converts string to an enum
+    /// </summary>
+    /// <param name="reader">JsonReader to read from</param>
+    /// <param name="objectType">unused</param>
+    /// <param name="existingValue">unused</param>
+    /// <param name="serializer">unused</param>
+    /// <returns>Converted object</returns>
+    public override object ReadJson(
+        JsonReader reader,
+        Type objectType,
+        object existingValue,
+        JsonSerializer serializer
+    )
+    {
+      if (reader.Value == null)
+      {
+        // Value is null for 'Null' tokens and 'StartArray' tokens. If it's the former, stop now!
+        if (reader.TokenType == JsonToken.Null)
+        {
+          return null;
+        }
 #if !NET35
-                if (objectType.GenericTypeArguments.Length == 0)
+        if (objectType.GenericTypeArguments.Length == 0)
 #else
                 if (objectType.GetGenericArguments().Length == 0)
 #endif
-                {
-                    return null;
-                }
-                var constructedListType = MakeGenericType(objectType);
-                var results = (IList) Activator.CreateInstance(constructedListType);
-                reader.Read();
-
-                while (reader.Value != null)
-                {
-                    var e = CreateEnum(objectType);
-                    e.FromString(reader.Value as string);
-                    results.Add(e);
-                    reader.Read();
-                }
-
-                return results;
-            }
-
-            var instance = (StringEnum) Activator.CreateInstance(objectType);
-            instance.FromString(reader.Value as string);
-
-            return instance;
-        }
-
-        /// <summary>
-        /// Determines if an object can be converted
-        /// </summary>
-        /// <param name="objectType">Object type to convert</param>
-        /// <returns>true if it can be converted; false otherwise</returns>
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == typeof(Enum);
-        }
-
-        private static Type MakeGenericType(Type objectType)
-        {
-            var listType = typeof(List<>);
-
+        {
+          return null;
+        }
+        var constructedListType = MakeGenericType(objectType);
+        var results = (IList)Activator.CreateInstance(constructedListType);
+        reader.Read();
+
+        while (reader.Value != null)
+        {
+          var e = CreateEnum(objectType);
+          e.FromString(reader.Value as string);
+          results.Add(e);
+          reader.Read();
+        }
+
+        return results;
+      }
+
+      var instance = (StringEnum)Activator.CreateInstance(objectType);
+      instance.FromString(reader.Value as string);
+
+      return instance;
+    }
+
+    /// <summary>
+    /// Determines if an object can be converted
+    /// </summary>
+    /// <param name="objectType">Object type to convert</param>
+    /// <returns>true if it can be converted; false otherwise</returns>
+    public override bool CanConvert(Type objectType)
+    {
+      return objectType == typeof(Enum);
+    }
+
+    private static Type MakeGenericType(Type objectType)
+    {
+      var listType = typeof(List<>);
+
 #if !NET35
-            return listType.MakeGenericType(objectType.GenericTypeArguments[0]);
+      return listType.MakeGenericType(objectType.GenericTypeArguments[0]);
 #else
             return listType.MakeGenericType(objectType.GetGenericArguments()[0]);
 #endif
-        }
-
-        private static StringEnum CreateEnum(Type objectType)
-        {
+    }
+
+    private static StringEnum CreateEnum(Type objectType)
+    {
 #if !NET35
-            return (StringEnum) Activator.CreateInstance(objectType.GenericTypeArguments[0]);
+      return (StringEnum)Activator.CreateInstance(objectType.GenericTypeArguments[0]);
 #else
             return (StringEnum) Activator.CreateInstance(objectType.GetGenericArguments()[0]);
 #endif
-        }
-    }
+    }
+  }
 
 }
 
diff --git a/src/Twilio/Converters/TwimlConverter.cs b/src/Twilio/Converters/TwimlConverter.cs
index b99b8a154..38a1613d5 100644
--- a/src/Twilio/Converters/TwimlConverter.cs
+++ b/src/Twilio/Converters/TwimlConverter.cs
@@ -3,50 +3,50 @@
 using Newtonsoft.Json.Linq;
 
 namespace Twilio.Converters
-{
+{
+  /// <summary>
+  /// Convert between strings and a Twiml
+  /// </summary>
+  public class TwimlConverter : JsonConverter
+  {
     /// <summary>
-    /// Convert between strings and a Twiml
+    /// Write value to JsonWriter
     /// </summary>
-    public class TwimlConverter : JsonConverter
-    {
-        /// <summary>
-        /// Write value to JsonWriter
-        /// </summary>
-        /// <param name="writer">Writer to write to</param>
-        /// <param name="value">Value to write</param>
-        /// <param name="serializer">unused</param>
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var t = JToken.FromObject(value.ToString());
-            t.WriteTo(writer);
-        }
-
-        /// <summary>
-        /// Convert a string to a Twiml
-        /// </summary>
-        /// <param name="reader">JsonReader to read from</param>
-        /// <param name="objectType">unused</param>
-        /// <param name="existingValue">unused</param>
-        /// <param name="serializer">unused</param>
-        /// <returns>Converted Twiml</returns>
-        public override object ReadJson(
-            JsonReader reader,
-            Type objectType,
-            object existingValue,
-            JsonSerializer serializer
-        )
-        {
-            return new Types.Twiml(reader.Value as string);
-        }
-
-        /// <summary>
-        /// Determines if an object converted to a Twiml
-        /// </summary>
-        /// <param name="objectType">Type of object</param>
-        /// <returns>true if an object can be converted; false otherwise</returns>
-        public override bool CanConvert(Type objectType)
-        {
-            return objectType == typeof(Enum);
-        }
-    }
+    /// <param name="writer">Writer to write to</param>
+    /// <param name="value">Value to write</param>
+    /// <param name="serializer">unused</param>
+    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+    {
+      var t = JToken.FromObject(value.ToString());
+      t.WriteTo(writer);
+    }
+
+    /// <summary>
+    /// Convert a string to a Twiml
+    /// </summary>
+    /// <param name="reader">JsonReader to read from</param>
+    /// <param name="objectType">unused</param>
+    /// <param name="existingValue">unused</param>
+    /// <param name="serializer">unused</param>
+    /// <returns>Converted Twiml</returns>
+    public override object ReadJson(
+        JsonReader reader,
+        Type objectType,
+        object existingValue,
+        JsonSerializer serializer
+    )
+    {
+      return new Types.Twiml(reader.Value as string);
+    }
+
+    /// <summary>
+    /// Determines if an object converted to a Twiml
+    /// </summary>
+    /// <param name="objectType">Type of object</param>
+    /// <returns>true if an object can be converted; false otherwise</returns>
+    public override bool CanConvert(Type objectType)
+    {
+      return objectType == typeof(Enum);
+    }
+  }
 }
diff --git a/src/Twilio/Exceptions/ApiException.cs b/src/Twilio/Exceptions/ApiException.cs
index e9433dead..348ed4a46 100644
--- a/src/Twilio/Exceptions/ApiException.cs
+++ b/src/Twilio/Exceptions/ApiException.cs
@@ -2,67 +2,67 @@
 using System.Collections.Generic;
 
 namespace Twilio.Exceptions
-{
+{
+  /// <summary>
+  /// POCO to represent an API Exception
+  /// </summary>
+  public class ApiException : TwilioException
+  {
     /// <summary>
-    /// POCO to represent an API Exception
+    /// Twilio error code
     /// </summary>
-    public class ApiException : TwilioException
-    {
-        /// <summary>
-        /// Twilio error code
-        /// </summary>
-        public int Code { get; }
-
-        /// <summary>
-        /// HTTP status code
-        /// </summary>
-        public int Status { get; }
-
-        /// <summary>
-        /// More info if any was provided
-        /// </summary>
-        public string MoreInfo { get; }
-
-        /// <summary>
-        /// Any more details about the error, if any were provided
-        /// </summary>
-        public Dictionary<string, object> Details { get; }
-
-        /// <summary>
-        /// Create a ApiException with message
-        /// </summary>
-        /// <param name="message">Exception message</param>
-        public ApiException(string message) : base(message) {}
-
-        /// <summary>
-        /// Create an ApiException from another Exception
-        /// </summary>
-        /// <param name="message">Exception message</param>
-        /// <param name="exception">Exception to copy detatils from</param>
-        public ApiException(string message, Exception exception) : base(message, exception) {}
-
-        /// <summary>
-        /// Create an ApiException
-        /// </summary>
-        /// <param name="code">Twilio error code</param>
-        /// <param name="status">HTTP status code</param>
-        /// <param name="message">Error message</param>
-        /// <param name="moreInfo">More info if provided</param>
-        /// <param name="details">Details if provided</param>
-        /// <param name="exception">Original exception</param>
-        public ApiException(
-            int code,
-            int status,
-            string message,
-            string moreInfo,
-            Dictionary<string, object> details = null,
-            Exception exception = null
-        ) : base(message, exception)
-        {
-            Code = code;
-            Status = status;
-            MoreInfo = moreInfo;
-            Details = details;
-        }
-    }
+    public int Code { get; }
+
+    /// <summary>
+    /// HTTP status code
+    /// </summary>
+    public int Status { get; }
+
+    /// <summary>
+    /// More info if any was provided
+    /// </summary>
+    public string MoreInfo { get; }
+
+    /// <summary>
+    /// Any more details about the error, if any were provided
+    /// </summary>
+    public Dictionary<string, object> Details { get; }
+
+    /// <summary>
+    /// Create a ApiException with message
+    /// </summary>
+    /// <param name="message">Exception message</param>
+    public ApiException(string message) : base(message) { }
+
+    /// <summary>
+    /// Create an ApiException from another Exception
+    /// </summary>
+    /// <param name="message">Exception message</param>
+    /// <param name="exception">Exception to copy detatils from</param>
+    public ApiException(string message, Exception exception) : base(message, exception) { }
+
+    /// <summary>
+    /// Create an ApiException
+    /// </summary>
+    /// <param name="code">Twilio error code</param>
+    /// <param name="status">HTTP status code</param>
+    /// <param name="message">Error message</param>
+    /// <param name="moreInfo">More info if provided</param>
+    /// <param name="details">Details if provided</param>
+    /// <param name="exception">Original exception</param>
+    public ApiException(
+        int code,
+        int status,
+        string message,
+        string moreInfo,
+        Dictionary<string, object> details = null,
+        Exception exception = null
+    ) : base(message, exception)
+    {
+      Code = code;
+      Status = status;
+      MoreInfo = moreInfo;
+      Details = details;
+    }
+  }
 }
diff --git a/src/Twilio/Exceptions/CertificateValidationException.cs b/src/Twilio/Exceptions/CertificateValidationException.cs
index f966384a5..0e0c0c028 100644
--- a/src/Twilio/Exceptions/CertificateValidationException.cs
+++ b/src/Twilio/Exceptions/CertificateValidationException.cs
@@ -2,45 +2,45 @@
 using Twilio.Http;
 
 namespace Twilio.Exceptions
-{
+{
+  /// <summary>
+  /// Error thrown specifically when validating SSL connection
+  /// </summary>
+  public class CertificateValidationException : TwilioException
+  {
     /// <summary>
-    /// Error thrown specifically when validating SSL connection
+    /// Request object that triggered the exception
     /// </summary>
-    public class CertificateValidationException : TwilioException
-    {
-        /// <summary>
-        /// Request object that triggered the exception
-        /// </summary>
-        public Request Request { get; }
-
-        /// <summary>
-        /// Response object that triggered the exception, if available
-        /// </summary>
-        public Response Response { get; }
-
-        /// <summary>
-        /// Construct a CertificateValidationException
-        /// </summary>
-        /// <param name="message">Error message</param>
-        /// <param name="request">The Request that triggered the exception</param>
-        /// <param name="response">The Response (if available) that triggered the exception</param>
-        public CertificateValidationException(string message, Request request, Response response)
-            : base(message)
-        {
-            Request = request;
-            Response = response;
-        }
-
-        /// <summary>
-        /// Construct a CertificateValidationException
-        /// </summary>
-        /// <param name="message">Error message</param>
-        /// <param name="exception">The parent exception</param>
-        /// <param name="request">The Request that triggered the exception</param>
-        public CertificateValidationException(string message, Exception exception, Request request)
-            : base(message, exception)
-        {
-            Request = request;
-        }
-    }
+    public Request Request { get; }
+
+    /// <summary>
+    /// Response object that triggered the exception, if available
+    /// </summary>
+    public Response Response { get; }
+
+    /// <summary>
+    /// Construct a CertificateValidationException
+    /// </summary>
+    /// <param name="message">Error message</param>
+    /// <param name="request">The Request that triggered the exception</param>
+    /// <param name="response">The Response (if available) that triggered the exception</param>
+    public CertificateValidationException(string message, Request request, Response response)
+        : base(message)
+    {
+      Request = request;
+      Response = response;
+    }
+
+    /// <summary>
+    /// Construct a CertificateValidationException
+    /// </summary>
+    /// <param name="message">Error message</param>
+    /// <param name="exception">The parent exception</param>
+    /// <param name="request">The Request that triggered the exception</param>
+    public CertificateValidationException(string message, Exception exception, Request request)
+        : base(message, exception)
+    {
+      Request = request;
+    }
+  }
 }
diff --git a/src/Twilio/Exceptions/RestException.cs b/src/Twilio/Exceptions/RestException.cs
index af6b5942b..8c12b285b 100644
--- a/src/Twilio/Exceptions/RestException.cs
+++ b/src/Twilio/Exceptions/RestException.cs
@@ -2,83 +2,85 @@
 using System.Collections.Generic;
 
 namespace Twilio.Exceptions
-{
+{
+  /// <summary>
+  /// Exception from Twilio API
+  /// </summary>
+  [JsonObject(MemberSerialization.OptIn)]
+  public class RestException : TwilioException
+  {
     /// <summary>
-    /// Exception from Twilio API
+    /// Twilio error code
     /// </summary>
-    [JsonObject(MemberSerialization.OptIn)]
-    public class RestException : TwilioException
-    {
-        /// <summary>
-        /// Twilio error code
-        /// </summary>
-        [JsonProperty("code")]
-        public int Code { get; private set; }
-
-        /// <summary>
-        /// HTTP status code
-        /// </summary>
+    [JsonProperty("code")]
+    public int Code { get; private set; }
+
+    /// <summary>
+    /// HTTP status code
+    /// </summary>
+    [JsonProperty("status")]
+    public int Status { get; private set; }
+
+    /// <summary>
+    /// Error message
+    /// </summary>
+    public override string Message
+    {
+      get
+      {
+        return _message;
+      }
+    }
+
+    [JsonProperty("message")]
+    private string _message
+    {
+      get; set;
+    }
+
+    /// <summary>
+    /// More info if provided
+    /// </summary>
+    [JsonProperty("more_info")]
+    public string MoreInfo { get; private set; }
+
+    /// <summary>
+    /// Details if provided
+    /// </summary>
+    [JsonProperty("details")]
+    public Dictionary<string, object> Details { get; private set; }
+
+    /// <summary>
+    /// Create an empty RestException
+    /// </summary>
+    public RestException() { }
+    private RestException(
         [JsonProperty("status")]
-        public int Status { get; private set; }
-
-        /// <summary>
-        /// Error message
-        /// </summary>
-        public override string Message {
-            get
-            {
-                return _message;
-            }
-        }
-
+            int status,
         [JsonProperty("message")]
-        private string _message
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// More info if provided
-        /// </summary>
+            string message,
+        [JsonProperty("code")]
+            int code,
         [JsonProperty("more_info")]
-        public string MoreInfo { get; private set; }
-
-        /// <summary>
-        /// Details if provided
-        /// </summary>
+            string moreInfo,
         [JsonProperty("details")]
-        public Dictionary<string, object> Details { get; private set; }
-
-        /// <summary>
-        /// Create an empty RestException
-        /// </summary>
-        public RestException() {}
-        private RestException(
-            [JsonProperty("status")]
-            int status,
-            [JsonProperty("message")]
-            string message,
-            [JsonProperty("code")]
-            int code,
-            [JsonProperty("more_info")]
-            string moreInfo,
-            [JsonProperty("details")]
-            Dictionary<string, object> details
-        ) {
-            Status = status;
-            Code = code;
-            _message = message;
-            MoreInfo = moreInfo;
-            Details = details;
-        }
-
-        /// <summary>
-        /// Create a RestException from a JSON payload
-        /// </summary>
-        /// <param name="json">JSON string to parse</param>
-        public static RestException FromJson(string json)
-        {
-            return JsonConvert.DeserializeObject<RestException>(json);
-        }
-    }
+            Dictionary<string, object> details
+    )
+    {
+      Status = status;
+      Code = code;
+      _message = message;
+      MoreInfo = moreInfo;
+      Details = details;
+    }
+
+    /// <summary>
+    /// Create a RestException from a JSON payload
+    /// </summary>
+    /// <param name="json">JSON string to parse</param>
+    public static RestException FromJson(string json)
+    {
+      return JsonConvert.DeserializeObject<RestException>(json);
+    }
+  }
 }
diff --git a/src/Twilio/Exceptions/TwilioException.cs b/src/Twilio/Exceptions/TwilioException.cs
index 0693d62a2..3dd41a86a 100644
--- a/src/Twilio/Exceptions/TwilioException.cs
+++ b/src/Twilio/Exceptions/TwilioException.cs
@@ -1,60 +1,60 @@
 using System;
 
 namespace Twilio.Exceptions
-{
+{
+  /// <summary>
+  /// Base TwilioException
+  /// </summary>
+  public class TwilioException : Exception
+  {
     /// <summary>
-    /// Base TwilioException
+    /// Create an empty TwilioException
     /// </summary>
-    public class TwilioException : Exception
-    {
-        /// <summary>
-        /// Create an empty TwilioException
-        /// </summary>
-        public TwilioException() {}
-
-        /// <summary>
-        /// Create a TwilioException from an error message
-        /// </summary>
-        /// <param name="message">Error message</param>
-        public TwilioException (string message) : base(message) {}
-
-        /// <summary>
-        /// Create a TwilioException from message and another exception
-        /// </summary>
-        /// <param name="message">Error message</param>
-        /// <param name="exception">Original Exception</param>
-        public TwilioException(string message, Exception exception) : base(message, exception) {}
-    }
-
+    public TwilioException() { }
+
     /// <summary>
-    /// Exception related to connection errors
+    /// Create a TwilioException from an error message
     /// </summary>
-    public class ApiConnectionException : TwilioException
-    {
-        /// <summary>
-        /// Create an ApiConnectionException from a message
-        /// </summary>
-        /// <param name="message">Error message</param>
-        public ApiConnectionException(string message) : base(message) {}
-
-        /// <summary>
-        /// Create an ApiConnectionException from a message and another Exception
-        /// </summary>
-        /// <param name="message">Error message</param>
-        /// <param name="exception">Original Exception</param>
-        public ApiConnectionException(string message, Exception exception) : base(message, exception) {}
-    }
-
+    /// <param name="message">Error message</param>
+    public TwilioException(string message) : base(message) { }
+
+    /// <summary>
+    /// Create a TwilioException from message and another exception
+    /// </summary>
+    /// <param name="message">Error message</param>
+    /// <param name="exception">Original Exception</param>
+    public TwilioException(string message, Exception exception) : base(message, exception) { }
+  }
+
+  /// <summary>
+  /// Exception related to connection errors
+  /// </summary>
+  public class ApiConnectionException : TwilioException
+  {
+    /// <summary>
+    /// Create an ApiConnectionException from a message
+    /// </summary>
+    /// <param name="message">Error message</param>
+    public ApiConnectionException(string message) : base(message) { }
+
+    /// <summary>
+    /// Create an ApiConnectionException from a message and another Exception
+    /// </summary>
+    /// <param name="message">Error message</param>
+    /// <param name="exception">Original Exception</param>
+    public ApiConnectionException(string message, Exception exception) : base(message, exception) { }
+  }
+
+  /// <summary>
+  /// Exception related to Authentication Errors
+  /// </summary>
+  public class AuthenticationException : TwilioException
+  {
     /// <summary>
-    /// Exception related to Authentication Errors
+    /// Create AuthenticationException from an error messsage
     /// </summary>
-    public class AuthenticationException : TwilioException
-    {
-        /// <summary>
-        /// Create AuthenticationException from an error messsage
-        /// </summary>
-        /// <param name="message">Error message</param>
-        public AuthenticationException(string message) : base(message) {}
-    }
+    /// <param name="message">Error message</param>
+    public AuthenticationException(string message) : base(message) { }
+  }
 }
 
diff --git a/src/Twilio/Http/HttpClient.cs b/src/Twilio/Http/HttpClient.cs
index 674ab133e..dd01c37d7 100644
--- a/src/Twilio/Http/HttpClient.cs
+++ b/src/Twilio/Http/HttpClient.cs
@@ -1,54 +1,54 @@
 using System;
 
 namespace Twilio.Http
-{
+{
+  /// <summary>
+  /// Base http client used to make Twilio requests
+  /// </summary>
+  public abstract class HttpClient
+  {
     /// <summary>
-    /// Base http client used to make Twilio requests
+    /// The last request made by this client
     /// </summary>
-    public abstract class HttpClient
-    {
-        /// <summary>
-        /// The last request made by this client
-        /// </summary>
-        public Request LastRequest { get; protected set; }
-
-        /// <summary>
-        /// The last response received by this client
-        /// </summary>
-        public Response LastResponse { get; protected set; }
-
-        /// <summary>
-        /// Make a request to Twilio, returns non-2XX responses as well
-        /// </summary>
-        ///
-        /// <param name="request">request to make</param>
-        /// <exception>throws exception on network or connection errors.</exception>
-        /// <returns>response of the request</returns>
-        public abstract Response MakeRequest(Request request);
-
+    public Request LastRequest { get; protected set; }
+
+    /// <summary>
+    /// The last response received by this client
+    /// </summary>
+    public Response LastResponse { get; protected set; }
+
+    /// <summary>
+    /// Make a request to Twilio, returns non-2XX responses as well
+    /// </summary>
+    ///
+    /// <param name="request">request to make</param>
+    /// <exception>throws exception on network or connection errors.</exception>
+    /// <returns>response of the request</returns>
+    public abstract Response MakeRequest(Request request);
+
 #if !NET35
-        /// <summary>
-        /// Make an async request to Twilio, returns non-2XX responses as well
-        /// </summary>
-        ///
-        /// <param name="request">request to make</param>
-        /// <exception>throws exception on network or connection errors.</exception>
-        /// <returns>response of the request</returns>
-        public abstract System.Threading.Tasks.Task<Response> MakeRequestAsync(Request request);
+    /// <summary>
+    /// Make an async request to Twilio, returns non-2XX responses as well
+    /// </summary>
+    ///
+    /// <param name="request">request to make</param>
+    /// <exception>throws exception on network or connection errors.</exception>
+    /// <returns>response of the request</returns>
+    public abstract System.Threading.Tasks.Task<Response> MakeRequestAsync(Request request);
 #endif
-
-        /// <summary>
-        /// Set the authentication string for the request
-        /// </summary>
-        ///
-        /// <param name="username">username of the request</param>
-        /// <param name="password">password of the request</param>
-        /// <returns>authentication string</returns>
-        public string Authentication(string username, string password)
-        {
-            var credentials = username + ":" + password;
-            var encoded = System.Text.Encoding.UTF8.GetBytes(credentials);
-            return Convert.ToBase64String(encoded);
-        }
-    }
+
+    /// <summary>
+    /// Set the authentication string for the request
+    /// </summary>
+    ///
+    /// <param name="username">username of the request</param>
+    /// <param name="password">password of the request</param>
+    /// <returns>authentication string</returns>
+    public string Authentication(string username, string password)
+    {
+      var credentials = username + ":" + password;
+      var encoded = System.Text.Encoding.UTF8.GetBytes(credentials);
+      return Convert.ToBase64String(encoded);
+    }
+  }
 }
diff --git a/src/Twilio/Http/HttpMethod.cs b/src/Twilio/Http/HttpMethod.cs
index ed4e23820..c60a76f68 100644
--- a/src/Twilio/Http/HttpMethod.cs
+++ b/src/Twilio/Http/HttpMethod.cs
@@ -1,93 +1,93 @@
 namespace Twilio.Http
-{
+{
+  /// <summary>
+  /// Represents an HTTP Method
+  /// </summary>
+  public class HttpMethod
+  {
     /// <summary>
-    /// Represents an HTTP Method
+    /// Constant for GET method
     /// </summary>
-    public class HttpMethod
-    {
-        /// <summary>
-        /// Constant for GET method
-        /// </summary>
-        public static readonly HttpMethod Get = new HttpMethod("GET");
-        
-        /// <summary>
-        /// Constant for POST method
-        /// </summary>
-        public static readonly HttpMethod Post = new HttpMethod("POST");
-        
-        /// <summary>
-        /// Constant for PUT method
-        /// </summary>
-        public static readonly HttpMethod Put = new HttpMethod("PUT");
-        
-        /// <summary>
-        /// Constant for DELETE method
-        /// </summary>
-        public static readonly HttpMethod Delete = new HttpMethod("DELETE");
-
-        private readonly string _value;
-
-        /// <summary>
-        /// Create a method from a string
-        /// </summary>
-        /// <param name="method">Method name</param>
-        public HttpMethod(string method)
-        {
-            _value = method.ToUpper();
-        }
-
-        /// <summary>
-        /// Convert from string to HttpMethod
-        /// </summary>
-        /// <param name="value">value to convert</param>
-        public static implicit operator HttpMethod(string value)
-        {
-            return new HttpMethod(value);
-        }
-
-        /// <summary>
-        /// Compare HttpMethod
-        /// </summary>
-        /// <param name="obj">object to compare with</param>
-        /// <returns>true if the HttpMethod are equal; false otherwise</returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj.GetType() != typeof(HttpMethod))
-            {
-                return false;
-            }
-
-            var other = (HttpMethod)obj;
-            return _value == other._value;
-        }
-
-        /// <summary>
-        /// Get the hash code of the HttpMethod
-        /// </summary>
-        /// <returns>the hash code of the HttpMethod</returns>
-        public override int GetHashCode()
-        {
-            unchecked { return _value?.GetHashCode () ?? 0; }
-        }
-
-        /// <summary>
-        /// Get the string representation of the HttpMethod
-        /// </summary>
-        /// <returns>string representation of the HttpMethod</returns>
-        public override string ToString()
-        {
-            return _value;
-        }
-    }
+    public static readonly HttpMethod Get = new HttpMethod("GET");
+
+    /// <summary>
+    /// Constant for POST method
+    /// </summary>
+    public static readonly HttpMethod Post = new HttpMethod("POST");
+
+    /// <summary>
+    /// Constant for PUT method
+    /// </summary>
+    public static readonly HttpMethod Put = new HttpMethod("PUT");
+
+    /// <summary>
+    /// Constant for DELETE method
+    /// </summary>
+    public static readonly HttpMethod Delete = new HttpMethod("DELETE");
+
+    private readonly string _value;
+
+    /// <summary>
+    /// Create a method from a string
+    /// </summary>
+    /// <param name="method">Method name</param>
+    public HttpMethod(string method)
+    {
+      _value = method.ToUpper();
+    }
+
+    /// <summary>
+    /// Convert from string to HttpMethod
+    /// </summary>
+    /// <param name="value">value to convert</param>
+    public static implicit operator HttpMethod(string value)
+    {
+      return new HttpMethod(value);
+    }
+
+    /// <summary>
+    /// Compare HttpMethod
+    /// </summary>
+    /// <param name="obj">object to compare with</param>
+    /// <returns>true if the HttpMethod are equal; false otherwise</returns>
+    public override bool Equals(object obj)
+    {
+      if (obj == null)
+      {
+        return false;
+      }
+
+      if (ReferenceEquals(this, obj))
+      {
+        return true;
+      }
+
+      if (obj.GetType() != typeof(HttpMethod))
+      {
+        return false;
+      }
+
+      var other = (HttpMethod)obj;
+      return _value == other._value;
+    }
+
+    /// <summary>
+    /// Get the hash code of the HttpMethod
+    /// </summary>
+    /// <returns>the hash code of the HttpMethod</returns>
+    public override int GetHashCode()
+    {
+      unchecked { return _value?.GetHashCode() ?? 0; }
+    }
+
+    /// <summary>
+    /// Get the string representation of the HttpMethod
+    /// </summary>
+    /// <returns>string representation of the HttpMethod</returns>
+    public override string ToString()
+    {
+      return _value;
+    }
+  }
 }
 
diff --git a/src/Twilio/Http/Request.cs b/src/Twilio/Http/Request.cs
index 148572885..efa1bab5a 100644
--- a/src/Twilio/Http/Request.cs
+++ b/src/Twilio/Http/Request.cs
@@ -11,274 +11,274 @@
 #endif
 
 namespace Twilio.Http
-{
+{
+  /// <summary>
+  /// Twilio request object
+  /// </summary>
+  public class Request
+  {
+    private static readonly string DEFAULT_REGION = "us1";
+
     /// <summary>
-    /// Twilio request object
+    /// HTTP Method
     /// </summary>
-    public class Request
-    {
-        private static readonly string DEFAULT_REGION = "us1";
-
-        /// <summary>
-        /// HTTP Method
-        /// </summary>
-        public HttpMethod Method { get; }
-
-        public Uri Uri { get; private set; }
-
-        /// <summary>
-        /// Auth username
-        /// </summary>
-        public string Username { get; set; }
-
-        /// <summary>
-        /// Auth password
-        /// </summary>
-        public string Password { get; set; }
-
-        /// <summary>
-        /// Twilio region
-        /// </summary>
-        public string Region { get; set; }
-
-        /// <summary>
-        /// Twilio edge
-        /// </summary>
-        public string Edge { get; set; }
-
-        /// <summary>
-        /// Query params
-        /// </summary>
-        public List<KeyValuePair<string, string>> QueryParams { get; private set; }
-
-        /// <summary>
-        /// Post params
-        /// </summary>
-        public List<KeyValuePair<string, string>> PostParams { get; private set; }
-
-        /// <summary>
-        /// Header params
-        /// </summary>
-        public List<KeyValuePair<string, string>> HeaderParams { get; private set; }
-
-        /// <summary>
-        /// Create a new Twilio request
-        /// </summary>
-        /// <param name="method">HTTP Method</param>
-        /// <param name="url">Request URL</param>
-        public Request(HttpMethod method, string url)
-        {
-            Method = method;
-            Uri = new Uri(url);
-            QueryParams = new List<KeyValuePair<string, string>>();
-            PostParams = new List<KeyValuePair<string, string>>();
-            HeaderParams = new List<KeyValuePair<string, string>>();
-        }
-
-        /// <summary>
-        /// Create a new Twilio request
-        /// </summary>
-        /// <param name="method">HTTP method</param>
-        /// <param name="domain">Twilio subdomain</param>
-        /// <param name="uri">Request URI</param>
-        /// <param name="region">Twilio region</param>
-        /// <param name="queryParams">Query parameters</param>
-        /// <param name="postParams">Post data</param>
-        /// <param name="edge">Twilio edge</param>
-        /// <param name="headerParams">Custom header data</param>
-        public Request(
-            HttpMethod method,
-            Domain domain,
-            string uri,
-            string region = null,
-            List<KeyValuePair<string, string>> queryParams = null,
-            List<KeyValuePair<string, string>> postParams = null,
-            string edge = null,
-            List<KeyValuePair<string, string>> headerParams = null
-        )
-        {
-            Method = method;
-            Uri = new Uri("https://" + domain + ".twilio.com" + uri);
-            Region = region;
-            Edge = edge;
-
-            QueryParams = queryParams ?? new List<KeyValuePair<string, string>>();
-            PostParams = postParams ?? new List<KeyValuePair<string, string>>();
-            HeaderParams = headerParams ?? new List<KeyValuePair<string, string>>();
-        }
-
-        /// <summary>
-        /// Construct the request URL
-        /// </summary>
-        /// <returns>Built URL including query parameters</returns>
-        public Uri ConstructUrl()
-        {
-            var uri = buildUri();
-            return QueryParams.Count > 0 ?
-                new Uri(uri.AbsoluteUri + "?" + EncodeParameters(QueryParams)) :
-                new Uri(uri.AbsoluteUri);
-        }
-
-        public Uri buildUri()
-        {
-            if (Region != null || Edge != null)
-            {
-                var uriBuilder = new UriBuilder(Uri);
-                var pieces = uriBuilder.Host.Split('.');
-                var product = pieces[0];
-                var domain = String.Join(".", pieces.Skip(pieces.Length - 2).ToArray());
-
-                var region = Region;
-                var edge = Edge;
-
-                if (pieces.Length == 4) // product.region.twilio.com
-                {
-                    region = region ?? pieces[1];
-                }
-                else if (pieces.Length == 5) // product.edge.region.twilio.com
-                {
-                    edge = edge ?? pieces[1];
-                    region = region ?? pieces[2];
-                }
-
-                if (edge != null && region == null)
-                    region = DEFAULT_REGION;
-
-                string[] parts = { product, edge, region, domain };
-
-                uriBuilder.Host = String.Join(".", Array.FindAll(parts, part => !string.IsNullOrEmpty(part)));
-                return uriBuilder.Uri;
-            }
-
-            return Uri;
-        }
-
-        /// <summary>
-        /// Set auth for the request
-        /// </summary>
-        /// <param name="username">Auth username</param>
-        /// <param name="password">Auth password</param>
-        public void SetAuth(string username, string password)
-        {
-            Username = username;
-            Password = password;
-        }
-
-        private static string EncodeParameters(IEnumerable<KeyValuePair<string, string>> data)
-        {
-            var result = "";
-            var first = true;
-            foreach (var pair in data)
-            {
-                if (first)
-                {
-                    first = false;
-                }
-                else
-                {
-                    result += "&";
-                }
-
+    public HttpMethod Method { get; }
+
+    public Uri Uri { get; private set; }
+
+    /// <summary>
+    /// Auth username
+    /// </summary>
+    public string Username { get; set; }
+
+    /// <summary>
+    /// Auth password
+    /// </summary>
+    public string Password { get; set; }
+
+    /// <summary>
+    /// Twilio region
+    /// </summary>
+    public string Region { get; set; }
+
+    /// <summary>
+    /// Twilio edge
+    /// </summary>
+    public string Edge { get; set; }
+
+    /// <summary>
+    /// Query params
+    /// </summary>
+    public List<KeyValuePair<string, string>> QueryParams { get; private set; }
+
+    /// <summary>
+    /// Post params
+    /// </summary>
+    public List<KeyValuePair<string, string>> PostParams { get; private set; }
+
+    /// <summary>
+    /// Header params
+    /// </summary>
+    public List<KeyValuePair<string, string>> HeaderParams { get; private set; }
+
+    /// <summary>
+    /// Create a new Twilio request
+    /// </summary>
+    /// <param name="method">HTTP Method</param>
+    /// <param name="url">Request URL</param>
+    public Request(HttpMethod method, string url)
+    {
+      Method = method;
+      Uri = new Uri(url);
+      QueryParams = new List<KeyValuePair<string, string>>();
+      PostParams = new List<KeyValuePair<string, string>>();
+      HeaderParams = new List<KeyValuePair<string, string>>();
+    }
+
+    /// <summary>
+    /// Create a new Twilio request
+    /// </summary>
+    /// <param name="method">HTTP method</param>
+    /// <param name="domain">Twilio subdomain</param>
+    /// <param name="uri">Request URI</param>
+    /// <param name="region">Twilio region</param>
+    /// <param name="queryParams">Query parameters</param>
+    /// <param name="postParams">Post data</param>
+    /// <param name="edge">Twilio edge</param>
+    /// <param name="headerParams">Custom header data</param>
+    public Request(
+        HttpMethod method,
+        Domain domain,
+        string uri,
+        string region = null,
+        List<KeyValuePair<string, string>> queryParams = null,
+        List<KeyValuePair<string, string>> postParams = null,
+        string edge = null,
+        List<KeyValuePair<string, string>> headerParams = null
+    )
+    {
+      Method = method;
+      Uri = new Uri("https://" + domain + ".twilio.com" + uri);
+      Region = region;
+      Edge = edge;
+
+      QueryParams = queryParams ?? new List<KeyValuePair<string, string>>();
+      PostParams = postParams ?? new List<KeyValuePair<string, string>>();
+      HeaderParams = headerParams ?? new List<KeyValuePair<string, string>>();
+    }
+
+    /// <summary>
+    /// Construct the request URL
+    /// </summary>
+    /// <returns>Built URL including query parameters</returns>
+    public Uri ConstructUrl()
+    {
+      var uri = buildUri();
+      return QueryParams.Count > 0 ?
+          new Uri(uri.AbsoluteUri + "?" + EncodeParameters(QueryParams)) :
+          new Uri(uri.AbsoluteUri);
+    }
+
+    public Uri buildUri()
+    {
+      if (Region != null || Edge != null)
+      {
+        var uriBuilder = new UriBuilder(Uri);
+        var pieces = uriBuilder.Host.Split('.');
+        var product = pieces[0];
+        var domain = String.Join(".", pieces.Skip(pieces.Length - 2).ToArray());
+
+        var region = Region;
+        var edge = Edge;
+
+        if (pieces.Length == 4) // product.region.twilio.com
+        {
+          region = region ?? pieces[1];
+        }
+        else if (pieces.Length == 5) // product.edge.region.twilio.com
+        {
+          edge = edge ?? pieces[1];
+          region = region ?? pieces[2];
+        }
+
+        if (edge != null && region == null)
+          region = DEFAULT_REGION;
+
+        string[] parts = { product, edge, region, domain };
+
+        uriBuilder.Host = String.Join(".", Array.FindAll(parts, part => !string.IsNullOrEmpty(part)));
+        return uriBuilder.Uri;
+      }
+
+      return Uri;
+    }
+
+    /// <summary>
+    /// Set auth for the request
+    /// </summary>
+    /// <param name="username">Auth username</param>
+    /// <param name="password">Auth password</param>
+    public void SetAuth(string username, string password)
+    {
+      Username = username;
+      Password = password;
+    }
+
+    private static string EncodeParameters(IEnumerable<KeyValuePair<string, string>> data)
+    {
+      var result = "";
+      var first = true;
+      foreach (var pair in data)
+      {
+        if (first)
+        {
+          first = false;
+        }
+        else
+        {
+          result += "&";
+        }
+
 #if !NET35
-                result += WebUtility.UrlEncode(pair.Key) + "=" + WebUtility.UrlEncode(pair.Value);
+        result += WebUtility.UrlEncode(pair.Key) + "=" + WebUtility.UrlEncode(pair.Value);
 #else
                 result += HttpUtility.UrlEncode(pair.Key) + "=" + HttpUtility.UrlEncode(pair.Value);
 #endif
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Encode POST data for transfer
-        /// </summary>
-        /// <returns>Encoded byte array</returns>
-        public byte[] EncodePostParams()
-        {
-            return Encoding.UTF8.GetBytes(EncodeParameters(PostParams));
-        }
-
-        /// <summary>
-        /// Add query parameter to request
-        /// </summary>
-        /// <param name="name">name of parameter</param>
-        /// <param name="value">value of parameter</param>
-        public void AddQueryParam(string name, string value)
-        {
-            AddParam(QueryParams, name, value);
-        }
-
-        /// <summary>
-        /// Add a parameter to the request payload
-        /// </summary>
-        /// <param name="name">name of parameter</param>
-        /// <param name="value">value of parameter</param>
-        public void AddPostParam(string name, string value)
-        {
-            AddParam(PostParams, name, value);
-        }
-
-        /// <summary>
-        /// Add a header parameter
-        /// </summary>
-        /// <param name="name">name of parameter</param>
-        /// <param name="value">value of parameter</param>
-        public void AddHeaderParam(string name, string value)
-        {
-            AddParam(HeaderParams, name, value);
-        }
-
-        private static void AddParam(ICollection<KeyValuePair<string, string>> list, string name, string value)
-        {
-            list.Add(new KeyValuePair<string, string>(name, value));
-        }
-
-        /// <summary>
-        /// Compare request
-        /// </summary>
-        /// <param name="obj">object to compare to</param>
-        /// <returns>true if requests are equal; false otherwise</returns>
-        public override bool Equals(object obj)
-        {
-            if (obj == null)
-            {
-                return false;
-            }
-
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-            if (obj.GetType() != typeof(Request))
-            {
-                return false;
-            }
-
-            var other = (Request)obj;
-            return Method.Equals(other.Method) &&
-                   buildUri().Equals(other.buildUri()) &&
-                   QueryParams.All(other.QueryParams.Contains) &&
-                   other.QueryParams.All(QueryParams.Contains) &&
-                   PostParams.All(other.PostParams.Contains) &&
-                   other.PostParams.All(PostParams.Contains) &&
-                   HeaderParams.All(other.HeaderParams.Contains) &&
-                   other.HeaderParams.All(HeaderParams.Contains);
-        }
-
-        /// <summary>
-        /// Generate hash code for request
-        /// </summary>
-        /// <returns>generated hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                return (Method?.GetHashCode() ?? 0) ^
-                       (buildUri()?.GetHashCode() ?? 0) ^
-                       (QueryParams?.GetHashCode() ?? 0) ^
-                       (PostParams?.GetHashCode() ?? 0) ^
-                       (HeaderParams?.GetHashCode() ?? 0);
-            }
-        }
-    }
+      }
+
+      return result;
+    }
+
+    /// <summary>
+    /// Encode POST data for transfer
+    /// </summary>
+    /// <returns>Encoded byte array</returns>
+    public byte[] EncodePostParams()
+    {
+      return Encoding.UTF8.GetBytes(EncodeParameters(PostParams));
+    }
+
+    /// <summary>
+    /// Add query parameter to request
+    /// </summary>
+    /// <param name="name">name of parameter</param>
+    /// <param name="value">value of parameter</param>
+    public void AddQueryParam(string name, string value)
+    {
+      AddParam(QueryParams, name, value);
+    }
+
+    /// <summary>
+    /// Add a parameter to the request payload
+    /// </summary>
+    /// <param name="name">name of parameter</param>
+    /// <param name="value">value of parameter</param>
+    public void AddPostParam(string name, string value)
+    {
+      AddParam(PostParams, name, value);
+    }
+
+    /// <summary>
+    /// Add a header parameter
+    /// </summary>
+    /// <param name="name">name of parameter</param>
+    /// <param name="value">value of parameter</param>
+    public void AddHeaderParam(string name, string value)
+    {
+      AddParam(HeaderParams, name, value);
+    }
+
+    private static void AddParam(ICollection<KeyValuePair<string, string>> list, string name, string value)
+    {
+      list.Add(new KeyValuePair<string, string>(name, value));
+    }
+
+    /// <summary>
+    /// Compare request
+    /// </summary>
+    /// <param name="obj">object to compare to</param>
+    /// <returns>true if requests are equal; false otherwise</returns>
+    public override bool Equals(object obj)
+    {
+      if (obj == null)
+      {
+        return false;
+      }
+
+      if (ReferenceEquals(this, obj))
+      {
+        return true;
+      }
+      if (obj.GetType() != typeof(Request))
+      {
+        return false;
+      }
+
+      var other = (Request)obj;
+      return Method.Equals(other.Method) &&
+             buildUri().Equals(other.buildUri()) &&
+             QueryParams.All(other.QueryParams.Contains) &&
+             other.QueryParams.All(QueryParams.Contains) &&
+             PostParams.All(other.PostParams.Contains) &&
+             other.PostParams.All(PostParams.Contains) &&
+             HeaderParams.All(other.HeaderParams.Contains) &&
+             other.HeaderParams.All(HeaderParams.Contains);
+    }
+
+    /// <summary>
+    /// Generate hash code for request
+    /// </summary>
+    /// <returns>generated hash code</returns>
+    public override int GetHashCode()
+    {
+      unchecked
+      {
+        return (Method?.GetHashCode() ?? 0) ^
+               (buildUri()?.GetHashCode() ?? 0) ^
+               (QueryParams?.GetHashCode() ?? 0) ^
+               (PostParams?.GetHashCode() ?? 0) ^
+               (HeaderParams?.GetHashCode() ?? 0);
+      }
+    }
+  }
 }
diff --git a/src/Twilio/Http/Response.cs b/src/Twilio/Http/Response.cs
index 4e19fef1e..dca9d6ff3 100644
--- a/src/Twilio/Http/Response.cs
+++ b/src/Twilio/Http/Response.cs
@@ -7,38 +7,38 @@
 #endif
 
 namespace Twilio.Http
-{
+{
+  /// <summary>
+  /// Twilio response
+  /// </summary>
+  public class Response
+  {
     /// <summary>
-    /// Twilio response
+    /// HTTP status code
     /// </summary>
-    public class Response
-    {
-        /// <summary>
-        /// HTTP status code
-        /// </summary>
-        public HttpStatusCode StatusCode { get; }
-
-        /// <summary>
-        /// Content string
-        /// </summary>
-        public string Content { get; }
-
-        /// <summary>
-        /// Headers
-        /// </summary>
-        public Headers Headers { get; }
-
-        /// <summary>
-        /// Create a new Response
-        /// </summary>
-        /// <param name="statusCode">HTTP status code</param>
-        /// <param name="content">Content string</param>
-        /// <param name="headers">Headers</param>
-        public Response(HttpStatusCode statusCode, string content, Headers headers = null)
-        {
-            StatusCode = statusCode;
-            Content = content;
-            Headers = headers;
-        }
-    }
+    public HttpStatusCode StatusCode { get; }
+
+    /// <summary>
+    /// Content string
+    /// </summary>
+    public string Content { get; }
+
+    /// <summary>
+    /// Headers
+    /// </summary>
+    public Headers Headers { get; }
+
+    /// <summary>
+    /// Create a new Response
+    /// </summary>
+    /// <param name="statusCode">HTTP status code</param>
+    /// <param name="content">Content string</param>
+    /// <param name="headers">Headers</param>
+    public Response(HttpStatusCode statusCode, string content, Headers headers = null)
+    {
+      StatusCode = statusCode;
+      Content = content;
+      Headers = headers;
+    }
+  }
 }
diff --git a/src/Twilio/Http/SystemNetHttpClient.cs b/src/Twilio/Http/SystemNetHttpClient.cs
index 724d4fb62..56251c84c 100644
--- a/src/Twilio/Http/SystemNetHttpClient.cs
+++ b/src/Twilio/Http/SystemNetHttpClient.cs
@@ -1,106 +1,106 @@
-#if !NET35
-using System;
-using System.IO;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-using System.Runtime.InteropServices;
-
-namespace Twilio.Http
-{
-    /// <summary>
-    /// Sample client to make HTTP requests
-    /// </summary>
-    public class SystemNetHttpClient : HttpClient
-    {
-#if NET451
-        private string PlatVersion = " (.NET Framework 4.5.1+)";
-#else
-        private string PlatVersion = $" ({RuntimeInformation.FrameworkDescription})";
-#endif
-
-        private readonly System.Net.Http.HttpClient _httpClient;
-
-        /// <summary>
-        /// Create new HttpClient
-        /// </summary>
-        /// <param name="httpClient">HTTP client to use</param>
-        public SystemNetHttpClient(System.Net.Http.HttpClient httpClient = null)
-        {
-            _httpClient = httpClient ?? new System.Net.Http.HttpClient(new HttpClientHandler() { AllowAutoRedirect = false });
-        }
-
-        /// <summary>
-        /// Make a synchronous request
-        /// </summary>
-        /// <param name="request">Twilio request</param>
-        /// <returns>Twilio response</returns>
-        public override Response MakeRequest(Request request)
-        {
-            try
-            {
-                var task = MakeRequestAsync(request);
-                task.Wait();
-                return task.Result;
-            }
-            catch (AggregateException ae)
-            {
-                // Combine nested AggregateExceptions
-                ae = ae.Flatten();
-                throw ae.InnerExceptions[0];
-            }
-        }
-
-        /// <summary>
-        /// Make an asynchronous request
-        /// </summary>
-        /// <param name="request">Twilio response</param>
-        /// <returns>Task that resolves to the response</returns>
-        public override async Task<Response> MakeRequestAsync(Request request)
-        {
-            var httpRequest = BuildHttpRequest(request);
-            if (!Equals(request.Method, HttpMethod.Get))
-            {
-                httpRequest.Content = new FormUrlEncodedContent(request.PostParams);
-            }
-
-            this.LastRequest = request;
-            this.LastResponse = null;
-
-            var httpResponse = await _httpClient.SendAsync(httpRequest).ConfigureAwait(false);
-            var reader = new StreamReader(await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false));
-
-            // Create and return a new Response. Keep a reference to the last
-            // response for debugging, but don't return it as it may be shared
-            // among threads.
-            var response = new Response(httpResponse.StatusCode, await reader.ReadToEndAsync().ConfigureAwait(false), httpResponse.Headers);
-            this.LastResponse = response;
-            return response;
-        }
-
-        private HttpRequestMessage BuildHttpRequest(Request request)
-        {
-            var httpRequest = new HttpRequestMessage(
-                new System.Net.Http.HttpMethod(request.Method.ToString()),
-                request.ConstructUrl()
-            );
-
-            var authBytes = Authentication(request.Username, request.Password);
-            httpRequest.Headers.Authorization = new AuthenticationHeaderValue("Basic", authBytes);
-
-            httpRequest.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-            httpRequest.Headers.AcceptEncoding.Add(new StringWithQualityHeaderValue("utf-8"));
-
-            var libraryVersion = "twilio-csharp/" + AssemblyInfomation.AssemblyInformationalVersion + PlatVersion;
-            httpRequest.Headers.TryAddWithoutValidation("User-Agent", libraryVersion);
-
-            foreach (var header in request.HeaderParams)
-            {
-                httpRequest.Headers.TryAddWithoutValidation(header.Key, header.Value);
-            }
-
-            return httpRequest;
-        }
-    }
-}
-#endif
+#if !NET35
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using System.Runtime.InteropServices;
+
+namespace Twilio.Http
+{
+  /// <summary>
+  /// Sample client to make HTTP requests
+  /// </summary>
+  public class SystemNetHttpClient : HttpClient
+  {
+#if NET451
+        private string PlatVersion = " (.NET Framework 4.5.1+)";
+#else
+    private string PlatVersion = $" ({RuntimeInformation.FrameworkDescription})";
+#endif
+
+    private readonly System.Net.Http.HttpClient _httpClient;
+
+    /// <summary>
+    /// Create new HttpClient
+    /// </summary>
+    /// <param name="httpClient">HTTP client to use</param>
+    public SystemNetHttpClient(System.Net.Http.HttpClient httpClient = null)
+    {
+      _httpClient = httpClient ?? new System.Net.Http.HttpClient(new HttpClientHandler() { AllowAutoRedirect = false });
+    }
+
+    /// <summary>
+    /// Make a synchronous request
+    /// </summary>
+    /// <param name="request">Twilio request</param>
+    /// <returns>Twilio response</returns>
+    public override Response MakeRequest(Request request)
+    {
+      try
+      {
+        var task = MakeRequestAsync(request);
+        task.Wait();
+        return task.Result;
+      }
+      catch (AggregateException ae)
+      {
+        // Combine nested AggregateExceptions
+        ae = ae.Flatten();
+        throw ae.InnerExceptions[0];
+      }
+    }
+
+    /// <summary>
+    /// Make an asynchronous request
+    /// </summary>
+    /// <param name="request">Twilio response</param>
+    /// <returns>Task that resolves to the response</returns>
+    public override async Task<Response> MakeRequestAsync(Request request)
+    {
+      var httpRequest = BuildHttpRequest(request);
+      if (!Equals(request.Method, HttpMethod.Get))
+      {
+        httpRequest.Content = new FormUrlEncodedContent(request.PostParams);
+      }
+
+      this.LastRequest = request;
+      this.LastResponse = null;
+
+      var httpResponse = await _httpClient.SendAsync(httpRequest).ConfigureAwait(false);
+      var reader = new StreamReader(await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false));
+
+      // Create and return a new Response. Keep a reference to the last
+      // response for debugging, but don't return it as it may be shared
+      // among threads.
+      var response = new Response(httpResponse.StatusCode, await reader.ReadToEndAsync().ConfigureAwait(false), httpResponse.Headers);
+      this.LastResponse = response;
+      return response;
+    }
+
+    private HttpRequestMessage BuildHttpRequest(Request request)
+    {
+      var httpRequest = new HttpRequestMessage(
+          new System.Net.Http.HttpMethod(request.Method.ToString()),
+          request.ConstructUrl()
+      );
+
+      var authBytes = Authentication(request.Username, request.Password);
+      httpRequest.Headers.Authorization = new AuthenticationHeaderValue("Basic", authBytes);
+
+      httpRequest.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+      httpRequest.Headers.AcceptEncoding.Add(new StringWithQualityHeaderValue("utf-8"));
+
+      var libraryVersion = "twilio-csharp/" + AssemblyInfomation.AssemblyInformationalVersion + PlatVersion;
+      httpRequest.Headers.TryAddWithoutValidation("User-Agent", libraryVersion);
+
+      foreach (var header in request.HeaderParams)
+      {
+        httpRequest.Headers.TryAddWithoutValidation(header.Key, header.Value);
+      }
+
+      return httpRequest;
+    }
+  }
+}
+#endif
diff --git a/src/Twilio/JWT/AccessToken/ChatGrant.cs b/src/Twilio/JWT/AccessToken/ChatGrant.cs
index bc3e57221..d7eb05817 100644
--- a/src/Twilio/JWT/AccessToken/ChatGrant.cs
+++ b/src/Twilio/JWT/AccessToken/ChatGrant.cs
@@ -1,76 +1,76 @@
 using System.Collections.Generic;
 
 namespace Twilio.Jwt.AccessToken
-{
+{
+  /// <summary>
+  /// Grant to use for Twilio Chat
+  /// </summary>
+  public class ChatGrant : IGrant
+  {
     /// <summary>
-    /// Grant to use for Twilio Chat
+    /// Service SID
     /// </summary>
-    public class ChatGrant : IGrant
-    {
-        /// <summary>
-        /// Service SID
-        /// </summary>
-        public string ServiceSid { get; set; }
-        
-        /// <summary>
-        /// Endpoint ID
-        /// </summary>
-        public string EndpointId { get; set; }
-        
-        /// <summary>
-        /// Deployment role SID
-        /// </summary>
-        public string DeploymentRoleSid { get; set; }
-        
-        /// <summary>
-        /// Push credential SID
-        /// </summary>
-        public string PushCredentialSid { get; set; }
-
-        /// <summary>
-        /// Get the grant name
-        /// </summary>
-        ///
-        /// <returns>name of the grant</returns>
-        public string Key
-        {
-            get
-            {
-                return "chat";
-            }
-        }
-
-        /// <summary>
-        /// Get the grant payload
-        /// </summary>
-        ///
-        /// <returns>payload of the grant</returns>
-        public object Payload
-        {
-            get
-            {
-                var payload = new Dictionary<string, string>();
-
-                if (ServiceSid != null)
-                {
-                    payload.Add("service_sid", ServiceSid);
-                }
-                if (EndpointId != null)
-                {
-                    payload.Add("endpoint_id", EndpointId);
-                }
-                if (DeploymentRoleSid != null)
-                {
-                    payload.Add("deployment_role_sid", DeploymentRoleSid);
-                }
-                if (PushCredentialSid != null)
-                {
-                    payload.Add("push_credential_sid", PushCredentialSid);
-                }
-
-                return payload;
-            }
-        }
-
-    }
+    public string ServiceSid { get; set; }
+
+    /// <summary>
+    /// Endpoint ID
+    /// </summary>
+    public string EndpointId { get; set; }
+
+    /// <summary>
+    /// Deployment role SID
+    /// </summary>
+    public string DeploymentRoleSid { get; set; }
+
+    /// <summary>
+    /// Push credential SID
+    /// </summary>
+    public string PushCredentialSid { get; set; }
+
+    /// <summary>
+    /// Get the grant name
+    /// </summary>
+    ///
+    /// <returns>name of the grant</returns>
+    public string Key
+    {
+      get
+      {
+        return "chat";
+      }
+    }
+
+    /// <summary>
+    /// Get the grant payload
+    /// </summary>
+    ///
+    /// <returns>payload of the grant</returns>
+    public object Payload
+    {
+      get
+      {
+        var payload = new Dictionary<string, string>();
+
+        if (ServiceSid != null)
+        {
+          payload.Add("service_sid", ServiceSid);
+        }
+        if (EndpointId != null)
+        {
+          payload.Add("endpoint_id", EndpointId);
+        }
+        if (DeploymentRoleSid != null)
+        {
+          payload.Add("deployment_role_sid", DeploymentRoleSid);
+        }
+        if (PushCredentialSid != null)
+        {
+          payload.Add("push_credential_sid", PushCredentialSid);
+        }
+
+        return payload;
+      }
+    }
+
+  }
 }
diff --git a/src/Twilio/JWT/AccessToken/ConversationsGrant.cs b/src/Twilio/JWT/AccessToken/ConversationsGrant.cs
index 4f13c7784..aa6390eb2 100644
--- a/src/Twilio/JWT/AccessToken/ConversationsGrant.cs
+++ b/src/Twilio/JWT/AccessToken/ConversationsGrant.cs
@@ -2,47 +2,47 @@
 
 namespace Twilio.Jwt.AccessToken
 {
+  /// <summary>
+  /// Grant to use for Twilio Conversations
+  /// </summary>
+  [System.Obsolete("ConversationsGrant is deprecated, use VideoGrant instead")]
+  public class ConversationsGrant : IGrant
+  {
     /// <summary>
-    /// Grant to use for Twilio Conversations
+    /// Configuration profile SID for the grant
     /// </summary>
-    [System.Obsolete("ConversationsGrant is deprecated, use VideoGrant instead")]
-    public class ConversationsGrant : IGrant
+    public string ConfigurationProfileSid { get; set; }
+
+    /// <summary>
+    /// Get the grant key
+    /// </summary>
+    ///
+    /// <returns>grant key</returns>
+    public string Key
     {
-        /// <summary>
-        /// Configuration profile SID for the grant
-        /// </summary>
-        public string ConfigurationProfileSid { get; set; }
+      get
+      {
+        return "rtc";
+      }
+    }
 
-        /// <summary>
-        /// Get the grant key
-        /// </summary>
-        ///
-        /// <returns>grant key</returns>
-        public string Key
+    /// <summary>
+    /// Get the grant payload
+    /// </summary>
+    ///
+    /// <returns>grant payload</returns>
+    public object Payload
+    {
+      get
+      {
+        var payload = new Dictionary<string, string>();
+        if (ConfigurationProfileSid != null)
         {
-            get
-            {
-                return "rtc";
-            }
+          payload.Add("configuration_profile_sid", ConfigurationProfileSid);
         }
 
-        /// <summary>
-        /// Get the grant payload
-        /// </summary>
-        ///
-        /// <returns>grant payload</returns>
-        public object Payload
-        {
-            get
-            {
-                var payload = new Dictionary<string, string>();
-                if (ConfigurationProfileSid != null)
-                {
-                    payload.Add("configuration_profile_sid", ConfigurationProfileSid);
-                }
-
-                return payload;
-            }
-        }
+        return payload;
+      }
     }
+  }
 }
diff --git a/src/Twilio/JWT/AccessToken/IGrant.cs b/src/Twilio/JWT/AccessToken/IGrant.cs
index 179beac30..2644f03b7 100644
--- a/src/Twilio/JWT/AccessToken/IGrant.cs
+++ b/src/Twilio/JWT/AccessToken/IGrant.cs
@@ -1,22 +1,22 @@
 namespace Twilio.Jwt.AccessToken
 {
+  /// <summary>
+  /// Grant used in Access Tokens
+  /// </summary>
+  public interface IGrant
+  {
     /// <summary>
-    /// Grant used in Access Tokens
+    /// Get the name of the grant.
     /// </summary>
-    public interface IGrant
-    {
-        /// <summary>
-        /// Get the name of the grant.
-        /// </summary>
-        ///
-        /// <returns>String - the name of the grant</returns>
-        string Key { get; }
+    ///
+    /// <returns>String - the name of the grant</returns>
+    string Key { get; }
 
-        /// <summary>
-        /// Get the data of the grant
-        /// </summary>
-        ///
-        /// <returns>Object - the data of the grant</returns>
-        object Payload { get; }
-    }
+    /// <summary>
+    /// Get the data of the grant
+    /// </summary>
+    ///
+    /// <returns>Object - the data of the grant</returns>
+    object Payload { get; }
+  }
 }
diff --git a/src/Twilio/JWT/AccessToken/IpMessagingGrant.cs b/src/Twilio/JWT/AccessToken/IpMessagingGrant.cs
index 06b95fb78..7aac3fdb2 100644
--- a/src/Twilio/JWT/AccessToken/IpMessagingGrant.cs
+++ b/src/Twilio/JWT/AccessToken/IpMessagingGrant.cs
@@ -2,76 +2,76 @@
 
 namespace Twilio.Jwt.AccessToken
 {
+  /// <summary>
+  /// Grant to use for IP Messaging
+  /// </summary>
+  [System.Obsolete("IpMessagingGrant is deprecated, use ChatGrant instead")]
+  public class IpMessagingGrant : IGrant
+  {
     /// <summary>
-    /// Grant to use for IP Messaging
+    /// Service SID
     /// </summary>
-    [System.Obsolete("IpMessagingGrant is deprecated, use ChatGrant instead")]
-    public class IpMessagingGrant : IGrant
+    public string ServiceSid { get; set; }
+
+    /// <summary>
+    /// Endpoint ID
+    /// </summary>
+    public string EndpointId { get; set; }
+
+    /// <summary>
+    /// Deployment role SID
+    /// </summary>
+    public string DeploymentRoleSid { get; set; }
+
+    /// <summary>
+    /// Push credential SID
+    /// </summary>
+    public string PushCredentialSid { get; set; }
+
+    /// <summary>
+    /// Get the grant name
+    /// </summary>
+    ///
+    /// <returns>name of the grant</returns>
+    public string Key
     {
-        /// <summary>
-        /// Service SID
-        /// </summary>
-        public string ServiceSid { get; set; }
-        
-        /// <summary>
-        /// Endpoint ID
-        /// </summary>
-        public string EndpointId { get; set; }
-        
-        /// <summary>
-        /// Deployment role SID
-        /// </summary>
-        public string DeploymentRoleSid { get; set; }
-        
-        /// <summary>
-        /// Push credential SID
-        /// </summary>
-        public string PushCredentialSid { get; set; }
+      get
+      {
+        return "ip_messaging";
+      }
+    }
 
-        /// <summary>
-        /// Get the grant name
-        /// </summary>
-        ///
-        /// <returns>name of the grant</returns>
-        public string Key
+    /// <summary>
+    /// Get the grant payload
+    /// </summary>
+    ///
+    /// <returns>payload of the grant</returns>
+    public object Payload
+    {
+      get
+      {
+        var payload = new Dictionary<string, string>();
+
+        if (ServiceSid != null)
         {
-            get
-            {
-                return "ip_messaging";
-            }
+          payload.Add("service_sid", ServiceSid);
         }
-
-        /// <summary>
-        /// Get the grant payload
-        /// </summary>
-        ///
-        /// <returns>payload of the grant</returns>
-        public object Payload
+        if (EndpointId != null)
         {
-            get
-            {
-                var payload = new Dictionary<string, string>();
-
-                if (ServiceSid != null)
-                {
-                    payload.Add("service_sid", ServiceSid);
-                }
-                if (EndpointId != null)
-                {
-                    payload.Add("endpoint_id", EndpointId);
-                }
-                if (DeploymentRoleSid != null)
-                {
-                    payload.Add("deployment_role_sid", DeploymentRoleSid);
-                }
-                if (PushCredentialSid != null)
-                {
-                    payload.Add("push_credential_sid", PushCredentialSid);
-                }
-
-                return payload;
-            }
+          payload.Add("endpoint_id", EndpointId);
+        }
+        if (DeploymentRoleSid != null)
+        {
+          payload.Add("deployment_role_sid", DeploymentRoleSid);
+        }
+        if (PushCredentialSid != null)
+        {
+          payload.Add("push_credential_sid", PushCredentialSid);
         }
 
+        return payload;
+      }
     }
+
+  }
 }
diff --git a/src/Twilio/JWT/AccessToken/PlaybackGrant.cs b/src/Twilio/JWT/AccessToken/PlaybackGrant.cs
index 067beb400..5a7e7dc68 100644
--- a/src/Twilio/JWT/AccessToken/PlaybackGrant.cs
+++ b/src/Twilio/JWT/AccessToken/PlaybackGrant.cs
@@ -1,41 +1,41 @@
 using System.Collections.Generic;
 
 namespace Twilio.Jwt.AccessToken
-{
+{
+  /// <summary>
+  /// Grant to expose Twilio Live
+  /// </summary>
+  public class PlaybackGrant : IGrant
+  {
     /// <summary>
-    /// Grant to expose Twilio Live
+    /// Grant payload
     /// </summary>
-    public class PlaybackGrant : IGrant
-    {
-        /// <summary>
-        /// Grant payload
-        /// </summary>
-        public Dictionary<string, object> Grant { get; set; }
-
-        /// <summary>
-        /// Get the playback grant key
-        /// </summary>
-        ///
-        /// <returns>the playback grant key</returns>
-        public string Key
-        {
-            get
-            {
-                return "player";
-            }
-        }
-
-        /// <summary>
-        /// Get the playback grant payload
-        /// </summary>
-        ///
-        /// <returns>the video grant payload</returns>
-        public object Payload
-        {
-            get
-            {
-                return Grant;
-            }
-        }
-    }
+    public Dictionary<string, object> Grant { get; set; }
+
+    /// <summary>
+    /// Get the playback grant key
+    /// </summary>
+    ///
+    /// <returns>the playback grant key</returns>
+    public string Key
+    {
+      get
+      {
+        return "player";
+      }
+    }
+
+    /// <summary>
+    /// Get the playback grant payload
+    /// </summary>
+    ///
+    /// <returns>the video grant payload</returns>
+    public object Payload
+    {
+      get
+      {
+        return Grant;
+      }
+    }
+  }
 }
diff --git a/src/Twilio/JWT/AccessToken/SyncGrant.cs b/src/Twilio/JWT/AccessToken/SyncGrant.cs
index 81ab11ae1..47e9266fa 100755
--- a/src/Twilio/JWT/AccessToken/SyncGrant.cs
+++ b/src/Twilio/JWT/AccessToken/SyncGrant.cs
@@ -2,57 +2,57 @@
 
 namespace Twilio.Jwt.AccessToken
 {
+  /// <summary>
+  /// Grant for Twilio Sync
+  /// </summary>
+  public class SyncGrant : IGrant
+  {
     /// <summary>
-    /// Grant for Twilio Sync
+    /// Sync service SID
     /// </summary>
-    public class SyncGrant : IGrant
+    public string ServiceSid { get; set; }
+
+    /// <summary>
+    /// Endpoint ID
+    /// </summary>
+    public string EndpointId { get; set; }
+
+    /// <summary>
+    /// Get the grant key
+    /// </summary>
+    ///
+    /// <returns>the grant key</returns>
+    public string Key
     {
-        /// <summary>
-        /// Sync service SID
-        /// </summary>
-        public string ServiceSid { get; set; }
-        
-        /// <summary>
-        /// Endpoint ID
-        /// </summary>
-        public string EndpointId { get; set; }
+      get
+      {
+        return "data_sync";
+      }
+    }
 
-        /// <summary>
-        /// Get the grant key
-        /// </summary>
-        ///
-        /// <returns>the grant key</returns>
-        public string Key
+    /// <summary>
+    /// Get the grant payload
+    /// </summary>
+    ///
+    /// <returns>the grant payload</returns>
+    public object Payload
+    {
+      get
+      {
+        var payload = new Dictionary<string, string>();
+
+        if (ServiceSid != null)
         {
-            get
-            {
-                return "data_sync";
-            }
+          payload.Add("service_sid", ServiceSid);
         }
 
-        /// <summary>
-        /// Get the grant payload
-        /// </summary>
-        ///
-        /// <returns>the grant payload</returns>
-        public object Payload
+        if (EndpointId != null)
         {
-            get
-            {
-                var payload = new Dictionary<string, string>();
-
-                if (ServiceSid != null)
-                {
-                    payload.Add("service_sid", ServiceSid);
-                }
-
-                if (EndpointId != null)
-                {
-                    payload.Add("endpoint_id", EndpointId);
-                }
-
-                return payload;
-            }
+          payload.Add("endpoint_id", EndpointId);
         }
+
+        return payload;
+      }
     }
+  }
 }
diff --git a/src/Twilio/JWT/AccessToken/Token.cs b/src/Twilio/JWT/AccessToken/Token.cs
index 0786ed39b..11372e9d6 100644
--- a/src/Twilio/JWT/AccessToken/Token.cs
+++ b/src/Twilio/JWT/AccessToken/Token.cs
@@ -2,137 +2,137 @@
 using System.Collections.Generic;
 
 namespace Twilio.Jwt.AccessToken
-{
+{
+  /// <summary>
+  /// Access Token for Twilio resources
+  /// </summary>
+  public class Token : BaseJwt
+  {
+    private readonly string _id;
+    private readonly string _accountSid;
+    private readonly string _identity;
+    private readonly DateTime? _nbf;
+    private readonly HashSet<IGrant> _grants;
+    private readonly string _region;
+
     /// <summary>
-    /// Access Token for Twilio resources
+    /// Create a new Access Token
     /// </summary>
-    public class Token : BaseJwt
-    {
-        private readonly string _id;
-        private readonly string _accountSid;
-        private readonly string _identity;
-        private readonly DateTime? _nbf;
-        private readonly HashSet<IGrant> _grants;
-        private readonly string _region;
-
-        /// <summary>
-        /// Create a new Access Token
-        /// </summary>
-        /// <param name="accountSid">Account SID</param>
-        /// <param name="signingKeySid">Signing key SID</param>
-        /// <param name="secret">Secret to encode with</param>
-        /// <param name="identity">Token identity</param>
-        /// <param name="expiration">Token expiration</param>
-        /// <param name="nbf">Token nbf</param>
-        /// <param name="grants">Token grants</param>
-        /// <param name="region">Token region</param>
-        public Token(
-            string accountSid,
-            string signingKeySid,
-            string secret,
-            string identity = null,
-            DateTime? expiration = null,
-            DateTime? nbf = null,
-            HashSet<IGrant> grants = null,
-            string region = null
-        ) : base(secret, signingKeySid, expiration.HasValue ? expiration.Value : DateTime.UtcNow.AddSeconds(3600))
-        {
-            var now = BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow);
-            this._id = signingKeySid + "-" + now;
-            this._accountSid = accountSid;
-            this._identity = identity;
-            this._nbf = nbf;
-            this._grants = grants;
-            this._region = region;
-        }
-
-        /// <summary>
-        /// Token ID
-        /// </summary>
-        public override string Id
-        {
-            get
-            {
-                return _id;
-            }
-        }
-
-        /// <summary>
-        /// Access token subject
-        /// </summary>
-        public override string Subject
-        {
-            get
-            {
-                return _accountSid;
-            }
-        }
-
-        /// <summary>
-        /// Token not before time
-        /// </summary>
-        public override DateTime? Nbf
-        {
-            get
-            {
-                return _nbf;
-            }
-        }
-
-        /// <summary>
-        /// The region associated with this account
-        /// </summary>
-        public string Region
-        {
-            get
-            {
-                return _region;
-            }
-        }
-
-        /// <summary>
-        /// Headers for an Access Token
-        /// </summary>
-        public override Dictionary<string, object> Headers
-        {
-            get
-            {
-                var headers = new Dictionary<string, object> { { "cty", "twilio-fpa;v=1" } };
-
-                if (_region != null)
-                {
-                    headers.Add("twr", _region);
-                }
-
-                return headers;
-            }
-        }
-
-        /// <summary>
-        /// Populate claims for the Access Token
-        /// </summary>
-        /// <returns></returns>
-        public override Dictionary<string, object> Claims
-        {
-            get
-            {
-                var grants = new Dictionary<string, object>();
-                if (_identity != null)
-                {
-                    grants.Add("identity", _identity);
-                }
-
-                if (_grants != null)
-                {
-                    foreach (var grant in _grants)
-                    {
-                        grants.Add(grant.Key, grant.Payload);
-                    }
-                }
-
-                return new Dictionary<string, object> { { "grants", grants } };
-            }
-        }
-
-    }
+    /// <param name="accountSid">Account SID</param>
+    /// <param name="signingKeySid">Signing key SID</param>
+    /// <param name="secret">Secret to encode with</param>
+    /// <param name="identity">Token identity</param>
+    /// <param name="expiration">Token expiration</param>
+    /// <param name="nbf">Token nbf</param>
+    /// <param name="grants">Token grants</param>
+    /// <param name="region">Token region</param>
+    public Token(
+        string accountSid,
+        string signingKeySid,
+        string secret,
+        string identity = null,
+        DateTime? expiration = null,
+        DateTime? nbf = null,
+        HashSet<IGrant> grants = null,
+        string region = null
+    ) : base(secret, signingKeySid, expiration.HasValue ? expiration.Value : DateTime.UtcNow.AddSeconds(3600))
+    {
+      var now = BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow);
+      this._id = signingKeySid + "-" + now;
+      this._accountSid = accountSid;
+      this._identity = identity;
+      this._nbf = nbf;
+      this._grants = grants;
+      this._region = region;
+    }
+
+    /// <summary>
+    /// Token ID
+    /// </summary>
+    public override string Id
+    {
+      get
+      {
+        return _id;
+      }
+    }
+
+    /// <summary>
+    /// Access token subject
+    /// </summary>
+    public override string Subject
+    {
+      get
+      {
+        return _accountSid;
+      }
+    }
+
+    /// <summary>
+    /// Token not before time
+    /// </summary>
+    public override DateTime? Nbf
+    {
+      get
+      {
+        return _nbf;
+      }
+    }
+
+    /// <summary>
+    /// The region associated with this account
+    /// </summary>
+    public string Region
+    {
+      get
+      {
+        return _region;
+      }
+    }
+
+    /// <summary>
+    /// Headers for an Access Token
+    /// </summary>
+    public override Dictionary<string, object> Headers
+    {
+      get
+      {
+        var headers = new Dictionary<string, object> { { "cty", "twilio-fpa;v=1" } };
+
+        if (_region != null)
+        {
+          headers.Add("twr", _region);
+        }
+
+        return headers;
+      }
+    }
+
+    /// <summary>
+    /// Populate claims for the Access Token
+    /// </summary>
+    /// <returns></returns>
+    public override Dictionary<string, object> Claims
+    {
+      get
+      {
+        var grants = new Dictionary<string, object>();
+        if (_identity != null)
+        {
+          grants.Add("identity", _identity);
+        }
+
+        if (_grants != null)
+        {
+          foreach (var grant in _grants)
+          {
+            grants.Add(grant.Key, grant.Payload);
+          }
+        }
+
+        return new Dictionary<string, object> { { "grants", grants } };
+      }
+    }
+
+  }
 }
diff --git a/src/Twilio/JWT/AccessToken/VideoGrant.cs b/src/Twilio/JWT/AccessToken/VideoGrant.cs
index 75d64b755..d122df2ab 100644
--- a/src/Twilio/JWT/AccessToken/VideoGrant.cs
+++ b/src/Twilio/JWT/AccessToken/VideoGrant.cs
@@ -1,57 +1,57 @@
-using System.Collections.Generic;
-
-namespace Twilio.Jwt.AccessToken
-{
-    /// <summary>
-    /// Grant to expose Twilio Video
-    /// </summary>
-    public class VideoGrant : IGrant
-    {
-        /// <summary>
-        /// Configuration profile SID
-        /// </summary>
-        [System.Obsolete("ConfigurationProfileSid is deprecated, use Room instead")]
-        public string ConfigurationProfileSid { get; set; }
-
-        /// <summary>
-        /// Roome SID or name
-        /// </summary>
-        public string Room { get; set; }
-
-        /// <summary>
-        /// Get the Video grant key
-        /// </summary>
-        ///
-        /// <returns>the video grant key</returns>
-        public string Key
-        {
-            get
-            {
-                return "video";
-            }
-        }
-
-        /// <summary>
-        /// Get the video grant payload
-        /// </summary>
-        ///
-        /// <returns>the video grant payload</returns>
-        public object Payload
-        {
-            get
-            {
-                var payload = new Dictionary<string, object>();
-                if (ConfigurationProfileSid != null)
-                {
-                    payload.Add("configuration_profile_sid", ConfigurationProfileSid);
-                }
-                if (Room != null)
-                {
-                    payload.Add("room", Room);
-                }
-
-                return payload;
-            }
-        }
-    }
-}
+using System.Collections.Generic;
+
+namespace Twilio.Jwt.AccessToken
+{
+  /// <summary>
+  /// Grant to expose Twilio Video
+  /// </summary>
+  public class VideoGrant : IGrant
+  {
+    /// <summary>
+    /// Configuration profile SID
+    /// </summary>
+    [System.Obsolete("ConfigurationProfileSid is deprecated, use Room instead")]
+    public string ConfigurationProfileSid { get; set; }
+
+    /// <summary>
+    /// Roome SID or name
+    /// </summary>
+    public string Room { get; set; }
+
+    /// <summary>
+    /// Get the Video grant key
+    /// </summary>
+    ///
+    /// <returns>the video grant key</returns>
+    public string Key
+    {
+      get
+      {
+        return "video";
+      }
+    }
+
+    /// <summary>
+    /// Get the video grant payload
+    /// </summary>
+    ///
+    /// <returns>the video grant payload</returns>
+    public object Payload
+    {
+      get
+      {
+        var payload = new Dictionary<string, object>();
+        if (ConfigurationProfileSid != null)
+        {
+          payload.Add("configuration_profile_sid", ConfigurationProfileSid);
+        }
+        if (Room != null)
+        {
+          payload.Add("room", Room);
+        }
+
+        return payload;
+      }
+    }
+  }
+}
diff --git a/src/Twilio/JWT/AccessToken/VoiceGrant.cs b/src/Twilio/JWT/AccessToken/VoiceGrant.cs
index 360c1bdbd..3a2e40c98 100644
--- a/src/Twilio/JWT/AccessToken/VoiceGrant.cs
+++ b/src/Twilio/JWT/AccessToken/VoiceGrant.cs
@@ -1,89 +1,89 @@
 using System.Collections.Generic;
 
 namespace Twilio.Jwt.AccessToken
-{
+{
+  /// <summary>
+  /// Grant to expose Twilio Voice
+  /// </summary>
+  public class VoiceGrant : IGrant
+  {
     /// <summary>
-    /// Grant to expose Twilio Voice
+    /// Whether incoming connections are allowed (JS Client)
     /// </summary>
-    public class VoiceGrant : IGrant
-    {
-        /// <summary>
-        /// Whether incoming connections are allowed (JS Client)
-        /// </summary>
-        public bool IncomingAllow { get; set; }
-
-        /// <summary>
-        /// Outgoing application SID
-        /// </summary>
-        public string OutgoingApplicationSid { get; set; }
-
-        /// <summary>
-        /// Parameters to send to the outgoing application
-        /// </summary>
-        public Dictionary<string, string> OutgoingApplicationParams { get; set; }
-
-        /// <summary>
-        /// Push credential SID
-        /// </summary>
-        public string PushCredentialSid { get; set; }
-
-        /// <summary>
-        /// Endpoint ID
-        /// </summary>
-        public string EndpointId { get; set; }
-
-        /// <summary>
-        /// Get the grant key
-        /// </summary>
-        ///
-        /// <returns>the grant key</returns>
-        public string Key
-        {
-            get
-            {
-                return "voice";
-            }
-        }
-
-        /// <summary>
-        /// Get the grant payload
-        /// </summary>
-        ///
-        /// <returns>the grant payload</returns>
-        public object Payload
-        {
-            get
-            {
-                var payload = new Dictionary<string, object>();
-                if (IncomingAllow == true)
-                {
-                    var incoming = new Dictionary<string, object> { { "allow", true } };
-                    payload.Add("incoming", incoming);
-                }
-
-                if (OutgoingApplicationSid != null)
-                {
-                    var outgoing = new Dictionary<string, object> { { "application_sid", OutgoingApplicationSid } };
-                    if (OutgoingApplicationParams != null)
-                    {
-                        outgoing.Add("params", OutgoingApplicationParams);
-                    }
-
-                    payload.Add("outgoing", outgoing);
-                }
-
-                if (PushCredentialSid != null)
-                {
-                    payload.Add("push_credential_sid", PushCredentialSid);
-                }
-
-                if (EndpointId != null)
-                {
-                    payload.Add("endpoint_id", EndpointId);
-                }
-
-                return payload;
-            }
-        }
-    }
+    public bool IncomingAllow { get; set; }
+
+    /// <summary>
+    /// Outgoing application SID
+    /// </summary>
+    public string OutgoingApplicationSid { get; set; }
+
+    /// <summary>
+    /// Parameters to send to the outgoing application
+    /// </summary>
+    public Dictionary<string, string> OutgoingApplicationParams { get; set; }
+
+    /// <summary>
+    /// Push credential SID
+    /// </summary>
+    public string PushCredentialSid { get; set; }
+
+    /// <summary>
+    /// Endpoint ID
+    /// </summary>
+    public string EndpointId { get; set; }
+
+    /// <summary>
+    /// Get the grant key
+    /// </summary>
+    ///
+    /// <returns>the grant key</returns>
+    public string Key
+    {
+      get
+      {
+        return "voice";
+      }
+    }
+
+    /// <summary>
+    /// Get the grant payload
+    /// </summary>
+    ///
+    /// <returns>the grant payload</returns>
+    public object Payload
+    {
+      get
+      {
+        var payload = new Dictionary<string, object>();
+        if (IncomingAllow == true)
+        {
+          var incoming = new Dictionary<string, object> { { "allow", true } };
+          payload.Add("incoming", incoming);
+        }
+
+        if (OutgoingApplicationSid != null)
+        {
+          var outgoing = new Dictionary<string, object> { { "application_sid", OutgoingApplicationSid } };
+          if (OutgoingApplicationParams != null)
+          {
+            outgoing.Add("params", OutgoingApplicationParams);
+          }
+
+          payload.Add("outgoing", outgoing);
+        }
+
+        if (PushCredentialSid != null)
+        {
+          payload.Add("push_credential_sid", PushCredentialSid);
+        }
+
+        if (EndpointId != null)
+        {
+          payload.Add("endpoint_id", EndpointId);
+        }
+
+        return payload;
+      }
+    }
+  }
 }
diff --git a/src/Twilio/JWT/Client/ClientCapability.cs b/src/Twilio/JWT/Client/ClientCapability.cs
index 1b264b803..233262289 100644
--- a/src/Twilio/JWT/Client/ClientCapability.cs
+++ b/src/Twilio/JWT/Client/ClientCapability.cs
@@ -2,63 +2,63 @@
 using System.Collections.Generic;
 
 namespace Twilio.Jwt
-{
+{
+  /// <summary>
+  /// JWT for Twilio Client
+  /// </summary>
+  public class ClientCapability : BaseJwt
+  {
+    private readonly HashSet<IScope> _scopes;
+
     /// <summary>
-    /// JWT for Twilio Client
+    /// Create a new Client JWT
     /// </summary>
-    public class ClientCapability : BaseJwt
-    {
-        private readonly HashSet<IScope> _scopes;
-
-        /// <summary>
-        /// Create a new Client JWT
-        /// </summary>
-        /// <param name="accountSid">Twilio Account SID</param>
-        /// <param name="authToken">Twilio auth token</param>
-        /// <param name="expiration">JWT expiration</param>
-        /// <param name="scopes">Scopes to give access to</param>
-        public ClientCapability(
-            string accountSid,
-            string authToken,
-            DateTime? expiration = null,
-            HashSet<IScope> scopes = null
-        ) : base (authToken, accountSid, expiration.HasValue ? expiration.Value : DateTime.UtcNow.AddSeconds(3600))
-        {
-            this._scopes = scopes;
-        }
-
-        /// <summary>
-        /// JWT headers
-        /// </summary>
-        public override Dictionary<string, object> Headers
-        {
-            get
-            {
-                return new Dictionary<string, object>();
-            }
-        }
-
-        /// <summary>
-        /// Get the JWT claims in JSON format
-        /// </summary>
-        public override Dictionary<string, object> Claims
-        {
-            get
-            {
-                var claims = new Dictionary<string, object>();
-                if (_scopes != null)
-                {
-                    var scopes = new List<string>();
-                    foreach (var scope in _scopes)
-                    {
-                        scopes.Add(scope.Payload);
-                    }
-
-                    claims.Add("scope", String.Join(" ", scopes.ToArray()));
-                }
-
-                return claims;
-            }
-        }
-    }
+    /// <param name="accountSid">Twilio Account SID</param>
+    /// <param name="authToken">Twilio auth token</param>
+    /// <param name="expiration">JWT expiration</param>
+    /// <param name="scopes">Scopes to give access to</param>
+    public ClientCapability(
+        string accountSid,
+        string authToken,
+        DateTime? expiration = null,
+        HashSet<IScope> scopes = null
+    ) : base(authToken, accountSid, expiration.HasValue ? expiration.Value : DateTime.UtcNow.AddSeconds(3600))
+    {
+      this._scopes = scopes;
+    }
+
+    /// <summary>
+    /// JWT headers
+    /// </summary>
+    public override Dictionary<string, object> Headers
+    {
+      get
+      {
+        return new Dictionary<string, object>();
+      }
+    }
+
+    /// <summary>
+    /// Get the JWT claims in JSON format
+    /// </summary>
+    public override Dictionary<string, object> Claims
+    {
+      get
+      {
+        var claims = new Dictionary<string, object>();
+        if (_scopes != null)
+        {
+          var scopes = new List<string>();
+          foreach (var scope in _scopes)
+          {
+            scopes.Add(scope.Payload);
+          }
+
+          claims.Add("scope", String.Join(" ", scopes.ToArray()));
+        }
+
+        return claims;
+      }
+    }
+  }
 }
diff --git a/src/Twilio/JWT/Client/EventStreamScope.cs b/src/Twilio/JWT/Client/EventStreamScope.cs
index 2b4987d8e..6016b5879 100644
--- a/src/Twilio/JWT/Client/EventStreamScope.cs
+++ b/src/Twilio/JWT/Client/EventStreamScope.cs
@@ -8,63 +8,63 @@
 #endif
 
 namespace Twilio.Jwt.Client
-{
+{
+  /// <summary>
+  /// Event stream scope for client capabilities
+  /// </summary>
+  public class EventStreamScope : IScope
+  {
+    private static readonly string Scope = "scope:stream:subscribe";
+
+    private readonly Dictionary<string, string> _filters;
+
     /// <summary>
-    /// Event stream scope for client capabilities
+    /// Create a new EventStreamScope
     /// </summary>
-    public class EventStreamScope : IScope
-    {
-        private static readonly string Scope = "scope:stream:subscribe";
-
-        private readonly Dictionary<string, string> _filters;
-
-        /// <summary>
-        /// Create a new EventStreamScope
-        /// </summary>
-        /// <param name="filters">filters to use</param>
-        public EventStreamScope(Dictionary<string, string> filters = null)
-        {
-            this._filters = filters;
-        }
-
-        /// <summary>
-        /// Generate scope payload
-        /// </summary>
-        public string Payload
-        {
-            get
-            {
-                var queryArgs = new List<string>();
-                queryArgs.Add("path=/2010-04-01/Events");
-
-                if (_filters != null)
-                {
-                    queryArgs.Add(BuildParameter("appParams", GetFilterParams()));
-                }
-
-                var queryString = String.Join("&", queryArgs.ToArray());
-                return Scope + "?" + queryString;
-            }
-        }
-
-        private string GetFilterParams()
-        {
-            var queryParams = new List<string>();
-            foreach (var entry in _filters)
-            {
-                queryParams.Add(BuildParameter(entry.Key, entry.Value));
-            }
-
-            return String.Join("&", queryParams.ToArray());
-        }
-
-        private string BuildParameter(string k, string v)
-        {
+    /// <param name="filters">filters to use</param>
+    public EventStreamScope(Dictionary<string, string> filters = null)
+    {
+      this._filters = filters;
+    }
+
+    /// <summary>
+    /// Generate scope payload
+    /// </summary>
+    public string Payload
+    {
+      get
+      {
+        var queryArgs = new List<string>();
+        queryArgs.Add("path=/2010-04-01/Events");
+
+        if (_filters != null)
+        {
+          queryArgs.Add(BuildParameter("appParams", GetFilterParams()));
+        }
+
+        var queryString = String.Join("&", queryArgs.ToArray());
+        return Scope + "?" + queryString;
+      }
+    }
+
+    private string GetFilterParams()
+    {
+      var queryParams = new List<string>();
+      foreach (var entry in _filters)
+      {
+        queryParams.Add(BuildParameter(entry.Key, entry.Value));
+      }
+
+      return String.Join("&", queryParams.ToArray());
+    }
+
+    private string BuildParameter(string k, string v)
+    {
 #if !NET35
-            return WebUtility.UrlEncode(k) + "=" + WebUtility.UrlEncode(v);
+      return WebUtility.UrlEncode(k) + "=" + WebUtility.UrlEncode(v);
 #else
             return HttpUtility.UrlEncode(k) + "=" + HttpUtility.UrlEncode(v);
 #endif
-        }
-    }
+    }
+  }
 }
diff --git a/src/Twilio/JWT/Client/IScope.cs b/src/Twilio/JWT/Client/IScope.cs
index 6c1e4a17b..ffd8471a8 100644
--- a/src/Twilio/JWT/Client/IScope.cs
+++ b/src/Twilio/JWT/Client/IScope.cs
@@ -1,15 +1,15 @@
 using System;
 
 namespace Twilio.Jwt
-{
+{
+  /// <summary>
+  /// Scope interface of client capabilities
+  /// </summary>
+  public interface IScope
+  {
     /// <summary>
-    /// Scope interface of client capabilities
+    /// Generate the scope payload
     /// </summary>
-    public interface IScope
-    {
-        /// <summary>
-        /// Generate the scope payload
-        /// </summary>
-        string Payload { get; }
-    }
+    string Payload { get; }
+  }
 }
diff --git a/src/Twilio/JWT/Client/IncomingClientScope.cs b/src/Twilio/JWT/Client/IncomingClientScope.cs
index a30a8f389..2e00ce9f2 100644
--- a/src/Twilio/JWT/Client/IncomingClientScope.cs
+++ b/src/Twilio/JWT/Client/IncomingClientScope.cs
@@ -1,35 +1,35 @@
 using System;
 
 namespace Twilio.Jwt.Client
-{
+{
+  /// <summary>
+  /// Incoming client scope for client capabilities
+  /// </summary>
+  public class IncomingClientScope : IScope
+  {
+    private static readonly string Scope = "scope:client:incoming";
+
+    private readonly string _clientName;
+
     /// <summary>
-    /// Incoming client scope for client capabilities
+    /// Create a new IncomingClientScope
     /// </summary>
-    public class IncomingClientScope : IScope
-    {
-        private static readonly string Scope = "scope:client:incoming";
-
-        private readonly string _clientName;
-
-        /// <summary>
-        /// Create a new IncomingClientScope
-        /// </summary>
-        /// <param name="clientName">Client name</param>
-        public IncomingClientScope(string clientName)
-        {
-            this._clientName = clientName;
-        }
-
-        /// <summary>
-        /// Generate scope payload
-        /// </summary>
-        public string Payload
-        {
-            get
-            {
-                var query = "clientName=" + _clientName;
-                return Scope + "?" + query;
-            }
-        }
-    }
+    /// <param name="clientName">Client name</param>
+    public IncomingClientScope(string clientName)
+    {
+      this._clientName = clientName;
+    }
+
+    /// <summary>
+    /// Generate scope payload
+    /// </summary>
+    public string Payload
+    {
+      get
+      {
+        var query = "clientName=" + _clientName;
+        return Scope + "?" + query;
+      }
+    }
+  }
 }
diff --git a/src/Twilio/JWT/Client/OutgoingClientScope.cs b/src/Twilio/JWT/Client/OutgoingClientScope.cs
index 0bac692df..2cd8802d5 100644
--- a/src/Twilio/JWT/Client/OutgoingClientScope.cs
+++ b/src/Twilio/JWT/Client/OutgoingClientScope.cs
@@ -8,78 +8,78 @@
 #endif
 
 namespace Twilio.Jwt.Client
-{
+{
+  /// <summary>
+  /// Scope capability
+  /// </summary>
+  public class OutgoingClientScope : IScope
+  {
+    private static readonly string Scope = "scope:client:outgoing";
+
+    private readonly string _applicationSid;
+    private readonly string _clientName;
+    private readonly Dictionary<string, string> _parameters;
+
     /// <summary>
-    /// Scope capability
+    /// Create a new OutgoingClientScope
     /// </summary>
-    public class OutgoingClientScope : IScope
-    {
-        private static readonly string Scope = "scope:client:outgoing";
-
-        private readonly string _applicationSid;
-        private readonly string _clientName;
-        private readonly Dictionary<string, string> _parameters;
-
-        /// <summary>
-        /// Create a new OutgoingClientScope
-        /// </summary>
-        /// <param name="applicationSid">Twilio Application SID</param>
-        /// <param name="clientName">Name of client</param>
-        /// <param name="parameters">Parameters to pass</param>
-        public OutgoingClientScope(
-            string applicationSid,
-            string clientName = null,
-            Dictionary<string, string> parameters = null
-        )
-        {
-            this._applicationSid = applicationSid;
-            this._clientName = clientName;
-            this._parameters = parameters;
-        }
-
-        /// <summary>
-        /// Generate scope payload
-        /// </summary>
-        public string Payload
-        {
-            get
-            {
-                var queryArgs = new List<string>();
-                queryArgs.Add(BuildParameter("appSid", _applicationSid));
-
-                if (_clientName != null)
-                {
-                    queryArgs.Add(BuildParameter("clientName", _clientName));
-                }
-
-                if (_parameters != null)
-                {
-                    queryArgs.Add(BuildParameter("appParams", GetAppParams()));
-                }
-
-                var queryString = String.Join("&", queryArgs.ToArray());
-                return Scope + "?" + queryString;
-            }
-        }
-
-        private string GetAppParams()
-        {
-            var queryParams = new List<string>();
-            foreach (var entry in _parameters)
-            {
-                queryParams.Add(BuildParameter(entry.Key, entry.Value));
-            }
-
-            return String.Join("&", queryParams.ToArray());
-        }
-
-        private string BuildParameter(string k, string v)
-        {
+    /// <param name="applicationSid">Twilio Application SID</param>
+    /// <param name="clientName">Name of client</param>
+    /// <param name="parameters">Parameters to pass</param>
+    public OutgoingClientScope(
+        string applicationSid,
+        string clientName = null,
+        Dictionary<string, string> parameters = null
+    )
+    {
+      this._applicationSid = applicationSid;
+      this._clientName = clientName;
+      this._parameters = parameters;
+    }
+
+    /// <summary>
+    /// Generate scope payload
+    /// </summary>
+    public string Payload
+    {
+      get
+      {
+        var queryArgs = new List<string>();
+        queryArgs.Add(BuildParameter("appSid", _applicationSid));
+
+        if (_clientName != null)
+        {
+          queryArgs.Add(BuildParameter("clientName", _clientName));
+        }
+
+        if (_parameters != null)
+        {
+          queryArgs.Add(BuildParameter("appParams", GetAppParams()));
+        }
+
+        var queryString = String.Join("&", queryArgs.ToArray());
+        return Scope + "?" + queryString;
+      }
+    }
+
+    private string GetAppParams()
+    {
+      var queryParams = new List<string>();
+      foreach (var entry in _parameters)
+      {
+        queryParams.Add(BuildParameter(entry.Key, entry.Value));
+      }
+
+      return String.Join("&", queryParams.ToArray());
+    }
+
+    private string BuildParameter(string k, string v)
+    {
 #if !NET35
-            return WebUtility.UrlEncode(k) + "=" + WebUtility.UrlEncode(v);
+      return WebUtility.UrlEncode(k) + "=" + WebUtility.UrlEncode(v);
 #else
             return HttpUtility.UrlEncode(k) + "=" + HttpUtility.UrlEncode(v);
 #endif
-        }
-    }
+    }
+  }
 }
diff --git a/src/Twilio/JWT/Taskrouter/Policy.cs b/src/Twilio/JWT/Taskrouter/Policy.cs
index b018744a5..28b95de71 100755
--- a/src/Twilio/JWT/Taskrouter/Policy.cs
+++ b/src/Twilio/JWT/Taskrouter/Policy.cs
@@ -2,75 +2,75 @@
 using Twilio.Http;
 
 namespace Twilio.Jwt.Taskrouter
-{
+{
+  /// <summary>
+  /// Policy for a TaskRouter token
+  /// </summary>
+  public class Policy
+  {
     /// <summary>
-    /// Policy for a TaskRouter token
+    /// Filter requirements for a TaskRouter policy
     /// </summary>
-    public class Policy
-    {
-        /// <summary>
-        /// Filter requirements for a TaskRouter policy
-        /// </summary>
-        public sealed class FilterRequirement : Dictionary<string, bool>
-        {
-            private FilterRequirement(bool v) 
-            {
-                Add("required", v);
-            }
-
-            /// <summary>
-            /// Parameter is required
-            /// </summary>
-            public static readonly FilterRequirement Required = new FilterRequirement(true);
-
-            /// <summary>
-            /// Parameter is optional
-            /// </summary>
-            public static readonly FilterRequirement Optional = new FilterRequirement(false);
-        }
-
-        private readonly string _url;
-        private readonly bool _allowed;
-        private readonly HttpMethod _method;
-        private readonly Dictionary<string, FilterRequirement> _queryFilter;
-        private readonly Dictionary<string, FilterRequirement> _postFilter;
-
-        /// <summary>
-        /// Create a new Policy
-        /// </summary>
-        /// <param name="url">TaskRouter URL</param>
-        /// <param name="method">HTTP method</param>
-        /// <param name="queryFilter">Query param filters</param>
-        /// <param name="postFilter">POST data filters</param>
-        /// <param name="allowed">Allow the JWT to access</param>
-        public Policy(
-            string url,
-            HttpMethod method,
-            Dictionary<string, FilterRequirement> queryFilter=null,
-            Dictionary<string, FilterRequirement> postFilter=null,
-            bool allowed=true
-        )
-        {
-            _url = url;
-            _allowed = allowed;
-            _method = method;
-            _queryFilter = queryFilter ?? new Dictionary<string, FilterRequirement>();
-            _postFilter = postFilter ?? new Dictionary<string, FilterRequirement>();
-        }
-
-        /// <summary>
-        /// Returns dictionary representation of the Policy
-        /// </summary>
-        /// <returns>Dictionary representation of the Policy</returns>
-        public Dictionary<string, object> ToDict()
-        {
-            return new Dictionary<string, object> {
+    public sealed class FilterRequirement : Dictionary<string, bool>
+    {
+      private FilterRequirement(bool v)
+      {
+        Add("required", v);
+      }
+
+      /// <summary>
+      /// Parameter is required
+      /// </summary>
+      public static readonly FilterRequirement Required = new FilterRequirement(true);
+
+      /// <summary>
+      /// Parameter is optional
+      /// </summary>
+      public static readonly FilterRequirement Optional = new FilterRequirement(false);
+    }
+
+    private readonly string _url;
+    private readonly bool _allowed;
+    private readonly HttpMethod _method;
+    private readonly Dictionary<string, FilterRequirement> _queryFilter;
+    private readonly Dictionary<string, FilterRequirement> _postFilter;
+
+    /// <summary>
+    /// Create a new Policy
+    /// </summary>
+    /// <param name="url">TaskRouter URL</param>
+    /// <param name="method">HTTP method</param>
+    /// <param name="queryFilter">Query param filters</param>
+    /// <param name="postFilter">POST data filters</param>
+    /// <param name="allowed">Allow the JWT to access</param>
+    public Policy(
+        string url,
+        HttpMethod method,
+        Dictionary<string, FilterRequirement> queryFilter = null,
+        Dictionary<string, FilterRequirement> postFilter = null,
+        bool allowed = true
+    )
+    {
+      _url = url;
+      _allowed = allowed;
+      _method = method;
+      _queryFilter = queryFilter ?? new Dictionary<string, FilterRequirement>();
+      _postFilter = postFilter ?? new Dictionary<string, FilterRequirement>();
+    }
+
+    /// <summary>
+    /// Returns dictionary representation of the Policy
+    /// </summary>
+    /// <returns>Dictionary representation of the Policy</returns>
+    public Dictionary<string, object> ToDict()
+    {
+      return new Dictionary<string, object> {
                 { "url", _url },
                 { "method", _method.ToString() },
                 { "query_filter", _queryFilter },
                 { "post_filter", _postFilter },
                 { "allow", _allowed }
-            };
-        }
-    }
+            };
+    }
+  }
 }
diff --git a/src/Twilio/JWT/Taskrouter/PolicyUtils.cs b/src/Twilio/JWT/Taskrouter/PolicyUtils.cs
index e607e36b0..42f820fca 100644
--- a/src/Twilio/JWT/Taskrouter/PolicyUtils.cs
+++ b/src/Twilio/JWT/Taskrouter/PolicyUtils.cs
@@ -3,30 +3,30 @@
 using Twilio.Http;
 
 namespace Twilio.Jwt.Taskrouter
-{
+{
+  /// <summary>
+  /// Utility class for generating Policies
+  /// </summary>
+  public class PolicyUtils
+  {
+    private static readonly string TaskRouterEventUrl = "https://event-bridge.twilio.com/v1/wschannels";
+
+    private PolicyUtils() { }
+
     /// <summary>
-    /// Utility class for generating Policies
+    /// Generate default event bridge policies
     /// </summary>
-    public class PolicyUtils
-    {
-        private static readonly string TaskRouterEventUrl = "https://event-bridge.twilio.com/v1/wschannels";
-
-        private PolicyUtils() {}
-
-        /// <summary>
-        /// Generate default event bridge policies
-        /// </summary>
-        /// <param name="accountSid">Twilio account SID</param>
-        /// <param name="channelId">TaskRouter channel ID</param>
-        /// <returns>Default event bridge policies</returns>
-        public static List<Policy> DefaultEventBridgePolicies(string accountSid, string channelId)
-        {
-            var url = TaskRouterEventUrl + "/" + accountSid + "/" + channelId;
-            return new List<Policy>
+    /// <param name="accountSid">Twilio account SID</param>
+    /// <param name="channelId">TaskRouter channel ID</param>
+    /// <returns>Default event bridge policies</returns>
+    public static List<Policy> DefaultEventBridgePolicies(string accountSid, string channelId)
+    {
+      var url = TaskRouterEventUrl + "/" + accountSid + "/" + channelId;
+      return new List<Policy>
             {
                 { new Policy(url, HttpMethod.Get) },
                 { new Policy(url, HttpMethod.Post) }
-            };
-        }
-    }
+            };
+    }
+  }
 }
diff --git a/src/Twilio/JWT/Taskrouter/TaskRouterCapability.cs b/src/Twilio/JWT/Taskrouter/TaskRouterCapability.cs
index 9e79e92a0..379ad8657 100644
--- a/src/Twilio/JWT/Taskrouter/TaskRouterCapability.cs
+++ b/src/Twilio/JWT/Taskrouter/TaskRouterCapability.cs
@@ -2,98 +2,98 @@
 using System.Collections.Generic;
 
 namespace Twilio.Jwt.Taskrouter
-{
+{
+  /// <summary>
+  /// JWT for TaskRouter use
+  /// </summary>
+  public class TaskRouterCapability : BaseJwt
+  {
+    private readonly string _accountSid;
+    private readonly string _workspaceSid;
+    private readonly string _friendlyName;
+    private readonly string _channelId;
+    private readonly List<Policy> _policies;
+
     /// <summary>
-    /// JWT for TaskRouter use
+    /// Create a new TaskRouter JWT
     /// </summary>
-    public class TaskRouterCapability : BaseJwt
-    {
-        private readonly string _accountSid;
-        private readonly string _workspaceSid;
-        private readonly string _friendlyName;
-        private readonly string _channelId;
-        private readonly List<Policy> _policies;
-
-        /// <summary>
-        /// Create a new TaskRouter JWT
-        /// </summary>
-        /// <param name="accountSid">Twilio account SID</param>
-        /// <param name="authToken">Twilio auth token</param>
-        /// <param name="workspaceSid">TaskRouter workspace SID</param>
-        /// <param name="channelId">TaskRouter channel ID</param>
-        /// <param name="friendlyName">Friendly name for this JWT</param>
-        /// <param name="expiration">JWT expiration</param>
-        /// <param name="policies">JWT policies</param>
-        public TaskRouterCapability(
-            string accountSid,
-            string authToken,
-            string workspaceSid,
-            string channelId,
-            string friendlyName = null,
-            DateTime? expiration = null,
-            List<Policy> policies = null
-        ) : base(authToken, accountSid, expiration.HasValue ? expiration.Value : DateTime.UtcNow.AddSeconds(3600))
-        {
-            this._accountSid = accountSid;
-            this._workspaceSid = workspaceSid;
-            this._channelId = channelId;
-            this._friendlyName = friendlyName;
-            this._policies = policies;
-        }
-
-        /// <summary>
-        /// Get the JWT headers
-        /// </summary>
-        public override Dictionary<string, object> Headers
-        {
-            get
-            {
-                return new Dictionary<string, object>();
-            }
-        }
-
-        /// <summary>
-        /// Generate JWT payload
-        /// </summary>
-        public override Dictionary<string, object> Claims
-        {
-            get
-            {
-                var payload = new Dictionary<string, object>
+    /// <param name="accountSid">Twilio account SID</param>
+    /// <param name="authToken">Twilio auth token</param>
+    /// <param name="workspaceSid">TaskRouter workspace SID</param>
+    /// <param name="channelId">TaskRouter channel ID</param>
+    /// <param name="friendlyName">Friendly name for this JWT</param>
+    /// <param name="expiration">JWT expiration</param>
+    /// <param name="policies">JWT policies</param>
+    public TaskRouterCapability(
+        string accountSid,
+        string authToken,
+        string workspaceSid,
+        string channelId,
+        string friendlyName = null,
+        DateTime? expiration = null,
+        List<Policy> policies = null
+    ) : base(authToken, accountSid, expiration.HasValue ? expiration.Value : DateTime.UtcNow.AddSeconds(3600))
+    {
+      this._accountSid = accountSid;
+      this._workspaceSid = workspaceSid;
+      this._channelId = channelId;
+      this._friendlyName = friendlyName;
+      this._policies = policies;
+    }
+
+    /// <summary>
+    /// Get the JWT headers
+    /// </summary>
+    public override Dictionary<string, object> Headers
+    {
+      get
+      {
+        return new Dictionary<string, object>();
+      }
+    }
+
+    /// <summary>
+    /// Generate JWT payload
+    /// </summary>
+    public override Dictionary<string, object> Claims
+    {
+      get
+      {
+        var payload = new Dictionary<string, object>
                 {
                     { "version", "v1" },
                     { "account_sid", _accountSid },
                     { "friendly_name", _friendlyName },
                     { "workspace_sid", _workspaceSid },
                     { "channel", _channelId }
-                };
-
-                if (_channelId.StartsWith("WK"))
-                {
-                    payload.Add("worker_sid", _channelId);
-                }
-                else if (_channelId.StartsWith("WQ"))
-                {
-                    payload.Add("taskqueue_sid", _channelId);
-                }
-
-                var payloadPolicies = new List<object>();
-                foreach (var policy in PolicyUtils.DefaultEventBridgePolicies(_accountSid, _channelId))
-                {
-                    payloadPolicies.Add(policy.ToDict());
-                }
-
-                if (_policies != null)
-                {
-                    foreach (var policy in _policies)
-                    {
-                        payloadPolicies.Add(policy.ToDict());
-                    }
-                }
-
-                payload.Add("policies", payloadPolicies);
-                return payload;
-            }
-        }
-    }
+                };
+
+        if (_channelId.StartsWith("WK"))
+        {
+          payload.Add("worker_sid", _channelId);
+        }
+        else if (_channelId.StartsWith("WQ"))
+        {
+          payload.Add("taskqueue_sid", _channelId);
+        }
+
+        var payloadPolicies = new List<object>();
+        foreach (var policy in PolicyUtils.DefaultEventBridgePolicies(_accountSid, _channelId))
+        {
+          payloadPolicies.Add(policy.ToDict());
+        }
+
+        if (_policies != null)
+        {
+          foreach (var policy in _policies)
+          {
+            payloadPolicies.Add(policy.ToDict());
+          }
+        }
+
+        payload.Add("policies", payloadPolicies);
+        return payload;
+      }
+    }
+  }
 }
diff --git a/src/Twilio/Properties/AssemblyInfo.cs b/src/Twilio/Properties/AssemblyInfo.cs
index 13dbe9010..08ebcc38d 100644
--- a/src/Twilio/Properties/AssemblyInfo.cs
+++ b/src/Twilio/Properties/AssemblyInfo.cs
@@ -9,6 +9,6 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 internal class AssemblyInfomation
-{
-    public const string AssemblyInformationalVersion = "5.69.0";
+{
+  public const string AssemblyInformationalVersion = "5.69.0";
 }
diff --git a/src/Twilio/Rest/Accounts/V1/AuthTokenPromotionOptions.cs b/src/Twilio/Rest/Accounts/V1/AuthTokenPromotionOptions.cs
index 08a491cb2..17c1bbc46 100644
--- a/src/Twilio/Rest/Accounts/V1/AuthTokenPromotionOptions.cs
+++ b/src/Twilio/Rest/Accounts/V1/AuthTokenPromotionOptions.cs
@@ -9,22 +9,22 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Accounts.V1
-{
-
+{
+
+  /// <summary>
+  /// Promote the secondary Auth Token to primary. After promoting the new token, all requests to Twilio using your old
+  /// primary Auth Token will result in an error.
+  /// </summary>
+  public class UpdateAuthTokenPromotionOptions : IOptions<AuthTokenPromotionResource>
+  {
     /// <summary>
-    /// Promote the secondary Auth Token to primary. After promoting the new token, all requests to Twilio using your old
-    /// primary Auth Token will result in an error.
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateAuthTokenPromotionOptions : IOptions<AuthTokenPromotionResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Accounts/V1/AuthTokenPromotionResource.cs b/src/Twilio/Rest/Accounts/V1/AuthTokenPromotionResource.cs
index e72db5869..67b41d9e1 100644
--- a/src/Twilio/Rest/Accounts/V1/AuthTokenPromotionResource.cs
+++ b/src/Twilio/Rest/Accounts/V1/AuthTokenPromotionResource.cs
@@ -16,127 +16,127 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Accounts.V1
-{
-
-    public class AuthTokenPromotionResource : Resource
-    {
-        private static Request BuildUpdateRequest(UpdateAuthTokenPromotionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Accounts,
-                "/v1/AuthTokens/Promote",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Promote the secondary Auth Token to primary. After promoting the new token, all requests to Twilio using your old
-        /// primary Auth Token will result in an error.
-        /// </summary>
-        /// <param name="options"> Update AuthTokenPromotion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthTokenPromotion </returns>
-        public static AuthTokenPromotionResource Update(UpdateAuthTokenPromotionOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Promote the secondary Auth Token to primary. After promoting the new token, all requests to Twilio using your old
-        /// primary Auth Token will result in an error.
-        /// </summary>
-        /// <param name="options"> Update AuthTokenPromotion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthTokenPromotion </returns>
-        public static async System.Threading.Tasks.Task<AuthTokenPromotionResource> UpdateAsync(UpdateAuthTokenPromotionOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Promote the secondary Auth Token to primary. After promoting the new token, all requests to Twilio using your old
-        /// primary Auth Token will result in an error.
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthTokenPromotion </returns>
-        public static AuthTokenPromotionResource Update(ITwilioRestClient client = null)
-        {
-            var options = new UpdateAuthTokenPromotionOptions();
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Promote the secondary Auth Token to primary. After promoting the new token, all requests to Twilio using your old
-        /// primary Auth Token will result in an error.
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthTokenPromotion </returns>
-        public static async System.Threading.Tasks.Task<AuthTokenPromotionResource> UpdateAsync(ITwilioRestClient client = null)
-        {
-            var options = new UpdateAuthTokenPromotionOptions();
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AuthTokenPromotionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AuthTokenPromotionResource object represented by the provided JSON </returns>
-        public static AuthTokenPromotionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AuthTokenPromotionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that the secondary Auth Token was created for
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The promoted Auth Token
-        /// </summary>
-        [JsonProperty("auth_token")]
-        public string AuthToken { get; private set; }
-        /// <summary>
-        /// The ISO 8601 formatted date and time in UTC when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 formatted date and time in UTC when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URI for this resource, relative to `https://accounts.twilio.com`
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private AuthTokenPromotionResource()
-        {
-
-        }
-    }
+{
+
+  public class AuthTokenPromotionResource : Resource
+  {
+    private static Request BuildUpdateRequest(UpdateAuthTokenPromotionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Accounts,
+          "/v1/AuthTokens/Promote",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Promote the secondary Auth Token to primary. After promoting the new token, all requests to Twilio using your old
+    /// primary Auth Token will result in an error.
+    /// </summary>
+    /// <param name="options"> Update AuthTokenPromotion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthTokenPromotion </returns>
+    public static AuthTokenPromotionResource Update(UpdateAuthTokenPromotionOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Promote the secondary Auth Token to primary. After promoting the new token, all requests to Twilio using your old
+    /// primary Auth Token will result in an error.
+    /// </summary>
+    /// <param name="options"> Update AuthTokenPromotion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthTokenPromotion </returns>
+    public static async System.Threading.Tasks.Task<AuthTokenPromotionResource> UpdateAsync(UpdateAuthTokenPromotionOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Promote the secondary Auth Token to primary. After promoting the new token, all requests to Twilio using your old
+    /// primary Auth Token will result in an error.
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthTokenPromotion </returns>
+    public static AuthTokenPromotionResource Update(ITwilioRestClient client = null)
+    {
+      var options = new UpdateAuthTokenPromotionOptions();
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Promote the secondary Auth Token to primary. After promoting the new token, all requests to Twilio using your old
+    /// primary Auth Token will result in an error.
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthTokenPromotion </returns>
+    public static async System.Threading.Tasks.Task<AuthTokenPromotionResource> UpdateAsync(ITwilioRestClient client = null)
+    {
+      var options = new UpdateAuthTokenPromotionOptions();
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AuthTokenPromotionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AuthTokenPromotionResource object represented by the provided JSON </returns>
+    public static AuthTokenPromotionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AuthTokenPromotionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that the secondary Auth Token was created for
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The promoted Auth Token
+    /// </summary>
+    [JsonProperty("auth_token")]
+    public string AuthToken { get; private set; }
+    /// <summary>
+    /// The ISO 8601 formatted date and time in UTC when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 formatted date and time in UTC when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URI for this resource, relative to `https://accounts.twilio.com`
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private AuthTokenPromotionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Accounts/V1/Credential/AwsOptions.cs b/src/Twilio/Rest/Accounts/V1/Credential/AwsOptions.cs
index c33a4e591..6455536a1 100644
--- a/src/Twilio/Rest/Accounts/V1/Credential/AwsOptions.cs
+++ b/src/Twilio/Rest/Accounts/V1/Credential/AwsOptions.cs
@@ -1,183 +1,186 @@
-/// This code was generated by
-/// \ / _    _  _|   _  _
-///  | (_)\/(_)(_|\/| |(/_  v1.0.0
-///       /       /
-
-using System;
-using System.Collections.Generic;
-using Twilio.Base;
-using Twilio.Converters;
-
-namespace Twilio.Rest.Accounts.V1.Credential
-{
-
-    /// <summary>
-    /// Retrieves a collection of AWS Credentials belonging to the account used to make the request
-    /// </summary>
-    public class ReadAwsOptions : ReadOptions<AwsResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
-    /// <summary>
-    /// Create a new AWS Credential
-    /// </summary>
-    public class CreateAwsOptions : IOptions<AwsResource>
-    {
-        /// <summary>
-        /// A string that contains the AWS access credentials in the format <AWS_ACCESS_KEY_ID>:<AWS_SECRET_ACCESS_KEY>
-        /// </summary>
-        public string Credentials { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The Subaccount this Credential should be associated with.
-        /// </summary>
-        public string AccountSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateAwsOptions
-        /// </summary>
-        /// <param name="credentials"> A string that contains the AWS access credentials in the format
-        ///                   <AWS_ACCESS_KEY_ID>:<AWS_SECRET_ACCESS_KEY> </param>
-        public CreateAwsOptions(string credentials)
-        {
-            Credentials = credentials;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Credentials != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Credentials", Credentials.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (AccountSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AccountSid", AccountSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
-    /// <summary>
-    /// Fetch the AWS credentials specified by the provided Credential Sid
-    /// </summary>
-    public class FetchAwsOptions : IOptions<AwsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAwsOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchAwsOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
-    /// <summary>
-    /// Modify the properties of a given Account
-    /// </summary>
-    public class UpdateAwsOptions : IOptions<AwsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateAwsOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateAwsOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
-    /// <summary>
-    /// Delete a Credential from your account
-    /// </summary>
-    public class DeleteAwsOptions : IOptions<AwsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteAwsOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteAwsOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+/// This code was generated by
+/// \ / _    _  _|   _  _
+///  | (_)\/(_)(_|\/| |(/_  v1.0.0
+///       /       /
+
+using System;
+using System.Collections.Generic;
+using Twilio.Base;
+using Twilio.Converters;
+
+namespace Twilio.Rest.Accounts.V1.Credential
+{
+
+  /// <summary>
+  /// Retrieves a collection of AWS Credentials belonging to the account used to make the request
+  /// </summary>
+  public class ReadAwsOptions : ReadOptions<AwsResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Create a new AWS Credential
+  /// </summary>
+  public class CreateAwsOptions : IOptions<AwsResource>
+  {
+
+#pragma warning disable CS1570 // XML comment has badly formed XML
+    /// <summary>
+    /// A string that contains the AWS access credentials in the format <AWS_ACCESS_KEY_ID>:<AWS_SECRET_ACCESS_KEY>
+    /// </summary>
+    public string Credentials { get; }
+#pragma warning restore CS1570 // XML comment has badly formed XML
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The Subaccount this Credential should be associated with.
+    /// </summary>
+    public string AccountSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateAwsOptions
+    /// </summary>
+    /// <param name="credentials"> A string that contains the AWS access credentials in the format
+    ///                   <AWS_ACCESS_KEY_ID>:<AWS_SECRET_ACCESS_KEY> </param>
+    public CreateAwsOptions(string credentials)
+    {
+      Credentials = credentials;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Credentials != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Credentials", Credentials.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (AccountSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AccountSid", AccountSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch the AWS credentials specified by the provided Credential Sid
+  /// </summary>
+  public class FetchAwsOptions : IOptions<AwsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchAwsOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchAwsOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Modify the properties of a given Account
+  /// </summary>
+  public class UpdateAwsOptions : IOptions<AwsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateAwsOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateAwsOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a Credential from your account
+  /// </summary>
+  public class DeleteAwsOptions : IOptions<AwsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteAwsOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteAwsOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Accounts/V1/Credential/AwsResource.cs b/src/Twilio/Rest/Accounts/V1/Credential/AwsResource.cs
index c06d14200..59462ffc9 100644
--- a/src/Twilio/Rest/Accounts/V1/Credential/AwsResource.cs
+++ b/src/Twilio/Rest/Accounts/V1/Credential/AwsResource.cs
@@ -16,473 +16,473 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Accounts.V1.Credential
-{
-
-    public class AwsResource : Resource
-    {
-        private static Request BuildReadRequest(ReadAwsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Accounts,
-                "/v1/Credentials/AWS",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieves a collection of AWS Credentials belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Aws parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Aws </returns>
-        public static ResourceSet<AwsResource> Read(ReadAwsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AwsResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<AwsResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieves a collection of AWS Credentials belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Aws parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AwsResource>> ReadAsync(ReadAwsOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AwsResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<AwsResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieves a collection of AWS Credentials belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Aws </returns>
-        public static ResourceSet<AwsResource> Read(int? pageSize = null,
-                                                    long? limit = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadAwsOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieves a collection of AWS Credentials belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AwsResource>> ReadAsync(int? pageSize = null,
-                                                                                            long? limit = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadAwsOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AwsResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AwsResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AwsResource> NextPage(Page<AwsResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Accounts)
-            );
-
-            var response = client.Request(request);
-            return Page<AwsResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AwsResource> PreviousPage(Page<AwsResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Accounts)
-            );
-
-            var response = client.Request(request);
-            return Page<AwsResource>.FromJson("credentials", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateAwsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Accounts,
-                "/v1/Credentials/AWS",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new AWS Credential
-        /// </summary>
-        /// <param name="options"> Create Aws parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Aws </returns>
-        public static AwsResource Create(CreateAwsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new AWS Credential
-        /// </summary>
-        /// <param name="options"> Create Aws parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> CreateAsync(CreateAwsOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new AWS Credential
-        /// </summary>
-        /// <param name="credentials"> A string that contains the AWS access credentials in the format
-        ///                   <AWS_ACCESS_KEY_ID>:<AWS_SECRET_ACCESS_KEY> </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="accountSid"> The Subaccount this Credential should be associated with. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Aws </returns>
-        public static AwsResource Create(string credentials,
-                                         string friendlyName = null,
-                                         string accountSid = null,
-                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateAwsOptions(credentials){FriendlyName = friendlyName, AccountSid = accountSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new AWS Credential
-        /// </summary>
-        /// <param name="credentials"> A string that contains the AWS access credentials in the format
-        ///                   <AWS_ACCESS_KEY_ID>:<AWS_SECRET_ACCESS_KEY> </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="accountSid"> The Subaccount this Credential should be associated with. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> CreateAsync(string credentials,
-                                                                                 string friendlyName = null,
-                                                                                 string accountSid = null,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateAwsOptions(credentials){FriendlyName = friendlyName, AccountSid = accountSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchAwsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Accounts,
-                "/v1/Credentials/AWS/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the AWS credentials specified by the provided Credential Sid
-        /// </summary>
-        /// <param name="options"> Fetch Aws parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Aws </returns>
-        public static AwsResource Fetch(FetchAwsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the AWS credentials specified by the provided Credential Sid
-        /// </summary>
-        /// <param name="options"> Fetch Aws parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> FetchAsync(FetchAwsOptions options,
-                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the AWS credentials specified by the provided Credential Sid
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Aws </returns>
-        public static AwsResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchAwsOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the AWS credentials specified by the provided Credential Sid
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> FetchAsync(string pathSid,
-                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchAwsOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateAwsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Accounts,
-                "/v1/Credentials/AWS/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Modify the properties of a given Account
-        /// </summary>
-        /// <param name="options"> Update Aws parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Aws </returns>
-        public static AwsResource Update(UpdateAwsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Modify the properties of a given Account
-        /// </summary>
-        /// <param name="options"> Update Aws parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> UpdateAsync(UpdateAwsOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Modify the properties of a given Account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Aws </returns>
-        public static AwsResource Update(string pathSid, string friendlyName = null, ITwilioRestClient client = null)
-        {
-            var options = new UpdateAwsOptions(pathSid){FriendlyName = friendlyName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Modify the properties of a given Account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<AwsResource> UpdateAsync(string pathSid,
-                                                                                 string friendlyName = null,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateAwsOptions(pathSid){FriendlyName = friendlyName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteAwsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Accounts,
-                "/v1/Credentials/AWS/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a Credential from your account
-        /// </summary>
-        /// <param name="options"> Delete Aws parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Aws </returns>
-        public static bool Delete(DeleteAwsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Credential from your account
-        /// </summary>
-        /// <param name="options"> Delete Aws parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAwsOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a Credential from your account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Aws </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteAwsOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Credential from your account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Aws </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteAwsOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AwsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AwsResource object represented by the provided JSON </returns>
-        public static AwsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AwsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URI for this resource, relative to `https://accounts.twilio.com`
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private AwsResource()
-        {
-
-        }
-    }
+{
+
+  public class AwsResource : Resource
+  {
+    private static Request BuildReadRequest(ReadAwsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Accounts,
+          "/v1/Credentials/AWS",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieves a collection of AWS Credentials belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Aws parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Aws </returns>
+    public static ResourceSet<AwsResource> Read(ReadAwsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AwsResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<AwsResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieves a collection of AWS Credentials belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Aws parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Aws </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AwsResource>> ReadAsync(ReadAwsOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AwsResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<AwsResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieves a collection of AWS Credentials belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Aws </returns>
+    public static ResourceSet<AwsResource> Read(int? pageSize = null,
+                                                long? limit = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadAwsOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieves a collection of AWS Credentials belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Aws </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AwsResource>> ReadAsync(int? pageSize = null,
+                                                                                        long? limit = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadAwsOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AwsResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AwsResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AwsResource> NextPage(Page<AwsResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Accounts)
+      );
+
+      var response = client.Request(request);
+      return Page<AwsResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AwsResource> PreviousPage(Page<AwsResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Accounts)
+      );
+
+      var response = client.Request(request);
+      return Page<AwsResource>.FromJson("credentials", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateAwsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Accounts,
+          "/v1/Credentials/AWS",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new AWS Credential
+    /// </summary>
+    /// <param name="options"> Create Aws parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Aws </returns>
+    public static AwsResource Create(CreateAwsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new AWS Credential
+    /// </summary>
+    /// <param name="options"> Create Aws parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Aws </returns>
+    public static async System.Threading.Tasks.Task<AwsResource> CreateAsync(CreateAwsOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new AWS Credential
+    /// </summary>
+    /// <param name="credentials"> A string that contains the AWS access credentials in the format
+    ///                   <AWS_ACCESS_KEY_ID>:<AWS_SECRET_ACCESS_KEY> </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="accountSid"> The Subaccount this Credential should be associated with. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Aws </returns>
+    public static AwsResource Create(string credentials,
+                                     string friendlyName = null,
+                                     string accountSid = null,
+                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateAwsOptions(credentials) { FriendlyName = friendlyName, AccountSid = accountSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new AWS Credential
+    /// </summary>
+    /// <param name="credentials"> A string that contains the AWS access credentials in the format
+    ///                   <AWS_ACCESS_KEY_ID>:<AWS_SECRET_ACCESS_KEY> </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="accountSid"> The Subaccount this Credential should be associated with. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Aws </returns>
+    public static async System.Threading.Tasks.Task<AwsResource> CreateAsync(string credentials,
+                                                                             string friendlyName = null,
+                                                                             string accountSid = null,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateAwsOptions(credentials) { FriendlyName = friendlyName, AccountSid = accountSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchAwsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Accounts,
+          "/v1/Credentials/AWS/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the AWS credentials specified by the provided Credential Sid
+    /// </summary>
+    /// <param name="options"> Fetch Aws parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Aws </returns>
+    public static AwsResource Fetch(FetchAwsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the AWS credentials specified by the provided Credential Sid
+    /// </summary>
+    /// <param name="options"> Fetch Aws parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Aws </returns>
+    public static async System.Threading.Tasks.Task<AwsResource> FetchAsync(FetchAwsOptions options,
+                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the AWS credentials specified by the provided Credential Sid
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Aws </returns>
+    public static AwsResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchAwsOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the AWS credentials specified by the provided Credential Sid
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Aws </returns>
+    public static async System.Threading.Tasks.Task<AwsResource> FetchAsync(string pathSid,
+                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchAwsOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateAwsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Accounts,
+          "/v1/Credentials/AWS/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Modify the properties of a given Account
+    /// </summary>
+    /// <param name="options"> Update Aws parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Aws </returns>
+    public static AwsResource Update(UpdateAwsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Modify the properties of a given Account
+    /// </summary>
+    /// <param name="options"> Update Aws parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Aws </returns>
+    public static async System.Threading.Tasks.Task<AwsResource> UpdateAsync(UpdateAwsOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Modify the properties of a given Account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Aws </returns>
+    public static AwsResource Update(string pathSid, string friendlyName = null, ITwilioRestClient client = null)
+    {
+      var options = new UpdateAwsOptions(pathSid) { FriendlyName = friendlyName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Modify the properties of a given Account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Aws </returns>
+    public static async System.Threading.Tasks.Task<AwsResource> UpdateAsync(string pathSid,
+                                                                             string friendlyName = null,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateAwsOptions(pathSid) { FriendlyName = friendlyName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteAwsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Accounts,
+          "/v1/Credentials/AWS/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a Credential from your account
+    /// </summary>
+    /// <param name="options"> Delete Aws parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Aws </returns>
+    public static bool Delete(DeleteAwsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Credential from your account
+    /// </summary>
+    /// <param name="options"> Delete Aws parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Aws </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAwsOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a Credential from your account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Aws </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteAwsOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Credential from your account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Aws </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteAwsOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AwsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AwsResource object represented by the provided JSON </returns>
+    public static AwsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AwsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URI for this resource, relative to `https://accounts.twilio.com`
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private AwsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Accounts/V1/Credential/PublicKeyOptions.cs b/src/Twilio/Rest/Accounts/V1/Credential/PublicKeyOptions.cs
index d60e62d4e..fc4303b2e 100644
--- a/src/Twilio/Rest/Accounts/V1/Credential/PublicKeyOptions.cs
+++ b/src/Twilio/Rest/Accounts/V1/Credential/PublicKeyOptions.cs
@@ -1,182 +1,182 @@
-/// This code was generated by
-/// \ / _    _  _|   _  _
-///  | (_)\/(_)(_|\/| |(/_  v1.0.0
-///       /       /
-
-using System;
-using System.Collections.Generic;
-using Twilio.Base;
-using Twilio.Converters;
-
-namespace Twilio.Rest.Accounts.V1.Credential
-{
-
-    /// <summary>
-    /// Retrieves a collection of Public Key Credentials belonging to the account used to make the request
-    /// </summary>
-    public class ReadPublicKeyOptions : ReadOptions<PublicKeyResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
-    /// <summary>
-    /// Create a new Public Key Credential
-    /// </summary>
-    public class CreatePublicKeyOptions : IOptions<PublicKeyResource>
-    {
-        /// <summary>
-        /// A URL encoded representation of the public key
-        /// </summary>
-        public string PublicKey { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The Subaccount this Credential should be associated with.
-        /// </summary>
-        public string AccountSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreatePublicKeyOptions
-        /// </summary>
-        /// <param name="publicKey"> A URL encoded representation of the public key </param>
-        public CreatePublicKeyOptions(string publicKey)
-        {
-            PublicKey = publicKey;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PublicKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PublicKey", PublicKey.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (AccountSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AccountSid", AccountSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
-    /// <summary>
-    /// Fetch the public key specified by the provided Credential Sid
-    /// </summary>
-    public class FetchPublicKeyOptions : IOptions<PublicKeyResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchPublicKeyOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchPublicKeyOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
-    /// <summary>
-    /// Modify the properties of a given Account
-    /// </summary>
-    public class UpdatePublicKeyOptions : IOptions<PublicKeyResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdatePublicKeyOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdatePublicKeyOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
-    /// <summary>
-    /// Delete a Credential from your account
-    /// </summary>
-    public class DeletePublicKeyOptions : IOptions<PublicKeyResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeletePublicKeyOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeletePublicKeyOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+/// This code was generated by
+/// \ / _    _  _|   _  _
+///  | (_)\/(_)(_|\/| |(/_  v1.0.0
+///       /       /
+
+using System;
+using System.Collections.Generic;
+using Twilio.Base;
+using Twilio.Converters;
+
+namespace Twilio.Rest.Accounts.V1.Credential
+{
+
+  /// <summary>
+  /// Retrieves a collection of Public Key Credentials belonging to the account used to make the request
+  /// </summary>
+  public class ReadPublicKeyOptions : ReadOptions<PublicKeyResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Create a new Public Key Credential
+  /// </summary>
+  public class CreatePublicKeyOptions : IOptions<PublicKeyResource>
+  {
+    /// <summary>
+    /// A URL encoded representation of the public key
+    /// </summary>
+    public string PublicKey { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The Subaccount this Credential should be associated with.
+    /// </summary>
+    public string AccountSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreatePublicKeyOptions
+    /// </summary>
+    /// <param name="publicKey"> A URL encoded representation of the public key </param>
+    public CreatePublicKeyOptions(string publicKey)
+    {
+      PublicKey = publicKey;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PublicKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PublicKey", PublicKey.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (AccountSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AccountSid", AccountSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch the public key specified by the provided Credential Sid
+  /// </summary>
+  public class FetchPublicKeyOptions : IOptions<PublicKeyResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchPublicKeyOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchPublicKeyOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Modify the properties of a given Account
+  /// </summary>
+  public class UpdatePublicKeyOptions : IOptions<PublicKeyResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdatePublicKeyOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdatePublicKeyOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a Credential from your account
+  /// </summary>
+  public class DeletePublicKeyOptions : IOptions<PublicKeyResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeletePublicKeyOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeletePublicKeyOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Accounts/V1/Credential/PublicKeyResource.cs b/src/Twilio/Rest/Accounts/V1/Credential/PublicKeyResource.cs
index a760d132f..254448f8e 100644
--- a/src/Twilio/Rest/Accounts/V1/Credential/PublicKeyResource.cs
+++ b/src/Twilio/Rest/Accounts/V1/Credential/PublicKeyResource.cs
@@ -16,471 +16,471 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Accounts.V1.Credential
-{
-
-    public class PublicKeyResource : Resource
-    {
-        private static Request BuildReadRequest(ReadPublicKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Accounts,
-                "/v1/Credentials/PublicKeys",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieves a collection of Public Key Credentials belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read PublicKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublicKey </returns>
-        public static ResourceSet<PublicKeyResource> Read(ReadPublicKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<PublicKeyResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<PublicKeyResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieves a collection of Public Key Credentials belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read PublicKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublicKey </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PublicKeyResource>> ReadAsync(ReadPublicKeyOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<PublicKeyResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<PublicKeyResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieves a collection of Public Key Credentials belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublicKey </returns>
-        public static ResourceSet<PublicKeyResource> Read(int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadPublicKeyOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieves a collection of Public Key Credentials belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublicKey </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PublicKeyResource>> ReadAsync(int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadPublicKeyOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<PublicKeyResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<PublicKeyResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<PublicKeyResource> NextPage(Page<PublicKeyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Accounts)
-            );
-
-            var response = client.Request(request);
-            return Page<PublicKeyResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<PublicKeyResource> PreviousPage(Page<PublicKeyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Accounts)
-            );
-
-            var response = client.Request(request);
-            return Page<PublicKeyResource>.FromJson("credentials", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreatePublicKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Accounts,
-                "/v1/Credentials/PublicKeys",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Public Key Credential
-        /// </summary>
-        /// <param name="options"> Create PublicKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublicKey </returns>
-        public static PublicKeyResource Create(CreatePublicKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Public Key Credential
-        /// </summary>
-        /// <param name="options"> Create PublicKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublicKey </returns>
-        public static async System.Threading.Tasks.Task<PublicKeyResource> CreateAsync(CreatePublicKeyOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Public Key Credential
-        /// </summary>
-        /// <param name="publicKey"> A URL encoded representation of the public key </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="accountSid"> The Subaccount this Credential should be associated with. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublicKey </returns>
-        public static PublicKeyResource Create(string publicKey,
-                                               string friendlyName = null,
-                                               string accountSid = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreatePublicKeyOptions(publicKey){FriendlyName = friendlyName, AccountSid = accountSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Public Key Credential
-        /// </summary>
-        /// <param name="publicKey"> A URL encoded representation of the public key </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="accountSid"> The Subaccount this Credential should be associated with. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublicKey </returns>
-        public static async System.Threading.Tasks.Task<PublicKeyResource> CreateAsync(string publicKey,
-                                                                                       string friendlyName = null,
-                                                                                       string accountSid = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreatePublicKeyOptions(publicKey){FriendlyName = friendlyName, AccountSid = accountSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchPublicKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Accounts,
-                "/v1/Credentials/PublicKeys/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the public key specified by the provided Credential Sid
-        /// </summary>
-        /// <param name="options"> Fetch PublicKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublicKey </returns>
-        public static PublicKeyResource Fetch(FetchPublicKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the public key specified by the provided Credential Sid
-        /// </summary>
-        /// <param name="options"> Fetch PublicKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublicKey </returns>
-        public static async System.Threading.Tasks.Task<PublicKeyResource> FetchAsync(FetchPublicKeyOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the public key specified by the provided Credential Sid
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublicKey </returns>
-        public static PublicKeyResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchPublicKeyOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the public key specified by the provided Credential Sid
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublicKey </returns>
-        public static async System.Threading.Tasks.Task<PublicKeyResource> FetchAsync(string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchPublicKeyOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdatePublicKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Accounts,
-                "/v1/Credentials/PublicKeys/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Modify the properties of a given Account
-        /// </summary>
-        /// <param name="options"> Update PublicKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublicKey </returns>
-        public static PublicKeyResource Update(UpdatePublicKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Modify the properties of a given Account
-        /// </summary>
-        /// <param name="options"> Update PublicKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublicKey </returns>
-        public static async System.Threading.Tasks.Task<PublicKeyResource> UpdateAsync(UpdatePublicKeyOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Modify the properties of a given Account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublicKey </returns>
-        public static PublicKeyResource Update(string pathSid, string friendlyName = null, ITwilioRestClient client = null)
-        {
-            var options = new UpdatePublicKeyOptions(pathSid){FriendlyName = friendlyName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Modify the properties of a given Account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublicKey </returns>
-        public static async System.Threading.Tasks.Task<PublicKeyResource> UpdateAsync(string pathSid,
-                                                                                       string friendlyName = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdatePublicKeyOptions(pathSid){FriendlyName = friendlyName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeletePublicKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Accounts,
-                "/v1/Credentials/PublicKeys/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a Credential from your account
-        /// </summary>
-        /// <param name="options"> Delete PublicKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublicKey </returns>
-        public static bool Delete(DeletePublicKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Credential from your account
-        /// </summary>
-        /// <param name="options"> Delete PublicKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublicKey </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeletePublicKeyOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a Credential from your account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublicKey </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeletePublicKeyOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Credential from your account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublicKey </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeletePublicKeyOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a PublicKeyResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> PublicKeyResource object represented by the provided JSON </returns>
-        public static PublicKeyResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<PublicKeyResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the Credential that the PublicKey resource belongs to
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URI for this resource, relative to `https://accounts.twilio.com`
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private PublicKeyResource()
-        {
-
-        }
-    }
+{
+
+  public class PublicKeyResource : Resource
+  {
+    private static Request BuildReadRequest(ReadPublicKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Accounts,
+          "/v1/Credentials/PublicKeys",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieves a collection of Public Key Credentials belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read PublicKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublicKey </returns>
+    public static ResourceSet<PublicKeyResource> Read(ReadPublicKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<PublicKeyResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<PublicKeyResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieves a collection of Public Key Credentials belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read PublicKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublicKey </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PublicKeyResource>> ReadAsync(ReadPublicKeyOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<PublicKeyResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<PublicKeyResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieves a collection of Public Key Credentials belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublicKey </returns>
+    public static ResourceSet<PublicKeyResource> Read(int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadPublicKeyOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieves a collection of Public Key Credentials belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublicKey </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PublicKeyResource>> ReadAsync(int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadPublicKeyOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<PublicKeyResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<PublicKeyResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<PublicKeyResource> NextPage(Page<PublicKeyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Accounts)
+      );
+
+      var response = client.Request(request);
+      return Page<PublicKeyResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<PublicKeyResource> PreviousPage(Page<PublicKeyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Accounts)
+      );
+
+      var response = client.Request(request);
+      return Page<PublicKeyResource>.FromJson("credentials", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreatePublicKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Accounts,
+          "/v1/Credentials/PublicKeys",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Public Key Credential
+    /// </summary>
+    /// <param name="options"> Create PublicKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublicKey </returns>
+    public static PublicKeyResource Create(CreatePublicKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Public Key Credential
+    /// </summary>
+    /// <param name="options"> Create PublicKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublicKey </returns>
+    public static async System.Threading.Tasks.Task<PublicKeyResource> CreateAsync(CreatePublicKeyOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Public Key Credential
+    /// </summary>
+    /// <param name="publicKey"> A URL encoded representation of the public key </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="accountSid"> The Subaccount this Credential should be associated with. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublicKey </returns>
+    public static PublicKeyResource Create(string publicKey,
+                                           string friendlyName = null,
+                                           string accountSid = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreatePublicKeyOptions(publicKey) { FriendlyName = friendlyName, AccountSid = accountSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Public Key Credential
+    /// </summary>
+    /// <param name="publicKey"> A URL encoded representation of the public key </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="accountSid"> The Subaccount this Credential should be associated with. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublicKey </returns>
+    public static async System.Threading.Tasks.Task<PublicKeyResource> CreateAsync(string publicKey,
+                                                                                   string friendlyName = null,
+                                                                                   string accountSid = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreatePublicKeyOptions(publicKey) { FriendlyName = friendlyName, AccountSid = accountSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchPublicKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Accounts,
+          "/v1/Credentials/PublicKeys/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the public key specified by the provided Credential Sid
+    /// </summary>
+    /// <param name="options"> Fetch PublicKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublicKey </returns>
+    public static PublicKeyResource Fetch(FetchPublicKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the public key specified by the provided Credential Sid
+    /// </summary>
+    /// <param name="options"> Fetch PublicKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublicKey </returns>
+    public static async System.Threading.Tasks.Task<PublicKeyResource> FetchAsync(FetchPublicKeyOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the public key specified by the provided Credential Sid
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublicKey </returns>
+    public static PublicKeyResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchPublicKeyOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the public key specified by the provided Credential Sid
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublicKey </returns>
+    public static async System.Threading.Tasks.Task<PublicKeyResource> FetchAsync(string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchPublicKeyOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdatePublicKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Accounts,
+          "/v1/Credentials/PublicKeys/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Modify the properties of a given Account
+    /// </summary>
+    /// <param name="options"> Update PublicKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublicKey </returns>
+    public static PublicKeyResource Update(UpdatePublicKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Modify the properties of a given Account
+    /// </summary>
+    /// <param name="options"> Update PublicKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublicKey </returns>
+    public static async System.Threading.Tasks.Task<PublicKeyResource> UpdateAsync(UpdatePublicKeyOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Modify the properties of a given Account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublicKey </returns>
+    public static PublicKeyResource Update(string pathSid, string friendlyName = null, ITwilioRestClient client = null)
+    {
+      var options = new UpdatePublicKeyOptions(pathSid) { FriendlyName = friendlyName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Modify the properties of a given Account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublicKey </returns>
+    public static async System.Threading.Tasks.Task<PublicKeyResource> UpdateAsync(string pathSid,
+                                                                                   string friendlyName = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdatePublicKeyOptions(pathSid) { FriendlyName = friendlyName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeletePublicKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Accounts,
+          "/v1/Credentials/PublicKeys/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a Credential from your account
+    /// </summary>
+    /// <param name="options"> Delete PublicKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublicKey </returns>
+    public static bool Delete(DeletePublicKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Credential from your account
+    /// </summary>
+    /// <param name="options"> Delete PublicKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublicKey </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeletePublicKeyOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a Credential from your account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublicKey </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeletePublicKeyOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Credential from your account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublicKey </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeletePublicKeyOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a PublicKeyResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> PublicKeyResource object represented by the provided JSON </returns>
+    public static PublicKeyResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<PublicKeyResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the Credential that the PublicKey resource belongs to
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URI for this resource, relative to `https://accounts.twilio.com`
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private PublicKeyResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Accounts/V1/SecondaryAuthTokenOptions.cs b/src/Twilio/Rest/Accounts/V1/SecondaryAuthTokenOptions.cs
index b2f9ed577..537427506 100644
--- a/src/Twilio/Rest/Accounts/V1/SecondaryAuthTokenOptions.cs
+++ b/src/Twilio/Rest/Accounts/V1/SecondaryAuthTokenOptions.cs
@@ -9,36 +9,36 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Accounts.V1
-{
-
+{
+
+  /// <summary>
+  /// Create a new secondary Auth Token
+  /// </summary>
+  public class CreateSecondaryAuthTokenOptions : IOptions<SecondaryAuthTokenResource>
+  {
     /// <summary>
-    /// Create a new secondary Auth Token
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateSecondaryAuthTokenOptions : IOptions<SecondaryAuthTokenResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete the secondary Auth Token from your account
+  /// </summary>
+  public class DeleteSecondaryAuthTokenOptions : IOptions<SecondaryAuthTokenResource>
+  {
     /// <summary>
-    /// Delete the secondary Auth Token from your account
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteSecondaryAuthTokenOptions : IOptions<SecondaryAuthTokenResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Accounts/V1/SecondaryAuthTokenResource.cs b/src/Twilio/Rest/Accounts/V1/SecondaryAuthTokenResource.cs
index 01502b182..0be8c460e 100644
--- a/src/Twilio/Rest/Accounts/V1/SecondaryAuthTokenResource.cs
+++ b/src/Twilio/Rest/Accounts/V1/SecondaryAuthTokenResource.cs
@@ -16,187 +16,187 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Accounts.V1
-{
-
-    public class SecondaryAuthTokenResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateSecondaryAuthTokenOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Accounts,
-                "/v1/AuthTokens/Secondary",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new secondary Auth Token
-        /// </summary>
-        /// <param name="options"> Create SecondaryAuthToken parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SecondaryAuthToken </returns>
-        public static SecondaryAuthTokenResource Create(CreateSecondaryAuthTokenOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new secondary Auth Token
-        /// </summary>
-        /// <param name="options"> Create SecondaryAuthToken parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SecondaryAuthToken </returns>
-        public static async System.Threading.Tasks.Task<SecondaryAuthTokenResource> CreateAsync(CreateSecondaryAuthTokenOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new secondary Auth Token
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SecondaryAuthToken </returns>
-        public static SecondaryAuthTokenResource Create(ITwilioRestClient client = null)
-        {
-            var options = new CreateSecondaryAuthTokenOptions();
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new secondary Auth Token
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SecondaryAuthToken </returns>
-        public static async System.Threading.Tasks.Task<SecondaryAuthTokenResource> CreateAsync(ITwilioRestClient client = null)
-        {
-            var options = new CreateSecondaryAuthTokenOptions();
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSecondaryAuthTokenOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Accounts,
-                "/v1/AuthTokens/Secondary",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete the secondary Auth Token from your account
-        /// </summary>
-        /// <param name="options"> Delete SecondaryAuthToken parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SecondaryAuthToken </returns>
-        public static bool Delete(DeleteSecondaryAuthTokenOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete the secondary Auth Token from your account
-        /// </summary>
-        /// <param name="options"> Delete SecondaryAuthToken parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SecondaryAuthToken </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSecondaryAuthTokenOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete the secondary Auth Token from your account
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SecondaryAuthToken </returns>
-        public static bool Delete(ITwilioRestClient client = null)
-        {
-            var options = new DeleteSecondaryAuthTokenOptions();
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete the secondary Auth Token from your account
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SecondaryAuthToken </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(ITwilioRestClient client = null)
-        {
-            var options = new DeleteSecondaryAuthTokenOptions();
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SecondaryAuthTokenResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SecondaryAuthTokenResource object represented by the provided JSON </returns>
-        public static SecondaryAuthTokenResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SecondaryAuthTokenResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that the secondary Auth Token was created for
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 formatted date and time in UTC when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 formatted date and time in UTC when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The generated secondary Auth Token
-        /// </summary>
-        [JsonProperty("secondary_auth_token")]
-        public string SecondaryAuthToken { get; private set; }
-        /// <summary>
-        /// The URI for this resource, relative to `https://accounts.twilio.com`
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SecondaryAuthTokenResource()
-        {
-
-        }
-    }
+{
+
+  public class SecondaryAuthTokenResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateSecondaryAuthTokenOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Accounts,
+          "/v1/AuthTokens/Secondary",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new secondary Auth Token
+    /// </summary>
+    /// <param name="options"> Create SecondaryAuthToken parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SecondaryAuthToken </returns>
+    public static SecondaryAuthTokenResource Create(CreateSecondaryAuthTokenOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new secondary Auth Token
+    /// </summary>
+    /// <param name="options"> Create SecondaryAuthToken parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SecondaryAuthToken </returns>
+    public static async System.Threading.Tasks.Task<SecondaryAuthTokenResource> CreateAsync(CreateSecondaryAuthTokenOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new secondary Auth Token
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SecondaryAuthToken </returns>
+    public static SecondaryAuthTokenResource Create(ITwilioRestClient client = null)
+    {
+      var options = new CreateSecondaryAuthTokenOptions();
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new secondary Auth Token
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SecondaryAuthToken </returns>
+    public static async System.Threading.Tasks.Task<SecondaryAuthTokenResource> CreateAsync(ITwilioRestClient client = null)
+    {
+      var options = new CreateSecondaryAuthTokenOptions();
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSecondaryAuthTokenOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Accounts,
+          "/v1/AuthTokens/Secondary",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete the secondary Auth Token from your account
+    /// </summary>
+    /// <param name="options"> Delete SecondaryAuthToken parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SecondaryAuthToken </returns>
+    public static bool Delete(DeleteSecondaryAuthTokenOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete the secondary Auth Token from your account
+    /// </summary>
+    /// <param name="options"> Delete SecondaryAuthToken parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SecondaryAuthToken </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSecondaryAuthTokenOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete the secondary Auth Token from your account
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SecondaryAuthToken </returns>
+    public static bool Delete(ITwilioRestClient client = null)
+    {
+      var options = new DeleteSecondaryAuthTokenOptions();
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete the secondary Auth Token from your account
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SecondaryAuthToken </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(ITwilioRestClient client = null)
+    {
+      var options = new DeleteSecondaryAuthTokenOptions();
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SecondaryAuthTokenResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SecondaryAuthTokenResource object represented by the provided JSON </returns>
+    public static SecondaryAuthTokenResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SecondaryAuthTokenResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that the secondary Auth Token was created for
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 formatted date and time in UTC when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 formatted date and time in UTC when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The generated secondary Auth Token
+    /// </summary>
+    [JsonProperty("secondary_auth_token")]
+    public string SecondaryAuthToken { get; private set; }
+    /// <summary>
+    /// The URI for this resource, relative to `https://accounts.twilio.com`
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SecondaryAuthTokenResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Address/DependentPhoneNumberOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Address/DependentPhoneNumberOptions.cs
index 4edf5673f..c312dc205 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Address/DependentPhoneNumberOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Address/DependentPhoneNumberOptions.cs
@@ -9,44 +9,44 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Address
-{
-
+{
+
+  /// <summary>
+  /// ReadDependentPhoneNumberOptions
+  /// </summary>
+  public class ReadDependentPhoneNumberOptions : ReadOptions<DependentPhoneNumberResource>
+  {
     /// <summary>
-    /// ReadDependentPhoneNumberOptions
+    /// The SID of the Account that created the resources to read
     /// </summary>
-    public class ReadDependentPhoneNumberOptions : ReadOptions<DependentPhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Address resource associated with the phone number
-        /// </summary>
-        public string PathAddressSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadDependentPhoneNumberOptions
-        /// </summary>
-        /// <param name="pathAddressSid"> The SID of the Address resource associated with the phone number </param>
-        public ReadDependentPhoneNumberOptions(string pathAddressSid)
-        {
-            PathAddressSid = pathAddressSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the Address resource associated with the phone number
+    /// </summary>
+    public string PathAddressSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadDependentPhoneNumberOptions
+    /// </summary>
+    /// <param name="pathAddressSid"> The SID of the Address resource associated with the phone number </param>
+    public ReadDependentPhoneNumberOptions(string pathAddressSid)
+    {
+      PathAddressSid = pathAddressSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Address/DependentPhoneNumberResource.cs b/src/Twilio/Rest/Api/V2010/Account/Address/DependentPhoneNumberResource.cs
index d399092fb..7f9737bd8 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Address/DependentPhoneNumberResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Address/DependentPhoneNumberResource.cs
@@ -17,340 +17,340 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Address
-{
-
-    public class DependentPhoneNumberResource : Resource
-    {
-        public sealed class AddressRequirementEnum : StringEnum
-        {
-            private AddressRequirementEnum(string value) : base(value) {}
-            public AddressRequirementEnum() {}
-            public static implicit operator AddressRequirementEnum(string value)
-            {
-                return new AddressRequirementEnum(value);
-            }
-
-            public static readonly AddressRequirementEnum None = new AddressRequirementEnum("none");
-            public static readonly AddressRequirementEnum Any = new AddressRequirementEnum("any");
-            public static readonly AddressRequirementEnum Local = new AddressRequirementEnum("local");
-            public static readonly AddressRequirementEnum Foreign = new AddressRequirementEnum("foreign");
-        }
-
-        public sealed class EmergencyStatusEnum : StringEnum
-        {
-            private EmergencyStatusEnum(string value) : base(value) {}
-            public EmergencyStatusEnum() {}
-            public static implicit operator EmergencyStatusEnum(string value)
-            {
-                return new EmergencyStatusEnum(value);
-            }
-
-            public static readonly EmergencyStatusEnum Active = new EmergencyStatusEnum("Active");
-            public static readonly EmergencyStatusEnum Inactive = new EmergencyStatusEnum("Inactive");
-        }
-
-        private static Request BuildReadRequest(ReadDependentPhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Addresses/" + options.PathAddressSid + "/DependentPhoneNumbers.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read DependentPhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DependentPhoneNumber </returns>
-        public static ResourceSet<DependentPhoneNumberResource> Read(ReadDependentPhoneNumberOptions options,
-                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DependentPhoneNumberResource>.FromJson("dependent_phone_numbers", response.Content);
-            return new ResourceSet<DependentPhoneNumberResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read DependentPhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DependentPhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DependentPhoneNumberResource>> ReadAsync(ReadDependentPhoneNumberOptions options,
-                                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DependentPhoneNumberResource>.FromJson("dependent_phone_numbers", response.Content);
-            return new ResourceSet<DependentPhoneNumberResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAddressSid"> The SID of the Address resource associated with the phone number </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DependentPhoneNumber </returns>
-        public static ResourceSet<DependentPhoneNumberResource> Read(string pathAddressSid,
-                                                                     string pathAccountSid = null,
-                                                                     int? pageSize = null,
-                                                                     long? limit = null,
-                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadDependentPhoneNumberOptions(pathAddressSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAddressSid"> The SID of the Address resource associated with the phone number </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DependentPhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DependentPhoneNumberResource>> ReadAsync(string pathAddressSid,
-                                                                                                             string pathAccountSid = null,
-                                                                                                             int? pageSize = null,
-                                                                                                             long? limit = null,
-                                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadDependentPhoneNumberOptions(pathAddressSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DependentPhoneNumberResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DependentPhoneNumberResource>.FromJson("dependent_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DependentPhoneNumberResource> NextPage(Page<DependentPhoneNumberResource> page,
-                                                                  ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<DependentPhoneNumberResource>.FromJson("dependent_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DependentPhoneNumberResource> PreviousPage(Page<DependentPhoneNumberResource> page,
-                                                                      ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<DependentPhoneNumberResource>.FromJson("dependent_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a DependentPhoneNumberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DependentPhoneNumberResource object represented by the provided JSON </returns>
-        public static DependentPhoneNumberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DependentPhoneNumberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber FriendlyName { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The URL we call when the phone number receives a call
-        /// </summary>
-        [JsonProperty("voice_url")]
-        public Uri VoiceUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method used with the voice_url
-        /// </summary>
-        [JsonProperty("voice_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        [JsonProperty("voice_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when an error occurs in TwiML
-        /// </summary>
-        [JsonProperty("voice_fallback_url")]
-        public Uri VoiceFallbackUrl { get; private set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        [JsonProperty("voice_caller_id_lookup")]
-        public bool? VoiceCallerIdLookup { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The HTTP method used with sms_fallback_url
-        /// </summary>
-        [JsonProperty("sms_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL that we call when an error occurs while retrieving or executing the TwiML
-        /// </summary>
-        [JsonProperty("sms_fallback_url")]
-        public Uri SmsFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method to use with sms_url
-        /// </summary>
-        [JsonProperty("sms_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when the phone number receives an incoming SMS message
-        /// </summary>
-        [JsonProperty("sms_url")]
-        public Uri SmsUrl { get; private set; }
-        /// <summary>
-        /// Whether the phone number requires an Address registered with Twilio
-        /// </summary>
-        [JsonProperty("address_requirements")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public DependentPhoneNumberResource.AddressRequirementEnum AddressRequirements { get; private set; }
-        /// <summary>
-        /// Indicate if a phone can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public object Capabilities { get; private set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call status_callback
-        /// </summary>
-        [JsonProperty("status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// The API version used to start a new TwiML session
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The SID of the application that handles SMS messages sent to the phone number
-        /// </summary>
-        [JsonProperty("sms_application_sid")]
-        public string SmsApplicationSid { get; private set; }
-        /// <summary>
-        /// The SID of the application that handles calls to the phone number
-        /// </summary>
-        [JsonProperty("voice_application_sid")]
-        public string VoiceApplicationSid { get; private set; }
-        /// <summary>
-        /// The SID of the Trunk that handles calls to the phone number
-        /// </summary>
-        [JsonProperty("trunk_sid")]
-        public string TrunkSid { get; private set; }
-        /// <summary>
-        /// Whether the phone number is enabled for emergency calling
-        /// </summary>
-        [JsonProperty("emergency_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public DependentPhoneNumberResource.EmergencyStatusEnum EmergencyStatus { get; private set; }
-        /// <summary>
-        /// The emergency address configuration to use for emergency calling
-        /// </summary>
-        [JsonProperty("emergency_address_sid")]
-        public string EmergencyAddressSid { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private DependentPhoneNumberResource()
-        {
-
-        }
-    }
+{
+
+  public class DependentPhoneNumberResource : Resource
+  {
+    public sealed class AddressRequirementEnum : StringEnum
+    {
+      private AddressRequirementEnum(string value) : base(value) { }
+      public AddressRequirementEnum() { }
+      public static implicit operator AddressRequirementEnum(string value)
+      {
+        return new AddressRequirementEnum(value);
+      }
+
+      public static readonly AddressRequirementEnum None = new AddressRequirementEnum("none");
+      public static readonly AddressRequirementEnum Any = new AddressRequirementEnum("any");
+      public static readonly AddressRequirementEnum Local = new AddressRequirementEnum("local");
+      public static readonly AddressRequirementEnum Foreign = new AddressRequirementEnum("foreign");
+    }
+
+    public sealed class EmergencyStatusEnum : StringEnum
+    {
+      private EmergencyStatusEnum(string value) : base(value) { }
+      public EmergencyStatusEnum() { }
+      public static implicit operator EmergencyStatusEnum(string value)
+      {
+        return new EmergencyStatusEnum(value);
+      }
+
+      public static readonly EmergencyStatusEnum Active = new EmergencyStatusEnum("Active");
+      public static readonly EmergencyStatusEnum Inactive = new EmergencyStatusEnum("Inactive");
+    }
+
+    private static Request BuildReadRequest(ReadDependentPhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Addresses/" + options.PathAddressSid + "/DependentPhoneNumbers.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read DependentPhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DependentPhoneNumber </returns>
+    public static ResourceSet<DependentPhoneNumberResource> Read(ReadDependentPhoneNumberOptions options,
+                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DependentPhoneNumberResource>.FromJson("dependent_phone_numbers", response.Content);
+      return new ResourceSet<DependentPhoneNumberResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read DependentPhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DependentPhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DependentPhoneNumberResource>> ReadAsync(ReadDependentPhoneNumberOptions options,
+                                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DependentPhoneNumberResource>.FromJson("dependent_phone_numbers", response.Content);
+      return new ResourceSet<DependentPhoneNumberResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAddressSid"> The SID of the Address resource associated with the phone number </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DependentPhoneNumber </returns>
+    public static ResourceSet<DependentPhoneNumberResource> Read(string pathAddressSid,
+                                                                 string pathAccountSid = null,
+                                                                 int? pageSize = null,
+                                                                 long? limit = null,
+                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadDependentPhoneNumberOptions(pathAddressSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAddressSid"> The SID of the Address resource associated with the phone number </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DependentPhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DependentPhoneNumberResource>> ReadAsync(string pathAddressSid,
+                                                                                                         string pathAccountSid = null,
+                                                                                                         int? pageSize = null,
+                                                                                                         long? limit = null,
+                                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadDependentPhoneNumberOptions(pathAddressSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DependentPhoneNumberResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DependentPhoneNumberResource>.FromJson("dependent_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DependentPhoneNumberResource> NextPage(Page<DependentPhoneNumberResource> page,
+                                                              ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<DependentPhoneNumberResource>.FromJson("dependent_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DependentPhoneNumberResource> PreviousPage(Page<DependentPhoneNumberResource> page,
+                                                                  ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<DependentPhoneNumberResource>.FromJson("dependent_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a DependentPhoneNumberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DependentPhoneNumberResource object represented by the provided JSON </returns>
+    public static DependentPhoneNumberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DependentPhoneNumberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber FriendlyName { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The URL we call when the phone number receives a call
+    /// </summary>
+    [JsonProperty("voice_url")]
+    public Uri VoiceUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method used with the voice_url
+    /// </summary>
+    [JsonProperty("voice_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    [JsonProperty("voice_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when an error occurs in TwiML
+    /// </summary>
+    [JsonProperty("voice_fallback_url")]
+    public Uri VoiceFallbackUrl { get; private set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    [JsonProperty("voice_caller_id_lookup")]
+    public bool? VoiceCallerIdLookup { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The HTTP method used with sms_fallback_url
+    /// </summary>
+    [JsonProperty("sms_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL that we call when an error occurs while retrieving or executing the TwiML
+    /// </summary>
+    [JsonProperty("sms_fallback_url")]
+    public Uri SmsFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method to use with sms_url
+    /// </summary>
+    [JsonProperty("sms_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when the phone number receives an incoming SMS message
+    /// </summary>
+    [JsonProperty("sms_url")]
+    public Uri SmsUrl { get; private set; }
+    /// <summary>
+    /// Whether the phone number requires an Address registered with Twilio
+    /// </summary>
+    [JsonProperty("address_requirements")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public DependentPhoneNumberResource.AddressRequirementEnum AddressRequirements { get; private set; }
+    /// <summary>
+    /// Indicate if a phone can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public object Capabilities { get; private set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call status_callback
+    /// </summary>
+    [JsonProperty("status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// The API version used to start a new TwiML session
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The SID of the application that handles SMS messages sent to the phone number
+    /// </summary>
+    [JsonProperty("sms_application_sid")]
+    public string SmsApplicationSid { get; private set; }
+    /// <summary>
+    /// The SID of the application that handles calls to the phone number
+    /// </summary>
+    [JsonProperty("voice_application_sid")]
+    public string VoiceApplicationSid { get; private set; }
+    /// <summary>
+    /// The SID of the Trunk that handles calls to the phone number
+    /// </summary>
+    [JsonProperty("trunk_sid")]
+    public string TrunkSid { get; private set; }
+    /// <summary>
+    /// Whether the phone number is enabled for emergency calling
+    /// </summary>
+    [JsonProperty("emergency_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public DependentPhoneNumberResource.EmergencyStatusEnum EmergencyStatus { get; private set; }
+    /// <summary>
+    /// The emergency address configuration to use for emergency calling
+    /// </summary>
+    [JsonProperty("emergency_address_sid")]
+    public string EmergencyAddressSid { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private DependentPhoneNumberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AddressOptions.cs b/src/Twilio/Rest/Api/V2010/Account/AddressOptions.cs
index 3485e9a95..0adb11e2d 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AddressOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AddressOptions.cs
@@ -9,354 +9,354 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// CreateAddressOptions
+  /// </summary>
+  public class CreateAddressOptions : IOptions<AddressResource>
+  {
     /// <summary>
-    /// CreateAddressOptions
-    /// </summary>
-    public class CreateAddressOptions : IOptions<AddressResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will be responsible for the new Address resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The name to associate with the new address
-        /// </summary>
-        public string CustomerName { get; }
-        /// <summary>
-        /// The number and street address of the new address
-        /// </summary>
-        public string Street { get; }
-        /// <summary>
-        /// The city of the new address
-        /// </summary>
-        public string City { get; }
-        /// <summary>
-        /// The state or region of the new address
-        /// </summary>
-        public string Region { get; }
-        /// <summary>
-        /// The postal code of the new address
-        /// </summary>
-        public string PostalCode { get; }
-        /// <summary>
-        /// The ISO country code of the new address
-        /// </summary>
-        public string IsoCountry { get; }
-        /// <summary>
-        /// A string to describe the new resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Whether to enable emergency calling on the new address
-        /// </summary>
-        public bool? EmergencyEnabled { get; set; }
-        /// <summary>
-        /// Whether we should automatically correct the address
-        /// </summary>
-        public bool? AutoCorrectAddress { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateAddressOptions
-        /// </summary>
-        /// <param name="customerName"> The name to associate with the new address </param>
-        /// <param name="street"> The number and street address of the new address </param>
-        /// <param name="city"> The city of the new address </param>
-        /// <param name="region"> The state or region of the new address </param>
-        /// <param name="postalCode"> The postal code of the new address </param>
-        /// <param name="isoCountry"> The ISO country code of the new address </param>
-        public CreateAddressOptions(string customerName,
-                                    string street,
-                                    string city,
-                                    string region,
-                                    string postalCode,
-                                    string isoCountry)
-        {
-            CustomerName = customerName;
-            Street = street;
-            City = city;
-            Region = region;
-            PostalCode = postalCode;
-            IsoCountry = isoCountry;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (CustomerName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CustomerName", CustomerName));
-            }
-
-            if (Street != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Street", Street));
-            }
-
-            if (City != null)
-            {
-                p.Add(new KeyValuePair<string, string>("City", City));
-            }
-
-            if (Region != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Region", Region));
-            }
-
-            if (PostalCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostalCode", PostalCode));
-            }
-
-            if (IsoCountry != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (EmergencyEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyEnabled", EmergencyEnabled.Value.ToString().ToLower()));
-            }
-
-            if (AutoCorrectAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AutoCorrectAddress", AutoCorrectAddress.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Account that will be responsible for the new Address resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// DeleteAddressOptions
-    /// </summary>
-    public class DeleteAddressOptions : IOptions<AddressResource>
-    {
-        /// <summary>
-        /// The SID of the Account that is responsible for the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteAddressOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteAddressOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The name to associate with the new address
+    /// </summary>
+    public string CustomerName { get; }
     /// <summary>
-    /// FetchAddressOptions
-    /// </summary>
-    public class FetchAddressOptions : IOptions<AddressResource>
-    {
-        /// <summary>
-        /// The SID of the Account that is responsible for this address
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAddressOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchAddressOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The number and street address of the new address
+    /// </summary>
+    public string Street { get; }
     /// <summary>
-    /// UpdateAddressOptions
-    /// </summary>
-    public class UpdateAddressOptions : IOptions<AddressResource>
-    {
-        /// <summary>
-        /// The SID of the Account that is responsible for the resource to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The name to associate with the address
-        /// </summary>
-        public string CustomerName { get; set; }
-        /// <summary>
-        /// The number and street address of the address
-        /// </summary>
-        public string Street { get; set; }
-        /// <summary>
-        /// The city of the address
-        /// </summary>
-        public string City { get; set; }
-        /// <summary>
-        /// The state or region of the address
-        /// </summary>
-        public string Region { get; set; }
-        /// <summary>
-        /// The postal code of the address
-        /// </summary>
-        public string PostalCode { get; set; }
-        /// <summary>
-        /// Whether to enable emergency calling on the address
-        /// </summary>
-        public bool? EmergencyEnabled { get; set; }
-        /// <summary>
-        /// Whether we should automatically correct the address
-        /// </summary>
-        public bool? AutoCorrectAddress { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateAddressOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateAddressOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (CustomerName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CustomerName", CustomerName));
-            }
-
-            if (Street != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Street", Street));
-            }
-
-            if (City != null)
-            {
-                p.Add(new KeyValuePair<string, string>("City", City));
-            }
-
-            if (Region != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Region", Region));
-            }
-
-            if (PostalCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostalCode", PostalCode));
-            }
-
-            if (EmergencyEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyEnabled", EmergencyEnabled.Value.ToString().ToLower()));
-            }
-
-            if (AutoCorrectAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AutoCorrectAddress", AutoCorrectAddress.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The city of the new address
+    /// </summary>
+    public string City { get; }
     /// <summary>
-    /// ReadAddressOptions
-    /// </summary>
-    public class ReadAddressOptions : ReadOptions<AddressResource>
-    {
-        /// <summary>
-        /// The SID of the Account that is responsible for this address
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The `customer_name` of the Address resources to read
-        /// </summary>
-        public string CustomerName { get; set; }
-        /// <summary>
-        /// The string that identifies the Address resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The ISO country code of the Address resources to read
-        /// </summary>
-        public string IsoCountry { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (CustomerName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CustomerName", CustomerName));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (IsoCountry != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The state or region of the new address
+    /// </summary>
+    public string Region { get; }
+    /// <summary>
+    /// The postal code of the new address
+    /// </summary>
+    public string PostalCode { get; }
+    /// <summary>
+    /// The ISO country code of the new address
+    /// </summary>
+    public string IsoCountry { get; }
+    /// <summary>
+    /// A string to describe the new resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Whether to enable emergency calling on the new address
+    /// </summary>
+    public bool? EmergencyEnabled { get; set; }
+    /// <summary>
+    /// Whether we should automatically correct the address
+    /// </summary>
+    public bool? AutoCorrectAddress { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateAddressOptions
+    /// </summary>
+    /// <param name="customerName"> The name to associate with the new address </param>
+    /// <param name="street"> The number and street address of the new address </param>
+    /// <param name="city"> The city of the new address </param>
+    /// <param name="region"> The state or region of the new address </param>
+    /// <param name="postalCode"> The postal code of the new address </param>
+    /// <param name="isoCountry"> The ISO country code of the new address </param>
+    public CreateAddressOptions(string customerName,
+                                string street,
+                                string city,
+                                string region,
+                                string postalCode,
+                                string isoCountry)
+    {
+      CustomerName = customerName;
+      Street = street;
+      City = city;
+      Region = region;
+      PostalCode = postalCode;
+      IsoCountry = isoCountry;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (CustomerName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CustomerName", CustomerName));
+      }
+
+      if (Street != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Street", Street));
+      }
+
+      if (City != null)
+      {
+        p.Add(new KeyValuePair<string, string>("City", City));
+      }
+
+      if (Region != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Region", Region));
+      }
+
+      if (PostalCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostalCode", PostalCode));
+      }
+
+      if (IsoCountry != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (EmergencyEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyEnabled", EmergencyEnabled.Value.ToString().ToLower()));
+      }
+
+      if (AutoCorrectAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AutoCorrectAddress", AutoCorrectAddress.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteAddressOptions
+  /// </summary>
+  public class DeleteAddressOptions : IOptions<AddressResource>
+  {
+    /// <summary>
+    /// The SID of the Account that is responsible for the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteAddressOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteAddressOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchAddressOptions
+  /// </summary>
+  public class FetchAddressOptions : IOptions<AddressResource>
+  {
+    /// <summary>
+    /// The SID of the Account that is responsible for this address
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchAddressOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchAddressOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateAddressOptions
+  /// </summary>
+  public class UpdateAddressOptions : IOptions<AddressResource>
+  {
+    /// <summary>
+    /// The SID of the Account that is responsible for the resource to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The name to associate with the address
+    /// </summary>
+    public string CustomerName { get; set; }
+    /// <summary>
+    /// The number and street address of the address
+    /// </summary>
+    public string Street { get; set; }
+    /// <summary>
+    /// The city of the address
+    /// </summary>
+    public string City { get; set; }
+    /// <summary>
+    /// The state or region of the address
+    /// </summary>
+    public string Region { get; set; }
+    /// <summary>
+    /// The postal code of the address
+    /// </summary>
+    public string PostalCode { get; set; }
+    /// <summary>
+    /// Whether to enable emergency calling on the address
+    /// </summary>
+    public bool? EmergencyEnabled { get; set; }
+    /// <summary>
+    /// Whether we should automatically correct the address
+    /// </summary>
+    public bool? AutoCorrectAddress { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateAddressOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateAddressOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (CustomerName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CustomerName", CustomerName));
+      }
+
+      if (Street != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Street", Street));
+      }
+
+      if (City != null)
+      {
+        p.Add(new KeyValuePair<string, string>("City", City));
+      }
+
+      if (Region != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Region", Region));
+      }
+
+      if (PostalCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostalCode", PostalCode));
+      }
+
+      if (EmergencyEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyEnabled", EmergencyEnabled.Value.ToString().ToLower()));
+      }
+
+      if (AutoCorrectAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AutoCorrectAddress", AutoCorrectAddress.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadAddressOptions
+  /// </summary>
+  public class ReadAddressOptions : ReadOptions<AddressResource>
+  {
+    /// <summary>
+    /// The SID of the Account that is responsible for this address
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The `customer_name` of the Address resources to read
+    /// </summary>
+    public string CustomerName { get; set; }
+    /// <summary>
+    /// The string that identifies the Address resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The ISO country code of the Address resources to read
+    /// </summary>
+    public string IsoCountry { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (CustomerName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CustomerName", CustomerName));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (IsoCountry != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AddressResource.cs b/src/Twilio/Rest/Api/V2010/Account/AddressResource.cs
index 9ba56dbc6..c18b9525b 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AddressResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AddressResource.cs
@@ -16,601 +16,601 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class AddressResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateAddressOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Addresses.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Address parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Address </returns>
-        public static AddressResource Create(CreateAddressOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Address parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Address </returns>
-        public static async System.Threading.Tasks.Task<AddressResource> CreateAsync(CreateAddressOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="customerName"> The name to associate with the new address </param>
-        /// <param name="street"> The number and street address of the new address </param>
-        /// <param name="city"> The city of the new address </param>
-        /// <param name="region"> The state or region of the new address </param>
-        /// <param name="postalCode"> The postal code of the new address </param>
-        /// <param name="isoCountry"> The ISO country code of the new address </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will be responsible for the new Address resource </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="emergencyEnabled"> Whether to enable emergency calling on the new address </param>
-        /// <param name="autoCorrectAddress"> Whether we should automatically correct the address </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Address </returns>
-        public static AddressResource Create(string customerName,
-                                             string street,
-                                             string city,
-                                             string region,
-                                             string postalCode,
-                                             string isoCountry,
-                                             string pathAccountSid = null,
-                                             string friendlyName = null,
-                                             bool? emergencyEnabled = null,
-                                             bool? autoCorrectAddress = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateAddressOptions(customerName, street, city, region, postalCode, isoCountry){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, EmergencyEnabled = emergencyEnabled, AutoCorrectAddress = autoCorrectAddress};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="customerName"> The name to associate with the new address </param>
-        /// <param name="street"> The number and street address of the new address </param>
-        /// <param name="city"> The city of the new address </param>
-        /// <param name="region"> The state or region of the new address </param>
-        /// <param name="postalCode"> The postal code of the new address </param>
-        /// <param name="isoCountry"> The ISO country code of the new address </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will be responsible for the new Address resource </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="emergencyEnabled"> Whether to enable emergency calling on the new address </param>
-        /// <param name="autoCorrectAddress"> Whether we should automatically correct the address </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Address </returns>
-        public static async System.Threading.Tasks.Task<AddressResource> CreateAsync(string customerName,
-                                                                                     string street,
-                                                                                     string city,
-                                                                                     string region,
-                                                                                     string postalCode,
-                                                                                     string isoCountry,
-                                                                                     string pathAccountSid = null,
-                                                                                     string friendlyName = null,
-                                                                                     bool? emergencyEnabled = null,
-                                                                                     bool? autoCorrectAddress = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateAddressOptions(customerName, street, city, region, postalCode, isoCountry){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, EmergencyEnabled = emergencyEnabled, AutoCorrectAddress = autoCorrectAddress};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteAddressOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Addresses/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Address parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Address </returns>
-        public static bool Delete(DeleteAddressOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Address parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Address </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAddressOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that is responsible for the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Address </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteAddressOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that is responsible for the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Address </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteAddressOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchAddressOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Addresses/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Address parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Address </returns>
-        public static AddressResource Fetch(FetchAddressOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Address parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Address </returns>
-        public static async System.Threading.Tasks.Task<AddressResource> FetchAsync(FetchAddressOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that is responsible for this address </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Address </returns>
-        public static AddressResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchAddressOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that is responsible for this address </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Address </returns>
-        public static async System.Threading.Tasks.Task<AddressResource> FetchAsync(string pathSid,
-                                                                                    string pathAccountSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchAddressOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateAddressOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Addresses/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Address parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Address </returns>
-        public static AddressResource Update(UpdateAddressOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Address parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Address </returns>
-        public static async System.Threading.Tasks.Task<AddressResource> UpdateAsync(UpdateAddressOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that is responsible for the resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="customerName"> The name to associate with the address </param>
-        /// <param name="street"> The number and street address of the address </param>
-        /// <param name="city"> The city of the address </param>
-        /// <param name="region"> The state or region of the address </param>
-        /// <param name="postalCode"> The postal code of the address </param>
-        /// <param name="emergencyEnabled"> Whether to enable emergency calling on the address </param>
-        /// <param name="autoCorrectAddress"> Whether we should automatically correct the address </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Address </returns>
-        public static AddressResource Update(string pathSid,
-                                             string pathAccountSid = null,
-                                             string friendlyName = null,
-                                             string customerName = null,
-                                             string street = null,
-                                             string city = null,
-                                             string region = null,
-                                             string postalCode = null,
-                                             bool? emergencyEnabled = null,
-                                             bool? autoCorrectAddress = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateAddressOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, CustomerName = customerName, Street = street, City = city, Region = region, PostalCode = postalCode, EmergencyEnabled = emergencyEnabled, AutoCorrectAddress = autoCorrectAddress};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that is responsible for the resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="customerName"> The name to associate with the address </param>
-        /// <param name="street"> The number and street address of the address </param>
-        /// <param name="city"> The city of the address </param>
-        /// <param name="region"> The state or region of the address </param>
-        /// <param name="postalCode"> The postal code of the address </param>
-        /// <param name="emergencyEnabled"> Whether to enable emergency calling on the address </param>
-        /// <param name="autoCorrectAddress"> Whether we should automatically correct the address </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Address </returns>
-        public static async System.Threading.Tasks.Task<AddressResource> UpdateAsync(string pathSid,
-                                                                                     string pathAccountSid = null,
-                                                                                     string friendlyName = null,
-                                                                                     string customerName = null,
-                                                                                     string street = null,
-                                                                                     string city = null,
-                                                                                     string region = null,
-                                                                                     string postalCode = null,
-                                                                                     bool? emergencyEnabled = null,
-                                                                                     bool? autoCorrectAddress = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateAddressOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, CustomerName = customerName, Street = street, City = city, Region = region, PostalCode = postalCode, EmergencyEnabled = emergencyEnabled, AutoCorrectAddress = autoCorrectAddress};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAddressOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Addresses.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Address parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Address </returns>
-        public static ResourceSet<AddressResource> Read(ReadAddressOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AddressResource>.FromJson("addresses", response.Content);
-            return new ResourceSet<AddressResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Address parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Address </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AddressResource>> ReadAsync(ReadAddressOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AddressResource>.FromJson("addresses", response.Content);
-            return new ResourceSet<AddressResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that is responsible for this address </param>
-        /// <param name="customerName"> The `customer_name` of the Address resources to read </param>
-        /// <param name="friendlyName"> The string that identifies the Address resources to read </param>
-        /// <param name="isoCountry"> The ISO country code of the Address resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Address </returns>
-        public static ResourceSet<AddressResource> Read(string pathAccountSid = null,
-                                                        string customerName = null,
-                                                        string friendlyName = null,
-                                                        string isoCountry = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadAddressOptions(){PathAccountSid = pathAccountSid, CustomerName = customerName, FriendlyName = friendlyName, IsoCountry = isoCountry, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that is responsible for this address </param>
-        /// <param name="customerName"> The `customer_name` of the Address resources to read </param>
-        /// <param name="friendlyName"> The string that identifies the Address resources to read </param>
-        /// <param name="isoCountry"> The ISO country code of the Address resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Address </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AddressResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                string customerName = null,
-                                                                                                string friendlyName = null,
-                                                                                                string isoCountry = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadAddressOptions(){PathAccountSid = pathAccountSid, CustomerName = customerName, FriendlyName = friendlyName, IsoCountry = isoCountry, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AddressResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AddressResource>.FromJson("addresses", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AddressResource> NextPage(Page<AddressResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AddressResource>.FromJson("addresses", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AddressResource> PreviousPage(Page<AddressResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AddressResource>.FromJson("addresses", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a AddressResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AddressResource object represented by the provided JSON </returns>
-        public static AddressResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AddressResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that is responsible for the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The city in which the address is located
-        /// </summary>
-        [JsonProperty("city")]
-        public string City { get; private set; }
-        /// <summary>
-        /// The name associated with the address
-        /// </summary>
-        [JsonProperty("customer_name")]
-        public string CustomerName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The ISO country code of the address
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The postal code of the address
-        /// </summary>
-        [JsonProperty("postal_code")]
-        public string PostalCode { get; private set; }
-        /// <summary>
-        /// The state or region of the address
-        /// </summary>
-        [JsonProperty("region")]
-        public string Region { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The number and street address of the address
-        /// </summary>
-        [JsonProperty("street")]
-        public string Street { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// Whether emergency calling has been enabled on this number
-        /// </summary>
-        [JsonProperty("emergency_enabled")]
-        public bool? EmergencyEnabled { get; private set; }
-        /// <summary>
-        /// Whether the address has been validated to comply with local regulation
-        /// </summary>
-        [JsonProperty("validated")]
-        public bool? Validated { get; private set; }
-        /// <summary>
-        /// Whether the address has been verified to comply with regulation
-        /// </summary>
-        [JsonProperty("verified")]
-        public bool? Verified { get; private set; }
-
-        private AddressResource()
-        {
-
-        }
-    }
+{
+
+  public class AddressResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateAddressOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Addresses.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Address parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Address </returns>
+    public static AddressResource Create(CreateAddressOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Address parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Address </returns>
+    public static async System.Threading.Tasks.Task<AddressResource> CreateAsync(CreateAddressOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="customerName"> The name to associate with the new address </param>
+    /// <param name="street"> The number and street address of the new address </param>
+    /// <param name="city"> The city of the new address </param>
+    /// <param name="region"> The state or region of the new address </param>
+    /// <param name="postalCode"> The postal code of the new address </param>
+    /// <param name="isoCountry"> The ISO country code of the new address </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will be responsible for the new Address resource </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="emergencyEnabled"> Whether to enable emergency calling on the new address </param>
+    /// <param name="autoCorrectAddress"> Whether we should automatically correct the address </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Address </returns>
+    public static AddressResource Create(string customerName,
+                                         string street,
+                                         string city,
+                                         string region,
+                                         string postalCode,
+                                         string isoCountry,
+                                         string pathAccountSid = null,
+                                         string friendlyName = null,
+                                         bool? emergencyEnabled = null,
+                                         bool? autoCorrectAddress = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateAddressOptions(customerName, street, city, region, postalCode, isoCountry) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, EmergencyEnabled = emergencyEnabled, AutoCorrectAddress = autoCorrectAddress };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="customerName"> The name to associate with the new address </param>
+    /// <param name="street"> The number and street address of the new address </param>
+    /// <param name="city"> The city of the new address </param>
+    /// <param name="region"> The state or region of the new address </param>
+    /// <param name="postalCode"> The postal code of the new address </param>
+    /// <param name="isoCountry"> The ISO country code of the new address </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will be responsible for the new Address resource </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="emergencyEnabled"> Whether to enable emergency calling on the new address </param>
+    /// <param name="autoCorrectAddress"> Whether we should automatically correct the address </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Address </returns>
+    public static async System.Threading.Tasks.Task<AddressResource> CreateAsync(string customerName,
+                                                                                 string street,
+                                                                                 string city,
+                                                                                 string region,
+                                                                                 string postalCode,
+                                                                                 string isoCountry,
+                                                                                 string pathAccountSid = null,
+                                                                                 string friendlyName = null,
+                                                                                 bool? emergencyEnabled = null,
+                                                                                 bool? autoCorrectAddress = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateAddressOptions(customerName, street, city, region, postalCode, isoCountry) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, EmergencyEnabled = emergencyEnabled, AutoCorrectAddress = autoCorrectAddress };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteAddressOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Addresses/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Address parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Address </returns>
+    public static bool Delete(DeleteAddressOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Address parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Address </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAddressOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that is responsible for the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Address </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteAddressOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that is responsible for the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Address </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteAddressOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchAddressOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Addresses/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Address parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Address </returns>
+    public static AddressResource Fetch(FetchAddressOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Address parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Address </returns>
+    public static async System.Threading.Tasks.Task<AddressResource> FetchAsync(FetchAddressOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that is responsible for this address </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Address </returns>
+    public static AddressResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchAddressOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that is responsible for this address </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Address </returns>
+    public static async System.Threading.Tasks.Task<AddressResource> FetchAsync(string pathSid,
+                                                                                string pathAccountSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchAddressOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateAddressOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Addresses/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Address parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Address </returns>
+    public static AddressResource Update(UpdateAddressOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Address parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Address </returns>
+    public static async System.Threading.Tasks.Task<AddressResource> UpdateAsync(UpdateAddressOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that is responsible for the resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="customerName"> The name to associate with the address </param>
+    /// <param name="street"> The number and street address of the address </param>
+    /// <param name="city"> The city of the address </param>
+    /// <param name="region"> The state or region of the address </param>
+    /// <param name="postalCode"> The postal code of the address </param>
+    /// <param name="emergencyEnabled"> Whether to enable emergency calling on the address </param>
+    /// <param name="autoCorrectAddress"> Whether we should automatically correct the address </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Address </returns>
+    public static AddressResource Update(string pathSid,
+                                         string pathAccountSid = null,
+                                         string friendlyName = null,
+                                         string customerName = null,
+                                         string street = null,
+                                         string city = null,
+                                         string region = null,
+                                         string postalCode = null,
+                                         bool? emergencyEnabled = null,
+                                         bool? autoCorrectAddress = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateAddressOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, CustomerName = customerName, Street = street, City = city, Region = region, PostalCode = postalCode, EmergencyEnabled = emergencyEnabled, AutoCorrectAddress = autoCorrectAddress };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that is responsible for the resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="customerName"> The name to associate with the address </param>
+    /// <param name="street"> The number and street address of the address </param>
+    /// <param name="city"> The city of the address </param>
+    /// <param name="region"> The state or region of the address </param>
+    /// <param name="postalCode"> The postal code of the address </param>
+    /// <param name="emergencyEnabled"> Whether to enable emergency calling on the address </param>
+    /// <param name="autoCorrectAddress"> Whether we should automatically correct the address </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Address </returns>
+    public static async System.Threading.Tasks.Task<AddressResource> UpdateAsync(string pathSid,
+                                                                                 string pathAccountSid = null,
+                                                                                 string friendlyName = null,
+                                                                                 string customerName = null,
+                                                                                 string street = null,
+                                                                                 string city = null,
+                                                                                 string region = null,
+                                                                                 string postalCode = null,
+                                                                                 bool? emergencyEnabled = null,
+                                                                                 bool? autoCorrectAddress = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateAddressOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, CustomerName = customerName, Street = street, City = city, Region = region, PostalCode = postalCode, EmergencyEnabled = emergencyEnabled, AutoCorrectAddress = autoCorrectAddress };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAddressOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Addresses.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Address parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Address </returns>
+    public static ResourceSet<AddressResource> Read(ReadAddressOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AddressResource>.FromJson("addresses", response.Content);
+      return new ResourceSet<AddressResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Address parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Address </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AddressResource>> ReadAsync(ReadAddressOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AddressResource>.FromJson("addresses", response.Content);
+      return new ResourceSet<AddressResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that is responsible for this address </param>
+    /// <param name="customerName"> The `customer_name` of the Address resources to read </param>
+    /// <param name="friendlyName"> The string that identifies the Address resources to read </param>
+    /// <param name="isoCountry"> The ISO country code of the Address resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Address </returns>
+    public static ResourceSet<AddressResource> Read(string pathAccountSid = null,
+                                                    string customerName = null,
+                                                    string friendlyName = null,
+                                                    string isoCountry = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadAddressOptions() { PathAccountSid = pathAccountSid, CustomerName = customerName, FriendlyName = friendlyName, IsoCountry = isoCountry, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that is responsible for this address </param>
+    /// <param name="customerName"> The `customer_name` of the Address resources to read </param>
+    /// <param name="friendlyName"> The string that identifies the Address resources to read </param>
+    /// <param name="isoCountry"> The ISO country code of the Address resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Address </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AddressResource>> ReadAsync(string pathAccountSid = null,
+                                                                                            string customerName = null,
+                                                                                            string friendlyName = null,
+                                                                                            string isoCountry = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadAddressOptions() { PathAccountSid = pathAccountSid, CustomerName = customerName, FriendlyName = friendlyName, IsoCountry = isoCountry, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AddressResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AddressResource>.FromJson("addresses", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AddressResource> NextPage(Page<AddressResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AddressResource>.FromJson("addresses", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AddressResource> PreviousPage(Page<AddressResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AddressResource>.FromJson("addresses", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a AddressResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AddressResource object represented by the provided JSON </returns>
+    public static AddressResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AddressResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that is responsible for the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The city in which the address is located
+    /// </summary>
+    [JsonProperty("city")]
+    public string City { get; private set; }
+    /// <summary>
+    /// The name associated with the address
+    /// </summary>
+    [JsonProperty("customer_name")]
+    public string CustomerName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The ISO country code of the address
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The postal code of the address
+    /// </summary>
+    [JsonProperty("postal_code")]
+    public string PostalCode { get; private set; }
+    /// <summary>
+    /// The state or region of the address
+    /// </summary>
+    [JsonProperty("region")]
+    public string Region { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The number and street address of the address
+    /// </summary>
+    [JsonProperty("street")]
+    public string Street { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// Whether emergency calling has been enabled on this number
+    /// </summary>
+    [JsonProperty("emergency_enabled")]
+    public bool? EmergencyEnabled { get; private set; }
+    /// <summary>
+    /// Whether the address has been validated to comply with local regulation
+    /// </summary>
+    [JsonProperty("validated")]
+    public bool? Validated { get; private set; }
+    /// <summary>
+    /// Whether the address has been verified to comply with regulation
+    /// </summary>
+    [JsonProperty("verified")]
+    public bool? Verified { get; private set; }
+
+    private AddressResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/ApplicationOptions.cs b/src/Twilio/Rest/Api/V2010/Account/ApplicationOptions.cs
index 4197a59ed..2e25f8a83 100644
--- a/src/Twilio/Rest/Api/V2010/Account/ApplicationOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/ApplicationOptions.cs
@@ -9,429 +9,429 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Create a new application within your account
+  /// </summary>
+  public class CreateApplicationOptions : IOptions<ApplicationResource>
+  {
     /// <summary>
-    /// Create a new application within your account
-    /// </summary>
-    public class CreateApplicationOptions : IOptions<ApplicationResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The API version to use to start a new TwiML session
-        /// </summary>
-        public string ApiVersion { get; set; }
-        /// <summary>
-        /// The URL to call when the phone number receives a call
-        /// </summary>
-        public Uri VoiceUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with the voice_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceMethod { get; set; }
-        /// <summary>
-        /// The URL to call when a TwiML error occurs
-        /// </summary>
-        public Uri VoiceFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with voice_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method to use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        public bool? VoiceCallerIdLookup { get; set; }
-        /// <summary>
-        /// The URL to call when the phone number receives an incoming SMS message
-        /// </summary>
-        public Uri SmsUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with sms_url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsMethod { get; set; }
-        /// <summary>
-        /// The URL to call when an error occurs while retrieving or executing the TwiML
-        /// </summary>
-        public Uri SmsFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with sms_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        public Uri SmsStatusCallback { get; set; }
-        /// <summary>
-        /// The URL to send message status information to your application
-        /// </summary>
-        public Uri MessageStatusCallback { get; set; }
-        /// <summary>
-        /// A string to describe the new resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ApiVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
-            }
-
-            if (VoiceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
-            }
-
-            if (VoiceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
-            }
-
-            if (VoiceFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
-            }
-
-            if (VoiceFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (VoiceCallerIdLookup != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
-            }
-
-            if (SmsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
-            }
-
-            if (SmsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
-            }
-
-            if (SmsFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
-            }
-
-            if (SmsFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
-            }
-
-            if (SmsStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsStatusCallback", Serializers.Url(SmsStatusCallback)));
-            }
-
-            if (MessageStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessageStatusCallback", Serializers.Url(MessageStatusCallback)));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Delete the application by the specified application sid
-    /// </summary>
-    public class DeleteApplicationOptions : IOptions<ApplicationResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteApplicationOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteApplicationOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The API version to use to start a new TwiML session
+    /// </summary>
+    public string ApiVersion { get; set; }
     /// <summary>
-    /// Fetch the application specified by the provided sid
-    /// </summary>
-    public class FetchApplicationOptions : IOptions<ApplicationResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchApplicationOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchApplicationOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The URL to call when the phone number receives a call
+    /// </summary>
+    public Uri VoiceUrl { get; set; }
     /// <summary>
-    /// Retrieve a list of applications representing an application within the requesting account
-    /// </summary>
-    public class ReadApplicationOptions : ReadOptions<ApplicationResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The string that identifies the Application resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The HTTP method to use with the voice_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceMethod { get; set; }
     /// <summary>
-    /// Updates the application's properties
-    /// </summary>
-    public class UpdateApplicationOptions : IOptions<ApplicationResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The API version to use to start a new TwiML session
-        /// </summary>
-        public string ApiVersion { get; set; }
-        /// <summary>
-        /// The URL to call when the phone number receives a call
-        /// </summary>
-        public Uri VoiceUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with the voice_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceMethod { get; set; }
-        /// <summary>
-        /// The URL to call when a TwiML error occurs
-        /// </summary>
-        public Uri VoiceFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with voice_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method to use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        public bool? VoiceCallerIdLookup { get; set; }
-        /// <summary>
-        /// The URL to call when the phone number receives an incoming SMS message
-        /// </summary>
-        public Uri SmsUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with sms_url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsMethod { get; set; }
-        /// <summary>
-        /// The URL to call when an error occurs while retrieving or executing the TwiML
-        /// </summary>
-        public Uri SmsFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with sms_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
-        /// <summary>
-        /// Same as message_status_callback. Deprecated, included for backwards compatibility.
-        /// </summary>
-        public Uri SmsStatusCallback { get; set; }
-        /// <summary>
-        /// The URL to send message status information to your application
-        /// </summary>
-        public Uri MessageStatusCallback { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateApplicationOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateApplicationOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (ApiVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
-            }
-
-            if (VoiceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
-            }
-
-            if (VoiceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
-            }
-
-            if (VoiceFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
-            }
-
-            if (VoiceFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (VoiceCallerIdLookup != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
-            }
-
-            if (SmsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
-            }
-
-            if (SmsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
-            }
-
-            if (SmsFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
-            }
-
-            if (SmsFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
-            }
-
-            if (SmsStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsStatusCallback", Serializers.Url(SmsStatusCallback)));
-            }
-
-            if (MessageStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessageStatusCallback", Serializers.Url(MessageStatusCallback)));
-            }
-
-            return p;
-        }
-    }
+    /// The URL to call when a TwiML error occurs
+    /// </summary>
+    public Uri VoiceFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with voice_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method to use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    public bool? VoiceCallerIdLookup { get; set; }
+    /// <summary>
+    /// The URL to call when the phone number receives an incoming SMS message
+    /// </summary>
+    public Uri SmsUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with sms_url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsMethod { get; set; }
+    /// <summary>
+    /// The URL to call when an error occurs while retrieving or executing the TwiML
+    /// </summary>
+    public Uri SmsFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with sms_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    public Uri SmsStatusCallback { get; set; }
+    /// <summary>
+    /// The URL to send message status information to your application
+    /// </summary>
+    public Uri MessageStatusCallback { get; set; }
+    /// <summary>
+    /// A string to describe the new resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ApiVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
+      }
+
+      if (VoiceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
+      }
+
+      if (VoiceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
+      }
+
+      if (VoiceFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
+      }
+
+      if (VoiceFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (VoiceCallerIdLookup != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
+      }
+
+      if (SmsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
+      }
+
+      if (SmsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
+      }
+
+      if (SmsFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
+      }
+
+      if (SmsFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
+      }
+
+      if (SmsStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsStatusCallback", Serializers.Url(SmsStatusCallback)));
+      }
+
+      if (MessageStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessageStatusCallback", Serializers.Url(MessageStatusCallback)));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete the application by the specified application sid
+  /// </summary>
+  public class DeleteApplicationOptions : IOptions<ApplicationResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteApplicationOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteApplicationOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch the application specified by the provided sid
+  /// </summary>
+  public class FetchApplicationOptions : IOptions<ApplicationResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchApplicationOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchApplicationOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of applications representing an application within the requesting account
+  /// </summary>
+  public class ReadApplicationOptions : ReadOptions<ApplicationResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The string that identifies the Application resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Updates the application's properties
+  /// </summary>
+  public class UpdateApplicationOptions : IOptions<ApplicationResource>
+  {
+    /// <summary>
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The API version to use to start a new TwiML session
+    /// </summary>
+    public string ApiVersion { get; set; }
+    /// <summary>
+    /// The URL to call when the phone number receives a call
+    /// </summary>
+    public Uri VoiceUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with the voice_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceMethod { get; set; }
+    /// <summary>
+    /// The URL to call when a TwiML error occurs
+    /// </summary>
+    public Uri VoiceFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with voice_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method to use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    public bool? VoiceCallerIdLookup { get; set; }
+    /// <summary>
+    /// The URL to call when the phone number receives an incoming SMS message
+    /// </summary>
+    public Uri SmsUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with sms_url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsMethod { get; set; }
+    /// <summary>
+    /// The URL to call when an error occurs while retrieving or executing the TwiML
+    /// </summary>
+    public Uri SmsFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with sms_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
+    /// <summary>
+    /// Same as message_status_callback. Deprecated, included for backwards compatibility.
+    /// </summary>
+    public Uri SmsStatusCallback { get; set; }
+    /// <summary>
+    /// The URL to send message status information to your application
+    /// </summary>
+    public Uri MessageStatusCallback { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateApplicationOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateApplicationOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (ApiVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
+      }
+
+      if (VoiceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
+      }
+
+      if (VoiceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
+      }
+
+      if (VoiceFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
+      }
+
+      if (VoiceFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (VoiceCallerIdLookup != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
+      }
+
+      if (SmsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
+      }
+
+      if (SmsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
+      }
+
+      if (SmsFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
+      }
+
+      if (SmsFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
+      }
+
+      if (SmsStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsStatusCallback", Serializers.Url(SmsStatusCallback)));
+      }
+
+      if (MessageStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessageStatusCallback", Serializers.Url(MessageStatusCallback)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/ApplicationResource.cs b/src/Twilio/Rest/Api/V2010/Account/ApplicationResource.cs
index bdea8bebe..7c28554f1 100644
--- a/src/Twilio/Rest/Api/V2010/Account/ApplicationResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/ApplicationResource.cs
@@ -16,679 +16,679 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class ApplicationResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateApplicationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Applications.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new application within your account
-        /// </summary>
-        /// <param name="options"> Create Application parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Application </returns>
-        public static ApplicationResource Create(CreateApplicationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new application within your account
-        /// </summary>
-        /// <param name="options"> Create Application parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Application </returns>
-        public static async System.Threading.Tasks.Task<ApplicationResource> CreateAsync(CreateApplicationOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new application within your account
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="apiVersion"> The API version to use to start a new TwiML session </param>
-        /// <param name="voiceUrl"> The URL to call when the phone number receives a call </param>
-        /// <param name="voiceMethod"> The HTTP method to use with the voice_url </param>
-        /// <param name="voiceFallbackUrl"> The URL to call when a TwiML error occurs </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
-        /// <param name="statusCallback"> The URL to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method to use to call status_callback </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="smsUrl"> The URL to call when the phone number receives an incoming SMS message </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
-        /// <param name="smsFallbackUrl"> The URL to call when an error occurs while retrieving or executing the TwiML </param>
-        /// <param name="smsFallbackMethod"> The HTTP method to use with sms_fallback_url </param>
-        /// <param name="smsStatusCallback"> The URL to send status information to your application </param>
-        /// <param name="messageStatusCallback"> The URL to send message status information to your application </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Application </returns>
-        public static ApplicationResource Create(string pathAccountSid = null,
-                                                 string apiVersion = null,
-                                                 Uri voiceUrl = null,
-                                                 Twilio.Http.HttpMethod voiceMethod = null,
-                                                 Uri voiceFallbackUrl = null,
-                                                 Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                 Uri statusCallback = null,
-                                                 Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                 bool? voiceCallerIdLookup = null,
-                                                 Uri smsUrl = null,
-                                                 Twilio.Http.HttpMethod smsMethod = null,
-                                                 Uri smsFallbackUrl = null,
-                                                 Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                 Uri smsStatusCallback = null,
-                                                 Uri messageStatusCallback = null,
-                                                 string friendlyName = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateApplicationOptions(){PathAccountSid = pathAccountSid, ApiVersion = apiVersion, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceCallerIdLookup = voiceCallerIdLookup, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsStatusCallback = smsStatusCallback, MessageStatusCallback = messageStatusCallback, FriendlyName = friendlyName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new application within your account
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="apiVersion"> The API version to use to start a new TwiML session </param>
-        /// <param name="voiceUrl"> The URL to call when the phone number receives a call </param>
-        /// <param name="voiceMethod"> The HTTP method to use with the voice_url </param>
-        /// <param name="voiceFallbackUrl"> The URL to call when a TwiML error occurs </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
-        /// <param name="statusCallback"> The URL to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method to use to call status_callback </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="smsUrl"> The URL to call when the phone number receives an incoming SMS message </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
-        /// <param name="smsFallbackUrl"> The URL to call when an error occurs while retrieving or executing the TwiML </param>
-        /// <param name="smsFallbackMethod"> The HTTP method to use with sms_fallback_url </param>
-        /// <param name="smsStatusCallback"> The URL to send status information to your application </param>
-        /// <param name="messageStatusCallback"> The URL to send message status information to your application </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Application </returns>
-        public static async System.Threading.Tasks.Task<ApplicationResource> CreateAsync(string pathAccountSid = null,
-                                                                                         string apiVersion = null,
-                                                                                         Uri voiceUrl = null,
-                                                                                         Twilio.Http.HttpMethod voiceMethod = null,
-                                                                                         Uri voiceFallbackUrl = null,
-                                                                                         Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                                                         Uri statusCallback = null,
-                                                                                         Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                         bool? voiceCallerIdLookup = null,
-                                                                                         Uri smsUrl = null,
-                                                                                         Twilio.Http.HttpMethod smsMethod = null,
-                                                                                         Uri smsFallbackUrl = null,
-                                                                                         Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                                                         Uri smsStatusCallback = null,
-                                                                                         Uri messageStatusCallback = null,
-                                                                                         string friendlyName = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateApplicationOptions(){PathAccountSid = pathAccountSid, ApiVersion = apiVersion, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceCallerIdLookup = voiceCallerIdLookup, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsStatusCallback = smsStatusCallback, MessageStatusCallback = messageStatusCallback, FriendlyName = friendlyName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteApplicationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Applications/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete the application by the specified application sid
-        /// </summary>
-        /// <param name="options"> Delete Application parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Application </returns>
-        public static bool Delete(DeleteApplicationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete the application by the specified application sid
-        /// </summary>
-        /// <param name="options"> Delete Application parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Application </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteApplicationOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete the application by the specified application sid
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Application </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteApplicationOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete the application by the specified application sid
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Application </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteApplicationOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchApplicationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Applications/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the application specified by the provided sid
-        /// </summary>
-        /// <param name="options"> Fetch Application parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Application </returns>
-        public static ApplicationResource Fetch(FetchApplicationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the application specified by the provided sid
-        /// </summary>
-        /// <param name="options"> Fetch Application parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Application </returns>
-        public static async System.Threading.Tasks.Task<ApplicationResource> FetchAsync(FetchApplicationOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the application specified by the provided sid
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Application </returns>
-        public static ApplicationResource Fetch(string pathSid,
-                                                string pathAccountSid = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchApplicationOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the application specified by the provided sid
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Application </returns>
-        public static async System.Threading.Tasks.Task<ApplicationResource> FetchAsync(string pathSid,
-                                                                                        string pathAccountSid = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchApplicationOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadApplicationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Applications.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of applications representing an application within the requesting account
-        /// </summary>
-        /// <param name="options"> Read Application parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Application </returns>
-        public static ResourceSet<ApplicationResource> Read(ReadApplicationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ApplicationResource>.FromJson("applications", response.Content);
-            return new ResourceSet<ApplicationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of applications representing an application within the requesting account
-        /// </summary>
-        /// <param name="options"> Read Application parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Application </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ApplicationResource>> ReadAsync(ReadApplicationOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ApplicationResource>.FromJson("applications", response.Content);
-            return new ResourceSet<ApplicationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of applications representing an application within the requesting account
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="friendlyName"> The string that identifies the Application resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Application </returns>
-        public static ResourceSet<ApplicationResource> Read(string pathAccountSid = null,
-                                                            string friendlyName = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadApplicationOptions(){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of applications representing an application within the requesting account
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="friendlyName"> The string that identifies the Application resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Application </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ApplicationResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                    string friendlyName = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadApplicationOptions(){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ApplicationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ApplicationResource>.FromJson("applications", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ApplicationResource> NextPage(Page<ApplicationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<ApplicationResource>.FromJson("applications", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ApplicationResource> PreviousPage(Page<ApplicationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<ApplicationResource>.FromJson("applications", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateApplicationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Applications/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates the application's properties
-        /// </summary>
-        /// <param name="options"> Update Application parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Application </returns>
-        public static ApplicationResource Update(UpdateApplicationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the application's properties
-        /// </summary>
-        /// <param name="options"> Update Application parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Application </returns>
-        public static async System.Threading.Tasks.Task<ApplicationResource> UpdateAsync(UpdateApplicationOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates the application's properties
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="apiVersion"> The API version to use to start a new TwiML session </param>
-        /// <param name="voiceUrl"> The URL to call when the phone number receives a call </param>
-        /// <param name="voiceMethod"> The HTTP method to use with the voice_url </param>
-        /// <param name="voiceFallbackUrl"> The URL to call when a TwiML error occurs </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
-        /// <param name="statusCallback"> The URL to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method to use to call status_callback </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="smsUrl"> The URL to call when the phone number receives an incoming SMS message </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
-        /// <param name="smsFallbackUrl"> The URL to call when an error occurs while retrieving or executing the TwiML </param>
-        /// <param name="smsFallbackMethod"> The HTTP method to use with sms_fallback_url </param>
-        /// <param name="smsStatusCallback"> Same as message_status_callback. Deprecated, included for backwards compatibility.
-        ///                         </param>
-        /// <param name="messageStatusCallback"> The URL to send message status information to your application </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Application </returns>
-        public static ApplicationResource Update(string pathSid,
-                                                 string pathAccountSid = null,
-                                                 string friendlyName = null,
-                                                 string apiVersion = null,
-                                                 Uri voiceUrl = null,
-                                                 Twilio.Http.HttpMethod voiceMethod = null,
-                                                 Uri voiceFallbackUrl = null,
-                                                 Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                 Uri statusCallback = null,
-                                                 Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                 bool? voiceCallerIdLookup = null,
-                                                 Uri smsUrl = null,
-                                                 Twilio.Http.HttpMethod smsMethod = null,
-                                                 Uri smsFallbackUrl = null,
-                                                 Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                 Uri smsStatusCallback = null,
-                                                 Uri messageStatusCallback = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateApplicationOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, ApiVersion = apiVersion, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceCallerIdLookup = voiceCallerIdLookup, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsStatusCallback = smsStatusCallback, MessageStatusCallback = messageStatusCallback};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the application's properties
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="apiVersion"> The API version to use to start a new TwiML session </param>
-        /// <param name="voiceUrl"> The URL to call when the phone number receives a call </param>
-        /// <param name="voiceMethod"> The HTTP method to use with the voice_url </param>
-        /// <param name="voiceFallbackUrl"> The URL to call when a TwiML error occurs </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
-        /// <param name="statusCallback"> The URL to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method to use to call status_callback </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="smsUrl"> The URL to call when the phone number receives an incoming SMS message </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
-        /// <param name="smsFallbackUrl"> The URL to call when an error occurs while retrieving or executing the TwiML </param>
-        /// <param name="smsFallbackMethod"> The HTTP method to use with sms_fallback_url </param>
-        /// <param name="smsStatusCallback"> Same as message_status_callback. Deprecated, included for backwards compatibility.
-        ///                         </param>
-        /// <param name="messageStatusCallback"> The URL to send message status information to your application </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Application </returns>
-        public static async System.Threading.Tasks.Task<ApplicationResource> UpdateAsync(string pathSid,
-                                                                                         string pathAccountSid = null,
-                                                                                         string friendlyName = null,
-                                                                                         string apiVersion = null,
-                                                                                         Uri voiceUrl = null,
-                                                                                         Twilio.Http.HttpMethod voiceMethod = null,
-                                                                                         Uri voiceFallbackUrl = null,
-                                                                                         Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                                                         Uri statusCallback = null,
-                                                                                         Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                         bool? voiceCallerIdLookup = null,
-                                                                                         Uri smsUrl = null,
-                                                                                         Twilio.Http.HttpMethod smsMethod = null,
-                                                                                         Uri smsFallbackUrl = null,
-                                                                                         Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                                                         Uri smsStatusCallback = null,
-                                                                                         Uri messageStatusCallback = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateApplicationOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, ApiVersion = apiVersion, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceCallerIdLookup = voiceCallerIdLookup, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsStatusCallback = smsStatusCallback, MessageStatusCallback = messageStatusCallback};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ApplicationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ApplicationResource object represented by the provided JSON </returns>
-        public static ApplicationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ApplicationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to start a new TwiML session
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The URL to send message status information to your application
-        /// </summary>
-        [JsonProperty("message_status_callback")]
-        public Uri MessageStatusCallback { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The HTTP method used with sms_fallback_url
-        /// </summary>
-        [JsonProperty("sms_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL that we call when an error occurs while retrieving or executing the TwiML
-        /// </summary>
-        [JsonProperty("sms_fallback_url")]
-        public Uri SmsFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method to use with sms_url
-        /// </summary>
-        [JsonProperty("sms_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsMethod { get; private set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        [JsonProperty("sms_status_callback")]
-        public Uri SmsStatusCallback { get; private set; }
-        /// <summary>
-        /// The URL we call when the phone number receives an incoming SMS message
-        /// </summary>
-        [JsonProperty("sms_url")]
-        public Uri SmsUrl { get; private set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call status_callback
-        /// </summary>
-        [JsonProperty("status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        [JsonProperty("voice_caller_id_lookup")]
-        public bool? VoiceCallerIdLookup { get; private set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        [JsonProperty("voice_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when a TwiML error occurs
-        /// </summary>
-        [JsonProperty("voice_fallback_url")]
-        public Uri VoiceFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method used with the voice_url
-        /// </summary>
-        [JsonProperty("voice_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when the phone number receives a call
-        /// </summary>
-        [JsonProperty("voice_url")]
-        public Uri VoiceUrl { get; private set; }
-
-        private ApplicationResource()
-        {
-
-        }
-    }
+{
+
+  public class ApplicationResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateApplicationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Applications.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new application within your account
+    /// </summary>
+    /// <param name="options"> Create Application parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Application </returns>
+    public static ApplicationResource Create(CreateApplicationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new application within your account
+    /// </summary>
+    /// <param name="options"> Create Application parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Application </returns>
+    public static async System.Threading.Tasks.Task<ApplicationResource> CreateAsync(CreateApplicationOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new application within your account
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="apiVersion"> The API version to use to start a new TwiML session </param>
+    /// <param name="voiceUrl"> The URL to call when the phone number receives a call </param>
+    /// <param name="voiceMethod"> The HTTP method to use with the voice_url </param>
+    /// <param name="voiceFallbackUrl"> The URL to call when a TwiML error occurs </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
+    /// <param name="statusCallback"> The URL to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method to use to call status_callback </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="smsUrl"> The URL to call when the phone number receives an incoming SMS message </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
+    /// <param name="smsFallbackUrl"> The URL to call when an error occurs while retrieving or executing the TwiML </param>
+    /// <param name="smsFallbackMethod"> The HTTP method to use with sms_fallback_url </param>
+    /// <param name="smsStatusCallback"> The URL to send status information to your application </param>
+    /// <param name="messageStatusCallback"> The URL to send message status information to your application </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Application </returns>
+    public static ApplicationResource Create(string pathAccountSid = null,
+                                             string apiVersion = null,
+                                             Uri voiceUrl = null,
+                                             Twilio.Http.HttpMethod voiceMethod = null,
+                                             Uri voiceFallbackUrl = null,
+                                             Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                             Uri statusCallback = null,
+                                             Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                             bool? voiceCallerIdLookup = null,
+                                             Uri smsUrl = null,
+                                             Twilio.Http.HttpMethod smsMethod = null,
+                                             Uri smsFallbackUrl = null,
+                                             Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                             Uri smsStatusCallback = null,
+                                             Uri messageStatusCallback = null,
+                                             string friendlyName = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateApplicationOptions() { PathAccountSid = pathAccountSid, ApiVersion = apiVersion, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceCallerIdLookup = voiceCallerIdLookup, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsStatusCallback = smsStatusCallback, MessageStatusCallback = messageStatusCallback, FriendlyName = friendlyName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new application within your account
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="apiVersion"> The API version to use to start a new TwiML session </param>
+    /// <param name="voiceUrl"> The URL to call when the phone number receives a call </param>
+    /// <param name="voiceMethod"> The HTTP method to use with the voice_url </param>
+    /// <param name="voiceFallbackUrl"> The URL to call when a TwiML error occurs </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
+    /// <param name="statusCallback"> The URL to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method to use to call status_callback </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="smsUrl"> The URL to call when the phone number receives an incoming SMS message </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
+    /// <param name="smsFallbackUrl"> The URL to call when an error occurs while retrieving or executing the TwiML </param>
+    /// <param name="smsFallbackMethod"> The HTTP method to use with sms_fallback_url </param>
+    /// <param name="smsStatusCallback"> The URL to send status information to your application </param>
+    /// <param name="messageStatusCallback"> The URL to send message status information to your application </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Application </returns>
+    public static async System.Threading.Tasks.Task<ApplicationResource> CreateAsync(string pathAccountSid = null,
+                                                                                     string apiVersion = null,
+                                                                                     Uri voiceUrl = null,
+                                                                                     Twilio.Http.HttpMethod voiceMethod = null,
+                                                                                     Uri voiceFallbackUrl = null,
+                                                                                     Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                                                     Uri statusCallback = null,
+                                                                                     Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                     bool? voiceCallerIdLookup = null,
+                                                                                     Uri smsUrl = null,
+                                                                                     Twilio.Http.HttpMethod smsMethod = null,
+                                                                                     Uri smsFallbackUrl = null,
+                                                                                     Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                                                     Uri smsStatusCallback = null,
+                                                                                     Uri messageStatusCallback = null,
+                                                                                     string friendlyName = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateApplicationOptions() { PathAccountSid = pathAccountSid, ApiVersion = apiVersion, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceCallerIdLookup = voiceCallerIdLookup, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsStatusCallback = smsStatusCallback, MessageStatusCallback = messageStatusCallback, FriendlyName = friendlyName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteApplicationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Applications/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete the application by the specified application sid
+    /// </summary>
+    /// <param name="options"> Delete Application parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Application </returns>
+    public static bool Delete(DeleteApplicationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete the application by the specified application sid
+    /// </summary>
+    /// <param name="options"> Delete Application parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Application </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteApplicationOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete the application by the specified application sid
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Application </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteApplicationOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete the application by the specified application sid
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Application </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteApplicationOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchApplicationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Applications/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the application specified by the provided sid
+    /// </summary>
+    /// <param name="options"> Fetch Application parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Application </returns>
+    public static ApplicationResource Fetch(FetchApplicationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the application specified by the provided sid
+    /// </summary>
+    /// <param name="options"> Fetch Application parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Application </returns>
+    public static async System.Threading.Tasks.Task<ApplicationResource> FetchAsync(FetchApplicationOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the application specified by the provided sid
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Application </returns>
+    public static ApplicationResource Fetch(string pathSid,
+                                            string pathAccountSid = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchApplicationOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the application specified by the provided sid
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Application </returns>
+    public static async System.Threading.Tasks.Task<ApplicationResource> FetchAsync(string pathSid,
+                                                                                    string pathAccountSid = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchApplicationOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadApplicationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Applications.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of applications representing an application within the requesting account
+    /// </summary>
+    /// <param name="options"> Read Application parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Application </returns>
+    public static ResourceSet<ApplicationResource> Read(ReadApplicationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ApplicationResource>.FromJson("applications", response.Content);
+      return new ResourceSet<ApplicationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of applications representing an application within the requesting account
+    /// </summary>
+    /// <param name="options"> Read Application parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Application </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ApplicationResource>> ReadAsync(ReadApplicationOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ApplicationResource>.FromJson("applications", response.Content);
+      return new ResourceSet<ApplicationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of applications representing an application within the requesting account
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="friendlyName"> The string that identifies the Application resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Application </returns>
+    public static ResourceSet<ApplicationResource> Read(string pathAccountSid = null,
+                                                        string friendlyName = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadApplicationOptions() { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of applications representing an application within the requesting account
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="friendlyName"> The string that identifies the Application resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Application </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ApplicationResource>> ReadAsync(string pathAccountSid = null,
+                                                                                                string friendlyName = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadApplicationOptions() { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ApplicationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ApplicationResource>.FromJson("applications", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ApplicationResource> NextPage(Page<ApplicationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<ApplicationResource>.FromJson("applications", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ApplicationResource> PreviousPage(Page<ApplicationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<ApplicationResource>.FromJson("applications", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateApplicationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Applications/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates the application's properties
+    /// </summary>
+    /// <param name="options"> Update Application parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Application </returns>
+    public static ApplicationResource Update(UpdateApplicationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the application's properties
+    /// </summary>
+    /// <param name="options"> Update Application parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Application </returns>
+    public static async System.Threading.Tasks.Task<ApplicationResource> UpdateAsync(UpdateApplicationOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates the application's properties
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="apiVersion"> The API version to use to start a new TwiML session </param>
+    /// <param name="voiceUrl"> The URL to call when the phone number receives a call </param>
+    /// <param name="voiceMethod"> The HTTP method to use with the voice_url </param>
+    /// <param name="voiceFallbackUrl"> The URL to call when a TwiML error occurs </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
+    /// <param name="statusCallback"> The URL to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method to use to call status_callback </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="smsUrl"> The URL to call when the phone number receives an incoming SMS message </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
+    /// <param name="smsFallbackUrl"> The URL to call when an error occurs while retrieving or executing the TwiML </param>
+    /// <param name="smsFallbackMethod"> The HTTP method to use with sms_fallback_url </param>
+    /// <param name="smsStatusCallback"> Same as message_status_callback. Deprecated, included for backwards compatibility.
+    ///                         </param>
+    /// <param name="messageStatusCallback"> The URL to send message status information to your application </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Application </returns>
+    public static ApplicationResource Update(string pathSid,
+                                             string pathAccountSid = null,
+                                             string friendlyName = null,
+                                             string apiVersion = null,
+                                             Uri voiceUrl = null,
+                                             Twilio.Http.HttpMethod voiceMethod = null,
+                                             Uri voiceFallbackUrl = null,
+                                             Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                             Uri statusCallback = null,
+                                             Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                             bool? voiceCallerIdLookup = null,
+                                             Uri smsUrl = null,
+                                             Twilio.Http.HttpMethod smsMethod = null,
+                                             Uri smsFallbackUrl = null,
+                                             Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                             Uri smsStatusCallback = null,
+                                             Uri messageStatusCallback = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateApplicationOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, ApiVersion = apiVersion, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceCallerIdLookup = voiceCallerIdLookup, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsStatusCallback = smsStatusCallback, MessageStatusCallback = messageStatusCallback };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the application's properties
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="apiVersion"> The API version to use to start a new TwiML session </param>
+    /// <param name="voiceUrl"> The URL to call when the phone number receives a call </param>
+    /// <param name="voiceMethod"> The HTTP method to use with the voice_url </param>
+    /// <param name="voiceFallbackUrl"> The URL to call when a TwiML error occurs </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
+    /// <param name="statusCallback"> The URL to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method to use to call status_callback </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="smsUrl"> The URL to call when the phone number receives an incoming SMS message </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
+    /// <param name="smsFallbackUrl"> The URL to call when an error occurs while retrieving or executing the TwiML </param>
+    /// <param name="smsFallbackMethod"> The HTTP method to use with sms_fallback_url </param>
+    /// <param name="smsStatusCallback"> Same as message_status_callback. Deprecated, included for backwards compatibility.
+    ///                         </param>
+    /// <param name="messageStatusCallback"> The URL to send message status information to your application </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Application </returns>
+    public static async System.Threading.Tasks.Task<ApplicationResource> UpdateAsync(string pathSid,
+                                                                                     string pathAccountSid = null,
+                                                                                     string friendlyName = null,
+                                                                                     string apiVersion = null,
+                                                                                     Uri voiceUrl = null,
+                                                                                     Twilio.Http.HttpMethod voiceMethod = null,
+                                                                                     Uri voiceFallbackUrl = null,
+                                                                                     Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                                                     Uri statusCallback = null,
+                                                                                     Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                     bool? voiceCallerIdLookup = null,
+                                                                                     Uri smsUrl = null,
+                                                                                     Twilio.Http.HttpMethod smsMethod = null,
+                                                                                     Uri smsFallbackUrl = null,
+                                                                                     Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                                                     Uri smsStatusCallback = null,
+                                                                                     Uri messageStatusCallback = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateApplicationOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, ApiVersion = apiVersion, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceCallerIdLookup = voiceCallerIdLookup, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsStatusCallback = smsStatusCallback, MessageStatusCallback = messageStatusCallback };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ApplicationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ApplicationResource object represented by the provided JSON </returns>
+    public static ApplicationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ApplicationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to start a new TwiML session
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The URL to send message status information to your application
+    /// </summary>
+    [JsonProperty("message_status_callback")]
+    public Uri MessageStatusCallback { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The HTTP method used with sms_fallback_url
+    /// </summary>
+    [JsonProperty("sms_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL that we call when an error occurs while retrieving or executing the TwiML
+    /// </summary>
+    [JsonProperty("sms_fallback_url")]
+    public Uri SmsFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method to use with sms_url
+    /// </summary>
+    [JsonProperty("sms_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsMethod { get; private set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    [JsonProperty("sms_status_callback")]
+    public Uri SmsStatusCallback { get; private set; }
+    /// <summary>
+    /// The URL we call when the phone number receives an incoming SMS message
+    /// </summary>
+    [JsonProperty("sms_url")]
+    public Uri SmsUrl { get; private set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call status_callback
+    /// </summary>
+    [JsonProperty("status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    [JsonProperty("voice_caller_id_lookup")]
+    public bool? VoiceCallerIdLookup { get; private set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    [JsonProperty("voice_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when a TwiML error occurs
+    /// </summary>
+    [JsonProperty("voice_fallback_url")]
+    public Uri VoiceFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method used with the voice_url
+    /// </summary>
+    [JsonProperty("voice_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when the phone number receives a call
+    /// </summary>
+    [JsonProperty("voice_url")]
+    public Uri VoiceUrl { get; private set; }
+
+    private ApplicationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AuthorizedConnectAppOptions.cs b/src/Twilio/Rest/Api/V2010/Account/AuthorizedConnectAppOptions.cs
index c8d7b53cb..0d742aa3f 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AuthorizedConnectAppOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AuthorizedConnectAppOptions.cs
@@ -9,64 +9,64 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Fetch an instance of an authorized-connect-app
+  /// </summary>
+  public class FetchAuthorizedConnectAppOptions : IOptions<AuthorizedConnectAppResource>
+  {
     /// <summary>
-    /// Fetch an instance of an authorized-connect-app
+    /// The SID of the Account that created the resource to fetch
     /// </summary>
-    public class FetchAuthorizedConnectAppOptions : IOptions<AuthorizedConnectAppResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Connect App to fetch
-        /// </summary>
-        public string PathConnectAppSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAuthorizedConnectAppOptions
-        /// </summary>
-        /// <param name="pathConnectAppSid"> The SID of the Connect App to fetch </param>
-        public FetchAuthorizedConnectAppOptions(string pathConnectAppSid)
-        {
-            PathConnectAppSid = pathConnectAppSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Retrieve a list of authorized-connect-apps belonging to the account used to make the request
+    /// The SID of the Connect App to fetch
     /// </summary>
-    public class ReadAuthorizedConnectAppOptions : ReadOptions<AuthorizedConnectAppResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathConnectAppSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchAuthorizedConnectAppOptions
+    /// </summary>
+    /// <param name="pathConnectAppSid"> The SID of the Connect App to fetch </param>
+    public FetchAuthorizedConnectAppOptions(string pathConnectAppSid)
+    {
+      PathConnectAppSid = pathConnectAppSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of authorized-connect-apps belonging to the account used to make the request
+  /// </summary>
+  public class ReadAuthorizedConnectAppOptions : ReadOptions<AuthorizedConnectAppResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AuthorizedConnectAppResource.cs b/src/Twilio/Rest/Api/V2010/Account/AuthorizedConnectAppResource.cs
index 082c60cb4..5c17a25ff 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AuthorizedConnectAppResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AuthorizedConnectAppResource.cs
@@ -17,306 +17,306 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class AuthorizedConnectAppResource : Resource
-    {
-        public sealed class PermissionEnum : StringEnum
-        {
-            private PermissionEnum(string value) : base(value) {}
-            public PermissionEnum() {}
-            public static implicit operator PermissionEnum(string value)
-            {
-                return new PermissionEnum(value);
-            }
-
-            public static readonly PermissionEnum GetAll = new PermissionEnum("get-all");
-            public static readonly PermissionEnum PostAll = new PermissionEnum("post-all");
-        }
-
-        private static Request BuildFetchRequest(FetchAuthorizedConnectAppOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AuthorizedConnectApps/" + options.PathConnectAppSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of an authorized-connect-app
-        /// </summary>
-        /// <param name="options"> Fetch AuthorizedConnectApp parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthorizedConnectApp </returns>
-        public static AuthorizedConnectAppResource Fetch(FetchAuthorizedConnectAppOptions options,
-                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an authorized-connect-app
-        /// </summary>
-        /// <param name="options"> Fetch AuthorizedConnectApp parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthorizedConnectApp </returns>
-        public static async System.Threading.Tasks.Task<AuthorizedConnectAppResource> FetchAsync(FetchAuthorizedConnectAppOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of an authorized-connect-app
-        /// </summary>
-        /// <param name="pathConnectAppSid"> The SID of the Connect App to fetch </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthorizedConnectApp </returns>
-        public static AuthorizedConnectAppResource Fetch(string pathConnectAppSid,
-                                                         string pathAccountSid = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchAuthorizedConnectAppOptions(pathConnectAppSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an authorized-connect-app
-        /// </summary>
-        /// <param name="pathConnectAppSid"> The SID of the Connect App to fetch </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthorizedConnectApp </returns>
-        public static async System.Threading.Tasks.Task<AuthorizedConnectAppResource> FetchAsync(string pathConnectAppSid,
-                                                                                                 string pathAccountSid = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchAuthorizedConnectAppOptions(pathConnectAppSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAuthorizedConnectAppOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AuthorizedConnectApps.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of authorized-connect-apps belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read AuthorizedConnectApp parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthorizedConnectApp </returns>
-        public static ResourceSet<AuthorizedConnectAppResource> Read(ReadAuthorizedConnectAppOptions options,
-                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AuthorizedConnectAppResource>.FromJson("authorized_connect_apps", response.Content);
-            return new ResourceSet<AuthorizedConnectAppResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of authorized-connect-apps belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read AuthorizedConnectApp parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthorizedConnectApp </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AuthorizedConnectAppResource>> ReadAsync(ReadAuthorizedConnectAppOptions options,
-                                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AuthorizedConnectAppResource>.FromJson("authorized_connect_apps", response.Content);
-            return new ResourceSet<AuthorizedConnectAppResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of authorized-connect-apps belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthorizedConnectApp </returns>
-        public static ResourceSet<AuthorizedConnectAppResource> Read(string pathAccountSid = null,
-                                                                     int? pageSize = null,
-                                                                     long? limit = null,
-                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadAuthorizedConnectAppOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of authorized-connect-apps belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthorizedConnectApp </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AuthorizedConnectAppResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                             int? pageSize = null,
-                                                                                                             long? limit = null,
-                                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadAuthorizedConnectAppOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AuthorizedConnectAppResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AuthorizedConnectAppResource>.FromJson("authorized_connect_apps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AuthorizedConnectAppResource> NextPage(Page<AuthorizedConnectAppResource> page,
-                                                                  ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AuthorizedConnectAppResource>.FromJson("authorized_connect_apps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AuthorizedConnectAppResource> PreviousPage(Page<AuthorizedConnectAppResource> page,
-                                                                      ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AuthorizedConnectAppResource>.FromJson("authorized_connect_apps", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a AuthorizedConnectAppResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AuthorizedConnectAppResource object represented by the provided JSON </returns>
-        public static AuthorizedConnectAppResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AuthorizedConnectAppResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The company name set for the Connect App
-        /// </summary>
-        [JsonProperty("connect_app_company_name")]
-        public string ConnectAppCompanyName { get; private set; }
-        /// <summary>
-        /// A detailed description of the app
-        /// </summary>
-        [JsonProperty("connect_app_description")]
-        public string ConnectAppDescription { get; private set; }
-        /// <summary>
-        /// The name of the Connect App
-        /// </summary>
-        [JsonProperty("connect_app_friendly_name")]
-        public string ConnectAppFriendlyName { get; private set; }
-        /// <summary>
-        /// The public URL for the Connect App
-        /// </summary>
-        [JsonProperty("connect_app_homepage_url")]
-        public Uri ConnectAppHomepageUrl { get; private set; }
-        /// <summary>
-        /// The SID that we assigned to the Connect App
-        /// </summary>
-        [JsonProperty("connect_app_sid")]
-        public string ConnectAppSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Permissions authorized to the app
-        /// </summary>
-        [JsonProperty("permissions")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public List<AuthorizedConnectAppResource.PermissionEnum> Permissions { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private AuthorizedConnectAppResource()
-        {
-
-        }
-    }
+{
+
+  public class AuthorizedConnectAppResource : Resource
+  {
+    public sealed class PermissionEnum : StringEnum
+    {
+      private PermissionEnum(string value) : base(value) { }
+      public PermissionEnum() { }
+      public static implicit operator PermissionEnum(string value)
+      {
+        return new PermissionEnum(value);
+      }
+
+      public static readonly PermissionEnum GetAll = new PermissionEnum("get-all");
+      public static readonly PermissionEnum PostAll = new PermissionEnum("post-all");
+    }
+
+    private static Request BuildFetchRequest(FetchAuthorizedConnectAppOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AuthorizedConnectApps/" + options.PathConnectAppSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of an authorized-connect-app
+    /// </summary>
+    /// <param name="options"> Fetch AuthorizedConnectApp parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthorizedConnectApp </returns>
+    public static AuthorizedConnectAppResource Fetch(FetchAuthorizedConnectAppOptions options,
+                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an authorized-connect-app
+    /// </summary>
+    /// <param name="options"> Fetch AuthorizedConnectApp parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthorizedConnectApp </returns>
+    public static async System.Threading.Tasks.Task<AuthorizedConnectAppResource> FetchAsync(FetchAuthorizedConnectAppOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of an authorized-connect-app
+    /// </summary>
+    /// <param name="pathConnectAppSid"> The SID of the Connect App to fetch </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthorizedConnectApp </returns>
+    public static AuthorizedConnectAppResource Fetch(string pathConnectAppSid,
+                                                     string pathAccountSid = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchAuthorizedConnectAppOptions(pathConnectAppSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an authorized-connect-app
+    /// </summary>
+    /// <param name="pathConnectAppSid"> The SID of the Connect App to fetch </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthorizedConnectApp </returns>
+    public static async System.Threading.Tasks.Task<AuthorizedConnectAppResource> FetchAsync(string pathConnectAppSid,
+                                                                                             string pathAccountSid = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchAuthorizedConnectAppOptions(pathConnectAppSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAuthorizedConnectAppOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AuthorizedConnectApps.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of authorized-connect-apps belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read AuthorizedConnectApp parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthorizedConnectApp </returns>
+    public static ResourceSet<AuthorizedConnectAppResource> Read(ReadAuthorizedConnectAppOptions options,
+                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AuthorizedConnectAppResource>.FromJson("authorized_connect_apps", response.Content);
+      return new ResourceSet<AuthorizedConnectAppResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of authorized-connect-apps belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read AuthorizedConnectApp parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthorizedConnectApp </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AuthorizedConnectAppResource>> ReadAsync(ReadAuthorizedConnectAppOptions options,
+                                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AuthorizedConnectAppResource>.FromJson("authorized_connect_apps", response.Content);
+      return new ResourceSet<AuthorizedConnectAppResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of authorized-connect-apps belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthorizedConnectApp </returns>
+    public static ResourceSet<AuthorizedConnectAppResource> Read(string pathAccountSid = null,
+                                                                 int? pageSize = null,
+                                                                 long? limit = null,
+                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadAuthorizedConnectAppOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of authorized-connect-apps belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthorizedConnectApp </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AuthorizedConnectAppResource>> ReadAsync(string pathAccountSid = null,
+                                                                                                         int? pageSize = null,
+                                                                                                         long? limit = null,
+                                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadAuthorizedConnectAppOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AuthorizedConnectAppResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AuthorizedConnectAppResource>.FromJson("authorized_connect_apps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AuthorizedConnectAppResource> NextPage(Page<AuthorizedConnectAppResource> page,
+                                                              ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AuthorizedConnectAppResource>.FromJson("authorized_connect_apps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AuthorizedConnectAppResource> PreviousPage(Page<AuthorizedConnectAppResource> page,
+                                                                  ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AuthorizedConnectAppResource>.FromJson("authorized_connect_apps", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a AuthorizedConnectAppResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AuthorizedConnectAppResource object represented by the provided JSON </returns>
+    public static AuthorizedConnectAppResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AuthorizedConnectAppResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The company name set for the Connect App
+    /// </summary>
+    [JsonProperty("connect_app_company_name")]
+    public string ConnectAppCompanyName { get; private set; }
+    /// <summary>
+    /// A detailed description of the app
+    /// </summary>
+    [JsonProperty("connect_app_description")]
+    public string ConnectAppDescription { get; private set; }
+    /// <summary>
+    /// The name of the Connect App
+    /// </summary>
+    [JsonProperty("connect_app_friendly_name")]
+    public string ConnectAppFriendlyName { get; private set; }
+    /// <summary>
+    /// The public URL for the Connect App
+    /// </summary>
+    [JsonProperty("connect_app_homepage_url")]
+    public Uri ConnectAppHomepageUrl { get; private set; }
+    /// <summary>
+    /// The SID that we assigned to the Connect App
+    /// </summary>
+    [JsonProperty("connect_app_sid")]
+    public string ConnectAppSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Permissions authorized to the app
+    /// </summary>
+    [JsonProperty("permissions")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public List<AuthorizedConnectAppResource.PermissionEnum> Permissions { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private AuthorizedConnectAppResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/LocalOptions.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/LocalOptions.cs
index 96f50fca8..96dba122a 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/LocalOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/LocalOptions.cs
@@ -9,206 +9,206 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
+{
+
+  /// <summary>
+  /// ReadLocalOptions
+  /// </summary>
+  public class ReadLocalOptions : ReadOptions<LocalResource>
+  {
     /// <summary>
-    /// ReadLocalOptions
-    /// </summary>
-    public class ReadLocalOptions : ReadOptions<LocalResource>
-    {
-        /// <summary>
-        /// The SID of the Account requesting the AvailablePhoneNumber resources
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The ISO Country code of the country from which to read phone numbers
-        /// </summary>
-        public string PathCountryCode { get; }
-        /// <summary>
-        /// The area code of the phone numbers to read
-        /// </summary>
-        public int? AreaCode { get; set; }
-        /// <summary>
-        /// The pattern on which to match phone numbers
-        /// </summary>
-        public string Contains { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive text messages
-        /// </summary>
-        public bool? SmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive MMS messages
-        /// </summary>
-        public bool? MmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive calls.
-        /// </summary>
-        public bool? VoiceEnabled { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require an Address
-        /// </summary>
-        public bool? ExcludeAllAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a local address
-        /// </summary>
-        public bool? ExcludeLocalAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a foreign address
-        /// </summary>
-        public bool? ExcludeForeignAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to read phone numbers new to the Twilio platform
-        /// </summary>
-        public bool? Beta { get; set; }
-        /// <summary>
-        /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
-        /// </summary>
-        public Types.PhoneNumber NearNumber { get; set; }
-        /// <summary>
-        /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
-        /// </summary>
-        public string NearLatLong { get; set; }
-        /// <summary>
-        /// The search radius, in miles, for a near_ query. (US/Canada only)
-        /// </summary>
-        public int? Distance { get; set; }
-        /// <summary>
-        /// Limit results to a particular postal code. (US/Canada only)
-        /// </summary>
-        public string InPostalCode { get; set; }
-        /// <summary>
-        /// Limit results to a particular region. (US/Canada only)
-        /// </summary>
-        public string InRegion { get; set; }
-        /// <summary>
-        /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
-        /// </summary>
-        public string InRateCenter { get; set; }
-        /// <summary>
-        /// Limit results to a specific local access and transport area. (US/Canada only)
-        /// </summary>
-        public string InLata { get; set; }
-        /// <summary>
-        /// Limit results to a particular locality
-        /// </summary>
-        public string InLocality { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive faxes
-        /// </summary>
-        public bool? FaxEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadLocalOptions
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        public ReadLocalOptions(string pathCountryCode)
-        {
-            PathCountryCode = pathCountryCode;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AreaCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
-            }
-
-            if (Contains != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Contains", Contains));
-            }
-
-            if (SmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (MmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (VoiceEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeAllAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeLocalAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeForeignAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (Beta != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
-            }
-
-            if (NearNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
-            }
-
-            if (NearLatLong != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
-            }
-
-            if (Distance != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
-            }
-
-            if (InPostalCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
-            }
-
-            if (InRegion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
-            }
-
-            if (InRateCenter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
-            }
-
-            if (InLata != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLata", InLata));
-            }
-
-            if (InLocality != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
-            }
-
-            if (FaxEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Account requesting the AvailablePhoneNumber resources
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The ISO Country code of the country from which to read phone numbers
+    /// </summary>
+    public string PathCountryCode { get; }
+    /// <summary>
+    /// The area code of the phone numbers to read
+    /// </summary>
+    public int? AreaCode { get; set; }
+    /// <summary>
+    /// The pattern on which to match phone numbers
+    /// </summary>
+    public string Contains { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive text messages
+    /// </summary>
+    public bool? SmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive MMS messages
+    /// </summary>
+    public bool? MmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive calls.
+    /// </summary>
+    public bool? VoiceEnabled { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require an Address
+    /// </summary>
+    public bool? ExcludeAllAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a local address
+    /// </summary>
+    public bool? ExcludeLocalAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a foreign address
+    /// </summary>
+    public bool? ExcludeForeignAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to read phone numbers new to the Twilio platform
+    /// </summary>
+    public bool? Beta { get; set; }
+    /// <summary>
+    /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
+    /// </summary>
+    public Types.PhoneNumber NearNumber { get; set; }
+    /// <summary>
+    /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
+    /// </summary>
+    public string NearLatLong { get; set; }
+    /// <summary>
+    /// The search radius, in miles, for a near_ query. (US/Canada only)
+    /// </summary>
+    public int? Distance { get; set; }
+    /// <summary>
+    /// Limit results to a particular postal code. (US/Canada only)
+    /// </summary>
+    public string InPostalCode { get; set; }
+    /// <summary>
+    /// Limit results to a particular region. (US/Canada only)
+    /// </summary>
+    public string InRegion { get; set; }
+    /// <summary>
+    /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
+    /// </summary>
+    public string InRateCenter { get; set; }
+    /// <summary>
+    /// Limit results to a specific local access and transport area. (US/Canada only)
+    /// </summary>
+    public string InLata { get; set; }
+    /// <summary>
+    /// Limit results to a particular locality
+    /// </summary>
+    public string InLocality { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive faxes
+    /// </summary>
+    public bool? FaxEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadLocalOptions
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    public ReadLocalOptions(string pathCountryCode)
+    {
+      PathCountryCode = pathCountryCode;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AreaCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
+      }
+
+      if (Contains != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Contains", Contains));
+      }
+
+      if (SmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (MmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (VoiceEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeAllAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeLocalAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeForeignAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (Beta != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
+      }
+
+      if (NearNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
+      }
+
+      if (NearLatLong != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
+      }
+
+      if (Distance != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
+      }
+
+      if (InPostalCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
+      }
+
+      if (InRegion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
+      }
+
+      if (InRateCenter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
+      }
+
+      if (InLata != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLata", InLata));
+      }
+
+      if (InLocality != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
+      }
+
+      if (FaxEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/LocalResource.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/LocalResource.cs
index 925312b4f..f03fd00b5 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/LocalResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/LocalResource.cs
@@ -17,317 +17,317 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
-    public class LocalResource : Resource
-    {
-        private static Request BuildReadRequest(ReadLocalOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/Local.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Local parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Local </returns>
-        public static ResourceSet<LocalResource> Read(ReadLocalOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<LocalResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<LocalResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Local parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Local </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<LocalResource>> ReadAsync(ReadLocalOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<LocalResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<LocalResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Local </returns>
-        public static ResourceSet<LocalResource> Read(string pathCountryCode,
-                                                      string pathAccountSid = null,
-                                                      int? areaCode = null,
-                                                      string contains = null,
-                                                      bool? smsEnabled = null,
-                                                      bool? mmsEnabled = null,
-                                                      bool? voiceEnabled = null,
-                                                      bool? excludeAllAddressRequired = null,
-                                                      bool? excludeLocalAddressRequired = null,
-                                                      bool? excludeForeignAddressRequired = null,
-                                                      bool? beta = null,
-                                                      Types.PhoneNumber nearNumber = null,
-                                                      string nearLatLong = null,
-                                                      int? distance = null,
-                                                      string inPostalCode = null,
-                                                      string inRegion = null,
-                                                      string inRateCenter = null,
-                                                      string inLata = null,
-                                                      string inLocality = null,
-                                                      bool? faxEnabled = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadLocalOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Local </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<LocalResource>> ReadAsync(string pathCountryCode,
-                                                                                              string pathAccountSid = null,
-                                                                                              int? areaCode = null,
-                                                                                              string contains = null,
-                                                                                              bool? smsEnabled = null,
-                                                                                              bool? mmsEnabled = null,
-                                                                                              bool? voiceEnabled = null,
-                                                                                              bool? excludeAllAddressRequired = null,
-                                                                                              bool? excludeLocalAddressRequired = null,
-                                                                                              bool? excludeForeignAddressRequired = null,
-                                                                                              bool? beta = null,
-                                                                                              Types.PhoneNumber nearNumber = null,
-                                                                                              string nearLatLong = null,
-                                                                                              int? distance = null,
-                                                                                              string inPostalCode = null,
-                                                                                              string inRegion = null,
-                                                                                              string inRateCenter = null,
-                                                                                              string inLata = null,
-                                                                                              string inLocality = null,
-                                                                                              bool? faxEnabled = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadLocalOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<LocalResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<LocalResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<LocalResource> NextPage(Page<LocalResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<LocalResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<LocalResource> PreviousPage(Page<LocalResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<LocalResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a LocalResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> LocalResource object represented by the provided JSON </returns>
-        public static LocalResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<LocalResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A formatted version of the phone number
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber FriendlyName { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The LATA of this phone number
-        /// </summary>
-        [JsonProperty("lata")]
-        public string Lata { get; private set; }
-        /// <summary>
-        /// The locality or city of this phone number's location
-        /// </summary>
-        [JsonProperty("locality")]
-        public string Locality { get; private set; }
-        /// <summary>
-        /// The rate center of this phone number
-        /// </summary>
-        [JsonProperty("rate_center")]
-        public string RateCenter { get; private set; }
-        /// <summary>
-        /// The latitude of this phone number's location
-        /// </summary>
-        [JsonProperty("latitude")]
-        public decimal? Latitude { get; private set; }
-        /// <summary>
-        /// The longitude of this phone number's location
-        /// </summary>
-        [JsonProperty("longitude")]
-        public decimal? Longitude { get; private set; }
-        /// <summary>
-        /// The two-letter state or province abbreviation of this phone number's location
-        /// </summary>
-        [JsonProperty("region")]
-        public string Region { get; private set; }
-        /// <summary>
-        /// The postal or ZIP code of this phone number's location
-        /// </summary>
-        [JsonProperty("postal_code")]
-        public string PostalCode { get; private set; }
-        /// <summary>
-        /// The ISO country code of this phone number
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The type of Address resource the phone number requires
-        /// </summary>
-        [JsonProperty("address_requirements")]
-        public string AddressRequirements { get; private set; }
-        /// <summary>
-        /// Whether the phone number is new to the Twilio platform
-        /// </summary>
-        [JsonProperty("beta")]
-        public bool? Beta { get; private set; }
-        /// <summary>
-        /// Whether a phone number can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-
-        private LocalResource()
-        {
-
-        }
-    }
+{
+
+  public class LocalResource : Resource
+  {
+    private static Request BuildReadRequest(ReadLocalOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/Local.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Local parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Local </returns>
+    public static ResourceSet<LocalResource> Read(ReadLocalOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<LocalResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<LocalResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Local parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Local </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<LocalResource>> ReadAsync(ReadLocalOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<LocalResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<LocalResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Local </returns>
+    public static ResourceSet<LocalResource> Read(string pathCountryCode,
+                                                  string pathAccountSid = null,
+                                                  int? areaCode = null,
+                                                  string contains = null,
+                                                  bool? smsEnabled = null,
+                                                  bool? mmsEnabled = null,
+                                                  bool? voiceEnabled = null,
+                                                  bool? excludeAllAddressRequired = null,
+                                                  bool? excludeLocalAddressRequired = null,
+                                                  bool? excludeForeignAddressRequired = null,
+                                                  bool? beta = null,
+                                                  Types.PhoneNumber nearNumber = null,
+                                                  string nearLatLong = null,
+                                                  int? distance = null,
+                                                  string inPostalCode = null,
+                                                  string inRegion = null,
+                                                  string inRateCenter = null,
+                                                  string inLata = null,
+                                                  string inLocality = null,
+                                                  bool? faxEnabled = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadLocalOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Local </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<LocalResource>> ReadAsync(string pathCountryCode,
+                                                                                          string pathAccountSid = null,
+                                                                                          int? areaCode = null,
+                                                                                          string contains = null,
+                                                                                          bool? smsEnabled = null,
+                                                                                          bool? mmsEnabled = null,
+                                                                                          bool? voiceEnabled = null,
+                                                                                          bool? excludeAllAddressRequired = null,
+                                                                                          bool? excludeLocalAddressRequired = null,
+                                                                                          bool? excludeForeignAddressRequired = null,
+                                                                                          bool? beta = null,
+                                                                                          Types.PhoneNumber nearNumber = null,
+                                                                                          string nearLatLong = null,
+                                                                                          int? distance = null,
+                                                                                          string inPostalCode = null,
+                                                                                          string inRegion = null,
+                                                                                          string inRateCenter = null,
+                                                                                          string inLata = null,
+                                                                                          string inLocality = null,
+                                                                                          bool? faxEnabled = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadLocalOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<LocalResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<LocalResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<LocalResource> NextPage(Page<LocalResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<LocalResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<LocalResource> PreviousPage(Page<LocalResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<LocalResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a LocalResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> LocalResource object represented by the provided JSON </returns>
+    public static LocalResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<LocalResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A formatted version of the phone number
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber FriendlyName { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The LATA of this phone number
+    /// </summary>
+    [JsonProperty("lata")]
+    public string Lata { get; private set; }
+    /// <summary>
+    /// The locality or city of this phone number's location
+    /// </summary>
+    [JsonProperty("locality")]
+    public string Locality { get; private set; }
+    /// <summary>
+    /// The rate center of this phone number
+    /// </summary>
+    [JsonProperty("rate_center")]
+    public string RateCenter { get; private set; }
+    /// <summary>
+    /// The latitude of this phone number's location
+    /// </summary>
+    [JsonProperty("latitude")]
+    public decimal? Latitude { get; private set; }
+    /// <summary>
+    /// The longitude of this phone number's location
+    /// </summary>
+    [JsonProperty("longitude")]
+    public decimal? Longitude { get; private set; }
+    /// <summary>
+    /// The two-letter state or province abbreviation of this phone number's location
+    /// </summary>
+    [JsonProperty("region")]
+    public string Region { get; private set; }
+    /// <summary>
+    /// The postal or ZIP code of this phone number's location
+    /// </summary>
+    [JsonProperty("postal_code")]
+    public string PostalCode { get; private set; }
+    /// <summary>
+    /// The ISO country code of this phone number
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The type of Address resource the phone number requires
+    /// </summary>
+    [JsonProperty("address_requirements")]
+    public string AddressRequirements { get; private set; }
+    /// <summary>
+    /// Whether the phone number is new to the Twilio platform
+    /// </summary>
+    [JsonProperty("beta")]
+    public bool? Beta { get; private set; }
+    /// <summary>
+    /// Whether a phone number can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+
+    private LocalResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MachineToMachineOptions.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MachineToMachineOptions.cs
index ae4e688cf..3970ab072 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MachineToMachineOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MachineToMachineOptions.cs
@@ -9,206 +9,206 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
+{
+
+  /// <summary>
+  /// ReadMachineToMachineOptions
+  /// </summary>
+  public class ReadMachineToMachineOptions : ReadOptions<MachineToMachineResource>
+  {
     /// <summary>
-    /// ReadMachineToMachineOptions
-    /// </summary>
-    public class ReadMachineToMachineOptions : ReadOptions<MachineToMachineResource>
-    {
-        /// <summary>
-        /// The SID of the Account requesting the AvailablePhoneNumber resources
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The ISO Country code of the country from which to read phone numbers
-        /// </summary>
-        public string PathCountryCode { get; }
-        /// <summary>
-        /// The area code of the phone numbers to read
-        /// </summary>
-        public int? AreaCode { get; set; }
-        /// <summary>
-        /// The pattern on which to match phone numbers
-        /// </summary>
-        public string Contains { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive text messages
-        /// </summary>
-        public bool? SmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive MMS messages
-        /// </summary>
-        public bool? MmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive calls.
-        /// </summary>
-        public bool? VoiceEnabled { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require an Address
-        /// </summary>
-        public bool? ExcludeAllAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a local address
-        /// </summary>
-        public bool? ExcludeLocalAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a foreign address
-        /// </summary>
-        public bool? ExcludeForeignAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to read phone numbers new to the Twilio platform
-        /// </summary>
-        public bool? Beta { get; set; }
-        /// <summary>
-        /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
-        /// </summary>
-        public Types.PhoneNumber NearNumber { get; set; }
-        /// <summary>
-        /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
-        /// </summary>
-        public string NearLatLong { get; set; }
-        /// <summary>
-        /// The search radius, in miles, for a near_ query. (US/Canada only)
-        /// </summary>
-        public int? Distance { get; set; }
-        /// <summary>
-        /// Limit results to a particular postal code. (US/Canada only)
-        /// </summary>
-        public string InPostalCode { get; set; }
-        /// <summary>
-        /// Limit results to a particular region. (US/Canada only)
-        /// </summary>
-        public string InRegion { get; set; }
-        /// <summary>
-        /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
-        /// </summary>
-        public string InRateCenter { get; set; }
-        /// <summary>
-        /// Limit results to a specific local access and transport area. (US/Canada only)
-        /// </summary>
-        public string InLata { get; set; }
-        /// <summary>
-        /// Limit results to a particular locality
-        /// </summary>
-        public string InLocality { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive faxes
-        /// </summary>
-        public bool? FaxEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMachineToMachineOptions
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        public ReadMachineToMachineOptions(string pathCountryCode)
-        {
-            PathCountryCode = pathCountryCode;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AreaCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
-            }
-
-            if (Contains != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Contains", Contains));
-            }
-
-            if (SmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (MmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (VoiceEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeAllAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeLocalAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeForeignAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (Beta != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
-            }
-
-            if (NearNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
-            }
-
-            if (NearLatLong != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
-            }
-
-            if (Distance != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
-            }
-
-            if (InPostalCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
-            }
-
-            if (InRegion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
-            }
-
-            if (InRateCenter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
-            }
-
-            if (InLata != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLata", InLata));
-            }
-
-            if (InLocality != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
-            }
-
-            if (FaxEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Account requesting the AvailablePhoneNumber resources
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The ISO Country code of the country from which to read phone numbers
+    /// </summary>
+    public string PathCountryCode { get; }
+    /// <summary>
+    /// The area code of the phone numbers to read
+    /// </summary>
+    public int? AreaCode { get; set; }
+    /// <summary>
+    /// The pattern on which to match phone numbers
+    /// </summary>
+    public string Contains { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive text messages
+    /// </summary>
+    public bool? SmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive MMS messages
+    /// </summary>
+    public bool? MmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive calls.
+    /// </summary>
+    public bool? VoiceEnabled { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require an Address
+    /// </summary>
+    public bool? ExcludeAllAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a local address
+    /// </summary>
+    public bool? ExcludeLocalAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a foreign address
+    /// </summary>
+    public bool? ExcludeForeignAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to read phone numbers new to the Twilio platform
+    /// </summary>
+    public bool? Beta { get; set; }
+    /// <summary>
+    /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
+    /// </summary>
+    public Types.PhoneNumber NearNumber { get; set; }
+    /// <summary>
+    /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
+    /// </summary>
+    public string NearLatLong { get; set; }
+    /// <summary>
+    /// The search radius, in miles, for a near_ query. (US/Canada only)
+    /// </summary>
+    public int? Distance { get; set; }
+    /// <summary>
+    /// Limit results to a particular postal code. (US/Canada only)
+    /// </summary>
+    public string InPostalCode { get; set; }
+    /// <summary>
+    /// Limit results to a particular region. (US/Canada only)
+    /// </summary>
+    public string InRegion { get; set; }
+    /// <summary>
+    /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
+    /// </summary>
+    public string InRateCenter { get; set; }
+    /// <summary>
+    /// Limit results to a specific local access and transport area. (US/Canada only)
+    /// </summary>
+    public string InLata { get; set; }
+    /// <summary>
+    /// Limit results to a particular locality
+    /// </summary>
+    public string InLocality { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive faxes
+    /// </summary>
+    public bool? FaxEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMachineToMachineOptions
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    public ReadMachineToMachineOptions(string pathCountryCode)
+    {
+      PathCountryCode = pathCountryCode;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AreaCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
+      }
+
+      if (Contains != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Contains", Contains));
+      }
+
+      if (SmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (MmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (VoiceEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeAllAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeLocalAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeForeignAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (Beta != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
+      }
+
+      if (NearNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
+      }
+
+      if (NearLatLong != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
+      }
+
+      if (Distance != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
+      }
+
+      if (InPostalCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
+      }
+
+      if (InRegion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
+      }
+
+      if (InRateCenter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
+      }
+
+      if (InLata != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLata", InLata));
+      }
+
+      if (InLocality != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
+      }
+
+      if (FaxEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MachineToMachineResource.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MachineToMachineResource.cs
index 47b551719..d69a61f8c 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MachineToMachineResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MachineToMachineResource.cs
@@ -17,319 +17,319 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
-    public class MachineToMachineResource : Resource
-    {
-        private static Request BuildReadRequest(ReadMachineToMachineOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/MachineToMachine.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read MachineToMachine parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MachineToMachine </returns>
-        public static ResourceSet<MachineToMachineResource> Read(ReadMachineToMachineOptions options,
-                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MachineToMachineResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<MachineToMachineResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read MachineToMachine parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MachineToMachine </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MachineToMachineResource>> ReadAsync(ReadMachineToMachineOptions options,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MachineToMachineResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<MachineToMachineResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MachineToMachine </returns>
-        public static ResourceSet<MachineToMachineResource> Read(string pathCountryCode,
-                                                                 string pathAccountSid = null,
-                                                                 int? areaCode = null,
-                                                                 string contains = null,
-                                                                 bool? smsEnabled = null,
-                                                                 bool? mmsEnabled = null,
-                                                                 bool? voiceEnabled = null,
-                                                                 bool? excludeAllAddressRequired = null,
-                                                                 bool? excludeLocalAddressRequired = null,
-                                                                 bool? excludeForeignAddressRequired = null,
-                                                                 bool? beta = null,
-                                                                 Types.PhoneNumber nearNumber = null,
-                                                                 string nearLatLong = null,
-                                                                 int? distance = null,
-                                                                 string inPostalCode = null,
-                                                                 string inRegion = null,
-                                                                 string inRateCenter = null,
-                                                                 string inLata = null,
-                                                                 string inLocality = null,
-                                                                 bool? faxEnabled = null,
-                                                                 int? pageSize = null,
-                                                                 long? limit = null,
-                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadMachineToMachineOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MachineToMachine </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MachineToMachineResource>> ReadAsync(string pathCountryCode,
-                                                                                                         string pathAccountSid = null,
-                                                                                                         int? areaCode = null,
-                                                                                                         string contains = null,
-                                                                                                         bool? smsEnabled = null,
-                                                                                                         bool? mmsEnabled = null,
-                                                                                                         bool? voiceEnabled = null,
-                                                                                                         bool? excludeAllAddressRequired = null,
-                                                                                                         bool? excludeLocalAddressRequired = null,
-                                                                                                         bool? excludeForeignAddressRequired = null,
-                                                                                                         bool? beta = null,
-                                                                                                         Types.PhoneNumber nearNumber = null,
-                                                                                                         string nearLatLong = null,
-                                                                                                         int? distance = null,
-                                                                                                         string inPostalCode = null,
-                                                                                                         string inRegion = null,
-                                                                                                         string inRateCenter = null,
-                                                                                                         string inLata = null,
-                                                                                                         string inLocality = null,
-                                                                                                         bool? faxEnabled = null,
-                                                                                                         int? pageSize = null,
-                                                                                                         long? limit = null,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadMachineToMachineOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MachineToMachineResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MachineToMachineResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MachineToMachineResource> NextPage(Page<MachineToMachineResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MachineToMachineResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MachineToMachineResource> PreviousPage(Page<MachineToMachineResource> page,
-                                                                  ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MachineToMachineResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a MachineToMachineResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MachineToMachineResource object represented by the provided JSON </returns>
-        public static MachineToMachineResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MachineToMachineResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A formatted version of the phone number
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber FriendlyName { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The LATA of this phone number
-        /// </summary>
-        [JsonProperty("lata")]
-        public string Lata { get; private set; }
-        /// <summary>
-        /// The locality or city of this phone number's location
-        /// </summary>
-        [JsonProperty("locality")]
-        public string Locality { get; private set; }
-        /// <summary>
-        /// The rate center of this phone number
-        /// </summary>
-        [JsonProperty("rate_center")]
-        public string RateCenter { get; private set; }
-        /// <summary>
-        /// The latitude of this phone number's location
-        /// </summary>
-        [JsonProperty("latitude")]
-        public decimal? Latitude { get; private set; }
-        /// <summary>
-        /// The longitude of this phone number's location
-        /// </summary>
-        [JsonProperty("longitude")]
-        public decimal? Longitude { get; private set; }
-        /// <summary>
-        /// The two-letter state or province abbreviation of this phone number's location
-        /// </summary>
-        [JsonProperty("region")]
-        public string Region { get; private set; }
-        /// <summary>
-        /// The postal or ZIP code of this phone number's location
-        /// </summary>
-        [JsonProperty("postal_code")]
-        public string PostalCode { get; private set; }
-        /// <summary>
-        /// The ISO country code of this phone number
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The type of Address resource the phone number requires
-        /// </summary>
-        [JsonProperty("address_requirements")]
-        public string AddressRequirements { get; private set; }
-        /// <summary>
-        /// Whether the phone number is new to the Twilio platform
-        /// </summary>
-        [JsonProperty("beta")]
-        public bool? Beta { get; private set; }
-        /// <summary>
-        /// Whether a phone number can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-
-        private MachineToMachineResource()
-        {
-
-        }
-    }
+{
+
+  public class MachineToMachineResource : Resource
+  {
+    private static Request BuildReadRequest(ReadMachineToMachineOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/MachineToMachine.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read MachineToMachine parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MachineToMachine </returns>
+    public static ResourceSet<MachineToMachineResource> Read(ReadMachineToMachineOptions options,
+                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MachineToMachineResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<MachineToMachineResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read MachineToMachine parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MachineToMachine </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MachineToMachineResource>> ReadAsync(ReadMachineToMachineOptions options,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MachineToMachineResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<MachineToMachineResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MachineToMachine </returns>
+    public static ResourceSet<MachineToMachineResource> Read(string pathCountryCode,
+                                                             string pathAccountSid = null,
+                                                             int? areaCode = null,
+                                                             string contains = null,
+                                                             bool? smsEnabled = null,
+                                                             bool? mmsEnabled = null,
+                                                             bool? voiceEnabled = null,
+                                                             bool? excludeAllAddressRequired = null,
+                                                             bool? excludeLocalAddressRequired = null,
+                                                             bool? excludeForeignAddressRequired = null,
+                                                             bool? beta = null,
+                                                             Types.PhoneNumber nearNumber = null,
+                                                             string nearLatLong = null,
+                                                             int? distance = null,
+                                                             string inPostalCode = null,
+                                                             string inRegion = null,
+                                                             string inRateCenter = null,
+                                                             string inLata = null,
+                                                             string inLocality = null,
+                                                             bool? faxEnabled = null,
+                                                             int? pageSize = null,
+                                                             long? limit = null,
+                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadMachineToMachineOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MachineToMachine </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MachineToMachineResource>> ReadAsync(string pathCountryCode,
+                                                                                                     string pathAccountSid = null,
+                                                                                                     int? areaCode = null,
+                                                                                                     string contains = null,
+                                                                                                     bool? smsEnabled = null,
+                                                                                                     bool? mmsEnabled = null,
+                                                                                                     bool? voiceEnabled = null,
+                                                                                                     bool? excludeAllAddressRequired = null,
+                                                                                                     bool? excludeLocalAddressRequired = null,
+                                                                                                     bool? excludeForeignAddressRequired = null,
+                                                                                                     bool? beta = null,
+                                                                                                     Types.PhoneNumber nearNumber = null,
+                                                                                                     string nearLatLong = null,
+                                                                                                     int? distance = null,
+                                                                                                     string inPostalCode = null,
+                                                                                                     string inRegion = null,
+                                                                                                     string inRateCenter = null,
+                                                                                                     string inLata = null,
+                                                                                                     string inLocality = null,
+                                                                                                     bool? faxEnabled = null,
+                                                                                                     int? pageSize = null,
+                                                                                                     long? limit = null,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadMachineToMachineOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MachineToMachineResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MachineToMachineResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MachineToMachineResource> NextPage(Page<MachineToMachineResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MachineToMachineResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MachineToMachineResource> PreviousPage(Page<MachineToMachineResource> page,
+                                                              ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MachineToMachineResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a MachineToMachineResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MachineToMachineResource object represented by the provided JSON </returns>
+    public static MachineToMachineResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MachineToMachineResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A formatted version of the phone number
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber FriendlyName { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The LATA of this phone number
+    /// </summary>
+    [JsonProperty("lata")]
+    public string Lata { get; private set; }
+    /// <summary>
+    /// The locality or city of this phone number's location
+    /// </summary>
+    [JsonProperty("locality")]
+    public string Locality { get; private set; }
+    /// <summary>
+    /// The rate center of this phone number
+    /// </summary>
+    [JsonProperty("rate_center")]
+    public string RateCenter { get; private set; }
+    /// <summary>
+    /// The latitude of this phone number's location
+    /// </summary>
+    [JsonProperty("latitude")]
+    public decimal? Latitude { get; private set; }
+    /// <summary>
+    /// The longitude of this phone number's location
+    /// </summary>
+    [JsonProperty("longitude")]
+    public decimal? Longitude { get; private set; }
+    /// <summary>
+    /// The two-letter state or province abbreviation of this phone number's location
+    /// </summary>
+    [JsonProperty("region")]
+    public string Region { get; private set; }
+    /// <summary>
+    /// The postal or ZIP code of this phone number's location
+    /// </summary>
+    [JsonProperty("postal_code")]
+    public string PostalCode { get; private set; }
+    /// <summary>
+    /// The ISO country code of this phone number
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The type of Address resource the phone number requires
+    /// </summary>
+    [JsonProperty("address_requirements")]
+    public string AddressRequirements { get; private set; }
+    /// <summary>
+    /// Whether the phone number is new to the Twilio platform
+    /// </summary>
+    [JsonProperty("beta")]
+    public bool? Beta { get; private set; }
+    /// <summary>
+    /// Whether a phone number can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+
+    private MachineToMachineResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MobileOptions.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MobileOptions.cs
index c804b56f8..3f3f70bdd 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MobileOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MobileOptions.cs
@@ -9,206 +9,206 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
+{
+
+  /// <summary>
+  /// ReadMobileOptions
+  /// </summary>
+  public class ReadMobileOptions : ReadOptions<MobileResource>
+  {
     /// <summary>
-    /// ReadMobileOptions
-    /// </summary>
-    public class ReadMobileOptions : ReadOptions<MobileResource>
-    {
-        /// <summary>
-        /// The SID of the Account requesting the AvailablePhoneNumber resources
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The ISO Country code of the country from which to read phone numbers
-        /// </summary>
-        public string PathCountryCode { get; }
-        /// <summary>
-        /// The area code of the phone numbers to read
-        /// </summary>
-        public int? AreaCode { get; set; }
-        /// <summary>
-        /// The pattern on which to match phone numbers
-        /// </summary>
-        public string Contains { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive text messages
-        /// </summary>
-        public bool? SmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive MMS messages
-        /// </summary>
-        public bool? MmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive calls.
-        /// </summary>
-        public bool? VoiceEnabled { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require an Address
-        /// </summary>
-        public bool? ExcludeAllAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a local address
-        /// </summary>
-        public bool? ExcludeLocalAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a foreign address
-        /// </summary>
-        public bool? ExcludeForeignAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to read phone numbers new to the Twilio platform
-        /// </summary>
-        public bool? Beta { get; set; }
-        /// <summary>
-        /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
-        /// </summary>
-        public Types.PhoneNumber NearNumber { get; set; }
-        /// <summary>
-        /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
-        /// </summary>
-        public string NearLatLong { get; set; }
-        /// <summary>
-        /// The search radius, in miles, for a near_ query. (US/Canada only)
-        /// </summary>
-        public int? Distance { get; set; }
-        /// <summary>
-        /// Limit results to a particular postal code. (US/Canada only)
-        /// </summary>
-        public string InPostalCode { get; set; }
-        /// <summary>
-        /// Limit results to a particular region. (US/Canada only)
-        /// </summary>
-        public string InRegion { get; set; }
-        /// <summary>
-        /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
-        /// </summary>
-        public string InRateCenter { get; set; }
-        /// <summary>
-        /// Limit results to a specific local access and transport area. (US/Canada only)
-        /// </summary>
-        public string InLata { get; set; }
-        /// <summary>
-        /// Limit results to a particular locality
-        /// </summary>
-        public string InLocality { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive faxes
-        /// </summary>
-        public bool? FaxEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMobileOptions
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        public ReadMobileOptions(string pathCountryCode)
-        {
-            PathCountryCode = pathCountryCode;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AreaCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
-            }
-
-            if (Contains != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Contains", Contains));
-            }
-
-            if (SmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (MmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (VoiceEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeAllAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeLocalAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeForeignAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (Beta != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
-            }
-
-            if (NearNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
-            }
-
-            if (NearLatLong != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
-            }
-
-            if (Distance != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
-            }
-
-            if (InPostalCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
-            }
-
-            if (InRegion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
-            }
-
-            if (InRateCenter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
-            }
-
-            if (InLata != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLata", InLata));
-            }
-
-            if (InLocality != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
-            }
-
-            if (FaxEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Account requesting the AvailablePhoneNumber resources
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The ISO Country code of the country from which to read phone numbers
+    /// </summary>
+    public string PathCountryCode { get; }
+    /// <summary>
+    /// The area code of the phone numbers to read
+    /// </summary>
+    public int? AreaCode { get; set; }
+    /// <summary>
+    /// The pattern on which to match phone numbers
+    /// </summary>
+    public string Contains { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive text messages
+    /// </summary>
+    public bool? SmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive MMS messages
+    /// </summary>
+    public bool? MmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive calls.
+    /// </summary>
+    public bool? VoiceEnabled { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require an Address
+    /// </summary>
+    public bool? ExcludeAllAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a local address
+    /// </summary>
+    public bool? ExcludeLocalAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a foreign address
+    /// </summary>
+    public bool? ExcludeForeignAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to read phone numbers new to the Twilio platform
+    /// </summary>
+    public bool? Beta { get; set; }
+    /// <summary>
+    /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
+    /// </summary>
+    public Types.PhoneNumber NearNumber { get; set; }
+    /// <summary>
+    /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
+    /// </summary>
+    public string NearLatLong { get; set; }
+    /// <summary>
+    /// The search radius, in miles, for a near_ query. (US/Canada only)
+    /// </summary>
+    public int? Distance { get; set; }
+    /// <summary>
+    /// Limit results to a particular postal code. (US/Canada only)
+    /// </summary>
+    public string InPostalCode { get; set; }
+    /// <summary>
+    /// Limit results to a particular region. (US/Canada only)
+    /// </summary>
+    public string InRegion { get; set; }
+    /// <summary>
+    /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
+    /// </summary>
+    public string InRateCenter { get; set; }
+    /// <summary>
+    /// Limit results to a specific local access and transport area. (US/Canada only)
+    /// </summary>
+    public string InLata { get; set; }
+    /// <summary>
+    /// Limit results to a particular locality
+    /// </summary>
+    public string InLocality { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive faxes
+    /// </summary>
+    public bool? FaxEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMobileOptions
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    public ReadMobileOptions(string pathCountryCode)
+    {
+      PathCountryCode = pathCountryCode;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AreaCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
+      }
+
+      if (Contains != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Contains", Contains));
+      }
+
+      if (SmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (MmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (VoiceEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeAllAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeLocalAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeForeignAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (Beta != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
+      }
+
+      if (NearNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
+      }
+
+      if (NearLatLong != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
+      }
+
+      if (Distance != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
+      }
+
+      if (InPostalCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
+      }
+
+      if (InRegion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
+      }
+
+      if (InRateCenter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
+      }
+
+      if (InLata != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLata", InLata));
+      }
+
+      if (InLocality != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
+      }
+
+      if (FaxEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MobileResource.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MobileResource.cs
index 3a4727137..e9f441870 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MobileResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/MobileResource.cs
@@ -17,317 +17,317 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
-    public class MobileResource : Resource
-    {
-        private static Request BuildReadRequest(ReadMobileOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/Mobile.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Mobile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Mobile </returns>
-        public static ResourceSet<MobileResource> Read(ReadMobileOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MobileResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<MobileResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Mobile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Mobile </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MobileResource>> ReadAsync(ReadMobileOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MobileResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<MobileResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Mobile </returns>
-        public static ResourceSet<MobileResource> Read(string pathCountryCode,
-                                                       string pathAccountSid = null,
-                                                       int? areaCode = null,
-                                                       string contains = null,
-                                                       bool? smsEnabled = null,
-                                                       bool? mmsEnabled = null,
-                                                       bool? voiceEnabled = null,
-                                                       bool? excludeAllAddressRequired = null,
-                                                       bool? excludeLocalAddressRequired = null,
-                                                       bool? excludeForeignAddressRequired = null,
-                                                       bool? beta = null,
-                                                       Types.PhoneNumber nearNumber = null,
-                                                       string nearLatLong = null,
-                                                       int? distance = null,
-                                                       string inPostalCode = null,
-                                                       string inRegion = null,
-                                                       string inRateCenter = null,
-                                                       string inLata = null,
-                                                       string inLocality = null,
-                                                       bool? faxEnabled = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadMobileOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Mobile </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MobileResource>> ReadAsync(string pathCountryCode,
-                                                                                               string pathAccountSid = null,
-                                                                                               int? areaCode = null,
-                                                                                               string contains = null,
-                                                                                               bool? smsEnabled = null,
-                                                                                               bool? mmsEnabled = null,
-                                                                                               bool? voiceEnabled = null,
-                                                                                               bool? excludeAllAddressRequired = null,
-                                                                                               bool? excludeLocalAddressRequired = null,
-                                                                                               bool? excludeForeignAddressRequired = null,
-                                                                                               bool? beta = null,
-                                                                                               Types.PhoneNumber nearNumber = null,
-                                                                                               string nearLatLong = null,
-                                                                                               int? distance = null,
-                                                                                               string inPostalCode = null,
-                                                                                               string inRegion = null,
-                                                                                               string inRateCenter = null,
-                                                                                               string inLata = null,
-                                                                                               string inLocality = null,
-                                                                                               bool? faxEnabled = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadMobileOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MobileResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MobileResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MobileResource> NextPage(Page<MobileResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MobileResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MobileResource> PreviousPage(Page<MobileResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MobileResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a MobileResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MobileResource object represented by the provided JSON </returns>
-        public static MobileResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MobileResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A formatted version of the phone number
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber FriendlyName { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The LATA of this phone number
-        /// </summary>
-        [JsonProperty("lata")]
-        public string Lata { get; private set; }
-        /// <summary>
-        /// The locality or city of this phone number's location
-        /// </summary>
-        [JsonProperty("locality")]
-        public string Locality { get; private set; }
-        /// <summary>
-        /// The rate center of this phone number
-        /// </summary>
-        [JsonProperty("rate_center")]
-        public string RateCenter { get; private set; }
-        /// <summary>
-        /// The latitude of this phone number's location
-        /// </summary>
-        [JsonProperty("latitude")]
-        public decimal? Latitude { get; private set; }
-        /// <summary>
-        /// The longitude of this phone number's location
-        /// </summary>
-        [JsonProperty("longitude")]
-        public decimal? Longitude { get; private set; }
-        /// <summary>
-        /// The two-letter state or province abbreviation of this phone number's location
-        /// </summary>
-        [JsonProperty("region")]
-        public string Region { get; private set; }
-        /// <summary>
-        /// The postal or ZIP code of this phone number's location
-        /// </summary>
-        [JsonProperty("postal_code")]
-        public string PostalCode { get; private set; }
-        /// <summary>
-        /// The ISO country code of this phone number
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The type of Address resource the phone number requires
-        /// </summary>
-        [JsonProperty("address_requirements")]
-        public string AddressRequirements { get; private set; }
-        /// <summary>
-        /// Whether the phone number is new to the Twilio platform
-        /// </summary>
-        [JsonProperty("beta")]
-        public bool? Beta { get; private set; }
-        /// <summary>
-        /// Whether a phone number can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-
-        private MobileResource()
-        {
-
-        }
-    }
+{
+
+  public class MobileResource : Resource
+  {
+    private static Request BuildReadRequest(ReadMobileOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/Mobile.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Mobile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Mobile </returns>
+    public static ResourceSet<MobileResource> Read(ReadMobileOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MobileResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<MobileResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Mobile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Mobile </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MobileResource>> ReadAsync(ReadMobileOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MobileResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<MobileResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Mobile </returns>
+    public static ResourceSet<MobileResource> Read(string pathCountryCode,
+                                                   string pathAccountSid = null,
+                                                   int? areaCode = null,
+                                                   string contains = null,
+                                                   bool? smsEnabled = null,
+                                                   bool? mmsEnabled = null,
+                                                   bool? voiceEnabled = null,
+                                                   bool? excludeAllAddressRequired = null,
+                                                   bool? excludeLocalAddressRequired = null,
+                                                   bool? excludeForeignAddressRequired = null,
+                                                   bool? beta = null,
+                                                   Types.PhoneNumber nearNumber = null,
+                                                   string nearLatLong = null,
+                                                   int? distance = null,
+                                                   string inPostalCode = null,
+                                                   string inRegion = null,
+                                                   string inRateCenter = null,
+                                                   string inLata = null,
+                                                   string inLocality = null,
+                                                   bool? faxEnabled = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadMobileOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Mobile </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MobileResource>> ReadAsync(string pathCountryCode,
+                                                                                           string pathAccountSid = null,
+                                                                                           int? areaCode = null,
+                                                                                           string contains = null,
+                                                                                           bool? smsEnabled = null,
+                                                                                           bool? mmsEnabled = null,
+                                                                                           bool? voiceEnabled = null,
+                                                                                           bool? excludeAllAddressRequired = null,
+                                                                                           bool? excludeLocalAddressRequired = null,
+                                                                                           bool? excludeForeignAddressRequired = null,
+                                                                                           bool? beta = null,
+                                                                                           Types.PhoneNumber nearNumber = null,
+                                                                                           string nearLatLong = null,
+                                                                                           int? distance = null,
+                                                                                           string inPostalCode = null,
+                                                                                           string inRegion = null,
+                                                                                           string inRateCenter = null,
+                                                                                           string inLata = null,
+                                                                                           string inLocality = null,
+                                                                                           bool? faxEnabled = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadMobileOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MobileResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MobileResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MobileResource> NextPage(Page<MobileResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MobileResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MobileResource> PreviousPage(Page<MobileResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MobileResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a MobileResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MobileResource object represented by the provided JSON </returns>
+    public static MobileResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MobileResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A formatted version of the phone number
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber FriendlyName { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The LATA of this phone number
+    /// </summary>
+    [JsonProperty("lata")]
+    public string Lata { get; private set; }
+    /// <summary>
+    /// The locality or city of this phone number's location
+    /// </summary>
+    [JsonProperty("locality")]
+    public string Locality { get; private set; }
+    /// <summary>
+    /// The rate center of this phone number
+    /// </summary>
+    [JsonProperty("rate_center")]
+    public string RateCenter { get; private set; }
+    /// <summary>
+    /// The latitude of this phone number's location
+    /// </summary>
+    [JsonProperty("latitude")]
+    public decimal? Latitude { get; private set; }
+    /// <summary>
+    /// The longitude of this phone number's location
+    /// </summary>
+    [JsonProperty("longitude")]
+    public decimal? Longitude { get; private set; }
+    /// <summary>
+    /// The two-letter state or province abbreviation of this phone number's location
+    /// </summary>
+    [JsonProperty("region")]
+    public string Region { get; private set; }
+    /// <summary>
+    /// The postal or ZIP code of this phone number's location
+    /// </summary>
+    [JsonProperty("postal_code")]
+    public string PostalCode { get; private set; }
+    /// <summary>
+    /// The ISO country code of this phone number
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The type of Address resource the phone number requires
+    /// </summary>
+    [JsonProperty("address_requirements")]
+    public string AddressRequirements { get; private set; }
+    /// <summary>
+    /// Whether the phone number is new to the Twilio platform
+    /// </summary>
+    [JsonProperty("beta")]
+    public bool? Beta { get; private set; }
+    /// <summary>
+    /// Whether a phone number can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+
+    private MobileResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/NationalOptions.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/NationalOptions.cs
index 0541a863e..a35947772 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/NationalOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/NationalOptions.cs
@@ -9,206 +9,206 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
+{
+
+  /// <summary>
+  /// ReadNationalOptions
+  /// </summary>
+  public class ReadNationalOptions : ReadOptions<NationalResource>
+  {
     /// <summary>
-    /// ReadNationalOptions
-    /// </summary>
-    public class ReadNationalOptions : ReadOptions<NationalResource>
-    {
-        /// <summary>
-        /// The SID of the Account requesting the AvailablePhoneNumber resources
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The ISO Country code of the country from which to read phone numbers
-        /// </summary>
-        public string PathCountryCode { get; }
-        /// <summary>
-        /// The area code of the phone numbers to read
-        /// </summary>
-        public int? AreaCode { get; set; }
-        /// <summary>
-        /// The pattern on which to match phone numbers
-        /// </summary>
-        public string Contains { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive text messages
-        /// </summary>
-        public bool? SmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive MMS messages
-        /// </summary>
-        public bool? MmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive calls.
-        /// </summary>
-        public bool? VoiceEnabled { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require an Address
-        /// </summary>
-        public bool? ExcludeAllAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a local address
-        /// </summary>
-        public bool? ExcludeLocalAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a foreign address
-        /// </summary>
-        public bool? ExcludeForeignAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to read phone numbers new to the Twilio platform
-        /// </summary>
-        public bool? Beta { get; set; }
-        /// <summary>
-        /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
-        /// </summary>
-        public Types.PhoneNumber NearNumber { get; set; }
-        /// <summary>
-        /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
-        /// </summary>
-        public string NearLatLong { get; set; }
-        /// <summary>
-        /// The search radius, in miles, for a near_ query. (US/Canada only)
-        /// </summary>
-        public int? Distance { get; set; }
-        /// <summary>
-        /// Limit results to a particular postal code. (US/Canada only)
-        /// </summary>
-        public string InPostalCode { get; set; }
-        /// <summary>
-        /// Limit results to a particular region. (US/Canada only)
-        /// </summary>
-        public string InRegion { get; set; }
-        /// <summary>
-        /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
-        /// </summary>
-        public string InRateCenter { get; set; }
-        /// <summary>
-        /// Limit results to a specific local access and transport area. (US/Canada only)
-        /// </summary>
-        public string InLata { get; set; }
-        /// <summary>
-        /// Limit results to a particular locality
-        /// </summary>
-        public string InLocality { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive faxes
-        /// </summary>
-        public bool? FaxEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadNationalOptions
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        public ReadNationalOptions(string pathCountryCode)
-        {
-            PathCountryCode = pathCountryCode;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AreaCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
-            }
-
-            if (Contains != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Contains", Contains));
-            }
-
-            if (SmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (MmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (VoiceEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeAllAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeLocalAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeForeignAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (Beta != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
-            }
-
-            if (NearNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
-            }
-
-            if (NearLatLong != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
-            }
-
-            if (Distance != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
-            }
-
-            if (InPostalCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
-            }
-
-            if (InRegion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
-            }
-
-            if (InRateCenter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
-            }
-
-            if (InLata != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLata", InLata));
-            }
-
-            if (InLocality != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
-            }
-
-            if (FaxEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Account requesting the AvailablePhoneNumber resources
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The ISO Country code of the country from which to read phone numbers
+    /// </summary>
+    public string PathCountryCode { get; }
+    /// <summary>
+    /// The area code of the phone numbers to read
+    /// </summary>
+    public int? AreaCode { get; set; }
+    /// <summary>
+    /// The pattern on which to match phone numbers
+    /// </summary>
+    public string Contains { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive text messages
+    /// </summary>
+    public bool? SmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive MMS messages
+    /// </summary>
+    public bool? MmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive calls.
+    /// </summary>
+    public bool? VoiceEnabled { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require an Address
+    /// </summary>
+    public bool? ExcludeAllAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a local address
+    /// </summary>
+    public bool? ExcludeLocalAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a foreign address
+    /// </summary>
+    public bool? ExcludeForeignAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to read phone numbers new to the Twilio platform
+    /// </summary>
+    public bool? Beta { get; set; }
+    /// <summary>
+    /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
+    /// </summary>
+    public Types.PhoneNumber NearNumber { get; set; }
+    /// <summary>
+    /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
+    /// </summary>
+    public string NearLatLong { get; set; }
+    /// <summary>
+    /// The search radius, in miles, for a near_ query. (US/Canada only)
+    /// </summary>
+    public int? Distance { get; set; }
+    /// <summary>
+    /// Limit results to a particular postal code. (US/Canada only)
+    /// </summary>
+    public string InPostalCode { get; set; }
+    /// <summary>
+    /// Limit results to a particular region. (US/Canada only)
+    /// </summary>
+    public string InRegion { get; set; }
+    /// <summary>
+    /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
+    /// </summary>
+    public string InRateCenter { get; set; }
+    /// <summary>
+    /// Limit results to a specific local access and transport area. (US/Canada only)
+    /// </summary>
+    public string InLata { get; set; }
+    /// <summary>
+    /// Limit results to a particular locality
+    /// </summary>
+    public string InLocality { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive faxes
+    /// </summary>
+    public bool? FaxEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadNationalOptions
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    public ReadNationalOptions(string pathCountryCode)
+    {
+      PathCountryCode = pathCountryCode;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AreaCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
+      }
+
+      if (Contains != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Contains", Contains));
+      }
+
+      if (SmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (MmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (VoiceEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeAllAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeLocalAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeForeignAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (Beta != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
+      }
+
+      if (NearNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
+      }
+
+      if (NearLatLong != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
+      }
+
+      if (Distance != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
+      }
+
+      if (InPostalCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
+      }
+
+      if (InRegion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
+      }
+
+      if (InRateCenter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
+      }
+
+      if (InLata != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLata", InLata));
+      }
+
+      if (InLocality != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
+      }
+
+      if (FaxEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/NationalResource.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/NationalResource.cs
index a75d84be4..b835120d9 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/NationalResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/NationalResource.cs
@@ -17,317 +17,317 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
-    public class NationalResource : Resource
-    {
-        private static Request BuildReadRequest(ReadNationalOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/National.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read National parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of National </returns>
-        public static ResourceSet<NationalResource> Read(ReadNationalOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<NationalResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<NationalResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read National parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of National </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<NationalResource>> ReadAsync(ReadNationalOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<NationalResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<NationalResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of National </returns>
-        public static ResourceSet<NationalResource> Read(string pathCountryCode,
-                                                         string pathAccountSid = null,
-                                                         int? areaCode = null,
-                                                         string contains = null,
-                                                         bool? smsEnabled = null,
-                                                         bool? mmsEnabled = null,
-                                                         bool? voiceEnabled = null,
-                                                         bool? excludeAllAddressRequired = null,
-                                                         bool? excludeLocalAddressRequired = null,
-                                                         bool? excludeForeignAddressRequired = null,
-                                                         bool? beta = null,
-                                                         Types.PhoneNumber nearNumber = null,
-                                                         string nearLatLong = null,
-                                                         int? distance = null,
-                                                         string inPostalCode = null,
-                                                         string inRegion = null,
-                                                         string inRateCenter = null,
-                                                         string inLata = null,
-                                                         string inLocality = null,
-                                                         bool? faxEnabled = null,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadNationalOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of National </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<NationalResource>> ReadAsync(string pathCountryCode,
-                                                                                                 string pathAccountSid = null,
-                                                                                                 int? areaCode = null,
-                                                                                                 string contains = null,
-                                                                                                 bool? smsEnabled = null,
-                                                                                                 bool? mmsEnabled = null,
-                                                                                                 bool? voiceEnabled = null,
-                                                                                                 bool? excludeAllAddressRequired = null,
-                                                                                                 bool? excludeLocalAddressRequired = null,
-                                                                                                 bool? excludeForeignAddressRequired = null,
-                                                                                                 bool? beta = null,
-                                                                                                 Types.PhoneNumber nearNumber = null,
-                                                                                                 string nearLatLong = null,
-                                                                                                 int? distance = null,
-                                                                                                 string inPostalCode = null,
-                                                                                                 string inRegion = null,
-                                                                                                 string inRateCenter = null,
-                                                                                                 string inLata = null,
-                                                                                                 string inLocality = null,
-                                                                                                 bool? faxEnabled = null,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadNationalOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<NationalResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<NationalResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<NationalResource> NextPage(Page<NationalResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<NationalResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<NationalResource> PreviousPage(Page<NationalResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<NationalResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a NationalResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NationalResource object represented by the provided JSON </returns>
-        public static NationalResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NationalResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A formatted version of the phone number
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber FriendlyName { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The LATA of this phone number
-        /// </summary>
-        [JsonProperty("lata")]
-        public string Lata { get; private set; }
-        /// <summary>
-        /// The locality or city of this phone number's location
-        /// </summary>
-        [JsonProperty("locality")]
-        public string Locality { get; private set; }
-        /// <summary>
-        /// The rate center of this phone number
-        /// </summary>
-        [JsonProperty("rate_center")]
-        public string RateCenter { get; private set; }
-        /// <summary>
-        /// The latitude of this phone number's location
-        /// </summary>
-        [JsonProperty("latitude")]
-        public decimal? Latitude { get; private set; }
-        /// <summary>
-        /// The longitude of this phone number's location
-        /// </summary>
-        [JsonProperty("longitude")]
-        public decimal? Longitude { get; private set; }
-        /// <summary>
-        /// The two-letter state or province abbreviation of this phone number's location
-        /// </summary>
-        [JsonProperty("region")]
-        public string Region { get; private set; }
-        /// <summary>
-        /// The postal or ZIP code of this phone number's location
-        /// </summary>
-        [JsonProperty("postal_code")]
-        public string PostalCode { get; private set; }
-        /// <summary>
-        /// The ISO country code of this phone number
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The type of Address resource the phone number requires
-        /// </summary>
-        [JsonProperty("address_requirements")]
-        public string AddressRequirements { get; private set; }
-        /// <summary>
-        /// Whether the phone number is new to the Twilio platform
-        /// </summary>
-        [JsonProperty("beta")]
-        public bool? Beta { get; private set; }
-        /// <summary>
-        /// Whether a phone number can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-
-        private NationalResource()
-        {
-
-        }
-    }
+{
+
+  public class NationalResource : Resource
+  {
+    private static Request BuildReadRequest(ReadNationalOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/National.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read National parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of National </returns>
+    public static ResourceSet<NationalResource> Read(ReadNationalOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<NationalResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<NationalResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read National parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of National </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<NationalResource>> ReadAsync(ReadNationalOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<NationalResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<NationalResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of National </returns>
+    public static ResourceSet<NationalResource> Read(string pathCountryCode,
+                                                     string pathAccountSid = null,
+                                                     int? areaCode = null,
+                                                     string contains = null,
+                                                     bool? smsEnabled = null,
+                                                     bool? mmsEnabled = null,
+                                                     bool? voiceEnabled = null,
+                                                     bool? excludeAllAddressRequired = null,
+                                                     bool? excludeLocalAddressRequired = null,
+                                                     bool? excludeForeignAddressRequired = null,
+                                                     bool? beta = null,
+                                                     Types.PhoneNumber nearNumber = null,
+                                                     string nearLatLong = null,
+                                                     int? distance = null,
+                                                     string inPostalCode = null,
+                                                     string inRegion = null,
+                                                     string inRateCenter = null,
+                                                     string inLata = null,
+                                                     string inLocality = null,
+                                                     bool? faxEnabled = null,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadNationalOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of National </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<NationalResource>> ReadAsync(string pathCountryCode,
+                                                                                             string pathAccountSid = null,
+                                                                                             int? areaCode = null,
+                                                                                             string contains = null,
+                                                                                             bool? smsEnabled = null,
+                                                                                             bool? mmsEnabled = null,
+                                                                                             bool? voiceEnabled = null,
+                                                                                             bool? excludeAllAddressRequired = null,
+                                                                                             bool? excludeLocalAddressRequired = null,
+                                                                                             bool? excludeForeignAddressRequired = null,
+                                                                                             bool? beta = null,
+                                                                                             Types.PhoneNumber nearNumber = null,
+                                                                                             string nearLatLong = null,
+                                                                                             int? distance = null,
+                                                                                             string inPostalCode = null,
+                                                                                             string inRegion = null,
+                                                                                             string inRateCenter = null,
+                                                                                             string inLata = null,
+                                                                                             string inLocality = null,
+                                                                                             bool? faxEnabled = null,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadNationalOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<NationalResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<NationalResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<NationalResource> NextPage(Page<NationalResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<NationalResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<NationalResource> PreviousPage(Page<NationalResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<NationalResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a NationalResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NationalResource object represented by the provided JSON </returns>
+    public static NationalResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NationalResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A formatted version of the phone number
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber FriendlyName { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The LATA of this phone number
+    /// </summary>
+    [JsonProperty("lata")]
+    public string Lata { get; private set; }
+    /// <summary>
+    /// The locality or city of this phone number's location
+    /// </summary>
+    [JsonProperty("locality")]
+    public string Locality { get; private set; }
+    /// <summary>
+    /// The rate center of this phone number
+    /// </summary>
+    [JsonProperty("rate_center")]
+    public string RateCenter { get; private set; }
+    /// <summary>
+    /// The latitude of this phone number's location
+    /// </summary>
+    [JsonProperty("latitude")]
+    public decimal? Latitude { get; private set; }
+    /// <summary>
+    /// The longitude of this phone number's location
+    /// </summary>
+    [JsonProperty("longitude")]
+    public decimal? Longitude { get; private set; }
+    /// <summary>
+    /// The two-letter state or province abbreviation of this phone number's location
+    /// </summary>
+    [JsonProperty("region")]
+    public string Region { get; private set; }
+    /// <summary>
+    /// The postal or ZIP code of this phone number's location
+    /// </summary>
+    [JsonProperty("postal_code")]
+    public string PostalCode { get; private set; }
+    /// <summary>
+    /// The ISO country code of this phone number
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The type of Address resource the phone number requires
+    /// </summary>
+    [JsonProperty("address_requirements")]
+    public string AddressRequirements { get; private set; }
+    /// <summary>
+    /// Whether the phone number is new to the Twilio platform
+    /// </summary>
+    [JsonProperty("beta")]
+    public bool? Beta { get; private set; }
+    /// <summary>
+    /// Whether a phone number can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+
+    private NationalResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/SharedCostOptions.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/SharedCostOptions.cs
index 8295b0e66..139ba0436 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/SharedCostOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/SharedCostOptions.cs
@@ -9,206 +9,206 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
+{
+
+  /// <summary>
+  /// ReadSharedCostOptions
+  /// </summary>
+  public class ReadSharedCostOptions : ReadOptions<SharedCostResource>
+  {
     /// <summary>
-    /// ReadSharedCostOptions
-    /// </summary>
-    public class ReadSharedCostOptions : ReadOptions<SharedCostResource>
-    {
-        /// <summary>
-        /// The SID of the Account requesting the AvailablePhoneNumber resources
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The ISO Country code of the country from which to read phone numbers
-        /// </summary>
-        public string PathCountryCode { get; }
-        /// <summary>
-        /// The area code of the phone numbers to read
-        /// </summary>
-        public int? AreaCode { get; set; }
-        /// <summary>
-        /// The pattern on which to match phone numbers
-        /// </summary>
-        public string Contains { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive text messages
-        /// </summary>
-        public bool? SmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive MMS messages
-        /// </summary>
-        public bool? MmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive calls.
-        /// </summary>
-        public bool? VoiceEnabled { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require an Address
-        /// </summary>
-        public bool? ExcludeAllAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a local address
-        /// </summary>
-        public bool? ExcludeLocalAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a foreign address
-        /// </summary>
-        public bool? ExcludeForeignAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to read phone numbers new to the Twilio platform
-        /// </summary>
-        public bool? Beta { get; set; }
-        /// <summary>
-        /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
-        /// </summary>
-        public Types.PhoneNumber NearNumber { get; set; }
-        /// <summary>
-        /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
-        /// </summary>
-        public string NearLatLong { get; set; }
-        /// <summary>
-        /// The search radius, in miles, for a near_ query. (US/Canada only)
-        /// </summary>
-        public int? Distance { get; set; }
-        /// <summary>
-        /// Limit results to a particular postal code. (US/Canada only)
-        /// </summary>
-        public string InPostalCode { get; set; }
-        /// <summary>
-        /// Limit results to a particular region. (US/Canada only)
-        /// </summary>
-        public string InRegion { get; set; }
-        /// <summary>
-        /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
-        /// </summary>
-        public string InRateCenter { get; set; }
-        /// <summary>
-        /// Limit results to a specific local access and transport area. (US/Canada only)
-        /// </summary>
-        public string InLata { get; set; }
-        /// <summary>
-        /// Limit results to a particular locality
-        /// </summary>
-        public string InLocality { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive faxes
-        /// </summary>
-        public bool? FaxEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadSharedCostOptions
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        public ReadSharedCostOptions(string pathCountryCode)
-        {
-            PathCountryCode = pathCountryCode;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AreaCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
-            }
-
-            if (Contains != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Contains", Contains));
-            }
-
-            if (SmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (MmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (VoiceEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeAllAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeLocalAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeForeignAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (Beta != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
-            }
-
-            if (NearNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
-            }
-
-            if (NearLatLong != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
-            }
-
-            if (Distance != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
-            }
-
-            if (InPostalCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
-            }
-
-            if (InRegion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
-            }
-
-            if (InRateCenter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
-            }
-
-            if (InLata != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLata", InLata));
-            }
-
-            if (InLocality != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
-            }
-
-            if (FaxEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Account requesting the AvailablePhoneNumber resources
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The ISO Country code of the country from which to read phone numbers
+    /// </summary>
+    public string PathCountryCode { get; }
+    /// <summary>
+    /// The area code of the phone numbers to read
+    /// </summary>
+    public int? AreaCode { get; set; }
+    /// <summary>
+    /// The pattern on which to match phone numbers
+    /// </summary>
+    public string Contains { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive text messages
+    /// </summary>
+    public bool? SmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive MMS messages
+    /// </summary>
+    public bool? MmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive calls.
+    /// </summary>
+    public bool? VoiceEnabled { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require an Address
+    /// </summary>
+    public bool? ExcludeAllAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a local address
+    /// </summary>
+    public bool? ExcludeLocalAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a foreign address
+    /// </summary>
+    public bool? ExcludeForeignAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to read phone numbers new to the Twilio platform
+    /// </summary>
+    public bool? Beta { get; set; }
+    /// <summary>
+    /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
+    /// </summary>
+    public Types.PhoneNumber NearNumber { get; set; }
+    /// <summary>
+    /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
+    /// </summary>
+    public string NearLatLong { get; set; }
+    /// <summary>
+    /// The search radius, in miles, for a near_ query. (US/Canada only)
+    /// </summary>
+    public int? Distance { get; set; }
+    /// <summary>
+    /// Limit results to a particular postal code. (US/Canada only)
+    /// </summary>
+    public string InPostalCode { get; set; }
+    /// <summary>
+    /// Limit results to a particular region. (US/Canada only)
+    /// </summary>
+    public string InRegion { get; set; }
+    /// <summary>
+    /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
+    /// </summary>
+    public string InRateCenter { get; set; }
+    /// <summary>
+    /// Limit results to a specific local access and transport area. (US/Canada only)
+    /// </summary>
+    public string InLata { get; set; }
+    /// <summary>
+    /// Limit results to a particular locality
+    /// </summary>
+    public string InLocality { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive faxes
+    /// </summary>
+    public bool? FaxEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadSharedCostOptions
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    public ReadSharedCostOptions(string pathCountryCode)
+    {
+      PathCountryCode = pathCountryCode;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AreaCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
+      }
+
+      if (Contains != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Contains", Contains));
+      }
+
+      if (SmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (MmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (VoiceEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeAllAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeLocalAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeForeignAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (Beta != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
+      }
+
+      if (NearNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
+      }
+
+      if (NearLatLong != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
+      }
+
+      if (Distance != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
+      }
+
+      if (InPostalCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
+      }
+
+      if (InRegion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
+      }
+
+      if (InRateCenter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
+      }
+
+      if (InLata != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLata", InLata));
+      }
+
+      if (InLocality != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
+      }
+
+      if (FaxEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/SharedCostResource.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/SharedCostResource.cs
index 95f9454e5..2a97fe984 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/SharedCostResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/SharedCostResource.cs
@@ -17,317 +17,317 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
-    public class SharedCostResource : Resource
-    {
-        private static Request BuildReadRequest(ReadSharedCostOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/SharedCost.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SharedCost parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SharedCost </returns>
-        public static ResourceSet<SharedCostResource> Read(ReadSharedCostOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SharedCostResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<SharedCostResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SharedCost parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SharedCost </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SharedCostResource>> ReadAsync(ReadSharedCostOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SharedCostResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<SharedCostResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SharedCost </returns>
-        public static ResourceSet<SharedCostResource> Read(string pathCountryCode,
-                                                           string pathAccountSid = null,
-                                                           int? areaCode = null,
-                                                           string contains = null,
-                                                           bool? smsEnabled = null,
-                                                           bool? mmsEnabled = null,
-                                                           bool? voiceEnabled = null,
-                                                           bool? excludeAllAddressRequired = null,
-                                                           bool? excludeLocalAddressRequired = null,
-                                                           bool? excludeForeignAddressRequired = null,
-                                                           bool? beta = null,
-                                                           Types.PhoneNumber nearNumber = null,
-                                                           string nearLatLong = null,
-                                                           int? distance = null,
-                                                           string inPostalCode = null,
-                                                           string inRegion = null,
-                                                           string inRateCenter = null,
-                                                           string inLata = null,
-                                                           string inLocality = null,
-                                                           bool? faxEnabled = null,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadSharedCostOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SharedCost </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SharedCostResource>> ReadAsync(string pathCountryCode,
-                                                                                                   string pathAccountSid = null,
-                                                                                                   int? areaCode = null,
-                                                                                                   string contains = null,
-                                                                                                   bool? smsEnabled = null,
-                                                                                                   bool? mmsEnabled = null,
-                                                                                                   bool? voiceEnabled = null,
-                                                                                                   bool? excludeAllAddressRequired = null,
-                                                                                                   bool? excludeLocalAddressRequired = null,
-                                                                                                   bool? excludeForeignAddressRequired = null,
-                                                                                                   bool? beta = null,
-                                                                                                   Types.PhoneNumber nearNumber = null,
-                                                                                                   string nearLatLong = null,
-                                                                                                   int? distance = null,
-                                                                                                   string inPostalCode = null,
-                                                                                                   string inRegion = null,
-                                                                                                   string inRateCenter = null,
-                                                                                                   string inLata = null,
-                                                                                                   string inLocality = null,
-                                                                                                   bool? faxEnabled = null,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadSharedCostOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SharedCostResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SharedCostResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SharedCostResource> NextPage(Page<SharedCostResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<SharedCostResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SharedCostResource> PreviousPage(Page<SharedCostResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<SharedCostResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a SharedCostResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SharedCostResource object represented by the provided JSON </returns>
-        public static SharedCostResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SharedCostResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A formatted version of the phone number
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber FriendlyName { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The LATA of this phone number
-        /// </summary>
-        [JsonProperty("lata")]
-        public string Lata { get; private set; }
-        /// <summary>
-        /// The locality or city of this phone number's location
-        /// </summary>
-        [JsonProperty("locality")]
-        public string Locality { get; private set; }
-        /// <summary>
-        /// The rate center of this phone number
-        /// </summary>
-        [JsonProperty("rate_center")]
-        public string RateCenter { get; private set; }
-        /// <summary>
-        /// The latitude of this phone number's location
-        /// </summary>
-        [JsonProperty("latitude")]
-        public decimal? Latitude { get; private set; }
-        /// <summary>
-        /// The longitude of this phone number's location
-        /// </summary>
-        [JsonProperty("longitude")]
-        public decimal? Longitude { get; private set; }
-        /// <summary>
-        /// The two-letter state or province abbreviation of this phone number's location
-        /// </summary>
-        [JsonProperty("region")]
-        public string Region { get; private set; }
-        /// <summary>
-        /// The postal or ZIP code of this phone number's location
-        /// </summary>
-        [JsonProperty("postal_code")]
-        public string PostalCode { get; private set; }
-        /// <summary>
-        /// The ISO country code of this phone number
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The type of Address resource the phone number requires
-        /// </summary>
-        [JsonProperty("address_requirements")]
-        public string AddressRequirements { get; private set; }
-        /// <summary>
-        /// Whether the phone number is new to the Twilio platform
-        /// </summary>
-        [JsonProperty("beta")]
-        public bool? Beta { get; private set; }
-        /// <summary>
-        /// Whether a phone number can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-
-        private SharedCostResource()
-        {
-
-        }
-    }
+{
+
+  public class SharedCostResource : Resource
+  {
+    private static Request BuildReadRequest(ReadSharedCostOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/SharedCost.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SharedCost parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SharedCost </returns>
+    public static ResourceSet<SharedCostResource> Read(ReadSharedCostOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SharedCostResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<SharedCostResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SharedCost parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SharedCost </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SharedCostResource>> ReadAsync(ReadSharedCostOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SharedCostResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<SharedCostResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SharedCost </returns>
+    public static ResourceSet<SharedCostResource> Read(string pathCountryCode,
+                                                       string pathAccountSid = null,
+                                                       int? areaCode = null,
+                                                       string contains = null,
+                                                       bool? smsEnabled = null,
+                                                       bool? mmsEnabled = null,
+                                                       bool? voiceEnabled = null,
+                                                       bool? excludeAllAddressRequired = null,
+                                                       bool? excludeLocalAddressRequired = null,
+                                                       bool? excludeForeignAddressRequired = null,
+                                                       bool? beta = null,
+                                                       Types.PhoneNumber nearNumber = null,
+                                                       string nearLatLong = null,
+                                                       int? distance = null,
+                                                       string inPostalCode = null,
+                                                       string inRegion = null,
+                                                       string inRateCenter = null,
+                                                       string inLata = null,
+                                                       string inLocality = null,
+                                                       bool? faxEnabled = null,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadSharedCostOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SharedCost </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SharedCostResource>> ReadAsync(string pathCountryCode,
+                                                                                               string pathAccountSid = null,
+                                                                                               int? areaCode = null,
+                                                                                               string contains = null,
+                                                                                               bool? smsEnabled = null,
+                                                                                               bool? mmsEnabled = null,
+                                                                                               bool? voiceEnabled = null,
+                                                                                               bool? excludeAllAddressRequired = null,
+                                                                                               bool? excludeLocalAddressRequired = null,
+                                                                                               bool? excludeForeignAddressRequired = null,
+                                                                                               bool? beta = null,
+                                                                                               Types.PhoneNumber nearNumber = null,
+                                                                                               string nearLatLong = null,
+                                                                                               int? distance = null,
+                                                                                               string inPostalCode = null,
+                                                                                               string inRegion = null,
+                                                                                               string inRateCenter = null,
+                                                                                               string inLata = null,
+                                                                                               string inLocality = null,
+                                                                                               bool? faxEnabled = null,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadSharedCostOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SharedCostResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SharedCostResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SharedCostResource> NextPage(Page<SharedCostResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<SharedCostResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SharedCostResource> PreviousPage(Page<SharedCostResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<SharedCostResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a SharedCostResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SharedCostResource object represented by the provided JSON </returns>
+    public static SharedCostResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SharedCostResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A formatted version of the phone number
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber FriendlyName { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The LATA of this phone number
+    /// </summary>
+    [JsonProperty("lata")]
+    public string Lata { get; private set; }
+    /// <summary>
+    /// The locality or city of this phone number's location
+    /// </summary>
+    [JsonProperty("locality")]
+    public string Locality { get; private set; }
+    /// <summary>
+    /// The rate center of this phone number
+    /// </summary>
+    [JsonProperty("rate_center")]
+    public string RateCenter { get; private set; }
+    /// <summary>
+    /// The latitude of this phone number's location
+    /// </summary>
+    [JsonProperty("latitude")]
+    public decimal? Latitude { get; private set; }
+    /// <summary>
+    /// The longitude of this phone number's location
+    /// </summary>
+    [JsonProperty("longitude")]
+    public decimal? Longitude { get; private set; }
+    /// <summary>
+    /// The two-letter state or province abbreviation of this phone number's location
+    /// </summary>
+    [JsonProperty("region")]
+    public string Region { get; private set; }
+    /// <summary>
+    /// The postal or ZIP code of this phone number's location
+    /// </summary>
+    [JsonProperty("postal_code")]
+    public string PostalCode { get; private set; }
+    /// <summary>
+    /// The ISO country code of this phone number
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The type of Address resource the phone number requires
+    /// </summary>
+    [JsonProperty("address_requirements")]
+    public string AddressRequirements { get; private set; }
+    /// <summary>
+    /// Whether the phone number is new to the Twilio platform
+    /// </summary>
+    [JsonProperty("beta")]
+    public bool? Beta { get; private set; }
+    /// <summary>
+    /// Whether a phone number can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+
+    private SharedCostResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/TollFreeOptions.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/TollFreeOptions.cs
index 9690409e6..5c252060b 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/TollFreeOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/TollFreeOptions.cs
@@ -9,206 +9,206 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
+{
+
+  /// <summary>
+  /// ReadTollFreeOptions
+  /// </summary>
+  public class ReadTollFreeOptions : ReadOptions<TollFreeResource>
+  {
     /// <summary>
-    /// ReadTollFreeOptions
-    /// </summary>
-    public class ReadTollFreeOptions : ReadOptions<TollFreeResource>
-    {
-        /// <summary>
-        /// The SID of the Account requesting the AvailablePhoneNumber resources
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The ISO Country code of the country from which to read phone numbers
-        /// </summary>
-        public string PathCountryCode { get; }
-        /// <summary>
-        /// The area code of the phone numbers to read
-        /// </summary>
-        public int? AreaCode { get; set; }
-        /// <summary>
-        /// The pattern on which to match phone numbers
-        /// </summary>
-        public string Contains { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive text messages
-        /// </summary>
-        public bool? SmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive MMS messages
-        /// </summary>
-        public bool? MmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive calls.
-        /// </summary>
-        public bool? VoiceEnabled { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require an Address
-        /// </summary>
-        public bool? ExcludeAllAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a local address
-        /// </summary>
-        public bool? ExcludeLocalAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a foreign address
-        /// </summary>
-        public bool? ExcludeForeignAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to read phone numbers new to the Twilio platform
-        /// </summary>
-        public bool? Beta { get; set; }
-        /// <summary>
-        /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
-        /// </summary>
-        public Types.PhoneNumber NearNumber { get; set; }
-        /// <summary>
-        /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
-        /// </summary>
-        public string NearLatLong { get; set; }
-        /// <summary>
-        /// The search radius, in miles, for a near_ query. (US/Canada only)
-        /// </summary>
-        public int? Distance { get; set; }
-        /// <summary>
-        /// Limit results to a particular postal code. (US/Canada only)
-        /// </summary>
-        public string InPostalCode { get; set; }
-        /// <summary>
-        /// Limit results to a particular region. (US/Canada only)
-        /// </summary>
-        public string InRegion { get; set; }
-        /// <summary>
-        /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
-        /// </summary>
-        public string InRateCenter { get; set; }
-        /// <summary>
-        /// Limit results to a specific local access and transport area. (US/Canada only)
-        /// </summary>
-        public string InLata { get; set; }
-        /// <summary>
-        /// Limit results to a particular locality
-        /// </summary>
-        public string InLocality { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive faxes
-        /// </summary>
-        public bool? FaxEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadTollFreeOptions
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        public ReadTollFreeOptions(string pathCountryCode)
-        {
-            PathCountryCode = pathCountryCode;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AreaCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
-            }
-
-            if (Contains != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Contains", Contains));
-            }
-
-            if (SmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (MmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (VoiceEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeAllAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeLocalAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeForeignAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (Beta != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
-            }
-
-            if (NearNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
-            }
-
-            if (NearLatLong != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
-            }
-
-            if (Distance != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
-            }
-
-            if (InPostalCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
-            }
-
-            if (InRegion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
-            }
-
-            if (InRateCenter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
-            }
-
-            if (InLata != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLata", InLata));
-            }
-
-            if (InLocality != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
-            }
-
-            if (FaxEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Account requesting the AvailablePhoneNumber resources
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The ISO Country code of the country from which to read phone numbers
+    /// </summary>
+    public string PathCountryCode { get; }
+    /// <summary>
+    /// The area code of the phone numbers to read
+    /// </summary>
+    public int? AreaCode { get; set; }
+    /// <summary>
+    /// The pattern on which to match phone numbers
+    /// </summary>
+    public string Contains { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive text messages
+    /// </summary>
+    public bool? SmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive MMS messages
+    /// </summary>
+    public bool? MmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive calls.
+    /// </summary>
+    public bool? VoiceEnabled { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require an Address
+    /// </summary>
+    public bool? ExcludeAllAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a local address
+    /// </summary>
+    public bool? ExcludeLocalAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a foreign address
+    /// </summary>
+    public bool? ExcludeForeignAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to read phone numbers new to the Twilio platform
+    /// </summary>
+    public bool? Beta { get; set; }
+    /// <summary>
+    /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
+    /// </summary>
+    public Types.PhoneNumber NearNumber { get; set; }
+    /// <summary>
+    /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
+    /// </summary>
+    public string NearLatLong { get; set; }
+    /// <summary>
+    /// The search radius, in miles, for a near_ query. (US/Canada only)
+    /// </summary>
+    public int? Distance { get; set; }
+    /// <summary>
+    /// Limit results to a particular postal code. (US/Canada only)
+    /// </summary>
+    public string InPostalCode { get; set; }
+    /// <summary>
+    /// Limit results to a particular region. (US/Canada only)
+    /// </summary>
+    public string InRegion { get; set; }
+    /// <summary>
+    /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
+    /// </summary>
+    public string InRateCenter { get; set; }
+    /// <summary>
+    /// Limit results to a specific local access and transport area. (US/Canada only)
+    /// </summary>
+    public string InLata { get; set; }
+    /// <summary>
+    /// Limit results to a particular locality
+    /// </summary>
+    public string InLocality { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive faxes
+    /// </summary>
+    public bool? FaxEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadTollFreeOptions
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    public ReadTollFreeOptions(string pathCountryCode)
+    {
+      PathCountryCode = pathCountryCode;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AreaCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
+      }
+
+      if (Contains != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Contains", Contains));
+      }
+
+      if (SmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (MmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (VoiceEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeAllAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeLocalAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeForeignAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (Beta != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
+      }
+
+      if (NearNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
+      }
+
+      if (NearLatLong != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
+      }
+
+      if (Distance != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
+      }
+
+      if (InPostalCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
+      }
+
+      if (InRegion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
+      }
+
+      if (InRateCenter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
+      }
+
+      if (InLata != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLata", InLata));
+      }
+
+      if (InLocality != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
+      }
+
+      if (FaxEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/TollFreeResource.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/TollFreeResource.cs
index 8923464bf..aaa0634ad 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/TollFreeResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/TollFreeResource.cs
@@ -17,317 +17,317 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
-    public class TollFreeResource : Resource
-    {
-        private static Request BuildReadRequest(ReadTollFreeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/TollFree.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read TollFree parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TollFree </returns>
-        public static ResourceSet<TollFreeResource> Read(ReadTollFreeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TollFreeResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<TollFreeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read TollFree parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TollFree </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TollFreeResource>> ReadAsync(ReadTollFreeOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TollFreeResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<TollFreeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TollFree </returns>
-        public static ResourceSet<TollFreeResource> Read(string pathCountryCode,
-                                                         string pathAccountSid = null,
-                                                         int? areaCode = null,
-                                                         string contains = null,
-                                                         bool? smsEnabled = null,
-                                                         bool? mmsEnabled = null,
-                                                         bool? voiceEnabled = null,
-                                                         bool? excludeAllAddressRequired = null,
-                                                         bool? excludeLocalAddressRequired = null,
-                                                         bool? excludeForeignAddressRequired = null,
-                                                         bool? beta = null,
-                                                         Types.PhoneNumber nearNumber = null,
-                                                         string nearLatLong = null,
-                                                         int? distance = null,
-                                                         string inPostalCode = null,
-                                                         string inRegion = null,
-                                                         string inRateCenter = null,
-                                                         string inLata = null,
-                                                         string inLocality = null,
-                                                         bool? faxEnabled = null,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadTollFreeOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TollFree </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TollFreeResource>> ReadAsync(string pathCountryCode,
-                                                                                                 string pathAccountSid = null,
-                                                                                                 int? areaCode = null,
-                                                                                                 string contains = null,
-                                                                                                 bool? smsEnabled = null,
-                                                                                                 bool? mmsEnabled = null,
-                                                                                                 bool? voiceEnabled = null,
-                                                                                                 bool? excludeAllAddressRequired = null,
-                                                                                                 bool? excludeLocalAddressRequired = null,
-                                                                                                 bool? excludeForeignAddressRequired = null,
-                                                                                                 bool? beta = null,
-                                                                                                 Types.PhoneNumber nearNumber = null,
-                                                                                                 string nearLatLong = null,
-                                                                                                 int? distance = null,
-                                                                                                 string inPostalCode = null,
-                                                                                                 string inRegion = null,
-                                                                                                 string inRateCenter = null,
-                                                                                                 string inLata = null,
-                                                                                                 string inLocality = null,
-                                                                                                 bool? faxEnabled = null,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadTollFreeOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TollFreeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TollFreeResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TollFreeResource> NextPage(Page<TollFreeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<TollFreeResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TollFreeResource> PreviousPage(Page<TollFreeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<TollFreeResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a TollFreeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TollFreeResource object represented by the provided JSON </returns>
-        public static TollFreeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TollFreeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A formatted version of the phone number
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber FriendlyName { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The LATA of this phone number
-        /// </summary>
-        [JsonProperty("lata")]
-        public string Lata { get; private set; }
-        /// <summary>
-        /// The locality or city of this phone number's location
-        /// </summary>
-        [JsonProperty("locality")]
-        public string Locality { get; private set; }
-        /// <summary>
-        /// The rate center of this phone number
-        /// </summary>
-        [JsonProperty("rate_center")]
-        public string RateCenter { get; private set; }
-        /// <summary>
-        /// The latitude of this phone number's location
-        /// </summary>
-        [JsonProperty("latitude")]
-        public decimal? Latitude { get; private set; }
-        /// <summary>
-        /// The longitude of this phone number's location
-        /// </summary>
-        [JsonProperty("longitude")]
-        public decimal? Longitude { get; private set; }
-        /// <summary>
-        /// The two-letter state or province abbreviation of this phone number's location
-        /// </summary>
-        [JsonProperty("region")]
-        public string Region { get; private set; }
-        /// <summary>
-        /// The postal or ZIP code of this phone number's location
-        /// </summary>
-        [JsonProperty("postal_code")]
-        public string PostalCode { get; private set; }
-        /// <summary>
-        /// The ISO country code of this phone number
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The type of Address resource the phone number requires
-        /// </summary>
-        [JsonProperty("address_requirements")]
-        public string AddressRequirements { get; private set; }
-        /// <summary>
-        /// Whether the phone number is new to the Twilio platform
-        /// </summary>
-        [JsonProperty("beta")]
-        public bool? Beta { get; private set; }
-        /// <summary>
-        /// Whether a phone number can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-
-        private TollFreeResource()
-        {
-
-        }
-    }
+{
+
+  public class TollFreeResource : Resource
+  {
+    private static Request BuildReadRequest(ReadTollFreeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/TollFree.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read TollFree parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TollFree </returns>
+    public static ResourceSet<TollFreeResource> Read(ReadTollFreeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TollFreeResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<TollFreeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read TollFree parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TollFree </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TollFreeResource>> ReadAsync(ReadTollFreeOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TollFreeResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<TollFreeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TollFree </returns>
+    public static ResourceSet<TollFreeResource> Read(string pathCountryCode,
+                                                     string pathAccountSid = null,
+                                                     int? areaCode = null,
+                                                     string contains = null,
+                                                     bool? smsEnabled = null,
+                                                     bool? mmsEnabled = null,
+                                                     bool? voiceEnabled = null,
+                                                     bool? excludeAllAddressRequired = null,
+                                                     bool? excludeLocalAddressRequired = null,
+                                                     bool? excludeForeignAddressRequired = null,
+                                                     bool? beta = null,
+                                                     Types.PhoneNumber nearNumber = null,
+                                                     string nearLatLong = null,
+                                                     int? distance = null,
+                                                     string inPostalCode = null,
+                                                     string inRegion = null,
+                                                     string inRateCenter = null,
+                                                     string inLata = null,
+                                                     string inLocality = null,
+                                                     bool? faxEnabled = null,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadTollFreeOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TollFree </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TollFreeResource>> ReadAsync(string pathCountryCode,
+                                                                                             string pathAccountSid = null,
+                                                                                             int? areaCode = null,
+                                                                                             string contains = null,
+                                                                                             bool? smsEnabled = null,
+                                                                                             bool? mmsEnabled = null,
+                                                                                             bool? voiceEnabled = null,
+                                                                                             bool? excludeAllAddressRequired = null,
+                                                                                             bool? excludeLocalAddressRequired = null,
+                                                                                             bool? excludeForeignAddressRequired = null,
+                                                                                             bool? beta = null,
+                                                                                             Types.PhoneNumber nearNumber = null,
+                                                                                             string nearLatLong = null,
+                                                                                             int? distance = null,
+                                                                                             string inPostalCode = null,
+                                                                                             string inRegion = null,
+                                                                                             string inRateCenter = null,
+                                                                                             string inLata = null,
+                                                                                             string inLocality = null,
+                                                                                             bool? faxEnabled = null,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadTollFreeOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TollFreeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TollFreeResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TollFreeResource> NextPage(Page<TollFreeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<TollFreeResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TollFreeResource> PreviousPage(Page<TollFreeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<TollFreeResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a TollFreeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TollFreeResource object represented by the provided JSON </returns>
+    public static TollFreeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TollFreeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A formatted version of the phone number
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber FriendlyName { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The LATA of this phone number
+    /// </summary>
+    [JsonProperty("lata")]
+    public string Lata { get; private set; }
+    /// <summary>
+    /// The locality or city of this phone number's location
+    /// </summary>
+    [JsonProperty("locality")]
+    public string Locality { get; private set; }
+    /// <summary>
+    /// The rate center of this phone number
+    /// </summary>
+    [JsonProperty("rate_center")]
+    public string RateCenter { get; private set; }
+    /// <summary>
+    /// The latitude of this phone number's location
+    /// </summary>
+    [JsonProperty("latitude")]
+    public decimal? Latitude { get; private set; }
+    /// <summary>
+    /// The longitude of this phone number's location
+    /// </summary>
+    [JsonProperty("longitude")]
+    public decimal? Longitude { get; private set; }
+    /// <summary>
+    /// The two-letter state or province abbreviation of this phone number's location
+    /// </summary>
+    [JsonProperty("region")]
+    public string Region { get; private set; }
+    /// <summary>
+    /// The postal or ZIP code of this phone number's location
+    /// </summary>
+    [JsonProperty("postal_code")]
+    public string PostalCode { get; private set; }
+    /// <summary>
+    /// The ISO country code of this phone number
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The type of Address resource the phone number requires
+    /// </summary>
+    [JsonProperty("address_requirements")]
+    public string AddressRequirements { get; private set; }
+    /// <summary>
+    /// Whether the phone number is new to the Twilio platform
+    /// </summary>
+    [JsonProperty("beta")]
+    public bool? Beta { get; private set; }
+    /// <summary>
+    /// Whether a phone number can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+
+    private TollFreeResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/VoipOptions.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/VoipOptions.cs
index 75ce5c49a..ac660584a 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/VoipOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/VoipOptions.cs
@@ -9,206 +9,206 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
+{
+
+  /// <summary>
+  /// ReadVoipOptions
+  /// </summary>
+  public class ReadVoipOptions : ReadOptions<VoipResource>
+  {
     /// <summary>
-    /// ReadVoipOptions
-    /// </summary>
-    public class ReadVoipOptions : ReadOptions<VoipResource>
-    {
-        /// <summary>
-        /// The SID of the Account requesting the AvailablePhoneNumber resources
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The ISO Country code of the country from which to read phone numbers
-        /// </summary>
-        public string PathCountryCode { get; }
-        /// <summary>
-        /// The area code of the phone numbers to read
-        /// </summary>
-        public int? AreaCode { get; set; }
-        /// <summary>
-        /// The pattern on which to match phone numbers
-        /// </summary>
-        public string Contains { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive text messages
-        /// </summary>
-        public bool? SmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive MMS messages
-        /// </summary>
-        public bool? MmsEnabled { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive calls.
-        /// </summary>
-        public bool? VoiceEnabled { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require an Address
-        /// </summary>
-        public bool? ExcludeAllAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a local address
-        /// </summary>
-        public bool? ExcludeLocalAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to exclude phone numbers that require a foreign address
-        /// </summary>
-        public bool? ExcludeForeignAddressRequired { get; set; }
-        /// <summary>
-        /// Whether to read phone numbers new to the Twilio platform
-        /// </summary>
-        public bool? Beta { get; set; }
-        /// <summary>
-        /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
-        /// </summary>
-        public Types.PhoneNumber NearNumber { get; set; }
-        /// <summary>
-        /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
-        /// </summary>
-        public string NearLatLong { get; set; }
-        /// <summary>
-        /// The search radius, in miles, for a near_ query. (US/Canada only)
-        /// </summary>
-        public int? Distance { get; set; }
-        /// <summary>
-        /// Limit results to a particular postal code. (US/Canada only)
-        /// </summary>
-        public string InPostalCode { get; set; }
-        /// <summary>
-        /// Limit results to a particular region. (US/Canada only)
-        /// </summary>
-        public string InRegion { get; set; }
-        /// <summary>
-        /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
-        /// </summary>
-        public string InRateCenter { get; set; }
-        /// <summary>
-        /// Limit results to a specific local access and transport area. (US/Canada only)
-        /// </summary>
-        public string InLata { get; set; }
-        /// <summary>
-        /// Limit results to a particular locality
-        /// </summary>
-        public string InLocality { get; set; }
-        /// <summary>
-        /// Whether the phone numbers can receive faxes
-        /// </summary>
-        public bool? FaxEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadVoipOptions
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        public ReadVoipOptions(string pathCountryCode)
-        {
-            PathCountryCode = pathCountryCode;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AreaCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
-            }
-
-            if (Contains != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Contains", Contains));
-            }
-
-            if (SmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (MmsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (VoiceEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeAllAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeLocalAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (ExcludeForeignAddressRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
-            }
-
-            if (Beta != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
-            }
-
-            if (NearNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
-            }
-
-            if (NearLatLong != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
-            }
-
-            if (Distance != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
-            }
-
-            if (InPostalCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
-            }
-
-            if (InRegion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
-            }
-
-            if (InRateCenter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
-            }
-
-            if (InLata != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLata", InLata));
-            }
-
-            if (InLocality != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
-            }
-
-            if (FaxEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Account requesting the AvailablePhoneNumber resources
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The ISO Country code of the country from which to read phone numbers
+    /// </summary>
+    public string PathCountryCode { get; }
+    /// <summary>
+    /// The area code of the phone numbers to read
+    /// </summary>
+    public int? AreaCode { get; set; }
+    /// <summary>
+    /// The pattern on which to match phone numbers
+    /// </summary>
+    public string Contains { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive text messages
+    /// </summary>
+    public bool? SmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive MMS messages
+    /// </summary>
+    public bool? MmsEnabled { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive calls.
+    /// </summary>
+    public bool? VoiceEnabled { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require an Address
+    /// </summary>
+    public bool? ExcludeAllAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a local address
+    /// </summary>
+    public bool? ExcludeLocalAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to exclude phone numbers that require a foreign address
+    /// </summary>
+    public bool? ExcludeForeignAddressRequired { get; set; }
+    /// <summary>
+    /// Whether to read phone numbers new to the Twilio platform
+    /// </summary>
+    public bool? Beta { get; set; }
+    /// <summary>
+    /// Given a phone number, find a geographically close number within distance miles. (US/Canada only)
+    /// </summary>
+    public Types.PhoneNumber NearNumber { get; set; }
+    /// <summary>
+    /// Given a latitude/longitude pair lat,long find geographically close numbers within distance miles. (US/Canada only)
+    /// </summary>
+    public string NearLatLong { get; set; }
+    /// <summary>
+    /// The search radius, in miles, for a near_ query. (US/Canada only)
+    /// </summary>
+    public int? Distance { get; set; }
+    /// <summary>
+    /// Limit results to a particular postal code. (US/Canada only)
+    /// </summary>
+    public string InPostalCode { get; set; }
+    /// <summary>
+    /// Limit results to a particular region. (US/Canada only)
+    /// </summary>
+    public string InRegion { get; set; }
+    /// <summary>
+    /// Limit results to a specific rate center, or given a phone number search within the same rate center as that number. (US/Canada only)
+    /// </summary>
+    public string InRateCenter { get; set; }
+    /// <summary>
+    /// Limit results to a specific local access and transport area. (US/Canada only)
+    /// </summary>
+    public string InLata { get; set; }
+    /// <summary>
+    /// Limit results to a particular locality
+    /// </summary>
+    public string InLocality { get; set; }
+    /// <summary>
+    /// Whether the phone numbers can receive faxes
+    /// </summary>
+    public bool? FaxEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadVoipOptions
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    public ReadVoipOptions(string pathCountryCode)
+    {
+      PathCountryCode = pathCountryCode;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AreaCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode.ToString()));
+      }
+
+      if (Contains != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Contains", Contains));
+      }
+
+      if (SmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsEnabled", SmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (MmsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MmsEnabled", MmsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (VoiceEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeAllAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeAllAddressRequired", ExcludeAllAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeLocalAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeLocalAddressRequired", ExcludeLocalAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (ExcludeForeignAddressRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExcludeForeignAddressRequired", ExcludeForeignAddressRequired.Value.ToString().ToLower()));
+      }
+
+      if (Beta != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
+      }
+
+      if (NearNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearNumber", NearNumber.ToString()));
+      }
+
+      if (NearLatLong != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NearLatLong", NearLatLong));
+      }
+
+      if (Distance != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Distance", Distance.ToString()));
+      }
+
+      if (InPostalCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InPostalCode", InPostalCode));
+      }
+
+      if (InRegion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRegion", InRegion));
+      }
+
+      if (InRateCenter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InRateCenter", InRateCenter));
+      }
+
+      if (InLata != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLata", InLata));
+      }
+
+      if (InLocality != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InLocality", InLocality));
+      }
+
+      if (FaxEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FaxEnabled", FaxEnabled.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/VoipResource.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/VoipResource.cs
index f246dbf04..49a017d0e 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/VoipResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountry/VoipResource.cs
@@ -17,317 +17,317 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.AvailablePhoneNumberCountry
-{
-
-    public class VoipResource : Resource
-    {
-        private static Request BuildReadRequest(ReadVoipOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/Voip.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Voip parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Voip </returns>
-        public static ResourceSet<VoipResource> Read(ReadVoipOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<VoipResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<VoipResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Voip parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Voip </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<VoipResource>> ReadAsync(ReadVoipOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<VoipResource>.FromJson("available_phone_numbers", response.Content);
-            return new ResourceSet<VoipResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Voip </returns>
-        public static ResourceSet<VoipResource> Read(string pathCountryCode,
-                                                     string pathAccountSid = null,
-                                                     int? areaCode = null,
-                                                     string contains = null,
-                                                     bool? smsEnabled = null,
-                                                     bool? mmsEnabled = null,
-                                                     bool? voiceEnabled = null,
-                                                     bool? excludeAllAddressRequired = null,
-                                                     bool? excludeLocalAddressRequired = null,
-                                                     bool? excludeForeignAddressRequired = null,
-                                                     bool? beta = null,
-                                                     Types.PhoneNumber nearNumber = null,
-                                                     string nearLatLong = null,
-                                                     int? distance = null,
-                                                     string inPostalCode = null,
-                                                     string inRegion = null,
-                                                     string inRateCenter = null,
-                                                     string inLata = null,
-                                                     string inLocality = null,
-                                                     bool? faxEnabled = null,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadVoipOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
-        /// <param name="areaCode"> The area code of the phone numbers to read </param>
-        /// <param name="contains"> The pattern on which to match phone numbers </param>
-        /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
-        /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
-        /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
-        /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
-        /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
-        /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
-        ///                                     </param>
-        /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
-        /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
-        ///                  (US/Canada only) </param>
-        /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
-        ///                   distance miles. (US/Canada only) </param>
-        /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
-        /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
-        /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
-        /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
-        ///                    rate center as that number. (US/Canada only) </param>
-        /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
-        /// <param name="inLocality"> Limit results to a particular locality </param>
-        /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Voip </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<VoipResource>> ReadAsync(string pathCountryCode,
-                                                                                             string pathAccountSid = null,
-                                                                                             int? areaCode = null,
-                                                                                             string contains = null,
-                                                                                             bool? smsEnabled = null,
-                                                                                             bool? mmsEnabled = null,
-                                                                                             bool? voiceEnabled = null,
-                                                                                             bool? excludeAllAddressRequired = null,
-                                                                                             bool? excludeLocalAddressRequired = null,
-                                                                                             bool? excludeForeignAddressRequired = null,
-                                                                                             bool? beta = null,
-                                                                                             Types.PhoneNumber nearNumber = null,
-                                                                                             string nearLatLong = null,
-                                                                                             int? distance = null,
-                                                                                             string inPostalCode = null,
-                                                                                             string inRegion = null,
-                                                                                             string inRateCenter = null,
-                                                                                             string inLata = null,
-                                                                                             string inLocality = null,
-                                                                                             bool? faxEnabled = null,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadVoipOptions(pathCountryCode){PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<VoipResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<VoipResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<VoipResource> NextPage(Page<VoipResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<VoipResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<VoipResource> PreviousPage(Page<VoipResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<VoipResource>.FromJson("available_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a VoipResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> VoipResource object represented by the provided JSON </returns>
-        public static VoipResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<VoipResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A formatted version of the phone number
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber FriendlyName { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The LATA of this phone number
-        /// </summary>
-        [JsonProperty("lata")]
-        public string Lata { get; private set; }
-        /// <summary>
-        /// The locality or city of this phone number's location
-        /// </summary>
-        [JsonProperty("locality")]
-        public string Locality { get; private set; }
-        /// <summary>
-        /// The rate center of this phone number
-        /// </summary>
-        [JsonProperty("rate_center")]
-        public string RateCenter { get; private set; }
-        /// <summary>
-        /// The latitude of this phone number's location
-        /// </summary>
-        [JsonProperty("latitude")]
-        public decimal? Latitude { get; private set; }
-        /// <summary>
-        /// The longitude of this phone number's location
-        /// </summary>
-        [JsonProperty("longitude")]
-        public decimal? Longitude { get; private set; }
-        /// <summary>
-        /// The two-letter state or province abbreviation of this phone number's location
-        /// </summary>
-        [JsonProperty("region")]
-        public string Region { get; private set; }
-        /// <summary>
-        /// The postal or ZIP code of this phone number's location
-        /// </summary>
-        [JsonProperty("postal_code")]
-        public string PostalCode { get; private set; }
-        /// <summary>
-        /// The ISO country code of this phone number
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The type of Address resource the phone number requires
-        /// </summary>
-        [JsonProperty("address_requirements")]
-        public string AddressRequirements { get; private set; }
-        /// <summary>
-        /// Whether the phone number is new to the Twilio platform
-        /// </summary>
-        [JsonProperty("beta")]
-        public bool? Beta { get; private set; }
-        /// <summary>
-        /// Whether a phone number can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-
-        private VoipResource()
-        {
-
-        }
-    }
+{
+
+  public class VoipResource : Resource
+  {
+    private static Request BuildReadRequest(ReadVoipOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + "/Voip.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Voip parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Voip </returns>
+    public static ResourceSet<VoipResource> Read(ReadVoipOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<VoipResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<VoipResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Voip parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Voip </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<VoipResource>> ReadAsync(ReadVoipOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<VoipResource>.FromJson("available_phone_numbers", response.Content);
+      return new ResourceSet<VoipResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Voip </returns>
+    public static ResourceSet<VoipResource> Read(string pathCountryCode,
+                                                 string pathAccountSid = null,
+                                                 int? areaCode = null,
+                                                 string contains = null,
+                                                 bool? smsEnabled = null,
+                                                 bool? mmsEnabled = null,
+                                                 bool? voiceEnabled = null,
+                                                 bool? excludeAllAddressRequired = null,
+                                                 bool? excludeLocalAddressRequired = null,
+                                                 bool? excludeForeignAddressRequired = null,
+                                                 bool? beta = null,
+                                                 Types.PhoneNumber nearNumber = null,
+                                                 string nearLatLong = null,
+                                                 int? distance = null,
+                                                 string inPostalCode = null,
+                                                 string inRegion = null,
+                                                 string inRateCenter = null,
+                                                 string inLata = null,
+                                                 string inLocality = null,
+                                                 bool? faxEnabled = null,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadVoipOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO Country code of the country from which to read phone numbers </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the AvailablePhoneNumber resources </param>
+    /// <param name="areaCode"> The area code of the phone numbers to read </param>
+    /// <param name="contains"> The pattern on which to match phone numbers </param>
+    /// <param name="smsEnabled"> Whether the phone numbers can receive text messages </param>
+    /// <param name="mmsEnabled"> Whether the phone numbers can receive MMS messages </param>
+    /// <param name="voiceEnabled"> Whether the phone numbers can receive calls. </param>
+    /// <param name="excludeAllAddressRequired"> Whether to exclude phone numbers that require an Address </param>
+    /// <param name="excludeLocalAddressRequired"> Whether to exclude phone numbers that require a local address </param>
+    /// <param name="excludeForeignAddressRequired"> Whether to exclude phone numbers that require a foreign address
+    ///                                     </param>
+    /// <param name="beta"> Whether to read phone numbers new to the Twilio platform </param>
+    /// <param name="nearNumber"> Given a phone number, find a geographically close number within distance miles.
+    ///                  (US/Canada only) </param>
+    /// <param name="nearLatLong"> Given a latitude/longitude pair lat,long find geographically close numbers within
+    ///                   distance miles. (US/Canada only) </param>
+    /// <param name="distance"> The search radius, in miles, for a near_ query. (US/Canada only) </param>
+    /// <param name="inPostalCode"> Limit results to a particular postal code. (US/Canada only) </param>
+    /// <param name="inRegion"> Limit results to a particular region. (US/Canada only) </param>
+    /// <param name="inRateCenter"> Limit results to a specific rate center, or given a phone number search within the same
+    ///                    rate center as that number. (US/Canada only) </param>
+    /// <param name="inLata"> Limit results to a specific local access and transport area. (US/Canada only) </param>
+    /// <param name="inLocality"> Limit results to a particular locality </param>
+    /// <param name="faxEnabled"> Whether the phone numbers can receive faxes </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Voip </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<VoipResource>> ReadAsync(string pathCountryCode,
+                                                                                         string pathAccountSid = null,
+                                                                                         int? areaCode = null,
+                                                                                         string contains = null,
+                                                                                         bool? smsEnabled = null,
+                                                                                         bool? mmsEnabled = null,
+                                                                                         bool? voiceEnabled = null,
+                                                                                         bool? excludeAllAddressRequired = null,
+                                                                                         bool? excludeLocalAddressRequired = null,
+                                                                                         bool? excludeForeignAddressRequired = null,
+                                                                                         bool? beta = null,
+                                                                                         Types.PhoneNumber nearNumber = null,
+                                                                                         string nearLatLong = null,
+                                                                                         int? distance = null,
+                                                                                         string inPostalCode = null,
+                                                                                         string inRegion = null,
+                                                                                         string inRateCenter = null,
+                                                                                         string inLata = null,
+                                                                                         string inLocality = null,
+                                                                                         bool? faxEnabled = null,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadVoipOptions(pathCountryCode) { PathAccountSid = pathAccountSid, AreaCode = areaCode, Contains = contains, SmsEnabled = smsEnabled, MmsEnabled = mmsEnabled, VoiceEnabled = voiceEnabled, ExcludeAllAddressRequired = excludeAllAddressRequired, ExcludeLocalAddressRequired = excludeLocalAddressRequired, ExcludeForeignAddressRequired = excludeForeignAddressRequired, Beta = beta, NearNumber = nearNumber, NearLatLong = nearLatLong, Distance = distance, InPostalCode = inPostalCode, InRegion = inRegion, InRateCenter = inRateCenter, InLata = inLata, InLocality = inLocality, FaxEnabled = faxEnabled, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<VoipResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<VoipResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<VoipResource> NextPage(Page<VoipResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<VoipResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<VoipResource> PreviousPage(Page<VoipResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<VoipResource>.FromJson("available_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a VoipResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> VoipResource object represented by the provided JSON </returns>
+    public static VoipResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<VoipResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A formatted version of the phone number
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber FriendlyName { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The LATA of this phone number
+    /// </summary>
+    [JsonProperty("lata")]
+    public string Lata { get; private set; }
+    /// <summary>
+    /// The locality or city of this phone number's location
+    /// </summary>
+    [JsonProperty("locality")]
+    public string Locality { get; private set; }
+    /// <summary>
+    /// The rate center of this phone number
+    /// </summary>
+    [JsonProperty("rate_center")]
+    public string RateCenter { get; private set; }
+    /// <summary>
+    /// The latitude of this phone number's location
+    /// </summary>
+    [JsonProperty("latitude")]
+    public decimal? Latitude { get; private set; }
+    /// <summary>
+    /// The longitude of this phone number's location
+    /// </summary>
+    [JsonProperty("longitude")]
+    public decimal? Longitude { get; private set; }
+    /// <summary>
+    /// The two-letter state or province abbreviation of this phone number's location
+    /// </summary>
+    [JsonProperty("region")]
+    public string Region { get; private set; }
+    /// <summary>
+    /// The postal or ZIP code of this phone number's location
+    /// </summary>
+    [JsonProperty("postal_code")]
+    public string PostalCode { get; private set; }
+    /// <summary>
+    /// The ISO country code of this phone number
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The type of Address resource the phone number requires
+    /// </summary>
+    [JsonProperty("address_requirements")]
+    public string AddressRequirements { get; private set; }
+    /// <summary>
+    /// Whether the phone number is new to the Twilio platform
+    /// </summary>
+    [JsonProperty("beta")]
+    public bool? Beta { get; private set; }
+    /// <summary>
+    /// Whether a phone number can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+
+    private VoipResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountryOptions.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountryOptions.cs
index 18bc82d2c..4d8ed2fdf 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountryOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountryOptions.cs
@@ -9,65 +9,65 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// ReadAvailablePhoneNumberCountryOptions
+  /// </summary>
+  public class ReadAvailablePhoneNumberCountryOptions : ReadOptions<AvailablePhoneNumberCountryResource>
+  {
     /// <summary>
-    /// ReadAvailablePhoneNumberCountryOptions
+    /// The SID of the Account requesting the available phone number Country resources
     /// </summary>
-    public class ReadAvailablePhoneNumberCountryOptions : ReadOptions<AvailablePhoneNumberCountryResource>
-    {
-        /// <summary>
-        /// The SID of the Account requesting the available phone number Country resources
-        /// </summary>
-        public string PathAccountSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
+
     /// <summary>
-    /// FetchAvailablePhoneNumberCountryOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchAvailablePhoneNumberCountryOptions : IOptions<AvailablePhoneNumberCountryResource>
-    {
-        /// <summary>
-        /// The SID of the Account requesting the available phone number Country resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The ISO country code of the country to fetch available phone number information about
-        /// </summary>
-        public string PathCountryCode { get; }
-
-        /// <summary>
-        /// Construct a new FetchAvailablePhoneNumberCountryOptions
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO country code of the country to fetch available phone number information
-        ///                       about </param>
-        public FetchAvailablePhoneNumberCountryOptions(string pathCountryCode)
-        {
-            PathCountryCode = pathCountryCode;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchAvailablePhoneNumberCountryOptions
+  /// </summary>
+  public class FetchAvailablePhoneNumberCountryOptions : IOptions<AvailablePhoneNumberCountryResource>
+  {
+    /// <summary>
+    /// The SID of the Account requesting the available phone number Country resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The ISO country code of the country to fetch available phone number information about
+    /// </summary>
+    public string PathCountryCode { get; }
+
+    /// <summary>
+    /// Construct a new FetchAvailablePhoneNumberCountryOptions
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO country code of the country to fetch available phone number information
+    ///                       about </param>
+    public FetchAvailablePhoneNumberCountryOptions(string pathCountryCode)
+    {
+      PathCountryCode = pathCountryCode;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountryResource.cs b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountryResource.cs
index 933e6f7a1..e3c80936b 100644
--- a/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountryResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/AvailablePhoneNumberCountryResource.cs
@@ -16,271 +16,271 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class AvailablePhoneNumberCountryResource : Resource
-    {
-        private static Request BuildReadRequest(ReadAvailablePhoneNumberCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read AvailablePhoneNumberCountry parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AvailablePhoneNumberCountry </returns>
-        public static ResourceSet<AvailablePhoneNumberCountryResource> Read(ReadAvailablePhoneNumberCountryOptions options,
-                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AvailablePhoneNumberCountryResource>.FromJson("countries", response.Content);
-            return new ResourceSet<AvailablePhoneNumberCountryResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read AvailablePhoneNumberCountry parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AvailablePhoneNumberCountry </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AvailablePhoneNumberCountryResource>> ReadAsync(ReadAvailablePhoneNumberCountryOptions options,
-                                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AvailablePhoneNumberCountryResource>.FromJson("countries", response.Content);
-            return new ResourceSet<AvailablePhoneNumberCountryResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the available phone number Country resources
-        ///                      </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AvailablePhoneNumberCountry </returns>
-        public static ResourceSet<AvailablePhoneNumberCountryResource> Read(string pathAccountSid = null,
-                                                                            int? pageSize = null,
-                                                                            long? limit = null,
-                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadAvailablePhoneNumberCountryOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the available phone number Country resources
-        ///                      </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AvailablePhoneNumberCountry </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AvailablePhoneNumberCountryResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                                    int? pageSize = null,
-                                                                                                                    long? limit = null,
-                                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadAvailablePhoneNumberCountryOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AvailablePhoneNumberCountryResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AvailablePhoneNumberCountryResource>.FromJson("countries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AvailablePhoneNumberCountryResource> NextPage(Page<AvailablePhoneNumberCountryResource> page,
-                                                                         ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AvailablePhoneNumberCountryResource>.FromJson("countries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AvailablePhoneNumberCountryResource> PreviousPage(Page<AvailablePhoneNumberCountryResource> page,
-                                                                             ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AvailablePhoneNumberCountryResource>.FromJson("countries", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchAvailablePhoneNumberCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch AvailablePhoneNumberCountry parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AvailablePhoneNumberCountry </returns>
-        public static AvailablePhoneNumberCountryResource Fetch(FetchAvailablePhoneNumberCountryOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch AvailablePhoneNumberCountry parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AvailablePhoneNumberCountry </returns>
-        public static async System.Threading.Tasks.Task<AvailablePhoneNumberCountryResource> FetchAsync(FetchAvailablePhoneNumberCountryOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO country code of the country to fetch available phone number information
-        ///                       about </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the available phone number Country resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AvailablePhoneNumberCountry </returns>
-        public static AvailablePhoneNumberCountryResource Fetch(string pathCountryCode,
-                                                                string pathAccountSid = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchAvailablePhoneNumberCountryOptions(pathCountryCode){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathCountryCode"> The ISO country code of the country to fetch available phone number information
-        ///                       about </param>
-        /// <param name="pathAccountSid"> The SID of the Account requesting the available phone number Country resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AvailablePhoneNumberCountry </returns>
-        public static async System.Threading.Tasks.Task<AvailablePhoneNumberCountryResource> FetchAsync(string pathCountryCode,
-                                                                                                        string pathAccountSid = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchAvailablePhoneNumberCountryOptions(pathCountryCode){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AvailablePhoneNumberCountryResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AvailablePhoneNumberCountryResource object represented by the provided JSON </returns>
-        public static AvailablePhoneNumberCountryResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AvailablePhoneNumberCountryResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The ISO-3166-1 country code of the country.
-        /// </summary>
-        [JsonProperty("country_code")]
-        public string CountryCode { get; private set; }
-        /// <summary>
-        /// The name of the country
-        /// </summary>
-        [JsonProperty("country")]
-        public string Country { get; private set; }
-        /// <summary>
-        /// The URI of the Country resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public Uri Uri { get; private set; }
-        /// <summary>
-        /// Whether all phone numbers available in the country are new to the Twilio platform.
-        /// </summary>
-        [JsonProperty("beta")]
-        public bool? Beta { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-
-        private AvailablePhoneNumberCountryResource()
-        {
-
-        }
-    }
+{
+
+  public class AvailablePhoneNumberCountryResource : Resource
+  {
+    private static Request BuildReadRequest(ReadAvailablePhoneNumberCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read AvailablePhoneNumberCountry parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AvailablePhoneNumberCountry </returns>
+    public static ResourceSet<AvailablePhoneNumberCountryResource> Read(ReadAvailablePhoneNumberCountryOptions options,
+                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AvailablePhoneNumberCountryResource>.FromJson("countries", response.Content);
+      return new ResourceSet<AvailablePhoneNumberCountryResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read AvailablePhoneNumberCountry parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AvailablePhoneNumberCountry </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AvailablePhoneNumberCountryResource>> ReadAsync(ReadAvailablePhoneNumberCountryOptions options,
+                                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AvailablePhoneNumberCountryResource>.FromJson("countries", response.Content);
+      return new ResourceSet<AvailablePhoneNumberCountryResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the available phone number Country resources
+    ///                      </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AvailablePhoneNumberCountry </returns>
+    public static ResourceSet<AvailablePhoneNumberCountryResource> Read(string pathAccountSid = null,
+                                                                        int? pageSize = null,
+                                                                        long? limit = null,
+                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadAvailablePhoneNumberCountryOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the available phone number Country resources
+    ///                      </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AvailablePhoneNumberCountry </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AvailablePhoneNumberCountryResource>> ReadAsync(string pathAccountSid = null,
+                                                                                                                int? pageSize = null,
+                                                                                                                long? limit = null,
+                                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadAvailablePhoneNumberCountryOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AvailablePhoneNumberCountryResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AvailablePhoneNumberCountryResource>.FromJson("countries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AvailablePhoneNumberCountryResource> NextPage(Page<AvailablePhoneNumberCountryResource> page,
+                                                                     ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AvailablePhoneNumberCountryResource>.FromJson("countries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AvailablePhoneNumberCountryResource> PreviousPage(Page<AvailablePhoneNumberCountryResource> page,
+                                                                         ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AvailablePhoneNumberCountryResource>.FromJson("countries", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchAvailablePhoneNumberCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/AvailablePhoneNumbers/" + options.PathCountryCode + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch AvailablePhoneNumberCountry parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AvailablePhoneNumberCountry </returns>
+    public static AvailablePhoneNumberCountryResource Fetch(FetchAvailablePhoneNumberCountryOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch AvailablePhoneNumberCountry parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AvailablePhoneNumberCountry </returns>
+    public static async System.Threading.Tasks.Task<AvailablePhoneNumberCountryResource> FetchAsync(FetchAvailablePhoneNumberCountryOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO country code of the country to fetch available phone number information
+    ///                       about </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the available phone number Country resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AvailablePhoneNumberCountry </returns>
+    public static AvailablePhoneNumberCountryResource Fetch(string pathCountryCode,
+                                                            string pathAccountSid = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchAvailablePhoneNumberCountryOptions(pathCountryCode) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathCountryCode"> The ISO country code of the country to fetch available phone number information
+    ///                       about </param>
+    /// <param name="pathAccountSid"> The SID of the Account requesting the available phone number Country resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AvailablePhoneNumberCountry </returns>
+    public static async System.Threading.Tasks.Task<AvailablePhoneNumberCountryResource> FetchAsync(string pathCountryCode,
+                                                                                                    string pathAccountSid = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchAvailablePhoneNumberCountryOptions(pathCountryCode) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AvailablePhoneNumberCountryResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AvailablePhoneNumberCountryResource object represented by the provided JSON </returns>
+    public static AvailablePhoneNumberCountryResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AvailablePhoneNumberCountryResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The ISO-3166-1 country code of the country.
+    /// </summary>
+    [JsonProperty("country_code")]
+    public string CountryCode { get; private set; }
+    /// <summary>
+    /// The name of the country
+    /// </summary>
+    [JsonProperty("country")]
+    public string Country { get; private set; }
+    /// <summary>
+    /// The URI of the Country resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public Uri Uri { get; private set; }
+    /// <summary>
+    /// Whether all phone numbers available in the country are new to the Twilio platform.
+    /// </summary>
+    [JsonProperty("beta")]
+    public bool? Beta { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+
+    private AvailablePhoneNumberCountryResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/BalanceOptions.cs b/src/Twilio/Rest/Api/V2010/Account/BalanceOptions.cs
index 763e8fd12..77b7d0356 100644
--- a/src/Twilio/Rest/Api/V2010/Account/BalanceOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/BalanceOptions.cs
@@ -9,27 +9,27 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Fetch the balance for an Account based on Account Sid. Balance changes may not be reflected immediately. Child
+  /// accounts do not contain balance information
+  /// </summary>
+  public class FetchBalanceOptions : IOptions<BalanceResource>
+  {
     /// <summary>
-    /// Fetch the balance for an Account based on Account Sid. Balance changes may not be reflected immediately. Child
-    /// accounts do not contain balance information
+    /// Account Sid.
     /// </summary>
-    public class FetchBalanceOptions : IOptions<BalanceResource>
-    {
-        /// <summary>
-        /// Account Sid.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/BalanceResource.cs b/src/Twilio/Rest/Api/V2010/Account/BalanceResource.cs
index 62eafbb6a..263cc3db1 100644
--- a/src/Twilio/Rest/Api/V2010/Account/BalanceResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/BalanceResource.cs
@@ -16,119 +16,119 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class BalanceResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchBalanceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Balance.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the balance for an Account based on Account Sid. Balance changes may not be reflected immediately. Child
-        /// accounts do not contain balance information
-        /// </summary>
-        /// <param name="options"> Fetch Balance parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Balance </returns>
-        public static BalanceResource Fetch(FetchBalanceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the balance for an Account based on Account Sid. Balance changes may not be reflected immediately. Child
-        /// accounts do not contain balance information
-        /// </summary>
-        /// <param name="options"> Fetch Balance parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Balance </returns>
-        public static async System.Threading.Tasks.Task<BalanceResource> FetchAsync(FetchBalanceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the balance for an Account based on Account Sid. Balance changes may not be reflected immediately. Child
-        /// accounts do not contain balance information
-        /// </summary>
-        /// <param name="pathAccountSid"> Account Sid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Balance </returns>
-        public static BalanceResource Fetch(string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchBalanceOptions(){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the balance for an Account based on Account Sid. Balance changes may not be reflected immediately. Child
-        /// accounts do not contain balance information
-        /// </summary>
-        /// <param name="pathAccountSid"> Account Sid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Balance </returns>
-        public static async System.Threading.Tasks.Task<BalanceResource> FetchAsync(string pathAccountSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchBalanceOptions(){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a BalanceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BalanceResource object represented by the provided JSON </returns>
-        public static BalanceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BalanceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Account Sid.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Account balance
-        /// </summary>
-        [JsonProperty("balance")]
-        public string Balance { get; private set; }
-        /// <summary>
-        /// Currency units
-        /// </summary>
-        [JsonProperty("currency")]
-        public string Currency { get; private set; }
-
-        private BalanceResource()
-        {
-
-        }
-    }
+{
+
+  public class BalanceResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchBalanceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Balance.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the balance for an Account based on Account Sid. Balance changes may not be reflected immediately. Child
+    /// accounts do not contain balance information
+    /// </summary>
+    /// <param name="options"> Fetch Balance parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Balance </returns>
+    public static BalanceResource Fetch(FetchBalanceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the balance for an Account based on Account Sid. Balance changes may not be reflected immediately. Child
+    /// accounts do not contain balance information
+    /// </summary>
+    /// <param name="options"> Fetch Balance parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Balance </returns>
+    public static async System.Threading.Tasks.Task<BalanceResource> FetchAsync(FetchBalanceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the balance for an Account based on Account Sid. Balance changes may not be reflected immediately. Child
+    /// accounts do not contain balance information
+    /// </summary>
+    /// <param name="pathAccountSid"> Account Sid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Balance </returns>
+    public static BalanceResource Fetch(string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchBalanceOptions() { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the balance for an Account based on Account Sid. Balance changes may not be reflected immediately. Child
+    /// accounts do not contain balance information
+    /// </summary>
+    /// <param name="pathAccountSid"> Account Sid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Balance </returns>
+    public static async System.Threading.Tasks.Task<BalanceResource> FetchAsync(string pathAccountSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchBalanceOptions() { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a BalanceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BalanceResource object represented by the provided JSON </returns>
+    public static BalanceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BalanceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Account Sid.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Account balance
+    /// </summary>
+    [JsonProperty("balance")]
+    public string Balance { get; private set; }
+    /// <summary>
+    /// Currency units
+    /// </summary>
+    [JsonProperty("currency")]
+    public string Currency { get; private set; }
+
+    private BalanceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/EventOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Call/EventOptions.cs
index 3ad784c53..d2b254eea 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/EventOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/EventOptions.cs
@@ -9,44 +9,44 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all events for a call.
+  /// </summary>
+  public class ReadEventOptions : ReadOptions<EventResource>
+  {
     /// <summary>
-    /// Retrieve a list of all events for a call.
+    /// Account Sid.
     /// </summary>
-    public class ReadEventOptions : ReadOptions<EventResource>
-    {
-        /// <summary>
-        /// Account Sid.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Call Sid.
-        /// </summary>
-        public string PathCallSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadEventOptions
-        /// </summary>
-        /// <param name="pathCallSid"> Call Sid. </param>
-        public ReadEventOptions(string pathCallSid)
-        {
-            PathCallSid = pathCallSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// Call Sid.
+    /// </summary>
+    public string PathCallSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadEventOptions
+    /// </summary>
+    /// <param name="pathCallSid"> Call Sid. </param>
+    public ReadEventOptions(string pathCallSid)
+    {
+      PathCallSid = pathCallSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/EventResource.cs b/src/Twilio/Rest/Api/V2010/Account/Call/EventResource.cs
index c818c92f9..844467d38 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/EventResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/EventResource.cs
@@ -16,180 +16,180 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
-    public class EventResource : Resource
-    {
-        private static Request BuildReadRequest(ReadEventOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Events.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all events for a call.
-        /// </summary>
-        /// <param name="options"> Read Event parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Event </returns>
-        public static ResourceSet<EventResource> Read(ReadEventOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<EventResource>.FromJson("events", response.Content);
-            return new ResourceSet<EventResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all events for a call.
-        /// </summary>
-        /// <param name="options"> Read Event parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Event </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(ReadEventOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<EventResource>.FromJson("events", response.Content);
-            return new ResourceSet<EventResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all events for a call.
-        /// </summary>
-        /// <param name="pathCallSid"> Call Sid. </param>
-        /// <param name="pathAccountSid"> Account Sid. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Event </returns>
-        public static ResourceSet<EventResource> Read(string pathCallSid,
-                                                      string pathAccountSid = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadEventOptions(pathCallSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all events for a call.
-        /// </summary>
-        /// <param name="pathCallSid"> Call Sid. </param>
-        /// <param name="pathAccountSid"> Account Sid. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Event </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(string pathCallSid,
-                                                                                              string pathAccountSid = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadEventOptions(pathCallSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<EventResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<EventResource>.FromJson("events", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<EventResource> NextPage(Page<EventResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<EventResource>.FromJson("events", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<EventResource> PreviousPage(Page<EventResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<EventResource>.FromJson("events", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a EventResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EventResource object represented by the provided JSON </returns>
-        public static EventResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EventResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Call Request.
-        /// </summary>
-        [JsonProperty("request")]
-        public object Request { get; private set; }
-        /// <summary>
-        /// Call Response with Events.
-        /// </summary>
-        [JsonProperty("response")]
-        public object Response { get; private set; }
-
-        private EventResource()
-        {
-
-        }
-    }
+{
+
+  public class EventResource : Resource
+  {
+    private static Request BuildReadRequest(ReadEventOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Events.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all events for a call.
+    /// </summary>
+    /// <param name="options"> Read Event parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Event </returns>
+    public static ResourceSet<EventResource> Read(ReadEventOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<EventResource>.FromJson("events", response.Content);
+      return new ResourceSet<EventResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all events for a call.
+    /// </summary>
+    /// <param name="options"> Read Event parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Event </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(ReadEventOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<EventResource>.FromJson("events", response.Content);
+      return new ResourceSet<EventResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all events for a call.
+    /// </summary>
+    /// <param name="pathCallSid"> Call Sid. </param>
+    /// <param name="pathAccountSid"> Account Sid. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Event </returns>
+    public static ResourceSet<EventResource> Read(string pathCallSid,
+                                                  string pathAccountSid = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadEventOptions(pathCallSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all events for a call.
+    /// </summary>
+    /// <param name="pathCallSid"> Call Sid. </param>
+    /// <param name="pathAccountSid"> Account Sid. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Event </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(string pathCallSid,
+                                                                                          string pathAccountSid = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadEventOptions(pathCallSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<EventResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<EventResource>.FromJson("events", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<EventResource> NextPage(Page<EventResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<EventResource>.FromJson("events", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<EventResource> PreviousPage(Page<EventResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<EventResource>.FromJson("events", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a EventResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EventResource object represented by the provided JSON </returns>
+    public static EventResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EventResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Call Request.
+    /// </summary>
+    [JsonProperty("request")]
+    public object Request { get; private set; }
+    /// <summary>
+    /// Call Response with Events.
+    /// </summary>
+    [JsonProperty("response")]
+    public object Response { get; private set; }
+
+    private EventResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackOptions.cs
index 623c90928..4f5332d06 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackOptions.cs
@@ -10,145 +10,145 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
+{
+
+  /// <summary>
+  /// Fetch a Feedback resource from a call
+  /// </summary>
+  public class FetchFeedbackOptions : IOptions<FeedbackResource>
+  {
     /// <summary>
-    /// Fetch a Feedback resource from a call
-    /// </summary>
-    public class FetchFeedbackOptions : IOptions<FeedbackResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The call sid that uniquely identifies the call
-        /// </summary>
-        public string PathCallSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFeedbackOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
-        public FetchFeedbackOptions(string pathCallSid)
-        {
-            PathCallSid = pathCallSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Create a Feedback resource for a call
-    /// </summary>
-    public class CreateFeedbackOptions : IOptions<FeedbackResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The call sid that uniquely identifies the call
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The call quality expressed as an integer from 1 to 5
-        /// </summary>
-        public int? QualityScore { get; }
-        /// <summary>
-        /// Issues experienced during the call
-        /// </summary>
-        public List<FeedbackResource.IssuesEnum> Issue { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateFeedbackOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
-        /// <param name="qualityScore"> The call quality expressed as an integer from 1 to 5 </param>
-        public CreateFeedbackOptions(string pathCallSid, int? qualityScore)
-        {
-            PathCallSid = pathCallSid;
-            QualityScore = qualityScore;
-            Issue = new List<FeedbackResource.IssuesEnum>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (QualityScore != null)
-            {
-                p.Add(new KeyValuePair<string, string>("QualityScore", QualityScore.ToString()));
-            }
-
-            if (Issue != null)
-            {
-                p.AddRange(Issue.Select(prop => new KeyValuePair<string, string>("Issue", prop.ToString())));
-            }
-
-            return p;
-        }
-    }
-
+    /// The call sid that uniquely identifies the call
+    /// </summary>
+    public string PathCallSid { get; }
+
     /// <summary>
-    /// Update a Feedback resource for a call
-    /// </summary>
-    public class UpdateFeedbackOptions : IOptions<FeedbackResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The call sid that uniquely identifies the call
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The call quality expressed as an integer from 1 to 5
-        /// </summary>
-        public int? QualityScore { get; set; }
-        /// <summary>
-        /// Issues experienced during the call
-        /// </summary>
-        public List<FeedbackResource.IssuesEnum> Issue { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateFeedbackOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
-        public UpdateFeedbackOptions(string pathCallSid)
-        {
-            PathCallSid = pathCallSid;
-            Issue = new List<FeedbackResource.IssuesEnum>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (QualityScore != null)
-            {
-                p.Add(new KeyValuePair<string, string>("QualityScore", QualityScore.ToString()));
-            }
-
-            if (Issue != null)
-            {
-                p.AddRange(Issue.Select(prop => new KeyValuePair<string, string>("Issue", prop.ToString())));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new FetchFeedbackOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
+    public FetchFeedbackOptions(string pathCallSid)
+    {
+      PathCallSid = pathCallSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Create a Feedback resource for a call
+  /// </summary>
+  public class CreateFeedbackOptions : IOptions<FeedbackResource>
+  {
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The call sid that uniquely identifies the call
+    /// </summary>
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The call quality expressed as an integer from 1 to 5
+    /// </summary>
+    public int? QualityScore { get; }
+    /// <summary>
+    /// Issues experienced during the call
+    /// </summary>
+    public List<FeedbackResource.IssuesEnum> Issue { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateFeedbackOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
+    /// <param name="qualityScore"> The call quality expressed as an integer from 1 to 5 </param>
+    public CreateFeedbackOptions(string pathCallSid, int? qualityScore)
+    {
+      PathCallSid = pathCallSid;
+      QualityScore = qualityScore;
+      Issue = new List<FeedbackResource.IssuesEnum>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (QualityScore != null)
+      {
+        p.Add(new KeyValuePair<string, string>("QualityScore", QualityScore.ToString()));
+      }
+
+      if (Issue != null)
+      {
+        p.AddRange(Issue.Select(prop => new KeyValuePair<string, string>("Issue", prop.ToString())));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update a Feedback resource for a call
+  /// </summary>
+  public class UpdateFeedbackOptions : IOptions<FeedbackResource>
+  {
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The call sid that uniquely identifies the call
+    /// </summary>
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The call quality expressed as an integer from 1 to 5
+    /// </summary>
+    public int? QualityScore { get; set; }
+    /// <summary>
+    /// Issues experienced during the call
+    /// </summary>
+    public List<FeedbackResource.IssuesEnum> Issue { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateFeedbackOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
+    public UpdateFeedbackOptions(string pathCallSid)
+    {
+      PathCallSid = pathCallSid;
+      Issue = new List<FeedbackResource.IssuesEnum>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (QualityScore != null)
+      {
+        p.Add(new KeyValuePair<string, string>("QualityScore", QualityScore.ToString()));
+      }
+
+      if (Issue != null)
+      {
+        p.AddRange(Issue.Select(prop => new KeyValuePair<string, string>("Issue", prop.ToString())));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackResource.cs b/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackResource.cs
index ef00880fc..91f6e0b94 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackResource.cs
@@ -17,315 +17,315 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
-    public class FeedbackResource : Resource
-    {
-        public sealed class IssuesEnum : StringEnum
-        {
-            private IssuesEnum(string value) : base(value) {}
-            public IssuesEnum() {}
-            public static implicit operator IssuesEnum(string value)
-            {
-                return new IssuesEnum(value);
-            }
-
-            public static readonly IssuesEnum AudioLatency = new IssuesEnum("audio-latency");
-            public static readonly IssuesEnum DigitsNotCaptured = new IssuesEnum("digits-not-captured");
-            public static readonly IssuesEnum DroppedCall = new IssuesEnum("dropped-call");
-            public static readonly IssuesEnum ImperfectAudio = new IssuesEnum("imperfect-audio");
-            public static readonly IssuesEnum IncorrectCallerId = new IssuesEnum("incorrect-caller-id");
-            public static readonly IssuesEnum OneWayAudio = new IssuesEnum("one-way-audio");
-            public static readonly IssuesEnum PostDialDelay = new IssuesEnum("post-dial-delay");
-            public static readonly IssuesEnum UnsolicitedCall = new IssuesEnum("unsolicited-call");
-        }
-
-        private static Request BuildFetchRequest(FetchFeedbackOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Feedback.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a Feedback resource from a call
-        /// </summary>
-        /// <param name="options"> Fetch Feedback parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Feedback </returns>
-        public static FeedbackResource Fetch(FetchFeedbackOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Feedback resource from a call
-        /// </summary>
-        /// <param name="options"> Fetch Feedback parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Feedback </returns>
-        public static async System.Threading.Tasks.Task<FeedbackResource> FetchAsync(FetchFeedbackOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a Feedback resource from a call
-        /// </summary>
-        /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Feedback </returns>
-        public static FeedbackResource Fetch(string pathCallSid,
-                                             string pathAccountSid = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new FetchFeedbackOptions(pathCallSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Feedback resource from a call
-        /// </summary>
-        /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Feedback </returns>
-        public static async System.Threading.Tasks.Task<FeedbackResource> FetchAsync(string pathCallSid,
-                                                                                     string pathAccountSid = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchFeedbackOptions(pathCallSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateFeedbackOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Feedback.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a Feedback resource for a call
-        /// </summary>
-        /// <param name="options"> Create Feedback parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Feedback </returns>
-        public static FeedbackResource Create(CreateFeedbackOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a Feedback resource for a call
-        /// </summary>
-        /// <param name="options"> Create Feedback parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Feedback </returns>
-        public static async System.Threading.Tasks.Task<FeedbackResource> CreateAsync(CreateFeedbackOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a Feedback resource for a call
-        /// </summary>
-        /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
-        /// <param name="qualityScore"> The call quality expressed as an integer from 1 to 5 </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="issue"> Issues experienced during the call </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Feedback </returns>
-        public static FeedbackResource Create(string pathCallSid,
-                                              int? qualityScore,
-                                              string pathAccountSid = null,
-                                              List<FeedbackResource.IssuesEnum> issue = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateFeedbackOptions(pathCallSid, qualityScore){PathAccountSid = pathAccountSid, Issue = issue};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a Feedback resource for a call
-        /// </summary>
-        /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
-        /// <param name="qualityScore"> The call quality expressed as an integer from 1 to 5 </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="issue"> Issues experienced during the call </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Feedback </returns>
-        public static async System.Threading.Tasks.Task<FeedbackResource> CreateAsync(string pathCallSid,
-                                                                                      int? qualityScore,
-                                                                                      string pathAccountSid = null,
-                                                                                      List<FeedbackResource.IssuesEnum> issue = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateFeedbackOptions(pathCallSid, qualityScore){PathAccountSid = pathAccountSid, Issue = issue};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateFeedbackOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Feedback.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a Feedback resource for a call
-        /// </summary>
-        /// <param name="options"> Update Feedback parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Feedback </returns>
-        public static FeedbackResource Update(UpdateFeedbackOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a Feedback resource for a call
-        /// </summary>
-        /// <param name="options"> Update Feedback parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Feedback </returns>
-        public static async System.Threading.Tasks.Task<FeedbackResource> UpdateAsync(UpdateFeedbackOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a Feedback resource for a call
-        /// </summary>
-        /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="qualityScore"> The call quality expressed as an integer from 1 to 5 </param>
-        /// <param name="issue"> Issues experienced during the call </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Feedback </returns>
-        public static FeedbackResource Update(string pathCallSid,
-                                              string pathAccountSid = null,
-                                              int? qualityScore = null,
-                                              List<FeedbackResource.IssuesEnum> issue = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateFeedbackOptions(pathCallSid){PathAccountSid = pathAccountSid, QualityScore = qualityScore, Issue = issue};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a Feedback resource for a call
-        /// </summary>
-        /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="qualityScore"> The call quality expressed as an integer from 1 to 5 </param>
-        /// <param name="issue"> Issues experienced during the call </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Feedback </returns>
-        public static async System.Threading.Tasks.Task<FeedbackResource> UpdateAsync(string pathCallSid,
-                                                                                      string pathAccountSid = null,
-                                                                                      int? qualityScore = null,
-                                                                                      List<FeedbackResource.IssuesEnum> issue = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateFeedbackOptions(pathCallSid){PathAccountSid = pathAccountSid, QualityScore = qualityScore, Issue = issue};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FeedbackResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FeedbackResource object represented by the provided JSON </returns>
-        public static FeedbackResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FeedbackResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The date this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Issues experienced during the call
-        /// </summary>
-        [JsonProperty("issues")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public List<FeedbackResource.IssuesEnum> Issues { get; private set; }
-        /// <summary>
-        /// 1 to 5 quality score
-        /// </summary>
-        [JsonProperty("quality_score")]
-        public int? QualityScore { get; private set; }
-        /// <summary>
-        /// A string that uniquely identifies this feedback resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-
-        private FeedbackResource()
-        {
-
-        }
-    }
+{
+
+  public class FeedbackResource : Resource
+  {
+    public sealed class IssuesEnum : StringEnum
+    {
+      private IssuesEnum(string value) : base(value) { }
+      public IssuesEnum() { }
+      public static implicit operator IssuesEnum(string value)
+      {
+        return new IssuesEnum(value);
+      }
+
+      public static readonly IssuesEnum AudioLatency = new IssuesEnum("audio-latency");
+      public static readonly IssuesEnum DigitsNotCaptured = new IssuesEnum("digits-not-captured");
+      public static readonly IssuesEnum DroppedCall = new IssuesEnum("dropped-call");
+      public static readonly IssuesEnum ImperfectAudio = new IssuesEnum("imperfect-audio");
+      public static readonly IssuesEnum IncorrectCallerId = new IssuesEnum("incorrect-caller-id");
+      public static readonly IssuesEnum OneWayAudio = new IssuesEnum("one-way-audio");
+      public static readonly IssuesEnum PostDialDelay = new IssuesEnum("post-dial-delay");
+      public static readonly IssuesEnum UnsolicitedCall = new IssuesEnum("unsolicited-call");
+    }
+
+    private static Request BuildFetchRequest(FetchFeedbackOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Feedback.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a Feedback resource from a call
+    /// </summary>
+    /// <param name="options"> Fetch Feedback parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Feedback </returns>
+    public static FeedbackResource Fetch(FetchFeedbackOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Feedback resource from a call
+    /// </summary>
+    /// <param name="options"> Fetch Feedback parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Feedback </returns>
+    public static async System.Threading.Tasks.Task<FeedbackResource> FetchAsync(FetchFeedbackOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a Feedback resource from a call
+    /// </summary>
+    /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Feedback </returns>
+    public static FeedbackResource Fetch(string pathCallSid,
+                                         string pathAccountSid = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new FetchFeedbackOptions(pathCallSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Feedback resource from a call
+    /// </summary>
+    /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Feedback </returns>
+    public static async System.Threading.Tasks.Task<FeedbackResource> FetchAsync(string pathCallSid,
+                                                                                 string pathAccountSid = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchFeedbackOptions(pathCallSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateFeedbackOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Feedback.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a Feedback resource for a call
+    /// </summary>
+    /// <param name="options"> Create Feedback parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Feedback </returns>
+    public static FeedbackResource Create(CreateFeedbackOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a Feedback resource for a call
+    /// </summary>
+    /// <param name="options"> Create Feedback parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Feedback </returns>
+    public static async System.Threading.Tasks.Task<FeedbackResource> CreateAsync(CreateFeedbackOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a Feedback resource for a call
+    /// </summary>
+    /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
+    /// <param name="qualityScore"> The call quality expressed as an integer from 1 to 5 </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="issue"> Issues experienced during the call </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Feedback </returns>
+    public static FeedbackResource Create(string pathCallSid,
+                                          int? qualityScore,
+                                          string pathAccountSid = null,
+                                          List<FeedbackResource.IssuesEnum> issue = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateFeedbackOptions(pathCallSid, qualityScore) { PathAccountSid = pathAccountSid, Issue = issue };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a Feedback resource for a call
+    /// </summary>
+    /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
+    /// <param name="qualityScore"> The call quality expressed as an integer from 1 to 5 </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="issue"> Issues experienced during the call </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Feedback </returns>
+    public static async System.Threading.Tasks.Task<FeedbackResource> CreateAsync(string pathCallSid,
+                                                                                  int? qualityScore,
+                                                                                  string pathAccountSid = null,
+                                                                                  List<FeedbackResource.IssuesEnum> issue = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateFeedbackOptions(pathCallSid, qualityScore) { PathAccountSid = pathAccountSid, Issue = issue };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateFeedbackOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Feedback.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a Feedback resource for a call
+    /// </summary>
+    /// <param name="options"> Update Feedback parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Feedback </returns>
+    public static FeedbackResource Update(UpdateFeedbackOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a Feedback resource for a call
+    /// </summary>
+    /// <param name="options"> Update Feedback parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Feedback </returns>
+    public static async System.Threading.Tasks.Task<FeedbackResource> UpdateAsync(UpdateFeedbackOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a Feedback resource for a call
+    /// </summary>
+    /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="qualityScore"> The call quality expressed as an integer from 1 to 5 </param>
+    /// <param name="issue"> Issues experienced during the call </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Feedback </returns>
+    public static FeedbackResource Update(string pathCallSid,
+                                          string pathAccountSid = null,
+                                          int? qualityScore = null,
+                                          List<FeedbackResource.IssuesEnum> issue = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateFeedbackOptions(pathCallSid) { PathAccountSid = pathAccountSid, QualityScore = qualityScore, Issue = issue };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a Feedback resource for a call
+    /// </summary>
+    /// <param name="pathCallSid"> The call sid that uniquely identifies the call </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="qualityScore"> The call quality expressed as an integer from 1 to 5 </param>
+    /// <param name="issue"> Issues experienced during the call </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Feedback </returns>
+    public static async System.Threading.Tasks.Task<FeedbackResource> UpdateAsync(string pathCallSid,
+                                                                                  string pathAccountSid = null,
+                                                                                  int? qualityScore = null,
+                                                                                  List<FeedbackResource.IssuesEnum> issue = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateFeedbackOptions(pathCallSid) { PathAccountSid = pathAccountSid, QualityScore = qualityScore, Issue = issue };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FeedbackResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FeedbackResource object represented by the provided JSON </returns>
+    public static FeedbackResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FeedbackResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The date this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Issues experienced during the call
+    /// </summary>
+    [JsonProperty("issues")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public List<FeedbackResource.IssuesEnum> Issues { get; private set; }
+    /// <summary>
+    /// 1 to 5 quality score
+    /// </summary>
+    [JsonProperty("quality_score")]
+    public int? QualityScore { get; private set; }
+    /// <summary>
+    /// A string that uniquely identifies this feedback resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+
+    private FeedbackResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackSummaryOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackSummaryOptions.cs
index f704a826f..b4d6e804b 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackSummaryOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackSummaryOptions.cs
@@ -9,148 +9,148 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
+{
+
+  /// <summary>
+  /// Create a FeedbackSummary resource for a call
+  /// </summary>
+  public class CreateFeedbackSummaryOptions : IOptions<FeedbackSummaryResource>
+  {
     /// <summary>
-    /// Create a FeedbackSummary resource for a call
-    /// </summary>
-    public class CreateFeedbackSummaryOptions : IOptions<FeedbackSummaryResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Only include feedback given on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; }
-        /// <summary>
-        /// Only include feedback given on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; }
-        /// <summary>
-        /// `true` includes feedback from the specified account and its subaccounts
-        /// </summary>
-        public bool? IncludeSubaccounts { get; set; }
-        /// <summary>
-        /// The URL that we will request when the feedback summary is complete
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we use to make requests to the StatusCallback URL
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateFeedbackSummaryOptions
-        /// </summary>
-        /// <param name="startDate"> Only include feedback given on or after this date </param>
-        /// <param name="endDate"> Only include feedback given on or before this date </param>
-        public CreateFeedbackSummaryOptions(DateTime? startDate, DateTime? endDate)
-        {
-            StartDate = startDate;
-            EndDate = endDate;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (IncludeSubaccounts != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Fetch a FeedbackSummary resource from a call
-    /// </summary>
-    public class FetchFeedbackSummaryOptions : IOptions<FeedbackSummaryResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string that uniquely identifies this feedback summary resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFeedbackSummaryOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this feedback summary resource </param>
-        public FetchFeedbackSummaryOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Only include feedback given on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; }
     /// <summary>
-    /// Delete a FeedbackSummary resource from a call
-    /// </summary>
-    public class DeleteFeedbackSummaryOptions : IOptions<FeedbackSummaryResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string that uniquely identifies this feedback summary resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFeedbackSummaryOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this feedback summary resource </param>
-        public DeleteFeedbackSummaryOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Only include feedback given on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; }
+    /// <summary>
+    /// `true` includes feedback from the specified account and its subaccounts
+    /// </summary>
+    public bool? IncludeSubaccounts { get; set; }
+    /// <summary>
+    /// The URL that we will request when the feedback summary is complete
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we use to make requests to the StatusCallback URL
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateFeedbackSummaryOptions
+    /// </summary>
+    /// <param name="startDate"> Only include feedback given on or after this date </param>
+    /// <param name="endDate"> Only include feedback given on or before this date </param>
+    public CreateFeedbackSummaryOptions(DateTime? startDate, DateTime? endDate)
+    {
+      StartDate = startDate;
+      EndDate = endDate;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (IncludeSubaccounts != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a FeedbackSummary resource from a call
+  /// </summary>
+  public class FetchFeedbackSummaryOptions : IOptions<FeedbackSummaryResource>
+  {
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string that uniquely identifies this feedback summary resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchFeedbackSummaryOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this feedback summary resource </param>
+    public FetchFeedbackSummaryOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a FeedbackSummary resource from a call
+  /// </summary>
+  public class DeleteFeedbackSummaryOptions : IOptions<FeedbackSummaryResource>
+  {
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string that uniquely identifies this feedback summary resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteFeedbackSummaryOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this feedback summary resource </param>
+    public DeleteFeedbackSummaryOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackSummaryResource.cs b/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackSummaryResource.cs
index 38359522e..b2dcf23da 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackSummaryResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/FeedbackSummaryResource.cs
@@ -17,349 +17,349 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
-    public class FeedbackSummaryResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Queued = new StatusEnum("queued");
-            public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        private static Request BuildCreateRequest(CreateFeedbackSummaryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/FeedbackSummary.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a FeedbackSummary resource for a call
-        /// </summary>
-        /// <param name="options"> Create FeedbackSummary parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FeedbackSummary </returns>
-        public static FeedbackSummaryResource Create(CreateFeedbackSummaryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a FeedbackSummary resource for a call
-        /// </summary>
-        /// <param name="options"> Create FeedbackSummary parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FeedbackSummary </returns>
-        public static async System.Threading.Tasks.Task<FeedbackSummaryResource> CreateAsync(CreateFeedbackSummaryOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a FeedbackSummary resource for a call
-        /// </summary>
-        /// <param name="startDate"> Only include feedback given on or after this date </param>
-        /// <param name="endDate"> Only include feedback given on or before this date </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="includeSubaccounts"> `true` includes feedback from the specified account and its subaccounts </param>
-        /// <param name="statusCallback"> The URL that we will request when the feedback summary is complete </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we use to make requests to the StatusCallback URL </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FeedbackSummary </returns>
-        public static FeedbackSummaryResource Create(DateTime? startDate,
-                                                     DateTime? endDate,
-                                                     string pathAccountSid = null,
-                                                     bool? includeSubaccounts = null,
-                                                     Uri statusCallback = null,
-                                                     Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateFeedbackSummaryOptions(startDate, endDate){PathAccountSid = pathAccountSid, IncludeSubaccounts = includeSubaccounts, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a FeedbackSummary resource for a call
-        /// </summary>
-        /// <param name="startDate"> Only include feedback given on or after this date </param>
-        /// <param name="endDate"> Only include feedback given on or before this date </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="includeSubaccounts"> `true` includes feedback from the specified account and its subaccounts </param>
-        /// <param name="statusCallback"> The URL that we will request when the feedback summary is complete </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we use to make requests to the StatusCallback URL </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FeedbackSummary </returns>
-        public static async System.Threading.Tasks.Task<FeedbackSummaryResource> CreateAsync(DateTime? startDate,
-                                                                                             DateTime? endDate,
-                                                                                             string pathAccountSid = null,
-                                                                                             bool? includeSubaccounts = null,
-                                                                                             Uri statusCallback = null,
-                                                                                             Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateFeedbackSummaryOptions(startDate, endDate){PathAccountSid = pathAccountSid, IncludeSubaccounts = includeSubaccounts, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchFeedbackSummaryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/FeedbackSummary/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a FeedbackSummary resource from a call
-        /// </summary>
-        /// <param name="options"> Fetch FeedbackSummary parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FeedbackSummary </returns>
-        public static FeedbackSummaryResource Fetch(FetchFeedbackSummaryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a FeedbackSummary resource from a call
-        /// </summary>
-        /// <param name="options"> Fetch FeedbackSummary parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FeedbackSummary </returns>
-        public static async System.Threading.Tasks.Task<FeedbackSummaryResource> FetchAsync(FetchFeedbackSummaryOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a FeedbackSummary resource from a call
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this feedback summary resource </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FeedbackSummary </returns>
-        public static FeedbackSummaryResource Fetch(string pathSid,
-                                                    string pathAccountSid = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchFeedbackSummaryOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a FeedbackSummary resource from a call
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this feedback summary resource </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FeedbackSummary </returns>
-        public static async System.Threading.Tasks.Task<FeedbackSummaryResource> FetchAsync(string pathSid,
-                                                                                            string pathAccountSid = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchFeedbackSummaryOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteFeedbackSummaryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/FeedbackSummary/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a FeedbackSummary resource from a call
-        /// </summary>
-        /// <param name="options"> Delete FeedbackSummary parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FeedbackSummary </returns>
-        public static bool Delete(DeleteFeedbackSummaryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a FeedbackSummary resource from a call
-        /// </summary>
-        /// <param name="options"> Delete FeedbackSummary parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FeedbackSummary </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFeedbackSummaryOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a FeedbackSummary resource from a call
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this feedback summary resource </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FeedbackSummary </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFeedbackSummaryOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a FeedbackSummary resource from a call
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this feedback summary resource </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FeedbackSummary </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteFeedbackSummaryOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FeedbackSummaryResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FeedbackSummaryResource object represented by the provided JSON </returns>
-        public static FeedbackSummaryResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FeedbackSummaryResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The total number of calls
-        /// </summary>
-        [JsonProperty("call_count")]
-        public int? CallCount { get; private set; }
-        /// <summary>
-        /// The total number of calls with a feedback entry
-        /// </summary>
-        [JsonProperty("call_feedback_count")]
-        public int? CallFeedbackCount { get; private set; }
-        /// <summary>
-        /// The date this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The latest feedback entry date in the summary
-        /// </summary>
-        [JsonProperty("end_date")]
-        public DateTime? EndDate { get; private set; }
-        /// <summary>
-        /// Whether the feedback summary includes subaccounts
-        /// </summary>
-        [JsonProperty("include_subaccounts")]
-        public bool? IncludeSubaccounts { get; private set; }
-        /// <summary>
-        /// Issues experienced during the call
-        /// </summary>
-        [JsonProperty("issues")]
-        public List<object> Issues { get; private set; }
-        /// <summary>
-        /// The average QualityScore of the feedback entries
-        /// </summary>
-        [JsonProperty("quality_score_average")]
-        public decimal? QualityScoreAverage { get; private set; }
-        /// <summary>
-        /// The median QualityScore of the feedback entries
-        /// </summary>
-        [JsonProperty("quality_score_median")]
-        public decimal? QualityScoreMedian { get; private set; }
-        /// <summary>
-        /// The standard deviation of the quality scores
-        /// </summary>
-        [JsonProperty("quality_score_standard_deviation")]
-        public decimal? QualityScoreStandardDeviation { get; private set; }
-        /// <summary>
-        /// A string that uniquely identifies this feedback entry
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The earliest feedback entry date in the summary
-        /// </summary>
-        [JsonProperty("start_date")]
-        public DateTime? StartDate { get; private set; }
-        /// <summary>
-        /// The status of the feedback summary
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FeedbackSummaryResource.StatusEnum Status { get; private set; }
-
-        private FeedbackSummaryResource()
-        {
-
-        }
-    }
+{
+
+  public class FeedbackSummaryResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Queued = new StatusEnum("queued");
+      public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    private static Request BuildCreateRequest(CreateFeedbackSummaryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/FeedbackSummary.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a FeedbackSummary resource for a call
+    /// </summary>
+    /// <param name="options"> Create FeedbackSummary parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FeedbackSummary </returns>
+    public static FeedbackSummaryResource Create(CreateFeedbackSummaryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a FeedbackSummary resource for a call
+    /// </summary>
+    /// <param name="options"> Create FeedbackSummary parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FeedbackSummary </returns>
+    public static async System.Threading.Tasks.Task<FeedbackSummaryResource> CreateAsync(CreateFeedbackSummaryOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a FeedbackSummary resource for a call
+    /// </summary>
+    /// <param name="startDate"> Only include feedback given on or after this date </param>
+    /// <param name="endDate"> Only include feedback given on or before this date </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="includeSubaccounts"> `true` includes feedback from the specified account and its subaccounts </param>
+    /// <param name="statusCallback"> The URL that we will request when the feedback summary is complete </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we use to make requests to the StatusCallback URL </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FeedbackSummary </returns>
+    public static FeedbackSummaryResource Create(DateTime? startDate,
+                                                 DateTime? endDate,
+                                                 string pathAccountSid = null,
+                                                 bool? includeSubaccounts = null,
+                                                 Uri statusCallback = null,
+                                                 Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateFeedbackSummaryOptions(startDate, endDate) { PathAccountSid = pathAccountSid, IncludeSubaccounts = includeSubaccounts, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a FeedbackSummary resource for a call
+    /// </summary>
+    /// <param name="startDate"> Only include feedback given on or after this date </param>
+    /// <param name="endDate"> Only include feedback given on or before this date </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="includeSubaccounts"> `true` includes feedback from the specified account and its subaccounts </param>
+    /// <param name="statusCallback"> The URL that we will request when the feedback summary is complete </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we use to make requests to the StatusCallback URL </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FeedbackSummary </returns>
+    public static async System.Threading.Tasks.Task<FeedbackSummaryResource> CreateAsync(DateTime? startDate,
+                                                                                         DateTime? endDate,
+                                                                                         string pathAccountSid = null,
+                                                                                         bool? includeSubaccounts = null,
+                                                                                         Uri statusCallback = null,
+                                                                                         Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateFeedbackSummaryOptions(startDate, endDate) { PathAccountSid = pathAccountSid, IncludeSubaccounts = includeSubaccounts, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchFeedbackSummaryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/FeedbackSummary/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a FeedbackSummary resource from a call
+    /// </summary>
+    /// <param name="options"> Fetch FeedbackSummary parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FeedbackSummary </returns>
+    public static FeedbackSummaryResource Fetch(FetchFeedbackSummaryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a FeedbackSummary resource from a call
+    /// </summary>
+    /// <param name="options"> Fetch FeedbackSummary parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FeedbackSummary </returns>
+    public static async System.Threading.Tasks.Task<FeedbackSummaryResource> FetchAsync(FetchFeedbackSummaryOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a FeedbackSummary resource from a call
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this feedback summary resource </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FeedbackSummary </returns>
+    public static FeedbackSummaryResource Fetch(string pathSid,
+                                                string pathAccountSid = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchFeedbackSummaryOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a FeedbackSummary resource from a call
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this feedback summary resource </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FeedbackSummary </returns>
+    public static async System.Threading.Tasks.Task<FeedbackSummaryResource> FetchAsync(string pathSid,
+                                                                                        string pathAccountSid = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchFeedbackSummaryOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteFeedbackSummaryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/FeedbackSummary/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a FeedbackSummary resource from a call
+    /// </summary>
+    /// <param name="options"> Delete FeedbackSummary parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FeedbackSummary </returns>
+    public static bool Delete(DeleteFeedbackSummaryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a FeedbackSummary resource from a call
+    /// </summary>
+    /// <param name="options"> Delete FeedbackSummary parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FeedbackSummary </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFeedbackSummaryOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a FeedbackSummary resource from a call
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this feedback summary resource </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FeedbackSummary </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFeedbackSummaryOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a FeedbackSummary resource from a call
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this feedback summary resource </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FeedbackSummary </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteFeedbackSummaryOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FeedbackSummaryResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FeedbackSummaryResource object represented by the provided JSON </returns>
+    public static FeedbackSummaryResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FeedbackSummaryResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The total number of calls
+    /// </summary>
+    [JsonProperty("call_count")]
+    public int? CallCount { get; private set; }
+    /// <summary>
+    /// The total number of calls with a feedback entry
+    /// </summary>
+    [JsonProperty("call_feedback_count")]
+    public int? CallFeedbackCount { get; private set; }
+    /// <summary>
+    /// The date this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The latest feedback entry date in the summary
+    /// </summary>
+    [JsonProperty("end_date")]
+    public DateTime? EndDate { get; private set; }
+    /// <summary>
+    /// Whether the feedback summary includes subaccounts
+    /// </summary>
+    [JsonProperty("include_subaccounts")]
+    public bool? IncludeSubaccounts { get; private set; }
+    /// <summary>
+    /// Issues experienced during the call
+    /// </summary>
+    [JsonProperty("issues")]
+    public List<object> Issues { get; private set; }
+    /// <summary>
+    /// The average QualityScore of the feedback entries
+    /// </summary>
+    [JsonProperty("quality_score_average")]
+    public decimal? QualityScoreAverage { get; private set; }
+    /// <summary>
+    /// The median QualityScore of the feedback entries
+    /// </summary>
+    [JsonProperty("quality_score_median")]
+    public decimal? QualityScoreMedian { get; private set; }
+    /// <summary>
+    /// The standard deviation of the quality scores
+    /// </summary>
+    [JsonProperty("quality_score_standard_deviation")]
+    public decimal? QualityScoreStandardDeviation { get; private set; }
+    /// <summary>
+    /// A string that uniquely identifies this feedback entry
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The earliest feedback entry date in the summary
+    /// </summary>
+    [JsonProperty("start_date")]
+    public DateTime? StartDate { get; private set; }
+    /// <summary>
+    /// The status of the feedback summary
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FeedbackSummaryResource.StatusEnum Status { get; private set; }
+
+    private FeedbackSummaryResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/NotificationOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Call/NotificationOptions.cs
index 54a69c7b1..906b290b7 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/NotificationOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/NotificationOptions.cs
@@ -9,121 +9,121 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
+{
+
+  /// <summary>
+  /// FetchNotificationOptions
+  /// </summary>
+  public class FetchNotificationOptions : IOptions<NotificationResource>
+  {
     /// <summary>
-    /// FetchNotificationOptions
+    /// The SID of the Account that created the resource to fetch
     /// </summary>
-    public class FetchNotificationOptions : IOptions<NotificationResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The Call SID of the resource to fetch
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchNotificationOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchNotificationOptions(string pathCallSid, string pathSid)
-        {
-            PathCallSid = pathCallSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// ReadNotificationOptions
+    /// The Call SID of the resource to fetch
     /// </summary>
-    public class ReadNotificationOptions : ReadOptions<NotificationResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The Call SID of the resources to read
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// Filter by log level
-        /// </summary>
-        public int? Log { get; set; }
-        /// <summary>
-        /// Filter by date
-        /// </summary>
-        public DateTime? MessageDateBefore { get; set; }
-        /// <summary>
-        /// Filter by date
-        /// </summary>
-        public DateTime? MessageDate { get; set; }
-        /// <summary>
-        /// Filter by date
-        /// </summary>
-        public DateTime? MessageDateAfter { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadNotificationOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resources to read </param>
-        public ReadNotificationOptions(string pathCallSid)
-        {
-            PathCallSid = pathCallSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Log != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Log", Log.ToString()));
-            }
-
-            if (MessageDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessageDate", MessageDate.Value.ToString("yyyy-MM-dd")));
-            }
-            else
-            {
-                if (MessageDateBefore != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("MessageDate<", MessageDateBefore.Value.ToString("yyyy-MM-dd")));
-                }
-
-                if (MessageDateAfter != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("MessageDate>", MessageDateAfter.Value.ToString("yyyy-MM-dd")));
-                }
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchNotificationOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchNotificationOptions(string pathCallSid, string pathSid)
+    {
+      PathCallSid = pathCallSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadNotificationOptions
+  /// </summary>
+  public class ReadNotificationOptions : ReadOptions<NotificationResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The Call SID of the resources to read
+    /// </summary>
+    public string PathCallSid { get; }
+    /// <summary>
+    /// Filter by log level
+    /// </summary>
+    public int? Log { get; set; }
+    /// <summary>
+    /// Filter by date
+    /// </summary>
+    public DateTime? MessageDateBefore { get; set; }
+    /// <summary>
+    /// Filter by date
+    /// </summary>
+    public DateTime? MessageDate { get; set; }
+    /// <summary>
+    /// Filter by date
+    /// </summary>
+    public DateTime? MessageDateAfter { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadNotificationOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resources to read </param>
+    public ReadNotificationOptions(string pathCallSid)
+    {
+      PathCallSid = pathCallSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Log != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Log", Log.ToString()));
+      }
+
+      if (MessageDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessageDate", MessageDate.Value.ToString("yyyy-MM-dd")));
+      }
+      else
+      {
+        if (MessageDateBefore != null)
+        {
+          p.Add(new KeyValuePair<string, string>("MessageDate<", MessageDateBefore.Value.ToString("yyyy-MM-dd")));
+        }
+
+        if (MessageDateAfter != null)
+        {
+          p.Add(new KeyValuePair<string, string>("MessageDate>", MessageDateAfter.Value.ToString("yyyy-MM-dd")));
+        }
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/NotificationResource.cs b/src/Twilio/Rest/Api/V2010/Account/Call/NotificationResource.cs
index 3e81cd26c..2dde89e6d 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/NotificationResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/NotificationResource.cs
@@ -16,349 +16,349 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
-    public class NotificationResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchNotificationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Notifications/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static NotificationResource Fetch(FetchNotificationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<NotificationResource> FetchAsync(FetchNotificationOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static NotificationResource Fetch(string pathCallSid,
-                                                 string pathSid,
-                                                 string pathAccountSid = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchNotificationOptions(pathCallSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<NotificationResource> FetchAsync(string pathCallSid,
-                                                                                         string pathSid,
-                                                                                         string pathAccountSid = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchNotificationOptions(pathCallSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadNotificationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Notifications.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static ResourceSet<NotificationResource> Read(ReadNotificationOptions options,
-                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<NotificationResource>.FromJson("notifications", response.Content);
-            return new ResourceSet<NotificationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<NotificationResource>> ReadAsync(ReadNotificationOptions options,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<NotificationResource>.FromJson("notifications", response.Content);
-            return new ResourceSet<NotificationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resources to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="log"> Filter by log level </param>
-        /// <param name="messageDateBefore"> Filter by date </param>
-        /// <param name="messageDate"> Filter by date </param>
-        /// <param name="messageDateAfter"> Filter by date </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static ResourceSet<NotificationResource> Read(string pathCallSid,
-                                                             string pathAccountSid = null,
-                                                             int? log = null,
-                                                             DateTime? messageDateBefore = null,
-                                                             DateTime? messageDate = null,
-                                                             DateTime? messageDateAfter = null,
-                                                             int? pageSize = null,
-                                                             long? limit = null,
-                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadNotificationOptions(pathCallSid){PathAccountSid = pathAccountSid, Log = log, MessageDateBefore = messageDateBefore, MessageDate = messageDate, MessageDateAfter = messageDateAfter, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resources to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="log"> Filter by log level </param>
-        /// <param name="messageDateBefore"> Filter by date </param>
-        /// <param name="messageDate"> Filter by date </param>
-        /// <param name="messageDateAfter"> Filter by date </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<NotificationResource>> ReadAsync(string pathCallSid,
-                                                                                                     string pathAccountSid = null,
-                                                                                                     int? log = null,
-                                                                                                     DateTime? messageDateBefore = null,
-                                                                                                     DateTime? messageDate = null,
-                                                                                                     DateTime? messageDateAfter = null,
-                                                                                                     int? pageSize = null,
-                                                                                                     long? limit = null,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadNotificationOptions(pathCallSid){PathAccountSid = pathAccountSid, Log = log, MessageDateBefore = messageDateBefore, MessageDate = messageDate, MessageDateAfter = messageDateAfter, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<NotificationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<NotificationResource>.FromJson("notifications", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<NotificationResource> NextPage(Page<NotificationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<NotificationResource>.FromJson("notifications", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<NotificationResource> PreviousPage(Page<NotificationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<NotificationResource>.FromJson("notifications", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a NotificationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NotificationResource object represented by the provided JSON </returns>
-        public static NotificationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NotificationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the Call Notification resource
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The SID of the Call the resource is associated with
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// A unique error code corresponding to the notification
-        /// </summary>
-        [JsonProperty("error_code")]
-        public string ErrorCode { get; private set; }
-        /// <summary>
-        /// An integer log level
-        /// </summary>
-        [JsonProperty("log")]
-        public string Log { get; private set; }
-        /// <summary>
-        /// The date the notification was generated
-        /// </summary>
-        [JsonProperty("message_date")]
-        public DateTime? MessageDate { get; private set; }
-        /// <summary>
-        /// The text of the notification
-        /// </summary>
-        [JsonProperty("message_text")]
-        public string MessageText { get; private set; }
-        /// <summary>
-        /// A URL for more information about the error code
-        /// </summary>
-        [JsonProperty("more_info")]
-        public Uri MoreInfo { get; private set; }
-        /// <summary>
-        /// HTTP method used with the request url
-        /// </summary>
-        [JsonProperty("request_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod RequestMethod { get; private set; }
-        /// <summary>
-        /// URL of the resource that generated the notification
-        /// </summary>
-        [JsonProperty("request_url")]
-        public Uri RequestUrl { get; private set; }
-        /// <summary>
-        /// Twilio-generated HTTP variables sent to the server
-        /// </summary>
-        [JsonProperty("request_variables")]
-        public string RequestVariables { get; private set; }
-        /// <summary>
-        /// The HTTP body returned by your server
-        /// </summary>
-        [JsonProperty("response_body")]
-        public string ResponseBody { get; private set; }
-        /// <summary>
-        /// The HTTP headers returned by your server
-        /// </summary>
-        [JsonProperty("response_headers")]
-        public string ResponseHeaders { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private NotificationResource()
-        {
-
-        }
-    }
+{
+
+  public class NotificationResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchNotificationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Notifications/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static NotificationResource Fetch(FetchNotificationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<NotificationResource> FetchAsync(FetchNotificationOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static NotificationResource Fetch(string pathCallSid,
+                                             string pathSid,
+                                             string pathAccountSid = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchNotificationOptions(pathCallSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<NotificationResource> FetchAsync(string pathCallSid,
+                                                                                     string pathSid,
+                                                                                     string pathAccountSid = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchNotificationOptions(pathCallSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadNotificationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Notifications.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static ResourceSet<NotificationResource> Read(ReadNotificationOptions options,
+                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<NotificationResource>.FromJson("notifications", response.Content);
+      return new ResourceSet<NotificationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<NotificationResource>> ReadAsync(ReadNotificationOptions options,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<NotificationResource>.FromJson("notifications", response.Content);
+      return new ResourceSet<NotificationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resources to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="log"> Filter by log level </param>
+    /// <param name="messageDateBefore"> Filter by date </param>
+    /// <param name="messageDate"> Filter by date </param>
+    /// <param name="messageDateAfter"> Filter by date </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static ResourceSet<NotificationResource> Read(string pathCallSid,
+                                                         string pathAccountSid = null,
+                                                         int? log = null,
+                                                         DateTime? messageDateBefore = null,
+                                                         DateTime? messageDate = null,
+                                                         DateTime? messageDateAfter = null,
+                                                         int? pageSize = null,
+                                                         long? limit = null,
+                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadNotificationOptions(pathCallSid) { PathAccountSid = pathAccountSid, Log = log, MessageDateBefore = messageDateBefore, MessageDate = messageDate, MessageDateAfter = messageDateAfter, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resources to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="log"> Filter by log level </param>
+    /// <param name="messageDateBefore"> Filter by date </param>
+    /// <param name="messageDate"> Filter by date </param>
+    /// <param name="messageDateAfter"> Filter by date </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<NotificationResource>> ReadAsync(string pathCallSid,
+                                                                                                 string pathAccountSid = null,
+                                                                                                 int? log = null,
+                                                                                                 DateTime? messageDateBefore = null,
+                                                                                                 DateTime? messageDate = null,
+                                                                                                 DateTime? messageDateAfter = null,
+                                                                                                 int? pageSize = null,
+                                                                                                 long? limit = null,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadNotificationOptions(pathCallSid) { PathAccountSid = pathAccountSid, Log = log, MessageDateBefore = messageDateBefore, MessageDate = messageDate, MessageDateAfter = messageDateAfter, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<NotificationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<NotificationResource>.FromJson("notifications", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<NotificationResource> NextPage(Page<NotificationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<NotificationResource>.FromJson("notifications", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<NotificationResource> PreviousPage(Page<NotificationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<NotificationResource>.FromJson("notifications", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a NotificationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NotificationResource object represented by the provided JSON </returns>
+    public static NotificationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NotificationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the Call Notification resource
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The SID of the Call the resource is associated with
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// A unique error code corresponding to the notification
+    /// </summary>
+    [JsonProperty("error_code")]
+    public string ErrorCode { get; private set; }
+    /// <summary>
+    /// An integer log level
+    /// </summary>
+    [JsonProperty("log")]
+    public string Log { get; private set; }
+    /// <summary>
+    /// The date the notification was generated
+    /// </summary>
+    [JsonProperty("message_date")]
+    public DateTime? MessageDate { get; private set; }
+    /// <summary>
+    /// The text of the notification
+    /// </summary>
+    [JsonProperty("message_text")]
+    public string MessageText { get; private set; }
+    /// <summary>
+    /// A URL for more information about the error code
+    /// </summary>
+    [JsonProperty("more_info")]
+    public Uri MoreInfo { get; private set; }
+    /// <summary>
+    /// HTTP method used with the request url
+    /// </summary>
+    [JsonProperty("request_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod RequestMethod { get; private set; }
+    /// <summary>
+    /// URL of the resource that generated the notification
+    /// </summary>
+    [JsonProperty("request_url")]
+    public Uri RequestUrl { get; private set; }
+    /// <summary>
+    /// Twilio-generated HTTP variables sent to the server
+    /// </summary>
+    [JsonProperty("request_variables")]
+    public string RequestVariables { get; private set; }
+    /// <summary>
+    /// The HTTP body returned by your server
+    /// </summary>
+    [JsonProperty("response_body")]
+    public string ResponseBody { get; private set; }
+    /// <summary>
+    /// The HTTP headers returned by your server
+    /// </summary>
+    [JsonProperty("response_headers")]
+    public string ResponseHeaders { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private NotificationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/PaymentOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Call/PaymentOptions.cs
index 034cec96a..b2613c394 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/PaymentOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/PaymentOptions.cs
@@ -9,276 +9,276 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// create an instance of payments. This will start a new payments session
+  /// </summary>
+  public class CreatePaymentOptions : IOptions<PaymentResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// create an instance of payments. This will start a new payments session
+    /// The SID of the Account that will create the resource
     /// </summary>
-    public class CreatePaymentOptions : IOptions<PaymentResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the call that will create the resource.
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// A unique token that will be used to ensure that multiple API calls with the same information do not result in multiple transactions.
-        /// </summary>
-        public string IdempotencyKey { get; }
-        /// <summary>
-        /// Provide an absolute or relative URL to receive status updates regarding your Pay session..
-        /// </summary>
-        public Uri StatusCallback { get; }
-        /// <summary>
-        /// Type of bank account if payment source is ACH.
-        /// </summary>
-        public PaymentResource.BankAccountTypeEnum BankAccountType { get; set; }
-        /// <summary>
-        /// A positive decimal value less than 1,000,000 to charge against the credit card or bank account.
-        /// </summary>
-        public decimal? ChargeAmount { get; set; }
-        /// <summary>
-        /// The currency of the `charge_amount`.
-        /// </summary>
-        public string Currency { get; set; }
-        /// <summary>
-        /// The description can be used to provide more details regarding the transaction.
-        /// </summary>
-        public string Description { get; set; }
-        /// <summary>
-        /// A list of inputs that should be accepted. Currently only `dtmf` is supported.
-        /// </summary>
-        public string Input { get; set; }
-        /// <summary>
-        /// A positive integer that is used to validate the length of the `PostalCode` inputted by the user.
-        /// </summary>
-        public int? MinPostalCodeLength { get; set; }
-        /// <summary>
-        /// A single level JSON string that is required when accepting certain information specific only to ACH payments.
-        /// </summary>
-        public object Parameter { get; set; }
-        /// <summary>
-        /// This is the unique name corresponding to the Payment Gateway Connector installed in the Twilio Add-ons.
-        /// </summary>
-        public string PaymentConnector { get; set; }
-        /// <summary>
-        /// Type of payment being captured.
-        /// </summary>
-        public PaymentResource.PaymentMethodEnum PaymentMethod { get; set; }
-        /// <summary>
-        /// Indicates whether the credit card PostalCode (zip code) is a required piece of payment information that must be provided by the caller.
-        /// </summary>
-        public bool? PostalCode { get; set; }
-        /// <summary>
-        /// Indicates whether the credit card security code is a required piece of payment information that must be provided by the caller.
-        /// </summary>
-        public bool? SecurityCode { get; set; }
-        /// <summary>
-        /// The number of seconds that <Pay> should wait for the caller to press a digit between each subsequent digit, after the first one, before moving on to validate the digits captured.
-        /// </summary>
-        public int? Timeout { get; set; }
-        /// <summary>
-        /// Indicates whether the payment method should be tokenized as a `one-time` or `reusable` token.
-        /// </summary>
-        public PaymentResource.TokenTypeEnum TokenType { get; set; }
-        /// <summary>
-        /// Credit card types separated by space that Pay should accept.
-        /// </summary>
-        public string ValidCardTypes { get; set; }
-
-        /// <summary>
-        /// Construct a new CreatePaymentOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the call that will create the resource. </param>
-        /// <param name="idempotencyKey"> A unique token that will be used to ensure that multiple API calls with the same
-        ///                      information do not result in multiple transactions. </param>
-        /// <param name="statusCallback"> Provide an absolute or relative URL to receive status updates regarding your Pay
-        ///                      session.. </param>
-        public CreatePaymentOptions(string pathCallSid, string idempotencyKey, Uri statusCallback)
-        {
-            PathCallSid = pathCallSid;
-            IdempotencyKey = idempotencyKey;
-            StatusCallback = statusCallback;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IdempotencyKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IdempotencyKey", IdempotencyKey));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (BankAccountType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BankAccountType", BankAccountType.ToString()));
-            }
-
-            if (ChargeAmount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChargeAmount", ChargeAmount.Value.ToString()));
-            }
-
-            if (Currency != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Currency", Currency));
-            }
-
-            if (Description != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Description", Description));
-            }
-
-            if (Input != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Input", Input));
-            }
-
-            if (MinPostalCodeLength != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MinPostalCodeLength", MinPostalCodeLength.ToString()));
-            }
-
-            if (Parameter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter", Serializers.JsonObject(Parameter)));
-            }
-
-            if (PaymentConnector != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PaymentConnector", PaymentConnector));
-            }
-
-            if (PaymentMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PaymentMethod", PaymentMethod.ToString()));
-            }
-
-            if (PostalCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostalCode", PostalCode.Value.ToString().ToLower()));
-            }
-
-            if (SecurityCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SecurityCode", SecurityCode.Value.ToString().ToLower()));
-            }
-
-            if (Timeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timeout", Timeout.ToString()));
-            }
-
-            if (TokenType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TokenType", TokenType.ToString()));
-            }
-
-            if (ValidCardTypes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ValidCardTypes", ValidCardTypes));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// update an instance of payments with different phases of payment flows.
+    /// The SID of the call that will create the resource.
     /// </summary>
-    public class UpdatePaymentOptions : IOptions<PaymentResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will update the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the call that will create the resource.
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The SID of Payments session
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A unique token that will be used to ensure that multiple API calls with the same information do not result in multiple transactions.
-        /// </summary>
-        public string IdempotencyKey { get; }
-        /// <summary>
-        /// Provide an absolute or relative URL to receive status updates regarding your Pay session.
-        /// </summary>
-        public Uri StatusCallback { get; }
-        /// <summary>
-        /// The piece of payment information that you wish the caller to enter.
-        /// </summary>
-        public PaymentResource.CaptureEnum Capture { get; set; }
-        /// <summary>
-        /// Indicates whether the current payment session should be cancelled or completed.
-        /// </summary>
-        public PaymentResource.StatusEnum Status { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdatePaymentOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the call that will create the resource. </param>
-        /// <param name="pathSid"> The SID of Payments session </param>
-        /// <param name="idempotencyKey"> A unique token that will be used to ensure that multiple API calls with the same
-        ///                      information do not result in multiple transactions. </param>
-        /// <param name="statusCallback"> Provide an absolute or relative URL to receive status updates regarding your Pay
-        ///                      session. </param>
-        public UpdatePaymentOptions(string pathCallSid, string pathSid, string idempotencyKey, Uri statusCallback)
-        {
-            PathCallSid = pathCallSid;
-            PathSid = pathSid;
-            IdempotencyKey = idempotencyKey;
-            StatusCallback = statusCallback;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IdempotencyKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IdempotencyKey", IdempotencyKey));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (Capture != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Capture", Capture.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathCallSid { get; }
+    /// <summary>
+    /// A unique token that will be used to ensure that multiple API calls with the same information do not result in multiple transactions.
+    /// </summary>
+    public string IdempotencyKey { get; }
+    /// <summary>
+    /// Provide an absolute or relative URL to receive status updates regarding your Pay session..
+    /// </summary>
+    public Uri StatusCallback { get; }
+    /// <summary>
+    /// Type of bank account if payment source is ACH.
+    /// </summary>
+    public PaymentResource.BankAccountTypeEnum BankAccountType { get; set; }
+    /// <summary>
+    /// A positive decimal value less than 1,000,000 to charge against the credit card or bank account.
+    /// </summary>
+    public decimal? ChargeAmount { get; set; }
+    /// <summary>
+    /// The currency of the `charge_amount`.
+    /// </summary>
+    public string Currency { get; set; }
+    /// <summary>
+    /// The description can be used to provide more details regarding the transaction.
+    /// </summary>
+    public string Description { get; set; }
+    /// <summary>
+    /// A list of inputs that should be accepted. Currently only `dtmf` is supported.
+    /// </summary>
+    public string Input { get; set; }
+    /// <summary>
+    /// A positive integer that is used to validate the length of the `PostalCode` inputted by the user.
+    /// </summary>
+    public int? MinPostalCodeLength { get; set; }
+    /// <summary>
+    /// A single level JSON string that is required when accepting certain information specific only to ACH payments.
+    /// </summary>
+    public object Parameter { get; set; }
+    /// <summary>
+    /// This is the unique name corresponding to the Payment Gateway Connector installed in the Twilio Add-ons.
+    /// </summary>
+    public string PaymentConnector { get; set; }
+    /// <summary>
+    /// Type of payment being captured.
+    /// </summary>
+    public PaymentResource.PaymentMethodEnum PaymentMethod { get; set; }
+    /// <summary>
+    /// Indicates whether the credit card PostalCode (zip code) is a required piece of payment information that must be provided by the caller.
+    /// </summary>
+    public bool? PostalCode { get; set; }
+    /// <summary>
+    /// Indicates whether the credit card security code is a required piece of payment information that must be provided by the caller.
+    /// </summary>
+    public bool? SecurityCode { get; set; }
+    /// <summary>
+    /// The number of seconds that <Pay> should wait for the caller to press a digit between each subsequent digit, after the first one, before moving on to validate the digits captured.
+    /// </summary>
+    public int? Timeout { get; set; }
+    /// <summary>
+    /// Indicates whether the payment method should be tokenized as a `one-time` or `reusable` token.
+    /// </summary>
+    public PaymentResource.TokenTypeEnum TokenType { get; set; }
+    /// <summary>
+    /// Credit card types separated by space that Pay should accept.
+    /// </summary>
+    public string ValidCardTypes { get; set; }
+
+    /// <summary>
+    /// Construct a new CreatePaymentOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the call that will create the resource. </param>
+    /// <param name="idempotencyKey"> A unique token that will be used to ensure that multiple API calls with the same
+    ///                      information do not result in multiple transactions. </param>
+    /// <param name="statusCallback"> Provide an absolute or relative URL to receive status updates regarding your Pay
+    ///                      session.. </param>
+    public CreatePaymentOptions(string pathCallSid, string idempotencyKey, Uri statusCallback)
+    {
+      PathCallSid = pathCallSid;
+      IdempotencyKey = idempotencyKey;
+      StatusCallback = statusCallback;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IdempotencyKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IdempotencyKey", IdempotencyKey));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (BankAccountType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BankAccountType", BankAccountType.ToString()));
+      }
+
+      if (ChargeAmount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChargeAmount", ChargeAmount.Value.ToString()));
+      }
+
+      if (Currency != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Currency", Currency));
+      }
+
+      if (Description != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Description", Description));
+      }
+
+      if (Input != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Input", Input));
+      }
+
+      if (MinPostalCodeLength != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MinPostalCodeLength", MinPostalCodeLength.ToString()));
+      }
+
+      if (Parameter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter", Serializers.JsonObject(Parameter)));
+      }
+
+      if (PaymentConnector != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PaymentConnector", PaymentConnector));
+      }
+
+      if (PaymentMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PaymentMethod", PaymentMethod.ToString()));
+      }
+
+      if (PostalCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostalCode", PostalCode.Value.ToString().ToLower()));
+      }
+
+      if (SecurityCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SecurityCode", SecurityCode.Value.ToString().ToLower()));
+      }
+
+      if (Timeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timeout", Timeout.ToString()));
+      }
+
+      if (TokenType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TokenType", TokenType.ToString()));
+      }
+
+      if (ValidCardTypes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ValidCardTypes", ValidCardTypes));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// update an instance of payments with different phases of payment flows.
+  /// </summary>
+  public class UpdatePaymentOptions : IOptions<PaymentResource>
+  {
+    /// <summary>
+    /// The SID of the Account that will update the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the call that will create the resource.
+    /// </summary>
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The SID of Payments session
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A unique token that will be used to ensure that multiple API calls with the same information do not result in multiple transactions.
+    /// </summary>
+    public string IdempotencyKey { get; }
+    /// <summary>
+    /// Provide an absolute or relative URL to receive status updates regarding your Pay session.
+    /// </summary>
+    public Uri StatusCallback { get; }
+    /// <summary>
+    /// The piece of payment information that you wish the caller to enter.
+    /// </summary>
+    public PaymentResource.CaptureEnum Capture { get; set; }
+    /// <summary>
+    /// Indicates whether the current payment session should be cancelled or completed.
+    /// </summary>
+    public PaymentResource.StatusEnum Status { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdatePaymentOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the call that will create the resource. </param>
+    /// <param name="pathSid"> The SID of Payments session </param>
+    /// <param name="idempotencyKey"> A unique token that will be used to ensure that multiple API calls with the same
+    ///                      information do not result in multiple transactions. </param>
+    /// <param name="statusCallback"> Provide an absolute or relative URL to receive status updates regarding your Pay
+    ///                      session. </param>
+    public UpdatePaymentOptions(string pathCallSid, string pathSid, string idempotencyKey, Uri statusCallback)
+    {
+      PathCallSid = pathCallSid;
+      PathSid = pathSid;
+      IdempotencyKey = idempotencyKey;
+      StatusCallback = statusCallback;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IdempotencyKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IdempotencyKey", IdempotencyKey));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (Capture != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Capture", Capture.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/PaymentResource.cs b/src/Twilio/Rest/Api/V2010/Account/Call/PaymentResource.cs
index 631fa1557..396cacadf 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/PaymentResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/PaymentResource.cs
@@ -20,385 +20,385 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
-    public class PaymentResource : Resource
-    {
-        public sealed class PaymentMethodEnum : StringEnum
-        {
-            private PaymentMethodEnum(string value) : base(value) {}
-            public PaymentMethodEnum() {}
-            public static implicit operator PaymentMethodEnum(string value)
-            {
-                return new PaymentMethodEnum(value);
-            }
-
-            public static readonly PaymentMethodEnum CreditCard = new PaymentMethodEnum("credit-card");
-            public static readonly PaymentMethodEnum AchDebit = new PaymentMethodEnum("ach-debit");
-        }
-
-        public sealed class BankAccountTypeEnum : StringEnum
-        {
-            private BankAccountTypeEnum(string value) : base(value) {}
-            public BankAccountTypeEnum() {}
-            public static implicit operator BankAccountTypeEnum(string value)
-            {
-                return new BankAccountTypeEnum(value);
-            }
-
-            public static readonly BankAccountTypeEnum ConsumerChecking = new BankAccountTypeEnum("consumer-checking");
-            public static readonly BankAccountTypeEnum ConsumerSavings = new BankAccountTypeEnum("consumer-savings");
-            public static readonly BankAccountTypeEnum CommercialChecking = new BankAccountTypeEnum("commercial-checking");
-        }
-
-        public sealed class TokenTypeEnum : StringEnum
-        {
-            private TokenTypeEnum(string value) : base(value) {}
-            public TokenTypeEnum() {}
-            public static implicit operator TokenTypeEnum(string value)
-            {
-                return new TokenTypeEnum(value);
-            }
-
-            public static readonly TokenTypeEnum OneTime = new TokenTypeEnum("one-time");
-            public static readonly TokenTypeEnum Reusable = new TokenTypeEnum("reusable");
-        }
-
-        public sealed class CaptureEnum : StringEnum
-        {
-            private CaptureEnum(string value) : base(value) {}
-            public CaptureEnum() {}
-            public static implicit operator CaptureEnum(string value)
-            {
-                return new CaptureEnum(value);
-            }
-
-            public static readonly CaptureEnum PaymentCardNumber = new CaptureEnum("payment-card-number");
-            public static readonly CaptureEnum ExpirationDate = new CaptureEnum("expiration-date");
-            public static readonly CaptureEnum SecurityCode = new CaptureEnum("security-code");
-            public static readonly CaptureEnum PostalCode = new CaptureEnum("postal-code");
-            public static readonly CaptureEnum BankRoutingNumber = new CaptureEnum("bank-routing-number");
-            public static readonly CaptureEnum BankAccountNumber = new CaptureEnum("bank-account-number");
-        }
-
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Complete = new StatusEnum("complete");
-            public static readonly StatusEnum Cancel = new StatusEnum("cancel");
-        }
-
-        private static Request BuildCreateRequest(CreatePaymentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Payments.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create an instance of payments. This will start a new payments session
-        /// </summary>
-        /// <param name="options"> Create Payment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Payment </returns>
-        public static PaymentResource Create(CreatePaymentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create an instance of payments. This will start a new payments session
-        /// </summary>
-        /// <param name="options"> Create Payment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Payment </returns>
-        public static async System.Threading.Tasks.Task<PaymentResource> CreateAsync(CreatePaymentOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create an instance of payments. This will start a new payments session
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the call that will create the resource. </param>
-        /// <param name="idempotencyKey"> A unique token that will be used to ensure that multiple API calls with the same
-        ///                      information do not result in multiple transactions. </param>
-        /// <param name="statusCallback"> Provide an absolute or relative URL to receive status updates regarding your Pay
-        ///                      session.. </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="bankAccountType"> Type of bank account if payment source is ACH. </param>
-        /// <param name="chargeAmount"> A positive decimal value less than 1,000,000 to charge against the credit card or bank
-        ///                    account. </param>
-        /// <param name="currency"> The currency of the `charge_amount`. </param>
-        /// <param name="description"> The description can be used to provide more details regarding the transaction. </param>
-        /// <param name="input"> A list of inputs that should be accepted. Currently only `dtmf` is supported. </param>
-        /// <param name="minPostalCodeLength"> A positive integer that is used to validate the length of the `PostalCode`
-        ///                           inputted by the user. </param>
-        /// <param name="parameter"> A single level JSON string that is required when accepting certain information specific
-        ///                 only to ACH payments. </param>
-        /// <param name="paymentConnector"> This is the unique name corresponding to the Payment Gateway Connector installed in
-        ///                        the Twilio Add-ons. </param>
-        /// <param name="paymentMethod"> Type of payment being captured. </param>
-        /// <param name="postalCode"> Indicates whether the credit card PostalCode (zip code) is a required piece of payment
-        ///                  information that must be provided by the caller. </param>
-        /// <param name="securityCode"> Indicates whether the credit card security code is a required piece of payment
-        ///                    information that must be provided by the caller. </param>
-        /// <param name="timeout"> The number of seconds that <Pay> should wait for the caller to press a digit between each
-        ///               subsequent digit, after the first one, before moving on to validate the digits captured. </param>
-        /// <param name="tokenType"> Indicates whether the payment method should be tokenized as a `one-time` or `reusable`
-        ///                 token. </param>
-        /// <param name="validCardTypes"> Credit card types separated by space that Pay should accept. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Payment </returns>
-        public static PaymentResource Create(string pathCallSid,
-                                             string idempotencyKey,
-                                             Uri statusCallback,
-                                             string pathAccountSid = null,
-                                             PaymentResource.BankAccountTypeEnum bankAccountType = null,
-                                             decimal? chargeAmount = null,
-                                             string currency = null,
-                                             string description = null,
-                                             string input = null,
-                                             int? minPostalCodeLength = null,
-                                             object parameter = null,
-                                             string paymentConnector = null,
-                                             PaymentResource.PaymentMethodEnum paymentMethod = null,
-                                             bool? postalCode = null,
-                                             bool? securityCode = null,
-                                             int? timeout = null,
-                                             PaymentResource.TokenTypeEnum tokenType = null,
-                                             string validCardTypes = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreatePaymentOptions(pathCallSid, idempotencyKey, statusCallback){PathAccountSid = pathAccountSid, BankAccountType = bankAccountType, ChargeAmount = chargeAmount, Currency = currency, Description = description, Input = input, MinPostalCodeLength = minPostalCodeLength, Parameter = parameter, PaymentConnector = paymentConnector, PaymentMethod = paymentMethod, PostalCode = postalCode, SecurityCode = securityCode, Timeout = timeout, TokenType = tokenType, ValidCardTypes = validCardTypes};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create an instance of payments. This will start a new payments session
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the call that will create the resource. </param>
-        /// <param name="idempotencyKey"> A unique token that will be used to ensure that multiple API calls with the same
-        ///                      information do not result in multiple transactions. </param>
-        /// <param name="statusCallback"> Provide an absolute or relative URL to receive status updates regarding your Pay
-        ///                      session.. </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="bankAccountType"> Type of bank account if payment source is ACH. </param>
-        /// <param name="chargeAmount"> A positive decimal value less than 1,000,000 to charge against the credit card or bank
-        ///                    account. </param>
-        /// <param name="currency"> The currency of the `charge_amount`. </param>
-        /// <param name="description"> The description can be used to provide more details regarding the transaction. </param>
-        /// <param name="input"> A list of inputs that should be accepted. Currently only `dtmf` is supported. </param>
-        /// <param name="minPostalCodeLength"> A positive integer that is used to validate the length of the `PostalCode`
-        ///                           inputted by the user. </param>
-        /// <param name="parameter"> A single level JSON string that is required when accepting certain information specific
-        ///                 only to ACH payments. </param>
-        /// <param name="paymentConnector"> This is the unique name corresponding to the Payment Gateway Connector installed in
-        ///                        the Twilio Add-ons. </param>
-        /// <param name="paymentMethod"> Type of payment being captured. </param>
-        /// <param name="postalCode"> Indicates whether the credit card PostalCode (zip code) is a required piece of payment
-        ///                  information that must be provided by the caller. </param>
-        /// <param name="securityCode"> Indicates whether the credit card security code is a required piece of payment
-        ///                    information that must be provided by the caller. </param>
-        /// <param name="timeout"> The number of seconds that <Pay> should wait for the caller to press a digit between each
-        ///               subsequent digit, after the first one, before moving on to validate the digits captured. </param>
-        /// <param name="tokenType"> Indicates whether the payment method should be tokenized as a `one-time` or `reusable`
-        ///                 token. </param>
-        /// <param name="validCardTypes"> Credit card types separated by space that Pay should accept. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Payment </returns>
-        public static async System.Threading.Tasks.Task<PaymentResource> CreateAsync(string pathCallSid,
-                                                                                     string idempotencyKey,
-                                                                                     Uri statusCallback,
-                                                                                     string pathAccountSid = null,
-                                                                                     PaymentResource.BankAccountTypeEnum bankAccountType = null,
-                                                                                     decimal? chargeAmount = null,
-                                                                                     string currency = null,
-                                                                                     string description = null,
-                                                                                     string input = null,
-                                                                                     int? minPostalCodeLength = null,
-                                                                                     object parameter = null,
-                                                                                     string paymentConnector = null,
-                                                                                     PaymentResource.PaymentMethodEnum paymentMethod = null,
-                                                                                     bool? postalCode = null,
-                                                                                     bool? securityCode = null,
-                                                                                     int? timeout = null,
-                                                                                     PaymentResource.TokenTypeEnum tokenType = null,
-                                                                                     string validCardTypes = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreatePaymentOptions(pathCallSid, idempotencyKey, statusCallback){PathAccountSid = pathAccountSid, BankAccountType = bankAccountType, ChargeAmount = chargeAmount, Currency = currency, Description = description, Input = input, MinPostalCodeLength = minPostalCodeLength, Parameter = parameter, PaymentConnector = paymentConnector, PaymentMethod = paymentMethod, PostalCode = postalCode, SecurityCode = securityCode, Timeout = timeout, TokenType = tokenType, ValidCardTypes = validCardTypes};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdatePaymentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Payments/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update an instance of payments with different phases of payment flows.
-        /// </summary>
-        /// <param name="options"> Update Payment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Payment </returns>
-        public static PaymentResource Update(UpdatePaymentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update an instance of payments with different phases of payment flows.
-        /// </summary>
-        /// <param name="options"> Update Payment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Payment </returns>
-        public static async System.Threading.Tasks.Task<PaymentResource> UpdateAsync(UpdatePaymentOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update an instance of payments with different phases of payment flows.
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the call that will create the resource. </param>
-        /// <param name="pathSid"> The SID of Payments session </param>
-        /// <param name="idempotencyKey"> A unique token that will be used to ensure that multiple API calls with the same
-        ///                      information do not result in multiple transactions. </param>
-        /// <param name="statusCallback"> Provide an absolute or relative URL to receive status updates regarding your Pay
-        ///                      session. </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will update the resource </param>
-        /// <param name="capture"> The piece of payment information that you wish the caller to enter. </param>
-        /// <param name="status"> Indicates whether the current payment session should be cancelled or completed. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Payment </returns>
-        public static PaymentResource Update(string pathCallSid,
-                                             string pathSid,
-                                             string idempotencyKey,
-                                             Uri statusCallback,
-                                             string pathAccountSid = null,
-                                             PaymentResource.CaptureEnum capture = null,
-                                             PaymentResource.StatusEnum status = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdatePaymentOptions(pathCallSid, pathSid, idempotencyKey, statusCallback){PathAccountSid = pathAccountSid, Capture = capture, Status = status};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update an instance of payments with different phases of payment flows.
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the call that will create the resource. </param>
-        /// <param name="pathSid"> The SID of Payments session </param>
-        /// <param name="idempotencyKey"> A unique token that will be used to ensure that multiple API calls with the same
-        ///                      information do not result in multiple transactions. </param>
-        /// <param name="statusCallback"> Provide an absolute or relative URL to receive status updates regarding your Pay
-        ///                      session. </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will update the resource </param>
-        /// <param name="capture"> The piece of payment information that you wish the caller to enter. </param>
-        /// <param name="status"> Indicates whether the current payment session should be cancelled or completed. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Payment </returns>
-        public static async System.Threading.Tasks.Task<PaymentResource> UpdateAsync(string pathCallSid,
-                                                                                     string pathSid,
-                                                                                     string idempotencyKey,
-                                                                                     Uri statusCallback,
-                                                                                     string pathAccountSid = null,
-                                                                                     PaymentResource.CaptureEnum capture = null,
-                                                                                     PaymentResource.StatusEnum status = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdatePaymentOptions(pathCallSid, pathSid, idempotencyKey, statusCallback){PathAccountSid = pathAccountSid, Capture = capture, Status = status};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a PaymentResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> PaymentResource object represented by the provided JSON </returns>
-        public static PaymentResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<PaymentResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the Payments resource.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Call the resource is associated with.
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The SID of the Payments resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private PaymentResource()
-        {
-
-        }
-    }
+{
+
+  public class PaymentResource : Resource
+  {
+    public sealed class PaymentMethodEnum : StringEnum
+    {
+      private PaymentMethodEnum(string value) : base(value) { }
+      public PaymentMethodEnum() { }
+      public static implicit operator PaymentMethodEnum(string value)
+      {
+        return new PaymentMethodEnum(value);
+      }
+
+      public static readonly PaymentMethodEnum CreditCard = new PaymentMethodEnum("credit-card");
+      public static readonly PaymentMethodEnum AchDebit = new PaymentMethodEnum("ach-debit");
+    }
+
+    public sealed class BankAccountTypeEnum : StringEnum
+    {
+      private BankAccountTypeEnum(string value) : base(value) { }
+      public BankAccountTypeEnum() { }
+      public static implicit operator BankAccountTypeEnum(string value)
+      {
+        return new BankAccountTypeEnum(value);
+      }
+
+      public static readonly BankAccountTypeEnum ConsumerChecking = new BankAccountTypeEnum("consumer-checking");
+      public static readonly BankAccountTypeEnum ConsumerSavings = new BankAccountTypeEnum("consumer-savings");
+      public static readonly BankAccountTypeEnum CommercialChecking = new BankAccountTypeEnum("commercial-checking");
+    }
+
+    public sealed class TokenTypeEnum : StringEnum
+    {
+      private TokenTypeEnum(string value) : base(value) { }
+      public TokenTypeEnum() { }
+      public static implicit operator TokenTypeEnum(string value)
+      {
+        return new TokenTypeEnum(value);
+      }
+
+      public static readonly TokenTypeEnum OneTime = new TokenTypeEnum("one-time");
+      public static readonly TokenTypeEnum Reusable = new TokenTypeEnum("reusable");
+    }
+
+    public sealed class CaptureEnum : StringEnum
+    {
+      private CaptureEnum(string value) : base(value) { }
+      public CaptureEnum() { }
+      public static implicit operator CaptureEnum(string value)
+      {
+        return new CaptureEnum(value);
+      }
+
+      public static readonly CaptureEnum PaymentCardNumber = new CaptureEnum("payment-card-number");
+      public static readonly CaptureEnum ExpirationDate = new CaptureEnum("expiration-date");
+      public static readonly CaptureEnum SecurityCode = new CaptureEnum("security-code");
+      public static readonly CaptureEnum PostalCode = new CaptureEnum("postal-code");
+      public static readonly CaptureEnum BankRoutingNumber = new CaptureEnum("bank-routing-number");
+      public static readonly CaptureEnum BankAccountNumber = new CaptureEnum("bank-account-number");
+    }
+
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Complete = new StatusEnum("complete");
+      public static readonly StatusEnum Cancel = new StatusEnum("cancel");
+    }
+
+    private static Request BuildCreateRequest(CreatePaymentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Payments.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create an instance of payments. This will start a new payments session
+    /// </summary>
+    /// <param name="options"> Create Payment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Payment </returns>
+    public static PaymentResource Create(CreatePaymentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create an instance of payments. This will start a new payments session
+    /// </summary>
+    /// <param name="options"> Create Payment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Payment </returns>
+    public static async System.Threading.Tasks.Task<PaymentResource> CreateAsync(CreatePaymentOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create an instance of payments. This will start a new payments session
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the call that will create the resource. </param>
+    /// <param name="idempotencyKey"> A unique token that will be used to ensure that multiple API calls with the same
+    ///                      information do not result in multiple transactions. </param>
+    /// <param name="statusCallback"> Provide an absolute or relative URL to receive status updates regarding your Pay
+    ///                      session.. </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="bankAccountType"> Type of bank account if payment source is ACH. </param>
+    /// <param name="chargeAmount"> A positive decimal value less than 1,000,000 to charge against the credit card or bank
+    ///                    account. </param>
+    /// <param name="currency"> The currency of the `charge_amount`. </param>
+    /// <param name="description"> The description can be used to provide more details regarding the transaction. </param>
+    /// <param name="input"> A list of inputs that should be accepted. Currently only `dtmf` is supported. </param>
+    /// <param name="minPostalCodeLength"> A positive integer that is used to validate the length of the `PostalCode`
+    ///                           inputted by the user. </param>
+    /// <param name="parameter"> A single level JSON string that is required when accepting certain information specific
+    ///                 only to ACH payments. </param>
+    /// <param name="paymentConnector"> This is the unique name corresponding to the Payment Gateway Connector installed in
+    ///                        the Twilio Add-ons. </param>
+    /// <param name="paymentMethod"> Type of payment being captured. </param>
+    /// <param name="postalCode"> Indicates whether the credit card PostalCode (zip code) is a required piece of payment
+    ///                  information that must be provided by the caller. </param>
+    /// <param name="securityCode"> Indicates whether the credit card security code is a required piece of payment
+    ///                    information that must be provided by the caller. </param>
+    /// <param name="timeout"> The number of seconds that <Pay> should wait for the caller to press a digit between each
+    ///               subsequent digit, after the first one, before moving on to validate the digits captured. </param>
+    /// <param name="tokenType"> Indicates whether the payment method should be tokenized as a `one-time` or `reusable`
+    ///                 token. </param>
+    /// <param name="validCardTypes"> Credit card types separated by space that Pay should accept. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Payment </returns>
+    public static PaymentResource Create(string pathCallSid,
+                                         string idempotencyKey,
+                                         Uri statusCallback,
+                                         string pathAccountSid = null,
+                                         PaymentResource.BankAccountTypeEnum bankAccountType = null,
+                                         decimal? chargeAmount = null,
+                                         string currency = null,
+                                         string description = null,
+                                         string input = null,
+                                         int? minPostalCodeLength = null,
+                                         object parameter = null,
+                                         string paymentConnector = null,
+                                         PaymentResource.PaymentMethodEnum paymentMethod = null,
+                                         bool? postalCode = null,
+                                         bool? securityCode = null,
+                                         int? timeout = null,
+                                         PaymentResource.TokenTypeEnum tokenType = null,
+                                         string validCardTypes = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreatePaymentOptions(pathCallSid, idempotencyKey, statusCallback) { PathAccountSid = pathAccountSid, BankAccountType = bankAccountType, ChargeAmount = chargeAmount, Currency = currency, Description = description, Input = input, MinPostalCodeLength = minPostalCodeLength, Parameter = parameter, PaymentConnector = paymentConnector, PaymentMethod = paymentMethod, PostalCode = postalCode, SecurityCode = securityCode, Timeout = timeout, TokenType = tokenType, ValidCardTypes = validCardTypes };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create an instance of payments. This will start a new payments session
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the call that will create the resource. </param>
+    /// <param name="idempotencyKey"> A unique token that will be used to ensure that multiple API calls with the same
+    ///                      information do not result in multiple transactions. </param>
+    /// <param name="statusCallback"> Provide an absolute or relative URL to receive status updates regarding your Pay
+    ///                      session.. </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="bankAccountType"> Type of bank account if payment source is ACH. </param>
+    /// <param name="chargeAmount"> A positive decimal value less than 1,000,000 to charge against the credit card or bank
+    ///                    account. </param>
+    /// <param name="currency"> The currency of the `charge_amount`. </param>
+    /// <param name="description"> The description can be used to provide more details regarding the transaction. </param>
+    /// <param name="input"> A list of inputs that should be accepted. Currently only `dtmf` is supported. </param>
+    /// <param name="minPostalCodeLength"> A positive integer that is used to validate the length of the `PostalCode`
+    ///                           inputted by the user. </param>
+    /// <param name="parameter"> A single level JSON string that is required when accepting certain information specific
+    ///                 only to ACH payments. </param>
+    /// <param name="paymentConnector"> This is the unique name corresponding to the Payment Gateway Connector installed in
+    ///                        the Twilio Add-ons. </param>
+    /// <param name="paymentMethod"> Type of payment being captured. </param>
+    /// <param name="postalCode"> Indicates whether the credit card PostalCode (zip code) is a required piece of payment
+    ///                  information that must be provided by the caller. </param>
+    /// <param name="securityCode"> Indicates whether the credit card security code is a required piece of payment
+    ///                    information that must be provided by the caller. </param>
+    /// <param name="timeout"> The number of seconds that <Pay> should wait for the caller to press a digit between each
+    ///               subsequent digit, after the first one, before moving on to validate the digits captured. </param>
+    /// <param name="tokenType"> Indicates whether the payment method should be tokenized as a `one-time` or `reusable`
+    ///                 token. </param>
+    /// <param name="validCardTypes"> Credit card types separated by space that Pay should accept. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Payment </returns>
+    public static async System.Threading.Tasks.Task<PaymentResource> CreateAsync(string pathCallSid,
+                                                                                 string idempotencyKey,
+                                                                                 Uri statusCallback,
+                                                                                 string pathAccountSid = null,
+                                                                                 PaymentResource.BankAccountTypeEnum bankAccountType = null,
+                                                                                 decimal? chargeAmount = null,
+                                                                                 string currency = null,
+                                                                                 string description = null,
+                                                                                 string input = null,
+                                                                                 int? minPostalCodeLength = null,
+                                                                                 object parameter = null,
+                                                                                 string paymentConnector = null,
+                                                                                 PaymentResource.PaymentMethodEnum paymentMethod = null,
+                                                                                 bool? postalCode = null,
+                                                                                 bool? securityCode = null,
+                                                                                 int? timeout = null,
+                                                                                 PaymentResource.TokenTypeEnum tokenType = null,
+                                                                                 string validCardTypes = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreatePaymentOptions(pathCallSid, idempotencyKey, statusCallback) { PathAccountSid = pathAccountSid, BankAccountType = bankAccountType, ChargeAmount = chargeAmount, Currency = currency, Description = description, Input = input, MinPostalCodeLength = minPostalCodeLength, Parameter = parameter, PaymentConnector = paymentConnector, PaymentMethod = paymentMethod, PostalCode = postalCode, SecurityCode = securityCode, Timeout = timeout, TokenType = tokenType, ValidCardTypes = validCardTypes };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdatePaymentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Payments/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update an instance of payments with different phases of payment flows.
+    /// </summary>
+    /// <param name="options"> Update Payment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Payment </returns>
+    public static PaymentResource Update(UpdatePaymentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update an instance of payments with different phases of payment flows.
+    /// </summary>
+    /// <param name="options"> Update Payment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Payment </returns>
+    public static async System.Threading.Tasks.Task<PaymentResource> UpdateAsync(UpdatePaymentOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update an instance of payments with different phases of payment flows.
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the call that will create the resource. </param>
+    /// <param name="pathSid"> The SID of Payments session </param>
+    /// <param name="idempotencyKey"> A unique token that will be used to ensure that multiple API calls with the same
+    ///                      information do not result in multiple transactions. </param>
+    /// <param name="statusCallback"> Provide an absolute or relative URL to receive status updates regarding your Pay
+    ///                      session. </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will update the resource </param>
+    /// <param name="capture"> The piece of payment information that you wish the caller to enter. </param>
+    /// <param name="status"> Indicates whether the current payment session should be cancelled or completed. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Payment </returns>
+    public static PaymentResource Update(string pathCallSid,
+                                         string pathSid,
+                                         string idempotencyKey,
+                                         Uri statusCallback,
+                                         string pathAccountSid = null,
+                                         PaymentResource.CaptureEnum capture = null,
+                                         PaymentResource.StatusEnum status = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdatePaymentOptions(pathCallSid, pathSid, idempotencyKey, statusCallback) { PathAccountSid = pathAccountSid, Capture = capture, Status = status };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update an instance of payments with different phases of payment flows.
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the call that will create the resource. </param>
+    /// <param name="pathSid"> The SID of Payments session </param>
+    /// <param name="idempotencyKey"> A unique token that will be used to ensure that multiple API calls with the same
+    ///                      information do not result in multiple transactions. </param>
+    /// <param name="statusCallback"> Provide an absolute or relative URL to receive status updates regarding your Pay
+    ///                      session. </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will update the resource </param>
+    /// <param name="capture"> The piece of payment information that you wish the caller to enter. </param>
+    /// <param name="status"> Indicates whether the current payment session should be cancelled or completed. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Payment </returns>
+    public static async System.Threading.Tasks.Task<PaymentResource> UpdateAsync(string pathCallSid,
+                                                                                 string pathSid,
+                                                                                 string idempotencyKey,
+                                                                                 Uri statusCallback,
+                                                                                 string pathAccountSid = null,
+                                                                                 PaymentResource.CaptureEnum capture = null,
+                                                                                 PaymentResource.StatusEnum status = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdatePaymentOptions(pathCallSid, pathSid, idempotencyKey, statusCallback) { PathAccountSid = pathAccountSid, Capture = capture, Status = status };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a PaymentResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> PaymentResource object represented by the provided JSON </returns>
+    public static PaymentResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<PaymentResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the Payments resource.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Call the resource is associated with.
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The SID of the Payments resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private PaymentResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/RecordingOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Call/RecordingOptions.cs
index 14f4d22fe..a910748b1 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/RecordingOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/RecordingOptions.cs
@@ -10,299 +10,299 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
+{
+
+  /// <summary>
+  /// Create a recording for the call
+  /// </summary>
+  public class CreateRecordingOptions : IOptions<RecordingResource>
+  {
     /// <summary>
-    /// Create a recording for the call
-    /// </summary>
-    public class CreateRecordingOptions : IOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Call to associate the resource with
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The recording status changes that should generate a callback
-        /// </summary>
-        public List<string> RecordingStatusCallbackEvent { get; set; }
-        /// <summary>
-        /// The callback URL on each selected recording event
-        /// </summary>
-        public Uri RecordingStatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call `recording_status_callback`
-        /// </summary>
-        public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Whether to trim the silence in the recording
-        /// </summary>
-        public string Trim { get; set; }
-        /// <summary>
-        /// The number of channels that the output recording will be configured with
-        /// </summary>
-        public string RecordingChannels { get; set; }
-        /// <summary>
-        /// Which track(s) to record
-        /// </summary>
-        public string RecordingTrack { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateRecordingOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the Call to associate the resource with </param>
-        public CreateRecordingOptions(string pathCallSid)
-        {
-            PathCallSid = pathCallSid;
-            RecordingStatusCallbackEvent = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (RecordingStatusCallbackEvent != null)
-            {
-                p.AddRange(RecordingStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("RecordingStatusCallbackEvent", prop)));
-            }
-
-            if (RecordingStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingStatusCallback", Serializers.Url(RecordingStatusCallback)));
-            }
-
-            if (RecordingStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingStatusCallbackMethod", RecordingStatusCallbackMethod.ToString()));
-            }
-
-            if (Trim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Trim", Trim));
-            }
-
-            if (RecordingChannels != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingChannels", RecordingChannels));
-            }
-
-            if (RecordingTrack != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingTrack", RecordingTrack));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Changes the status of the recording to paused, stopped, or in-progress. Note: Pass `Twilio.CURRENT` instead of
-    /// recording sid to reference current active recording.
-    /// </summary>
-    public class UpdateRecordingOptions : IOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The Call SID of the resource to update
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The new status of the recording
-        /// </summary>
-        public RecordingResource.StatusEnum Status { get; }
-        /// <summary>
-        /// Whether to record or not during the pause period.
-        /// </summary>
-        public string PauseBehavior { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateRecordingOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="status"> The new status of the recording </param>
-        public UpdateRecordingOptions(string pathCallSid, string pathSid, RecordingResource.StatusEnum status)
-        {
-            PathCallSid = pathCallSid;
-            PathSid = pathSid;
-            Status = status;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (PauseBehavior != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PauseBehavior", PauseBehavior));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Call to associate the resource with
+    /// </summary>
+    public string PathCallSid { get; }
     /// <summary>
-    /// Fetch an instance of a recording for a call
-    /// </summary>
-    public class FetchRecordingOptions : IOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The Call SID of the resource to fetch
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRecordingOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchRecordingOptions(string pathCallSid, string pathSid)
-        {
-            PathCallSid = pathCallSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The recording status changes that should generate a callback
+    /// </summary>
+    public List<string> RecordingStatusCallbackEvent { get; set; }
     /// <summary>
-    /// Delete a recording from your account
-    /// </summary>
-    public class DeleteRecordingOptions : IOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The Call SID of the resources to delete
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRecordingOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteRecordingOptions(string pathCallSid, string pathSid)
-        {
-            PathCallSid = pathCallSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The callback URL on each selected recording event
+    /// </summary>
+    public Uri RecordingStatusCallback { get; set; }
     /// <summary>
-    /// Retrieve a list of recordings belonging to the call used to make the request
-    /// </summary>
-    public class ReadRecordingOptions : ReadOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The Call SID of the resources to read
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The `YYYY-MM-DD` value of the resources to read
-        /// </summary>
-        public DateTime? DateCreatedBefore { get; set; }
-        /// <summary>
-        /// The `YYYY-MM-DD` value of the resources to read
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The `YYYY-MM-DD` value of the resources to read
-        /// </summary>
-        public DateTime? DateCreatedAfter { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadRecordingOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resources to read </param>
-        public ReadRecordingOptions(string pathCallSid)
-        {
-            PathCallSid = pathCallSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", DateCreated.Value.ToString("yyyy-MM-dd")));
-            }
-            else
-            {
-                if (DateCreatedBefore != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateCreated<", DateCreatedBefore.Value.ToString("yyyy-MM-dd")));
-                }
-
-                if (DateCreatedAfter != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateCreated>", DateCreatedAfter.Value.ToString("yyyy-MM-dd")));
-                }
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The HTTP method we should use to call `recording_status_callback`
+    /// </summary>
+    public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Whether to trim the silence in the recording
+    /// </summary>
+    public string Trim { get; set; }
+    /// <summary>
+    /// The number of channels that the output recording will be configured with
+    /// </summary>
+    public string RecordingChannels { get; set; }
+    /// <summary>
+    /// Which track(s) to record
+    /// </summary>
+    public string RecordingTrack { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateRecordingOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the Call to associate the resource with </param>
+    public CreateRecordingOptions(string pathCallSid)
+    {
+      PathCallSid = pathCallSid;
+      RecordingStatusCallbackEvent = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (RecordingStatusCallbackEvent != null)
+      {
+        p.AddRange(RecordingStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("RecordingStatusCallbackEvent", prop)));
+      }
+
+      if (RecordingStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingStatusCallback", Serializers.Url(RecordingStatusCallback)));
+      }
+
+      if (RecordingStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingStatusCallbackMethod", RecordingStatusCallbackMethod.ToString()));
+      }
+
+      if (Trim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Trim", Trim));
+      }
+
+      if (RecordingChannels != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingChannels", RecordingChannels));
+      }
+
+      if (RecordingTrack != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingTrack", RecordingTrack));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Changes the status of the recording to paused, stopped, or in-progress. Note: Pass `Twilio.CURRENT` instead of
+  /// recording sid to reference current active recording.
+  /// </summary>
+  public class UpdateRecordingOptions : IOptions<RecordingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The Call SID of the resource to update
+    /// </summary>
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The new status of the recording
+    /// </summary>
+    public RecordingResource.StatusEnum Status { get; }
+    /// <summary>
+    /// Whether to record or not during the pause period.
+    /// </summary>
+    public string PauseBehavior { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateRecordingOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="status"> The new status of the recording </param>
+    public UpdateRecordingOptions(string pathCallSid, string pathSid, RecordingResource.StatusEnum status)
+    {
+      PathCallSid = pathCallSid;
+      PathSid = pathSid;
+      Status = status;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (PauseBehavior != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PauseBehavior", PauseBehavior));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch an instance of a recording for a call
+  /// </summary>
+  public class FetchRecordingOptions : IOptions<RecordingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The Call SID of the resource to fetch
+    /// </summary>
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchRecordingOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchRecordingOptions(string pathCallSid, string pathSid)
+    {
+      PathCallSid = pathCallSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a recording from your account
+  /// </summary>
+  public class DeleteRecordingOptions : IOptions<RecordingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The Call SID of the resources to delete
+    /// </summary>
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRecordingOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteRecordingOptions(string pathCallSid, string pathSid)
+    {
+      PathCallSid = pathCallSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of recordings belonging to the call used to make the request
+  /// </summary>
+  public class ReadRecordingOptions : ReadOptions<RecordingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The Call SID of the resources to read
+    /// </summary>
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The `YYYY-MM-DD` value of the resources to read
+    /// </summary>
+    public DateTime? DateCreatedBefore { get; set; }
+    /// <summary>
+    /// The `YYYY-MM-DD` value of the resources to read
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The `YYYY-MM-DD` value of the resources to read
+    /// </summary>
+    public DateTime? DateCreatedAfter { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadRecordingOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resources to read </param>
+    public ReadRecordingOptions(string pathCallSid)
+    {
+      PathCallSid = pathCallSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", DateCreated.Value.ToString("yyyy-MM-dd")));
+      }
+      else
+      {
+        if (DateCreatedBefore != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateCreated<", DateCreatedBefore.Value.ToString("yyyy-MM-dd")));
+        }
+
+        if (DateCreatedAfter != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateCreated>", DateCreatedAfter.Value.ToString("yyyy-MM-dd")));
+        }
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/RecordingResource.cs b/src/Twilio/Rest/Api/V2010/Account/Call/RecordingResource.cs
index 4663e1e91..203a0daf4 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/RecordingResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/RecordingResource.cs
@@ -17,647 +17,647 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
-    public class RecordingResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
-            public static readonly StatusEnum Paused = new StatusEnum("paused");
-            public static readonly StatusEnum Stopped = new StatusEnum("stopped");
-            public static readonly StatusEnum Processing = new StatusEnum("processing");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Absent = new StatusEnum("absent");
-        }
-
-        public sealed class SourceEnum : StringEnum
-        {
-            private SourceEnum(string value) : base(value) {}
-            public SourceEnum() {}
-            public static implicit operator SourceEnum(string value)
-            {
-                return new SourceEnum(value);
-            }
-
-            public static readonly SourceEnum Dialverb = new SourceEnum("DialVerb");
-            public static readonly SourceEnum Conference = new SourceEnum("Conference");
-            public static readonly SourceEnum Outboundapi = new SourceEnum("OutboundAPI");
-            public static readonly SourceEnum Trunking = new SourceEnum("Trunking");
-            public static readonly SourceEnum Recordverb = new SourceEnum("RecordVerb");
-            public static readonly SourceEnum Startcallrecordingapi = new SourceEnum("StartCallRecordingAPI");
-            public static readonly SourceEnum Startconferencerecordingapi = new SourceEnum("StartConferenceRecordingAPI");
-        }
-
-        private static Request BuildCreateRequest(CreateRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Recordings.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a recording for the call
-        /// </summary>
-        /// <param name="options"> Create Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Create(CreateRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a recording for the call
-        /// </summary>
-        /// <param name="options"> Create Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> CreateAsync(CreateRecordingOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a recording for the call
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the Call to associate the resource with </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="recordingStatusCallbackEvent"> The recording status changes that should generate a callback </param>
-        /// <param name="recordingStatusCallback"> The callback URL on each selected recording event </param>
-        /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use to call `recording_status_callback`
-        ///                                     </param>
-        /// <param name="trim"> Whether to trim the silence in the recording </param>
-        /// <param name="recordingChannels"> The number of channels that the output recording will be configured with </param>
-        /// <param name="recordingTrack"> Which track(s) to record </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Create(string pathCallSid,
-                                               string pathAccountSid = null,
-                                               List<string> recordingStatusCallbackEvent = null,
-                                               Uri recordingStatusCallback = null,
-                                               Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                                               string trim = null,
-                                               string recordingChannels = null,
-                                               string recordingTrack = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateRecordingOptions(pathCallSid){PathAccountSid = pathAccountSid, RecordingStatusCallbackEvent = recordingStatusCallbackEvent, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, Trim = trim, RecordingChannels = recordingChannels, RecordingTrack = recordingTrack};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a recording for the call
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the Call to associate the resource with </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="recordingStatusCallbackEvent"> The recording status changes that should generate a callback </param>
-        /// <param name="recordingStatusCallback"> The callback URL on each selected recording event </param>
-        /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use to call `recording_status_callback`
-        ///                                     </param>
-        /// <param name="trim"> Whether to trim the silence in the recording </param>
-        /// <param name="recordingChannels"> The number of channels that the output recording will be configured with </param>
-        /// <param name="recordingTrack"> Which track(s) to record </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> CreateAsync(string pathCallSid,
-                                                                                       string pathAccountSid = null,
-                                                                                       List<string> recordingStatusCallbackEvent = null,
-                                                                                       Uri recordingStatusCallback = null,
-                                                                                       Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                                                                                       string trim = null,
-                                                                                       string recordingChannels = null,
-                                                                                       string recordingTrack = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateRecordingOptions(pathCallSid){PathAccountSid = pathAccountSid, RecordingStatusCallbackEvent = recordingStatusCallbackEvent, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, Trim = trim, RecordingChannels = recordingChannels, RecordingTrack = recordingTrack};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Recordings/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Changes the status of the recording to paused, stopped, or in-progress. Note: Pass `Twilio.CURRENT` instead of
-        /// recording sid to reference current active recording.
-        /// </summary>
-        /// <param name="options"> Update Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Update(UpdateRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Changes the status of the recording to paused, stopped, or in-progress. Note: Pass `Twilio.CURRENT` instead of
-        /// recording sid to reference current active recording.
-        /// </summary>
-        /// <param name="options"> Update Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> UpdateAsync(UpdateRecordingOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Changes the status of the recording to paused, stopped, or in-progress. Note: Pass `Twilio.CURRENT` instead of
-        /// recording sid to reference current active recording.
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="status"> The new status of the recording </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
-        /// <param name="pauseBehavior"> Whether to record or not during the pause period. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Update(string pathCallSid,
-                                               string pathSid,
-                                               RecordingResource.StatusEnum status,
-                                               string pathAccountSid = null,
-                                               string pauseBehavior = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateRecordingOptions(pathCallSid, pathSid, status){PathAccountSid = pathAccountSid, PauseBehavior = pauseBehavior};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Changes the status of the recording to paused, stopped, or in-progress. Note: Pass `Twilio.CURRENT` instead of
-        /// recording sid to reference current active recording.
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="status"> The new status of the recording </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
-        /// <param name="pauseBehavior"> Whether to record or not during the pause period. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> UpdateAsync(string pathCallSid,
-                                                                                       string pathSid,
-                                                                                       RecordingResource.StatusEnum status,
-                                                                                       string pathAccountSid = null,
-                                                                                       string pauseBehavior = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateRecordingOptions(pathCallSid, pathSid, status){PathAccountSid = pathAccountSid, PauseBehavior = pauseBehavior};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Recordings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of a recording for a call
-        /// </summary>
-        /// <param name="options"> Fetch Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Fetch(FetchRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a recording for a call
-        /// </summary>
-        /// <param name="options"> Fetch Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(FetchRecordingOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of a recording for a call
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Fetch(string pathCallSid,
-                                              string pathSid,
-                                              string pathAccountSid = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingOptions(pathCallSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a recording for a call
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(string pathCallSid,
-                                                                                      string pathSid,
-                                                                                      string pathAccountSid = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingOptions(pathCallSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Recordings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a recording from your account
-        /// </summary>
-        /// <param name="options"> Delete Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static bool Delete(DeleteRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a recording from your account
-        /// </summary>
-        /// <param name="options"> Delete Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRecordingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a recording from your account
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static bool Delete(string pathCallSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteRecordingOptions(pathCallSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a recording from your account
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathCallSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteRecordingOptions(pathCallSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Recordings.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of recordings belonging to the call used to make the request
-        /// </summary>
-        /// <param name="options"> Read Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static ResourceSet<RecordingResource> Read(ReadRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RecordingResource>.FromJson("recordings", response.Content);
-            return new ResourceSet<RecordingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of recordings belonging to the call used to make the request
-        /// </summary>
-        /// <param name="options"> Read Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(ReadRecordingOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RecordingResource>.FromJson("recordings", response.Content);
-            return new ResourceSet<RecordingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of recordings belonging to the call used to make the request
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resources to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="dateCreatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateCreated"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateCreatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static ResourceSet<RecordingResource> Read(string pathCallSid,
-                                                          string pathAccountSid = null,
-                                                          DateTime? dateCreatedBefore = null,
-                                                          DateTime? dateCreated = null,
-                                                          DateTime? dateCreatedAfter = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadRecordingOptions(pathCallSid){PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of recordings belonging to the call used to make the request
-        /// </summary>
-        /// <param name="pathCallSid"> The Call SID of the resources to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="dateCreatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateCreated"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateCreatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(string pathCallSid,
-                                                                                                  string pathAccountSid = null,
-                                                                                                  DateTime? dateCreatedBefore = null,
-                                                                                                  DateTime? dateCreated = null,
-                                                                                                  DateTime? dateCreatedAfter = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadRecordingOptions(pathCallSid){PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RecordingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RecordingResource> NextPage(Page<RecordingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<RecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RecordingResource> PreviousPage(Page<RecordingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<RecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a RecordingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RecordingResource object represented by the provided JSON </returns>
-        public static RecordingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RecordingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to make the recording
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The SID of the Call the resource is associated with
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The Conference SID that identifies the conference associated with the recording
-        /// </summary>
-        [JsonProperty("conference_sid")]
-        public string ConferenceSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The start time of the recording, given in RFC 2822 format
-        /// </summary>
-        [JsonProperty("start_time")]
-        public DateTime? StartTime { get; private set; }
-        /// <summary>
-        /// The length of the recording in seconds
-        /// </summary>
-        [JsonProperty("duration")]
-        public string Duration { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The one-time cost of creating the recording.
-        /// </summary>
-        [JsonProperty("price")]
-        public decimal? Price { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// How to decrypt the recording.
-        /// </summary>
-        [JsonProperty("encryption_details")]
-        public object EncryptionDetails { get; private set; }
-        /// <summary>
-        /// The currency used in the price property.
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The status of the recording
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RecordingResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The number of channels in the final recording file
-        /// </summary>
-        [JsonProperty("channels")]
-        public int? Channels { get; private set; }
-        /// <summary>
-        /// How the recording was created
-        /// </summary>
-        [JsonProperty("source")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RecordingResource.SourceEnum Source { get; private set; }
-        /// <summary>
-        /// More information about why the recording is missing, if status is `absent`.
-        /// </summary>
-        [JsonProperty("error_code")]
-        public int? ErrorCode { get; private set; }
-        /// <summary>
-        /// The recorded track. Can be: `inbound`, `outbound`, or `both`.
-        /// </summary>
-        [JsonProperty("track")]
-        public string Track { get; private set; }
-
-        private RecordingResource()
-        {
-
-        }
-    }
+{
+
+  public class RecordingResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
+      public static readonly StatusEnum Paused = new StatusEnum("paused");
+      public static readonly StatusEnum Stopped = new StatusEnum("stopped");
+      public static readonly StatusEnum Processing = new StatusEnum("processing");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Absent = new StatusEnum("absent");
+    }
+
+    public sealed class SourceEnum : StringEnum
+    {
+      private SourceEnum(string value) : base(value) { }
+      public SourceEnum() { }
+      public static implicit operator SourceEnum(string value)
+      {
+        return new SourceEnum(value);
+      }
+
+      public static readonly SourceEnum Dialverb = new SourceEnum("DialVerb");
+      public static readonly SourceEnum Conference = new SourceEnum("Conference");
+      public static readonly SourceEnum Outboundapi = new SourceEnum("OutboundAPI");
+      public static readonly SourceEnum Trunking = new SourceEnum("Trunking");
+      public static readonly SourceEnum Recordverb = new SourceEnum("RecordVerb");
+      public static readonly SourceEnum Startcallrecordingapi = new SourceEnum("StartCallRecordingAPI");
+      public static readonly SourceEnum Startconferencerecordingapi = new SourceEnum("StartConferenceRecordingAPI");
+    }
+
+    private static Request BuildCreateRequest(CreateRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Recordings.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a recording for the call
+    /// </summary>
+    /// <param name="options"> Create Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Create(CreateRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a recording for the call
+    /// </summary>
+    /// <param name="options"> Create Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> CreateAsync(CreateRecordingOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a recording for the call
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the Call to associate the resource with </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="recordingStatusCallbackEvent"> The recording status changes that should generate a callback </param>
+    /// <param name="recordingStatusCallback"> The callback URL on each selected recording event </param>
+    /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use to call `recording_status_callback`
+    ///                                     </param>
+    /// <param name="trim"> Whether to trim the silence in the recording </param>
+    /// <param name="recordingChannels"> The number of channels that the output recording will be configured with </param>
+    /// <param name="recordingTrack"> Which track(s) to record </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Create(string pathCallSid,
+                                           string pathAccountSid = null,
+                                           List<string> recordingStatusCallbackEvent = null,
+                                           Uri recordingStatusCallback = null,
+                                           Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                                           string trim = null,
+                                           string recordingChannels = null,
+                                           string recordingTrack = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateRecordingOptions(pathCallSid) { PathAccountSid = pathAccountSid, RecordingStatusCallbackEvent = recordingStatusCallbackEvent, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, Trim = trim, RecordingChannels = recordingChannels, RecordingTrack = recordingTrack };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a recording for the call
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the Call to associate the resource with </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="recordingStatusCallbackEvent"> The recording status changes that should generate a callback </param>
+    /// <param name="recordingStatusCallback"> The callback URL on each selected recording event </param>
+    /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use to call `recording_status_callback`
+    ///                                     </param>
+    /// <param name="trim"> Whether to trim the silence in the recording </param>
+    /// <param name="recordingChannels"> The number of channels that the output recording will be configured with </param>
+    /// <param name="recordingTrack"> Which track(s) to record </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> CreateAsync(string pathCallSid,
+                                                                                   string pathAccountSid = null,
+                                                                                   List<string> recordingStatusCallbackEvent = null,
+                                                                                   Uri recordingStatusCallback = null,
+                                                                                   Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                                                                                   string trim = null,
+                                                                                   string recordingChannels = null,
+                                                                                   string recordingTrack = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateRecordingOptions(pathCallSid) { PathAccountSid = pathAccountSid, RecordingStatusCallbackEvent = recordingStatusCallbackEvent, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, Trim = trim, RecordingChannels = recordingChannels, RecordingTrack = recordingTrack };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Recordings/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Changes the status of the recording to paused, stopped, or in-progress. Note: Pass `Twilio.CURRENT` instead of
+    /// recording sid to reference current active recording.
+    /// </summary>
+    /// <param name="options"> Update Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Update(UpdateRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Changes the status of the recording to paused, stopped, or in-progress. Note: Pass `Twilio.CURRENT` instead of
+    /// recording sid to reference current active recording.
+    /// </summary>
+    /// <param name="options"> Update Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> UpdateAsync(UpdateRecordingOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Changes the status of the recording to paused, stopped, or in-progress. Note: Pass `Twilio.CURRENT` instead of
+    /// recording sid to reference current active recording.
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="status"> The new status of the recording </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
+    /// <param name="pauseBehavior"> Whether to record or not during the pause period. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Update(string pathCallSid,
+                                           string pathSid,
+                                           RecordingResource.StatusEnum status,
+                                           string pathAccountSid = null,
+                                           string pauseBehavior = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateRecordingOptions(pathCallSid, pathSid, status) { PathAccountSid = pathAccountSid, PauseBehavior = pauseBehavior };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Changes the status of the recording to paused, stopped, or in-progress. Note: Pass `Twilio.CURRENT` instead of
+    /// recording sid to reference current active recording.
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="status"> The new status of the recording </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
+    /// <param name="pauseBehavior"> Whether to record or not during the pause period. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> UpdateAsync(string pathCallSid,
+                                                                                   string pathSid,
+                                                                                   RecordingResource.StatusEnum status,
+                                                                                   string pathAccountSid = null,
+                                                                                   string pauseBehavior = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateRecordingOptions(pathCallSid, pathSid, status) { PathAccountSid = pathAccountSid, PauseBehavior = pauseBehavior };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Recordings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of a recording for a call
+    /// </summary>
+    /// <param name="options"> Fetch Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Fetch(FetchRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a recording for a call
+    /// </summary>
+    /// <param name="options"> Fetch Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(FetchRecordingOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of a recording for a call
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Fetch(string pathCallSid,
+                                          string pathSid,
+                                          string pathAccountSid = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingOptions(pathCallSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a recording for a call
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(string pathCallSid,
+                                                                                  string pathSid,
+                                                                                  string pathAccountSid = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingOptions(pathCallSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Recordings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a recording from your account
+    /// </summary>
+    /// <param name="options"> Delete Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static bool Delete(DeleteRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a recording from your account
+    /// </summary>
+    /// <param name="options"> Delete Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRecordingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a recording from your account
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static bool Delete(string pathCallSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteRecordingOptions(pathCallSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a recording from your account
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathCallSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteRecordingOptions(pathCallSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Recordings.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of recordings belonging to the call used to make the request
+    /// </summary>
+    /// <param name="options"> Read Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static ResourceSet<RecordingResource> Read(ReadRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RecordingResource>.FromJson("recordings", response.Content);
+      return new ResourceSet<RecordingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of recordings belonging to the call used to make the request
+    /// </summary>
+    /// <param name="options"> Read Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(ReadRecordingOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RecordingResource>.FromJson("recordings", response.Content);
+      return new ResourceSet<RecordingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of recordings belonging to the call used to make the request
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resources to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="dateCreatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateCreated"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateCreatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static ResourceSet<RecordingResource> Read(string pathCallSid,
+                                                      string pathAccountSid = null,
+                                                      DateTime? dateCreatedBefore = null,
+                                                      DateTime? dateCreated = null,
+                                                      DateTime? dateCreatedAfter = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadRecordingOptions(pathCallSid) { PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of recordings belonging to the call used to make the request
+    /// </summary>
+    /// <param name="pathCallSid"> The Call SID of the resources to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="dateCreatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateCreated"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateCreatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(string pathCallSid,
+                                                                                              string pathAccountSid = null,
+                                                                                              DateTime? dateCreatedBefore = null,
+                                                                                              DateTime? dateCreated = null,
+                                                                                              DateTime? dateCreatedAfter = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadRecordingOptions(pathCallSid) { PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RecordingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RecordingResource> NextPage(Page<RecordingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<RecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RecordingResource> PreviousPage(Page<RecordingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<RecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a RecordingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RecordingResource object represented by the provided JSON </returns>
+    public static RecordingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RecordingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to make the recording
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The SID of the Call the resource is associated with
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The Conference SID that identifies the conference associated with the recording
+    /// </summary>
+    [JsonProperty("conference_sid")]
+    public string ConferenceSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The start time of the recording, given in RFC 2822 format
+    /// </summary>
+    [JsonProperty("start_time")]
+    public DateTime? StartTime { get; private set; }
+    /// <summary>
+    /// The length of the recording in seconds
+    /// </summary>
+    [JsonProperty("duration")]
+    public string Duration { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The one-time cost of creating the recording.
+    /// </summary>
+    [JsonProperty("price")]
+    public decimal? Price { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// How to decrypt the recording.
+    /// </summary>
+    [JsonProperty("encryption_details")]
+    public object EncryptionDetails { get; private set; }
+    /// <summary>
+    /// The currency used in the price property.
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The status of the recording
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RecordingResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The number of channels in the final recording file
+    /// </summary>
+    [JsonProperty("channels")]
+    public int? Channels { get; private set; }
+    /// <summary>
+    /// How the recording was created
+    /// </summary>
+    [JsonProperty("source")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RecordingResource.SourceEnum Source { get; private set; }
+    /// <summary>
+    /// More information about why the recording is missing, if status is `absent`.
+    /// </summary>
+    [JsonProperty("error_code")]
+    public int? ErrorCode { get; private set; }
+    /// <summary>
+    /// The recorded track. Can be: `inbound`, `outbound`, or `both`.
+    /// </summary>
+    [JsonProperty("track")]
+    public string Track { get; private set; }
+
+    private RecordingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/SiprecOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Call/SiprecOptions.cs
index 757caeaaa..d4a0115c4 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/SiprecOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/SiprecOptions.cs
@@ -9,1916 +9,1916 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
+{
+
+  /// <summary>
+  /// Create a Siprec
+  /// </summary>
+  public class CreateSiprecOptions : IOptions<SiprecResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created this resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the Call the resource is associated with
+    /// </summary>
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The name of this resource
+    /// </summary>
+    public string Name { get; set; }
+    /// <summary>
+    /// Unique name used when configuring the connector via Marketplace Add-on.
+    /// </summary>
+    public string ConnectorName { get; set; }
+    /// <summary>
+    /// One of `inbound_track`, `outbound_track`, `both_tracks`.
+    /// </summary>
+    public SiprecResource.TrackEnum Track { get; set; }
+    /// <summary>
+    /// Absolute URL of the status callback.
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The http method for the status_callback.
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter1Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter1Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter2Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter2Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter3Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter3Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter4Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter4Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter5Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter5Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter6Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter6Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter7Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter7Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter8Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter8Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter9Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter9Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter10Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter10Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter11Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter11Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter12Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter12Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter13Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter13Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter14Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter14Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter15Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter15Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter16Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter16Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter17Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter17Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter18Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter18Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter19Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter19Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter20Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter20Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter21Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter21Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter22Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter22Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter23Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter23Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter24Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter24Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter25Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter25Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter26Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter26Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter27Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter27Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter28Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter28Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter29Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter29Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter30Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter30Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter31Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter31Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter32Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter32Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter33Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter33Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter34Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter34Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter35Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter35Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter36Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter36Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter37Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter37Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter38Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter38Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter39Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter39Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter40Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter40Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter41Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter41Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter42Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter42Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter43Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter43Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter44Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter44Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter45Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter45Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter46Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter46Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter47Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter47Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter48Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter48Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter49Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter49Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter50Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter50Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter51Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter51Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter52Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter52Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter53Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter53Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter54Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter54Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter55Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter55Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter56Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter56Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter57Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter57Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter58Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter58Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter59Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter59Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter60Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter60Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter61Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter61Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter62Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter62Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter63Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter63Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter64Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter64Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter65Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter65Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter66Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter66Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter67Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter67Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter68Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter68Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter69Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter69Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter70Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter70Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter71Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter71Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter72Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter72Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter73Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter73Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter74Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter74Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter75Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter75Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter76Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter76Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter77Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter77Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter78Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter78Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter79Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter79Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter80Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter80Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter81Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter81Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter82Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter82Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter83Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter83Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter84Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter84Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter85Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter85Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter86Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter86Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter87Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter87Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter88Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter88Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter89Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter89Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter90Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter90Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter91Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter91Value { get; set; }
     /// <summary>
-    /// Create a Siprec
-    /// </summary>
-    public class CreateSiprecOptions : IOptions<SiprecResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created this resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Call the resource is associated with
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The name of this resource
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// Unique name used when configuring the connector via Marketplace Add-on.
-        /// </summary>
-        public string ConnectorName { get; set; }
-        /// <summary>
-        /// One of `inbound_track`, `outbound_track`, `both_tracks`.
-        /// </summary>
-        public SiprecResource.TrackEnum Track { get; set; }
-        /// <summary>
-        /// Absolute URL of the status callback.
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The http method for the status_callback.
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter1Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter1Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter2Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter2Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter3Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter3Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter4Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter4Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter5Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter5Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter6Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter6Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter7Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter7Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter8Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter8Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter9Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter9Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter10Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter10Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter11Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter11Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter12Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter12Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter13Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter13Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter14Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter14Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter15Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter15Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter16Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter16Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter17Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter17Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter18Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter18Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter19Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter19Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter20Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter20Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter21Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter21Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter22Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter22Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter23Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter23Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter24Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter24Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter25Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter25Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter26Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter26Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter27Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter27Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter28Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter28Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter29Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter29Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter30Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter30Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter31Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter31Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter32Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter32Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter33Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter33Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter34Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter34Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter35Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter35Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter36Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter36Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter37Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter37Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter38Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter38Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter39Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter39Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter40Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter40Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter41Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter41Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter42Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter42Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter43Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter43Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter44Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter44Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter45Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter45Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter46Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter46Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter47Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter47Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter48Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter48Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter49Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter49Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter50Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter50Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter51Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter51Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter52Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter52Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter53Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter53Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter54Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter54Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter55Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter55Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter56Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter56Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter57Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter57Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter58Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter58Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter59Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter59Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter60Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter60Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter61Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter61Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter62Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter62Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter63Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter63Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter64Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter64Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter65Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter65Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter66Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter66Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter67Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter67Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter68Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter68Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter69Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter69Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter70Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter70Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter71Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter71Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter72Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter72Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter73Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter73Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter74Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter74Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter75Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter75Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter76Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter76Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter77Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter77Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter78Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter78Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter79Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter79Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter80Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter80Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter81Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter81Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter82Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter82Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter83Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter83Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter84Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter84Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter85Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter85Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter86Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter86Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter87Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter87Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter88Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter88Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter89Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter89Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter90Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter90Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter91Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter91Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter92Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter92Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter93Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter93Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter94Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter94Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter95Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter95Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter96Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter96Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter97Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter97Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter98Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter98Value { get; set; }
-        /// <summary>
-        /// Parameter name
-        /// </summary>
-        public string Parameter99Name { get; set; }
-        /// <summary>
-        /// Parameter value
-        /// </summary>
-        public string Parameter99Value { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSiprecOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the Call the resource is associated with </param>
-        public CreateSiprecOptions(string pathCallSid)
-        {
-            PathCallSid = pathCallSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Name", Name));
-            }
-
-            if (ConnectorName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConnectorName", ConnectorName));
-            }
-
-            if (Track != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Track", Track.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (Parameter1Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter1.Name", Parameter1Name));
-            }
-
-            if (Parameter1Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter1.Value", Parameter1Value));
-            }
-
-            if (Parameter2Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter2.Name", Parameter2Name));
-            }
-
-            if (Parameter2Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter2.Value", Parameter2Value));
-            }
-
-            if (Parameter3Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter3.Name", Parameter3Name));
-            }
-
-            if (Parameter3Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter3.Value", Parameter3Value));
-            }
-
-            if (Parameter4Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter4.Name", Parameter4Name));
-            }
-
-            if (Parameter4Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter4.Value", Parameter4Value));
-            }
-
-            if (Parameter5Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter5.Name", Parameter5Name));
-            }
-
-            if (Parameter5Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter5.Value", Parameter5Value));
-            }
-
-            if (Parameter6Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter6.Name", Parameter6Name));
-            }
-
-            if (Parameter6Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter6.Value", Parameter6Value));
-            }
-
-            if (Parameter7Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter7.Name", Parameter7Name));
-            }
-
-            if (Parameter7Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter7.Value", Parameter7Value));
-            }
-
-            if (Parameter8Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter8.Name", Parameter8Name));
-            }
-
-            if (Parameter8Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter8.Value", Parameter8Value));
-            }
-
-            if (Parameter9Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter9.Name", Parameter9Name));
-            }
-
-            if (Parameter9Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter9.Value", Parameter9Value));
-            }
-
-            if (Parameter10Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter10.Name", Parameter10Name));
-            }
-
-            if (Parameter10Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter10.Value", Parameter10Value));
-            }
-
-            if (Parameter11Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter11.Name", Parameter11Name));
-            }
-
-            if (Parameter11Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter11.Value", Parameter11Value));
-            }
-
-            if (Parameter12Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter12.Name", Parameter12Name));
-            }
-
-            if (Parameter12Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter12.Value", Parameter12Value));
-            }
-
-            if (Parameter13Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter13.Name", Parameter13Name));
-            }
-
-            if (Parameter13Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter13.Value", Parameter13Value));
-            }
-
-            if (Parameter14Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter14.Name", Parameter14Name));
-            }
-
-            if (Parameter14Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter14.Value", Parameter14Value));
-            }
-
-            if (Parameter15Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter15.Name", Parameter15Name));
-            }
-
-            if (Parameter15Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter15.Value", Parameter15Value));
-            }
-
-            if (Parameter16Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter16.Name", Parameter16Name));
-            }
-
-            if (Parameter16Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter16.Value", Parameter16Value));
-            }
-
-            if (Parameter17Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter17.Name", Parameter17Name));
-            }
-
-            if (Parameter17Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter17.Value", Parameter17Value));
-            }
-
-            if (Parameter18Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter18.Name", Parameter18Name));
-            }
-
-            if (Parameter18Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter18.Value", Parameter18Value));
-            }
-
-            if (Parameter19Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter19.Name", Parameter19Name));
-            }
-
-            if (Parameter19Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter19.Value", Parameter19Value));
-            }
-
-            if (Parameter20Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter20.Name", Parameter20Name));
-            }
-
-            if (Parameter20Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter20.Value", Parameter20Value));
-            }
-
-            if (Parameter21Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter21.Name", Parameter21Name));
-            }
-
-            if (Parameter21Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter21.Value", Parameter21Value));
-            }
-
-            if (Parameter22Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter22.Name", Parameter22Name));
-            }
-
-            if (Parameter22Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter22.Value", Parameter22Value));
-            }
-
-            if (Parameter23Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter23.Name", Parameter23Name));
-            }
-
-            if (Parameter23Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter23.Value", Parameter23Value));
-            }
-
-            if (Parameter24Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter24.Name", Parameter24Name));
-            }
-
-            if (Parameter24Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter24.Value", Parameter24Value));
-            }
-
-            if (Parameter25Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter25.Name", Parameter25Name));
-            }
-
-            if (Parameter25Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter25.Value", Parameter25Value));
-            }
-
-            if (Parameter26Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter26.Name", Parameter26Name));
-            }
-
-            if (Parameter26Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter26.Value", Parameter26Value));
-            }
-
-            if (Parameter27Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter27.Name", Parameter27Name));
-            }
-
-            if (Parameter27Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter27.Value", Parameter27Value));
-            }
-
-            if (Parameter28Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter28.Name", Parameter28Name));
-            }
-
-            if (Parameter28Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter28.Value", Parameter28Value));
-            }
-
-            if (Parameter29Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter29.Name", Parameter29Name));
-            }
-
-            if (Parameter29Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter29.Value", Parameter29Value));
-            }
-
-            if (Parameter30Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter30.Name", Parameter30Name));
-            }
-
-            if (Parameter30Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter30.Value", Parameter30Value));
-            }
-
-            if (Parameter31Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter31.Name", Parameter31Name));
-            }
-
-            if (Parameter31Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter31.Value", Parameter31Value));
-            }
-
-            if (Parameter32Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter32.Name", Parameter32Name));
-            }
-
-            if (Parameter32Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter32.Value", Parameter32Value));
-            }
-
-            if (Parameter33Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter33.Name", Parameter33Name));
-            }
-
-            if (Parameter33Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter33.Value", Parameter33Value));
-            }
-
-            if (Parameter34Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter34.Name", Parameter34Name));
-            }
-
-            if (Parameter34Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter34.Value", Parameter34Value));
-            }
-
-            if (Parameter35Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter35.Name", Parameter35Name));
-            }
-
-            if (Parameter35Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter35.Value", Parameter35Value));
-            }
-
-            if (Parameter36Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter36.Name", Parameter36Name));
-            }
-
-            if (Parameter36Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter36.Value", Parameter36Value));
-            }
-
-            if (Parameter37Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter37.Name", Parameter37Name));
-            }
-
-            if (Parameter37Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter37.Value", Parameter37Value));
-            }
-
-            if (Parameter38Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter38.Name", Parameter38Name));
-            }
-
-            if (Parameter38Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter38.Value", Parameter38Value));
-            }
-
-            if (Parameter39Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter39.Name", Parameter39Name));
-            }
-
-            if (Parameter39Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter39.Value", Parameter39Value));
-            }
-
-            if (Parameter40Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter40.Name", Parameter40Name));
-            }
-
-            if (Parameter40Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter40.Value", Parameter40Value));
-            }
-
-            if (Parameter41Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter41.Name", Parameter41Name));
-            }
-
-            if (Parameter41Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter41.Value", Parameter41Value));
-            }
-
-            if (Parameter42Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter42.Name", Parameter42Name));
-            }
-
-            if (Parameter42Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter42.Value", Parameter42Value));
-            }
-
-            if (Parameter43Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter43.Name", Parameter43Name));
-            }
-
-            if (Parameter43Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter43.Value", Parameter43Value));
-            }
-
-            if (Parameter44Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter44.Name", Parameter44Name));
-            }
-
-            if (Parameter44Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter44.Value", Parameter44Value));
-            }
-
-            if (Parameter45Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter45.Name", Parameter45Name));
-            }
-
-            if (Parameter45Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter45.Value", Parameter45Value));
-            }
-
-            if (Parameter46Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter46.Name", Parameter46Name));
-            }
-
-            if (Parameter46Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter46.Value", Parameter46Value));
-            }
-
-            if (Parameter47Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter47.Name", Parameter47Name));
-            }
-
-            if (Parameter47Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter47.Value", Parameter47Value));
-            }
-
-            if (Parameter48Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter48.Name", Parameter48Name));
-            }
-
-            if (Parameter48Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter48.Value", Parameter48Value));
-            }
-
-            if (Parameter49Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter49.Name", Parameter49Name));
-            }
-
-            if (Parameter49Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter49.Value", Parameter49Value));
-            }
-
-            if (Parameter50Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter50.Name", Parameter50Name));
-            }
-
-            if (Parameter50Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter50.Value", Parameter50Value));
-            }
-
-            if (Parameter51Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter51.Name", Parameter51Name));
-            }
-
-            if (Parameter51Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter51.Value", Parameter51Value));
-            }
-
-            if (Parameter52Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter52.Name", Parameter52Name));
-            }
-
-            if (Parameter52Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter52.Value", Parameter52Value));
-            }
-
-            if (Parameter53Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter53.Name", Parameter53Name));
-            }
-
-            if (Parameter53Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter53.Value", Parameter53Value));
-            }
-
-            if (Parameter54Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter54.Name", Parameter54Name));
-            }
-
-            if (Parameter54Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter54.Value", Parameter54Value));
-            }
-
-            if (Parameter55Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter55.Name", Parameter55Name));
-            }
-
-            if (Parameter55Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter55.Value", Parameter55Value));
-            }
-
-            if (Parameter56Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter56.Name", Parameter56Name));
-            }
-
-            if (Parameter56Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter56.Value", Parameter56Value));
-            }
-
-            if (Parameter57Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter57.Name", Parameter57Name));
-            }
-
-            if (Parameter57Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter57.Value", Parameter57Value));
-            }
-
-            if (Parameter58Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter58.Name", Parameter58Name));
-            }
-
-            if (Parameter58Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter58.Value", Parameter58Value));
-            }
-
-            if (Parameter59Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter59.Name", Parameter59Name));
-            }
-
-            if (Parameter59Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter59.Value", Parameter59Value));
-            }
-
-            if (Parameter60Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter60.Name", Parameter60Name));
-            }
-
-            if (Parameter60Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter60.Value", Parameter60Value));
-            }
-
-            if (Parameter61Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter61.Name", Parameter61Name));
-            }
-
-            if (Parameter61Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter61.Value", Parameter61Value));
-            }
-
-            if (Parameter62Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter62.Name", Parameter62Name));
-            }
-
-            if (Parameter62Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter62.Value", Parameter62Value));
-            }
-
-            if (Parameter63Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter63.Name", Parameter63Name));
-            }
-
-            if (Parameter63Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter63.Value", Parameter63Value));
-            }
-
-            if (Parameter64Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter64.Name", Parameter64Name));
-            }
-
-            if (Parameter64Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter64.Value", Parameter64Value));
-            }
-
-            if (Parameter65Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter65.Name", Parameter65Name));
-            }
-
-            if (Parameter65Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter65.Value", Parameter65Value));
-            }
-
-            if (Parameter66Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter66.Name", Parameter66Name));
-            }
-
-            if (Parameter66Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter66.Value", Parameter66Value));
-            }
-
-            if (Parameter67Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter67.Name", Parameter67Name));
-            }
-
-            if (Parameter67Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter67.Value", Parameter67Value));
-            }
-
-            if (Parameter68Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter68.Name", Parameter68Name));
-            }
-
-            if (Parameter68Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter68.Value", Parameter68Value));
-            }
-
-            if (Parameter69Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter69.Name", Parameter69Name));
-            }
-
-            if (Parameter69Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter69.Value", Parameter69Value));
-            }
-
-            if (Parameter70Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter70.Name", Parameter70Name));
-            }
-
-            if (Parameter70Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter70.Value", Parameter70Value));
-            }
-
-            if (Parameter71Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter71.Name", Parameter71Name));
-            }
-
-            if (Parameter71Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter71.Value", Parameter71Value));
-            }
-
-            if (Parameter72Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter72.Name", Parameter72Name));
-            }
-
-            if (Parameter72Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter72.Value", Parameter72Value));
-            }
-
-            if (Parameter73Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter73.Name", Parameter73Name));
-            }
-
-            if (Parameter73Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter73.Value", Parameter73Value));
-            }
-
-            if (Parameter74Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter74.Name", Parameter74Name));
-            }
-
-            if (Parameter74Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter74.Value", Parameter74Value));
-            }
-
-            if (Parameter75Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter75.Name", Parameter75Name));
-            }
-
-            if (Parameter75Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter75.Value", Parameter75Value));
-            }
-
-            if (Parameter76Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter76.Name", Parameter76Name));
-            }
-
-            if (Parameter76Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter76.Value", Parameter76Value));
-            }
-
-            if (Parameter77Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter77.Name", Parameter77Name));
-            }
-
-            if (Parameter77Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter77.Value", Parameter77Value));
-            }
-
-            if (Parameter78Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter78.Name", Parameter78Name));
-            }
-
-            if (Parameter78Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter78.Value", Parameter78Value));
-            }
-
-            if (Parameter79Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter79.Name", Parameter79Name));
-            }
-
-            if (Parameter79Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter79.Value", Parameter79Value));
-            }
-
-            if (Parameter80Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter80.Name", Parameter80Name));
-            }
-
-            if (Parameter80Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter80.Value", Parameter80Value));
-            }
-
-            if (Parameter81Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter81.Name", Parameter81Name));
-            }
-
-            if (Parameter81Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter81.Value", Parameter81Value));
-            }
-
-            if (Parameter82Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter82.Name", Parameter82Name));
-            }
-
-            if (Parameter82Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter82.Value", Parameter82Value));
-            }
-
-            if (Parameter83Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter83.Name", Parameter83Name));
-            }
-
-            if (Parameter83Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter83.Value", Parameter83Value));
-            }
-
-            if (Parameter84Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter84.Name", Parameter84Name));
-            }
-
-            if (Parameter84Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter84.Value", Parameter84Value));
-            }
-
-            if (Parameter85Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter85.Name", Parameter85Name));
-            }
-
-            if (Parameter85Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter85.Value", Parameter85Value));
-            }
-
-            if (Parameter86Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter86.Name", Parameter86Name));
-            }
-
-            if (Parameter86Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter86.Value", Parameter86Value));
-            }
-
-            if (Parameter87Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter87.Name", Parameter87Name));
-            }
-
-            if (Parameter87Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter87.Value", Parameter87Value));
-            }
-
-            if (Parameter88Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter88.Name", Parameter88Name));
-            }
-
-            if (Parameter88Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter88.Value", Parameter88Value));
-            }
-
-            if (Parameter89Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter89.Name", Parameter89Name));
-            }
-
-            if (Parameter89Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter89.Value", Parameter89Value));
-            }
-
-            if (Parameter90Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter90.Name", Parameter90Name));
-            }
-
-            if (Parameter90Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter90.Value", Parameter90Value));
-            }
-
-            if (Parameter91Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter91.Name", Parameter91Name));
-            }
-
-            if (Parameter91Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter91.Value", Parameter91Value));
-            }
-
-            if (Parameter92Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter92.Name", Parameter92Name));
-            }
-
-            if (Parameter92Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter92.Value", Parameter92Value));
-            }
-
-            if (Parameter93Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter93.Name", Parameter93Name));
-            }
-
-            if (Parameter93Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter93.Value", Parameter93Value));
-            }
-
-            if (Parameter94Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter94.Name", Parameter94Name));
-            }
-
-            if (Parameter94Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter94.Value", Parameter94Value));
-            }
-
-            if (Parameter95Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter95.Name", Parameter95Name));
-            }
-
-            if (Parameter95Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter95.Value", Parameter95Value));
-            }
-
-            if (Parameter96Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter96.Name", Parameter96Name));
-            }
-
-            if (Parameter96Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter96.Value", Parameter96Value));
-            }
-
-            if (Parameter97Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter97.Name", Parameter97Name));
-            }
-
-            if (Parameter97Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter97.Value", Parameter97Value));
-            }
-
-            if (Parameter98Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter98.Name", Parameter98Name));
-            }
-
-            if (Parameter98Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter98.Value", Parameter98Value));
-            }
-
-            if (Parameter99Name != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter99.Name", Parameter99Name));
-            }
-
-            if (Parameter99Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameter99.Value", Parameter99Value));
-            }
-
-            return p;
-        }
-    }
-
+    /// Parameter name
+    /// </summary>
+    public string Parameter92Name { get; set; }
     /// <summary>
-    /// Stop a Siprec using either the SID of the Siprec resource or the `name` used when creating the resource
-    /// </summary>
-    public class UpdateSiprecOptions : IOptions<SiprecResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created this resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Call the resource is associated with
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The SID of the Siprec resource, or the `name`
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The status. Must have the value `stopped`
-        /// </summary>
-        public SiprecResource.UpdateStatusEnum Status { get; }
-
-        /// <summary>
-        /// Construct a new UpdateSiprecOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the Call the resource is associated with </param>
-        /// <param name="pathSid"> The SID of the Siprec resource, or the `name` </param>
-        /// <param name="status"> The status. Must have the value `stopped` </param>
-        public UpdateSiprecOptions(string pathCallSid, string pathSid, SiprecResource.UpdateStatusEnum status)
-        {
-            PathCallSid = pathCallSid;
-            PathSid = pathSid;
-            Status = status;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Parameter value
+    /// </summary>
+    public string Parameter92Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter93Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter93Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter94Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter94Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter95Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter95Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter96Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter96Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter97Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter97Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter98Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter98Value { get; set; }
+    /// <summary>
+    /// Parameter name
+    /// </summary>
+    public string Parameter99Name { get; set; }
+    /// <summary>
+    /// Parameter value
+    /// </summary>
+    public string Parameter99Value { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateSiprecOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the Call the resource is associated with </param>
+    public CreateSiprecOptions(string pathCallSid)
+    {
+      PathCallSid = pathCallSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Name", Name));
+      }
+
+      if (ConnectorName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConnectorName", ConnectorName));
+      }
+
+      if (Track != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Track", Track.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (Parameter1Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter1.Name", Parameter1Name));
+      }
+
+      if (Parameter1Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter1.Value", Parameter1Value));
+      }
+
+      if (Parameter2Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter2.Name", Parameter2Name));
+      }
+
+      if (Parameter2Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter2.Value", Parameter2Value));
+      }
+
+      if (Parameter3Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter3.Name", Parameter3Name));
+      }
+
+      if (Parameter3Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter3.Value", Parameter3Value));
+      }
+
+      if (Parameter4Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter4.Name", Parameter4Name));
+      }
+
+      if (Parameter4Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter4.Value", Parameter4Value));
+      }
+
+      if (Parameter5Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter5.Name", Parameter5Name));
+      }
+
+      if (Parameter5Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter5.Value", Parameter5Value));
+      }
+
+      if (Parameter6Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter6.Name", Parameter6Name));
+      }
+
+      if (Parameter6Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter6.Value", Parameter6Value));
+      }
+
+      if (Parameter7Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter7.Name", Parameter7Name));
+      }
+
+      if (Parameter7Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter7.Value", Parameter7Value));
+      }
+
+      if (Parameter8Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter8.Name", Parameter8Name));
+      }
+
+      if (Parameter8Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter8.Value", Parameter8Value));
+      }
+
+      if (Parameter9Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter9.Name", Parameter9Name));
+      }
+
+      if (Parameter9Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter9.Value", Parameter9Value));
+      }
+
+      if (Parameter10Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter10.Name", Parameter10Name));
+      }
+
+      if (Parameter10Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter10.Value", Parameter10Value));
+      }
+
+      if (Parameter11Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter11.Name", Parameter11Name));
+      }
+
+      if (Parameter11Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter11.Value", Parameter11Value));
+      }
+
+      if (Parameter12Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter12.Name", Parameter12Name));
+      }
+
+      if (Parameter12Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter12.Value", Parameter12Value));
+      }
+
+      if (Parameter13Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter13.Name", Parameter13Name));
+      }
+
+      if (Parameter13Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter13.Value", Parameter13Value));
+      }
+
+      if (Parameter14Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter14.Name", Parameter14Name));
+      }
+
+      if (Parameter14Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter14.Value", Parameter14Value));
+      }
+
+      if (Parameter15Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter15.Name", Parameter15Name));
+      }
+
+      if (Parameter15Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter15.Value", Parameter15Value));
+      }
+
+      if (Parameter16Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter16.Name", Parameter16Name));
+      }
+
+      if (Parameter16Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter16.Value", Parameter16Value));
+      }
+
+      if (Parameter17Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter17.Name", Parameter17Name));
+      }
+
+      if (Parameter17Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter17.Value", Parameter17Value));
+      }
+
+      if (Parameter18Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter18.Name", Parameter18Name));
+      }
+
+      if (Parameter18Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter18.Value", Parameter18Value));
+      }
+
+      if (Parameter19Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter19.Name", Parameter19Name));
+      }
+
+      if (Parameter19Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter19.Value", Parameter19Value));
+      }
+
+      if (Parameter20Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter20.Name", Parameter20Name));
+      }
+
+      if (Parameter20Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter20.Value", Parameter20Value));
+      }
+
+      if (Parameter21Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter21.Name", Parameter21Name));
+      }
+
+      if (Parameter21Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter21.Value", Parameter21Value));
+      }
+
+      if (Parameter22Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter22.Name", Parameter22Name));
+      }
+
+      if (Parameter22Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter22.Value", Parameter22Value));
+      }
+
+      if (Parameter23Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter23.Name", Parameter23Name));
+      }
+
+      if (Parameter23Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter23.Value", Parameter23Value));
+      }
+
+      if (Parameter24Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter24.Name", Parameter24Name));
+      }
+
+      if (Parameter24Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter24.Value", Parameter24Value));
+      }
+
+      if (Parameter25Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter25.Name", Parameter25Name));
+      }
+
+      if (Parameter25Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter25.Value", Parameter25Value));
+      }
+
+      if (Parameter26Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter26.Name", Parameter26Name));
+      }
+
+      if (Parameter26Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter26.Value", Parameter26Value));
+      }
+
+      if (Parameter27Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter27.Name", Parameter27Name));
+      }
+
+      if (Parameter27Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter27.Value", Parameter27Value));
+      }
+
+      if (Parameter28Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter28.Name", Parameter28Name));
+      }
+
+      if (Parameter28Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter28.Value", Parameter28Value));
+      }
+
+      if (Parameter29Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter29.Name", Parameter29Name));
+      }
+
+      if (Parameter29Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter29.Value", Parameter29Value));
+      }
+
+      if (Parameter30Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter30.Name", Parameter30Name));
+      }
+
+      if (Parameter30Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter30.Value", Parameter30Value));
+      }
+
+      if (Parameter31Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter31.Name", Parameter31Name));
+      }
+
+      if (Parameter31Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter31.Value", Parameter31Value));
+      }
+
+      if (Parameter32Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter32.Name", Parameter32Name));
+      }
+
+      if (Parameter32Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter32.Value", Parameter32Value));
+      }
+
+      if (Parameter33Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter33.Name", Parameter33Name));
+      }
+
+      if (Parameter33Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter33.Value", Parameter33Value));
+      }
+
+      if (Parameter34Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter34.Name", Parameter34Name));
+      }
+
+      if (Parameter34Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter34.Value", Parameter34Value));
+      }
+
+      if (Parameter35Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter35.Name", Parameter35Name));
+      }
+
+      if (Parameter35Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter35.Value", Parameter35Value));
+      }
+
+      if (Parameter36Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter36.Name", Parameter36Name));
+      }
+
+      if (Parameter36Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter36.Value", Parameter36Value));
+      }
+
+      if (Parameter37Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter37.Name", Parameter37Name));
+      }
+
+      if (Parameter37Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter37.Value", Parameter37Value));
+      }
+
+      if (Parameter38Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter38.Name", Parameter38Name));
+      }
+
+      if (Parameter38Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter38.Value", Parameter38Value));
+      }
+
+      if (Parameter39Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter39.Name", Parameter39Name));
+      }
+
+      if (Parameter39Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter39.Value", Parameter39Value));
+      }
+
+      if (Parameter40Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter40.Name", Parameter40Name));
+      }
+
+      if (Parameter40Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter40.Value", Parameter40Value));
+      }
+
+      if (Parameter41Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter41.Name", Parameter41Name));
+      }
+
+      if (Parameter41Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter41.Value", Parameter41Value));
+      }
+
+      if (Parameter42Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter42.Name", Parameter42Name));
+      }
+
+      if (Parameter42Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter42.Value", Parameter42Value));
+      }
+
+      if (Parameter43Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter43.Name", Parameter43Name));
+      }
+
+      if (Parameter43Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter43.Value", Parameter43Value));
+      }
+
+      if (Parameter44Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter44.Name", Parameter44Name));
+      }
+
+      if (Parameter44Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter44.Value", Parameter44Value));
+      }
+
+      if (Parameter45Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter45.Name", Parameter45Name));
+      }
+
+      if (Parameter45Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter45.Value", Parameter45Value));
+      }
+
+      if (Parameter46Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter46.Name", Parameter46Name));
+      }
+
+      if (Parameter46Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter46.Value", Parameter46Value));
+      }
+
+      if (Parameter47Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter47.Name", Parameter47Name));
+      }
+
+      if (Parameter47Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter47.Value", Parameter47Value));
+      }
+
+      if (Parameter48Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter48.Name", Parameter48Name));
+      }
+
+      if (Parameter48Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter48.Value", Parameter48Value));
+      }
+
+      if (Parameter49Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter49.Name", Parameter49Name));
+      }
+
+      if (Parameter49Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter49.Value", Parameter49Value));
+      }
+
+      if (Parameter50Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter50.Name", Parameter50Name));
+      }
+
+      if (Parameter50Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter50.Value", Parameter50Value));
+      }
+
+      if (Parameter51Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter51.Name", Parameter51Name));
+      }
+
+      if (Parameter51Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter51.Value", Parameter51Value));
+      }
+
+      if (Parameter52Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter52.Name", Parameter52Name));
+      }
+
+      if (Parameter52Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter52.Value", Parameter52Value));
+      }
+
+      if (Parameter53Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter53.Name", Parameter53Name));
+      }
+
+      if (Parameter53Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter53.Value", Parameter53Value));
+      }
+
+      if (Parameter54Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter54.Name", Parameter54Name));
+      }
+
+      if (Parameter54Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter54.Value", Parameter54Value));
+      }
+
+      if (Parameter55Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter55.Name", Parameter55Name));
+      }
+
+      if (Parameter55Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter55.Value", Parameter55Value));
+      }
+
+      if (Parameter56Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter56.Name", Parameter56Name));
+      }
+
+      if (Parameter56Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter56.Value", Parameter56Value));
+      }
+
+      if (Parameter57Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter57.Name", Parameter57Name));
+      }
+
+      if (Parameter57Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter57.Value", Parameter57Value));
+      }
+
+      if (Parameter58Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter58.Name", Parameter58Name));
+      }
+
+      if (Parameter58Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter58.Value", Parameter58Value));
+      }
+
+      if (Parameter59Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter59.Name", Parameter59Name));
+      }
+
+      if (Parameter59Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter59.Value", Parameter59Value));
+      }
+
+      if (Parameter60Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter60.Name", Parameter60Name));
+      }
+
+      if (Parameter60Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter60.Value", Parameter60Value));
+      }
+
+      if (Parameter61Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter61.Name", Parameter61Name));
+      }
+
+      if (Parameter61Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter61.Value", Parameter61Value));
+      }
+
+      if (Parameter62Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter62.Name", Parameter62Name));
+      }
+
+      if (Parameter62Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter62.Value", Parameter62Value));
+      }
+
+      if (Parameter63Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter63.Name", Parameter63Name));
+      }
+
+      if (Parameter63Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter63.Value", Parameter63Value));
+      }
+
+      if (Parameter64Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter64.Name", Parameter64Name));
+      }
+
+      if (Parameter64Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter64.Value", Parameter64Value));
+      }
+
+      if (Parameter65Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter65.Name", Parameter65Name));
+      }
+
+      if (Parameter65Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter65.Value", Parameter65Value));
+      }
+
+      if (Parameter66Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter66.Name", Parameter66Name));
+      }
+
+      if (Parameter66Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter66.Value", Parameter66Value));
+      }
+
+      if (Parameter67Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter67.Name", Parameter67Name));
+      }
+
+      if (Parameter67Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter67.Value", Parameter67Value));
+      }
+
+      if (Parameter68Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter68.Name", Parameter68Name));
+      }
+
+      if (Parameter68Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter68.Value", Parameter68Value));
+      }
+
+      if (Parameter69Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter69.Name", Parameter69Name));
+      }
+
+      if (Parameter69Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter69.Value", Parameter69Value));
+      }
+
+      if (Parameter70Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter70.Name", Parameter70Name));
+      }
+
+      if (Parameter70Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter70.Value", Parameter70Value));
+      }
+
+      if (Parameter71Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter71.Name", Parameter71Name));
+      }
+
+      if (Parameter71Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter71.Value", Parameter71Value));
+      }
+
+      if (Parameter72Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter72.Name", Parameter72Name));
+      }
+
+      if (Parameter72Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter72.Value", Parameter72Value));
+      }
+
+      if (Parameter73Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter73.Name", Parameter73Name));
+      }
+
+      if (Parameter73Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter73.Value", Parameter73Value));
+      }
+
+      if (Parameter74Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter74.Name", Parameter74Name));
+      }
+
+      if (Parameter74Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter74.Value", Parameter74Value));
+      }
+
+      if (Parameter75Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter75.Name", Parameter75Name));
+      }
+
+      if (Parameter75Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter75.Value", Parameter75Value));
+      }
+
+      if (Parameter76Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter76.Name", Parameter76Name));
+      }
+
+      if (Parameter76Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter76.Value", Parameter76Value));
+      }
+
+      if (Parameter77Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter77.Name", Parameter77Name));
+      }
+
+      if (Parameter77Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter77.Value", Parameter77Value));
+      }
+
+      if (Parameter78Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter78.Name", Parameter78Name));
+      }
+
+      if (Parameter78Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter78.Value", Parameter78Value));
+      }
+
+      if (Parameter79Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter79.Name", Parameter79Name));
+      }
+
+      if (Parameter79Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter79.Value", Parameter79Value));
+      }
+
+      if (Parameter80Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter80.Name", Parameter80Name));
+      }
+
+      if (Parameter80Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter80.Value", Parameter80Value));
+      }
+
+      if (Parameter81Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter81.Name", Parameter81Name));
+      }
+
+      if (Parameter81Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter81.Value", Parameter81Value));
+      }
+
+      if (Parameter82Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter82.Name", Parameter82Name));
+      }
+
+      if (Parameter82Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter82.Value", Parameter82Value));
+      }
+
+      if (Parameter83Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter83.Name", Parameter83Name));
+      }
+
+      if (Parameter83Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter83.Value", Parameter83Value));
+      }
+
+      if (Parameter84Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter84.Name", Parameter84Name));
+      }
+
+      if (Parameter84Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter84.Value", Parameter84Value));
+      }
+
+      if (Parameter85Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter85.Name", Parameter85Name));
+      }
+
+      if (Parameter85Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter85.Value", Parameter85Value));
+      }
+
+      if (Parameter86Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter86.Name", Parameter86Name));
+      }
+
+      if (Parameter86Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter86.Value", Parameter86Value));
+      }
+
+      if (Parameter87Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter87.Name", Parameter87Name));
+      }
+
+      if (Parameter87Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter87.Value", Parameter87Value));
+      }
+
+      if (Parameter88Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter88.Name", Parameter88Name));
+      }
+
+      if (Parameter88Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter88.Value", Parameter88Value));
+      }
+
+      if (Parameter89Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter89.Name", Parameter89Name));
+      }
+
+      if (Parameter89Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter89.Value", Parameter89Value));
+      }
+
+      if (Parameter90Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter90.Name", Parameter90Name));
+      }
+
+      if (Parameter90Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter90.Value", Parameter90Value));
+      }
+
+      if (Parameter91Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter91.Name", Parameter91Name));
+      }
+
+      if (Parameter91Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter91.Value", Parameter91Value));
+      }
+
+      if (Parameter92Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter92.Name", Parameter92Name));
+      }
+
+      if (Parameter92Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter92.Value", Parameter92Value));
+      }
+
+      if (Parameter93Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter93.Name", Parameter93Name));
+      }
+
+      if (Parameter93Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter93.Value", Parameter93Value));
+      }
+
+      if (Parameter94Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter94.Name", Parameter94Name));
+      }
+
+      if (Parameter94Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter94.Value", Parameter94Value));
+      }
+
+      if (Parameter95Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter95.Name", Parameter95Name));
+      }
+
+      if (Parameter95Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter95.Value", Parameter95Value));
+      }
+
+      if (Parameter96Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter96.Name", Parameter96Name));
+      }
+
+      if (Parameter96Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter96.Value", Parameter96Value));
+      }
+
+      if (Parameter97Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter97.Name", Parameter97Name));
+      }
+
+      if (Parameter97Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter97.Value", Parameter97Value));
+      }
+
+      if (Parameter98Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter98.Name", Parameter98Name));
+      }
+
+      if (Parameter98Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter98.Value", Parameter98Value));
+      }
+
+      if (Parameter99Name != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter99.Name", Parameter99Name));
+      }
+
+      if (Parameter99Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameter99.Value", Parameter99Value));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Stop a Siprec using either the SID of the Siprec resource or the `name` used when creating the resource
+  /// </summary>
+  public class UpdateSiprecOptions : IOptions<SiprecResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created this resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the Call the resource is associated with
+    /// </summary>
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The SID of the Siprec resource, or the `name`
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The status. Must have the value `stopped`
+    /// </summary>
+    public SiprecResource.UpdateStatusEnum Status { get; }
+
+    /// <summary>
+    /// Construct a new UpdateSiprecOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the Call the resource is associated with </param>
+    /// <param name="pathSid"> The SID of the Siprec resource, or the `name` </param>
+    /// <param name="status"> The status. Must have the value `stopped` </param>
+    public UpdateSiprecOptions(string pathCallSid, string pathSid, SiprecResource.UpdateStatusEnum status)
+    {
+      PathCallSid = pathCallSid;
+      PathSid = pathSid;
+      Status = status;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Call/SiprecResource.cs b/src/Twilio/Rest/Api/V2010/Account/Call/SiprecResource.cs
index fc78e6ddf..ec8c2af2c 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Call/SiprecResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Call/SiprecResource.cs
@@ -17,1067 +17,1067 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Call
-{
-
-    public class SiprecResource : Resource
-    {
-        public sealed class TrackEnum : StringEnum
-        {
-            private TrackEnum(string value) : base(value) {}
-            public TrackEnum() {}
-            public static implicit operator TrackEnum(string value)
-            {
-                return new TrackEnum(value);
-            }
-
-            public static readonly TrackEnum InboundTrack = new TrackEnum("inbound_track");
-            public static readonly TrackEnum OutboundTrack = new TrackEnum("outbound_track");
-            public static readonly TrackEnum BothTracks = new TrackEnum("both_tracks");
-        }
-
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
-            public static readonly StatusEnum Stopped = new StatusEnum("stopped");
-        }
-
-        public sealed class UpdateStatusEnum : StringEnum
-        {
-            private UpdateStatusEnum(string value) : base(value) {}
-            public UpdateStatusEnum() {}
-            public static implicit operator UpdateStatusEnum(string value)
-            {
-                return new UpdateStatusEnum(value);
-            }
-
-            public static readonly UpdateStatusEnum Stopped = new UpdateStatusEnum("stopped");
-        }
-
-        private static Request BuildCreateRequest(CreateSiprecOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Siprec.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a Siprec
-        /// </summary>
-        /// <param name="options"> Create Siprec parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Siprec </returns>
-        public static SiprecResource Create(CreateSiprecOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a Siprec
-        /// </summary>
-        /// <param name="options"> Create Siprec parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Siprec </returns>
-        public static async System.Threading.Tasks.Task<SiprecResource> CreateAsync(CreateSiprecOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a Siprec
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the Call the resource is associated with </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created this resource </param>
-        /// <param name="name"> The name of this resource </param>
-        /// <param name="connectorName"> Unique name used when configuring the connector via Marketplace Add-on. </param>
-        /// <param name="track"> One of `inbound_track`, `outbound_track`, `both_tracks`. </param>
-        /// <param name="statusCallback"> Absolute URL of the status callback. </param>
-        /// <param name="statusCallbackMethod"> The http method for the status_callback. </param>
-        /// <param name="parameter1Name"> Parameter name </param>
-        /// <param name="parameter1Value"> Parameter value </param>
-        /// <param name="parameter2Name"> Parameter name </param>
-        /// <param name="parameter2Value"> Parameter value </param>
-        /// <param name="parameter3Name"> Parameter name </param>
-        /// <param name="parameter3Value"> Parameter value </param>
-        /// <param name="parameter4Name"> Parameter name </param>
-        /// <param name="parameter4Value"> Parameter value </param>
-        /// <param name="parameter5Name"> Parameter name </param>
-        /// <param name="parameter5Value"> Parameter value </param>
-        /// <param name="parameter6Name"> Parameter name </param>
-        /// <param name="parameter6Value"> Parameter value </param>
-        /// <param name="parameter7Name"> Parameter name </param>
-        /// <param name="parameter7Value"> Parameter value </param>
-        /// <param name="parameter8Name"> Parameter name </param>
-        /// <param name="parameter8Value"> Parameter value </param>
-        /// <param name="parameter9Name"> Parameter name </param>
-        /// <param name="parameter9Value"> Parameter value </param>
-        /// <param name="parameter10Name"> Parameter name </param>
-        /// <param name="parameter10Value"> Parameter value </param>
-        /// <param name="parameter11Name"> Parameter name </param>
-        /// <param name="parameter11Value"> Parameter value </param>
-        /// <param name="parameter12Name"> Parameter name </param>
-        /// <param name="parameter12Value"> Parameter value </param>
-        /// <param name="parameter13Name"> Parameter name </param>
-        /// <param name="parameter13Value"> Parameter value </param>
-        /// <param name="parameter14Name"> Parameter name </param>
-        /// <param name="parameter14Value"> Parameter value </param>
-        /// <param name="parameter15Name"> Parameter name </param>
-        /// <param name="parameter15Value"> Parameter value </param>
-        /// <param name="parameter16Name"> Parameter name </param>
-        /// <param name="parameter16Value"> Parameter value </param>
-        /// <param name="parameter17Name"> Parameter name </param>
-        /// <param name="parameter17Value"> Parameter value </param>
-        /// <param name="parameter18Name"> Parameter name </param>
-        /// <param name="parameter18Value"> Parameter value </param>
-        /// <param name="parameter19Name"> Parameter name </param>
-        /// <param name="parameter19Value"> Parameter value </param>
-        /// <param name="parameter20Name"> Parameter name </param>
-        /// <param name="parameter20Value"> Parameter value </param>
-        /// <param name="parameter21Name"> Parameter name </param>
-        /// <param name="parameter21Value"> Parameter value </param>
-        /// <param name="parameter22Name"> Parameter name </param>
-        /// <param name="parameter22Value"> Parameter value </param>
-        /// <param name="parameter23Name"> Parameter name </param>
-        /// <param name="parameter23Value"> Parameter value </param>
-        /// <param name="parameter24Name"> Parameter name </param>
-        /// <param name="parameter24Value"> Parameter value </param>
-        /// <param name="parameter25Name"> Parameter name </param>
-        /// <param name="parameter25Value"> Parameter value </param>
-        /// <param name="parameter26Name"> Parameter name </param>
-        /// <param name="parameter26Value"> Parameter value </param>
-        /// <param name="parameter27Name"> Parameter name </param>
-        /// <param name="parameter27Value"> Parameter value </param>
-        /// <param name="parameter28Name"> Parameter name </param>
-        /// <param name="parameter28Value"> Parameter value </param>
-        /// <param name="parameter29Name"> Parameter name </param>
-        /// <param name="parameter29Value"> Parameter value </param>
-        /// <param name="parameter30Name"> Parameter name </param>
-        /// <param name="parameter30Value"> Parameter value </param>
-        /// <param name="parameter31Name"> Parameter name </param>
-        /// <param name="parameter31Value"> Parameter value </param>
-        /// <param name="parameter32Name"> Parameter name </param>
-        /// <param name="parameter32Value"> Parameter value </param>
-        /// <param name="parameter33Name"> Parameter name </param>
-        /// <param name="parameter33Value"> Parameter value </param>
-        /// <param name="parameter34Name"> Parameter name </param>
-        /// <param name="parameter34Value"> Parameter value </param>
-        /// <param name="parameter35Name"> Parameter name </param>
-        /// <param name="parameter35Value"> Parameter value </param>
-        /// <param name="parameter36Name"> Parameter name </param>
-        /// <param name="parameter36Value"> Parameter value </param>
-        /// <param name="parameter37Name"> Parameter name </param>
-        /// <param name="parameter37Value"> Parameter value </param>
-        /// <param name="parameter38Name"> Parameter name </param>
-        /// <param name="parameter38Value"> Parameter value </param>
-        /// <param name="parameter39Name"> Parameter name </param>
-        /// <param name="parameter39Value"> Parameter value </param>
-        /// <param name="parameter40Name"> Parameter name </param>
-        /// <param name="parameter40Value"> Parameter value </param>
-        /// <param name="parameter41Name"> Parameter name </param>
-        /// <param name="parameter41Value"> Parameter value </param>
-        /// <param name="parameter42Name"> Parameter name </param>
-        /// <param name="parameter42Value"> Parameter value </param>
-        /// <param name="parameter43Name"> Parameter name </param>
-        /// <param name="parameter43Value"> Parameter value </param>
-        /// <param name="parameter44Name"> Parameter name </param>
-        /// <param name="parameter44Value"> Parameter value </param>
-        /// <param name="parameter45Name"> Parameter name </param>
-        /// <param name="parameter45Value"> Parameter value </param>
-        /// <param name="parameter46Name"> Parameter name </param>
-        /// <param name="parameter46Value"> Parameter value </param>
-        /// <param name="parameter47Name"> Parameter name </param>
-        /// <param name="parameter47Value"> Parameter value </param>
-        /// <param name="parameter48Name"> Parameter name </param>
-        /// <param name="parameter48Value"> Parameter value </param>
-        /// <param name="parameter49Name"> Parameter name </param>
-        /// <param name="parameter49Value"> Parameter value </param>
-        /// <param name="parameter50Name"> Parameter name </param>
-        /// <param name="parameter50Value"> Parameter value </param>
-        /// <param name="parameter51Name"> Parameter name </param>
-        /// <param name="parameter51Value"> Parameter value </param>
-        /// <param name="parameter52Name"> Parameter name </param>
-        /// <param name="parameter52Value"> Parameter value </param>
-        /// <param name="parameter53Name"> Parameter name </param>
-        /// <param name="parameter53Value"> Parameter value </param>
-        /// <param name="parameter54Name"> Parameter name </param>
-        /// <param name="parameter54Value"> Parameter value </param>
-        /// <param name="parameter55Name"> Parameter name </param>
-        /// <param name="parameter55Value"> Parameter value </param>
-        /// <param name="parameter56Name"> Parameter name </param>
-        /// <param name="parameter56Value"> Parameter value </param>
-        /// <param name="parameter57Name"> Parameter name </param>
-        /// <param name="parameter57Value"> Parameter value </param>
-        /// <param name="parameter58Name"> Parameter name </param>
-        /// <param name="parameter58Value"> Parameter value </param>
-        /// <param name="parameter59Name"> Parameter name </param>
-        /// <param name="parameter59Value"> Parameter value </param>
-        /// <param name="parameter60Name"> Parameter name </param>
-        /// <param name="parameter60Value"> Parameter value </param>
-        /// <param name="parameter61Name"> Parameter name </param>
-        /// <param name="parameter61Value"> Parameter value </param>
-        /// <param name="parameter62Name"> Parameter name </param>
-        /// <param name="parameter62Value"> Parameter value </param>
-        /// <param name="parameter63Name"> Parameter name </param>
-        /// <param name="parameter63Value"> Parameter value </param>
-        /// <param name="parameter64Name"> Parameter name </param>
-        /// <param name="parameter64Value"> Parameter value </param>
-        /// <param name="parameter65Name"> Parameter name </param>
-        /// <param name="parameter65Value"> Parameter value </param>
-        /// <param name="parameter66Name"> Parameter name </param>
-        /// <param name="parameter66Value"> Parameter value </param>
-        /// <param name="parameter67Name"> Parameter name </param>
-        /// <param name="parameter67Value"> Parameter value </param>
-        /// <param name="parameter68Name"> Parameter name </param>
-        /// <param name="parameter68Value"> Parameter value </param>
-        /// <param name="parameter69Name"> Parameter name </param>
-        /// <param name="parameter69Value"> Parameter value </param>
-        /// <param name="parameter70Name"> Parameter name </param>
-        /// <param name="parameter70Value"> Parameter value </param>
-        /// <param name="parameter71Name"> Parameter name </param>
-        /// <param name="parameter71Value"> Parameter value </param>
-        /// <param name="parameter72Name"> Parameter name </param>
-        /// <param name="parameter72Value"> Parameter value </param>
-        /// <param name="parameter73Name"> Parameter name </param>
-        /// <param name="parameter73Value"> Parameter value </param>
-        /// <param name="parameter74Name"> Parameter name </param>
-        /// <param name="parameter74Value"> Parameter value </param>
-        /// <param name="parameter75Name"> Parameter name </param>
-        /// <param name="parameter75Value"> Parameter value </param>
-        /// <param name="parameter76Name"> Parameter name </param>
-        /// <param name="parameter76Value"> Parameter value </param>
-        /// <param name="parameter77Name"> Parameter name </param>
-        /// <param name="parameter77Value"> Parameter value </param>
-        /// <param name="parameter78Name"> Parameter name </param>
-        /// <param name="parameter78Value"> Parameter value </param>
-        /// <param name="parameter79Name"> Parameter name </param>
-        /// <param name="parameter79Value"> Parameter value </param>
-        /// <param name="parameter80Name"> Parameter name </param>
-        /// <param name="parameter80Value"> Parameter value </param>
-        /// <param name="parameter81Name"> Parameter name </param>
-        /// <param name="parameter81Value"> Parameter value </param>
-        /// <param name="parameter82Name"> Parameter name </param>
-        /// <param name="parameter82Value"> Parameter value </param>
-        /// <param name="parameter83Name"> Parameter name </param>
-        /// <param name="parameter83Value"> Parameter value </param>
-        /// <param name="parameter84Name"> Parameter name </param>
-        /// <param name="parameter84Value"> Parameter value </param>
-        /// <param name="parameter85Name"> Parameter name </param>
-        /// <param name="parameter85Value"> Parameter value </param>
-        /// <param name="parameter86Name"> Parameter name </param>
-        /// <param name="parameter86Value"> Parameter value </param>
-        /// <param name="parameter87Name"> Parameter name </param>
-        /// <param name="parameter87Value"> Parameter value </param>
-        /// <param name="parameter88Name"> Parameter name </param>
-        /// <param name="parameter88Value"> Parameter value </param>
-        /// <param name="parameter89Name"> Parameter name </param>
-        /// <param name="parameter89Value"> Parameter value </param>
-        /// <param name="parameter90Name"> Parameter name </param>
-        /// <param name="parameter90Value"> Parameter value </param>
-        /// <param name="parameter91Name"> Parameter name </param>
-        /// <param name="parameter91Value"> Parameter value </param>
-        /// <param name="parameter92Name"> Parameter name </param>
-        /// <param name="parameter92Value"> Parameter value </param>
-        /// <param name="parameter93Name"> Parameter name </param>
-        /// <param name="parameter93Value"> Parameter value </param>
-        /// <param name="parameter94Name"> Parameter name </param>
-        /// <param name="parameter94Value"> Parameter value </param>
-        /// <param name="parameter95Name"> Parameter name </param>
-        /// <param name="parameter95Value"> Parameter value </param>
-        /// <param name="parameter96Name"> Parameter name </param>
-        /// <param name="parameter96Value"> Parameter value </param>
-        /// <param name="parameter97Name"> Parameter name </param>
-        /// <param name="parameter97Value"> Parameter value </param>
-        /// <param name="parameter98Name"> Parameter name </param>
-        /// <param name="parameter98Value"> Parameter value </param>
-        /// <param name="parameter99Name"> Parameter name </param>
-        /// <param name="parameter99Value"> Parameter value </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Siprec </returns>
-        public static SiprecResource Create(string pathCallSid,
-                                            string pathAccountSid = null,
-                                            string name = null,
-                                            string connectorName = null,
-                                            SiprecResource.TrackEnum track = null,
-                                            Uri statusCallback = null,
-                                            Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                            string parameter1Name = null,
-                                            string parameter1Value = null,
-                                            string parameter2Name = null,
-                                            string parameter2Value = null,
-                                            string parameter3Name = null,
-                                            string parameter3Value = null,
-                                            string parameter4Name = null,
-                                            string parameter4Value = null,
-                                            string parameter5Name = null,
-                                            string parameter5Value = null,
-                                            string parameter6Name = null,
-                                            string parameter6Value = null,
-                                            string parameter7Name = null,
-                                            string parameter7Value = null,
-                                            string parameter8Name = null,
-                                            string parameter8Value = null,
-                                            string parameter9Name = null,
-                                            string parameter9Value = null,
-                                            string parameter10Name = null,
-                                            string parameter10Value = null,
-                                            string parameter11Name = null,
-                                            string parameter11Value = null,
-                                            string parameter12Name = null,
-                                            string parameter12Value = null,
-                                            string parameter13Name = null,
-                                            string parameter13Value = null,
-                                            string parameter14Name = null,
-                                            string parameter14Value = null,
-                                            string parameter15Name = null,
-                                            string parameter15Value = null,
-                                            string parameter16Name = null,
-                                            string parameter16Value = null,
-                                            string parameter17Name = null,
-                                            string parameter17Value = null,
-                                            string parameter18Name = null,
-                                            string parameter18Value = null,
-                                            string parameter19Name = null,
-                                            string parameter19Value = null,
-                                            string parameter20Name = null,
-                                            string parameter20Value = null,
-                                            string parameter21Name = null,
-                                            string parameter21Value = null,
-                                            string parameter22Name = null,
-                                            string parameter22Value = null,
-                                            string parameter23Name = null,
-                                            string parameter23Value = null,
-                                            string parameter24Name = null,
-                                            string parameter24Value = null,
-                                            string parameter25Name = null,
-                                            string parameter25Value = null,
-                                            string parameter26Name = null,
-                                            string parameter26Value = null,
-                                            string parameter27Name = null,
-                                            string parameter27Value = null,
-                                            string parameter28Name = null,
-                                            string parameter28Value = null,
-                                            string parameter29Name = null,
-                                            string parameter29Value = null,
-                                            string parameter30Name = null,
-                                            string parameter30Value = null,
-                                            string parameter31Name = null,
-                                            string parameter31Value = null,
-                                            string parameter32Name = null,
-                                            string parameter32Value = null,
-                                            string parameter33Name = null,
-                                            string parameter33Value = null,
-                                            string parameter34Name = null,
-                                            string parameter34Value = null,
-                                            string parameter35Name = null,
-                                            string parameter35Value = null,
-                                            string parameter36Name = null,
-                                            string parameter36Value = null,
-                                            string parameter37Name = null,
-                                            string parameter37Value = null,
-                                            string parameter38Name = null,
-                                            string parameter38Value = null,
-                                            string parameter39Name = null,
-                                            string parameter39Value = null,
-                                            string parameter40Name = null,
-                                            string parameter40Value = null,
-                                            string parameter41Name = null,
-                                            string parameter41Value = null,
-                                            string parameter42Name = null,
-                                            string parameter42Value = null,
-                                            string parameter43Name = null,
-                                            string parameter43Value = null,
-                                            string parameter44Name = null,
-                                            string parameter44Value = null,
-                                            string parameter45Name = null,
-                                            string parameter45Value = null,
-                                            string parameter46Name = null,
-                                            string parameter46Value = null,
-                                            string parameter47Name = null,
-                                            string parameter47Value = null,
-                                            string parameter48Name = null,
-                                            string parameter48Value = null,
-                                            string parameter49Name = null,
-                                            string parameter49Value = null,
-                                            string parameter50Name = null,
-                                            string parameter50Value = null,
-                                            string parameter51Name = null,
-                                            string parameter51Value = null,
-                                            string parameter52Name = null,
-                                            string parameter52Value = null,
-                                            string parameter53Name = null,
-                                            string parameter53Value = null,
-                                            string parameter54Name = null,
-                                            string parameter54Value = null,
-                                            string parameter55Name = null,
-                                            string parameter55Value = null,
-                                            string parameter56Name = null,
-                                            string parameter56Value = null,
-                                            string parameter57Name = null,
-                                            string parameter57Value = null,
-                                            string parameter58Name = null,
-                                            string parameter58Value = null,
-                                            string parameter59Name = null,
-                                            string parameter59Value = null,
-                                            string parameter60Name = null,
-                                            string parameter60Value = null,
-                                            string parameter61Name = null,
-                                            string parameter61Value = null,
-                                            string parameter62Name = null,
-                                            string parameter62Value = null,
-                                            string parameter63Name = null,
-                                            string parameter63Value = null,
-                                            string parameter64Name = null,
-                                            string parameter64Value = null,
-                                            string parameter65Name = null,
-                                            string parameter65Value = null,
-                                            string parameter66Name = null,
-                                            string parameter66Value = null,
-                                            string parameter67Name = null,
-                                            string parameter67Value = null,
-                                            string parameter68Name = null,
-                                            string parameter68Value = null,
-                                            string parameter69Name = null,
-                                            string parameter69Value = null,
-                                            string parameter70Name = null,
-                                            string parameter70Value = null,
-                                            string parameter71Name = null,
-                                            string parameter71Value = null,
-                                            string parameter72Name = null,
-                                            string parameter72Value = null,
-                                            string parameter73Name = null,
-                                            string parameter73Value = null,
-                                            string parameter74Name = null,
-                                            string parameter74Value = null,
-                                            string parameter75Name = null,
-                                            string parameter75Value = null,
-                                            string parameter76Name = null,
-                                            string parameter76Value = null,
-                                            string parameter77Name = null,
-                                            string parameter77Value = null,
-                                            string parameter78Name = null,
-                                            string parameter78Value = null,
-                                            string parameter79Name = null,
-                                            string parameter79Value = null,
-                                            string parameter80Name = null,
-                                            string parameter80Value = null,
-                                            string parameter81Name = null,
-                                            string parameter81Value = null,
-                                            string parameter82Name = null,
-                                            string parameter82Value = null,
-                                            string parameter83Name = null,
-                                            string parameter83Value = null,
-                                            string parameter84Name = null,
-                                            string parameter84Value = null,
-                                            string parameter85Name = null,
-                                            string parameter85Value = null,
-                                            string parameter86Name = null,
-                                            string parameter86Value = null,
-                                            string parameter87Name = null,
-                                            string parameter87Value = null,
-                                            string parameter88Name = null,
-                                            string parameter88Value = null,
-                                            string parameter89Name = null,
-                                            string parameter89Value = null,
-                                            string parameter90Name = null,
-                                            string parameter90Value = null,
-                                            string parameter91Name = null,
-                                            string parameter91Value = null,
-                                            string parameter92Name = null,
-                                            string parameter92Value = null,
-                                            string parameter93Name = null,
-                                            string parameter93Value = null,
-                                            string parameter94Name = null,
-                                            string parameter94Value = null,
-                                            string parameter95Name = null,
-                                            string parameter95Value = null,
-                                            string parameter96Name = null,
-                                            string parameter96Value = null,
-                                            string parameter97Name = null,
-                                            string parameter97Value = null,
-                                            string parameter98Name = null,
-                                            string parameter98Value = null,
-                                            string parameter99Name = null,
-                                            string parameter99Value = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateSiprecOptions(pathCallSid){PathAccountSid = pathAccountSid, Name = name, ConnectorName = connectorName, Track = track, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Parameter1Name = parameter1Name, Parameter1Value = parameter1Value, Parameter2Name = parameter2Name, Parameter2Value = parameter2Value, Parameter3Name = parameter3Name, Parameter3Value = parameter3Value, Parameter4Name = parameter4Name, Parameter4Value = parameter4Value, Parameter5Name = parameter5Name, Parameter5Value = parameter5Value, Parameter6Name = parameter6Name, Parameter6Value = parameter6Value, Parameter7Name = parameter7Name, Parameter7Value = parameter7Value, Parameter8Name = parameter8Name, Parameter8Value = parameter8Value, Parameter9Name = parameter9Name, Parameter9Value = parameter9Value, Parameter10Name = parameter10Name, Parameter10Value = parameter10Value, Parameter11Name = parameter11Name, Parameter11Value = parameter11Value, Parameter12Name = parameter12Name, Parameter12Value = parameter12Value, Parameter13Name = parameter13Name, Parameter13Value = parameter13Value, Parameter14Name = parameter14Name, Parameter14Value = parameter14Value, Parameter15Name = parameter15Name, Parameter15Value = parameter15Value, Parameter16Name = parameter16Name, Parameter16Value = parameter16Value, Parameter17Name = parameter17Name, Parameter17Value = parameter17Value, Parameter18Name = parameter18Name, Parameter18Value = parameter18Value, Parameter19Name = parameter19Name, Parameter19Value = parameter19Value, Parameter20Name = parameter20Name, Parameter20Value = parameter20Value, Parameter21Name = parameter21Name, Parameter21Value = parameter21Value, Parameter22Name = parameter22Name, Parameter22Value = parameter22Value, Parameter23Name = parameter23Name, Parameter23Value = parameter23Value, Parameter24Name = parameter24Name, Parameter24Value = parameter24Value, Parameter25Name = parameter25Name, Parameter25Value = parameter25Value, Parameter26Name = parameter26Name, Parameter26Value = parameter26Value, Parameter27Name = parameter27Name, Parameter27Value = parameter27Value, Parameter28Name = parameter28Name, Parameter28Value = parameter28Value, Parameter29Name = parameter29Name, Parameter29Value = parameter29Value, Parameter30Name = parameter30Name, Parameter30Value = parameter30Value, Parameter31Name = parameter31Name, Parameter31Value = parameter31Value, Parameter32Name = parameter32Name, Parameter32Value = parameter32Value, Parameter33Name = parameter33Name, Parameter33Value = parameter33Value, Parameter34Name = parameter34Name, Parameter34Value = parameter34Value, Parameter35Name = parameter35Name, Parameter35Value = parameter35Value, Parameter36Name = parameter36Name, Parameter36Value = parameter36Value, Parameter37Name = parameter37Name, Parameter37Value = parameter37Value, Parameter38Name = parameter38Name, Parameter38Value = parameter38Value, Parameter39Name = parameter39Name, Parameter39Value = parameter39Value, Parameter40Name = parameter40Name, Parameter40Value = parameter40Value, Parameter41Name = parameter41Name, Parameter41Value = parameter41Value, Parameter42Name = parameter42Name, Parameter42Value = parameter42Value, Parameter43Name = parameter43Name, Parameter43Value = parameter43Value, Parameter44Name = parameter44Name, Parameter44Value = parameter44Value, Parameter45Name = parameter45Name, Parameter45Value = parameter45Value, Parameter46Name = parameter46Name, Parameter46Value = parameter46Value, Parameter47Name = parameter47Name, Parameter47Value = parameter47Value, Parameter48Name = parameter48Name, Parameter48Value = parameter48Value, Parameter49Name = parameter49Name, Parameter49Value = parameter49Value, Parameter50Name = parameter50Name, Parameter50Value = parameter50Value, Parameter51Name = parameter51Name, Parameter51Value = parameter51Value, Parameter52Name = parameter52Name, Parameter52Value = parameter52Value, Parameter53Name = parameter53Name, Parameter53Value = parameter53Value, Parameter54Name = parameter54Name, Parameter54Value = parameter54Value, Parameter55Name = parameter55Name, Parameter55Value = parameter55Value, Parameter56Name = parameter56Name, Parameter56Value = parameter56Value, Parameter57Name = parameter57Name, Parameter57Value = parameter57Value, Parameter58Name = parameter58Name, Parameter58Value = parameter58Value, Parameter59Name = parameter59Name, Parameter59Value = parameter59Value, Parameter60Name = parameter60Name, Parameter60Value = parameter60Value, Parameter61Name = parameter61Name, Parameter61Value = parameter61Value, Parameter62Name = parameter62Name, Parameter62Value = parameter62Value, Parameter63Name = parameter63Name, Parameter63Value = parameter63Value, Parameter64Name = parameter64Name, Parameter64Value = parameter64Value, Parameter65Name = parameter65Name, Parameter65Value = parameter65Value, Parameter66Name = parameter66Name, Parameter66Value = parameter66Value, Parameter67Name = parameter67Name, Parameter67Value = parameter67Value, Parameter68Name = parameter68Name, Parameter68Value = parameter68Value, Parameter69Name = parameter69Name, Parameter69Value = parameter69Value, Parameter70Name = parameter70Name, Parameter70Value = parameter70Value, Parameter71Name = parameter71Name, Parameter71Value = parameter71Value, Parameter72Name = parameter72Name, Parameter72Value = parameter72Value, Parameter73Name = parameter73Name, Parameter73Value = parameter73Value, Parameter74Name = parameter74Name, Parameter74Value = parameter74Value, Parameter75Name = parameter75Name, Parameter75Value = parameter75Value, Parameter76Name = parameter76Name, Parameter76Value = parameter76Value, Parameter77Name = parameter77Name, Parameter77Value = parameter77Value, Parameter78Name = parameter78Name, Parameter78Value = parameter78Value, Parameter79Name = parameter79Name, Parameter79Value = parameter79Value, Parameter80Name = parameter80Name, Parameter80Value = parameter80Value, Parameter81Name = parameter81Name, Parameter81Value = parameter81Value, Parameter82Name = parameter82Name, Parameter82Value = parameter82Value, Parameter83Name = parameter83Name, Parameter83Value = parameter83Value, Parameter84Name = parameter84Name, Parameter84Value = parameter84Value, Parameter85Name = parameter85Name, Parameter85Value = parameter85Value, Parameter86Name = parameter86Name, Parameter86Value = parameter86Value, Parameter87Name = parameter87Name, Parameter87Value = parameter87Value, Parameter88Name = parameter88Name, Parameter88Value = parameter88Value, Parameter89Name = parameter89Name, Parameter89Value = parameter89Value, Parameter90Name = parameter90Name, Parameter90Value = parameter90Value, Parameter91Name = parameter91Name, Parameter91Value = parameter91Value, Parameter92Name = parameter92Name, Parameter92Value = parameter92Value, Parameter93Name = parameter93Name, Parameter93Value = parameter93Value, Parameter94Name = parameter94Name, Parameter94Value = parameter94Value, Parameter95Name = parameter95Name, Parameter95Value = parameter95Value, Parameter96Name = parameter96Name, Parameter96Value = parameter96Value, Parameter97Name = parameter97Name, Parameter97Value = parameter97Value, Parameter98Name = parameter98Name, Parameter98Value = parameter98Value, Parameter99Name = parameter99Name, Parameter99Value = parameter99Value};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a Siprec
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the Call the resource is associated with </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created this resource </param>
-        /// <param name="name"> The name of this resource </param>
-        /// <param name="connectorName"> Unique name used when configuring the connector via Marketplace Add-on. </param>
-        /// <param name="track"> One of `inbound_track`, `outbound_track`, `both_tracks`. </param>
-        /// <param name="statusCallback"> Absolute URL of the status callback. </param>
-        /// <param name="statusCallbackMethod"> The http method for the status_callback. </param>
-        /// <param name="parameter1Name"> Parameter name </param>
-        /// <param name="parameter1Value"> Parameter value </param>
-        /// <param name="parameter2Name"> Parameter name </param>
-        /// <param name="parameter2Value"> Parameter value </param>
-        /// <param name="parameter3Name"> Parameter name </param>
-        /// <param name="parameter3Value"> Parameter value </param>
-        /// <param name="parameter4Name"> Parameter name </param>
-        /// <param name="parameter4Value"> Parameter value </param>
-        /// <param name="parameter5Name"> Parameter name </param>
-        /// <param name="parameter5Value"> Parameter value </param>
-        /// <param name="parameter6Name"> Parameter name </param>
-        /// <param name="parameter6Value"> Parameter value </param>
-        /// <param name="parameter7Name"> Parameter name </param>
-        /// <param name="parameter7Value"> Parameter value </param>
-        /// <param name="parameter8Name"> Parameter name </param>
-        /// <param name="parameter8Value"> Parameter value </param>
-        /// <param name="parameter9Name"> Parameter name </param>
-        /// <param name="parameter9Value"> Parameter value </param>
-        /// <param name="parameter10Name"> Parameter name </param>
-        /// <param name="parameter10Value"> Parameter value </param>
-        /// <param name="parameter11Name"> Parameter name </param>
-        /// <param name="parameter11Value"> Parameter value </param>
-        /// <param name="parameter12Name"> Parameter name </param>
-        /// <param name="parameter12Value"> Parameter value </param>
-        /// <param name="parameter13Name"> Parameter name </param>
-        /// <param name="parameter13Value"> Parameter value </param>
-        /// <param name="parameter14Name"> Parameter name </param>
-        /// <param name="parameter14Value"> Parameter value </param>
-        /// <param name="parameter15Name"> Parameter name </param>
-        /// <param name="parameter15Value"> Parameter value </param>
-        /// <param name="parameter16Name"> Parameter name </param>
-        /// <param name="parameter16Value"> Parameter value </param>
-        /// <param name="parameter17Name"> Parameter name </param>
-        /// <param name="parameter17Value"> Parameter value </param>
-        /// <param name="parameter18Name"> Parameter name </param>
-        /// <param name="parameter18Value"> Parameter value </param>
-        /// <param name="parameter19Name"> Parameter name </param>
-        /// <param name="parameter19Value"> Parameter value </param>
-        /// <param name="parameter20Name"> Parameter name </param>
-        /// <param name="parameter20Value"> Parameter value </param>
-        /// <param name="parameter21Name"> Parameter name </param>
-        /// <param name="parameter21Value"> Parameter value </param>
-        /// <param name="parameter22Name"> Parameter name </param>
-        /// <param name="parameter22Value"> Parameter value </param>
-        /// <param name="parameter23Name"> Parameter name </param>
-        /// <param name="parameter23Value"> Parameter value </param>
-        /// <param name="parameter24Name"> Parameter name </param>
-        /// <param name="parameter24Value"> Parameter value </param>
-        /// <param name="parameter25Name"> Parameter name </param>
-        /// <param name="parameter25Value"> Parameter value </param>
-        /// <param name="parameter26Name"> Parameter name </param>
-        /// <param name="parameter26Value"> Parameter value </param>
-        /// <param name="parameter27Name"> Parameter name </param>
-        /// <param name="parameter27Value"> Parameter value </param>
-        /// <param name="parameter28Name"> Parameter name </param>
-        /// <param name="parameter28Value"> Parameter value </param>
-        /// <param name="parameter29Name"> Parameter name </param>
-        /// <param name="parameter29Value"> Parameter value </param>
-        /// <param name="parameter30Name"> Parameter name </param>
-        /// <param name="parameter30Value"> Parameter value </param>
-        /// <param name="parameter31Name"> Parameter name </param>
-        /// <param name="parameter31Value"> Parameter value </param>
-        /// <param name="parameter32Name"> Parameter name </param>
-        /// <param name="parameter32Value"> Parameter value </param>
-        /// <param name="parameter33Name"> Parameter name </param>
-        /// <param name="parameter33Value"> Parameter value </param>
-        /// <param name="parameter34Name"> Parameter name </param>
-        /// <param name="parameter34Value"> Parameter value </param>
-        /// <param name="parameter35Name"> Parameter name </param>
-        /// <param name="parameter35Value"> Parameter value </param>
-        /// <param name="parameter36Name"> Parameter name </param>
-        /// <param name="parameter36Value"> Parameter value </param>
-        /// <param name="parameter37Name"> Parameter name </param>
-        /// <param name="parameter37Value"> Parameter value </param>
-        /// <param name="parameter38Name"> Parameter name </param>
-        /// <param name="parameter38Value"> Parameter value </param>
-        /// <param name="parameter39Name"> Parameter name </param>
-        /// <param name="parameter39Value"> Parameter value </param>
-        /// <param name="parameter40Name"> Parameter name </param>
-        /// <param name="parameter40Value"> Parameter value </param>
-        /// <param name="parameter41Name"> Parameter name </param>
-        /// <param name="parameter41Value"> Parameter value </param>
-        /// <param name="parameter42Name"> Parameter name </param>
-        /// <param name="parameter42Value"> Parameter value </param>
-        /// <param name="parameter43Name"> Parameter name </param>
-        /// <param name="parameter43Value"> Parameter value </param>
-        /// <param name="parameter44Name"> Parameter name </param>
-        /// <param name="parameter44Value"> Parameter value </param>
-        /// <param name="parameter45Name"> Parameter name </param>
-        /// <param name="parameter45Value"> Parameter value </param>
-        /// <param name="parameter46Name"> Parameter name </param>
-        /// <param name="parameter46Value"> Parameter value </param>
-        /// <param name="parameter47Name"> Parameter name </param>
-        /// <param name="parameter47Value"> Parameter value </param>
-        /// <param name="parameter48Name"> Parameter name </param>
-        /// <param name="parameter48Value"> Parameter value </param>
-        /// <param name="parameter49Name"> Parameter name </param>
-        /// <param name="parameter49Value"> Parameter value </param>
-        /// <param name="parameter50Name"> Parameter name </param>
-        /// <param name="parameter50Value"> Parameter value </param>
-        /// <param name="parameter51Name"> Parameter name </param>
-        /// <param name="parameter51Value"> Parameter value </param>
-        /// <param name="parameter52Name"> Parameter name </param>
-        /// <param name="parameter52Value"> Parameter value </param>
-        /// <param name="parameter53Name"> Parameter name </param>
-        /// <param name="parameter53Value"> Parameter value </param>
-        /// <param name="parameter54Name"> Parameter name </param>
-        /// <param name="parameter54Value"> Parameter value </param>
-        /// <param name="parameter55Name"> Parameter name </param>
-        /// <param name="parameter55Value"> Parameter value </param>
-        /// <param name="parameter56Name"> Parameter name </param>
-        /// <param name="parameter56Value"> Parameter value </param>
-        /// <param name="parameter57Name"> Parameter name </param>
-        /// <param name="parameter57Value"> Parameter value </param>
-        /// <param name="parameter58Name"> Parameter name </param>
-        /// <param name="parameter58Value"> Parameter value </param>
-        /// <param name="parameter59Name"> Parameter name </param>
-        /// <param name="parameter59Value"> Parameter value </param>
-        /// <param name="parameter60Name"> Parameter name </param>
-        /// <param name="parameter60Value"> Parameter value </param>
-        /// <param name="parameter61Name"> Parameter name </param>
-        /// <param name="parameter61Value"> Parameter value </param>
-        /// <param name="parameter62Name"> Parameter name </param>
-        /// <param name="parameter62Value"> Parameter value </param>
-        /// <param name="parameter63Name"> Parameter name </param>
-        /// <param name="parameter63Value"> Parameter value </param>
-        /// <param name="parameter64Name"> Parameter name </param>
-        /// <param name="parameter64Value"> Parameter value </param>
-        /// <param name="parameter65Name"> Parameter name </param>
-        /// <param name="parameter65Value"> Parameter value </param>
-        /// <param name="parameter66Name"> Parameter name </param>
-        /// <param name="parameter66Value"> Parameter value </param>
-        /// <param name="parameter67Name"> Parameter name </param>
-        /// <param name="parameter67Value"> Parameter value </param>
-        /// <param name="parameter68Name"> Parameter name </param>
-        /// <param name="parameter68Value"> Parameter value </param>
-        /// <param name="parameter69Name"> Parameter name </param>
-        /// <param name="parameter69Value"> Parameter value </param>
-        /// <param name="parameter70Name"> Parameter name </param>
-        /// <param name="parameter70Value"> Parameter value </param>
-        /// <param name="parameter71Name"> Parameter name </param>
-        /// <param name="parameter71Value"> Parameter value </param>
-        /// <param name="parameter72Name"> Parameter name </param>
-        /// <param name="parameter72Value"> Parameter value </param>
-        /// <param name="parameter73Name"> Parameter name </param>
-        /// <param name="parameter73Value"> Parameter value </param>
-        /// <param name="parameter74Name"> Parameter name </param>
-        /// <param name="parameter74Value"> Parameter value </param>
-        /// <param name="parameter75Name"> Parameter name </param>
-        /// <param name="parameter75Value"> Parameter value </param>
-        /// <param name="parameter76Name"> Parameter name </param>
-        /// <param name="parameter76Value"> Parameter value </param>
-        /// <param name="parameter77Name"> Parameter name </param>
-        /// <param name="parameter77Value"> Parameter value </param>
-        /// <param name="parameter78Name"> Parameter name </param>
-        /// <param name="parameter78Value"> Parameter value </param>
-        /// <param name="parameter79Name"> Parameter name </param>
-        /// <param name="parameter79Value"> Parameter value </param>
-        /// <param name="parameter80Name"> Parameter name </param>
-        /// <param name="parameter80Value"> Parameter value </param>
-        /// <param name="parameter81Name"> Parameter name </param>
-        /// <param name="parameter81Value"> Parameter value </param>
-        /// <param name="parameter82Name"> Parameter name </param>
-        /// <param name="parameter82Value"> Parameter value </param>
-        /// <param name="parameter83Name"> Parameter name </param>
-        /// <param name="parameter83Value"> Parameter value </param>
-        /// <param name="parameter84Name"> Parameter name </param>
-        /// <param name="parameter84Value"> Parameter value </param>
-        /// <param name="parameter85Name"> Parameter name </param>
-        /// <param name="parameter85Value"> Parameter value </param>
-        /// <param name="parameter86Name"> Parameter name </param>
-        /// <param name="parameter86Value"> Parameter value </param>
-        /// <param name="parameter87Name"> Parameter name </param>
-        /// <param name="parameter87Value"> Parameter value </param>
-        /// <param name="parameter88Name"> Parameter name </param>
-        /// <param name="parameter88Value"> Parameter value </param>
-        /// <param name="parameter89Name"> Parameter name </param>
-        /// <param name="parameter89Value"> Parameter value </param>
-        /// <param name="parameter90Name"> Parameter name </param>
-        /// <param name="parameter90Value"> Parameter value </param>
-        /// <param name="parameter91Name"> Parameter name </param>
-        /// <param name="parameter91Value"> Parameter value </param>
-        /// <param name="parameter92Name"> Parameter name </param>
-        /// <param name="parameter92Value"> Parameter value </param>
-        /// <param name="parameter93Name"> Parameter name </param>
-        /// <param name="parameter93Value"> Parameter value </param>
-        /// <param name="parameter94Name"> Parameter name </param>
-        /// <param name="parameter94Value"> Parameter value </param>
-        /// <param name="parameter95Name"> Parameter name </param>
-        /// <param name="parameter95Value"> Parameter value </param>
-        /// <param name="parameter96Name"> Parameter name </param>
-        /// <param name="parameter96Value"> Parameter value </param>
-        /// <param name="parameter97Name"> Parameter name </param>
-        /// <param name="parameter97Value"> Parameter value </param>
-        /// <param name="parameter98Name"> Parameter name </param>
-        /// <param name="parameter98Value"> Parameter value </param>
-        /// <param name="parameter99Name"> Parameter name </param>
-        /// <param name="parameter99Value"> Parameter value </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Siprec </returns>
-        public static async System.Threading.Tasks.Task<SiprecResource> CreateAsync(string pathCallSid,
-                                                                                    string pathAccountSid = null,
-                                                                                    string name = null,
-                                                                                    string connectorName = null,
-                                                                                    SiprecResource.TrackEnum track = null,
-                                                                                    Uri statusCallback = null,
-                                                                                    Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                    string parameter1Name = null,
-                                                                                    string parameter1Value = null,
-                                                                                    string parameter2Name = null,
-                                                                                    string parameter2Value = null,
-                                                                                    string parameter3Name = null,
-                                                                                    string parameter3Value = null,
-                                                                                    string parameter4Name = null,
-                                                                                    string parameter4Value = null,
-                                                                                    string parameter5Name = null,
-                                                                                    string parameter5Value = null,
-                                                                                    string parameter6Name = null,
-                                                                                    string parameter6Value = null,
-                                                                                    string parameter7Name = null,
-                                                                                    string parameter7Value = null,
-                                                                                    string parameter8Name = null,
-                                                                                    string parameter8Value = null,
-                                                                                    string parameter9Name = null,
-                                                                                    string parameter9Value = null,
-                                                                                    string parameter10Name = null,
-                                                                                    string parameter10Value = null,
-                                                                                    string parameter11Name = null,
-                                                                                    string parameter11Value = null,
-                                                                                    string parameter12Name = null,
-                                                                                    string parameter12Value = null,
-                                                                                    string parameter13Name = null,
-                                                                                    string parameter13Value = null,
-                                                                                    string parameter14Name = null,
-                                                                                    string parameter14Value = null,
-                                                                                    string parameter15Name = null,
-                                                                                    string parameter15Value = null,
-                                                                                    string parameter16Name = null,
-                                                                                    string parameter16Value = null,
-                                                                                    string parameter17Name = null,
-                                                                                    string parameter17Value = null,
-                                                                                    string parameter18Name = null,
-                                                                                    string parameter18Value = null,
-                                                                                    string parameter19Name = null,
-                                                                                    string parameter19Value = null,
-                                                                                    string parameter20Name = null,
-                                                                                    string parameter20Value = null,
-                                                                                    string parameter21Name = null,
-                                                                                    string parameter21Value = null,
-                                                                                    string parameter22Name = null,
-                                                                                    string parameter22Value = null,
-                                                                                    string parameter23Name = null,
-                                                                                    string parameter23Value = null,
-                                                                                    string parameter24Name = null,
-                                                                                    string parameter24Value = null,
-                                                                                    string parameter25Name = null,
-                                                                                    string parameter25Value = null,
-                                                                                    string parameter26Name = null,
-                                                                                    string parameter26Value = null,
-                                                                                    string parameter27Name = null,
-                                                                                    string parameter27Value = null,
-                                                                                    string parameter28Name = null,
-                                                                                    string parameter28Value = null,
-                                                                                    string parameter29Name = null,
-                                                                                    string parameter29Value = null,
-                                                                                    string parameter30Name = null,
-                                                                                    string parameter30Value = null,
-                                                                                    string parameter31Name = null,
-                                                                                    string parameter31Value = null,
-                                                                                    string parameter32Name = null,
-                                                                                    string parameter32Value = null,
-                                                                                    string parameter33Name = null,
-                                                                                    string parameter33Value = null,
-                                                                                    string parameter34Name = null,
-                                                                                    string parameter34Value = null,
-                                                                                    string parameter35Name = null,
-                                                                                    string parameter35Value = null,
-                                                                                    string parameter36Name = null,
-                                                                                    string parameter36Value = null,
-                                                                                    string parameter37Name = null,
-                                                                                    string parameter37Value = null,
-                                                                                    string parameter38Name = null,
-                                                                                    string parameter38Value = null,
-                                                                                    string parameter39Name = null,
-                                                                                    string parameter39Value = null,
-                                                                                    string parameter40Name = null,
-                                                                                    string parameter40Value = null,
-                                                                                    string parameter41Name = null,
-                                                                                    string parameter41Value = null,
-                                                                                    string parameter42Name = null,
-                                                                                    string parameter42Value = null,
-                                                                                    string parameter43Name = null,
-                                                                                    string parameter43Value = null,
-                                                                                    string parameter44Name = null,
-                                                                                    string parameter44Value = null,
-                                                                                    string parameter45Name = null,
-                                                                                    string parameter45Value = null,
-                                                                                    string parameter46Name = null,
-                                                                                    string parameter46Value = null,
-                                                                                    string parameter47Name = null,
-                                                                                    string parameter47Value = null,
-                                                                                    string parameter48Name = null,
-                                                                                    string parameter48Value = null,
-                                                                                    string parameter49Name = null,
-                                                                                    string parameter49Value = null,
-                                                                                    string parameter50Name = null,
-                                                                                    string parameter50Value = null,
-                                                                                    string parameter51Name = null,
-                                                                                    string parameter51Value = null,
-                                                                                    string parameter52Name = null,
-                                                                                    string parameter52Value = null,
-                                                                                    string parameter53Name = null,
-                                                                                    string parameter53Value = null,
-                                                                                    string parameter54Name = null,
-                                                                                    string parameter54Value = null,
-                                                                                    string parameter55Name = null,
-                                                                                    string parameter55Value = null,
-                                                                                    string parameter56Name = null,
-                                                                                    string parameter56Value = null,
-                                                                                    string parameter57Name = null,
-                                                                                    string parameter57Value = null,
-                                                                                    string parameter58Name = null,
-                                                                                    string parameter58Value = null,
-                                                                                    string parameter59Name = null,
-                                                                                    string parameter59Value = null,
-                                                                                    string parameter60Name = null,
-                                                                                    string parameter60Value = null,
-                                                                                    string parameter61Name = null,
-                                                                                    string parameter61Value = null,
-                                                                                    string parameter62Name = null,
-                                                                                    string parameter62Value = null,
-                                                                                    string parameter63Name = null,
-                                                                                    string parameter63Value = null,
-                                                                                    string parameter64Name = null,
-                                                                                    string parameter64Value = null,
-                                                                                    string parameter65Name = null,
-                                                                                    string parameter65Value = null,
-                                                                                    string parameter66Name = null,
-                                                                                    string parameter66Value = null,
-                                                                                    string parameter67Name = null,
-                                                                                    string parameter67Value = null,
-                                                                                    string parameter68Name = null,
-                                                                                    string parameter68Value = null,
-                                                                                    string parameter69Name = null,
-                                                                                    string parameter69Value = null,
-                                                                                    string parameter70Name = null,
-                                                                                    string parameter70Value = null,
-                                                                                    string parameter71Name = null,
-                                                                                    string parameter71Value = null,
-                                                                                    string parameter72Name = null,
-                                                                                    string parameter72Value = null,
-                                                                                    string parameter73Name = null,
-                                                                                    string parameter73Value = null,
-                                                                                    string parameter74Name = null,
-                                                                                    string parameter74Value = null,
-                                                                                    string parameter75Name = null,
-                                                                                    string parameter75Value = null,
-                                                                                    string parameter76Name = null,
-                                                                                    string parameter76Value = null,
-                                                                                    string parameter77Name = null,
-                                                                                    string parameter77Value = null,
-                                                                                    string parameter78Name = null,
-                                                                                    string parameter78Value = null,
-                                                                                    string parameter79Name = null,
-                                                                                    string parameter79Value = null,
-                                                                                    string parameter80Name = null,
-                                                                                    string parameter80Value = null,
-                                                                                    string parameter81Name = null,
-                                                                                    string parameter81Value = null,
-                                                                                    string parameter82Name = null,
-                                                                                    string parameter82Value = null,
-                                                                                    string parameter83Name = null,
-                                                                                    string parameter83Value = null,
-                                                                                    string parameter84Name = null,
-                                                                                    string parameter84Value = null,
-                                                                                    string parameter85Name = null,
-                                                                                    string parameter85Value = null,
-                                                                                    string parameter86Name = null,
-                                                                                    string parameter86Value = null,
-                                                                                    string parameter87Name = null,
-                                                                                    string parameter87Value = null,
-                                                                                    string parameter88Name = null,
-                                                                                    string parameter88Value = null,
-                                                                                    string parameter89Name = null,
-                                                                                    string parameter89Value = null,
-                                                                                    string parameter90Name = null,
-                                                                                    string parameter90Value = null,
-                                                                                    string parameter91Name = null,
-                                                                                    string parameter91Value = null,
-                                                                                    string parameter92Name = null,
-                                                                                    string parameter92Value = null,
-                                                                                    string parameter93Name = null,
-                                                                                    string parameter93Value = null,
-                                                                                    string parameter94Name = null,
-                                                                                    string parameter94Value = null,
-                                                                                    string parameter95Name = null,
-                                                                                    string parameter95Value = null,
-                                                                                    string parameter96Name = null,
-                                                                                    string parameter96Value = null,
-                                                                                    string parameter97Name = null,
-                                                                                    string parameter97Value = null,
-                                                                                    string parameter98Name = null,
-                                                                                    string parameter98Value = null,
-                                                                                    string parameter99Name = null,
-                                                                                    string parameter99Value = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateSiprecOptions(pathCallSid){PathAccountSid = pathAccountSid, Name = name, ConnectorName = connectorName, Track = track, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Parameter1Name = parameter1Name, Parameter1Value = parameter1Value, Parameter2Name = parameter2Name, Parameter2Value = parameter2Value, Parameter3Name = parameter3Name, Parameter3Value = parameter3Value, Parameter4Name = parameter4Name, Parameter4Value = parameter4Value, Parameter5Name = parameter5Name, Parameter5Value = parameter5Value, Parameter6Name = parameter6Name, Parameter6Value = parameter6Value, Parameter7Name = parameter7Name, Parameter7Value = parameter7Value, Parameter8Name = parameter8Name, Parameter8Value = parameter8Value, Parameter9Name = parameter9Name, Parameter9Value = parameter9Value, Parameter10Name = parameter10Name, Parameter10Value = parameter10Value, Parameter11Name = parameter11Name, Parameter11Value = parameter11Value, Parameter12Name = parameter12Name, Parameter12Value = parameter12Value, Parameter13Name = parameter13Name, Parameter13Value = parameter13Value, Parameter14Name = parameter14Name, Parameter14Value = parameter14Value, Parameter15Name = parameter15Name, Parameter15Value = parameter15Value, Parameter16Name = parameter16Name, Parameter16Value = parameter16Value, Parameter17Name = parameter17Name, Parameter17Value = parameter17Value, Parameter18Name = parameter18Name, Parameter18Value = parameter18Value, Parameter19Name = parameter19Name, Parameter19Value = parameter19Value, Parameter20Name = parameter20Name, Parameter20Value = parameter20Value, Parameter21Name = parameter21Name, Parameter21Value = parameter21Value, Parameter22Name = parameter22Name, Parameter22Value = parameter22Value, Parameter23Name = parameter23Name, Parameter23Value = parameter23Value, Parameter24Name = parameter24Name, Parameter24Value = parameter24Value, Parameter25Name = parameter25Name, Parameter25Value = parameter25Value, Parameter26Name = parameter26Name, Parameter26Value = parameter26Value, Parameter27Name = parameter27Name, Parameter27Value = parameter27Value, Parameter28Name = parameter28Name, Parameter28Value = parameter28Value, Parameter29Name = parameter29Name, Parameter29Value = parameter29Value, Parameter30Name = parameter30Name, Parameter30Value = parameter30Value, Parameter31Name = parameter31Name, Parameter31Value = parameter31Value, Parameter32Name = parameter32Name, Parameter32Value = parameter32Value, Parameter33Name = parameter33Name, Parameter33Value = parameter33Value, Parameter34Name = parameter34Name, Parameter34Value = parameter34Value, Parameter35Name = parameter35Name, Parameter35Value = parameter35Value, Parameter36Name = parameter36Name, Parameter36Value = parameter36Value, Parameter37Name = parameter37Name, Parameter37Value = parameter37Value, Parameter38Name = parameter38Name, Parameter38Value = parameter38Value, Parameter39Name = parameter39Name, Parameter39Value = parameter39Value, Parameter40Name = parameter40Name, Parameter40Value = parameter40Value, Parameter41Name = parameter41Name, Parameter41Value = parameter41Value, Parameter42Name = parameter42Name, Parameter42Value = parameter42Value, Parameter43Name = parameter43Name, Parameter43Value = parameter43Value, Parameter44Name = parameter44Name, Parameter44Value = parameter44Value, Parameter45Name = parameter45Name, Parameter45Value = parameter45Value, Parameter46Name = parameter46Name, Parameter46Value = parameter46Value, Parameter47Name = parameter47Name, Parameter47Value = parameter47Value, Parameter48Name = parameter48Name, Parameter48Value = parameter48Value, Parameter49Name = parameter49Name, Parameter49Value = parameter49Value, Parameter50Name = parameter50Name, Parameter50Value = parameter50Value, Parameter51Name = parameter51Name, Parameter51Value = parameter51Value, Parameter52Name = parameter52Name, Parameter52Value = parameter52Value, Parameter53Name = parameter53Name, Parameter53Value = parameter53Value, Parameter54Name = parameter54Name, Parameter54Value = parameter54Value, Parameter55Name = parameter55Name, Parameter55Value = parameter55Value, Parameter56Name = parameter56Name, Parameter56Value = parameter56Value, Parameter57Name = parameter57Name, Parameter57Value = parameter57Value, Parameter58Name = parameter58Name, Parameter58Value = parameter58Value, Parameter59Name = parameter59Name, Parameter59Value = parameter59Value, Parameter60Name = parameter60Name, Parameter60Value = parameter60Value, Parameter61Name = parameter61Name, Parameter61Value = parameter61Value, Parameter62Name = parameter62Name, Parameter62Value = parameter62Value, Parameter63Name = parameter63Name, Parameter63Value = parameter63Value, Parameter64Name = parameter64Name, Parameter64Value = parameter64Value, Parameter65Name = parameter65Name, Parameter65Value = parameter65Value, Parameter66Name = parameter66Name, Parameter66Value = parameter66Value, Parameter67Name = parameter67Name, Parameter67Value = parameter67Value, Parameter68Name = parameter68Name, Parameter68Value = parameter68Value, Parameter69Name = parameter69Name, Parameter69Value = parameter69Value, Parameter70Name = parameter70Name, Parameter70Value = parameter70Value, Parameter71Name = parameter71Name, Parameter71Value = parameter71Value, Parameter72Name = parameter72Name, Parameter72Value = parameter72Value, Parameter73Name = parameter73Name, Parameter73Value = parameter73Value, Parameter74Name = parameter74Name, Parameter74Value = parameter74Value, Parameter75Name = parameter75Name, Parameter75Value = parameter75Value, Parameter76Name = parameter76Name, Parameter76Value = parameter76Value, Parameter77Name = parameter77Name, Parameter77Value = parameter77Value, Parameter78Name = parameter78Name, Parameter78Value = parameter78Value, Parameter79Name = parameter79Name, Parameter79Value = parameter79Value, Parameter80Name = parameter80Name, Parameter80Value = parameter80Value, Parameter81Name = parameter81Name, Parameter81Value = parameter81Value, Parameter82Name = parameter82Name, Parameter82Value = parameter82Value, Parameter83Name = parameter83Name, Parameter83Value = parameter83Value, Parameter84Name = parameter84Name, Parameter84Value = parameter84Value, Parameter85Name = parameter85Name, Parameter85Value = parameter85Value, Parameter86Name = parameter86Name, Parameter86Value = parameter86Value, Parameter87Name = parameter87Name, Parameter87Value = parameter87Value, Parameter88Name = parameter88Name, Parameter88Value = parameter88Value, Parameter89Name = parameter89Name, Parameter89Value = parameter89Value, Parameter90Name = parameter90Name, Parameter90Value = parameter90Value, Parameter91Name = parameter91Name, Parameter91Value = parameter91Value, Parameter92Name = parameter92Name, Parameter92Value = parameter92Value, Parameter93Name = parameter93Name, Parameter93Value = parameter93Value, Parameter94Name = parameter94Name, Parameter94Value = parameter94Value, Parameter95Name = parameter95Name, Parameter95Value = parameter95Value, Parameter96Name = parameter96Name, Parameter96Value = parameter96Value, Parameter97Name = parameter97Name, Parameter97Value = parameter97Value, Parameter98Name = parameter98Name, Parameter98Value = parameter98Value, Parameter99Name = parameter99Name, Parameter99Value = parameter99Value};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSiprecOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Siprec/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Stop a Siprec using either the SID of the Siprec resource or the `name` used when creating the resource
-        /// </summary>
-        /// <param name="options"> Update Siprec parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Siprec </returns>
-        public static SiprecResource Update(UpdateSiprecOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Stop a Siprec using either the SID of the Siprec resource or the `name` used when creating the resource
-        /// </summary>
-        /// <param name="options"> Update Siprec parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Siprec </returns>
-        public static async System.Threading.Tasks.Task<SiprecResource> UpdateAsync(UpdateSiprecOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Stop a Siprec using either the SID of the Siprec resource or the `name` used when creating the resource
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the Call the resource is associated with </param>
-        /// <param name="pathSid"> The SID of the Siprec resource, or the `name` </param>
-        /// <param name="status"> The status. Must have the value `stopped` </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created this resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Siprec </returns>
-        public static SiprecResource Update(string pathCallSid,
-                                            string pathSid,
-                                            SiprecResource.UpdateStatusEnum status,
-                                            string pathAccountSid = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateSiprecOptions(pathCallSid, pathSid, status){PathAccountSid = pathAccountSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Stop a Siprec using either the SID of the Siprec resource or the `name` used when creating the resource
-        /// </summary>
-        /// <param name="pathCallSid"> The SID of the Call the resource is associated with </param>
-        /// <param name="pathSid"> The SID of the Siprec resource, or the `name` </param>
-        /// <param name="status"> The status. Must have the value `stopped` </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created this resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Siprec </returns>
-        public static async System.Threading.Tasks.Task<SiprecResource> UpdateAsync(string pathCallSid,
-                                                                                    string pathSid,
-                                                                                    SiprecResource.UpdateStatusEnum status,
-                                                                                    string pathAccountSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateSiprecOptions(pathCallSid, pathSid, status){PathAccountSid = pathAccountSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SiprecResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SiprecResource object represented by the provided JSON </returns>
-        public static SiprecResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SiprecResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Siprec resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created this resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Call the resource is associated with
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The name of this resource
-        /// </summary>
-        [JsonProperty("name")]
-        public string Name { get; private set; }
-        /// <summary>
-        /// The status - one of `stopped`, `in-progress`
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SiprecResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private SiprecResource()
-        {
-
-        }
-    }
+{
+
+  public class SiprecResource : Resource
+  {
+    public sealed class TrackEnum : StringEnum
+    {
+      private TrackEnum(string value) : base(value) { }
+      public TrackEnum() { }
+      public static implicit operator TrackEnum(string value)
+      {
+        return new TrackEnum(value);
+      }
+
+      public static readonly TrackEnum InboundTrack = new TrackEnum("inbound_track");
+      public static readonly TrackEnum OutboundTrack = new TrackEnum("outbound_track");
+      public static readonly TrackEnum BothTracks = new TrackEnum("both_tracks");
+    }
+
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
+      public static readonly StatusEnum Stopped = new StatusEnum("stopped");
+    }
+
+    public sealed class UpdateStatusEnum : StringEnum
+    {
+      private UpdateStatusEnum(string value) : base(value) { }
+      public UpdateStatusEnum() { }
+      public static implicit operator UpdateStatusEnum(string value)
+      {
+        return new UpdateStatusEnum(value);
+      }
+
+      public static readonly UpdateStatusEnum Stopped = new UpdateStatusEnum("stopped");
+    }
+
+    private static Request BuildCreateRequest(CreateSiprecOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Siprec.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a Siprec
+    /// </summary>
+    /// <param name="options"> Create Siprec parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Siprec </returns>
+    public static SiprecResource Create(CreateSiprecOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a Siprec
+    /// </summary>
+    /// <param name="options"> Create Siprec parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Siprec </returns>
+    public static async System.Threading.Tasks.Task<SiprecResource> CreateAsync(CreateSiprecOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a Siprec
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the Call the resource is associated with </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created this resource </param>
+    /// <param name="name"> The name of this resource </param>
+    /// <param name="connectorName"> Unique name used when configuring the connector via Marketplace Add-on. </param>
+    /// <param name="track"> One of `inbound_track`, `outbound_track`, `both_tracks`. </param>
+    /// <param name="statusCallback"> Absolute URL of the status callback. </param>
+    /// <param name="statusCallbackMethod"> The http method for the status_callback. </param>
+    /// <param name="parameter1Name"> Parameter name </param>
+    /// <param name="parameter1Value"> Parameter value </param>
+    /// <param name="parameter2Name"> Parameter name </param>
+    /// <param name="parameter2Value"> Parameter value </param>
+    /// <param name="parameter3Name"> Parameter name </param>
+    /// <param name="parameter3Value"> Parameter value </param>
+    /// <param name="parameter4Name"> Parameter name </param>
+    /// <param name="parameter4Value"> Parameter value </param>
+    /// <param name="parameter5Name"> Parameter name </param>
+    /// <param name="parameter5Value"> Parameter value </param>
+    /// <param name="parameter6Name"> Parameter name </param>
+    /// <param name="parameter6Value"> Parameter value </param>
+    /// <param name="parameter7Name"> Parameter name </param>
+    /// <param name="parameter7Value"> Parameter value </param>
+    /// <param name="parameter8Name"> Parameter name </param>
+    /// <param name="parameter8Value"> Parameter value </param>
+    /// <param name="parameter9Name"> Parameter name </param>
+    /// <param name="parameter9Value"> Parameter value </param>
+    /// <param name="parameter10Name"> Parameter name </param>
+    /// <param name="parameter10Value"> Parameter value </param>
+    /// <param name="parameter11Name"> Parameter name </param>
+    /// <param name="parameter11Value"> Parameter value </param>
+    /// <param name="parameter12Name"> Parameter name </param>
+    /// <param name="parameter12Value"> Parameter value </param>
+    /// <param name="parameter13Name"> Parameter name </param>
+    /// <param name="parameter13Value"> Parameter value </param>
+    /// <param name="parameter14Name"> Parameter name </param>
+    /// <param name="parameter14Value"> Parameter value </param>
+    /// <param name="parameter15Name"> Parameter name </param>
+    /// <param name="parameter15Value"> Parameter value </param>
+    /// <param name="parameter16Name"> Parameter name </param>
+    /// <param name="parameter16Value"> Parameter value </param>
+    /// <param name="parameter17Name"> Parameter name </param>
+    /// <param name="parameter17Value"> Parameter value </param>
+    /// <param name="parameter18Name"> Parameter name </param>
+    /// <param name="parameter18Value"> Parameter value </param>
+    /// <param name="parameter19Name"> Parameter name </param>
+    /// <param name="parameter19Value"> Parameter value </param>
+    /// <param name="parameter20Name"> Parameter name </param>
+    /// <param name="parameter20Value"> Parameter value </param>
+    /// <param name="parameter21Name"> Parameter name </param>
+    /// <param name="parameter21Value"> Parameter value </param>
+    /// <param name="parameter22Name"> Parameter name </param>
+    /// <param name="parameter22Value"> Parameter value </param>
+    /// <param name="parameter23Name"> Parameter name </param>
+    /// <param name="parameter23Value"> Parameter value </param>
+    /// <param name="parameter24Name"> Parameter name </param>
+    /// <param name="parameter24Value"> Parameter value </param>
+    /// <param name="parameter25Name"> Parameter name </param>
+    /// <param name="parameter25Value"> Parameter value </param>
+    /// <param name="parameter26Name"> Parameter name </param>
+    /// <param name="parameter26Value"> Parameter value </param>
+    /// <param name="parameter27Name"> Parameter name </param>
+    /// <param name="parameter27Value"> Parameter value </param>
+    /// <param name="parameter28Name"> Parameter name </param>
+    /// <param name="parameter28Value"> Parameter value </param>
+    /// <param name="parameter29Name"> Parameter name </param>
+    /// <param name="parameter29Value"> Parameter value </param>
+    /// <param name="parameter30Name"> Parameter name </param>
+    /// <param name="parameter30Value"> Parameter value </param>
+    /// <param name="parameter31Name"> Parameter name </param>
+    /// <param name="parameter31Value"> Parameter value </param>
+    /// <param name="parameter32Name"> Parameter name </param>
+    /// <param name="parameter32Value"> Parameter value </param>
+    /// <param name="parameter33Name"> Parameter name </param>
+    /// <param name="parameter33Value"> Parameter value </param>
+    /// <param name="parameter34Name"> Parameter name </param>
+    /// <param name="parameter34Value"> Parameter value </param>
+    /// <param name="parameter35Name"> Parameter name </param>
+    /// <param name="parameter35Value"> Parameter value </param>
+    /// <param name="parameter36Name"> Parameter name </param>
+    /// <param name="parameter36Value"> Parameter value </param>
+    /// <param name="parameter37Name"> Parameter name </param>
+    /// <param name="parameter37Value"> Parameter value </param>
+    /// <param name="parameter38Name"> Parameter name </param>
+    /// <param name="parameter38Value"> Parameter value </param>
+    /// <param name="parameter39Name"> Parameter name </param>
+    /// <param name="parameter39Value"> Parameter value </param>
+    /// <param name="parameter40Name"> Parameter name </param>
+    /// <param name="parameter40Value"> Parameter value </param>
+    /// <param name="parameter41Name"> Parameter name </param>
+    /// <param name="parameter41Value"> Parameter value </param>
+    /// <param name="parameter42Name"> Parameter name </param>
+    /// <param name="parameter42Value"> Parameter value </param>
+    /// <param name="parameter43Name"> Parameter name </param>
+    /// <param name="parameter43Value"> Parameter value </param>
+    /// <param name="parameter44Name"> Parameter name </param>
+    /// <param name="parameter44Value"> Parameter value </param>
+    /// <param name="parameter45Name"> Parameter name </param>
+    /// <param name="parameter45Value"> Parameter value </param>
+    /// <param name="parameter46Name"> Parameter name </param>
+    /// <param name="parameter46Value"> Parameter value </param>
+    /// <param name="parameter47Name"> Parameter name </param>
+    /// <param name="parameter47Value"> Parameter value </param>
+    /// <param name="parameter48Name"> Parameter name </param>
+    /// <param name="parameter48Value"> Parameter value </param>
+    /// <param name="parameter49Name"> Parameter name </param>
+    /// <param name="parameter49Value"> Parameter value </param>
+    /// <param name="parameter50Name"> Parameter name </param>
+    /// <param name="parameter50Value"> Parameter value </param>
+    /// <param name="parameter51Name"> Parameter name </param>
+    /// <param name="parameter51Value"> Parameter value </param>
+    /// <param name="parameter52Name"> Parameter name </param>
+    /// <param name="parameter52Value"> Parameter value </param>
+    /// <param name="parameter53Name"> Parameter name </param>
+    /// <param name="parameter53Value"> Parameter value </param>
+    /// <param name="parameter54Name"> Parameter name </param>
+    /// <param name="parameter54Value"> Parameter value </param>
+    /// <param name="parameter55Name"> Parameter name </param>
+    /// <param name="parameter55Value"> Parameter value </param>
+    /// <param name="parameter56Name"> Parameter name </param>
+    /// <param name="parameter56Value"> Parameter value </param>
+    /// <param name="parameter57Name"> Parameter name </param>
+    /// <param name="parameter57Value"> Parameter value </param>
+    /// <param name="parameter58Name"> Parameter name </param>
+    /// <param name="parameter58Value"> Parameter value </param>
+    /// <param name="parameter59Name"> Parameter name </param>
+    /// <param name="parameter59Value"> Parameter value </param>
+    /// <param name="parameter60Name"> Parameter name </param>
+    /// <param name="parameter60Value"> Parameter value </param>
+    /// <param name="parameter61Name"> Parameter name </param>
+    /// <param name="parameter61Value"> Parameter value </param>
+    /// <param name="parameter62Name"> Parameter name </param>
+    /// <param name="parameter62Value"> Parameter value </param>
+    /// <param name="parameter63Name"> Parameter name </param>
+    /// <param name="parameter63Value"> Parameter value </param>
+    /// <param name="parameter64Name"> Parameter name </param>
+    /// <param name="parameter64Value"> Parameter value </param>
+    /// <param name="parameter65Name"> Parameter name </param>
+    /// <param name="parameter65Value"> Parameter value </param>
+    /// <param name="parameter66Name"> Parameter name </param>
+    /// <param name="parameter66Value"> Parameter value </param>
+    /// <param name="parameter67Name"> Parameter name </param>
+    /// <param name="parameter67Value"> Parameter value </param>
+    /// <param name="parameter68Name"> Parameter name </param>
+    /// <param name="parameter68Value"> Parameter value </param>
+    /// <param name="parameter69Name"> Parameter name </param>
+    /// <param name="parameter69Value"> Parameter value </param>
+    /// <param name="parameter70Name"> Parameter name </param>
+    /// <param name="parameter70Value"> Parameter value </param>
+    /// <param name="parameter71Name"> Parameter name </param>
+    /// <param name="parameter71Value"> Parameter value </param>
+    /// <param name="parameter72Name"> Parameter name </param>
+    /// <param name="parameter72Value"> Parameter value </param>
+    /// <param name="parameter73Name"> Parameter name </param>
+    /// <param name="parameter73Value"> Parameter value </param>
+    /// <param name="parameter74Name"> Parameter name </param>
+    /// <param name="parameter74Value"> Parameter value </param>
+    /// <param name="parameter75Name"> Parameter name </param>
+    /// <param name="parameter75Value"> Parameter value </param>
+    /// <param name="parameter76Name"> Parameter name </param>
+    /// <param name="parameter76Value"> Parameter value </param>
+    /// <param name="parameter77Name"> Parameter name </param>
+    /// <param name="parameter77Value"> Parameter value </param>
+    /// <param name="parameter78Name"> Parameter name </param>
+    /// <param name="parameter78Value"> Parameter value </param>
+    /// <param name="parameter79Name"> Parameter name </param>
+    /// <param name="parameter79Value"> Parameter value </param>
+    /// <param name="parameter80Name"> Parameter name </param>
+    /// <param name="parameter80Value"> Parameter value </param>
+    /// <param name="parameter81Name"> Parameter name </param>
+    /// <param name="parameter81Value"> Parameter value </param>
+    /// <param name="parameter82Name"> Parameter name </param>
+    /// <param name="parameter82Value"> Parameter value </param>
+    /// <param name="parameter83Name"> Parameter name </param>
+    /// <param name="parameter83Value"> Parameter value </param>
+    /// <param name="parameter84Name"> Parameter name </param>
+    /// <param name="parameter84Value"> Parameter value </param>
+    /// <param name="parameter85Name"> Parameter name </param>
+    /// <param name="parameter85Value"> Parameter value </param>
+    /// <param name="parameter86Name"> Parameter name </param>
+    /// <param name="parameter86Value"> Parameter value </param>
+    /// <param name="parameter87Name"> Parameter name </param>
+    /// <param name="parameter87Value"> Parameter value </param>
+    /// <param name="parameter88Name"> Parameter name </param>
+    /// <param name="parameter88Value"> Parameter value </param>
+    /// <param name="parameter89Name"> Parameter name </param>
+    /// <param name="parameter89Value"> Parameter value </param>
+    /// <param name="parameter90Name"> Parameter name </param>
+    /// <param name="parameter90Value"> Parameter value </param>
+    /// <param name="parameter91Name"> Parameter name </param>
+    /// <param name="parameter91Value"> Parameter value </param>
+    /// <param name="parameter92Name"> Parameter name </param>
+    /// <param name="parameter92Value"> Parameter value </param>
+    /// <param name="parameter93Name"> Parameter name </param>
+    /// <param name="parameter93Value"> Parameter value </param>
+    /// <param name="parameter94Name"> Parameter name </param>
+    /// <param name="parameter94Value"> Parameter value </param>
+    /// <param name="parameter95Name"> Parameter name </param>
+    /// <param name="parameter95Value"> Parameter value </param>
+    /// <param name="parameter96Name"> Parameter name </param>
+    /// <param name="parameter96Value"> Parameter value </param>
+    /// <param name="parameter97Name"> Parameter name </param>
+    /// <param name="parameter97Value"> Parameter value </param>
+    /// <param name="parameter98Name"> Parameter name </param>
+    /// <param name="parameter98Value"> Parameter value </param>
+    /// <param name="parameter99Name"> Parameter name </param>
+    /// <param name="parameter99Value"> Parameter value </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Siprec </returns>
+    public static SiprecResource Create(string pathCallSid,
+                                        string pathAccountSid = null,
+                                        string name = null,
+                                        string connectorName = null,
+                                        SiprecResource.TrackEnum track = null,
+                                        Uri statusCallback = null,
+                                        Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                        string parameter1Name = null,
+                                        string parameter1Value = null,
+                                        string parameter2Name = null,
+                                        string parameter2Value = null,
+                                        string parameter3Name = null,
+                                        string parameter3Value = null,
+                                        string parameter4Name = null,
+                                        string parameter4Value = null,
+                                        string parameter5Name = null,
+                                        string parameter5Value = null,
+                                        string parameter6Name = null,
+                                        string parameter6Value = null,
+                                        string parameter7Name = null,
+                                        string parameter7Value = null,
+                                        string parameter8Name = null,
+                                        string parameter8Value = null,
+                                        string parameter9Name = null,
+                                        string parameter9Value = null,
+                                        string parameter10Name = null,
+                                        string parameter10Value = null,
+                                        string parameter11Name = null,
+                                        string parameter11Value = null,
+                                        string parameter12Name = null,
+                                        string parameter12Value = null,
+                                        string parameter13Name = null,
+                                        string parameter13Value = null,
+                                        string parameter14Name = null,
+                                        string parameter14Value = null,
+                                        string parameter15Name = null,
+                                        string parameter15Value = null,
+                                        string parameter16Name = null,
+                                        string parameter16Value = null,
+                                        string parameter17Name = null,
+                                        string parameter17Value = null,
+                                        string parameter18Name = null,
+                                        string parameter18Value = null,
+                                        string parameter19Name = null,
+                                        string parameter19Value = null,
+                                        string parameter20Name = null,
+                                        string parameter20Value = null,
+                                        string parameter21Name = null,
+                                        string parameter21Value = null,
+                                        string parameter22Name = null,
+                                        string parameter22Value = null,
+                                        string parameter23Name = null,
+                                        string parameter23Value = null,
+                                        string parameter24Name = null,
+                                        string parameter24Value = null,
+                                        string parameter25Name = null,
+                                        string parameter25Value = null,
+                                        string parameter26Name = null,
+                                        string parameter26Value = null,
+                                        string parameter27Name = null,
+                                        string parameter27Value = null,
+                                        string parameter28Name = null,
+                                        string parameter28Value = null,
+                                        string parameter29Name = null,
+                                        string parameter29Value = null,
+                                        string parameter30Name = null,
+                                        string parameter30Value = null,
+                                        string parameter31Name = null,
+                                        string parameter31Value = null,
+                                        string parameter32Name = null,
+                                        string parameter32Value = null,
+                                        string parameter33Name = null,
+                                        string parameter33Value = null,
+                                        string parameter34Name = null,
+                                        string parameter34Value = null,
+                                        string parameter35Name = null,
+                                        string parameter35Value = null,
+                                        string parameter36Name = null,
+                                        string parameter36Value = null,
+                                        string parameter37Name = null,
+                                        string parameter37Value = null,
+                                        string parameter38Name = null,
+                                        string parameter38Value = null,
+                                        string parameter39Name = null,
+                                        string parameter39Value = null,
+                                        string parameter40Name = null,
+                                        string parameter40Value = null,
+                                        string parameter41Name = null,
+                                        string parameter41Value = null,
+                                        string parameter42Name = null,
+                                        string parameter42Value = null,
+                                        string parameter43Name = null,
+                                        string parameter43Value = null,
+                                        string parameter44Name = null,
+                                        string parameter44Value = null,
+                                        string parameter45Name = null,
+                                        string parameter45Value = null,
+                                        string parameter46Name = null,
+                                        string parameter46Value = null,
+                                        string parameter47Name = null,
+                                        string parameter47Value = null,
+                                        string parameter48Name = null,
+                                        string parameter48Value = null,
+                                        string parameter49Name = null,
+                                        string parameter49Value = null,
+                                        string parameter50Name = null,
+                                        string parameter50Value = null,
+                                        string parameter51Name = null,
+                                        string parameter51Value = null,
+                                        string parameter52Name = null,
+                                        string parameter52Value = null,
+                                        string parameter53Name = null,
+                                        string parameter53Value = null,
+                                        string parameter54Name = null,
+                                        string parameter54Value = null,
+                                        string parameter55Name = null,
+                                        string parameter55Value = null,
+                                        string parameter56Name = null,
+                                        string parameter56Value = null,
+                                        string parameter57Name = null,
+                                        string parameter57Value = null,
+                                        string parameter58Name = null,
+                                        string parameter58Value = null,
+                                        string parameter59Name = null,
+                                        string parameter59Value = null,
+                                        string parameter60Name = null,
+                                        string parameter60Value = null,
+                                        string parameter61Name = null,
+                                        string parameter61Value = null,
+                                        string parameter62Name = null,
+                                        string parameter62Value = null,
+                                        string parameter63Name = null,
+                                        string parameter63Value = null,
+                                        string parameter64Name = null,
+                                        string parameter64Value = null,
+                                        string parameter65Name = null,
+                                        string parameter65Value = null,
+                                        string parameter66Name = null,
+                                        string parameter66Value = null,
+                                        string parameter67Name = null,
+                                        string parameter67Value = null,
+                                        string parameter68Name = null,
+                                        string parameter68Value = null,
+                                        string parameter69Name = null,
+                                        string parameter69Value = null,
+                                        string parameter70Name = null,
+                                        string parameter70Value = null,
+                                        string parameter71Name = null,
+                                        string parameter71Value = null,
+                                        string parameter72Name = null,
+                                        string parameter72Value = null,
+                                        string parameter73Name = null,
+                                        string parameter73Value = null,
+                                        string parameter74Name = null,
+                                        string parameter74Value = null,
+                                        string parameter75Name = null,
+                                        string parameter75Value = null,
+                                        string parameter76Name = null,
+                                        string parameter76Value = null,
+                                        string parameter77Name = null,
+                                        string parameter77Value = null,
+                                        string parameter78Name = null,
+                                        string parameter78Value = null,
+                                        string parameter79Name = null,
+                                        string parameter79Value = null,
+                                        string parameter80Name = null,
+                                        string parameter80Value = null,
+                                        string parameter81Name = null,
+                                        string parameter81Value = null,
+                                        string parameter82Name = null,
+                                        string parameter82Value = null,
+                                        string parameter83Name = null,
+                                        string parameter83Value = null,
+                                        string parameter84Name = null,
+                                        string parameter84Value = null,
+                                        string parameter85Name = null,
+                                        string parameter85Value = null,
+                                        string parameter86Name = null,
+                                        string parameter86Value = null,
+                                        string parameter87Name = null,
+                                        string parameter87Value = null,
+                                        string parameter88Name = null,
+                                        string parameter88Value = null,
+                                        string parameter89Name = null,
+                                        string parameter89Value = null,
+                                        string parameter90Name = null,
+                                        string parameter90Value = null,
+                                        string parameter91Name = null,
+                                        string parameter91Value = null,
+                                        string parameter92Name = null,
+                                        string parameter92Value = null,
+                                        string parameter93Name = null,
+                                        string parameter93Value = null,
+                                        string parameter94Name = null,
+                                        string parameter94Value = null,
+                                        string parameter95Name = null,
+                                        string parameter95Value = null,
+                                        string parameter96Name = null,
+                                        string parameter96Value = null,
+                                        string parameter97Name = null,
+                                        string parameter97Value = null,
+                                        string parameter98Name = null,
+                                        string parameter98Value = null,
+                                        string parameter99Name = null,
+                                        string parameter99Value = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateSiprecOptions(pathCallSid) { PathAccountSid = pathAccountSid, Name = name, ConnectorName = connectorName, Track = track, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Parameter1Name = parameter1Name, Parameter1Value = parameter1Value, Parameter2Name = parameter2Name, Parameter2Value = parameter2Value, Parameter3Name = parameter3Name, Parameter3Value = parameter3Value, Parameter4Name = parameter4Name, Parameter4Value = parameter4Value, Parameter5Name = parameter5Name, Parameter5Value = parameter5Value, Parameter6Name = parameter6Name, Parameter6Value = parameter6Value, Parameter7Name = parameter7Name, Parameter7Value = parameter7Value, Parameter8Name = parameter8Name, Parameter8Value = parameter8Value, Parameter9Name = parameter9Name, Parameter9Value = parameter9Value, Parameter10Name = parameter10Name, Parameter10Value = parameter10Value, Parameter11Name = parameter11Name, Parameter11Value = parameter11Value, Parameter12Name = parameter12Name, Parameter12Value = parameter12Value, Parameter13Name = parameter13Name, Parameter13Value = parameter13Value, Parameter14Name = parameter14Name, Parameter14Value = parameter14Value, Parameter15Name = parameter15Name, Parameter15Value = parameter15Value, Parameter16Name = parameter16Name, Parameter16Value = parameter16Value, Parameter17Name = parameter17Name, Parameter17Value = parameter17Value, Parameter18Name = parameter18Name, Parameter18Value = parameter18Value, Parameter19Name = parameter19Name, Parameter19Value = parameter19Value, Parameter20Name = parameter20Name, Parameter20Value = parameter20Value, Parameter21Name = parameter21Name, Parameter21Value = parameter21Value, Parameter22Name = parameter22Name, Parameter22Value = parameter22Value, Parameter23Name = parameter23Name, Parameter23Value = parameter23Value, Parameter24Name = parameter24Name, Parameter24Value = parameter24Value, Parameter25Name = parameter25Name, Parameter25Value = parameter25Value, Parameter26Name = parameter26Name, Parameter26Value = parameter26Value, Parameter27Name = parameter27Name, Parameter27Value = parameter27Value, Parameter28Name = parameter28Name, Parameter28Value = parameter28Value, Parameter29Name = parameter29Name, Parameter29Value = parameter29Value, Parameter30Name = parameter30Name, Parameter30Value = parameter30Value, Parameter31Name = parameter31Name, Parameter31Value = parameter31Value, Parameter32Name = parameter32Name, Parameter32Value = parameter32Value, Parameter33Name = parameter33Name, Parameter33Value = parameter33Value, Parameter34Name = parameter34Name, Parameter34Value = parameter34Value, Parameter35Name = parameter35Name, Parameter35Value = parameter35Value, Parameter36Name = parameter36Name, Parameter36Value = parameter36Value, Parameter37Name = parameter37Name, Parameter37Value = parameter37Value, Parameter38Name = parameter38Name, Parameter38Value = parameter38Value, Parameter39Name = parameter39Name, Parameter39Value = parameter39Value, Parameter40Name = parameter40Name, Parameter40Value = parameter40Value, Parameter41Name = parameter41Name, Parameter41Value = parameter41Value, Parameter42Name = parameter42Name, Parameter42Value = parameter42Value, Parameter43Name = parameter43Name, Parameter43Value = parameter43Value, Parameter44Name = parameter44Name, Parameter44Value = parameter44Value, Parameter45Name = parameter45Name, Parameter45Value = parameter45Value, Parameter46Name = parameter46Name, Parameter46Value = parameter46Value, Parameter47Name = parameter47Name, Parameter47Value = parameter47Value, Parameter48Name = parameter48Name, Parameter48Value = parameter48Value, Parameter49Name = parameter49Name, Parameter49Value = parameter49Value, Parameter50Name = parameter50Name, Parameter50Value = parameter50Value, Parameter51Name = parameter51Name, Parameter51Value = parameter51Value, Parameter52Name = parameter52Name, Parameter52Value = parameter52Value, Parameter53Name = parameter53Name, Parameter53Value = parameter53Value, Parameter54Name = parameter54Name, Parameter54Value = parameter54Value, Parameter55Name = parameter55Name, Parameter55Value = parameter55Value, Parameter56Name = parameter56Name, Parameter56Value = parameter56Value, Parameter57Name = parameter57Name, Parameter57Value = parameter57Value, Parameter58Name = parameter58Name, Parameter58Value = parameter58Value, Parameter59Name = parameter59Name, Parameter59Value = parameter59Value, Parameter60Name = parameter60Name, Parameter60Value = parameter60Value, Parameter61Name = parameter61Name, Parameter61Value = parameter61Value, Parameter62Name = parameter62Name, Parameter62Value = parameter62Value, Parameter63Name = parameter63Name, Parameter63Value = parameter63Value, Parameter64Name = parameter64Name, Parameter64Value = parameter64Value, Parameter65Name = parameter65Name, Parameter65Value = parameter65Value, Parameter66Name = parameter66Name, Parameter66Value = parameter66Value, Parameter67Name = parameter67Name, Parameter67Value = parameter67Value, Parameter68Name = parameter68Name, Parameter68Value = parameter68Value, Parameter69Name = parameter69Name, Parameter69Value = parameter69Value, Parameter70Name = parameter70Name, Parameter70Value = parameter70Value, Parameter71Name = parameter71Name, Parameter71Value = parameter71Value, Parameter72Name = parameter72Name, Parameter72Value = parameter72Value, Parameter73Name = parameter73Name, Parameter73Value = parameter73Value, Parameter74Name = parameter74Name, Parameter74Value = parameter74Value, Parameter75Name = parameter75Name, Parameter75Value = parameter75Value, Parameter76Name = parameter76Name, Parameter76Value = parameter76Value, Parameter77Name = parameter77Name, Parameter77Value = parameter77Value, Parameter78Name = parameter78Name, Parameter78Value = parameter78Value, Parameter79Name = parameter79Name, Parameter79Value = parameter79Value, Parameter80Name = parameter80Name, Parameter80Value = parameter80Value, Parameter81Name = parameter81Name, Parameter81Value = parameter81Value, Parameter82Name = parameter82Name, Parameter82Value = parameter82Value, Parameter83Name = parameter83Name, Parameter83Value = parameter83Value, Parameter84Name = parameter84Name, Parameter84Value = parameter84Value, Parameter85Name = parameter85Name, Parameter85Value = parameter85Value, Parameter86Name = parameter86Name, Parameter86Value = parameter86Value, Parameter87Name = parameter87Name, Parameter87Value = parameter87Value, Parameter88Name = parameter88Name, Parameter88Value = parameter88Value, Parameter89Name = parameter89Name, Parameter89Value = parameter89Value, Parameter90Name = parameter90Name, Parameter90Value = parameter90Value, Parameter91Name = parameter91Name, Parameter91Value = parameter91Value, Parameter92Name = parameter92Name, Parameter92Value = parameter92Value, Parameter93Name = parameter93Name, Parameter93Value = parameter93Value, Parameter94Name = parameter94Name, Parameter94Value = parameter94Value, Parameter95Name = parameter95Name, Parameter95Value = parameter95Value, Parameter96Name = parameter96Name, Parameter96Value = parameter96Value, Parameter97Name = parameter97Name, Parameter97Value = parameter97Value, Parameter98Name = parameter98Name, Parameter98Value = parameter98Value, Parameter99Name = parameter99Name, Parameter99Value = parameter99Value };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a Siprec
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the Call the resource is associated with </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created this resource </param>
+    /// <param name="name"> The name of this resource </param>
+    /// <param name="connectorName"> Unique name used when configuring the connector via Marketplace Add-on. </param>
+    /// <param name="track"> One of `inbound_track`, `outbound_track`, `both_tracks`. </param>
+    /// <param name="statusCallback"> Absolute URL of the status callback. </param>
+    /// <param name="statusCallbackMethod"> The http method for the status_callback. </param>
+    /// <param name="parameter1Name"> Parameter name </param>
+    /// <param name="parameter1Value"> Parameter value </param>
+    /// <param name="parameter2Name"> Parameter name </param>
+    /// <param name="parameter2Value"> Parameter value </param>
+    /// <param name="parameter3Name"> Parameter name </param>
+    /// <param name="parameter3Value"> Parameter value </param>
+    /// <param name="parameter4Name"> Parameter name </param>
+    /// <param name="parameter4Value"> Parameter value </param>
+    /// <param name="parameter5Name"> Parameter name </param>
+    /// <param name="parameter5Value"> Parameter value </param>
+    /// <param name="parameter6Name"> Parameter name </param>
+    /// <param name="parameter6Value"> Parameter value </param>
+    /// <param name="parameter7Name"> Parameter name </param>
+    /// <param name="parameter7Value"> Parameter value </param>
+    /// <param name="parameter8Name"> Parameter name </param>
+    /// <param name="parameter8Value"> Parameter value </param>
+    /// <param name="parameter9Name"> Parameter name </param>
+    /// <param name="parameter9Value"> Parameter value </param>
+    /// <param name="parameter10Name"> Parameter name </param>
+    /// <param name="parameter10Value"> Parameter value </param>
+    /// <param name="parameter11Name"> Parameter name </param>
+    /// <param name="parameter11Value"> Parameter value </param>
+    /// <param name="parameter12Name"> Parameter name </param>
+    /// <param name="parameter12Value"> Parameter value </param>
+    /// <param name="parameter13Name"> Parameter name </param>
+    /// <param name="parameter13Value"> Parameter value </param>
+    /// <param name="parameter14Name"> Parameter name </param>
+    /// <param name="parameter14Value"> Parameter value </param>
+    /// <param name="parameter15Name"> Parameter name </param>
+    /// <param name="parameter15Value"> Parameter value </param>
+    /// <param name="parameter16Name"> Parameter name </param>
+    /// <param name="parameter16Value"> Parameter value </param>
+    /// <param name="parameter17Name"> Parameter name </param>
+    /// <param name="parameter17Value"> Parameter value </param>
+    /// <param name="parameter18Name"> Parameter name </param>
+    /// <param name="parameter18Value"> Parameter value </param>
+    /// <param name="parameter19Name"> Parameter name </param>
+    /// <param name="parameter19Value"> Parameter value </param>
+    /// <param name="parameter20Name"> Parameter name </param>
+    /// <param name="parameter20Value"> Parameter value </param>
+    /// <param name="parameter21Name"> Parameter name </param>
+    /// <param name="parameter21Value"> Parameter value </param>
+    /// <param name="parameter22Name"> Parameter name </param>
+    /// <param name="parameter22Value"> Parameter value </param>
+    /// <param name="parameter23Name"> Parameter name </param>
+    /// <param name="parameter23Value"> Parameter value </param>
+    /// <param name="parameter24Name"> Parameter name </param>
+    /// <param name="parameter24Value"> Parameter value </param>
+    /// <param name="parameter25Name"> Parameter name </param>
+    /// <param name="parameter25Value"> Parameter value </param>
+    /// <param name="parameter26Name"> Parameter name </param>
+    /// <param name="parameter26Value"> Parameter value </param>
+    /// <param name="parameter27Name"> Parameter name </param>
+    /// <param name="parameter27Value"> Parameter value </param>
+    /// <param name="parameter28Name"> Parameter name </param>
+    /// <param name="parameter28Value"> Parameter value </param>
+    /// <param name="parameter29Name"> Parameter name </param>
+    /// <param name="parameter29Value"> Parameter value </param>
+    /// <param name="parameter30Name"> Parameter name </param>
+    /// <param name="parameter30Value"> Parameter value </param>
+    /// <param name="parameter31Name"> Parameter name </param>
+    /// <param name="parameter31Value"> Parameter value </param>
+    /// <param name="parameter32Name"> Parameter name </param>
+    /// <param name="parameter32Value"> Parameter value </param>
+    /// <param name="parameter33Name"> Parameter name </param>
+    /// <param name="parameter33Value"> Parameter value </param>
+    /// <param name="parameter34Name"> Parameter name </param>
+    /// <param name="parameter34Value"> Parameter value </param>
+    /// <param name="parameter35Name"> Parameter name </param>
+    /// <param name="parameter35Value"> Parameter value </param>
+    /// <param name="parameter36Name"> Parameter name </param>
+    /// <param name="parameter36Value"> Parameter value </param>
+    /// <param name="parameter37Name"> Parameter name </param>
+    /// <param name="parameter37Value"> Parameter value </param>
+    /// <param name="parameter38Name"> Parameter name </param>
+    /// <param name="parameter38Value"> Parameter value </param>
+    /// <param name="parameter39Name"> Parameter name </param>
+    /// <param name="parameter39Value"> Parameter value </param>
+    /// <param name="parameter40Name"> Parameter name </param>
+    /// <param name="parameter40Value"> Parameter value </param>
+    /// <param name="parameter41Name"> Parameter name </param>
+    /// <param name="parameter41Value"> Parameter value </param>
+    /// <param name="parameter42Name"> Parameter name </param>
+    /// <param name="parameter42Value"> Parameter value </param>
+    /// <param name="parameter43Name"> Parameter name </param>
+    /// <param name="parameter43Value"> Parameter value </param>
+    /// <param name="parameter44Name"> Parameter name </param>
+    /// <param name="parameter44Value"> Parameter value </param>
+    /// <param name="parameter45Name"> Parameter name </param>
+    /// <param name="parameter45Value"> Parameter value </param>
+    /// <param name="parameter46Name"> Parameter name </param>
+    /// <param name="parameter46Value"> Parameter value </param>
+    /// <param name="parameter47Name"> Parameter name </param>
+    /// <param name="parameter47Value"> Parameter value </param>
+    /// <param name="parameter48Name"> Parameter name </param>
+    /// <param name="parameter48Value"> Parameter value </param>
+    /// <param name="parameter49Name"> Parameter name </param>
+    /// <param name="parameter49Value"> Parameter value </param>
+    /// <param name="parameter50Name"> Parameter name </param>
+    /// <param name="parameter50Value"> Parameter value </param>
+    /// <param name="parameter51Name"> Parameter name </param>
+    /// <param name="parameter51Value"> Parameter value </param>
+    /// <param name="parameter52Name"> Parameter name </param>
+    /// <param name="parameter52Value"> Parameter value </param>
+    /// <param name="parameter53Name"> Parameter name </param>
+    /// <param name="parameter53Value"> Parameter value </param>
+    /// <param name="parameter54Name"> Parameter name </param>
+    /// <param name="parameter54Value"> Parameter value </param>
+    /// <param name="parameter55Name"> Parameter name </param>
+    /// <param name="parameter55Value"> Parameter value </param>
+    /// <param name="parameter56Name"> Parameter name </param>
+    /// <param name="parameter56Value"> Parameter value </param>
+    /// <param name="parameter57Name"> Parameter name </param>
+    /// <param name="parameter57Value"> Parameter value </param>
+    /// <param name="parameter58Name"> Parameter name </param>
+    /// <param name="parameter58Value"> Parameter value </param>
+    /// <param name="parameter59Name"> Parameter name </param>
+    /// <param name="parameter59Value"> Parameter value </param>
+    /// <param name="parameter60Name"> Parameter name </param>
+    /// <param name="parameter60Value"> Parameter value </param>
+    /// <param name="parameter61Name"> Parameter name </param>
+    /// <param name="parameter61Value"> Parameter value </param>
+    /// <param name="parameter62Name"> Parameter name </param>
+    /// <param name="parameter62Value"> Parameter value </param>
+    /// <param name="parameter63Name"> Parameter name </param>
+    /// <param name="parameter63Value"> Parameter value </param>
+    /// <param name="parameter64Name"> Parameter name </param>
+    /// <param name="parameter64Value"> Parameter value </param>
+    /// <param name="parameter65Name"> Parameter name </param>
+    /// <param name="parameter65Value"> Parameter value </param>
+    /// <param name="parameter66Name"> Parameter name </param>
+    /// <param name="parameter66Value"> Parameter value </param>
+    /// <param name="parameter67Name"> Parameter name </param>
+    /// <param name="parameter67Value"> Parameter value </param>
+    /// <param name="parameter68Name"> Parameter name </param>
+    /// <param name="parameter68Value"> Parameter value </param>
+    /// <param name="parameter69Name"> Parameter name </param>
+    /// <param name="parameter69Value"> Parameter value </param>
+    /// <param name="parameter70Name"> Parameter name </param>
+    /// <param name="parameter70Value"> Parameter value </param>
+    /// <param name="parameter71Name"> Parameter name </param>
+    /// <param name="parameter71Value"> Parameter value </param>
+    /// <param name="parameter72Name"> Parameter name </param>
+    /// <param name="parameter72Value"> Parameter value </param>
+    /// <param name="parameter73Name"> Parameter name </param>
+    /// <param name="parameter73Value"> Parameter value </param>
+    /// <param name="parameter74Name"> Parameter name </param>
+    /// <param name="parameter74Value"> Parameter value </param>
+    /// <param name="parameter75Name"> Parameter name </param>
+    /// <param name="parameter75Value"> Parameter value </param>
+    /// <param name="parameter76Name"> Parameter name </param>
+    /// <param name="parameter76Value"> Parameter value </param>
+    /// <param name="parameter77Name"> Parameter name </param>
+    /// <param name="parameter77Value"> Parameter value </param>
+    /// <param name="parameter78Name"> Parameter name </param>
+    /// <param name="parameter78Value"> Parameter value </param>
+    /// <param name="parameter79Name"> Parameter name </param>
+    /// <param name="parameter79Value"> Parameter value </param>
+    /// <param name="parameter80Name"> Parameter name </param>
+    /// <param name="parameter80Value"> Parameter value </param>
+    /// <param name="parameter81Name"> Parameter name </param>
+    /// <param name="parameter81Value"> Parameter value </param>
+    /// <param name="parameter82Name"> Parameter name </param>
+    /// <param name="parameter82Value"> Parameter value </param>
+    /// <param name="parameter83Name"> Parameter name </param>
+    /// <param name="parameter83Value"> Parameter value </param>
+    /// <param name="parameter84Name"> Parameter name </param>
+    /// <param name="parameter84Value"> Parameter value </param>
+    /// <param name="parameter85Name"> Parameter name </param>
+    /// <param name="parameter85Value"> Parameter value </param>
+    /// <param name="parameter86Name"> Parameter name </param>
+    /// <param name="parameter86Value"> Parameter value </param>
+    /// <param name="parameter87Name"> Parameter name </param>
+    /// <param name="parameter87Value"> Parameter value </param>
+    /// <param name="parameter88Name"> Parameter name </param>
+    /// <param name="parameter88Value"> Parameter value </param>
+    /// <param name="parameter89Name"> Parameter name </param>
+    /// <param name="parameter89Value"> Parameter value </param>
+    /// <param name="parameter90Name"> Parameter name </param>
+    /// <param name="parameter90Value"> Parameter value </param>
+    /// <param name="parameter91Name"> Parameter name </param>
+    /// <param name="parameter91Value"> Parameter value </param>
+    /// <param name="parameter92Name"> Parameter name </param>
+    /// <param name="parameter92Value"> Parameter value </param>
+    /// <param name="parameter93Name"> Parameter name </param>
+    /// <param name="parameter93Value"> Parameter value </param>
+    /// <param name="parameter94Name"> Parameter name </param>
+    /// <param name="parameter94Value"> Parameter value </param>
+    /// <param name="parameter95Name"> Parameter name </param>
+    /// <param name="parameter95Value"> Parameter value </param>
+    /// <param name="parameter96Name"> Parameter name </param>
+    /// <param name="parameter96Value"> Parameter value </param>
+    /// <param name="parameter97Name"> Parameter name </param>
+    /// <param name="parameter97Value"> Parameter value </param>
+    /// <param name="parameter98Name"> Parameter name </param>
+    /// <param name="parameter98Value"> Parameter value </param>
+    /// <param name="parameter99Name"> Parameter name </param>
+    /// <param name="parameter99Value"> Parameter value </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Siprec </returns>
+    public static async System.Threading.Tasks.Task<SiprecResource> CreateAsync(string pathCallSid,
+                                                                                string pathAccountSid = null,
+                                                                                string name = null,
+                                                                                string connectorName = null,
+                                                                                SiprecResource.TrackEnum track = null,
+                                                                                Uri statusCallback = null,
+                                                                                Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                string parameter1Name = null,
+                                                                                string parameter1Value = null,
+                                                                                string parameter2Name = null,
+                                                                                string parameter2Value = null,
+                                                                                string parameter3Name = null,
+                                                                                string parameter3Value = null,
+                                                                                string parameter4Name = null,
+                                                                                string parameter4Value = null,
+                                                                                string parameter5Name = null,
+                                                                                string parameter5Value = null,
+                                                                                string parameter6Name = null,
+                                                                                string parameter6Value = null,
+                                                                                string parameter7Name = null,
+                                                                                string parameter7Value = null,
+                                                                                string parameter8Name = null,
+                                                                                string parameter8Value = null,
+                                                                                string parameter9Name = null,
+                                                                                string parameter9Value = null,
+                                                                                string parameter10Name = null,
+                                                                                string parameter10Value = null,
+                                                                                string parameter11Name = null,
+                                                                                string parameter11Value = null,
+                                                                                string parameter12Name = null,
+                                                                                string parameter12Value = null,
+                                                                                string parameter13Name = null,
+                                                                                string parameter13Value = null,
+                                                                                string parameter14Name = null,
+                                                                                string parameter14Value = null,
+                                                                                string parameter15Name = null,
+                                                                                string parameter15Value = null,
+                                                                                string parameter16Name = null,
+                                                                                string parameter16Value = null,
+                                                                                string parameter17Name = null,
+                                                                                string parameter17Value = null,
+                                                                                string parameter18Name = null,
+                                                                                string parameter18Value = null,
+                                                                                string parameter19Name = null,
+                                                                                string parameter19Value = null,
+                                                                                string parameter20Name = null,
+                                                                                string parameter20Value = null,
+                                                                                string parameter21Name = null,
+                                                                                string parameter21Value = null,
+                                                                                string parameter22Name = null,
+                                                                                string parameter22Value = null,
+                                                                                string parameter23Name = null,
+                                                                                string parameter23Value = null,
+                                                                                string parameter24Name = null,
+                                                                                string parameter24Value = null,
+                                                                                string parameter25Name = null,
+                                                                                string parameter25Value = null,
+                                                                                string parameter26Name = null,
+                                                                                string parameter26Value = null,
+                                                                                string parameter27Name = null,
+                                                                                string parameter27Value = null,
+                                                                                string parameter28Name = null,
+                                                                                string parameter28Value = null,
+                                                                                string parameter29Name = null,
+                                                                                string parameter29Value = null,
+                                                                                string parameter30Name = null,
+                                                                                string parameter30Value = null,
+                                                                                string parameter31Name = null,
+                                                                                string parameter31Value = null,
+                                                                                string parameter32Name = null,
+                                                                                string parameter32Value = null,
+                                                                                string parameter33Name = null,
+                                                                                string parameter33Value = null,
+                                                                                string parameter34Name = null,
+                                                                                string parameter34Value = null,
+                                                                                string parameter35Name = null,
+                                                                                string parameter35Value = null,
+                                                                                string parameter36Name = null,
+                                                                                string parameter36Value = null,
+                                                                                string parameter37Name = null,
+                                                                                string parameter37Value = null,
+                                                                                string parameter38Name = null,
+                                                                                string parameter38Value = null,
+                                                                                string parameter39Name = null,
+                                                                                string parameter39Value = null,
+                                                                                string parameter40Name = null,
+                                                                                string parameter40Value = null,
+                                                                                string parameter41Name = null,
+                                                                                string parameter41Value = null,
+                                                                                string parameter42Name = null,
+                                                                                string parameter42Value = null,
+                                                                                string parameter43Name = null,
+                                                                                string parameter43Value = null,
+                                                                                string parameter44Name = null,
+                                                                                string parameter44Value = null,
+                                                                                string parameter45Name = null,
+                                                                                string parameter45Value = null,
+                                                                                string parameter46Name = null,
+                                                                                string parameter46Value = null,
+                                                                                string parameter47Name = null,
+                                                                                string parameter47Value = null,
+                                                                                string parameter48Name = null,
+                                                                                string parameter48Value = null,
+                                                                                string parameter49Name = null,
+                                                                                string parameter49Value = null,
+                                                                                string parameter50Name = null,
+                                                                                string parameter50Value = null,
+                                                                                string parameter51Name = null,
+                                                                                string parameter51Value = null,
+                                                                                string parameter52Name = null,
+                                                                                string parameter52Value = null,
+                                                                                string parameter53Name = null,
+                                                                                string parameter53Value = null,
+                                                                                string parameter54Name = null,
+                                                                                string parameter54Value = null,
+                                                                                string parameter55Name = null,
+                                                                                string parameter55Value = null,
+                                                                                string parameter56Name = null,
+                                                                                string parameter56Value = null,
+                                                                                string parameter57Name = null,
+                                                                                string parameter57Value = null,
+                                                                                string parameter58Name = null,
+                                                                                string parameter58Value = null,
+                                                                                string parameter59Name = null,
+                                                                                string parameter59Value = null,
+                                                                                string parameter60Name = null,
+                                                                                string parameter60Value = null,
+                                                                                string parameter61Name = null,
+                                                                                string parameter61Value = null,
+                                                                                string parameter62Name = null,
+                                                                                string parameter62Value = null,
+                                                                                string parameter63Name = null,
+                                                                                string parameter63Value = null,
+                                                                                string parameter64Name = null,
+                                                                                string parameter64Value = null,
+                                                                                string parameter65Name = null,
+                                                                                string parameter65Value = null,
+                                                                                string parameter66Name = null,
+                                                                                string parameter66Value = null,
+                                                                                string parameter67Name = null,
+                                                                                string parameter67Value = null,
+                                                                                string parameter68Name = null,
+                                                                                string parameter68Value = null,
+                                                                                string parameter69Name = null,
+                                                                                string parameter69Value = null,
+                                                                                string parameter70Name = null,
+                                                                                string parameter70Value = null,
+                                                                                string parameter71Name = null,
+                                                                                string parameter71Value = null,
+                                                                                string parameter72Name = null,
+                                                                                string parameter72Value = null,
+                                                                                string parameter73Name = null,
+                                                                                string parameter73Value = null,
+                                                                                string parameter74Name = null,
+                                                                                string parameter74Value = null,
+                                                                                string parameter75Name = null,
+                                                                                string parameter75Value = null,
+                                                                                string parameter76Name = null,
+                                                                                string parameter76Value = null,
+                                                                                string parameter77Name = null,
+                                                                                string parameter77Value = null,
+                                                                                string parameter78Name = null,
+                                                                                string parameter78Value = null,
+                                                                                string parameter79Name = null,
+                                                                                string parameter79Value = null,
+                                                                                string parameter80Name = null,
+                                                                                string parameter80Value = null,
+                                                                                string parameter81Name = null,
+                                                                                string parameter81Value = null,
+                                                                                string parameter82Name = null,
+                                                                                string parameter82Value = null,
+                                                                                string parameter83Name = null,
+                                                                                string parameter83Value = null,
+                                                                                string parameter84Name = null,
+                                                                                string parameter84Value = null,
+                                                                                string parameter85Name = null,
+                                                                                string parameter85Value = null,
+                                                                                string parameter86Name = null,
+                                                                                string parameter86Value = null,
+                                                                                string parameter87Name = null,
+                                                                                string parameter87Value = null,
+                                                                                string parameter88Name = null,
+                                                                                string parameter88Value = null,
+                                                                                string parameter89Name = null,
+                                                                                string parameter89Value = null,
+                                                                                string parameter90Name = null,
+                                                                                string parameter90Value = null,
+                                                                                string parameter91Name = null,
+                                                                                string parameter91Value = null,
+                                                                                string parameter92Name = null,
+                                                                                string parameter92Value = null,
+                                                                                string parameter93Name = null,
+                                                                                string parameter93Value = null,
+                                                                                string parameter94Name = null,
+                                                                                string parameter94Value = null,
+                                                                                string parameter95Name = null,
+                                                                                string parameter95Value = null,
+                                                                                string parameter96Name = null,
+                                                                                string parameter96Value = null,
+                                                                                string parameter97Name = null,
+                                                                                string parameter97Value = null,
+                                                                                string parameter98Name = null,
+                                                                                string parameter98Value = null,
+                                                                                string parameter99Name = null,
+                                                                                string parameter99Value = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateSiprecOptions(pathCallSid) { PathAccountSid = pathAccountSid, Name = name, ConnectorName = connectorName, Track = track, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Parameter1Name = parameter1Name, Parameter1Value = parameter1Value, Parameter2Name = parameter2Name, Parameter2Value = parameter2Value, Parameter3Name = parameter3Name, Parameter3Value = parameter3Value, Parameter4Name = parameter4Name, Parameter4Value = parameter4Value, Parameter5Name = parameter5Name, Parameter5Value = parameter5Value, Parameter6Name = parameter6Name, Parameter6Value = parameter6Value, Parameter7Name = parameter7Name, Parameter7Value = parameter7Value, Parameter8Name = parameter8Name, Parameter8Value = parameter8Value, Parameter9Name = parameter9Name, Parameter9Value = parameter9Value, Parameter10Name = parameter10Name, Parameter10Value = parameter10Value, Parameter11Name = parameter11Name, Parameter11Value = parameter11Value, Parameter12Name = parameter12Name, Parameter12Value = parameter12Value, Parameter13Name = parameter13Name, Parameter13Value = parameter13Value, Parameter14Name = parameter14Name, Parameter14Value = parameter14Value, Parameter15Name = parameter15Name, Parameter15Value = parameter15Value, Parameter16Name = parameter16Name, Parameter16Value = parameter16Value, Parameter17Name = parameter17Name, Parameter17Value = parameter17Value, Parameter18Name = parameter18Name, Parameter18Value = parameter18Value, Parameter19Name = parameter19Name, Parameter19Value = parameter19Value, Parameter20Name = parameter20Name, Parameter20Value = parameter20Value, Parameter21Name = parameter21Name, Parameter21Value = parameter21Value, Parameter22Name = parameter22Name, Parameter22Value = parameter22Value, Parameter23Name = parameter23Name, Parameter23Value = parameter23Value, Parameter24Name = parameter24Name, Parameter24Value = parameter24Value, Parameter25Name = parameter25Name, Parameter25Value = parameter25Value, Parameter26Name = parameter26Name, Parameter26Value = parameter26Value, Parameter27Name = parameter27Name, Parameter27Value = parameter27Value, Parameter28Name = parameter28Name, Parameter28Value = parameter28Value, Parameter29Name = parameter29Name, Parameter29Value = parameter29Value, Parameter30Name = parameter30Name, Parameter30Value = parameter30Value, Parameter31Name = parameter31Name, Parameter31Value = parameter31Value, Parameter32Name = parameter32Name, Parameter32Value = parameter32Value, Parameter33Name = parameter33Name, Parameter33Value = parameter33Value, Parameter34Name = parameter34Name, Parameter34Value = parameter34Value, Parameter35Name = parameter35Name, Parameter35Value = parameter35Value, Parameter36Name = parameter36Name, Parameter36Value = parameter36Value, Parameter37Name = parameter37Name, Parameter37Value = parameter37Value, Parameter38Name = parameter38Name, Parameter38Value = parameter38Value, Parameter39Name = parameter39Name, Parameter39Value = parameter39Value, Parameter40Name = parameter40Name, Parameter40Value = parameter40Value, Parameter41Name = parameter41Name, Parameter41Value = parameter41Value, Parameter42Name = parameter42Name, Parameter42Value = parameter42Value, Parameter43Name = parameter43Name, Parameter43Value = parameter43Value, Parameter44Name = parameter44Name, Parameter44Value = parameter44Value, Parameter45Name = parameter45Name, Parameter45Value = parameter45Value, Parameter46Name = parameter46Name, Parameter46Value = parameter46Value, Parameter47Name = parameter47Name, Parameter47Value = parameter47Value, Parameter48Name = parameter48Name, Parameter48Value = parameter48Value, Parameter49Name = parameter49Name, Parameter49Value = parameter49Value, Parameter50Name = parameter50Name, Parameter50Value = parameter50Value, Parameter51Name = parameter51Name, Parameter51Value = parameter51Value, Parameter52Name = parameter52Name, Parameter52Value = parameter52Value, Parameter53Name = parameter53Name, Parameter53Value = parameter53Value, Parameter54Name = parameter54Name, Parameter54Value = parameter54Value, Parameter55Name = parameter55Name, Parameter55Value = parameter55Value, Parameter56Name = parameter56Name, Parameter56Value = parameter56Value, Parameter57Name = parameter57Name, Parameter57Value = parameter57Value, Parameter58Name = parameter58Name, Parameter58Value = parameter58Value, Parameter59Name = parameter59Name, Parameter59Value = parameter59Value, Parameter60Name = parameter60Name, Parameter60Value = parameter60Value, Parameter61Name = parameter61Name, Parameter61Value = parameter61Value, Parameter62Name = parameter62Name, Parameter62Value = parameter62Value, Parameter63Name = parameter63Name, Parameter63Value = parameter63Value, Parameter64Name = parameter64Name, Parameter64Value = parameter64Value, Parameter65Name = parameter65Name, Parameter65Value = parameter65Value, Parameter66Name = parameter66Name, Parameter66Value = parameter66Value, Parameter67Name = parameter67Name, Parameter67Value = parameter67Value, Parameter68Name = parameter68Name, Parameter68Value = parameter68Value, Parameter69Name = parameter69Name, Parameter69Value = parameter69Value, Parameter70Name = parameter70Name, Parameter70Value = parameter70Value, Parameter71Name = parameter71Name, Parameter71Value = parameter71Value, Parameter72Name = parameter72Name, Parameter72Value = parameter72Value, Parameter73Name = parameter73Name, Parameter73Value = parameter73Value, Parameter74Name = parameter74Name, Parameter74Value = parameter74Value, Parameter75Name = parameter75Name, Parameter75Value = parameter75Value, Parameter76Name = parameter76Name, Parameter76Value = parameter76Value, Parameter77Name = parameter77Name, Parameter77Value = parameter77Value, Parameter78Name = parameter78Name, Parameter78Value = parameter78Value, Parameter79Name = parameter79Name, Parameter79Value = parameter79Value, Parameter80Name = parameter80Name, Parameter80Value = parameter80Value, Parameter81Name = parameter81Name, Parameter81Value = parameter81Value, Parameter82Name = parameter82Name, Parameter82Value = parameter82Value, Parameter83Name = parameter83Name, Parameter83Value = parameter83Value, Parameter84Name = parameter84Name, Parameter84Value = parameter84Value, Parameter85Name = parameter85Name, Parameter85Value = parameter85Value, Parameter86Name = parameter86Name, Parameter86Value = parameter86Value, Parameter87Name = parameter87Name, Parameter87Value = parameter87Value, Parameter88Name = parameter88Name, Parameter88Value = parameter88Value, Parameter89Name = parameter89Name, Parameter89Value = parameter89Value, Parameter90Name = parameter90Name, Parameter90Value = parameter90Value, Parameter91Name = parameter91Name, Parameter91Value = parameter91Value, Parameter92Name = parameter92Name, Parameter92Value = parameter92Value, Parameter93Name = parameter93Name, Parameter93Value = parameter93Value, Parameter94Name = parameter94Name, Parameter94Value = parameter94Value, Parameter95Name = parameter95Name, Parameter95Value = parameter95Value, Parameter96Name = parameter96Name, Parameter96Value = parameter96Value, Parameter97Name = parameter97Name, Parameter97Value = parameter97Value, Parameter98Name = parameter98Name, Parameter98Value = parameter98Value, Parameter99Name = parameter99Name, Parameter99Value = parameter99Value };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSiprecOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathCallSid + "/Siprec/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Stop a Siprec using either the SID of the Siprec resource or the `name` used when creating the resource
+    /// </summary>
+    /// <param name="options"> Update Siprec parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Siprec </returns>
+    public static SiprecResource Update(UpdateSiprecOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Stop a Siprec using either the SID of the Siprec resource or the `name` used when creating the resource
+    /// </summary>
+    /// <param name="options"> Update Siprec parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Siprec </returns>
+    public static async System.Threading.Tasks.Task<SiprecResource> UpdateAsync(UpdateSiprecOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Stop a Siprec using either the SID of the Siprec resource or the `name` used when creating the resource
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the Call the resource is associated with </param>
+    /// <param name="pathSid"> The SID of the Siprec resource, or the `name` </param>
+    /// <param name="status"> The status. Must have the value `stopped` </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created this resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Siprec </returns>
+    public static SiprecResource Update(string pathCallSid,
+                                        string pathSid,
+                                        SiprecResource.UpdateStatusEnum status,
+                                        string pathAccountSid = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateSiprecOptions(pathCallSid, pathSid, status) { PathAccountSid = pathAccountSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Stop a Siprec using either the SID of the Siprec resource or the `name` used when creating the resource
+    /// </summary>
+    /// <param name="pathCallSid"> The SID of the Call the resource is associated with </param>
+    /// <param name="pathSid"> The SID of the Siprec resource, or the `name` </param>
+    /// <param name="status"> The status. Must have the value `stopped` </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created this resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Siprec </returns>
+    public static async System.Threading.Tasks.Task<SiprecResource> UpdateAsync(string pathCallSid,
+                                                                                string pathSid,
+                                                                                SiprecResource.UpdateStatusEnum status,
+                                                                                string pathAccountSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateSiprecOptions(pathCallSid, pathSid, status) { PathAccountSid = pathAccountSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SiprecResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SiprecResource object represented by the provided JSON </returns>
+    public static SiprecResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SiprecResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Siprec resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created this resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Call the resource is associated with
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The name of this resource
+    /// </summary>
+    [JsonProperty("name")]
+    public string Name { get; private set; }
+    /// <summary>
+    /// The status - one of `stopped`, `in-progress`
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public SiprecResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private SiprecResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/CallOptions.cs b/src/Twilio/Rest/Api/V2010/Account/CallOptions.cs
index 7eb68a00d..bfcebdd5e 100644
--- a/src/Twilio/Rest/Api/V2010/Account/CallOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/CallOptions.cs
@@ -11,654 +11,654 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Create a new outgoing call to phones, SIP-enabled endpoints or Twilio Client connections
+  /// </summary>
+  public class CreateCallOptions : IOptions<CallResource>
+  {
     /// <summary>
-    /// Create a new outgoing call to phones, SIP-enabled endpoints or Twilio Client connections
-    /// </summary>
-    public class CreateCallOptions : IOptions<CallResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Phone number, SIP address, or client identifier to call
-        /// </summary>
-        public IEndpoint To { get; }
-        /// <summary>
-        /// Twilio number from which to originate the call
-        /// </summary>
-        public IEndpoint From { get; }
-        /// <summary>
-        /// The absolute URL that returns TwiML for this call
-        /// </summary>
-        public Uri Url { get; set; }
-        /// <summary>
-        /// TwiML instructions for the call
-        /// </summary>
-        public Types.Twiml Twiml { get; set; }
-        /// <summary>
-        /// The SID of the Application resource that will handle the call
-        /// </summary>
-        public string ApplicationSid { get; set; }
-        /// <summary>
-        /// HTTP method to use to fetch TwiML
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-        /// <summary>
-        /// Fallback URL in case of error
-        /// </summary>
-        public Uri FallbackUrl { get; set; }
-        /// <summary>
-        /// HTTP Method to use with fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod FallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The call progress events that we send to the `status_callback` URL.
-        /// </summary>
-        public List<string> StatusCallbackEvent { get; set; }
-        /// <summary>
-        /// HTTP Method to use with status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The digits to dial after connecting to the number
-        /// </summary>
-        public string SendDigits { get; set; }
-        /// <summary>
-        /// Number of seconds to wait for an answer
-        /// </summary>
-        public int? Timeout { get; set; }
-        /// <summary>
-        /// Whether to record the call
-        /// </summary>
-        public bool? Record { get; set; }
-        /// <summary>
-        /// The number of channels in the final recording
-        /// </summary>
-        public string RecordingChannels { get; set; }
-        /// <summary>
-        /// The URL that we call when the recording is available to be accessed
-        /// </summary>
-        public string RecordingStatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use when calling the `recording_status_callback` URL
-        /// </summary>
-        public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The username used to authenticate the caller making a SIP call
-        /// </summary>
-        public string SipAuthUsername { get; set; }
-        /// <summary>
-        /// The password required to authenticate the user account specified in `sip_auth_username`.
-        /// </summary>
-        public string SipAuthPassword { get; set; }
-        /// <summary>
-        /// Enable machine detection or end of greeting detection
-        /// </summary>
-        public string MachineDetection { get; set; }
-        /// <summary>
-        /// Number of seconds to wait for machine detection
-        /// </summary>
-        public int? MachineDetectionTimeout { get; set; }
-        /// <summary>
-        /// The recording status events that will trigger calls to the URL specified in `recording_status_callback`
-        /// </summary>
-        public List<string> RecordingStatusCallbackEvent { get; set; }
-        /// <summary>
-        /// Set this parameter to control trimming of silence on the recording.
-        /// </summary>
-        public string Trim { get; set; }
-        /// <summary>
-        /// The phone number, SIP address, or Client identifier that made this call. Phone numbers are in E.164 format (e.g., +16175551212). SIP addresses are formatted as `name@company.com`.
-        /// </summary>
-        public string CallerId { get; set; }
-        /// <summary>
-        /// Number of milliseconds for measuring stick for the length of the speech activity
-        /// </summary>
-        public int? MachineDetectionSpeechThreshold { get; set; }
-        /// <summary>
-        /// Number of milliseconds of silence after speech activity
-        /// </summary>
-        public int? MachineDetectionSpeechEndThreshold { get; set; }
-        /// <summary>
-        /// Number of milliseconds of initial silence
-        /// </summary>
-        public int? MachineDetectionSilenceTimeout { get; set; }
-        /// <summary>
-        /// Enable asynchronous AMD
-        /// </summary>
-        public string AsyncAmd { get; set; }
-        /// <summary>
-        /// The URL we should call to send amd status information to your application
-        /// </summary>
-        public Uri AsyncAmdStatusCallback { get; set; }
-        /// <summary>
-        /// HTTP Method to use with async_amd_status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod AsyncAmdStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// BYOC trunk SID (Beta)
-        /// </summary>
-        public string Byoc { get; set; }
-        /// <summary>
-        /// Reason for the call (Branded Calls Beta)
-        /// </summary>
-        public string CallReason { get; set; }
-        /// <summary>
-        /// A token string needed to invoke a forwarded call with a CallerId recieved on a previous incoming call
-        /// </summary>
-        public string CallToken { get; set; }
-        /// <summary>
-        /// Which track(s) to record
-        /// </summary>
-        public string RecordingTrack { get; set; }
-        /// <summary>
-        /// The maximum duration of the call in seconds.
-        /// </summary>
-        public int? TimeLimit { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCallOptions
-        /// </summary>
-        /// <param name="to"> Phone number, SIP address, or client identifier to call </param>
-        /// <param name="from"> Twilio number from which to originate the call </param>
-        public CreateCallOptions(IEndpoint to, IEndpoint from)
-        {
-            To = to;
-            From = from;
-            StatusCallbackEvent = new List<string>();
-            RecordingStatusCallbackEvent = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To.ToString()));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From.ToString()));
-            }
-
-            if (Url != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Url", Serializers.Url(Url)));
-            }
-
-            if (Twiml != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Twiml", Twiml.ToString()));
-            }
-
-            if (ApplicationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApplicationSid", ApplicationSid.ToString()));
-            }
-
-            if (Method != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Method", Method.ToString()));
-            }
-
-            if (FallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackUrl", Serializers.Url(FallbackUrl)));
-            }
-
-            if (FallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackMethod", FallbackMethod.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackEvent != null)
-            {
-                p.AddRange(StatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("StatusCallbackEvent", prop)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (SendDigits != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SendDigits", SendDigits));
-            }
-
-            if (Timeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timeout", Timeout.ToString()));
-            }
-
-            if (Record != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Record", Record.Value.ToString().ToLower()));
-            }
-
-            if (RecordingChannels != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingChannels", RecordingChannels));
-            }
-
-            if (RecordingStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingStatusCallback", RecordingStatusCallback));
-            }
-
-            if (RecordingStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingStatusCallbackMethod", RecordingStatusCallbackMethod.ToString()));
-            }
-
-            if (SipAuthUsername != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipAuthUsername", SipAuthUsername));
-            }
-
-            if (SipAuthPassword != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipAuthPassword", SipAuthPassword));
-            }
-
-            if (MachineDetection != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MachineDetection", MachineDetection));
-            }
-
-            if (MachineDetectionTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MachineDetectionTimeout", MachineDetectionTimeout.ToString()));
-            }
-
-            if (RecordingStatusCallbackEvent != null)
-            {
-                p.AddRange(RecordingStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("RecordingStatusCallbackEvent", prop)));
-            }
-
-            if (Trim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Trim", Trim));
-            }
-
-            if (CallerId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallerId", CallerId));
-            }
-
-            if (MachineDetectionSpeechThreshold != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MachineDetectionSpeechThreshold", MachineDetectionSpeechThreshold.ToString()));
-            }
-
-            if (MachineDetectionSpeechEndThreshold != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MachineDetectionSpeechEndThreshold", MachineDetectionSpeechEndThreshold.ToString()));
-            }
-
-            if (MachineDetectionSilenceTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MachineDetectionSilenceTimeout", MachineDetectionSilenceTimeout.ToString()));
-            }
-
-            if (AsyncAmd != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AsyncAmd", AsyncAmd));
-            }
-
-            if (AsyncAmdStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AsyncAmdStatusCallback", Serializers.Url(AsyncAmdStatusCallback)));
-            }
-
-            if (AsyncAmdStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AsyncAmdStatusCallbackMethod", AsyncAmdStatusCallbackMethod.ToString()));
-            }
-
-            if (Byoc != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Byoc", Byoc.ToString()));
-            }
-
-            if (CallReason != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallReason", CallReason));
-            }
-
-            if (CallToken != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallToken", CallToken));
-            }
-
-            if (RecordingTrack != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingTrack", RecordingTrack));
-            }
-
-            if (TimeLimit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TimeLimit", TimeLimit.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Delete a Call record from your account. Once the record is deleted, it will no longer appear in the API and Account
-    /// Portal logs.
-    /// </summary>
-    public class DeleteCallOptions : IOptions<CallResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCallOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        public DeleteCallOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Phone number, SIP address, or client identifier to call
+    /// </summary>
+    public IEndpoint To { get; }
     /// <summary>
-    /// Fetch the call specified by the provided Call SID
-    /// </summary>
-    public class FetchCallOptions : IOptions<CallResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Call resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCallOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Call resource to fetch </param>
-        public FetchCallOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Twilio number from which to originate the call
+    /// </summary>
+    public IEndpoint From { get; }
     /// <summary>
-    /// Retrieves a collection of calls made to and from your account
-    /// </summary>
-    public class ReadCallOptions : ReadOptions<CallResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Phone number or Client identifier of calls to include
-        /// </summary>
-        public Types.PhoneNumber To { get; set; }
-        /// <summary>
-        /// Phone number or Client identifier to filter `from` on
-        /// </summary>
-        public Types.PhoneNumber From { get; set; }
-        /// <summary>
-        /// Parent call SID to filter on
-        /// </summary>
-        public string ParentCallSid { get; set; }
-        /// <summary>
-        /// The status of the resources to read
-        /// </summary>
-        public CallResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// Only include calls that started on this date
-        /// </summary>
-        public DateTime? StartTimeBefore { get; set; }
-        /// <summary>
-        /// Only include calls that started on this date
-        /// </summary>
-        public DateTime? StartTime { get; set; }
-        /// <summary>
-        /// Only include calls that started on this date
-        /// </summary>
-        public DateTime? StartTimeAfter { get; set; }
-        /// <summary>
-        /// Only include calls that ended on this date
-        /// </summary>
-        public DateTime? EndTimeBefore { get; set; }
-        /// <summary>
-        /// Only include calls that ended on this date
-        /// </summary>
-        public DateTime? EndTime { get; set; }
-        /// <summary>
-        /// Only include calls that ended on this date
-        /// </summary>
-        public DateTime? EndTimeAfter { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To.ToString()));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From.ToString()));
-            }
-
-            if (ParentCallSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ParentCallSid", ParentCallSid.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (StartTime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartTime", Serializers.DateTimeIso8601(StartTime)));
-            }
-            else
-            {
-                if (StartTimeBefore != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("StartTime<", Serializers.DateTimeIso8601(StartTimeBefore)));
-                }
-
-                if (StartTimeAfter != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("StartTime>", Serializers.DateTimeIso8601(StartTimeAfter)));
-                }
-            }
-
-            if (EndTime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndTime", Serializers.DateTimeIso8601(EndTime)));
-            }
-            else
-            {
-                if (EndTimeBefore != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("EndTime<", Serializers.DateTimeIso8601(EndTimeBefore)));
-                }
-
-                if (EndTimeAfter != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("EndTime>", Serializers.DateTimeIso8601(EndTimeAfter)));
-                }
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The absolute URL that returns TwiML for this call
+    /// </summary>
+    public Uri Url { get; set; }
     /// <summary>
-    /// Initiates a call redirect or terminates a call
-    /// </summary>
-    public class UpdateCallOptions : IOptions<CallResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The absolute URL that returns TwiML for this call
-        /// </summary>
-        public Uri Url { get; set; }
-        /// <summary>
-        /// HTTP method to use to fetch TwiML
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-        /// <summary>
-        /// The new status to update the call with.
-        /// </summary>
-        public CallResource.UpdateStatusEnum Status { get; set; }
-        /// <summary>
-        /// Fallback URL in case of error
-        /// </summary>
-        public Uri FallbackUrl { get; set; }
-        /// <summary>
-        /// HTTP Method to use with fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod FallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// HTTP Method to use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// TwiML instructions for the call
-        /// </summary>
-        public Types.Twiml Twiml { get; set; }
-        /// <summary>
-        /// The maximum duration of the call in seconds.
-        /// </summary>
-        public int? TimeLimit { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateCallOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        public UpdateCallOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Url != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Url", Serializers.Url(Url)));
-            }
-
-            if (Method != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Method", Method.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (FallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackUrl", Serializers.Url(FallbackUrl)));
-            }
-
-            if (FallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackMethod", FallbackMethod.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (Twiml != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Twiml", Twiml.ToString()));
-            }
-
-            if (TimeLimit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TimeLimit", TimeLimit.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// TwiML instructions for the call
+    /// </summary>
+    public Types.Twiml Twiml { get; set; }
+    /// <summary>
+    /// The SID of the Application resource that will handle the call
+    /// </summary>
+    public string ApplicationSid { get; set; }
+    /// <summary>
+    /// HTTP method to use to fetch TwiML
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+    /// <summary>
+    /// Fallback URL in case of error
+    /// </summary>
+    public Uri FallbackUrl { get; set; }
+    /// <summary>
+    /// HTTP Method to use with fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod FallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The call progress events that we send to the `status_callback` URL.
+    /// </summary>
+    public List<string> StatusCallbackEvent { get; set; }
+    /// <summary>
+    /// HTTP Method to use with status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The digits to dial after connecting to the number
+    /// </summary>
+    public string SendDigits { get; set; }
+    /// <summary>
+    /// Number of seconds to wait for an answer
+    /// </summary>
+    public int? Timeout { get; set; }
+    /// <summary>
+    /// Whether to record the call
+    /// </summary>
+    public bool? Record { get; set; }
+    /// <summary>
+    /// The number of channels in the final recording
+    /// </summary>
+    public string RecordingChannels { get; set; }
+    /// <summary>
+    /// The URL that we call when the recording is available to be accessed
+    /// </summary>
+    public string RecordingStatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use when calling the `recording_status_callback` URL
+    /// </summary>
+    public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The username used to authenticate the caller making a SIP call
+    /// </summary>
+    public string SipAuthUsername { get; set; }
+    /// <summary>
+    /// The password required to authenticate the user account specified in `sip_auth_username`.
+    /// </summary>
+    public string SipAuthPassword { get; set; }
+    /// <summary>
+    /// Enable machine detection or end of greeting detection
+    /// </summary>
+    public string MachineDetection { get; set; }
+    /// <summary>
+    /// Number of seconds to wait for machine detection
+    /// </summary>
+    public int? MachineDetectionTimeout { get; set; }
+    /// <summary>
+    /// The recording status events that will trigger calls to the URL specified in `recording_status_callback`
+    /// </summary>
+    public List<string> RecordingStatusCallbackEvent { get; set; }
+    /// <summary>
+    /// Set this parameter to control trimming of silence on the recording.
+    /// </summary>
+    public string Trim { get; set; }
+    /// <summary>
+    /// The phone number, SIP address, or Client identifier that made this call. Phone numbers are in E.164 format (e.g., +16175551212). SIP addresses are formatted as `name@company.com`.
+    /// </summary>
+    public string CallerId { get; set; }
+    /// <summary>
+    /// Number of milliseconds for measuring stick for the length of the speech activity
+    /// </summary>
+    public int? MachineDetectionSpeechThreshold { get; set; }
+    /// <summary>
+    /// Number of milliseconds of silence after speech activity
+    /// </summary>
+    public int? MachineDetectionSpeechEndThreshold { get; set; }
+    /// <summary>
+    /// Number of milliseconds of initial silence
+    /// </summary>
+    public int? MachineDetectionSilenceTimeout { get; set; }
+    /// <summary>
+    /// Enable asynchronous AMD
+    /// </summary>
+    public string AsyncAmd { get; set; }
+    /// <summary>
+    /// The URL we should call to send amd status information to your application
+    /// </summary>
+    public Uri AsyncAmdStatusCallback { get; set; }
+    /// <summary>
+    /// HTTP Method to use with async_amd_status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod AsyncAmdStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// BYOC trunk SID (Beta)
+    /// </summary>
+    public string Byoc { get; set; }
+    /// <summary>
+    /// Reason for the call (Branded Calls Beta)
+    /// </summary>
+    public string CallReason { get; set; }
+    /// <summary>
+    /// A token string needed to invoke a forwarded call with a CallerId recieved on a previous incoming call
+    /// </summary>
+    public string CallToken { get; set; }
+    /// <summary>
+    /// Which track(s) to record
+    /// </summary>
+    public string RecordingTrack { get; set; }
+    /// <summary>
+    /// The maximum duration of the call in seconds.
+    /// </summary>
+    public int? TimeLimit { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCallOptions
+    /// </summary>
+    /// <param name="to"> Phone number, SIP address, or client identifier to call </param>
+    /// <param name="from"> Twilio number from which to originate the call </param>
+    public CreateCallOptions(IEndpoint to, IEndpoint from)
+    {
+      To = to;
+      From = from;
+      StatusCallbackEvent = new List<string>();
+      RecordingStatusCallbackEvent = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To.ToString()));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From.ToString()));
+      }
+
+      if (Url != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Url", Serializers.Url(Url)));
+      }
+
+      if (Twiml != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Twiml", Twiml.ToString()));
+      }
+
+      if (ApplicationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApplicationSid", ApplicationSid.ToString()));
+      }
+
+      if (Method != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Method", Method.ToString()));
+      }
+
+      if (FallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackUrl", Serializers.Url(FallbackUrl)));
+      }
+
+      if (FallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackMethod", FallbackMethod.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackEvent != null)
+      {
+        p.AddRange(StatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("StatusCallbackEvent", prop)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (SendDigits != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SendDigits", SendDigits));
+      }
+
+      if (Timeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timeout", Timeout.ToString()));
+      }
+
+      if (Record != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Record", Record.Value.ToString().ToLower()));
+      }
+
+      if (RecordingChannels != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingChannels", RecordingChannels));
+      }
+
+      if (RecordingStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingStatusCallback", RecordingStatusCallback));
+      }
+
+      if (RecordingStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingStatusCallbackMethod", RecordingStatusCallbackMethod.ToString()));
+      }
+
+      if (SipAuthUsername != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipAuthUsername", SipAuthUsername));
+      }
+
+      if (SipAuthPassword != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipAuthPassword", SipAuthPassword));
+      }
+
+      if (MachineDetection != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MachineDetection", MachineDetection));
+      }
+
+      if (MachineDetectionTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MachineDetectionTimeout", MachineDetectionTimeout.ToString()));
+      }
+
+      if (RecordingStatusCallbackEvent != null)
+      {
+        p.AddRange(RecordingStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("RecordingStatusCallbackEvent", prop)));
+      }
+
+      if (Trim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Trim", Trim));
+      }
+
+      if (CallerId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallerId", CallerId));
+      }
+
+      if (MachineDetectionSpeechThreshold != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MachineDetectionSpeechThreshold", MachineDetectionSpeechThreshold.ToString()));
+      }
+
+      if (MachineDetectionSpeechEndThreshold != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MachineDetectionSpeechEndThreshold", MachineDetectionSpeechEndThreshold.ToString()));
+      }
+
+      if (MachineDetectionSilenceTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MachineDetectionSilenceTimeout", MachineDetectionSilenceTimeout.ToString()));
+      }
+
+      if (AsyncAmd != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AsyncAmd", AsyncAmd));
+      }
+
+      if (AsyncAmdStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AsyncAmdStatusCallback", Serializers.Url(AsyncAmdStatusCallback)));
+      }
+
+      if (AsyncAmdStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AsyncAmdStatusCallbackMethod", AsyncAmdStatusCallbackMethod.ToString()));
+      }
+
+      if (Byoc != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Byoc", Byoc.ToString()));
+      }
+
+      if (CallReason != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallReason", CallReason));
+      }
+
+      if (CallToken != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallToken", CallToken));
+      }
+
+      if (RecordingTrack != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingTrack", RecordingTrack));
+      }
+
+      if (TimeLimit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TimeLimit", TimeLimit.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a Call record from your account. Once the record is deleted, it will no longer appear in the API and Account
+  /// Portal logs.
+  /// </summary>
+  public class DeleteCallOptions : IOptions<CallResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies this resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCallOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    public DeleteCallOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch the call specified by the provided Call SID
+  /// </summary>
+  public class FetchCallOptions : IOptions<CallResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the Call resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCallOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Call resource to fetch </param>
+    public FetchCallOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieves a collection of calls made to and from your account
+  /// </summary>
+  public class ReadCallOptions : ReadOptions<CallResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// Phone number or Client identifier of calls to include
+    /// </summary>
+    public Types.PhoneNumber To { get; set; }
+    /// <summary>
+    /// Phone number or Client identifier to filter `from` on
+    /// </summary>
+    public Types.PhoneNumber From { get; set; }
+    /// <summary>
+    /// Parent call SID to filter on
+    /// </summary>
+    public string ParentCallSid { get; set; }
+    /// <summary>
+    /// The status of the resources to read
+    /// </summary>
+    public CallResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// Only include calls that started on this date
+    /// </summary>
+    public DateTime? StartTimeBefore { get; set; }
+    /// <summary>
+    /// Only include calls that started on this date
+    /// </summary>
+    public DateTime? StartTime { get; set; }
+    /// <summary>
+    /// Only include calls that started on this date
+    /// </summary>
+    public DateTime? StartTimeAfter { get; set; }
+    /// <summary>
+    /// Only include calls that ended on this date
+    /// </summary>
+    public DateTime? EndTimeBefore { get; set; }
+    /// <summary>
+    /// Only include calls that ended on this date
+    /// </summary>
+    public DateTime? EndTime { get; set; }
+    /// <summary>
+    /// Only include calls that ended on this date
+    /// </summary>
+    public DateTime? EndTimeAfter { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To.ToString()));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From.ToString()));
+      }
+
+      if (ParentCallSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ParentCallSid", ParentCallSid.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (StartTime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartTime", Serializers.DateTimeIso8601(StartTime)));
+      }
+      else
+      {
+        if (StartTimeBefore != null)
+        {
+          p.Add(new KeyValuePair<string, string>("StartTime<", Serializers.DateTimeIso8601(StartTimeBefore)));
+        }
+
+        if (StartTimeAfter != null)
+        {
+          p.Add(new KeyValuePair<string, string>("StartTime>", Serializers.DateTimeIso8601(StartTimeAfter)));
+        }
+      }
+
+      if (EndTime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndTime", Serializers.DateTimeIso8601(EndTime)));
+      }
+      else
+      {
+        if (EndTimeBefore != null)
+        {
+          p.Add(new KeyValuePair<string, string>("EndTime<", Serializers.DateTimeIso8601(EndTimeBefore)));
+        }
+
+        if (EndTimeAfter != null)
+        {
+          p.Add(new KeyValuePair<string, string>("EndTime>", Serializers.DateTimeIso8601(EndTimeAfter)));
+        }
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Initiates a call redirect or terminates a call
+  /// </summary>
+  public class UpdateCallOptions : IOptions<CallResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies this resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The absolute URL that returns TwiML for this call
+    /// </summary>
+    public Uri Url { get; set; }
+    /// <summary>
+    /// HTTP method to use to fetch TwiML
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+    /// <summary>
+    /// The new status to update the call with.
+    /// </summary>
+    public CallResource.UpdateStatusEnum Status { get; set; }
+    /// <summary>
+    /// Fallback URL in case of error
+    /// </summary>
+    public Uri FallbackUrl { get; set; }
+    /// <summary>
+    /// HTTP Method to use with fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod FallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// HTTP Method to use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// TwiML instructions for the call
+    /// </summary>
+    public Types.Twiml Twiml { get; set; }
+    /// <summary>
+    /// The maximum duration of the call in seconds.
+    /// </summary>
+    public int? TimeLimit { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateCallOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    public UpdateCallOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Url != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Url", Serializers.Url(Url)));
+      }
+
+      if (Method != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Method", Method.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (FallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackUrl", Serializers.Url(FallbackUrl)));
+      }
+
+      if (FallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackMethod", FallbackMethod.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (Twiml != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Twiml", Twiml.ToString()));
+      }
+
+      if (TimeLimit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TimeLimit", TimeLimit.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/CallResource.cs b/src/Twilio/Rest/Api/V2010/Account/CallResource.cs
index d449de844..edd168a32 100644
--- a/src/Twilio/Rest/Api/V2010/Account/CallResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/CallResource.cs
@@ -17,863 +17,863 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class CallResource : Resource
-    {
-        public sealed class EventEnum : StringEnum
-        {
-            private EventEnum(string value) : base(value) {}
-            public EventEnum() {}
-            public static implicit operator EventEnum(string value)
-            {
-                return new EventEnum(value);
-            }
-
-            public static readonly EventEnum Initiated = new EventEnum("initiated");
-            public static readonly EventEnum Ringing = new EventEnum("ringing");
-            public static readonly EventEnum Answered = new EventEnum("answered");
-            public static readonly EventEnum Completed = new EventEnum("completed");
-        }
-
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Queued = new StatusEnum("queued");
-            public static readonly StatusEnum Ringing = new StatusEnum("ringing");
-            public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Busy = new StatusEnum("busy");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-            public static readonly StatusEnum NoAnswer = new StatusEnum("no-answer");
-            public static readonly StatusEnum Canceled = new StatusEnum("canceled");
-        }
-
-        public sealed class UpdateStatusEnum : StringEnum
-        {
-            private UpdateStatusEnum(string value) : base(value) {}
-            public UpdateStatusEnum() {}
-            public static implicit operator UpdateStatusEnum(string value)
-            {
-                return new UpdateStatusEnum(value);
-            }
-
-            public static readonly UpdateStatusEnum Canceled = new UpdateStatusEnum("canceled");
-            public static readonly UpdateStatusEnum Completed = new UpdateStatusEnum("completed");
-        }
-
-        private static Request BuildCreateRequest(CreateCallOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new outgoing call to phones, SIP-enabled endpoints or Twilio Client connections
-        /// </summary>
-        /// <param name="options"> Create Call parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Call </returns>
-        public static CallResource Create(CreateCallOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new outgoing call to phones, SIP-enabled endpoints or Twilio Client connections
-        /// </summary>
-        /// <param name="options"> Create Call parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Call </returns>
-        public static async System.Threading.Tasks.Task<CallResource> CreateAsync(CreateCallOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new outgoing call to phones, SIP-enabled endpoints or Twilio Client connections
-        /// </summary>
-        /// <param name="to"> Phone number, SIP address, or client identifier to call </param>
-        /// <param name="from"> Twilio number from which to originate the call </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="url"> The absolute URL that returns TwiML for this call </param>
-        /// <param name="twiml"> TwiML instructions for the call </param>
-        /// <param name="applicationSid"> The SID of the Application resource that will handle the call </param>
-        /// <param name="method"> HTTP method to use to fetch TwiML </param>
-        /// <param name="fallbackUrl"> Fallback URL in case of error </param>
-        /// <param name="fallbackMethod"> HTTP Method to use with fallback_url </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackEvent"> The call progress events that we send to the `status_callback` URL. </param>
-        /// <param name="statusCallbackMethod"> HTTP Method to use with status_callback </param>
-        /// <param name="sendDigits"> The digits to dial after connecting to the number </param>
-        /// <param name="timeout"> Number of seconds to wait for an answer </param>
-        /// <param name="record"> Whether to record the call </param>
-        /// <param name="recordingChannels"> The number of channels in the final recording </param>
-        /// <param name="recordingStatusCallback"> The URL that we call when the recording is available to be accessed </param>
-        /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when calling the
-        ///                                     `recording_status_callback` URL </param>
-        /// <param name="sipAuthUsername"> The username used to authenticate the caller making a SIP call </param>
-        /// <param name="sipAuthPassword"> The password required to authenticate the user account specified in
-        ///                       `sip_auth_username`. </param>
-        /// <param name="machineDetection"> Enable machine detection or end of greeting detection </param>
-        /// <param name="machineDetectionTimeout"> Number of seconds to wait for machine detection </param>
-        /// <param name="recordingStatusCallbackEvent"> The recording status events that will trigger calls to the URL
-        ///                                    specified in `recording_status_callback` </param>
-        /// <param name="trim"> Set this parameter to control trimming of silence on the recording. </param>
-        /// <param name="callerId"> The phone number, SIP address, or Client identifier that made this call. Phone numbers are
-        ///                in E.164 format (e.g., +16175551212). SIP addresses are formatted as `name@company.com`. </param>
-        /// <param name="machineDetectionSpeechThreshold"> Number of milliseconds for measuring stick for the length of the
-        ///                                       speech activity </param>
-        /// <param name="machineDetectionSpeechEndThreshold"> Number of milliseconds of silence after speech activity </param>
-        /// <param name="machineDetectionSilenceTimeout"> Number of milliseconds of initial silence </param>
-        /// <param name="asyncAmd"> Enable asynchronous AMD </param>
-        /// <param name="asyncAmdStatusCallback"> The URL we should call to send amd status information to your application
-        ///                              </param>
-        /// <param name="asyncAmdStatusCallbackMethod"> HTTP Method to use with async_amd_status_callback </param>
-        /// <param name="byoc"> BYOC trunk SID (Beta) </param>
-        /// <param name="callReason"> Reason for the call (Branded Calls Beta) </param>
-        /// <param name="callToken"> A token string needed to invoke a forwarded call with a CallerId recieved on a previous
-        ///                 incoming call </param>
-        /// <param name="recordingTrack"> Which track(s) to record </param>
-        /// <param name="timeLimit"> The maximum duration of the call in seconds. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Call </returns>
-        public static CallResource Create(IEndpoint to,
-                                          IEndpoint from,
-                                          string pathAccountSid = null,
-                                          Uri url = null,
-                                          Types.Twiml twiml = null,
-                                          string applicationSid = null,
-                                          Twilio.Http.HttpMethod method = null,
-                                          Uri fallbackUrl = null,
-                                          Twilio.Http.HttpMethod fallbackMethod = null,
-                                          Uri statusCallback = null,
-                                          List<string> statusCallbackEvent = null,
-                                          Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                          string sendDigits = null,
-                                          int? timeout = null,
-                                          bool? record = null,
-                                          string recordingChannels = null,
-                                          string recordingStatusCallback = null,
-                                          Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                                          string sipAuthUsername = null,
-                                          string sipAuthPassword = null,
-                                          string machineDetection = null,
-                                          int? machineDetectionTimeout = null,
-                                          List<string> recordingStatusCallbackEvent = null,
-                                          string trim = null,
-                                          string callerId = null,
-                                          int? machineDetectionSpeechThreshold = null,
-                                          int? machineDetectionSpeechEndThreshold = null,
-                                          int? machineDetectionSilenceTimeout = null,
-                                          string asyncAmd = null,
-                                          Uri asyncAmdStatusCallback = null,
-                                          Twilio.Http.HttpMethod asyncAmdStatusCallbackMethod = null,
-                                          string byoc = null,
-                                          string callReason = null,
-                                          string callToken = null,
-                                          string recordingTrack = null,
-                                          int? timeLimit = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateCallOptions(to, from){PathAccountSid = pathAccountSid, Url = url, Twiml = twiml, ApplicationSid = applicationSid, Method = method, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StatusCallbackEvent = statusCallbackEvent, StatusCallbackMethod = statusCallbackMethod, SendDigits = sendDigits, Timeout = timeout, Record = record, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, MachineDetection = machineDetection, MachineDetectionTimeout = machineDetectionTimeout, RecordingStatusCallbackEvent = recordingStatusCallbackEvent, Trim = trim, CallerId = callerId, MachineDetectionSpeechThreshold = machineDetectionSpeechThreshold, MachineDetectionSpeechEndThreshold = machineDetectionSpeechEndThreshold, MachineDetectionSilenceTimeout = machineDetectionSilenceTimeout, AsyncAmd = asyncAmd, AsyncAmdStatusCallback = asyncAmdStatusCallback, AsyncAmdStatusCallbackMethod = asyncAmdStatusCallbackMethod, Byoc = byoc, CallReason = callReason, CallToken = callToken, RecordingTrack = recordingTrack, TimeLimit = timeLimit};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new outgoing call to phones, SIP-enabled endpoints or Twilio Client connections
-        /// </summary>
-        /// <param name="to"> Phone number, SIP address, or client identifier to call </param>
-        /// <param name="from"> Twilio number from which to originate the call </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="url"> The absolute URL that returns TwiML for this call </param>
-        /// <param name="twiml"> TwiML instructions for the call </param>
-        /// <param name="applicationSid"> The SID of the Application resource that will handle the call </param>
-        /// <param name="method"> HTTP method to use to fetch TwiML </param>
-        /// <param name="fallbackUrl"> Fallback URL in case of error </param>
-        /// <param name="fallbackMethod"> HTTP Method to use with fallback_url </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackEvent"> The call progress events that we send to the `status_callback` URL. </param>
-        /// <param name="statusCallbackMethod"> HTTP Method to use with status_callback </param>
-        /// <param name="sendDigits"> The digits to dial after connecting to the number </param>
-        /// <param name="timeout"> Number of seconds to wait for an answer </param>
-        /// <param name="record"> Whether to record the call </param>
-        /// <param name="recordingChannels"> The number of channels in the final recording </param>
-        /// <param name="recordingStatusCallback"> The URL that we call when the recording is available to be accessed </param>
-        /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when calling the
-        ///                                     `recording_status_callback` URL </param>
-        /// <param name="sipAuthUsername"> The username used to authenticate the caller making a SIP call </param>
-        /// <param name="sipAuthPassword"> The password required to authenticate the user account specified in
-        ///                       `sip_auth_username`. </param>
-        /// <param name="machineDetection"> Enable machine detection or end of greeting detection </param>
-        /// <param name="machineDetectionTimeout"> Number of seconds to wait for machine detection </param>
-        /// <param name="recordingStatusCallbackEvent"> The recording status events that will trigger calls to the URL
-        ///                                    specified in `recording_status_callback` </param>
-        /// <param name="trim"> Set this parameter to control trimming of silence on the recording. </param>
-        /// <param name="callerId"> The phone number, SIP address, or Client identifier that made this call. Phone numbers are
-        ///                in E.164 format (e.g., +16175551212). SIP addresses are formatted as `name@company.com`. </param>
-        /// <param name="machineDetectionSpeechThreshold"> Number of milliseconds for measuring stick for the length of the
-        ///                                       speech activity </param>
-        /// <param name="machineDetectionSpeechEndThreshold"> Number of milliseconds of silence after speech activity </param>
-        /// <param name="machineDetectionSilenceTimeout"> Number of milliseconds of initial silence </param>
-        /// <param name="asyncAmd"> Enable asynchronous AMD </param>
-        /// <param name="asyncAmdStatusCallback"> The URL we should call to send amd status information to your application
-        ///                              </param>
-        /// <param name="asyncAmdStatusCallbackMethod"> HTTP Method to use with async_amd_status_callback </param>
-        /// <param name="byoc"> BYOC trunk SID (Beta) </param>
-        /// <param name="callReason"> Reason for the call (Branded Calls Beta) </param>
-        /// <param name="callToken"> A token string needed to invoke a forwarded call with a CallerId recieved on a previous
-        ///                 incoming call </param>
-        /// <param name="recordingTrack"> Which track(s) to record </param>
-        /// <param name="timeLimit"> The maximum duration of the call in seconds. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Call </returns>
-        public static async System.Threading.Tasks.Task<CallResource> CreateAsync(IEndpoint to,
-                                                                                  IEndpoint from,
-                                                                                  string pathAccountSid = null,
-                                                                                  Uri url = null,
-                                                                                  Types.Twiml twiml = null,
-                                                                                  string applicationSid = null,
-                                                                                  Twilio.Http.HttpMethod method = null,
-                                                                                  Uri fallbackUrl = null,
-                                                                                  Twilio.Http.HttpMethod fallbackMethod = null,
-                                                                                  Uri statusCallback = null,
-                                                                                  List<string> statusCallbackEvent = null,
-                                                                                  Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                  string sendDigits = null,
-                                                                                  int? timeout = null,
-                                                                                  bool? record = null,
-                                                                                  string recordingChannels = null,
-                                                                                  string recordingStatusCallback = null,
-                                                                                  Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                                                                                  string sipAuthUsername = null,
-                                                                                  string sipAuthPassword = null,
-                                                                                  string machineDetection = null,
-                                                                                  int? machineDetectionTimeout = null,
-                                                                                  List<string> recordingStatusCallbackEvent = null,
-                                                                                  string trim = null,
-                                                                                  string callerId = null,
-                                                                                  int? machineDetectionSpeechThreshold = null,
-                                                                                  int? machineDetectionSpeechEndThreshold = null,
-                                                                                  int? machineDetectionSilenceTimeout = null,
-                                                                                  string asyncAmd = null,
-                                                                                  Uri asyncAmdStatusCallback = null,
-                                                                                  Twilio.Http.HttpMethod asyncAmdStatusCallbackMethod = null,
-                                                                                  string byoc = null,
-                                                                                  string callReason = null,
-                                                                                  string callToken = null,
-                                                                                  string recordingTrack = null,
-                                                                                  int? timeLimit = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateCallOptions(to, from){PathAccountSid = pathAccountSid, Url = url, Twiml = twiml, ApplicationSid = applicationSid, Method = method, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StatusCallbackEvent = statusCallbackEvent, StatusCallbackMethod = statusCallbackMethod, SendDigits = sendDigits, Timeout = timeout, Record = record, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, MachineDetection = machineDetection, MachineDetectionTimeout = machineDetectionTimeout, RecordingStatusCallbackEvent = recordingStatusCallbackEvent, Trim = trim, CallerId = callerId, MachineDetectionSpeechThreshold = machineDetectionSpeechThreshold, MachineDetectionSpeechEndThreshold = machineDetectionSpeechEndThreshold, MachineDetectionSilenceTimeout = machineDetectionSilenceTimeout, AsyncAmd = asyncAmd, AsyncAmdStatusCallback = asyncAmdStatusCallback, AsyncAmdStatusCallbackMethod = asyncAmdStatusCallbackMethod, Byoc = byoc, CallReason = callReason, CallToken = callToken, RecordingTrack = recordingTrack, TimeLimit = timeLimit};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCallOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a Call record from your account. Once the record is deleted, it will no longer appear in the API and Account
-        /// Portal logs.
-        /// </summary>
-        /// <param name="options"> Delete Call parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Call </returns>
-        public static bool Delete(DeleteCallOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Call record from your account. Once the record is deleted, it will no longer appear in the API and Account
-        /// Portal logs.
-        /// </summary>
-        /// <param name="options"> Delete Call parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Call </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCallOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a Call record from your account. Once the record is deleted, it will no longer appear in the API and Account
-        /// Portal logs.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Call </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCallOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Call record from your account. Once the record is deleted, it will no longer appear in the API and Account
-        /// Portal logs.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Call </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteCallOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchCallOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the call specified by the provided Call SID
-        /// </summary>
-        /// <param name="options"> Fetch Call parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Call </returns>
-        public static CallResource Fetch(FetchCallOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the call specified by the provided Call SID
-        /// </summary>
-        /// <param name="options"> Fetch Call parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Call </returns>
-        public static async System.Threading.Tasks.Task<CallResource> FetchAsync(FetchCallOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the call specified by the provided Call SID
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Call resource to fetch </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Call </returns>
-        public static CallResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchCallOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the call specified by the provided Call SID
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Call resource to fetch </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Call </returns>
-        public static async System.Threading.Tasks.Task<CallResource> FetchAsync(string pathSid,
-                                                                                 string pathAccountSid = null,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchCallOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCallOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieves a collection of calls made to and from your account
-        /// </summary>
-        /// <param name="options"> Read Call parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Call </returns>
-        public static ResourceSet<CallResource> Read(ReadCallOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CallResource>.FromJson("calls", response.Content);
-            return new ResourceSet<CallResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieves a collection of calls made to and from your account
-        /// </summary>
-        /// <param name="options"> Read Call parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Call </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CallResource>> ReadAsync(ReadCallOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CallResource>.FromJson("calls", response.Content);
-            return new ResourceSet<CallResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieves a collection of calls made to and from your account
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
-        /// <param name="to"> Phone number or Client identifier of calls to include </param>
-        /// <param name="from"> Phone number or Client identifier to filter `from` on </param>
-        /// <param name="parentCallSid"> Parent call SID to filter on </param>
-        /// <param name="status"> The status of the resources to read </param>
-        /// <param name="startTimeBefore"> Only include calls that started on this date </param>
-        /// <param name="startTime"> Only include calls that started on this date </param>
-        /// <param name="startTimeAfter"> Only include calls that started on this date </param>
-        /// <param name="endTimeBefore"> Only include calls that ended on this date </param>
-        /// <param name="endTime"> Only include calls that ended on this date </param>
-        /// <param name="endTimeAfter"> Only include calls that ended on this date </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Call </returns>
-        public static ResourceSet<CallResource> Read(string pathAccountSid = null,
-                                                     Types.PhoneNumber to = null,
-                                                     Types.PhoneNumber from = null,
-                                                     string parentCallSid = null,
-                                                     CallResource.StatusEnum status = null,
-                                                     DateTime? startTimeBefore = null,
-                                                     DateTime? startTime = null,
-                                                     DateTime? startTimeAfter = null,
-                                                     DateTime? endTimeBefore = null,
-                                                     DateTime? endTime = null,
-                                                     DateTime? endTimeAfter = null,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadCallOptions(){PathAccountSid = pathAccountSid, To = to, From = from, ParentCallSid = parentCallSid, Status = status, StartTimeBefore = startTimeBefore, StartTime = startTime, StartTimeAfter = startTimeAfter, EndTimeBefore = endTimeBefore, EndTime = endTime, EndTimeAfter = endTimeAfter, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieves a collection of calls made to and from your account
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
-        /// <param name="to"> Phone number or Client identifier of calls to include </param>
-        /// <param name="from"> Phone number or Client identifier to filter `from` on </param>
-        /// <param name="parentCallSid"> Parent call SID to filter on </param>
-        /// <param name="status"> The status of the resources to read </param>
-        /// <param name="startTimeBefore"> Only include calls that started on this date </param>
-        /// <param name="startTime"> Only include calls that started on this date </param>
-        /// <param name="startTimeAfter"> Only include calls that started on this date </param>
-        /// <param name="endTimeBefore"> Only include calls that ended on this date </param>
-        /// <param name="endTime"> Only include calls that ended on this date </param>
-        /// <param name="endTimeAfter"> Only include calls that ended on this date </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Call </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CallResource>> ReadAsync(string pathAccountSid = null,
-                                                                                             Types.PhoneNumber to = null,
-                                                                                             Types.PhoneNumber from = null,
-                                                                                             string parentCallSid = null,
-                                                                                             CallResource.StatusEnum status = null,
-                                                                                             DateTime? startTimeBefore = null,
-                                                                                             DateTime? startTime = null,
-                                                                                             DateTime? startTimeAfter = null,
-                                                                                             DateTime? endTimeBefore = null,
-                                                                                             DateTime? endTime = null,
-                                                                                             DateTime? endTimeAfter = null,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadCallOptions(){PathAccountSid = pathAccountSid, To = to, From = from, ParentCallSid = parentCallSid, Status = status, StartTimeBefore = startTimeBefore, StartTime = startTime, StartTimeAfter = startTimeAfter, EndTimeBefore = endTimeBefore, EndTime = endTime, EndTimeAfter = endTimeAfter, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CallResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CallResource>.FromJson("calls", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CallResource> NextPage(Page<CallResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<CallResource>.FromJson("calls", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CallResource> PreviousPage(Page<CallResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<CallResource>.FromJson("calls", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateCallOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Initiates a call redirect or terminates a call
-        /// </summary>
-        /// <param name="options"> Update Call parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Call </returns>
-        public static CallResource Update(UpdateCallOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Initiates a call redirect or terminates a call
-        /// </summary>
-        /// <param name="options"> Update Call parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Call </returns>
-        public static async System.Threading.Tasks.Task<CallResource> UpdateAsync(UpdateCallOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Initiates a call redirect or terminates a call
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
-        /// <param name="url"> The absolute URL that returns TwiML for this call </param>
-        /// <param name="method"> HTTP method to use to fetch TwiML </param>
-        /// <param name="status"> The new status to update the call with. </param>
-        /// <param name="fallbackUrl"> Fallback URL in case of error </param>
-        /// <param name="fallbackMethod"> HTTP Method to use with fallback_url </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> HTTP Method to use to call status_callback </param>
-        /// <param name="twiml"> TwiML instructions for the call </param>
-        /// <param name="timeLimit"> The maximum duration of the call in seconds. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Call </returns>
-        public static CallResource Update(string pathSid,
-                                          string pathAccountSid = null,
-                                          Uri url = null,
-                                          Twilio.Http.HttpMethod method = null,
-                                          CallResource.UpdateStatusEnum status = null,
-                                          Uri fallbackUrl = null,
-                                          Twilio.Http.HttpMethod fallbackMethod = null,
-                                          Uri statusCallback = null,
-                                          Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                          Types.Twiml twiml = null,
-                                          int? timeLimit = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateCallOptions(pathSid){PathAccountSid = pathAccountSid, Url = url, Method = method, Status = status, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Twiml = twiml, TimeLimit = timeLimit};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Initiates a call redirect or terminates a call
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
-        /// <param name="url"> The absolute URL that returns TwiML for this call </param>
-        /// <param name="method"> HTTP method to use to fetch TwiML </param>
-        /// <param name="status"> The new status to update the call with. </param>
-        /// <param name="fallbackUrl"> Fallback URL in case of error </param>
-        /// <param name="fallbackMethod"> HTTP Method to use with fallback_url </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> HTTP Method to use to call status_callback </param>
-        /// <param name="twiml"> TwiML instructions for the call </param>
-        /// <param name="timeLimit"> The maximum duration of the call in seconds. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Call </returns>
-        public static async System.Threading.Tasks.Task<CallResource> UpdateAsync(string pathSid,
-                                                                                  string pathAccountSid = null,
-                                                                                  Uri url = null,
-                                                                                  Twilio.Http.HttpMethod method = null,
-                                                                                  CallResource.UpdateStatusEnum status = null,
-                                                                                  Uri fallbackUrl = null,
-                                                                                  Twilio.Http.HttpMethod fallbackMethod = null,
-                                                                                  Uri statusCallback = null,
-                                                                                  Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                  Types.Twiml twiml = null,
-                                                                                  int? timeLimit = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateCallOptions(pathSid){PathAccountSid = pathAccountSid, Url = url, Method = method, Status = status, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Twiml = twiml, TimeLimit = timeLimit};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CallResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CallResource object represented by the provided JSON </returns>
-        public static CallResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CallResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The SID that identifies the call that created this leg.
-        /// </summary>
-        [JsonProperty("parent_call_sid")]
-        public string ParentCallSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created this resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The phone number, SIP address or Client identifier that received this call. Phone numbers are in E.164 format (e.g., +16175551212). SIP addresses are formatted as `name@company.com`. Client identifiers are formatted `client:name`.
-        /// </summary>
-        [JsonProperty("to")]
-        public string To { get; private set; }
-        /// <summary>
-        /// The phone number, SIP address or Client identifier that received this call. Formatted for display.
-        /// </summary>
-        [JsonProperty("to_formatted")]
-        public string ToFormatted { get; private set; }
-        /// <summary>
-        /// The phone number, SIP address or Client identifier that made this call. Phone numbers are in E.164 format (e.g., +16175551212). SIP addresses are formatted as `name@company.com`. Client identifiers are formatted `client:name`.
-        /// </summary>
-        [JsonProperty("from")]
-        public string From { get; private set; }
-        /// <summary>
-        /// The calling phone number, SIP address, or Client identifier formatted for display.
-        /// </summary>
-        [JsonProperty("from_formatted")]
-        public string FromFormatted { get; private set; }
-        /// <summary>
-        /// If the call was inbound, this is the SID of the IncomingPhoneNumber resource that received the call. If the call was outbound, it is the SID of the OutgoingCallerId resource from which the call was placed.
-        /// </summary>
-        [JsonProperty("phone_number_sid")]
-        public string PhoneNumberSid { get; private set; }
-        /// <summary>
-        /// The status of this call.
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CallResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The start time of the call. Null if the call has not yet been dialed.
-        /// </summary>
-        [JsonProperty("start_time")]
-        public DateTime? StartTime { get; private set; }
-        /// <summary>
-        /// The end time of the call. Null if the call did not complete successfully.
-        /// </summary>
-        [JsonProperty("end_time")]
-        public DateTime? EndTime { get; private set; }
-        /// <summary>
-        /// The length of the call in seconds.
-        /// </summary>
-        [JsonProperty("duration")]
-        public string Duration { get; private set; }
-        /// <summary>
-        /// The charge for this call, in the currency associated with the account. Populated after the call is completed. May not be immediately available.
-        /// </summary>
-        [JsonProperty("price")]
-        public string Price { get; private set; }
-        /// <summary>
-        /// The currency in which `Price` is measured.
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// A string describing the direction of the call. `inbound` for inbound calls, `outbound-api` for calls initiated via the REST API or `outbound-dial` for calls initiated by a `Dial` verb.
-        /// </summary>
-        [JsonProperty("direction")]
-        public string Direction { get; private set; }
-        /// <summary>
-        /// Either `human` or `machine` if this call was initiated with answering machine detection. Empty otherwise.
-        /// </summary>
-        [JsonProperty("answered_by")]
-        public string AnsweredBy { get; private set; }
-        /// <summary>
-        /// The annotation provided for the call
-        /// </summary>
-        [JsonProperty("annotation")]
-        public string Annotation { get; private set; }
-        /// <summary>
-        /// The API Version used to create the call
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The forwarding phone number if this call was an incoming call forwarded from another number (depends on carrier supporting forwarding). Otherwise, empty.
-        /// </summary>
-        [JsonProperty("forwarded_from")]
-        public string ForwardedFrom { get; private set; }
-        /// <summary>
-        /// The Group SID associated with this call. If no Group is associated with the call, the field is empty.
-        /// </summary>
-        [JsonProperty("group_sid")]
-        public string GroupSid { get; private set; }
-        /// <summary>
-        /// The caller's name if this call was an incoming call to a phone number with caller ID Lookup enabled. Otherwise, empty.
-        /// </summary>
-        [JsonProperty("caller_name")]
-        public string CallerName { get; private set; }
-        /// <summary>
-        /// The wait time in milliseconds before the call is placed.
-        /// </summary>
-        [JsonProperty("queue_time")]
-        public string QueueTime { get; private set; }
-        /// <summary>
-        /// The (optional) unique identifier of the trunk resource that was used for this call.
-        /// </summary>
-        [JsonProperty("trunk_sid")]
-        public string TrunkSid { get; private set; }
-        /// <summary>
-        /// The URI of this resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// A list of related subresources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-
-        private CallResource()
-        {
-
-        }
-    }
+{
+
+  public class CallResource : Resource
+  {
+    public sealed class EventEnum : StringEnum
+    {
+      private EventEnum(string value) : base(value) { }
+      public EventEnum() { }
+      public static implicit operator EventEnum(string value)
+      {
+        return new EventEnum(value);
+      }
+
+      public static readonly EventEnum Initiated = new EventEnum("initiated");
+      public static readonly EventEnum Ringing = new EventEnum("ringing");
+      public static readonly EventEnum Answered = new EventEnum("answered");
+      public static readonly EventEnum Completed = new EventEnum("completed");
+    }
+
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Queued = new StatusEnum("queued");
+      public static readonly StatusEnum Ringing = new StatusEnum("ringing");
+      public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Busy = new StatusEnum("busy");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+      public static readonly StatusEnum NoAnswer = new StatusEnum("no-answer");
+      public static readonly StatusEnum Canceled = new StatusEnum("canceled");
+    }
+
+    public sealed class UpdateStatusEnum : StringEnum
+    {
+      private UpdateStatusEnum(string value) : base(value) { }
+      public UpdateStatusEnum() { }
+      public static implicit operator UpdateStatusEnum(string value)
+      {
+        return new UpdateStatusEnum(value);
+      }
+
+      public static readonly UpdateStatusEnum Canceled = new UpdateStatusEnum("canceled");
+      public static readonly UpdateStatusEnum Completed = new UpdateStatusEnum("completed");
+    }
+
+    private static Request BuildCreateRequest(CreateCallOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new outgoing call to phones, SIP-enabled endpoints or Twilio Client connections
+    /// </summary>
+    /// <param name="options"> Create Call parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Call </returns>
+    public static CallResource Create(CreateCallOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new outgoing call to phones, SIP-enabled endpoints or Twilio Client connections
+    /// </summary>
+    /// <param name="options"> Create Call parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Call </returns>
+    public static async System.Threading.Tasks.Task<CallResource> CreateAsync(CreateCallOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new outgoing call to phones, SIP-enabled endpoints or Twilio Client connections
+    /// </summary>
+    /// <param name="to"> Phone number, SIP address, or client identifier to call </param>
+    /// <param name="from"> Twilio number from which to originate the call </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="url"> The absolute URL that returns TwiML for this call </param>
+    /// <param name="twiml"> TwiML instructions for the call </param>
+    /// <param name="applicationSid"> The SID of the Application resource that will handle the call </param>
+    /// <param name="method"> HTTP method to use to fetch TwiML </param>
+    /// <param name="fallbackUrl"> Fallback URL in case of error </param>
+    /// <param name="fallbackMethod"> HTTP Method to use with fallback_url </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackEvent"> The call progress events that we send to the `status_callback` URL. </param>
+    /// <param name="statusCallbackMethod"> HTTP Method to use with status_callback </param>
+    /// <param name="sendDigits"> The digits to dial after connecting to the number </param>
+    /// <param name="timeout"> Number of seconds to wait for an answer </param>
+    /// <param name="record"> Whether to record the call </param>
+    /// <param name="recordingChannels"> The number of channels in the final recording </param>
+    /// <param name="recordingStatusCallback"> The URL that we call when the recording is available to be accessed </param>
+    /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when calling the
+    ///                                     `recording_status_callback` URL </param>
+    /// <param name="sipAuthUsername"> The username used to authenticate the caller making a SIP call </param>
+    /// <param name="sipAuthPassword"> The password required to authenticate the user account specified in
+    ///                       `sip_auth_username`. </param>
+    /// <param name="machineDetection"> Enable machine detection or end of greeting detection </param>
+    /// <param name="machineDetectionTimeout"> Number of seconds to wait for machine detection </param>
+    /// <param name="recordingStatusCallbackEvent"> The recording status events that will trigger calls to the URL
+    ///                                    specified in `recording_status_callback` </param>
+    /// <param name="trim"> Set this parameter to control trimming of silence on the recording. </param>
+    /// <param name="callerId"> The phone number, SIP address, or Client identifier that made this call. Phone numbers are
+    ///                in E.164 format (e.g., +16175551212). SIP addresses are formatted as `name@company.com`. </param>
+    /// <param name="machineDetectionSpeechThreshold"> Number of milliseconds for measuring stick for the length of the
+    ///                                       speech activity </param>
+    /// <param name="machineDetectionSpeechEndThreshold"> Number of milliseconds of silence after speech activity </param>
+    /// <param name="machineDetectionSilenceTimeout"> Number of milliseconds of initial silence </param>
+    /// <param name="asyncAmd"> Enable asynchronous AMD </param>
+    /// <param name="asyncAmdStatusCallback"> The URL we should call to send amd status information to your application
+    ///                              </param>
+    /// <param name="asyncAmdStatusCallbackMethod"> HTTP Method to use with async_amd_status_callback </param>
+    /// <param name="byoc"> BYOC trunk SID (Beta) </param>
+    /// <param name="callReason"> Reason for the call (Branded Calls Beta) </param>
+    /// <param name="callToken"> A token string needed to invoke a forwarded call with a CallerId recieved on a previous
+    ///                 incoming call </param>
+    /// <param name="recordingTrack"> Which track(s) to record </param>
+    /// <param name="timeLimit"> The maximum duration of the call in seconds. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Call </returns>
+    public static CallResource Create(IEndpoint to,
+                                      IEndpoint from,
+                                      string pathAccountSid = null,
+                                      Uri url = null,
+                                      Types.Twiml twiml = null,
+                                      string applicationSid = null,
+                                      Twilio.Http.HttpMethod method = null,
+                                      Uri fallbackUrl = null,
+                                      Twilio.Http.HttpMethod fallbackMethod = null,
+                                      Uri statusCallback = null,
+                                      List<string> statusCallbackEvent = null,
+                                      Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                      string sendDigits = null,
+                                      int? timeout = null,
+                                      bool? record = null,
+                                      string recordingChannels = null,
+                                      string recordingStatusCallback = null,
+                                      Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                                      string sipAuthUsername = null,
+                                      string sipAuthPassword = null,
+                                      string machineDetection = null,
+                                      int? machineDetectionTimeout = null,
+                                      List<string> recordingStatusCallbackEvent = null,
+                                      string trim = null,
+                                      string callerId = null,
+                                      int? machineDetectionSpeechThreshold = null,
+                                      int? machineDetectionSpeechEndThreshold = null,
+                                      int? machineDetectionSilenceTimeout = null,
+                                      string asyncAmd = null,
+                                      Uri asyncAmdStatusCallback = null,
+                                      Twilio.Http.HttpMethod asyncAmdStatusCallbackMethod = null,
+                                      string byoc = null,
+                                      string callReason = null,
+                                      string callToken = null,
+                                      string recordingTrack = null,
+                                      int? timeLimit = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateCallOptions(to, from) { PathAccountSid = pathAccountSid, Url = url, Twiml = twiml, ApplicationSid = applicationSid, Method = method, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StatusCallbackEvent = statusCallbackEvent, StatusCallbackMethod = statusCallbackMethod, SendDigits = sendDigits, Timeout = timeout, Record = record, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, MachineDetection = machineDetection, MachineDetectionTimeout = machineDetectionTimeout, RecordingStatusCallbackEvent = recordingStatusCallbackEvent, Trim = trim, CallerId = callerId, MachineDetectionSpeechThreshold = machineDetectionSpeechThreshold, MachineDetectionSpeechEndThreshold = machineDetectionSpeechEndThreshold, MachineDetectionSilenceTimeout = machineDetectionSilenceTimeout, AsyncAmd = asyncAmd, AsyncAmdStatusCallback = asyncAmdStatusCallback, AsyncAmdStatusCallbackMethod = asyncAmdStatusCallbackMethod, Byoc = byoc, CallReason = callReason, CallToken = callToken, RecordingTrack = recordingTrack, TimeLimit = timeLimit };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new outgoing call to phones, SIP-enabled endpoints or Twilio Client connections
+    /// </summary>
+    /// <param name="to"> Phone number, SIP address, or client identifier to call </param>
+    /// <param name="from"> Twilio number from which to originate the call </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="url"> The absolute URL that returns TwiML for this call </param>
+    /// <param name="twiml"> TwiML instructions for the call </param>
+    /// <param name="applicationSid"> The SID of the Application resource that will handle the call </param>
+    /// <param name="method"> HTTP method to use to fetch TwiML </param>
+    /// <param name="fallbackUrl"> Fallback URL in case of error </param>
+    /// <param name="fallbackMethod"> HTTP Method to use with fallback_url </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackEvent"> The call progress events that we send to the `status_callback` URL. </param>
+    /// <param name="statusCallbackMethod"> HTTP Method to use with status_callback </param>
+    /// <param name="sendDigits"> The digits to dial after connecting to the number </param>
+    /// <param name="timeout"> Number of seconds to wait for an answer </param>
+    /// <param name="record"> Whether to record the call </param>
+    /// <param name="recordingChannels"> The number of channels in the final recording </param>
+    /// <param name="recordingStatusCallback"> The URL that we call when the recording is available to be accessed </param>
+    /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when calling the
+    ///                                     `recording_status_callback` URL </param>
+    /// <param name="sipAuthUsername"> The username used to authenticate the caller making a SIP call </param>
+    /// <param name="sipAuthPassword"> The password required to authenticate the user account specified in
+    ///                       `sip_auth_username`. </param>
+    /// <param name="machineDetection"> Enable machine detection or end of greeting detection </param>
+    /// <param name="machineDetectionTimeout"> Number of seconds to wait for machine detection </param>
+    /// <param name="recordingStatusCallbackEvent"> The recording status events that will trigger calls to the URL
+    ///                                    specified in `recording_status_callback` </param>
+    /// <param name="trim"> Set this parameter to control trimming of silence on the recording. </param>
+    /// <param name="callerId"> The phone number, SIP address, or Client identifier that made this call. Phone numbers are
+    ///                in E.164 format (e.g., +16175551212). SIP addresses are formatted as `name@company.com`. </param>
+    /// <param name="machineDetectionSpeechThreshold"> Number of milliseconds for measuring stick for the length of the
+    ///                                       speech activity </param>
+    /// <param name="machineDetectionSpeechEndThreshold"> Number of milliseconds of silence after speech activity </param>
+    /// <param name="machineDetectionSilenceTimeout"> Number of milliseconds of initial silence </param>
+    /// <param name="asyncAmd"> Enable asynchronous AMD </param>
+    /// <param name="asyncAmdStatusCallback"> The URL we should call to send amd status information to your application
+    ///                              </param>
+    /// <param name="asyncAmdStatusCallbackMethod"> HTTP Method to use with async_amd_status_callback </param>
+    /// <param name="byoc"> BYOC trunk SID (Beta) </param>
+    /// <param name="callReason"> Reason for the call (Branded Calls Beta) </param>
+    /// <param name="callToken"> A token string needed to invoke a forwarded call with a CallerId recieved on a previous
+    ///                 incoming call </param>
+    /// <param name="recordingTrack"> Which track(s) to record </param>
+    /// <param name="timeLimit"> The maximum duration of the call in seconds. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Call </returns>
+    public static async System.Threading.Tasks.Task<CallResource> CreateAsync(IEndpoint to,
+                                                                              IEndpoint from,
+                                                                              string pathAccountSid = null,
+                                                                              Uri url = null,
+                                                                              Types.Twiml twiml = null,
+                                                                              string applicationSid = null,
+                                                                              Twilio.Http.HttpMethod method = null,
+                                                                              Uri fallbackUrl = null,
+                                                                              Twilio.Http.HttpMethod fallbackMethod = null,
+                                                                              Uri statusCallback = null,
+                                                                              List<string> statusCallbackEvent = null,
+                                                                              Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                              string sendDigits = null,
+                                                                              int? timeout = null,
+                                                                              bool? record = null,
+                                                                              string recordingChannels = null,
+                                                                              string recordingStatusCallback = null,
+                                                                              Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                                                                              string sipAuthUsername = null,
+                                                                              string sipAuthPassword = null,
+                                                                              string machineDetection = null,
+                                                                              int? machineDetectionTimeout = null,
+                                                                              List<string> recordingStatusCallbackEvent = null,
+                                                                              string trim = null,
+                                                                              string callerId = null,
+                                                                              int? machineDetectionSpeechThreshold = null,
+                                                                              int? machineDetectionSpeechEndThreshold = null,
+                                                                              int? machineDetectionSilenceTimeout = null,
+                                                                              string asyncAmd = null,
+                                                                              Uri asyncAmdStatusCallback = null,
+                                                                              Twilio.Http.HttpMethod asyncAmdStatusCallbackMethod = null,
+                                                                              string byoc = null,
+                                                                              string callReason = null,
+                                                                              string callToken = null,
+                                                                              string recordingTrack = null,
+                                                                              int? timeLimit = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateCallOptions(to, from) { PathAccountSid = pathAccountSid, Url = url, Twiml = twiml, ApplicationSid = applicationSid, Method = method, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StatusCallbackEvent = statusCallbackEvent, StatusCallbackMethod = statusCallbackMethod, SendDigits = sendDigits, Timeout = timeout, Record = record, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, MachineDetection = machineDetection, MachineDetectionTimeout = machineDetectionTimeout, RecordingStatusCallbackEvent = recordingStatusCallbackEvent, Trim = trim, CallerId = callerId, MachineDetectionSpeechThreshold = machineDetectionSpeechThreshold, MachineDetectionSpeechEndThreshold = machineDetectionSpeechEndThreshold, MachineDetectionSilenceTimeout = machineDetectionSilenceTimeout, AsyncAmd = asyncAmd, AsyncAmdStatusCallback = asyncAmdStatusCallback, AsyncAmdStatusCallbackMethod = asyncAmdStatusCallbackMethod, Byoc = byoc, CallReason = callReason, CallToken = callToken, RecordingTrack = recordingTrack, TimeLimit = timeLimit };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCallOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a Call record from your account. Once the record is deleted, it will no longer appear in the API and Account
+    /// Portal logs.
+    /// </summary>
+    /// <param name="options"> Delete Call parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Call </returns>
+    public static bool Delete(DeleteCallOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Call record from your account. Once the record is deleted, it will no longer appear in the API and Account
+    /// Portal logs.
+    /// </summary>
+    /// <param name="options"> Delete Call parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Call </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCallOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a Call record from your account. Once the record is deleted, it will no longer appear in the API and Account
+    /// Portal logs.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Call </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCallOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Call record from your account. Once the record is deleted, it will no longer appear in the API and Account
+    /// Portal logs.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Call </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteCallOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchCallOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the call specified by the provided Call SID
+    /// </summary>
+    /// <param name="options"> Fetch Call parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Call </returns>
+    public static CallResource Fetch(FetchCallOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the call specified by the provided Call SID
+    /// </summary>
+    /// <param name="options"> Fetch Call parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Call </returns>
+    public static async System.Threading.Tasks.Task<CallResource> FetchAsync(FetchCallOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the call specified by the provided Call SID
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Call resource to fetch </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Call </returns>
+    public static CallResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchCallOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the call specified by the provided Call SID
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Call resource to fetch </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Call </returns>
+    public static async System.Threading.Tasks.Task<CallResource> FetchAsync(string pathSid,
+                                                                             string pathAccountSid = null,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchCallOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCallOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieves a collection of calls made to and from your account
+    /// </summary>
+    /// <param name="options"> Read Call parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Call </returns>
+    public static ResourceSet<CallResource> Read(ReadCallOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CallResource>.FromJson("calls", response.Content);
+      return new ResourceSet<CallResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieves a collection of calls made to and from your account
+    /// </summary>
+    /// <param name="options"> Read Call parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Call </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CallResource>> ReadAsync(ReadCallOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CallResource>.FromJson("calls", response.Content);
+      return new ResourceSet<CallResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieves a collection of calls made to and from your account
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
+    /// <param name="to"> Phone number or Client identifier of calls to include </param>
+    /// <param name="from"> Phone number or Client identifier to filter `from` on </param>
+    /// <param name="parentCallSid"> Parent call SID to filter on </param>
+    /// <param name="status"> The status of the resources to read </param>
+    /// <param name="startTimeBefore"> Only include calls that started on this date </param>
+    /// <param name="startTime"> Only include calls that started on this date </param>
+    /// <param name="startTimeAfter"> Only include calls that started on this date </param>
+    /// <param name="endTimeBefore"> Only include calls that ended on this date </param>
+    /// <param name="endTime"> Only include calls that ended on this date </param>
+    /// <param name="endTimeAfter"> Only include calls that ended on this date </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Call </returns>
+    public static ResourceSet<CallResource> Read(string pathAccountSid = null,
+                                                 Types.PhoneNumber to = null,
+                                                 Types.PhoneNumber from = null,
+                                                 string parentCallSid = null,
+                                                 CallResource.StatusEnum status = null,
+                                                 DateTime? startTimeBefore = null,
+                                                 DateTime? startTime = null,
+                                                 DateTime? startTimeAfter = null,
+                                                 DateTime? endTimeBefore = null,
+                                                 DateTime? endTime = null,
+                                                 DateTime? endTimeAfter = null,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadCallOptions() { PathAccountSid = pathAccountSid, To = to, From = from, ParentCallSid = parentCallSid, Status = status, StartTimeBefore = startTimeBefore, StartTime = startTime, StartTimeAfter = startTimeAfter, EndTimeBefore = endTimeBefore, EndTime = endTime, EndTimeAfter = endTimeAfter, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieves a collection of calls made to and from your account
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
+    /// <param name="to"> Phone number or Client identifier of calls to include </param>
+    /// <param name="from"> Phone number or Client identifier to filter `from` on </param>
+    /// <param name="parentCallSid"> Parent call SID to filter on </param>
+    /// <param name="status"> The status of the resources to read </param>
+    /// <param name="startTimeBefore"> Only include calls that started on this date </param>
+    /// <param name="startTime"> Only include calls that started on this date </param>
+    /// <param name="startTimeAfter"> Only include calls that started on this date </param>
+    /// <param name="endTimeBefore"> Only include calls that ended on this date </param>
+    /// <param name="endTime"> Only include calls that ended on this date </param>
+    /// <param name="endTimeAfter"> Only include calls that ended on this date </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Call </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CallResource>> ReadAsync(string pathAccountSid = null,
+                                                                                         Types.PhoneNumber to = null,
+                                                                                         Types.PhoneNumber from = null,
+                                                                                         string parentCallSid = null,
+                                                                                         CallResource.StatusEnum status = null,
+                                                                                         DateTime? startTimeBefore = null,
+                                                                                         DateTime? startTime = null,
+                                                                                         DateTime? startTimeAfter = null,
+                                                                                         DateTime? endTimeBefore = null,
+                                                                                         DateTime? endTime = null,
+                                                                                         DateTime? endTimeAfter = null,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadCallOptions() { PathAccountSid = pathAccountSid, To = to, From = from, ParentCallSid = parentCallSid, Status = status, StartTimeBefore = startTimeBefore, StartTime = startTime, StartTimeAfter = startTimeAfter, EndTimeBefore = endTimeBefore, EndTime = endTime, EndTimeAfter = endTimeAfter, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CallResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CallResource>.FromJson("calls", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CallResource> NextPage(Page<CallResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<CallResource>.FromJson("calls", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CallResource> PreviousPage(Page<CallResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<CallResource>.FromJson("calls", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateCallOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Calls/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Initiates a call redirect or terminates a call
+    /// </summary>
+    /// <param name="options"> Update Call parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Call </returns>
+    public static CallResource Update(UpdateCallOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Initiates a call redirect or terminates a call
+    /// </summary>
+    /// <param name="options"> Update Call parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Call </returns>
+    public static async System.Threading.Tasks.Task<CallResource> UpdateAsync(UpdateCallOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Initiates a call redirect or terminates a call
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
+    /// <param name="url"> The absolute URL that returns TwiML for this call </param>
+    /// <param name="method"> HTTP method to use to fetch TwiML </param>
+    /// <param name="status"> The new status to update the call with. </param>
+    /// <param name="fallbackUrl"> Fallback URL in case of error </param>
+    /// <param name="fallbackMethod"> HTTP Method to use with fallback_url </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> HTTP Method to use to call status_callback </param>
+    /// <param name="twiml"> TwiML instructions for the call </param>
+    /// <param name="timeLimit"> The maximum duration of the call in seconds. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Call </returns>
+    public static CallResource Update(string pathSid,
+                                      string pathAccountSid = null,
+                                      Uri url = null,
+                                      Twilio.Http.HttpMethod method = null,
+                                      CallResource.UpdateStatusEnum status = null,
+                                      Uri fallbackUrl = null,
+                                      Twilio.Http.HttpMethod fallbackMethod = null,
+                                      Uri statusCallback = null,
+                                      Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                      Types.Twiml twiml = null,
+                                      int? timeLimit = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateCallOptions(pathSid) { PathAccountSid = pathAccountSid, Url = url, Method = method, Status = status, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Twiml = twiml, TimeLimit = timeLimit };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Initiates a call redirect or terminates a call
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
+    /// <param name="url"> The absolute URL that returns TwiML for this call </param>
+    /// <param name="method"> HTTP method to use to fetch TwiML </param>
+    /// <param name="status"> The new status to update the call with. </param>
+    /// <param name="fallbackUrl"> Fallback URL in case of error </param>
+    /// <param name="fallbackMethod"> HTTP Method to use with fallback_url </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> HTTP Method to use to call status_callback </param>
+    /// <param name="twiml"> TwiML instructions for the call </param>
+    /// <param name="timeLimit"> The maximum duration of the call in seconds. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Call </returns>
+    public static async System.Threading.Tasks.Task<CallResource> UpdateAsync(string pathSid,
+                                                                              string pathAccountSid = null,
+                                                                              Uri url = null,
+                                                                              Twilio.Http.HttpMethod method = null,
+                                                                              CallResource.UpdateStatusEnum status = null,
+                                                                              Uri fallbackUrl = null,
+                                                                              Twilio.Http.HttpMethod fallbackMethod = null,
+                                                                              Uri statusCallback = null,
+                                                                              Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                              Types.Twiml twiml = null,
+                                                                              int? timeLimit = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateCallOptions(pathSid) { PathAccountSid = pathAccountSid, Url = url, Method = method, Status = status, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Twiml = twiml, TimeLimit = timeLimit };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CallResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CallResource object represented by the provided JSON </returns>
+    public static CallResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CallResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies this resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The SID that identifies the call that created this leg.
+    /// </summary>
+    [JsonProperty("parent_call_sid")]
+    public string ParentCallSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created this resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The phone number, SIP address or Client identifier that received this call. Phone numbers are in E.164 format (e.g., +16175551212). SIP addresses are formatted as `name@company.com`. Client identifiers are formatted `client:name`.
+    /// </summary>
+    [JsonProperty("to")]
+    public string To { get; private set; }
+    /// <summary>
+    /// The phone number, SIP address or Client identifier that received this call. Formatted for display.
+    /// </summary>
+    [JsonProperty("to_formatted")]
+    public string ToFormatted { get; private set; }
+    /// <summary>
+    /// The phone number, SIP address or Client identifier that made this call. Phone numbers are in E.164 format (e.g., +16175551212). SIP addresses are formatted as `name@company.com`. Client identifiers are formatted `client:name`.
+    /// </summary>
+    [JsonProperty("from")]
+    public string From { get; private set; }
+    /// <summary>
+    /// The calling phone number, SIP address, or Client identifier formatted for display.
+    /// </summary>
+    [JsonProperty("from_formatted")]
+    public string FromFormatted { get; private set; }
+    /// <summary>
+    /// If the call was inbound, this is the SID of the IncomingPhoneNumber resource that received the call. If the call was outbound, it is the SID of the OutgoingCallerId resource from which the call was placed.
+    /// </summary>
+    [JsonProperty("phone_number_sid")]
+    public string PhoneNumberSid { get; private set; }
+    /// <summary>
+    /// The status of this call.
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CallResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The start time of the call. Null if the call has not yet been dialed.
+    /// </summary>
+    [JsonProperty("start_time")]
+    public DateTime? StartTime { get; private set; }
+    /// <summary>
+    /// The end time of the call. Null if the call did not complete successfully.
+    /// </summary>
+    [JsonProperty("end_time")]
+    public DateTime? EndTime { get; private set; }
+    /// <summary>
+    /// The length of the call in seconds.
+    /// </summary>
+    [JsonProperty("duration")]
+    public string Duration { get; private set; }
+    /// <summary>
+    /// The charge for this call, in the currency associated with the account. Populated after the call is completed. May not be immediately available.
+    /// </summary>
+    [JsonProperty("price")]
+    public string Price { get; private set; }
+    /// <summary>
+    /// The currency in which `Price` is measured.
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// A string describing the direction of the call. `inbound` for inbound calls, `outbound-api` for calls initiated via the REST API or `outbound-dial` for calls initiated by a `Dial` verb.
+    /// </summary>
+    [JsonProperty("direction")]
+    public string Direction { get; private set; }
+    /// <summary>
+    /// Either `human` or `machine` if this call was initiated with answering machine detection. Empty otherwise.
+    /// </summary>
+    [JsonProperty("answered_by")]
+    public string AnsweredBy { get; private set; }
+    /// <summary>
+    /// The annotation provided for the call
+    /// </summary>
+    [JsonProperty("annotation")]
+    public string Annotation { get; private set; }
+    /// <summary>
+    /// The API Version used to create the call
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The forwarding phone number if this call was an incoming call forwarded from another number (depends on carrier supporting forwarding). Otherwise, empty.
+    /// </summary>
+    [JsonProperty("forwarded_from")]
+    public string ForwardedFrom { get; private set; }
+    /// <summary>
+    /// The Group SID associated with this call. If no Group is associated with the call, the field is empty.
+    /// </summary>
+    [JsonProperty("group_sid")]
+    public string GroupSid { get; private set; }
+    /// <summary>
+    /// The caller's name if this call was an incoming call to a phone number with caller ID Lookup enabled. Otherwise, empty.
+    /// </summary>
+    [JsonProperty("caller_name")]
+    public string CallerName { get; private set; }
+    /// <summary>
+    /// The wait time in milliseconds before the call is placed.
+    /// </summary>
+    [JsonProperty("queue_time")]
+    public string QueueTime { get; private set; }
+    /// <summary>
+    /// The (optional) unique identifier of the trunk resource that was used for this call.
+    /// </summary>
+    [JsonProperty("trunk_sid")]
+    public string TrunkSid { get; private set; }
+    /// <summary>
+    /// The URI of this resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// A list of related subresources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+
+    private CallResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Conference/ParticipantOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Conference/ParticipantOptions.cs
index f6f294ff9..0767bcad2 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Conference/ParticipantOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Conference/ParticipantOptions.cs
@@ -11,689 +11,689 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Conference
-{
-
+{
+
+  /// <summary>
+  /// Fetch an instance of a participant
+  /// </summary>
+  public class FetchParticipantOptions : IOptions<ParticipantResource>
+  {
     /// <summary>
-    /// Fetch an instance of a participant
-    /// </summary>
-    public class FetchParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the conference with the participant to fetch
-        /// </summary>
-        public string PathConferenceSid { get; }
-        /// <summary>
-        /// The Call SID or URL encoded label of the participant to fetch
-        /// </summary>
-        public string PathCallSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchParticipantOptions
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the conference with the participant to fetch </param>
-        /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to fetch </param>
-        public FetchParticipantOptions(string pathConferenceSid, string pathCallSid)
-        {
-            PathConferenceSid = pathConferenceSid;
-            PathCallSid = pathCallSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Update the properties of the participant
-    /// </summary>
-    public class UpdateParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the conference with the participant to update
-        /// </summary>
-        public string PathConferenceSid { get; }
-        /// <summary>
-        /// The Call SID or URL encoded label of the participant to update
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// Whether the participant should be muted
-        /// </summary>
-        public bool? Muted { get; set; }
-        /// <summary>
-        /// Whether the participant should be on hold
-        /// </summary>
-        public bool? Hold { get; set; }
-        /// <summary>
-        /// The URL we call using the `hold_method` for  music that plays when the participant is on hold
-        /// </summary>
-        public Uri HoldUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call hold_url
-        /// </summary>
-        public Twilio.Http.HttpMethod HoldMethod { get; set; }
-        /// <summary>
-        /// The URL we call using the `announce_method` for an announcement to the participant
-        /// </summary>
-        public Uri AnnounceUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call announce_url
-        /// </summary>
-        public Twilio.Http.HttpMethod AnnounceMethod { get; set; }
-        /// <summary>
-        /// URL that hosts pre-conference hold music
-        /// </summary>
-        public Uri WaitUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call `wait_url`
-        /// </summary>
-        public Twilio.Http.HttpMethod WaitMethod { get; set; }
-        /// <summary>
-        /// Whether to play a notification beep to the conference when the participant exit
-        /// </summary>
-        public bool? BeepOnExit { get; set; }
-        /// <summary>
-        /// Whether to end the conference when the participant leaves
-        /// </summary>
-        public bool? EndConferenceOnExit { get; set; }
-        /// <summary>
-        /// Indicates if the participant changed to coach
-        /// </summary>
-        public bool? Coaching { get; set; }
-        /// <summary>
-        /// The SID of the participant who is being `coached`
-        /// </summary>
-        public string CallSidToCoach { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateParticipantOptions
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the conference with the participant to update </param>
-        /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to update </param>
-        public UpdateParticipantOptions(string pathConferenceSid, string pathCallSid)
-        {
-            PathConferenceSid = pathConferenceSid;
-            PathCallSid = pathCallSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Muted != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Muted", Muted.Value.ToString().ToLower()));
-            }
-
-            if (Hold != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Hold", Hold.Value.ToString().ToLower()));
-            }
-
-            if (HoldUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("HoldUrl", Serializers.Url(HoldUrl)));
-            }
-
-            if (HoldMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("HoldMethod", HoldMethod.ToString()));
-            }
-
-            if (AnnounceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AnnounceUrl", Serializers.Url(AnnounceUrl)));
-            }
-
-            if (AnnounceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AnnounceMethod", AnnounceMethod.ToString()));
-            }
-
-            if (WaitUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WaitUrl", Serializers.Url(WaitUrl)));
-            }
-
-            if (WaitMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WaitMethod", WaitMethod.ToString()));
-            }
-
-            if (BeepOnExit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BeepOnExit", BeepOnExit.Value.ToString().ToLower()));
-            }
-
-            if (EndConferenceOnExit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndConferenceOnExit", EndConferenceOnExit.Value.ToString().ToLower()));
-            }
-
-            if (Coaching != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Coaching", Coaching.Value.ToString().ToLower()));
-            }
-
-            if (CallSidToCoach != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallSidToCoach", CallSidToCoach.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the conference with the participant to fetch
+    /// </summary>
+    public string PathConferenceSid { get; }
     /// <summary>
-    /// CreateParticipantOptions
-    /// </summary>
-    public class CreateParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the participant's conference
-        /// </summary>
-        public string PathConferenceSid { get; }
-        /// <summary>
-        /// The phone number, Client identifier, or username portion of SIP address that made this call.
-        /// </summary>
-        public IEndpoint From { get; }
-        /// <summary>
-        /// The phone number, SIP address or Client identifier that received this call.
-        /// </summary>
-        public IEndpoint To { get; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call `status_callback`
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Set state change events that will trigger a callback
-        /// </summary>
-        public List<string> StatusCallbackEvent { get; set; }
-        /// <summary>
-        /// The label of this participant
-        /// </summary>
-        public string Label { get; set; }
-        /// <summary>
-        /// he number of seconds that we should wait for an answer
-        /// </summary>
-        public int? Timeout { get; set; }
-        /// <summary>
-        /// Whether to record the participant and their conferences
-        /// </summary>
-        public bool? Record { get; set; }
-        /// <summary>
-        /// Whether to mute the agent
-        /// </summary>
-        public bool? Muted { get; set; }
-        /// <summary>
-        /// Whether to play a notification beep to the conference when the participant joins
-        /// </summary>
-        public string Beep { get; set; }
-        /// <summary>
-        /// Whether the conference starts when the participant joins the conference
-        /// </summary>
-        public bool? StartConferenceOnEnter { get; set; }
-        /// <summary>
-        /// Whether to end the conference when the participant leaves
-        /// </summary>
-        public bool? EndConferenceOnExit { get; set; }
-        /// <summary>
-        /// URL that hosts pre-conference hold music
-        /// </summary>
-        public Uri WaitUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call `wait_url`
-        /// </summary>
-        public Twilio.Http.HttpMethod WaitMethod { get; set; }
-        /// <summary>
-        /// Whether agents can hear the state of the outbound call
-        /// </summary>
-        public bool? EarlyMedia { get; set; }
-        /// <summary>
-        /// The maximum number of agent conference participants
-        /// </summary>
-        public int? MaxParticipants { get; set; }
-        /// <summary>
-        /// Whether to record the conference the participant is joining
-        /// </summary>
-        public string ConferenceRecord { get; set; }
-        /// <summary>
-        /// Whether to trim leading and trailing silence from your recorded conference audio files
-        /// </summary>
-        public string ConferenceTrim { get; set; }
-        /// <summary>
-        /// The callback URL for conference events
-        /// </summary>
-        public Uri ConferenceStatusCallback { get; set; }
-        /// <summary>
-        /// HTTP method for requesting `conference_status_callback` URL
-        /// </summary>
-        public Twilio.Http.HttpMethod ConferenceStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The conference state changes that should generate a call to `conference_status_callback`
-        /// </summary>
-        public List<string> ConferenceStatusCallbackEvent { get; set; }
-        /// <summary>
-        /// Specify `mono` or `dual` recording channels
-        /// </summary>
-        public string RecordingChannels { get; set; }
-        /// <summary>
-        /// The URL that we should call using the `recording_status_callback_method` when the recording status changes
-        /// </summary>
-        public Uri RecordingStatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use when we call `recording_status_callback`
-        /// </summary>
-        public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The SIP username used for authentication
-        /// </summary>
-        public string SipAuthUsername { get; set; }
-        /// <summary>
-        /// The SIP password for authentication
-        /// </summary>
-        public string SipAuthPassword { get; set; }
-        /// <summary>
-        /// The region where we should mix the conference audio
-        /// </summary>
-        public string Region { get; set; }
-        /// <summary>
-        /// The URL we should call using the `conference_recording_status_callback_method` when the conference recording is available
-        /// </summary>
-        public Uri ConferenceRecordingStatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call `conference_recording_status_callback`
-        /// </summary>
-        public Twilio.Http.HttpMethod ConferenceRecordingStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The recording state changes that should generate a call to `recording_status_callback`
-        /// </summary>
-        public List<string> RecordingStatusCallbackEvent { get; set; }
-        /// <summary>
-        /// The conference recording state changes that should generate a call to `conference_recording_status_callback`
-        /// </summary>
-        public List<string> ConferenceRecordingStatusCallbackEvent { get; set; }
-        /// <summary>
-        /// Indicates if the participant changed to coach
-        /// </summary>
-        public bool? Coaching { get; set; }
-        /// <summary>
-        /// The SID of the participant who is being `coached`
-        /// </summary>
-        public string CallSidToCoach { get; set; }
-        /// <summary>
-        /// Jitter Buffer size for the connecting participant
-        /// </summary>
-        public string JitterBufferSize { get; set; }
-        /// <summary>
-        /// BYOC trunk SID (Beta)
-        /// </summary>
-        public string Byoc { get; set; }
-        /// <summary>
-        /// The phone number, Client identifier, or username portion of SIP address that made this call.
-        /// </summary>
-        public string CallerId { get; set; }
-        /// <summary>
-        /// Reason for the call (Branded Calls Beta)
-        /// </summary>
-        public string CallReason { get; set; }
-        /// <summary>
-        /// The track(s) to record
-        /// </summary>
-        public string RecordingTrack { get; set; }
-        /// <summary>
-        /// The maximum duration of the call in seconds.
-        /// </summary>
-        public int? TimeLimit { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateParticipantOptions
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the participant's conference </param>
-        /// <param name="from"> The phone number, Client identifier, or username portion of SIP address that made this call.
-        ///            </param>
-        /// <param name="to"> The phone number, SIP address or Client identifier that received this call. </param>
-        public CreateParticipantOptions(string pathConferenceSid, IEndpoint from, IEndpoint to)
-        {
-            PathConferenceSid = pathConferenceSid;
-            From = from;
-            To = to;
-            StatusCallbackEvent = new List<string>();
-            ConferenceStatusCallbackEvent = new List<string>();
-            RecordingStatusCallbackEvent = new List<string>();
-            ConferenceRecordingStatusCallbackEvent = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From.ToString()));
-            }
-
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (StatusCallbackEvent != null)
-            {
-                p.AddRange(StatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("StatusCallbackEvent", prop)));
-            }
-
-            if (Label != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Label", Label));
-            }
-
-            if (Timeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timeout", Timeout.ToString()));
-            }
-
-            if (Record != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Record", Record.Value.ToString().ToLower()));
-            }
-
-            if (Muted != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Muted", Muted.Value.ToString().ToLower()));
-            }
-
-            if (Beep != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beep", Beep));
-            }
-
-            if (StartConferenceOnEnter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartConferenceOnEnter", StartConferenceOnEnter.Value.ToString().ToLower()));
-            }
-
-            if (EndConferenceOnExit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndConferenceOnExit", EndConferenceOnExit.Value.ToString().ToLower()));
-            }
-
-            if (WaitUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WaitUrl", Serializers.Url(WaitUrl)));
-            }
-
-            if (WaitMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WaitMethod", WaitMethod.ToString()));
-            }
-
-            if (EarlyMedia != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EarlyMedia", EarlyMedia.Value.ToString().ToLower()));
-            }
-
-            if (MaxParticipants != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MaxParticipants", MaxParticipants.ToString()));
-            }
-
-            if (ConferenceRecord != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceRecord", ConferenceRecord));
-            }
-
-            if (ConferenceTrim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceTrim", ConferenceTrim));
-            }
-
-            if (ConferenceStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceStatusCallback", Serializers.Url(ConferenceStatusCallback)));
-            }
-
-            if (ConferenceStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceStatusCallbackMethod", ConferenceStatusCallbackMethod.ToString()));
-            }
-
-            if (ConferenceStatusCallbackEvent != null)
-            {
-                p.AddRange(ConferenceStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("ConferenceStatusCallbackEvent", prop)));
-            }
-
-            if (RecordingChannels != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingChannels", RecordingChannels));
-            }
-
-            if (RecordingStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingStatusCallback", Serializers.Url(RecordingStatusCallback)));
-            }
-
-            if (RecordingStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingStatusCallbackMethod", RecordingStatusCallbackMethod.ToString()));
-            }
-
-            if (SipAuthUsername != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipAuthUsername", SipAuthUsername));
-            }
-
-            if (SipAuthPassword != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipAuthPassword", SipAuthPassword));
-            }
-
-            if (Region != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Region", Region));
-            }
-
-            if (ConferenceRecordingStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceRecordingStatusCallback", Serializers.Url(ConferenceRecordingStatusCallback)));
-            }
-
-            if (ConferenceRecordingStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceRecordingStatusCallbackMethod", ConferenceRecordingStatusCallbackMethod.ToString()));
-            }
-
-            if (RecordingStatusCallbackEvent != null)
-            {
-                p.AddRange(RecordingStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("RecordingStatusCallbackEvent", prop)));
-            }
-
-            if (ConferenceRecordingStatusCallbackEvent != null)
-            {
-                p.AddRange(ConferenceRecordingStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("ConferenceRecordingStatusCallbackEvent", prop)));
-            }
-
-            if (Coaching != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Coaching", Coaching.Value.ToString().ToLower()));
-            }
-
-            if (CallSidToCoach != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallSidToCoach", CallSidToCoach.ToString()));
-            }
-
-            if (JitterBufferSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("JitterBufferSize", JitterBufferSize));
-            }
-
-            if (Byoc != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Byoc", Byoc.ToString()));
-            }
-
-            if (CallerId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallerId", CallerId));
-            }
-
-            if (CallReason != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallReason", CallReason));
-            }
-
-            if (RecordingTrack != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingTrack", RecordingTrack));
-            }
-
-            if (TimeLimit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TimeLimit", TimeLimit.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The Call SID or URL encoded label of the participant to fetch
+    /// </summary>
+    public string PathCallSid { get; }
+
     /// <summary>
-    /// Kick a participant from a given conference
-    /// </summary>
-    public class DeleteParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the conference with the participants to delete
-        /// </summary>
-        public string PathConferenceSid { get; }
-        /// <summary>
-        /// The Call SID or URL encoded label of the participant to delete
-        /// </summary>
-        public string PathCallSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteParticipantOptions
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the conference with the participants to delete </param>
-        /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to delete </param>
-        public DeleteParticipantOptions(string pathConferenceSid, string pathCallSid)
-        {
-            PathConferenceSid = pathConferenceSid;
-            PathCallSid = pathCallSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new FetchParticipantOptions
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the conference with the participant to fetch </param>
+    /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to fetch </param>
+    public FetchParticipantOptions(string pathConferenceSid, string pathCallSid)
+    {
+      PathConferenceSid = pathConferenceSid;
+      PathCallSid = pathCallSid;
+    }
+
     /// <summary>
-    /// Retrieve a list of participants belonging to the account used to make the request
-    /// </summary>
-    public class ReadParticipantOptions : ReadOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the conference with the participants to read
-        /// </summary>
-        public string PathConferenceSid { get; }
-        /// <summary>
-        /// Whether to return only participants that are muted
-        /// </summary>
-        public bool? Muted { get; set; }
-        /// <summary>
-        /// Whether to return only participants that are on hold
-        /// </summary>
-        public bool? Hold { get; set; }
-        /// <summary>
-        /// Whether to return only participants who are coaching another call
-        /// </summary>
-        public bool? Coaching { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadParticipantOptions
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the conference with the participants to read </param>
-        public ReadParticipantOptions(string pathConferenceSid)
-        {
-            PathConferenceSid = pathConferenceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Muted != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Muted", Muted.Value.ToString().ToLower()));
-            }
-
-            if (Hold != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Hold", Hold.Value.ToString().ToLower()));
-            }
-
-            if (Coaching != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Coaching", Coaching.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update the properties of the participant
+  /// </summary>
+  public class UpdateParticipantOptions : IOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the conference with the participant to update
+    /// </summary>
+    public string PathConferenceSid { get; }
+    /// <summary>
+    /// The Call SID or URL encoded label of the participant to update
+    /// </summary>
+    public string PathCallSid { get; }
+    /// <summary>
+    /// Whether the participant should be muted
+    /// </summary>
+    public bool? Muted { get; set; }
+    /// <summary>
+    /// Whether the participant should be on hold
+    /// </summary>
+    public bool? Hold { get; set; }
+    /// <summary>
+    /// The URL we call using the `hold_method` for  music that plays when the participant is on hold
+    /// </summary>
+    public Uri HoldUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call hold_url
+    /// </summary>
+    public Twilio.Http.HttpMethod HoldMethod { get; set; }
+    /// <summary>
+    /// The URL we call using the `announce_method` for an announcement to the participant
+    /// </summary>
+    public Uri AnnounceUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call announce_url
+    /// </summary>
+    public Twilio.Http.HttpMethod AnnounceMethod { get; set; }
+    /// <summary>
+    /// URL that hosts pre-conference hold music
+    /// </summary>
+    public Uri WaitUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call `wait_url`
+    /// </summary>
+    public Twilio.Http.HttpMethod WaitMethod { get; set; }
+    /// <summary>
+    /// Whether to play a notification beep to the conference when the participant exit
+    /// </summary>
+    public bool? BeepOnExit { get; set; }
+    /// <summary>
+    /// Whether to end the conference when the participant leaves
+    /// </summary>
+    public bool? EndConferenceOnExit { get; set; }
+    /// <summary>
+    /// Indicates if the participant changed to coach
+    /// </summary>
+    public bool? Coaching { get; set; }
+    /// <summary>
+    /// The SID of the participant who is being `coached`
+    /// </summary>
+    public string CallSidToCoach { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateParticipantOptions
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the conference with the participant to update </param>
+    /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to update </param>
+    public UpdateParticipantOptions(string pathConferenceSid, string pathCallSid)
+    {
+      PathConferenceSid = pathConferenceSid;
+      PathCallSid = pathCallSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Muted != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Muted", Muted.Value.ToString().ToLower()));
+      }
+
+      if (Hold != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Hold", Hold.Value.ToString().ToLower()));
+      }
+
+      if (HoldUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("HoldUrl", Serializers.Url(HoldUrl)));
+      }
+
+      if (HoldMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("HoldMethod", HoldMethod.ToString()));
+      }
+
+      if (AnnounceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AnnounceUrl", Serializers.Url(AnnounceUrl)));
+      }
+
+      if (AnnounceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AnnounceMethod", AnnounceMethod.ToString()));
+      }
+
+      if (WaitUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WaitUrl", Serializers.Url(WaitUrl)));
+      }
+
+      if (WaitMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WaitMethod", WaitMethod.ToString()));
+      }
+
+      if (BeepOnExit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BeepOnExit", BeepOnExit.Value.ToString().ToLower()));
+      }
+
+      if (EndConferenceOnExit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndConferenceOnExit", EndConferenceOnExit.Value.ToString().ToLower()));
+      }
+
+      if (Coaching != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Coaching", Coaching.Value.ToString().ToLower()));
+      }
+
+      if (CallSidToCoach != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallSidToCoach", CallSidToCoach.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateParticipantOptions
+  /// </summary>
+  public class CreateParticipantOptions : IOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the participant's conference
+    /// </summary>
+    public string PathConferenceSid { get; }
+    /// <summary>
+    /// The phone number, Client identifier, or username portion of SIP address that made this call.
+    /// </summary>
+    public IEndpoint From { get; }
+    /// <summary>
+    /// The phone number, SIP address or Client identifier that received this call.
+    /// </summary>
+    public IEndpoint To { get; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call `status_callback`
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Set state change events that will trigger a callback
+    /// </summary>
+    public List<string> StatusCallbackEvent { get; set; }
+    /// <summary>
+    /// The label of this participant
+    /// </summary>
+    public string Label { get; set; }
+    /// <summary>
+    /// he number of seconds that we should wait for an answer
+    /// </summary>
+    public int? Timeout { get; set; }
+    /// <summary>
+    /// Whether to record the participant and their conferences
+    /// </summary>
+    public bool? Record { get; set; }
+    /// <summary>
+    /// Whether to mute the agent
+    /// </summary>
+    public bool? Muted { get; set; }
+    /// <summary>
+    /// Whether to play a notification beep to the conference when the participant joins
+    /// </summary>
+    public string Beep { get; set; }
+    /// <summary>
+    /// Whether the conference starts when the participant joins the conference
+    /// </summary>
+    public bool? StartConferenceOnEnter { get; set; }
+    /// <summary>
+    /// Whether to end the conference when the participant leaves
+    /// </summary>
+    public bool? EndConferenceOnExit { get; set; }
+    /// <summary>
+    /// URL that hosts pre-conference hold music
+    /// </summary>
+    public Uri WaitUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call `wait_url`
+    /// </summary>
+    public Twilio.Http.HttpMethod WaitMethod { get; set; }
+    /// <summary>
+    /// Whether agents can hear the state of the outbound call
+    /// </summary>
+    public bool? EarlyMedia { get; set; }
+    /// <summary>
+    /// The maximum number of agent conference participants
+    /// </summary>
+    public int? MaxParticipants { get; set; }
+    /// <summary>
+    /// Whether to record the conference the participant is joining
+    /// </summary>
+    public string ConferenceRecord { get; set; }
+    /// <summary>
+    /// Whether to trim leading and trailing silence from your recorded conference audio files
+    /// </summary>
+    public string ConferenceTrim { get; set; }
+    /// <summary>
+    /// The callback URL for conference events
+    /// </summary>
+    public Uri ConferenceStatusCallback { get; set; }
+    /// <summary>
+    /// HTTP method for requesting `conference_status_callback` URL
+    /// </summary>
+    public Twilio.Http.HttpMethod ConferenceStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The conference state changes that should generate a call to `conference_status_callback`
+    /// </summary>
+    public List<string> ConferenceStatusCallbackEvent { get; set; }
+    /// <summary>
+    /// Specify `mono` or `dual` recording channels
+    /// </summary>
+    public string RecordingChannels { get; set; }
+    /// <summary>
+    /// The URL that we should call using the `recording_status_callback_method` when the recording status changes
+    /// </summary>
+    public Uri RecordingStatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use when we call `recording_status_callback`
+    /// </summary>
+    public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The SIP username used for authentication
+    /// </summary>
+    public string SipAuthUsername { get; set; }
+    /// <summary>
+    /// The SIP password for authentication
+    /// </summary>
+    public string SipAuthPassword { get; set; }
+    /// <summary>
+    /// The region where we should mix the conference audio
+    /// </summary>
+    public string Region { get; set; }
+    /// <summary>
+    /// The URL we should call using the `conference_recording_status_callback_method` when the conference recording is available
+    /// </summary>
+    public Uri ConferenceRecordingStatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call `conference_recording_status_callback`
+    /// </summary>
+    public Twilio.Http.HttpMethod ConferenceRecordingStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The recording state changes that should generate a call to `recording_status_callback`
+    /// </summary>
+    public List<string> RecordingStatusCallbackEvent { get; set; }
+    /// <summary>
+    /// The conference recording state changes that should generate a call to `conference_recording_status_callback`
+    /// </summary>
+    public List<string> ConferenceRecordingStatusCallbackEvent { get; set; }
+    /// <summary>
+    /// Indicates if the participant changed to coach
+    /// </summary>
+    public bool? Coaching { get; set; }
+    /// <summary>
+    /// The SID of the participant who is being `coached`
+    /// </summary>
+    public string CallSidToCoach { get; set; }
+    /// <summary>
+    /// Jitter Buffer size for the connecting participant
+    /// </summary>
+    public string JitterBufferSize { get; set; }
+    /// <summary>
+    /// BYOC trunk SID (Beta)
+    /// </summary>
+    public string Byoc { get; set; }
+    /// <summary>
+    /// The phone number, Client identifier, or username portion of SIP address that made this call.
+    /// </summary>
+    public string CallerId { get; set; }
+    /// <summary>
+    /// Reason for the call (Branded Calls Beta)
+    /// </summary>
+    public string CallReason { get; set; }
+    /// <summary>
+    /// The track(s) to record
+    /// </summary>
+    public string RecordingTrack { get; set; }
+    /// <summary>
+    /// The maximum duration of the call in seconds.
+    /// </summary>
+    public int? TimeLimit { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateParticipantOptions
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the participant's conference </param>
+    /// <param name="from"> The phone number, Client identifier, or username portion of SIP address that made this call.
+    ///            </param>
+    /// <param name="to"> The phone number, SIP address or Client identifier that received this call. </param>
+    public CreateParticipantOptions(string pathConferenceSid, IEndpoint from, IEndpoint to)
+    {
+      PathConferenceSid = pathConferenceSid;
+      From = from;
+      To = to;
+      StatusCallbackEvent = new List<string>();
+      ConferenceStatusCallbackEvent = new List<string>();
+      RecordingStatusCallbackEvent = new List<string>();
+      ConferenceRecordingStatusCallbackEvent = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From.ToString()));
+      }
+
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (StatusCallbackEvent != null)
+      {
+        p.AddRange(StatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("StatusCallbackEvent", prop)));
+      }
+
+      if (Label != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Label", Label));
+      }
+
+      if (Timeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timeout", Timeout.ToString()));
+      }
+
+      if (Record != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Record", Record.Value.ToString().ToLower()));
+      }
+
+      if (Muted != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Muted", Muted.Value.ToString().ToLower()));
+      }
+
+      if (Beep != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beep", Beep));
+      }
+
+      if (StartConferenceOnEnter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartConferenceOnEnter", StartConferenceOnEnter.Value.ToString().ToLower()));
+      }
+
+      if (EndConferenceOnExit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndConferenceOnExit", EndConferenceOnExit.Value.ToString().ToLower()));
+      }
+
+      if (WaitUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WaitUrl", Serializers.Url(WaitUrl)));
+      }
+
+      if (WaitMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WaitMethod", WaitMethod.ToString()));
+      }
+
+      if (EarlyMedia != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EarlyMedia", EarlyMedia.Value.ToString().ToLower()));
+      }
+
+      if (MaxParticipants != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MaxParticipants", MaxParticipants.ToString()));
+      }
+
+      if (ConferenceRecord != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceRecord", ConferenceRecord));
+      }
+
+      if (ConferenceTrim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceTrim", ConferenceTrim));
+      }
+
+      if (ConferenceStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceStatusCallback", Serializers.Url(ConferenceStatusCallback)));
+      }
+
+      if (ConferenceStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceStatusCallbackMethod", ConferenceStatusCallbackMethod.ToString()));
+      }
+
+      if (ConferenceStatusCallbackEvent != null)
+      {
+        p.AddRange(ConferenceStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("ConferenceStatusCallbackEvent", prop)));
+      }
+
+      if (RecordingChannels != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingChannels", RecordingChannels));
+      }
+
+      if (RecordingStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingStatusCallback", Serializers.Url(RecordingStatusCallback)));
+      }
+
+      if (RecordingStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingStatusCallbackMethod", RecordingStatusCallbackMethod.ToString()));
+      }
+
+      if (SipAuthUsername != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipAuthUsername", SipAuthUsername));
+      }
+
+      if (SipAuthPassword != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipAuthPassword", SipAuthPassword));
+      }
+
+      if (Region != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Region", Region));
+      }
+
+      if (ConferenceRecordingStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceRecordingStatusCallback", Serializers.Url(ConferenceRecordingStatusCallback)));
+      }
+
+      if (ConferenceRecordingStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceRecordingStatusCallbackMethod", ConferenceRecordingStatusCallbackMethod.ToString()));
+      }
+
+      if (RecordingStatusCallbackEvent != null)
+      {
+        p.AddRange(RecordingStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("RecordingStatusCallbackEvent", prop)));
+      }
+
+      if (ConferenceRecordingStatusCallbackEvent != null)
+      {
+        p.AddRange(ConferenceRecordingStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("ConferenceRecordingStatusCallbackEvent", prop)));
+      }
+
+      if (Coaching != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Coaching", Coaching.Value.ToString().ToLower()));
+      }
+
+      if (CallSidToCoach != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallSidToCoach", CallSidToCoach.ToString()));
+      }
+
+      if (JitterBufferSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("JitterBufferSize", JitterBufferSize));
+      }
+
+      if (Byoc != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Byoc", Byoc.ToString()));
+      }
+
+      if (CallerId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallerId", CallerId));
+      }
+
+      if (CallReason != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallReason", CallReason));
+      }
+
+      if (RecordingTrack != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingTrack", RecordingTrack));
+      }
+
+      if (TimeLimit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TimeLimit", TimeLimit.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Kick a participant from a given conference
+  /// </summary>
+  public class DeleteParticipantOptions : IOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the conference with the participants to delete
+    /// </summary>
+    public string PathConferenceSid { get; }
+    /// <summary>
+    /// The Call SID or URL encoded label of the participant to delete
+    /// </summary>
+    public string PathCallSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteParticipantOptions
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the conference with the participants to delete </param>
+    /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to delete </param>
+    public DeleteParticipantOptions(string pathConferenceSid, string pathCallSid)
+    {
+      PathConferenceSid = pathConferenceSid;
+      PathCallSid = pathCallSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of participants belonging to the account used to make the request
+  /// </summary>
+  public class ReadParticipantOptions : ReadOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the conference with the participants to read
+    /// </summary>
+    public string PathConferenceSid { get; }
+    /// <summary>
+    /// Whether to return only participants that are muted
+    /// </summary>
+    public bool? Muted { get; set; }
+    /// <summary>
+    /// Whether to return only participants that are on hold
+    /// </summary>
+    public bool? Hold { get; set; }
+    /// <summary>
+    /// Whether to return only participants who are coaching another call
+    /// </summary>
+    public bool? Coaching { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadParticipantOptions
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the conference with the participants to read </param>
+    public ReadParticipantOptions(string pathConferenceSid)
+    {
+      PathConferenceSid = pathConferenceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Muted != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Muted", Muted.Value.ToString().ToLower()));
+      }
+
+      if (Hold != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Hold", Hold.Value.ToString().ToLower()));
+      }
+
+      if (Coaching != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Coaching", Coaching.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Conference/ParticipantResource.cs b/src/Twilio/Rest/Api/V2010/Account/Conference/ParticipantResource.cs
index 33b208473..5bb884bed 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Conference/ParticipantResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Conference/ParticipantResource.cs
@@ -17,802 +17,802 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Conference
-{
-
-    public class ParticipantResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Queued = new StatusEnum("queued");
-            public static readonly StatusEnum Connecting = new StatusEnum("connecting");
-            public static readonly StatusEnum Ringing = new StatusEnum("ringing");
-            public static readonly StatusEnum Connected = new StatusEnum("connected");
-            public static readonly StatusEnum Complete = new StatusEnum("complete");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        private static Request BuildFetchRequest(FetchParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Participants/" + options.PathCallSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of a participant
-        /// </summary>
-        /// <param name="options"> Fetch Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Fetch(FetchParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a participant
-        /// </summary>
-        /// <param name="options"> Fetch Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(FetchParticipantOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of a participant
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the conference with the participant to fetch </param>
-        /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to fetch </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Fetch(string pathConferenceSid,
-                                                string pathCallSid,
-                                                string pathAccountSid = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchParticipantOptions(pathConferenceSid, pathCallSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a participant
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the conference with the participant to fetch </param>
-        /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to fetch </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(string pathConferenceSid,
-                                                                                        string pathCallSid,
-                                                                                        string pathAccountSid = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchParticipantOptions(pathConferenceSid, pathCallSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Participants/" + options.PathCallSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update the properties of the participant
-        /// </summary>
-        /// <param name="options"> Update Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Update(UpdateParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the properties of the participant
-        /// </summary>
-        /// <param name="options"> Update Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(UpdateParticipantOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update the properties of the participant
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the conference with the participant to update </param>
-        /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to update </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
-        /// <param name="muted"> Whether the participant should be muted </param>
-        /// <param name="hold"> Whether the participant should be on hold </param>
-        /// <param name="holdUrl"> The URL we call using the `hold_method` for  music that plays when the participant is on
-        ///               hold </param>
-        /// <param name="holdMethod"> The HTTP method we should use to call hold_url </param>
-        /// <param name="announceUrl"> The URL we call using the `announce_method` for an announcement to the participant
-        ///                   </param>
-        /// <param name="announceMethod"> The HTTP method we should use to call announce_url </param>
-        /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
-        /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
-        /// <param name="beepOnExit"> Whether to play a notification beep to the conference when the participant exit </param>
-        /// <param name="endConferenceOnExit"> Whether to end the conference when the participant leaves </param>
-        /// <param name="coaching"> Indicates if the participant changed to coach </param>
-        /// <param name="callSidToCoach"> The SID of the participant who is being `coached` </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Update(string pathConferenceSid,
-                                                 string pathCallSid,
-                                                 string pathAccountSid = null,
-                                                 bool? muted = null,
-                                                 bool? hold = null,
-                                                 Uri holdUrl = null,
-                                                 Twilio.Http.HttpMethod holdMethod = null,
-                                                 Uri announceUrl = null,
-                                                 Twilio.Http.HttpMethod announceMethod = null,
-                                                 Uri waitUrl = null,
-                                                 Twilio.Http.HttpMethod waitMethod = null,
-                                                 bool? beepOnExit = null,
-                                                 bool? endConferenceOnExit = null,
-                                                 bool? coaching = null,
-                                                 string callSidToCoach = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateParticipantOptions(pathConferenceSid, pathCallSid){PathAccountSid = pathAccountSid, Muted = muted, Hold = hold, HoldUrl = holdUrl, HoldMethod = holdMethod, AnnounceUrl = announceUrl, AnnounceMethod = announceMethod, WaitUrl = waitUrl, WaitMethod = waitMethod, BeepOnExit = beepOnExit, EndConferenceOnExit = endConferenceOnExit, Coaching = coaching, CallSidToCoach = callSidToCoach};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the properties of the participant
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the conference with the participant to update </param>
-        /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to update </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
-        /// <param name="muted"> Whether the participant should be muted </param>
-        /// <param name="hold"> Whether the participant should be on hold </param>
-        /// <param name="holdUrl"> The URL we call using the `hold_method` for  music that plays when the participant is on
-        ///               hold </param>
-        /// <param name="holdMethod"> The HTTP method we should use to call hold_url </param>
-        /// <param name="announceUrl"> The URL we call using the `announce_method` for an announcement to the participant
-        ///                   </param>
-        /// <param name="announceMethod"> The HTTP method we should use to call announce_url </param>
-        /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
-        /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
-        /// <param name="beepOnExit"> Whether to play a notification beep to the conference when the participant exit </param>
-        /// <param name="endConferenceOnExit"> Whether to end the conference when the participant leaves </param>
-        /// <param name="coaching"> Indicates if the participant changed to coach </param>
-        /// <param name="callSidToCoach"> The SID of the participant who is being `coached` </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(string pathConferenceSid,
-                                                                                         string pathCallSid,
-                                                                                         string pathAccountSid = null,
-                                                                                         bool? muted = null,
-                                                                                         bool? hold = null,
-                                                                                         Uri holdUrl = null,
-                                                                                         Twilio.Http.HttpMethod holdMethod = null,
-                                                                                         Uri announceUrl = null,
-                                                                                         Twilio.Http.HttpMethod announceMethod = null,
-                                                                                         Uri waitUrl = null,
-                                                                                         Twilio.Http.HttpMethod waitMethod = null,
-                                                                                         bool? beepOnExit = null,
-                                                                                         bool? endConferenceOnExit = null,
-                                                                                         bool? coaching = null,
-                                                                                         string callSidToCoach = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateParticipantOptions(pathConferenceSid, pathCallSid){PathAccountSid = pathAccountSid, Muted = muted, Hold = hold, HoldUrl = holdUrl, HoldMethod = holdMethod, AnnounceUrl = announceUrl, AnnounceMethod = announceMethod, WaitUrl = waitUrl, WaitMethod = waitMethod, BeepOnExit = beepOnExit, EndConferenceOnExit = endConferenceOnExit, Coaching = coaching, CallSidToCoach = callSidToCoach};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Participants.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Create(CreateParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(CreateParticipantOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the participant's conference </param>
-        /// <param name="from"> The phone number, Client identifier, or username portion of SIP address that made this call.
-        ///            </param>
-        /// <param name="to"> The phone number, SIP address or Client identifier that received this call. </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call `status_callback` </param>
-        /// <param name="statusCallbackEvent"> Set state change events that will trigger a callback </param>
-        /// <param name="label"> The label of this participant </param>
-        /// <param name="timeout"> he number of seconds that we should wait for an answer </param>
-        /// <param name="record"> Whether to record the participant and their conferences </param>
-        /// <param name="muted"> Whether to mute the agent </param>
-        /// <param name="beep"> Whether to play a notification beep to the conference when the participant joins </param>
-        /// <param name="startConferenceOnEnter"> Whether the conference starts when the participant joins the conference
-        ///                              </param>
-        /// <param name="endConferenceOnExit"> Whether to end the conference when the participant leaves </param>
-        /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
-        /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
-        /// <param name="earlyMedia"> Whether agents can hear the state of the outbound call </param>
-        /// <param name="maxParticipants"> The maximum number of agent conference participants </param>
-        /// <param name="conferenceRecord"> Whether to record the conference the participant is joining </param>
-        /// <param name="conferenceTrim"> Whether to trim leading and trailing silence from your recorded conference audio
-        ///                      files </param>
-        /// <param name="conferenceStatusCallback"> The callback URL for conference events </param>
-        /// <param name="conferenceStatusCallbackMethod"> HTTP method for requesting `conference_status_callback` URL </param>
-        /// <param name="conferenceStatusCallbackEvent"> The conference state changes that should generate a call to
-        ///                                     `conference_status_callback` </param>
-        /// <param name="recordingChannels"> Specify `mono` or `dual` recording channels </param>
-        /// <param name="recordingStatusCallback"> The URL that we should call using the `recording_status_callback_method`
-        ///                               when the recording status changes </param>
-        /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when we call `recording_status_callback`
-        ///                                     </param>
-        /// <param name="sipAuthUsername"> The SIP username used for authentication </param>
-        /// <param name="sipAuthPassword"> The SIP password for authentication </param>
-        /// <param name="region"> The region where we should mix the conference audio </param>
-        /// <param name="conferenceRecordingStatusCallback"> The URL we should call using the
-        ///                                         `conference_recording_status_callback_method` when the conference recording
-        ///                                         is available </param>
-        /// <param name="conferenceRecordingStatusCallbackMethod"> The HTTP method we should use to call
-        ///                                               `conference_recording_status_callback` </param>
-        /// <param name="recordingStatusCallbackEvent"> The recording state changes that should generate a call to
-        ///                                    `recording_status_callback` </param>
-        /// <param name="conferenceRecordingStatusCallbackEvent"> The conference recording state changes that should generate a
-        ///                                              call to `conference_recording_status_callback` </param>
-        /// <param name="coaching"> Indicates if the participant changed to coach </param>
-        /// <param name="callSidToCoach"> The SID of the participant who is being `coached` </param>
-        /// <param name="jitterBufferSize"> Jitter Buffer size for the connecting participant </param>
-        /// <param name="byoc"> BYOC trunk SID (Beta) </param>
-        /// <param name="callerId"> The phone number, Client identifier, or username portion of SIP address that made this
-        ///                call. </param>
-        /// <param name="callReason"> Reason for the call (Branded Calls Beta) </param>
-        /// <param name="recordingTrack"> The track(s) to record </param>
-        /// <param name="timeLimit"> The maximum duration of the call in seconds. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Create(string pathConferenceSid,
-                                                 IEndpoint from,
-                                                 IEndpoint to,
-                                                 string pathAccountSid = null,
-                                                 Uri statusCallback = null,
-                                                 Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                 List<string> statusCallbackEvent = null,
-                                                 string label = null,
-                                                 int? timeout = null,
-                                                 bool? record = null,
-                                                 bool? muted = null,
-                                                 string beep = null,
-                                                 bool? startConferenceOnEnter = null,
-                                                 bool? endConferenceOnExit = null,
-                                                 Uri waitUrl = null,
-                                                 Twilio.Http.HttpMethod waitMethod = null,
-                                                 bool? earlyMedia = null,
-                                                 int? maxParticipants = null,
-                                                 string conferenceRecord = null,
-                                                 string conferenceTrim = null,
-                                                 Uri conferenceStatusCallback = null,
-                                                 Twilio.Http.HttpMethod conferenceStatusCallbackMethod = null,
-                                                 List<string> conferenceStatusCallbackEvent = null,
-                                                 string recordingChannels = null,
-                                                 Uri recordingStatusCallback = null,
-                                                 Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                                                 string sipAuthUsername = null,
-                                                 string sipAuthPassword = null,
-                                                 string region = null,
-                                                 Uri conferenceRecordingStatusCallback = null,
-                                                 Twilio.Http.HttpMethod conferenceRecordingStatusCallbackMethod = null,
-                                                 List<string> recordingStatusCallbackEvent = null,
-                                                 List<string> conferenceRecordingStatusCallbackEvent = null,
-                                                 bool? coaching = null,
-                                                 string callSidToCoach = null,
-                                                 string jitterBufferSize = null,
-                                                 string byoc = null,
-                                                 string callerId = null,
-                                                 string callReason = null,
-                                                 string recordingTrack = null,
-                                                 int? timeLimit = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateParticipantOptions(pathConferenceSid, from, to){PathAccountSid = pathAccountSid, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, StatusCallbackEvent = statusCallbackEvent, Label = label, Timeout = timeout, Record = record, Muted = muted, Beep = beep, StartConferenceOnEnter = startConferenceOnEnter, EndConferenceOnExit = endConferenceOnExit, WaitUrl = waitUrl, WaitMethod = waitMethod, EarlyMedia = earlyMedia, MaxParticipants = maxParticipants, ConferenceRecord = conferenceRecord, ConferenceTrim = conferenceTrim, ConferenceStatusCallback = conferenceStatusCallback, ConferenceStatusCallbackMethod = conferenceStatusCallbackMethod, ConferenceStatusCallbackEvent = conferenceStatusCallbackEvent, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, Region = region, ConferenceRecordingStatusCallback = conferenceRecordingStatusCallback, ConferenceRecordingStatusCallbackMethod = conferenceRecordingStatusCallbackMethod, RecordingStatusCallbackEvent = recordingStatusCallbackEvent, ConferenceRecordingStatusCallbackEvent = conferenceRecordingStatusCallbackEvent, Coaching = coaching, CallSidToCoach = callSidToCoach, JitterBufferSize = jitterBufferSize, Byoc = byoc, CallerId = callerId, CallReason = callReason, RecordingTrack = recordingTrack, TimeLimit = timeLimit};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the participant's conference </param>
-        /// <param name="from"> The phone number, Client identifier, or username portion of SIP address that made this call.
-        ///            </param>
-        /// <param name="to"> The phone number, SIP address or Client identifier that received this call. </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call `status_callback` </param>
-        /// <param name="statusCallbackEvent"> Set state change events that will trigger a callback </param>
-        /// <param name="label"> The label of this participant </param>
-        /// <param name="timeout"> he number of seconds that we should wait for an answer </param>
-        /// <param name="record"> Whether to record the participant and their conferences </param>
-        /// <param name="muted"> Whether to mute the agent </param>
-        /// <param name="beep"> Whether to play a notification beep to the conference when the participant joins </param>
-        /// <param name="startConferenceOnEnter"> Whether the conference starts when the participant joins the conference
-        ///                              </param>
-        /// <param name="endConferenceOnExit"> Whether to end the conference when the participant leaves </param>
-        /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
-        /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
-        /// <param name="earlyMedia"> Whether agents can hear the state of the outbound call </param>
-        /// <param name="maxParticipants"> The maximum number of agent conference participants </param>
-        /// <param name="conferenceRecord"> Whether to record the conference the participant is joining </param>
-        /// <param name="conferenceTrim"> Whether to trim leading and trailing silence from your recorded conference audio
-        ///                      files </param>
-        /// <param name="conferenceStatusCallback"> The callback URL for conference events </param>
-        /// <param name="conferenceStatusCallbackMethod"> HTTP method for requesting `conference_status_callback` URL </param>
-        /// <param name="conferenceStatusCallbackEvent"> The conference state changes that should generate a call to
-        ///                                     `conference_status_callback` </param>
-        /// <param name="recordingChannels"> Specify `mono` or `dual` recording channels </param>
-        /// <param name="recordingStatusCallback"> The URL that we should call using the `recording_status_callback_method`
-        ///                               when the recording status changes </param>
-        /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when we call `recording_status_callback`
-        ///                                     </param>
-        /// <param name="sipAuthUsername"> The SIP username used for authentication </param>
-        /// <param name="sipAuthPassword"> The SIP password for authentication </param>
-        /// <param name="region"> The region where we should mix the conference audio </param>
-        /// <param name="conferenceRecordingStatusCallback"> The URL we should call using the
-        ///                                         `conference_recording_status_callback_method` when the conference recording
-        ///                                         is available </param>
-        /// <param name="conferenceRecordingStatusCallbackMethod"> The HTTP method we should use to call
-        ///                                               `conference_recording_status_callback` </param>
-        /// <param name="recordingStatusCallbackEvent"> The recording state changes that should generate a call to
-        ///                                    `recording_status_callback` </param>
-        /// <param name="conferenceRecordingStatusCallbackEvent"> The conference recording state changes that should generate a
-        ///                                              call to `conference_recording_status_callback` </param>
-        /// <param name="coaching"> Indicates if the participant changed to coach </param>
-        /// <param name="callSidToCoach"> The SID of the participant who is being `coached` </param>
-        /// <param name="jitterBufferSize"> Jitter Buffer size for the connecting participant </param>
-        /// <param name="byoc"> BYOC trunk SID (Beta) </param>
-        /// <param name="callerId"> The phone number, Client identifier, or username portion of SIP address that made this
-        ///                call. </param>
-        /// <param name="callReason"> Reason for the call (Branded Calls Beta) </param>
-        /// <param name="recordingTrack"> The track(s) to record </param>
-        /// <param name="timeLimit"> The maximum duration of the call in seconds. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(string pathConferenceSid,
-                                                                                         IEndpoint from,
-                                                                                         IEndpoint to,
-                                                                                         string pathAccountSid = null,
-                                                                                         Uri statusCallback = null,
-                                                                                         Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                         List<string> statusCallbackEvent = null,
-                                                                                         string label = null,
-                                                                                         int? timeout = null,
-                                                                                         bool? record = null,
-                                                                                         bool? muted = null,
-                                                                                         string beep = null,
-                                                                                         bool? startConferenceOnEnter = null,
-                                                                                         bool? endConferenceOnExit = null,
-                                                                                         Uri waitUrl = null,
-                                                                                         Twilio.Http.HttpMethod waitMethod = null,
-                                                                                         bool? earlyMedia = null,
-                                                                                         int? maxParticipants = null,
-                                                                                         string conferenceRecord = null,
-                                                                                         string conferenceTrim = null,
-                                                                                         Uri conferenceStatusCallback = null,
-                                                                                         Twilio.Http.HttpMethod conferenceStatusCallbackMethod = null,
-                                                                                         List<string> conferenceStatusCallbackEvent = null,
-                                                                                         string recordingChannels = null,
-                                                                                         Uri recordingStatusCallback = null,
-                                                                                         Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                                                                                         string sipAuthUsername = null,
-                                                                                         string sipAuthPassword = null,
-                                                                                         string region = null,
-                                                                                         Uri conferenceRecordingStatusCallback = null,
-                                                                                         Twilio.Http.HttpMethod conferenceRecordingStatusCallbackMethod = null,
-                                                                                         List<string> recordingStatusCallbackEvent = null,
-                                                                                         List<string> conferenceRecordingStatusCallbackEvent = null,
-                                                                                         bool? coaching = null,
-                                                                                         string callSidToCoach = null,
-                                                                                         string jitterBufferSize = null,
-                                                                                         string byoc = null,
-                                                                                         string callerId = null,
-                                                                                         string callReason = null,
-                                                                                         string recordingTrack = null,
-                                                                                         int? timeLimit = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateParticipantOptions(pathConferenceSid, from, to){PathAccountSid = pathAccountSid, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, StatusCallbackEvent = statusCallbackEvent, Label = label, Timeout = timeout, Record = record, Muted = muted, Beep = beep, StartConferenceOnEnter = startConferenceOnEnter, EndConferenceOnExit = endConferenceOnExit, WaitUrl = waitUrl, WaitMethod = waitMethod, EarlyMedia = earlyMedia, MaxParticipants = maxParticipants, ConferenceRecord = conferenceRecord, ConferenceTrim = conferenceTrim, ConferenceStatusCallback = conferenceStatusCallback, ConferenceStatusCallbackMethod = conferenceStatusCallbackMethod, ConferenceStatusCallbackEvent = conferenceStatusCallbackEvent, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, Region = region, ConferenceRecordingStatusCallback = conferenceRecordingStatusCallback, ConferenceRecordingStatusCallbackMethod = conferenceRecordingStatusCallbackMethod, RecordingStatusCallbackEvent = recordingStatusCallbackEvent, ConferenceRecordingStatusCallbackEvent = conferenceRecordingStatusCallbackEvent, Coaching = coaching, CallSidToCoach = callSidToCoach, JitterBufferSize = jitterBufferSize, Byoc = byoc, CallerId = callerId, CallReason = callReason, RecordingTrack = recordingTrack, TimeLimit = timeLimit};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Participants/" + options.PathCallSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Kick a participant from a given conference
-        /// </summary>
-        /// <param name="options"> Delete Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static bool Delete(DeleteParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Kick a participant from a given conference
-        /// </summary>
-        /// <param name="options"> Delete Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteParticipantOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Kick a participant from a given conference
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the conference with the participants to delete </param>
-        /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to delete </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static bool Delete(string pathConferenceSid,
-                                  string pathCallSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteParticipantOptions(pathConferenceSid, pathCallSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Kick a participant from a given conference
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the conference with the participants to delete </param>
-        /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to delete </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathConferenceSid,
-                                                                          string pathCallSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteParticipantOptions(pathConferenceSid, pathCallSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Participants.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of participants belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ResourceSet<ParticipantResource> Read(ReadParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantResource>.FromJson("participants", response.Content);
-            return new ResourceSet<ParticipantResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of participants belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(ReadParticipantOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantResource>.FromJson("participants", response.Content);
-            return new ResourceSet<ParticipantResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of participants belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the conference with the participants to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="muted"> Whether to return only participants that are muted </param>
-        /// <param name="hold"> Whether to return only participants that are on hold </param>
-        /// <param name="coaching"> Whether to return only participants who are coaching another call </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ResourceSet<ParticipantResource> Read(string pathConferenceSid,
-                                                            string pathAccountSid = null,
-                                                            bool? muted = null,
-                                                            bool? hold = null,
-                                                            bool? coaching = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantOptions(pathConferenceSid){PathAccountSid = pathAccountSid, Muted = muted, Hold = hold, Coaching = coaching, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of participants belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathConferenceSid"> The SID of the conference with the participants to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="muted"> Whether to return only participants that are muted </param>
-        /// <param name="hold"> Whether to return only participants that are on hold </param>
-        /// <param name="coaching"> Whether to return only participants who are coaching another call </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(string pathConferenceSid,
-                                                                                                    string pathAccountSid = null,
-                                                                                                    bool? muted = null,
-                                                                                                    bool? hold = null,
-                                                                                                    bool? coaching = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantOptions(pathConferenceSid){PathAccountSid = pathAccountSid, Muted = muted, Hold = hold, Coaching = coaching, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ParticipantResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ParticipantResource> NextPage(Page<ParticipantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ParticipantResource> PreviousPage(Page<ParticipantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a ParticipantResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ParticipantResource object represented by the provided JSON </returns>
-        public static ParticipantResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ParticipantResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Call the resource is associated with
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The label of this participant
-        /// </summary>
-        [JsonProperty("label")]
-        public string Label { get; private set; }
-        /// <summary>
-        /// The SID of the participant who is being `coached`
-        /// </summary>
-        [JsonProperty("call_sid_to_coach")]
-        public string CallSidToCoach { get; private set; }
-        /// <summary>
-        /// Indicates if the participant changed to coach
-        /// </summary>
-        [JsonProperty("coaching")]
-        public bool? Coaching { get; private set; }
-        /// <summary>
-        /// The SID of the conference the participant is in
-        /// </summary>
-        [JsonProperty("conference_sid")]
-        public string ConferenceSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Whether the conference ends when the participant leaves
-        /// </summary>
-        [JsonProperty("end_conference_on_exit")]
-        public bool? EndConferenceOnExit { get; private set; }
-        /// <summary>
-        /// Whether the participant is muted
-        /// </summary>
-        [JsonProperty("muted")]
-        public bool? Muted { get; private set; }
-        /// <summary>
-        /// Whether the participant is on hold
-        /// </summary>
-        [JsonProperty("hold")]
-        public bool? Hold { get; private set; }
-        /// <summary>
-        /// Whether the conference starts when the participant joins the conference
-        /// </summary>
-        [JsonProperty("start_conference_on_enter")]
-        public bool? StartConferenceOnEnter { get; private set; }
-        /// <summary>
-        /// The status of the participant's call in a session
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ParticipantResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private ParticipantResource()
-        {
-
-        }
-    }
+{
+
+  public class ParticipantResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Queued = new StatusEnum("queued");
+      public static readonly StatusEnum Connecting = new StatusEnum("connecting");
+      public static readonly StatusEnum Ringing = new StatusEnum("ringing");
+      public static readonly StatusEnum Connected = new StatusEnum("connected");
+      public static readonly StatusEnum Complete = new StatusEnum("complete");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    private static Request BuildFetchRequest(FetchParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Participants/" + options.PathCallSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of a participant
+    /// </summary>
+    /// <param name="options"> Fetch Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Fetch(FetchParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a participant
+    /// </summary>
+    /// <param name="options"> Fetch Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(FetchParticipantOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of a participant
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the conference with the participant to fetch </param>
+    /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to fetch </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Fetch(string pathConferenceSid,
+                                            string pathCallSid,
+                                            string pathAccountSid = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchParticipantOptions(pathConferenceSid, pathCallSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a participant
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the conference with the participant to fetch </param>
+    /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to fetch </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(string pathConferenceSid,
+                                                                                    string pathCallSid,
+                                                                                    string pathAccountSid = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchParticipantOptions(pathConferenceSid, pathCallSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Participants/" + options.PathCallSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update the properties of the participant
+    /// </summary>
+    /// <param name="options"> Update Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Update(UpdateParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the properties of the participant
+    /// </summary>
+    /// <param name="options"> Update Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(UpdateParticipantOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update the properties of the participant
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the conference with the participant to update </param>
+    /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to update </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
+    /// <param name="muted"> Whether the participant should be muted </param>
+    /// <param name="hold"> Whether the participant should be on hold </param>
+    /// <param name="holdUrl"> The URL we call using the `hold_method` for  music that plays when the participant is on
+    ///               hold </param>
+    /// <param name="holdMethod"> The HTTP method we should use to call hold_url </param>
+    /// <param name="announceUrl"> The URL we call using the `announce_method` for an announcement to the participant
+    ///                   </param>
+    /// <param name="announceMethod"> The HTTP method we should use to call announce_url </param>
+    /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
+    /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
+    /// <param name="beepOnExit"> Whether to play a notification beep to the conference when the participant exit </param>
+    /// <param name="endConferenceOnExit"> Whether to end the conference when the participant leaves </param>
+    /// <param name="coaching"> Indicates if the participant changed to coach </param>
+    /// <param name="callSidToCoach"> The SID of the participant who is being `coached` </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Update(string pathConferenceSid,
+                                             string pathCallSid,
+                                             string pathAccountSid = null,
+                                             bool? muted = null,
+                                             bool? hold = null,
+                                             Uri holdUrl = null,
+                                             Twilio.Http.HttpMethod holdMethod = null,
+                                             Uri announceUrl = null,
+                                             Twilio.Http.HttpMethod announceMethod = null,
+                                             Uri waitUrl = null,
+                                             Twilio.Http.HttpMethod waitMethod = null,
+                                             bool? beepOnExit = null,
+                                             bool? endConferenceOnExit = null,
+                                             bool? coaching = null,
+                                             string callSidToCoach = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateParticipantOptions(pathConferenceSid, pathCallSid) { PathAccountSid = pathAccountSid, Muted = muted, Hold = hold, HoldUrl = holdUrl, HoldMethod = holdMethod, AnnounceUrl = announceUrl, AnnounceMethod = announceMethod, WaitUrl = waitUrl, WaitMethod = waitMethod, BeepOnExit = beepOnExit, EndConferenceOnExit = endConferenceOnExit, Coaching = coaching, CallSidToCoach = callSidToCoach };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the properties of the participant
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the conference with the participant to update </param>
+    /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to update </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
+    /// <param name="muted"> Whether the participant should be muted </param>
+    /// <param name="hold"> Whether the participant should be on hold </param>
+    /// <param name="holdUrl"> The URL we call using the `hold_method` for  music that plays when the participant is on
+    ///               hold </param>
+    /// <param name="holdMethod"> The HTTP method we should use to call hold_url </param>
+    /// <param name="announceUrl"> The URL we call using the `announce_method` for an announcement to the participant
+    ///                   </param>
+    /// <param name="announceMethod"> The HTTP method we should use to call announce_url </param>
+    /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
+    /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
+    /// <param name="beepOnExit"> Whether to play a notification beep to the conference when the participant exit </param>
+    /// <param name="endConferenceOnExit"> Whether to end the conference when the participant leaves </param>
+    /// <param name="coaching"> Indicates if the participant changed to coach </param>
+    /// <param name="callSidToCoach"> The SID of the participant who is being `coached` </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(string pathConferenceSid,
+                                                                                     string pathCallSid,
+                                                                                     string pathAccountSid = null,
+                                                                                     bool? muted = null,
+                                                                                     bool? hold = null,
+                                                                                     Uri holdUrl = null,
+                                                                                     Twilio.Http.HttpMethod holdMethod = null,
+                                                                                     Uri announceUrl = null,
+                                                                                     Twilio.Http.HttpMethod announceMethod = null,
+                                                                                     Uri waitUrl = null,
+                                                                                     Twilio.Http.HttpMethod waitMethod = null,
+                                                                                     bool? beepOnExit = null,
+                                                                                     bool? endConferenceOnExit = null,
+                                                                                     bool? coaching = null,
+                                                                                     string callSidToCoach = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateParticipantOptions(pathConferenceSid, pathCallSid) { PathAccountSid = pathAccountSid, Muted = muted, Hold = hold, HoldUrl = holdUrl, HoldMethod = holdMethod, AnnounceUrl = announceUrl, AnnounceMethod = announceMethod, WaitUrl = waitUrl, WaitMethod = waitMethod, BeepOnExit = beepOnExit, EndConferenceOnExit = endConferenceOnExit, Coaching = coaching, CallSidToCoach = callSidToCoach };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Participants.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Create(CreateParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(CreateParticipantOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the participant's conference </param>
+    /// <param name="from"> The phone number, Client identifier, or username portion of SIP address that made this call.
+    ///            </param>
+    /// <param name="to"> The phone number, SIP address or Client identifier that received this call. </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call `status_callback` </param>
+    /// <param name="statusCallbackEvent"> Set state change events that will trigger a callback </param>
+    /// <param name="label"> The label of this participant </param>
+    /// <param name="timeout"> he number of seconds that we should wait for an answer </param>
+    /// <param name="record"> Whether to record the participant and their conferences </param>
+    /// <param name="muted"> Whether to mute the agent </param>
+    /// <param name="beep"> Whether to play a notification beep to the conference when the participant joins </param>
+    /// <param name="startConferenceOnEnter"> Whether the conference starts when the participant joins the conference
+    ///                              </param>
+    /// <param name="endConferenceOnExit"> Whether to end the conference when the participant leaves </param>
+    /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
+    /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
+    /// <param name="earlyMedia"> Whether agents can hear the state of the outbound call </param>
+    /// <param name="maxParticipants"> The maximum number of agent conference participants </param>
+    /// <param name="conferenceRecord"> Whether to record the conference the participant is joining </param>
+    /// <param name="conferenceTrim"> Whether to trim leading and trailing silence from your recorded conference audio
+    ///                      files </param>
+    /// <param name="conferenceStatusCallback"> The callback URL for conference events </param>
+    /// <param name="conferenceStatusCallbackMethod"> HTTP method for requesting `conference_status_callback` URL </param>
+    /// <param name="conferenceStatusCallbackEvent"> The conference state changes that should generate a call to
+    ///                                     `conference_status_callback` </param>
+    /// <param name="recordingChannels"> Specify `mono` or `dual` recording channels </param>
+    /// <param name="recordingStatusCallback"> The URL that we should call using the `recording_status_callback_method`
+    ///                               when the recording status changes </param>
+    /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when we call `recording_status_callback`
+    ///                                     </param>
+    /// <param name="sipAuthUsername"> The SIP username used for authentication </param>
+    /// <param name="sipAuthPassword"> The SIP password for authentication </param>
+    /// <param name="region"> The region where we should mix the conference audio </param>
+    /// <param name="conferenceRecordingStatusCallback"> The URL we should call using the
+    ///                                         `conference_recording_status_callback_method` when the conference recording
+    ///                                         is available </param>
+    /// <param name="conferenceRecordingStatusCallbackMethod"> The HTTP method we should use to call
+    ///                                               `conference_recording_status_callback` </param>
+    /// <param name="recordingStatusCallbackEvent"> The recording state changes that should generate a call to
+    ///                                    `recording_status_callback` </param>
+    /// <param name="conferenceRecordingStatusCallbackEvent"> The conference recording state changes that should generate a
+    ///                                              call to `conference_recording_status_callback` </param>
+    /// <param name="coaching"> Indicates if the participant changed to coach </param>
+    /// <param name="callSidToCoach"> The SID of the participant who is being `coached` </param>
+    /// <param name="jitterBufferSize"> Jitter Buffer size for the connecting participant </param>
+    /// <param name="byoc"> BYOC trunk SID (Beta) </param>
+    /// <param name="callerId"> The phone number, Client identifier, or username portion of SIP address that made this
+    ///                call. </param>
+    /// <param name="callReason"> Reason for the call (Branded Calls Beta) </param>
+    /// <param name="recordingTrack"> The track(s) to record </param>
+    /// <param name="timeLimit"> The maximum duration of the call in seconds. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Create(string pathConferenceSid,
+                                             IEndpoint from,
+                                             IEndpoint to,
+                                             string pathAccountSid = null,
+                                             Uri statusCallback = null,
+                                             Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                             List<string> statusCallbackEvent = null,
+                                             string label = null,
+                                             int? timeout = null,
+                                             bool? record = null,
+                                             bool? muted = null,
+                                             string beep = null,
+                                             bool? startConferenceOnEnter = null,
+                                             bool? endConferenceOnExit = null,
+                                             Uri waitUrl = null,
+                                             Twilio.Http.HttpMethod waitMethod = null,
+                                             bool? earlyMedia = null,
+                                             int? maxParticipants = null,
+                                             string conferenceRecord = null,
+                                             string conferenceTrim = null,
+                                             Uri conferenceStatusCallback = null,
+                                             Twilio.Http.HttpMethod conferenceStatusCallbackMethod = null,
+                                             List<string> conferenceStatusCallbackEvent = null,
+                                             string recordingChannels = null,
+                                             Uri recordingStatusCallback = null,
+                                             Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                                             string sipAuthUsername = null,
+                                             string sipAuthPassword = null,
+                                             string region = null,
+                                             Uri conferenceRecordingStatusCallback = null,
+                                             Twilio.Http.HttpMethod conferenceRecordingStatusCallbackMethod = null,
+                                             List<string> recordingStatusCallbackEvent = null,
+                                             List<string> conferenceRecordingStatusCallbackEvent = null,
+                                             bool? coaching = null,
+                                             string callSidToCoach = null,
+                                             string jitterBufferSize = null,
+                                             string byoc = null,
+                                             string callerId = null,
+                                             string callReason = null,
+                                             string recordingTrack = null,
+                                             int? timeLimit = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateParticipantOptions(pathConferenceSid, from, to) { PathAccountSid = pathAccountSid, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, StatusCallbackEvent = statusCallbackEvent, Label = label, Timeout = timeout, Record = record, Muted = muted, Beep = beep, StartConferenceOnEnter = startConferenceOnEnter, EndConferenceOnExit = endConferenceOnExit, WaitUrl = waitUrl, WaitMethod = waitMethod, EarlyMedia = earlyMedia, MaxParticipants = maxParticipants, ConferenceRecord = conferenceRecord, ConferenceTrim = conferenceTrim, ConferenceStatusCallback = conferenceStatusCallback, ConferenceStatusCallbackMethod = conferenceStatusCallbackMethod, ConferenceStatusCallbackEvent = conferenceStatusCallbackEvent, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, Region = region, ConferenceRecordingStatusCallback = conferenceRecordingStatusCallback, ConferenceRecordingStatusCallbackMethod = conferenceRecordingStatusCallbackMethod, RecordingStatusCallbackEvent = recordingStatusCallbackEvent, ConferenceRecordingStatusCallbackEvent = conferenceRecordingStatusCallbackEvent, Coaching = coaching, CallSidToCoach = callSidToCoach, JitterBufferSize = jitterBufferSize, Byoc = byoc, CallerId = callerId, CallReason = callReason, RecordingTrack = recordingTrack, TimeLimit = timeLimit };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the participant's conference </param>
+    /// <param name="from"> The phone number, Client identifier, or username portion of SIP address that made this call.
+    ///            </param>
+    /// <param name="to"> The phone number, SIP address or Client identifier that received this call. </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call `status_callback` </param>
+    /// <param name="statusCallbackEvent"> Set state change events that will trigger a callback </param>
+    /// <param name="label"> The label of this participant </param>
+    /// <param name="timeout"> he number of seconds that we should wait for an answer </param>
+    /// <param name="record"> Whether to record the participant and their conferences </param>
+    /// <param name="muted"> Whether to mute the agent </param>
+    /// <param name="beep"> Whether to play a notification beep to the conference when the participant joins </param>
+    /// <param name="startConferenceOnEnter"> Whether the conference starts when the participant joins the conference
+    ///                              </param>
+    /// <param name="endConferenceOnExit"> Whether to end the conference when the participant leaves </param>
+    /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
+    /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
+    /// <param name="earlyMedia"> Whether agents can hear the state of the outbound call </param>
+    /// <param name="maxParticipants"> The maximum number of agent conference participants </param>
+    /// <param name="conferenceRecord"> Whether to record the conference the participant is joining </param>
+    /// <param name="conferenceTrim"> Whether to trim leading and trailing silence from your recorded conference audio
+    ///                      files </param>
+    /// <param name="conferenceStatusCallback"> The callback URL for conference events </param>
+    /// <param name="conferenceStatusCallbackMethod"> HTTP method for requesting `conference_status_callback` URL </param>
+    /// <param name="conferenceStatusCallbackEvent"> The conference state changes that should generate a call to
+    ///                                     `conference_status_callback` </param>
+    /// <param name="recordingChannels"> Specify `mono` or `dual` recording channels </param>
+    /// <param name="recordingStatusCallback"> The URL that we should call using the `recording_status_callback_method`
+    ///                               when the recording status changes </param>
+    /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when we call `recording_status_callback`
+    ///                                     </param>
+    /// <param name="sipAuthUsername"> The SIP username used for authentication </param>
+    /// <param name="sipAuthPassword"> The SIP password for authentication </param>
+    /// <param name="region"> The region where we should mix the conference audio </param>
+    /// <param name="conferenceRecordingStatusCallback"> The URL we should call using the
+    ///                                         `conference_recording_status_callback_method` when the conference recording
+    ///                                         is available </param>
+    /// <param name="conferenceRecordingStatusCallbackMethod"> The HTTP method we should use to call
+    ///                                               `conference_recording_status_callback` </param>
+    /// <param name="recordingStatusCallbackEvent"> The recording state changes that should generate a call to
+    ///                                    `recording_status_callback` </param>
+    /// <param name="conferenceRecordingStatusCallbackEvent"> The conference recording state changes that should generate a
+    ///                                              call to `conference_recording_status_callback` </param>
+    /// <param name="coaching"> Indicates if the participant changed to coach </param>
+    /// <param name="callSidToCoach"> The SID of the participant who is being `coached` </param>
+    /// <param name="jitterBufferSize"> Jitter Buffer size for the connecting participant </param>
+    /// <param name="byoc"> BYOC trunk SID (Beta) </param>
+    /// <param name="callerId"> The phone number, Client identifier, or username portion of SIP address that made this
+    ///                call. </param>
+    /// <param name="callReason"> Reason for the call (Branded Calls Beta) </param>
+    /// <param name="recordingTrack"> The track(s) to record </param>
+    /// <param name="timeLimit"> The maximum duration of the call in seconds. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(string pathConferenceSid,
+                                                                                     IEndpoint from,
+                                                                                     IEndpoint to,
+                                                                                     string pathAccountSid = null,
+                                                                                     Uri statusCallback = null,
+                                                                                     Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                     List<string> statusCallbackEvent = null,
+                                                                                     string label = null,
+                                                                                     int? timeout = null,
+                                                                                     bool? record = null,
+                                                                                     bool? muted = null,
+                                                                                     string beep = null,
+                                                                                     bool? startConferenceOnEnter = null,
+                                                                                     bool? endConferenceOnExit = null,
+                                                                                     Uri waitUrl = null,
+                                                                                     Twilio.Http.HttpMethod waitMethod = null,
+                                                                                     bool? earlyMedia = null,
+                                                                                     int? maxParticipants = null,
+                                                                                     string conferenceRecord = null,
+                                                                                     string conferenceTrim = null,
+                                                                                     Uri conferenceStatusCallback = null,
+                                                                                     Twilio.Http.HttpMethod conferenceStatusCallbackMethod = null,
+                                                                                     List<string> conferenceStatusCallbackEvent = null,
+                                                                                     string recordingChannels = null,
+                                                                                     Uri recordingStatusCallback = null,
+                                                                                     Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                                                                                     string sipAuthUsername = null,
+                                                                                     string sipAuthPassword = null,
+                                                                                     string region = null,
+                                                                                     Uri conferenceRecordingStatusCallback = null,
+                                                                                     Twilio.Http.HttpMethod conferenceRecordingStatusCallbackMethod = null,
+                                                                                     List<string> recordingStatusCallbackEvent = null,
+                                                                                     List<string> conferenceRecordingStatusCallbackEvent = null,
+                                                                                     bool? coaching = null,
+                                                                                     string callSidToCoach = null,
+                                                                                     string jitterBufferSize = null,
+                                                                                     string byoc = null,
+                                                                                     string callerId = null,
+                                                                                     string callReason = null,
+                                                                                     string recordingTrack = null,
+                                                                                     int? timeLimit = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateParticipantOptions(pathConferenceSid, from, to) { PathAccountSid = pathAccountSid, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, StatusCallbackEvent = statusCallbackEvent, Label = label, Timeout = timeout, Record = record, Muted = muted, Beep = beep, StartConferenceOnEnter = startConferenceOnEnter, EndConferenceOnExit = endConferenceOnExit, WaitUrl = waitUrl, WaitMethod = waitMethod, EarlyMedia = earlyMedia, MaxParticipants = maxParticipants, ConferenceRecord = conferenceRecord, ConferenceTrim = conferenceTrim, ConferenceStatusCallback = conferenceStatusCallback, ConferenceStatusCallbackMethod = conferenceStatusCallbackMethod, ConferenceStatusCallbackEvent = conferenceStatusCallbackEvent, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, Region = region, ConferenceRecordingStatusCallback = conferenceRecordingStatusCallback, ConferenceRecordingStatusCallbackMethod = conferenceRecordingStatusCallbackMethod, RecordingStatusCallbackEvent = recordingStatusCallbackEvent, ConferenceRecordingStatusCallbackEvent = conferenceRecordingStatusCallbackEvent, Coaching = coaching, CallSidToCoach = callSidToCoach, JitterBufferSize = jitterBufferSize, Byoc = byoc, CallerId = callerId, CallReason = callReason, RecordingTrack = recordingTrack, TimeLimit = timeLimit };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Participants/" + options.PathCallSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Kick a participant from a given conference
+    /// </summary>
+    /// <param name="options"> Delete Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static bool Delete(DeleteParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Kick a participant from a given conference
+    /// </summary>
+    /// <param name="options"> Delete Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteParticipantOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Kick a participant from a given conference
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the conference with the participants to delete </param>
+    /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to delete </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static bool Delete(string pathConferenceSid,
+                              string pathCallSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteParticipantOptions(pathConferenceSid, pathCallSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Kick a participant from a given conference
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the conference with the participants to delete </param>
+    /// <param name="pathCallSid"> The Call SID or URL encoded label of the participant to delete </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathConferenceSid,
+                                                                      string pathCallSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteParticipantOptions(pathConferenceSid, pathCallSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Participants.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of participants belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ResourceSet<ParticipantResource> Read(ReadParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantResource>.FromJson("participants", response.Content);
+      return new ResourceSet<ParticipantResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of participants belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(ReadParticipantOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantResource>.FromJson("participants", response.Content);
+      return new ResourceSet<ParticipantResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of participants belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the conference with the participants to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="muted"> Whether to return only participants that are muted </param>
+    /// <param name="hold"> Whether to return only participants that are on hold </param>
+    /// <param name="coaching"> Whether to return only participants who are coaching another call </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ResourceSet<ParticipantResource> Read(string pathConferenceSid,
+                                                        string pathAccountSid = null,
+                                                        bool? muted = null,
+                                                        bool? hold = null,
+                                                        bool? coaching = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantOptions(pathConferenceSid) { PathAccountSid = pathAccountSid, Muted = muted, Hold = hold, Coaching = coaching, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of participants belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathConferenceSid"> The SID of the conference with the participants to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="muted"> Whether to return only participants that are muted </param>
+    /// <param name="hold"> Whether to return only participants that are on hold </param>
+    /// <param name="coaching"> Whether to return only participants who are coaching another call </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(string pathConferenceSid,
+                                                                                                string pathAccountSid = null,
+                                                                                                bool? muted = null,
+                                                                                                bool? hold = null,
+                                                                                                bool? coaching = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantOptions(pathConferenceSid) { PathAccountSid = pathAccountSid, Muted = muted, Hold = hold, Coaching = coaching, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ParticipantResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ParticipantResource> NextPage(Page<ParticipantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ParticipantResource> PreviousPage(Page<ParticipantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a ParticipantResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ParticipantResource object represented by the provided JSON </returns>
+    public static ParticipantResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ParticipantResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Call the resource is associated with
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The label of this participant
+    /// </summary>
+    [JsonProperty("label")]
+    public string Label { get; private set; }
+    /// <summary>
+    /// The SID of the participant who is being `coached`
+    /// </summary>
+    [JsonProperty("call_sid_to_coach")]
+    public string CallSidToCoach { get; private set; }
+    /// <summary>
+    /// Indicates if the participant changed to coach
+    /// </summary>
+    [JsonProperty("coaching")]
+    public bool? Coaching { get; private set; }
+    /// <summary>
+    /// The SID of the conference the participant is in
+    /// </summary>
+    [JsonProperty("conference_sid")]
+    public string ConferenceSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Whether the conference ends when the participant leaves
+    /// </summary>
+    [JsonProperty("end_conference_on_exit")]
+    public bool? EndConferenceOnExit { get; private set; }
+    /// <summary>
+    /// Whether the participant is muted
+    /// </summary>
+    [JsonProperty("muted")]
+    public bool? Muted { get; private set; }
+    /// <summary>
+    /// Whether the participant is on hold
+    /// </summary>
+    [JsonProperty("hold")]
+    public bool? Hold { get; private set; }
+    /// <summary>
+    /// Whether the conference starts when the participant joins the conference
+    /// </summary>
+    [JsonProperty("start_conference_on_enter")]
+    public bool? StartConferenceOnEnter { get; private set; }
+    /// <summary>
+    /// The status of the participant's call in a session
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ParticipantResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private ParticipantResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Conference/RecordingOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Conference/RecordingOptions.cs
index cb907cf86..2d5e8b937 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Conference/RecordingOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Conference/RecordingOptions.cs
@@ -9,211 +9,211 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Conference
-{
-
+{
+
+  /// <summary>
+  /// Changes the status of the recording to paused, stopped, or in-progress. Note: To use `Twilio.CURRENT`, pass it as
+  /// recording sid.
+  /// </summary>
+  public class UpdateRecordingOptions : IOptions<RecordingResource>
+  {
     /// <summary>
-    /// Changes the status of the recording to paused, stopped, or in-progress. Note: To use `Twilio.CURRENT`, pass it as
-    /// recording sid.
-    /// </summary>
-    public class UpdateRecordingOptions : IOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Update by unique Conference SID for the recording
-        /// </summary>
-        public string PathConferenceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The new status of the recording
-        /// </summary>
-        public RecordingResource.StatusEnum Status { get; }
-        /// <summary>
-        /// Whether to record during a pause
-        /// </summary>
-        public string PauseBehavior { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateRecordingOptions
-        /// </summary>
-        /// <param name="pathConferenceSid"> Update by unique Conference SID for the recording </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="status"> The new status of the recording </param>
-        public UpdateRecordingOptions(string pathConferenceSid, string pathSid, RecordingResource.StatusEnum status)
-        {
-            PathConferenceSid = pathConferenceSid;
-            PathSid = pathSid;
-            Status = status;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (PauseBehavior != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PauseBehavior", PauseBehavior));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resource to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Fetch an instance of a recording for a call
-    /// </summary>
-    public class FetchRecordingOptions : IOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Fetch by unique Conference SID for the recording
-        /// </summary>
-        public string PathConferenceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRecordingOptions
-        /// </summary>
-        /// <param name="pathConferenceSid"> Fetch by unique Conference SID for the recording </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchRecordingOptions(string pathConferenceSid, string pathSid)
-        {
-            PathConferenceSid = pathConferenceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Update by unique Conference SID for the recording
+    /// </summary>
+    public string PathConferenceSid { get; }
     /// <summary>
-    /// Delete a recording from your account
-    /// </summary>
-    public class DeleteRecordingOptions : IOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Delete by the recording's conference SID
-        /// </summary>
-        public string PathConferenceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRecordingOptions
-        /// </summary>
-        /// <param name="pathConferenceSid"> Delete by the recording's conference SID </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteRecordingOptions(string pathConferenceSid, string pathSid)
-        {
-            PathConferenceSid = pathConferenceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
     /// <summary>
-    /// Retrieve a list of recordings belonging to the call used to make the request
-    /// </summary>
-    public class ReadRecordingOptions : ReadOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Read by unique Conference SID for the recording
-        /// </summary>
-        public string PathConferenceSid { get; }
-        /// <summary>
-        /// The `YYYY-MM-DD` value of the resources to read
-        /// </summary>
-        public DateTime? DateCreatedBefore { get; set; }
-        /// <summary>
-        /// The `YYYY-MM-DD` value of the resources to read
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The `YYYY-MM-DD` value of the resources to read
-        /// </summary>
-        public DateTime? DateCreatedAfter { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadRecordingOptions
-        /// </summary>
-        /// <param name="pathConferenceSid"> Read by unique Conference SID for the recording </param>
-        public ReadRecordingOptions(string pathConferenceSid)
-        {
-            PathConferenceSid = pathConferenceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", DateCreated.Value.ToString("yyyy-MM-dd")));
-            }
-            else
-            {
-                if (DateCreatedBefore != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateCreated<", DateCreatedBefore.Value.ToString("yyyy-MM-dd")));
-                }
-
-                if (DateCreatedAfter != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateCreated>", DateCreatedAfter.Value.ToString("yyyy-MM-dd")));
-                }
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The new status of the recording
+    /// </summary>
+    public RecordingResource.StatusEnum Status { get; }
+    /// <summary>
+    /// Whether to record during a pause
+    /// </summary>
+    public string PauseBehavior { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateRecordingOptions
+    /// </summary>
+    /// <param name="pathConferenceSid"> Update by unique Conference SID for the recording </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="status"> The new status of the recording </param>
+    public UpdateRecordingOptions(string pathConferenceSid, string pathSid, RecordingResource.StatusEnum status)
+    {
+      PathConferenceSid = pathConferenceSid;
+      PathSid = pathSid;
+      Status = status;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (PauseBehavior != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PauseBehavior", PauseBehavior));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch an instance of a recording for a call
+  /// </summary>
+  public class FetchRecordingOptions : IOptions<RecordingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// Fetch by unique Conference SID for the recording
+    /// </summary>
+    public string PathConferenceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchRecordingOptions
+    /// </summary>
+    /// <param name="pathConferenceSid"> Fetch by unique Conference SID for the recording </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchRecordingOptions(string pathConferenceSid, string pathSid)
+    {
+      PathConferenceSid = pathConferenceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a recording from your account
+  /// </summary>
+  public class DeleteRecordingOptions : IOptions<RecordingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// Delete by the recording's conference SID
+    /// </summary>
+    public string PathConferenceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRecordingOptions
+    /// </summary>
+    /// <param name="pathConferenceSid"> Delete by the recording's conference SID </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteRecordingOptions(string pathConferenceSid, string pathSid)
+    {
+      PathConferenceSid = pathConferenceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of recordings belonging to the call used to make the request
+  /// </summary>
+  public class ReadRecordingOptions : ReadOptions<RecordingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// Read by unique Conference SID for the recording
+    /// </summary>
+    public string PathConferenceSid { get; }
+    /// <summary>
+    /// The `YYYY-MM-DD` value of the resources to read
+    /// </summary>
+    public DateTime? DateCreatedBefore { get; set; }
+    /// <summary>
+    /// The `YYYY-MM-DD` value of the resources to read
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The `YYYY-MM-DD` value of the resources to read
+    /// </summary>
+    public DateTime? DateCreatedAfter { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadRecordingOptions
+    /// </summary>
+    /// <param name="pathConferenceSid"> Read by unique Conference SID for the recording </param>
+    public ReadRecordingOptions(string pathConferenceSid)
+    {
+      PathConferenceSid = pathConferenceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", DateCreated.Value.ToString("yyyy-MM-dd")));
+      }
+      else
+      {
+        if (DateCreatedBefore != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateCreated<", DateCreatedBefore.Value.ToString("yyyy-MM-dd")));
+        }
+
+        if (DateCreatedAfter != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateCreated>", DateCreatedAfter.Value.ToString("yyyy-MM-dd")));
+        }
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Conference/RecordingResource.cs b/src/Twilio/Rest/Api/V2010/Account/Conference/RecordingResource.cs
index 58ad5b719..b8acf1fdc 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Conference/RecordingResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Conference/RecordingResource.cs
@@ -17,544 +17,544 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Conference
-{
-
-    public class RecordingResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
-            public static readonly StatusEnum Paused = new StatusEnum("paused");
-            public static readonly StatusEnum Stopped = new StatusEnum("stopped");
-            public static readonly StatusEnum Processing = new StatusEnum("processing");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Absent = new StatusEnum("absent");
-        }
-
-        public sealed class SourceEnum : StringEnum
-        {
-            private SourceEnum(string value) : base(value) {}
-            public SourceEnum() {}
-            public static implicit operator SourceEnum(string value)
-            {
-                return new SourceEnum(value);
-            }
-
-            public static readonly SourceEnum Dialverb = new SourceEnum("DialVerb");
-            public static readonly SourceEnum Conference = new SourceEnum("Conference");
-            public static readonly SourceEnum Outboundapi = new SourceEnum("OutboundAPI");
-            public static readonly SourceEnum Trunking = new SourceEnum("Trunking");
-            public static readonly SourceEnum Recordverb = new SourceEnum("RecordVerb");
-            public static readonly SourceEnum Startcallrecordingapi = new SourceEnum("StartCallRecordingAPI");
-            public static readonly SourceEnum Startconferencerecordingapi = new SourceEnum("StartConferenceRecordingAPI");
-        }
-
-        private static Request BuildUpdateRequest(UpdateRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Recordings/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Changes the status of the recording to paused, stopped, or in-progress. Note: To use `Twilio.CURRENT`, pass it as
-        /// recording sid.
-        /// </summary>
-        /// <param name="options"> Update Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Update(UpdateRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Changes the status of the recording to paused, stopped, or in-progress. Note: To use `Twilio.CURRENT`, pass it as
-        /// recording sid.
-        /// </summary>
-        /// <param name="options"> Update Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> UpdateAsync(UpdateRecordingOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Changes the status of the recording to paused, stopped, or in-progress. Note: To use `Twilio.CURRENT`, pass it as
-        /// recording sid.
-        /// </summary>
-        /// <param name="pathConferenceSid"> Update by unique Conference SID for the recording </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="status"> The new status of the recording </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
-        /// <param name="pauseBehavior"> Whether to record during a pause </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Update(string pathConferenceSid,
-                                               string pathSid,
-                                               RecordingResource.StatusEnum status,
-                                               string pathAccountSid = null,
-                                               string pauseBehavior = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateRecordingOptions(pathConferenceSid, pathSid, status){PathAccountSid = pathAccountSid, PauseBehavior = pauseBehavior};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Changes the status of the recording to paused, stopped, or in-progress. Note: To use `Twilio.CURRENT`, pass it as
-        /// recording sid.
-        /// </summary>
-        /// <param name="pathConferenceSid"> Update by unique Conference SID for the recording </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="status"> The new status of the recording </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
-        /// <param name="pauseBehavior"> Whether to record during a pause </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> UpdateAsync(string pathConferenceSid,
-                                                                                       string pathSid,
-                                                                                       RecordingResource.StatusEnum status,
-                                                                                       string pathAccountSid = null,
-                                                                                       string pauseBehavior = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateRecordingOptions(pathConferenceSid, pathSid, status){PathAccountSid = pathAccountSid, PauseBehavior = pauseBehavior};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Recordings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of a recording for a call
-        /// </summary>
-        /// <param name="options"> Fetch Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Fetch(FetchRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a recording for a call
-        /// </summary>
-        /// <param name="options"> Fetch Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(FetchRecordingOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of a recording for a call
-        /// </summary>
-        /// <param name="pathConferenceSid"> Fetch by unique Conference SID for the recording </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Fetch(string pathConferenceSid,
-                                              string pathSid,
-                                              string pathAccountSid = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingOptions(pathConferenceSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a recording for a call
-        /// </summary>
-        /// <param name="pathConferenceSid"> Fetch by unique Conference SID for the recording </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(string pathConferenceSid,
-                                                                                      string pathSid,
-                                                                                      string pathAccountSid = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingOptions(pathConferenceSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Recordings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a recording from your account
-        /// </summary>
-        /// <param name="options"> Delete Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static bool Delete(DeleteRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a recording from your account
-        /// </summary>
-        /// <param name="options"> Delete Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRecordingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a recording from your account
-        /// </summary>
-        /// <param name="pathConferenceSid"> Delete by the recording's conference SID </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static bool Delete(string pathConferenceSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteRecordingOptions(pathConferenceSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a recording from your account
-        /// </summary>
-        /// <param name="pathConferenceSid"> Delete by the recording's conference SID </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathConferenceSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteRecordingOptions(pathConferenceSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Recordings.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of recordings belonging to the call used to make the request
-        /// </summary>
-        /// <param name="options"> Read Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static ResourceSet<RecordingResource> Read(ReadRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RecordingResource>.FromJson("recordings", response.Content);
-            return new ResourceSet<RecordingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of recordings belonging to the call used to make the request
-        /// </summary>
-        /// <param name="options"> Read Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(ReadRecordingOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RecordingResource>.FromJson("recordings", response.Content);
-            return new ResourceSet<RecordingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of recordings belonging to the call used to make the request
-        /// </summary>
-        /// <param name="pathConferenceSid"> Read by unique Conference SID for the recording </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="dateCreatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateCreated"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateCreatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static ResourceSet<RecordingResource> Read(string pathConferenceSid,
-                                                          string pathAccountSid = null,
-                                                          DateTime? dateCreatedBefore = null,
-                                                          DateTime? dateCreated = null,
-                                                          DateTime? dateCreatedAfter = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadRecordingOptions(pathConferenceSid){PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of recordings belonging to the call used to make the request
-        /// </summary>
-        /// <param name="pathConferenceSid"> Read by unique Conference SID for the recording </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="dateCreatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateCreated"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateCreatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(string pathConferenceSid,
-                                                                                                  string pathAccountSid = null,
-                                                                                                  DateTime? dateCreatedBefore = null,
-                                                                                                  DateTime? dateCreated = null,
-                                                                                                  DateTime? dateCreatedAfter = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadRecordingOptions(pathConferenceSid){PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RecordingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RecordingResource> NextPage(Page<RecordingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<RecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RecordingResource> PreviousPage(Page<RecordingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<RecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a RecordingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RecordingResource object represented by the provided JSON </returns>
-        public static RecordingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RecordingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the recording
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The SID of the Call the resource is associated with
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The Conference SID that identifies the conference associated with the recording
-        /// </summary>
-        [JsonProperty("conference_sid")]
-        public string ConferenceSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The start time of the recording, given in RFC 2822 format
-        /// </summary>
-        [JsonProperty("start_time")]
-        public DateTime? StartTime { get; private set; }
-        /// <summary>
-        /// The length of the recording in seconds
-        /// </summary>
-        [JsonProperty("duration")]
-        public string Duration { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The one-time cost of creating the recording.
-        /// </summary>
-        [JsonProperty("price")]
-        public string Price { get; private set; }
-        /// <summary>
-        /// The currency used in the price property.
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The status of the recording
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RecordingResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The number of channels in the final recording file as an integer
-        /// </summary>
-        [JsonProperty("channels")]
-        public int? Channels { get; private set; }
-        /// <summary>
-        /// How the recording was created
-        /// </summary>
-        [JsonProperty("source")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RecordingResource.SourceEnum Source { get; private set; }
-        /// <summary>
-        /// More information about why the recording is missing, if status is `absent`.
-        /// </summary>
-        [JsonProperty("error_code")]
-        public int? ErrorCode { get; private set; }
-        /// <summary>
-        /// How to decrypt the recording.
-        /// </summary>
-        [JsonProperty("encryption_details")]
-        public object EncryptionDetails { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private RecordingResource()
-        {
-
-        }
-    }
+{
+
+  public class RecordingResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
+      public static readonly StatusEnum Paused = new StatusEnum("paused");
+      public static readonly StatusEnum Stopped = new StatusEnum("stopped");
+      public static readonly StatusEnum Processing = new StatusEnum("processing");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Absent = new StatusEnum("absent");
+    }
+
+    public sealed class SourceEnum : StringEnum
+    {
+      private SourceEnum(string value) : base(value) { }
+      public SourceEnum() { }
+      public static implicit operator SourceEnum(string value)
+      {
+        return new SourceEnum(value);
+      }
+
+      public static readonly SourceEnum Dialverb = new SourceEnum("DialVerb");
+      public static readonly SourceEnum Conference = new SourceEnum("Conference");
+      public static readonly SourceEnum Outboundapi = new SourceEnum("OutboundAPI");
+      public static readonly SourceEnum Trunking = new SourceEnum("Trunking");
+      public static readonly SourceEnum Recordverb = new SourceEnum("RecordVerb");
+      public static readonly SourceEnum Startcallrecordingapi = new SourceEnum("StartCallRecordingAPI");
+      public static readonly SourceEnum Startconferencerecordingapi = new SourceEnum("StartConferenceRecordingAPI");
+    }
+
+    private static Request BuildUpdateRequest(UpdateRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Recordings/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Changes the status of the recording to paused, stopped, or in-progress. Note: To use `Twilio.CURRENT`, pass it as
+    /// recording sid.
+    /// </summary>
+    /// <param name="options"> Update Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Update(UpdateRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Changes the status of the recording to paused, stopped, or in-progress. Note: To use `Twilio.CURRENT`, pass it as
+    /// recording sid.
+    /// </summary>
+    /// <param name="options"> Update Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> UpdateAsync(UpdateRecordingOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Changes the status of the recording to paused, stopped, or in-progress. Note: To use `Twilio.CURRENT`, pass it as
+    /// recording sid.
+    /// </summary>
+    /// <param name="pathConferenceSid"> Update by unique Conference SID for the recording </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="status"> The new status of the recording </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
+    /// <param name="pauseBehavior"> Whether to record during a pause </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Update(string pathConferenceSid,
+                                           string pathSid,
+                                           RecordingResource.StatusEnum status,
+                                           string pathAccountSid = null,
+                                           string pauseBehavior = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateRecordingOptions(pathConferenceSid, pathSid, status) { PathAccountSid = pathAccountSid, PauseBehavior = pauseBehavior };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Changes the status of the recording to paused, stopped, or in-progress. Note: To use `Twilio.CURRENT`, pass it as
+    /// recording sid.
+    /// </summary>
+    /// <param name="pathConferenceSid"> Update by unique Conference SID for the recording </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="status"> The new status of the recording </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
+    /// <param name="pauseBehavior"> Whether to record during a pause </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> UpdateAsync(string pathConferenceSid,
+                                                                                   string pathSid,
+                                                                                   RecordingResource.StatusEnum status,
+                                                                                   string pathAccountSid = null,
+                                                                                   string pauseBehavior = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateRecordingOptions(pathConferenceSid, pathSid, status) { PathAccountSid = pathAccountSid, PauseBehavior = pauseBehavior };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Recordings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of a recording for a call
+    /// </summary>
+    /// <param name="options"> Fetch Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Fetch(FetchRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a recording for a call
+    /// </summary>
+    /// <param name="options"> Fetch Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(FetchRecordingOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of a recording for a call
+    /// </summary>
+    /// <param name="pathConferenceSid"> Fetch by unique Conference SID for the recording </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Fetch(string pathConferenceSid,
+                                          string pathSid,
+                                          string pathAccountSid = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingOptions(pathConferenceSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a recording for a call
+    /// </summary>
+    /// <param name="pathConferenceSid"> Fetch by unique Conference SID for the recording </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(string pathConferenceSid,
+                                                                                  string pathSid,
+                                                                                  string pathAccountSid = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingOptions(pathConferenceSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Recordings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a recording from your account
+    /// </summary>
+    /// <param name="options"> Delete Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static bool Delete(DeleteRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a recording from your account
+    /// </summary>
+    /// <param name="options"> Delete Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRecordingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a recording from your account
+    /// </summary>
+    /// <param name="pathConferenceSid"> Delete by the recording's conference SID </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static bool Delete(string pathConferenceSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteRecordingOptions(pathConferenceSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a recording from your account
+    /// </summary>
+    /// <param name="pathConferenceSid"> Delete by the recording's conference SID </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathConferenceSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteRecordingOptions(pathConferenceSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathConferenceSid + "/Recordings.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of recordings belonging to the call used to make the request
+    /// </summary>
+    /// <param name="options"> Read Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static ResourceSet<RecordingResource> Read(ReadRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RecordingResource>.FromJson("recordings", response.Content);
+      return new ResourceSet<RecordingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of recordings belonging to the call used to make the request
+    /// </summary>
+    /// <param name="options"> Read Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(ReadRecordingOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RecordingResource>.FromJson("recordings", response.Content);
+      return new ResourceSet<RecordingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of recordings belonging to the call used to make the request
+    /// </summary>
+    /// <param name="pathConferenceSid"> Read by unique Conference SID for the recording </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="dateCreatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateCreated"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateCreatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static ResourceSet<RecordingResource> Read(string pathConferenceSid,
+                                                      string pathAccountSid = null,
+                                                      DateTime? dateCreatedBefore = null,
+                                                      DateTime? dateCreated = null,
+                                                      DateTime? dateCreatedAfter = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadRecordingOptions(pathConferenceSid) { PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of recordings belonging to the call used to make the request
+    /// </summary>
+    /// <param name="pathConferenceSid"> Read by unique Conference SID for the recording </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="dateCreatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateCreated"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateCreatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(string pathConferenceSid,
+                                                                                              string pathAccountSid = null,
+                                                                                              DateTime? dateCreatedBefore = null,
+                                                                                              DateTime? dateCreated = null,
+                                                                                              DateTime? dateCreatedAfter = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadRecordingOptions(pathConferenceSid) { PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RecordingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RecordingResource> NextPage(Page<RecordingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<RecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RecordingResource> PreviousPage(Page<RecordingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<RecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a RecordingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RecordingResource object represented by the provided JSON </returns>
+    public static RecordingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RecordingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the recording
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The SID of the Call the resource is associated with
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The Conference SID that identifies the conference associated with the recording
+    /// </summary>
+    [JsonProperty("conference_sid")]
+    public string ConferenceSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The start time of the recording, given in RFC 2822 format
+    /// </summary>
+    [JsonProperty("start_time")]
+    public DateTime? StartTime { get; private set; }
+    /// <summary>
+    /// The length of the recording in seconds
+    /// </summary>
+    [JsonProperty("duration")]
+    public string Duration { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The one-time cost of creating the recording.
+    /// </summary>
+    [JsonProperty("price")]
+    public string Price { get; private set; }
+    /// <summary>
+    /// The currency used in the price property.
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The status of the recording
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RecordingResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The number of channels in the final recording file as an integer
+    /// </summary>
+    [JsonProperty("channels")]
+    public int? Channels { get; private set; }
+    /// <summary>
+    /// How the recording was created
+    /// </summary>
+    [JsonProperty("source")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RecordingResource.SourceEnum Source { get; private set; }
+    /// <summary>
+    /// More information about why the recording is missing, if status is `absent`.
+    /// </summary>
+    [JsonProperty("error_code")]
+    public int? ErrorCode { get; private set; }
+    /// <summary>
+    /// How to decrypt the recording.
+    /// </summary>
+    [JsonProperty("encryption_details")]
+    public object EncryptionDetails { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private RecordingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/ConferenceOptions.cs b/src/Twilio/Rest/Api/V2010/Account/ConferenceOptions.cs
index f270a38f6..68f95641b 100644
--- a/src/Twilio/Rest/Api/V2010/Account/ConferenceOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/ConferenceOptions.cs
@@ -9,200 +9,200 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Fetch an instance of a conference
+  /// </summary>
+  public class FetchConferenceOptions : IOptions<ConferenceResource>
+  {
     /// <summary>
-    /// Fetch an instance of a conference
-    /// </summary>
-    public class FetchConferenceOptions : IOptions<ConferenceResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchConferenceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        public FetchConferenceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resource(s) to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Retrieve a list of conferences belonging to the account used to make the request
-    /// </summary>
-    public class ReadConferenceOptions : ReadOptions<ConferenceResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The `YYYY-MM-DD` value of the resources to read
-        /// </summary>
-        public DateTime? DateCreatedBefore { get; set; }
-        /// <summary>
-        /// The `YYYY-MM-DD` value of the resources to read
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The `YYYY-MM-DD` value of the resources to read
-        /// </summary>
-        public DateTime? DateCreatedAfter { get; set; }
-        /// <summary>
-        /// The `YYYY-MM-DD` value of the resources to read
-        /// </summary>
-        public DateTime? DateUpdatedBefore { get; set; }
-        /// <summary>
-        /// The `YYYY-MM-DD` value of the resources to read
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// The `YYYY-MM-DD` value of the resources to read
-        /// </summary>
-        public DateTime? DateUpdatedAfter { get; set; }
-        /// <summary>
-        /// The string that identifies the Conference resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The status of the resources to read
-        /// </summary>
-        public ConferenceResource.StatusEnum Status { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", DateCreated.Value.ToString("yyyy-MM-dd")));
-            }
-            else
-            {
-                if (DateCreatedBefore != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateCreated<", DateCreatedBefore.Value.ToString("yyyy-MM-dd")));
-                }
-
-                if (DateCreatedAfter != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateCreated>", DateCreatedAfter.Value.ToString("yyyy-MM-dd")));
-                }
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", DateUpdated.Value.ToString("yyyy-MM-dd")));
-            }
-            else
-            {
-                if (DateUpdatedBefore != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateUpdated<", DateUpdatedBefore.Value.ToString("yyyy-MM-dd")));
-                }
-
-                if (DateUpdatedAfter != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateUpdated>", DateUpdatedAfter.Value.ToString("yyyy-MM-dd")));
-                }
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies this resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// UpdateConferenceOptions
-    /// </summary>
-    public class UpdateConferenceOptions : IOptions<ConferenceResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The new status of the resource
-        /// </summary>
-        public ConferenceResource.UpdateStatusEnum Status { get; set; }
-        /// <summary>
-        /// The URL we should call to announce something into the conference
-        /// </summary>
-        public Uri AnnounceUrl { get; set; }
-        /// <summary>
-        /// he HTTP method used to call announce_url
-        /// </summary>
-        public Twilio.Http.HttpMethod AnnounceMethod { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateConferenceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        public UpdateConferenceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (AnnounceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AnnounceUrl", Serializers.Url(AnnounceUrl)));
-            }
-
-            if (AnnounceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AnnounceMethod", AnnounceMethod.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new FetchConferenceOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    public FetchConferenceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of conferences belonging to the account used to make the request
+  /// </summary>
+  public class ReadConferenceOptions : ReadOptions<ConferenceResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The `YYYY-MM-DD` value of the resources to read
+    /// </summary>
+    public DateTime? DateCreatedBefore { get; set; }
+    /// <summary>
+    /// The `YYYY-MM-DD` value of the resources to read
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The `YYYY-MM-DD` value of the resources to read
+    /// </summary>
+    public DateTime? DateCreatedAfter { get; set; }
+    /// <summary>
+    /// The `YYYY-MM-DD` value of the resources to read
+    /// </summary>
+    public DateTime? DateUpdatedBefore { get; set; }
+    /// <summary>
+    /// The `YYYY-MM-DD` value of the resources to read
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// The `YYYY-MM-DD` value of the resources to read
+    /// </summary>
+    public DateTime? DateUpdatedAfter { get; set; }
+    /// <summary>
+    /// The string that identifies the Conference resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The status of the resources to read
+    /// </summary>
+    public ConferenceResource.StatusEnum Status { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", DateCreated.Value.ToString("yyyy-MM-dd")));
+      }
+      else
+      {
+        if (DateCreatedBefore != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateCreated<", DateCreatedBefore.Value.ToString("yyyy-MM-dd")));
+        }
+
+        if (DateCreatedAfter != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateCreated>", DateCreatedAfter.Value.ToString("yyyy-MM-dd")));
+        }
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", DateUpdated.Value.ToString("yyyy-MM-dd")));
+      }
+      else
+      {
+        if (DateUpdatedBefore != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateUpdated<", DateUpdatedBefore.Value.ToString("yyyy-MM-dd")));
+        }
+
+        if (DateUpdatedAfter != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateUpdated>", DateUpdatedAfter.Value.ToString("yyyy-MM-dd")));
+        }
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateConferenceOptions
+  /// </summary>
+  public class UpdateConferenceOptions : IOptions<ConferenceResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies this resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The new status of the resource
+    /// </summary>
+    public ConferenceResource.UpdateStatusEnum Status { get; set; }
+    /// <summary>
+    /// The URL we should call to announce something into the conference
+    /// </summary>
+    public Uri AnnounceUrl { get; set; }
+    /// <summary>
+    /// he HTTP method used to call announce_url
+    /// </summary>
+    public Twilio.Http.HttpMethod AnnounceMethod { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateConferenceOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    public UpdateConferenceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (AnnounceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AnnounceUrl", Serializers.Url(AnnounceUrl)));
+      }
+
+      if (AnnounceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AnnounceMethod", AnnounceMethod.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/ConferenceResource.cs b/src/Twilio/Rest/Api/V2010/Account/ConferenceResource.cs
index c641c53ff..cd8fee582 100644
--- a/src/Twilio/Rest/Api/V2010/Account/ConferenceResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/ConferenceResource.cs
@@ -17,456 +17,456 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class ConferenceResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Init = new StatusEnum("init");
-            public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-        }
-
-        public sealed class UpdateStatusEnum : StringEnum
-        {
-            private UpdateStatusEnum(string value) : base(value) {}
-            public UpdateStatusEnum() {}
-            public static implicit operator UpdateStatusEnum(string value)
-            {
-                return new UpdateStatusEnum(value);
-            }
-
-            public static readonly UpdateStatusEnum Completed = new UpdateStatusEnum("completed");
-        }
-
-        public sealed class ReasonConferenceEndedEnum : StringEnum
-        {
-            private ReasonConferenceEndedEnum(string value) : base(value) {}
-            public ReasonConferenceEndedEnum() {}
-            public static implicit operator ReasonConferenceEndedEnum(string value)
-            {
-                return new ReasonConferenceEndedEnum(value);
-            }
-
-            public static readonly ReasonConferenceEndedEnum ConferenceEndedViaApi = new ReasonConferenceEndedEnum("conference-ended-via-api");
-            public static readonly ReasonConferenceEndedEnum ParticipantWithEndConferenceOnExitLeft = new ReasonConferenceEndedEnum("participant-with-end-conference-on-exit-left");
-            public static readonly ReasonConferenceEndedEnum ParticipantWithEndConferenceOnExitKicked = new ReasonConferenceEndedEnum("participant-with-end-conference-on-exit-kicked");
-            public static readonly ReasonConferenceEndedEnum LastParticipantKicked = new ReasonConferenceEndedEnum("last-participant-kicked");
-            public static readonly ReasonConferenceEndedEnum LastParticipantLeft = new ReasonConferenceEndedEnum("last-participant-left");
-        }
-
-        private static Request BuildFetchRequest(FetchConferenceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of a conference
-        /// </summary>
-        /// <param name="options"> Fetch Conference parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conference </returns>
-        public static ConferenceResource Fetch(FetchConferenceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a conference
-        /// </summary>
-        /// <param name="options"> Fetch Conference parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conference </returns>
-        public static async System.Threading.Tasks.Task<ConferenceResource> FetchAsync(FetchConferenceOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of a conference
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conference </returns>
-        public static ConferenceResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchConferenceOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a conference
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conference </returns>
-        public static async System.Threading.Tasks.Task<ConferenceResource> FetchAsync(string pathSid,
-                                                                                       string pathAccountSid = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchConferenceOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadConferenceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of conferences belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Conference parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conference </returns>
-        public static ResourceSet<ConferenceResource> Read(ReadConferenceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ConferenceResource>.FromJson("conferences", response.Content);
-            return new ResourceSet<ConferenceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of conferences belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Conference parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conference </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ConferenceResource>> ReadAsync(ReadConferenceOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ConferenceResource>.FromJson("conferences", response.Content);
-            return new ResourceSet<ConferenceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of conferences belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
-        /// <param name="dateCreatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateCreated"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateCreatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateUpdatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateUpdated"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateUpdatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="friendlyName"> The string that identifies the Conference resources to read </param>
-        /// <param name="status"> The status of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conference </returns>
-        public static ResourceSet<ConferenceResource> Read(string pathAccountSid = null,
-                                                           DateTime? dateCreatedBefore = null,
-                                                           DateTime? dateCreated = null,
-                                                           DateTime? dateCreatedAfter = null,
-                                                           DateTime? dateUpdatedBefore = null,
-                                                           DateTime? dateUpdated = null,
-                                                           DateTime? dateUpdatedAfter = null,
-                                                           string friendlyName = null,
-                                                           ConferenceResource.StatusEnum status = null,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadConferenceOptions(){PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, DateUpdatedBefore = dateUpdatedBefore, DateUpdated = dateUpdated, DateUpdatedAfter = dateUpdatedAfter, FriendlyName = friendlyName, Status = status, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of conferences belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
-        /// <param name="dateCreatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateCreated"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateCreatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateUpdatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateUpdated"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="dateUpdatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
-        /// <param name="friendlyName"> The string that identifies the Conference resources to read </param>
-        /// <param name="status"> The status of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conference </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ConferenceResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                   DateTime? dateCreatedBefore = null,
-                                                                                                   DateTime? dateCreated = null,
-                                                                                                   DateTime? dateCreatedAfter = null,
-                                                                                                   DateTime? dateUpdatedBefore = null,
-                                                                                                   DateTime? dateUpdated = null,
-                                                                                                   DateTime? dateUpdatedAfter = null,
-                                                                                                   string friendlyName = null,
-                                                                                                   ConferenceResource.StatusEnum status = null,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadConferenceOptions(){PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, DateUpdatedBefore = dateUpdatedBefore, DateUpdated = dateUpdated, DateUpdatedAfter = dateUpdatedAfter, FriendlyName = friendlyName, Status = status, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ConferenceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ConferenceResource>.FromJson("conferences", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ConferenceResource> NextPage(Page<ConferenceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<ConferenceResource>.FromJson("conferences", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ConferenceResource> PreviousPage(Page<ConferenceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<ConferenceResource>.FromJson("conferences", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateConferenceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Conference parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conference </returns>
-        public static ConferenceResource Update(UpdateConferenceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Conference parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conference </returns>
-        public static async System.Threading.Tasks.Task<ConferenceResource> UpdateAsync(UpdateConferenceOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="announceUrl"> The URL we should call to announce something into the conference </param>
-        /// <param name="announceMethod"> he HTTP method used to call announce_url </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conference </returns>
-        public static ConferenceResource Update(string pathSid,
-                                                string pathAccountSid = null,
-                                                ConferenceResource.UpdateStatusEnum status = null,
-                                                Uri announceUrl = null,
-                                                Twilio.Http.HttpMethod announceMethod = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateConferenceOptions(pathSid){PathAccountSid = pathAccountSid, Status = status, AnnounceUrl = announceUrl, AnnounceMethod = announceMethod};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="announceUrl"> The URL we should call to announce something into the conference </param>
-        /// <param name="announceMethod"> he HTTP method used to call announce_url </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conference </returns>
-        public static async System.Threading.Tasks.Task<ConferenceResource> UpdateAsync(string pathSid,
-                                                                                        string pathAccountSid = null,
-                                                                                        ConferenceResource.UpdateStatusEnum status = null,
-                                                                                        Uri announceUrl = null,
-                                                                                        Twilio.Http.HttpMethod announceMethod = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateConferenceOptions(pathSid){PathAccountSid = pathAccountSid, Status = status, AnnounceUrl = announceUrl, AnnounceMethod = announceMethod};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ConferenceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ConferenceResource object represented by the provided JSON </returns>
-        public static ConferenceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ConferenceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created this resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The API version used to create this conference
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// A string that you assigned to describe this conference room
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A string that represents the Twilio Region where the conference was mixed
-        /// </summary>
-        [JsonProperty("region")]
-        public string Region { get; private set; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The status of this conference
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ConferenceResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The URI of this resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// The reason why a conference ended.
-        /// </summary>
-        [JsonProperty("reason_conference_ended")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ConferenceResource.ReasonConferenceEndedEnum ReasonConferenceEnded { get; private set; }
-        /// <summary>
-        /// The call SID that caused the conference to end
-        /// </summary>
-        [JsonProperty("call_sid_ending_conference")]
-        public string CallSidEndingConference { get; private set; }
-
-        private ConferenceResource()
-        {
-
-        }
-    }
+{
+
+  public class ConferenceResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Init = new StatusEnum("init");
+      public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+    }
+
+    public sealed class UpdateStatusEnum : StringEnum
+    {
+      private UpdateStatusEnum(string value) : base(value) { }
+      public UpdateStatusEnum() { }
+      public static implicit operator UpdateStatusEnum(string value)
+      {
+        return new UpdateStatusEnum(value);
+      }
+
+      public static readonly UpdateStatusEnum Completed = new UpdateStatusEnum("completed");
+    }
+
+    public sealed class ReasonConferenceEndedEnum : StringEnum
+    {
+      private ReasonConferenceEndedEnum(string value) : base(value) { }
+      public ReasonConferenceEndedEnum() { }
+      public static implicit operator ReasonConferenceEndedEnum(string value)
+      {
+        return new ReasonConferenceEndedEnum(value);
+      }
+
+      public static readonly ReasonConferenceEndedEnum ConferenceEndedViaApi = new ReasonConferenceEndedEnum("conference-ended-via-api");
+      public static readonly ReasonConferenceEndedEnum ParticipantWithEndConferenceOnExitLeft = new ReasonConferenceEndedEnum("participant-with-end-conference-on-exit-left");
+      public static readonly ReasonConferenceEndedEnum ParticipantWithEndConferenceOnExitKicked = new ReasonConferenceEndedEnum("participant-with-end-conference-on-exit-kicked");
+      public static readonly ReasonConferenceEndedEnum LastParticipantKicked = new ReasonConferenceEndedEnum("last-participant-kicked");
+      public static readonly ReasonConferenceEndedEnum LastParticipantLeft = new ReasonConferenceEndedEnum("last-participant-left");
+    }
+
+    private static Request BuildFetchRequest(FetchConferenceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of a conference
+    /// </summary>
+    /// <param name="options"> Fetch Conference parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conference </returns>
+    public static ConferenceResource Fetch(FetchConferenceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a conference
+    /// </summary>
+    /// <param name="options"> Fetch Conference parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conference </returns>
+    public static async System.Threading.Tasks.Task<ConferenceResource> FetchAsync(FetchConferenceOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of a conference
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conference </returns>
+    public static ConferenceResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchConferenceOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a conference
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conference </returns>
+    public static async System.Threading.Tasks.Task<ConferenceResource> FetchAsync(string pathSid,
+                                                                                   string pathAccountSid = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchConferenceOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadConferenceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of conferences belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Conference parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conference </returns>
+    public static ResourceSet<ConferenceResource> Read(ReadConferenceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ConferenceResource>.FromJson("conferences", response.Content);
+      return new ResourceSet<ConferenceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of conferences belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Conference parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conference </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ConferenceResource>> ReadAsync(ReadConferenceOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ConferenceResource>.FromJson("conferences", response.Content);
+      return new ResourceSet<ConferenceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of conferences belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
+    /// <param name="dateCreatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateCreated"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateCreatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateUpdatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateUpdated"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateUpdatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="friendlyName"> The string that identifies the Conference resources to read </param>
+    /// <param name="status"> The status of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conference </returns>
+    public static ResourceSet<ConferenceResource> Read(string pathAccountSid = null,
+                                                       DateTime? dateCreatedBefore = null,
+                                                       DateTime? dateCreated = null,
+                                                       DateTime? dateCreatedAfter = null,
+                                                       DateTime? dateUpdatedBefore = null,
+                                                       DateTime? dateUpdated = null,
+                                                       DateTime? dateUpdatedAfter = null,
+                                                       string friendlyName = null,
+                                                       ConferenceResource.StatusEnum status = null,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadConferenceOptions() { PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, DateUpdatedBefore = dateUpdatedBefore, DateUpdated = dateUpdated, DateUpdatedAfter = dateUpdatedAfter, FriendlyName = friendlyName, Status = status, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of conferences belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
+    /// <param name="dateCreatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateCreated"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateCreatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateUpdatedBefore"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateUpdated"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="dateUpdatedAfter"> The `YYYY-MM-DD` value of the resources to read </param>
+    /// <param name="friendlyName"> The string that identifies the Conference resources to read </param>
+    /// <param name="status"> The status of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conference </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ConferenceResource>> ReadAsync(string pathAccountSid = null,
+                                                                                               DateTime? dateCreatedBefore = null,
+                                                                                               DateTime? dateCreated = null,
+                                                                                               DateTime? dateCreatedAfter = null,
+                                                                                               DateTime? dateUpdatedBefore = null,
+                                                                                               DateTime? dateUpdated = null,
+                                                                                               DateTime? dateUpdatedAfter = null,
+                                                                                               string friendlyName = null,
+                                                                                               ConferenceResource.StatusEnum status = null,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadConferenceOptions() { PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, DateUpdatedBefore = dateUpdatedBefore, DateUpdated = dateUpdated, DateUpdatedAfter = dateUpdatedAfter, FriendlyName = friendlyName, Status = status, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ConferenceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ConferenceResource>.FromJson("conferences", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ConferenceResource> NextPage(Page<ConferenceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<ConferenceResource>.FromJson("conferences", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ConferenceResource> PreviousPage(Page<ConferenceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<ConferenceResource>.FromJson("conferences", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateConferenceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Conferences/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Conference parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conference </returns>
+    public static ConferenceResource Update(UpdateConferenceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Conference parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conference </returns>
+    public static async System.Threading.Tasks.Task<ConferenceResource> UpdateAsync(UpdateConferenceOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="announceUrl"> The URL we should call to announce something into the conference </param>
+    /// <param name="announceMethod"> he HTTP method used to call announce_url </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conference </returns>
+    public static ConferenceResource Update(string pathSid,
+                                            string pathAccountSid = null,
+                                            ConferenceResource.UpdateStatusEnum status = null,
+                                            Uri announceUrl = null,
+                                            Twilio.Http.HttpMethod announceMethod = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateConferenceOptions(pathSid) { PathAccountSid = pathAccountSid, Status = status, AnnounceUrl = announceUrl, AnnounceMethod = announceMethod };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="announceUrl"> The URL we should call to announce something into the conference </param>
+    /// <param name="announceMethod"> he HTTP method used to call announce_url </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conference </returns>
+    public static async System.Threading.Tasks.Task<ConferenceResource> UpdateAsync(string pathSid,
+                                                                                    string pathAccountSid = null,
+                                                                                    ConferenceResource.UpdateStatusEnum status = null,
+                                                                                    Uri announceUrl = null,
+                                                                                    Twilio.Http.HttpMethod announceMethod = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateConferenceOptions(pathSid) { PathAccountSid = pathAccountSid, Status = status, AnnounceUrl = announceUrl, AnnounceMethod = announceMethod };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ConferenceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ConferenceResource object represented by the provided JSON </returns>
+    public static ConferenceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ConferenceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created this resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The API version used to create this conference
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// A string that you assigned to describe this conference room
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A string that represents the Twilio Region where the conference was mixed
+    /// </summary>
+    [JsonProperty("region")]
+    public string Region { get; private set; }
+    /// <summary>
+    /// The unique string that identifies this resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The status of this conference
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ConferenceResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The URI of this resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// The reason why a conference ended.
+    /// </summary>
+    [JsonProperty("reason_conference_ended")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ConferenceResource.ReasonConferenceEndedEnum ReasonConferenceEnded { get; private set; }
+    /// <summary>
+    /// The call SID that caused the conference to end
+    /// </summary>
+    [JsonProperty("call_sid_ending_conference")]
+    public string CallSidEndingConference { get; private set; }
+
+    private ConferenceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/ConnectAppOptions.cs b/src/Twilio/Rest/Api/V2010/Account/ConnectAppOptions.cs
index 2a3ea7948..0ed4e2302 100644
--- a/src/Twilio/Rest/Api/V2010/Account/ConnectAppOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/ConnectAppOptions.cs
@@ -10,203 +10,203 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Fetch an instance of a connect-app
+  /// </summary>
+  public class FetchConnectAppOptions : IOptions<ConnectAppResource>
+  {
     /// <summary>
-    /// Fetch an instance of a connect-app
-    /// </summary>
-    public class FetchConnectAppOptions : IOptions<ConnectAppResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchConnectAppOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchConnectAppOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Update a connect-app with the specified parameters
-    /// </summary>
-    public class UpdateConnectAppOptions : IOptions<ConnectAppResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The URL to redirect the user to after authorization
-        /// </summary>
-        public Uri AuthorizeRedirectUrl { get; set; }
-        /// <summary>
-        /// The company name to set for the Connect App
-        /// </summary>
-        public string CompanyName { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling deauthorize_callback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod DeauthorizeCallbackMethod { get; set; }
-        /// <summary>
-        /// The URL to call to de-authorize the Connect App
-        /// </summary>
-        public Uri DeauthorizeCallbackUrl { get; set; }
-        /// <summary>
-        /// A description of the Connect App
-        /// </summary>
-        public string Description { get; set; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// A public URL where users can obtain more information
-        /// </summary>
-        public Uri HomepageUrl { get; set; }
-        /// <summary>
-        /// The set of permissions that your ConnectApp will request
-        /// </summary>
-        public List<ConnectAppResource.PermissionEnum> Permissions { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateConnectAppOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateConnectAppOptions(string pathSid)
-        {
-            PathSid = pathSid;
-            Permissions = new List<ConnectAppResource.PermissionEnum>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AuthorizeRedirectUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AuthorizeRedirectUrl", Serializers.Url(AuthorizeRedirectUrl)));
-            }
-
-            if (CompanyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CompanyName", CompanyName));
-            }
-
-            if (DeauthorizeCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeauthorizeCallbackMethod", DeauthorizeCallbackMethod.ToString()));
-            }
-
-            if (DeauthorizeCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeauthorizeCallbackUrl", Serializers.Url(DeauthorizeCallbackUrl)));
-            }
-
-            if (Description != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Description", Description));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (HomepageUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("HomepageUrl", Serializers.Url(HomepageUrl)));
-            }
-
-            if (Permissions != null)
-            {
-                p.AddRange(Permissions.Select(prop => new KeyValuePair<string, string>("Permissions", prop.ToString())));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// Retrieve a list of connect-apps belonging to the account used to make the request
+    /// Construct a new FetchConnectAppOptions
     /// </summary>
-    public class ReadConnectAppOptions : ReadOptions<ConnectAppResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchConnectAppOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// Delete an instance of a connect-app
-    /// </summary>
-    public class DeleteConnectAppOptions : IOptions<ConnectAppResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteConnectAppOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteConnectAppOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update a connect-app with the specified parameters
+  /// </summary>
+  public class UpdateConnectAppOptions : IOptions<ConnectAppResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The URL to redirect the user to after authorization
+    /// </summary>
+    public Uri AuthorizeRedirectUrl { get; set; }
+    /// <summary>
+    /// The company name to set for the Connect App
+    /// </summary>
+    public string CompanyName { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling deauthorize_callback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod DeauthorizeCallbackMethod { get; set; }
+    /// <summary>
+    /// The URL to call to de-authorize the Connect App
+    /// </summary>
+    public Uri DeauthorizeCallbackUrl { get; set; }
+    /// <summary>
+    /// A description of the Connect App
+    /// </summary>
+    public string Description { get; set; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// A public URL where users can obtain more information
+    /// </summary>
+    public Uri HomepageUrl { get; set; }
+    /// <summary>
+    /// The set of permissions that your ConnectApp will request
+    /// </summary>
+    public List<ConnectAppResource.PermissionEnum> Permissions { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateConnectAppOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateConnectAppOptions(string pathSid)
+    {
+      PathSid = pathSid;
+      Permissions = new List<ConnectAppResource.PermissionEnum>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AuthorizeRedirectUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AuthorizeRedirectUrl", Serializers.Url(AuthorizeRedirectUrl)));
+      }
+
+      if (CompanyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CompanyName", CompanyName));
+      }
+
+      if (DeauthorizeCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeauthorizeCallbackMethod", DeauthorizeCallbackMethod.ToString()));
+      }
+
+      if (DeauthorizeCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeauthorizeCallbackUrl", Serializers.Url(DeauthorizeCallbackUrl)));
+      }
+
+      if (Description != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Description", Description));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (HomepageUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("HomepageUrl", Serializers.Url(HomepageUrl)));
+      }
+
+      if (Permissions != null)
+      {
+        p.AddRange(Permissions.Select(prop => new KeyValuePair<string, string>("Permissions", prop.ToString())));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of connect-apps belonging to the account used to make the request
+  /// </summary>
+  public class ReadConnectAppOptions : ReadOptions<ConnectAppResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete an instance of a connect-app
+  /// </summary>
+  public class DeleteConnectAppOptions : IOptions<ConnectAppResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteConnectAppOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteConnectAppOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/ConnectAppResource.cs b/src/Twilio/Rest/Api/V2010/Account/ConnectAppResource.cs
index 24f4f0e35..930e8e1ca 100644
--- a/src/Twilio/Rest/Api/V2010/Account/ConnectAppResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/ConnectAppResource.cs
@@ -17,480 +17,480 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class ConnectAppResource : Resource
-    {
-        public sealed class PermissionEnum : StringEnum
-        {
-            private PermissionEnum(string value) : base(value) {}
-            public PermissionEnum() {}
-            public static implicit operator PermissionEnum(string value)
-            {
-                return new PermissionEnum(value);
-            }
-
-            public static readonly PermissionEnum GetAll = new PermissionEnum("get-all");
-            public static readonly PermissionEnum PostAll = new PermissionEnum("post-all");
-        }
-
-        private static Request BuildFetchRequest(FetchConnectAppOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/ConnectApps/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of a connect-app
-        /// </summary>
-        /// <param name="options"> Fetch ConnectApp parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectApp </returns>
-        public static ConnectAppResource Fetch(FetchConnectAppOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a connect-app
-        /// </summary>
-        /// <param name="options"> Fetch ConnectApp parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectApp </returns>
-        public static async System.Threading.Tasks.Task<ConnectAppResource> FetchAsync(FetchConnectAppOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of a connect-app
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectApp </returns>
-        public static ConnectAppResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchConnectAppOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a connect-app
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectApp </returns>
-        public static async System.Threading.Tasks.Task<ConnectAppResource> FetchAsync(string pathSid,
-                                                                                       string pathAccountSid = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchConnectAppOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateConnectAppOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/ConnectApps/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a connect-app with the specified parameters
-        /// </summary>
-        /// <param name="options"> Update ConnectApp parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectApp </returns>
-        public static ConnectAppResource Update(UpdateConnectAppOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a connect-app with the specified parameters
-        /// </summary>
-        /// <param name="options"> Update ConnectApp parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectApp </returns>
-        public static async System.Threading.Tasks.Task<ConnectAppResource> UpdateAsync(UpdateConnectAppOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a connect-app with the specified parameters
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
-        /// <param name="authorizeRedirectUrl"> The URL to redirect the user to after authorization </param>
-        /// <param name="companyName"> The company name to set for the Connect App </param>
-        /// <param name="deauthorizeCallbackMethod"> The HTTP method to use when calling deauthorize_callback_url </param>
-        /// <param name="deauthorizeCallbackUrl"> The URL to call to de-authorize the Connect App </param>
-        /// <param name="description"> A description of the Connect App </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="homepageUrl"> A public URL where users can obtain more information </param>
-        /// <param name="permissions"> The set of permissions that your ConnectApp will request </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectApp </returns>
-        public static ConnectAppResource Update(string pathSid,
-                                                string pathAccountSid = null,
-                                                Uri authorizeRedirectUrl = null,
-                                                string companyName = null,
-                                                Twilio.Http.HttpMethod deauthorizeCallbackMethod = null,
-                                                Uri deauthorizeCallbackUrl = null,
-                                                string description = null,
-                                                string friendlyName = null,
-                                                Uri homepageUrl = null,
-                                                List<ConnectAppResource.PermissionEnum> permissions = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateConnectAppOptions(pathSid){PathAccountSid = pathAccountSid, AuthorizeRedirectUrl = authorizeRedirectUrl, CompanyName = companyName, DeauthorizeCallbackMethod = deauthorizeCallbackMethod, DeauthorizeCallbackUrl = deauthorizeCallbackUrl, Description = description, FriendlyName = friendlyName, HomepageUrl = homepageUrl, Permissions = permissions};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a connect-app with the specified parameters
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
-        /// <param name="authorizeRedirectUrl"> The URL to redirect the user to after authorization </param>
-        /// <param name="companyName"> The company name to set for the Connect App </param>
-        /// <param name="deauthorizeCallbackMethod"> The HTTP method to use when calling deauthorize_callback_url </param>
-        /// <param name="deauthorizeCallbackUrl"> The URL to call to de-authorize the Connect App </param>
-        /// <param name="description"> A description of the Connect App </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="homepageUrl"> A public URL where users can obtain more information </param>
-        /// <param name="permissions"> The set of permissions that your ConnectApp will request </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectApp </returns>
-        public static async System.Threading.Tasks.Task<ConnectAppResource> UpdateAsync(string pathSid,
-                                                                                        string pathAccountSid = null,
-                                                                                        Uri authorizeRedirectUrl = null,
-                                                                                        string companyName = null,
-                                                                                        Twilio.Http.HttpMethod deauthorizeCallbackMethod = null,
-                                                                                        Uri deauthorizeCallbackUrl = null,
-                                                                                        string description = null,
-                                                                                        string friendlyName = null,
-                                                                                        Uri homepageUrl = null,
-                                                                                        List<ConnectAppResource.PermissionEnum> permissions = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateConnectAppOptions(pathSid){PathAccountSid = pathAccountSid, AuthorizeRedirectUrl = authorizeRedirectUrl, CompanyName = companyName, DeauthorizeCallbackMethod = deauthorizeCallbackMethod, DeauthorizeCallbackUrl = deauthorizeCallbackUrl, Description = description, FriendlyName = friendlyName, HomepageUrl = homepageUrl, Permissions = permissions};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadConnectAppOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/ConnectApps.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of connect-apps belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read ConnectApp parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectApp </returns>
-        public static ResourceSet<ConnectAppResource> Read(ReadConnectAppOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ConnectAppResource>.FromJson("connect_apps", response.Content);
-            return new ResourceSet<ConnectAppResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of connect-apps belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read ConnectApp parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectApp </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ConnectAppResource>> ReadAsync(ReadConnectAppOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ConnectAppResource>.FromJson("connect_apps", response.Content);
-            return new ResourceSet<ConnectAppResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of connect-apps belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectApp </returns>
-        public static ResourceSet<ConnectAppResource> Read(string pathAccountSid = null,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadConnectAppOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of connect-apps belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectApp </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ConnectAppResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadConnectAppOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ConnectAppResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ConnectAppResource>.FromJson("connect_apps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ConnectAppResource> NextPage(Page<ConnectAppResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<ConnectAppResource>.FromJson("connect_apps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ConnectAppResource> PreviousPage(Page<ConnectAppResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<ConnectAppResource>.FromJson("connect_apps", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteConnectAppOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/ConnectApps/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete an instance of a connect-app
-        /// </summary>
-        /// <param name="options"> Delete ConnectApp parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectApp </returns>
-        public static bool Delete(DeleteConnectAppOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an instance of a connect-app
-        /// </summary>
-        /// <param name="options"> Delete ConnectApp parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectApp </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteConnectAppOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete an instance of a connect-app
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectApp </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteConnectAppOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an instance of a connect-app
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectApp </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteConnectAppOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ConnectAppResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ConnectAppResource object represented by the provided JSON </returns>
-        public static ConnectAppResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ConnectAppResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The URL to redirect the user to after authorization
-        /// </summary>
-        [JsonProperty("authorize_redirect_url")]
-        public Uri AuthorizeRedirectUrl { get; private set; }
-        /// <summary>
-        /// The company name set for the Connect App
-        /// </summary>
-        [JsonProperty("company_name")]
-        public string CompanyName { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call deauthorize_callback_url
-        /// </summary>
-        [JsonProperty("deauthorize_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod DeauthorizeCallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL we call to de-authorize the Connect App
-        /// </summary>
-        [JsonProperty("deauthorize_callback_url")]
-        public Uri DeauthorizeCallbackUrl { get; private set; }
-        /// <summary>
-        /// The description of the Connect App
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The URL users can obtain more information
-        /// </summary>
-        [JsonProperty("homepage_url")]
-        public Uri HomepageUrl { get; private set; }
-        /// <summary>
-        /// The set of permissions that your ConnectApp requests
-        /// </summary>
-        [JsonProperty("permissions")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public List<ConnectAppResource.PermissionEnum> Permissions { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private ConnectAppResource()
-        {
-
-        }
-    }
+{
+
+  public class ConnectAppResource : Resource
+  {
+    public sealed class PermissionEnum : StringEnum
+    {
+      private PermissionEnum(string value) : base(value) { }
+      public PermissionEnum() { }
+      public static implicit operator PermissionEnum(string value)
+      {
+        return new PermissionEnum(value);
+      }
+
+      public static readonly PermissionEnum GetAll = new PermissionEnum("get-all");
+      public static readonly PermissionEnum PostAll = new PermissionEnum("post-all");
+    }
+
+    private static Request BuildFetchRequest(FetchConnectAppOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/ConnectApps/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of a connect-app
+    /// </summary>
+    /// <param name="options"> Fetch ConnectApp parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectApp </returns>
+    public static ConnectAppResource Fetch(FetchConnectAppOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a connect-app
+    /// </summary>
+    /// <param name="options"> Fetch ConnectApp parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectApp </returns>
+    public static async System.Threading.Tasks.Task<ConnectAppResource> FetchAsync(FetchConnectAppOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of a connect-app
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectApp </returns>
+    public static ConnectAppResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchConnectAppOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a connect-app
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectApp </returns>
+    public static async System.Threading.Tasks.Task<ConnectAppResource> FetchAsync(string pathSid,
+                                                                                   string pathAccountSid = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchConnectAppOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateConnectAppOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/ConnectApps/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a connect-app with the specified parameters
+    /// </summary>
+    /// <param name="options"> Update ConnectApp parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectApp </returns>
+    public static ConnectAppResource Update(UpdateConnectAppOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a connect-app with the specified parameters
+    /// </summary>
+    /// <param name="options"> Update ConnectApp parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectApp </returns>
+    public static async System.Threading.Tasks.Task<ConnectAppResource> UpdateAsync(UpdateConnectAppOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a connect-app with the specified parameters
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
+    /// <param name="authorizeRedirectUrl"> The URL to redirect the user to after authorization </param>
+    /// <param name="companyName"> The company name to set for the Connect App </param>
+    /// <param name="deauthorizeCallbackMethod"> The HTTP method to use when calling deauthorize_callback_url </param>
+    /// <param name="deauthorizeCallbackUrl"> The URL to call to de-authorize the Connect App </param>
+    /// <param name="description"> A description of the Connect App </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="homepageUrl"> A public URL where users can obtain more information </param>
+    /// <param name="permissions"> The set of permissions that your ConnectApp will request </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectApp </returns>
+    public static ConnectAppResource Update(string pathSid,
+                                            string pathAccountSid = null,
+                                            Uri authorizeRedirectUrl = null,
+                                            string companyName = null,
+                                            Twilio.Http.HttpMethod deauthorizeCallbackMethod = null,
+                                            Uri deauthorizeCallbackUrl = null,
+                                            string description = null,
+                                            string friendlyName = null,
+                                            Uri homepageUrl = null,
+                                            List<ConnectAppResource.PermissionEnum> permissions = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateConnectAppOptions(pathSid) { PathAccountSid = pathAccountSid, AuthorizeRedirectUrl = authorizeRedirectUrl, CompanyName = companyName, DeauthorizeCallbackMethod = deauthorizeCallbackMethod, DeauthorizeCallbackUrl = deauthorizeCallbackUrl, Description = description, FriendlyName = friendlyName, HomepageUrl = homepageUrl, Permissions = permissions };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a connect-app with the specified parameters
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
+    /// <param name="authorizeRedirectUrl"> The URL to redirect the user to after authorization </param>
+    /// <param name="companyName"> The company name to set for the Connect App </param>
+    /// <param name="deauthorizeCallbackMethod"> The HTTP method to use when calling deauthorize_callback_url </param>
+    /// <param name="deauthorizeCallbackUrl"> The URL to call to de-authorize the Connect App </param>
+    /// <param name="description"> A description of the Connect App </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="homepageUrl"> A public URL where users can obtain more information </param>
+    /// <param name="permissions"> The set of permissions that your ConnectApp will request </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectApp </returns>
+    public static async System.Threading.Tasks.Task<ConnectAppResource> UpdateAsync(string pathSid,
+                                                                                    string pathAccountSid = null,
+                                                                                    Uri authorizeRedirectUrl = null,
+                                                                                    string companyName = null,
+                                                                                    Twilio.Http.HttpMethod deauthorizeCallbackMethod = null,
+                                                                                    Uri deauthorizeCallbackUrl = null,
+                                                                                    string description = null,
+                                                                                    string friendlyName = null,
+                                                                                    Uri homepageUrl = null,
+                                                                                    List<ConnectAppResource.PermissionEnum> permissions = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateConnectAppOptions(pathSid) { PathAccountSid = pathAccountSid, AuthorizeRedirectUrl = authorizeRedirectUrl, CompanyName = companyName, DeauthorizeCallbackMethod = deauthorizeCallbackMethod, DeauthorizeCallbackUrl = deauthorizeCallbackUrl, Description = description, FriendlyName = friendlyName, HomepageUrl = homepageUrl, Permissions = permissions };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadConnectAppOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/ConnectApps.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of connect-apps belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read ConnectApp parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectApp </returns>
+    public static ResourceSet<ConnectAppResource> Read(ReadConnectAppOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ConnectAppResource>.FromJson("connect_apps", response.Content);
+      return new ResourceSet<ConnectAppResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of connect-apps belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read ConnectApp parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectApp </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ConnectAppResource>> ReadAsync(ReadConnectAppOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ConnectAppResource>.FromJson("connect_apps", response.Content);
+      return new ResourceSet<ConnectAppResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of connect-apps belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectApp </returns>
+    public static ResourceSet<ConnectAppResource> Read(string pathAccountSid = null,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadConnectAppOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of connect-apps belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectApp </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ConnectAppResource>> ReadAsync(string pathAccountSid = null,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadConnectAppOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ConnectAppResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ConnectAppResource>.FromJson("connect_apps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ConnectAppResource> NextPage(Page<ConnectAppResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<ConnectAppResource>.FromJson("connect_apps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ConnectAppResource> PreviousPage(Page<ConnectAppResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<ConnectAppResource>.FromJson("connect_apps", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteConnectAppOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/ConnectApps/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete an instance of a connect-app
+    /// </summary>
+    /// <param name="options"> Delete ConnectApp parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectApp </returns>
+    public static bool Delete(DeleteConnectAppOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an instance of a connect-app
+    /// </summary>
+    /// <param name="options"> Delete ConnectApp parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectApp </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteConnectAppOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete an instance of a connect-app
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectApp </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteConnectAppOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an instance of a connect-app
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectApp </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteConnectAppOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ConnectAppResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ConnectAppResource object represented by the provided JSON </returns>
+    public static ConnectAppResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ConnectAppResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The URL to redirect the user to after authorization
+    /// </summary>
+    [JsonProperty("authorize_redirect_url")]
+    public Uri AuthorizeRedirectUrl { get; private set; }
+    /// <summary>
+    /// The company name set for the Connect App
+    /// </summary>
+    [JsonProperty("company_name")]
+    public string CompanyName { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call deauthorize_callback_url
+    /// </summary>
+    [JsonProperty("deauthorize_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod DeauthorizeCallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL we call to de-authorize the Connect App
+    /// </summary>
+    [JsonProperty("deauthorize_callback_url")]
+    public Uri DeauthorizeCallbackUrl { get; private set; }
+    /// <summary>
+    /// The description of the Connect App
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The URL users can obtain more information
+    /// </summary>
+    [JsonProperty("homepage_url")]
+    public Uri HomepageUrl { get; private set; }
+    /// <summary>
+    /// The set of permissions that your ConnectApp requests
+    /// </summary>
+    [JsonProperty("permissions")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public List<ConnectAppResource.PermissionEnum> Permissions { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private ConnectAppResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOn/AssignedAddOnExtensionOptions.cs b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOn/AssignedAddOnExtensionOptions.cs
index 7a36b10f4..7560114db 100644
--- a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOn/AssignedAddOnExtensionOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOn/AssignedAddOnExtensionOptions.cs
@@ -9,99 +9,99 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.IncomingPhoneNumber.AssignedAddOn
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch an instance of an Extension for the Assigned Add-on.
+  /// </summary>
+  public class FetchAssignedAddOnExtensionOptions : IOptions<AssignedAddOnExtensionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch an instance of an Extension for the Assigned Add-on.
+    /// The SID of the Account that created the resource to fetch
     /// </summary>
-    public class FetchAssignedAddOnExtensionOptions : IOptions<AssignedAddOnExtensionResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Phone Number to which the Add-on is assigned
-        /// </summary>
-        public string PathResourceSid { get; }
-        /// <summary>
-        /// The SID that uniquely identifies the assigned Add-on installation
-        /// </summary>
-        public string PathAssignedAddOnSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAssignedAddOnExtensionOptions
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number to which the Add-on is assigned </param>
-        /// <param name="pathAssignedAddOnSid"> The SID that uniquely identifies the assigned Add-on installation </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchAssignedAddOnExtensionOptions(string pathResourceSid, string pathAssignedAddOnSid, string pathSid)
-        {
-            PathResourceSid = pathResourceSid;
-            PathAssignedAddOnSid = pathAssignedAddOnSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of Extensions for the Assigned Add-on.
+    /// The SID of the Phone Number to which the Add-on is assigned
     /// </summary>
-    public class ReadAssignedAddOnExtensionOptions : ReadOptions<AssignedAddOnExtensionResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Phone Number to which the Add-on is assigned
-        /// </summary>
-        public string PathResourceSid { get; }
-        /// <summary>
-        /// The SID that uniquely identifies the assigned Add-on installation
-        /// </summary>
-        public string PathAssignedAddOnSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadAssignedAddOnExtensionOptions
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number to which the Add-on is assigned </param>
-        /// <param name="pathAssignedAddOnSid"> The SID that uniquely identifies the assigned Add-on installation </param>
-        public ReadAssignedAddOnExtensionOptions(string pathResourceSid, string pathAssignedAddOnSid)
-        {
-            PathResourceSid = pathResourceSid;
-            PathAssignedAddOnSid = pathAssignedAddOnSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathResourceSid { get; }
+    /// <summary>
+    /// The SID that uniquely identifies the assigned Add-on installation
+    /// </summary>
+    public string PathAssignedAddOnSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchAssignedAddOnExtensionOptions
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number to which the Add-on is assigned </param>
+    /// <param name="pathAssignedAddOnSid"> The SID that uniquely identifies the assigned Add-on installation </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchAssignedAddOnExtensionOptions(string pathResourceSid, string pathAssignedAddOnSid, string pathSid)
+    {
+      PathResourceSid = pathResourceSid;
+      PathAssignedAddOnSid = pathAssignedAddOnSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of Extensions for the Assigned Add-on.
+  /// </summary>
+  public class ReadAssignedAddOnExtensionOptions : ReadOptions<AssignedAddOnExtensionResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the Phone Number to which the Add-on is assigned
+    /// </summary>
+    public string PathResourceSid { get; }
+    /// <summary>
+    /// The SID that uniquely identifies the assigned Add-on installation
+    /// </summary>
+    public string PathAssignedAddOnSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadAssignedAddOnExtensionOptions
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number to which the Add-on is assigned </param>
+    /// <param name="pathAssignedAddOnSid"> The SID that uniquely identifies the assigned Add-on installation </param>
+    public ReadAssignedAddOnExtensionOptions(string pathResourceSid, string pathAssignedAddOnSid)
+    {
+      PathResourceSid = pathResourceSid;
+      PathAssignedAddOnSid = pathAssignedAddOnSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOn/AssignedAddOnExtensionResource.cs b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOn/AssignedAddOnExtensionResource.cs
index bfe3119f1..46f28b3d6 100644
--- a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOn/AssignedAddOnExtensionResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOn/AssignedAddOnExtensionResource.cs
@@ -18,303 +18,303 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.IncomingPhoneNumber.AssignedAddOn
-{
-
-    public class AssignedAddOnExtensionResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchAssignedAddOnExtensionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathResourceSid + "/AssignedAddOns/" + options.PathAssignedAddOnSid + "/Extensions/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of an Extension for the Assigned Add-on.
-        /// </summary>
-        /// <param name="options"> Fetch AssignedAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssignedAddOnExtension </returns>
-        public static AssignedAddOnExtensionResource Fetch(FetchAssignedAddOnExtensionOptions options,
-                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an Extension for the Assigned Add-on.
-        /// </summary>
-        /// <param name="options"> Fetch AssignedAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssignedAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<AssignedAddOnExtensionResource> FetchAsync(FetchAssignedAddOnExtensionOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of an Extension for the Assigned Add-on.
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number to which the Add-on is assigned </param>
-        /// <param name="pathAssignedAddOnSid"> The SID that uniquely identifies the assigned Add-on installation </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssignedAddOnExtension </returns>
-        public static AssignedAddOnExtensionResource Fetch(string pathResourceSid,
-                                                           string pathAssignedAddOnSid,
-                                                           string pathSid,
-                                                           string pathAccountSid = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchAssignedAddOnExtensionOptions(pathResourceSid, pathAssignedAddOnSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an Extension for the Assigned Add-on.
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number to which the Add-on is assigned </param>
-        /// <param name="pathAssignedAddOnSid"> The SID that uniquely identifies the assigned Add-on installation </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssignedAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<AssignedAddOnExtensionResource> FetchAsync(string pathResourceSid,
-                                                                                                   string pathAssignedAddOnSid,
-                                                                                                   string pathSid,
-                                                                                                   string pathAccountSid = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchAssignedAddOnExtensionOptions(pathResourceSid, pathAssignedAddOnSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAssignedAddOnExtensionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathResourceSid + "/AssignedAddOns/" + options.PathAssignedAddOnSid + "/Extensions.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Extensions for the Assigned Add-on.
-        /// </summary>
-        /// <param name="options"> Read AssignedAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssignedAddOnExtension </returns>
-        public static ResourceSet<AssignedAddOnExtensionResource> Read(ReadAssignedAddOnExtensionOptions options,
-                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AssignedAddOnExtensionResource>.FromJson("extensions", response.Content);
-            return new ResourceSet<AssignedAddOnExtensionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Extensions for the Assigned Add-on.
-        /// </summary>
-        /// <param name="options"> Read AssignedAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssignedAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AssignedAddOnExtensionResource>> ReadAsync(ReadAssignedAddOnExtensionOptions options,
-                                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AssignedAddOnExtensionResource>.FromJson("extensions", response.Content);
-            return new ResourceSet<AssignedAddOnExtensionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Extensions for the Assigned Add-on.
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number to which the Add-on is assigned </param>
-        /// <param name="pathAssignedAddOnSid"> The SID that uniquely identifies the assigned Add-on installation </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssignedAddOnExtension </returns>
-        public static ResourceSet<AssignedAddOnExtensionResource> Read(string pathResourceSid,
-                                                                       string pathAssignedAddOnSid,
-                                                                       string pathAccountSid = null,
-                                                                       int? pageSize = null,
-                                                                       long? limit = null,
-                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadAssignedAddOnExtensionOptions(pathResourceSid, pathAssignedAddOnSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Extensions for the Assigned Add-on.
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number to which the Add-on is assigned </param>
-        /// <param name="pathAssignedAddOnSid"> The SID that uniquely identifies the assigned Add-on installation </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssignedAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AssignedAddOnExtensionResource>> ReadAsync(string pathResourceSid,
-                                                                                                               string pathAssignedAddOnSid,
-                                                                                                               string pathAccountSid = null,
-                                                                                                               int? pageSize = null,
-                                                                                                               long? limit = null,
-                                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadAssignedAddOnExtensionOptions(pathResourceSid, pathAssignedAddOnSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AssignedAddOnExtensionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AssignedAddOnExtensionResource>.FromJson("extensions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AssignedAddOnExtensionResource> NextPage(Page<AssignedAddOnExtensionResource> page,
-                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AssignedAddOnExtensionResource>.FromJson("extensions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AssignedAddOnExtensionResource> PreviousPage(Page<AssignedAddOnExtensionResource> page,
-                                                                        ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AssignedAddOnExtensionResource>.FromJson("extensions", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a AssignedAddOnExtensionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AssignedAddOnExtensionResource object represented by the provided JSON </returns>
-        public static AssignedAddOnExtensionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AssignedAddOnExtensionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Phone Number to which the Add-on is assigned
-        /// </summary>
-        [JsonProperty("resource_sid")]
-        public string ResourceSid { get; private set; }
-        /// <summary>
-        /// The SID that uniquely identifies the assigned Add-on installation
-        /// </summary>
-        [JsonProperty("assigned_add_on_sid")]
-        public string AssignedAddOnSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A string that you assigned to describe the Product this Extension is used within
-        /// </summary>
-        [JsonProperty("product_name")]
-        public string ProductName { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// Whether the Extension will be invoked
-        /// </summary>
-        [JsonProperty("enabled")]
-        public bool? Enabled { get; private set; }
-
-        private AssignedAddOnExtensionResource()
-        {
-
-        }
-    }
+{
+
+  public class AssignedAddOnExtensionResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchAssignedAddOnExtensionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathResourceSid + "/AssignedAddOns/" + options.PathAssignedAddOnSid + "/Extensions/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of an Extension for the Assigned Add-on.
+    /// </summary>
+    /// <param name="options"> Fetch AssignedAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssignedAddOnExtension </returns>
+    public static AssignedAddOnExtensionResource Fetch(FetchAssignedAddOnExtensionOptions options,
+                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an Extension for the Assigned Add-on.
+    /// </summary>
+    /// <param name="options"> Fetch AssignedAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssignedAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<AssignedAddOnExtensionResource> FetchAsync(FetchAssignedAddOnExtensionOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of an Extension for the Assigned Add-on.
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number to which the Add-on is assigned </param>
+    /// <param name="pathAssignedAddOnSid"> The SID that uniquely identifies the assigned Add-on installation </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssignedAddOnExtension </returns>
+    public static AssignedAddOnExtensionResource Fetch(string pathResourceSid,
+                                                       string pathAssignedAddOnSid,
+                                                       string pathSid,
+                                                       string pathAccountSid = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchAssignedAddOnExtensionOptions(pathResourceSid, pathAssignedAddOnSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an Extension for the Assigned Add-on.
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number to which the Add-on is assigned </param>
+    /// <param name="pathAssignedAddOnSid"> The SID that uniquely identifies the assigned Add-on installation </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssignedAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<AssignedAddOnExtensionResource> FetchAsync(string pathResourceSid,
+                                                                                               string pathAssignedAddOnSid,
+                                                                                               string pathSid,
+                                                                                               string pathAccountSid = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchAssignedAddOnExtensionOptions(pathResourceSid, pathAssignedAddOnSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAssignedAddOnExtensionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathResourceSid + "/AssignedAddOns/" + options.PathAssignedAddOnSid + "/Extensions.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Extensions for the Assigned Add-on.
+    /// </summary>
+    /// <param name="options"> Read AssignedAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssignedAddOnExtension </returns>
+    public static ResourceSet<AssignedAddOnExtensionResource> Read(ReadAssignedAddOnExtensionOptions options,
+                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AssignedAddOnExtensionResource>.FromJson("extensions", response.Content);
+      return new ResourceSet<AssignedAddOnExtensionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Extensions for the Assigned Add-on.
+    /// </summary>
+    /// <param name="options"> Read AssignedAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssignedAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AssignedAddOnExtensionResource>> ReadAsync(ReadAssignedAddOnExtensionOptions options,
+                                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AssignedAddOnExtensionResource>.FromJson("extensions", response.Content);
+      return new ResourceSet<AssignedAddOnExtensionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Extensions for the Assigned Add-on.
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number to which the Add-on is assigned </param>
+    /// <param name="pathAssignedAddOnSid"> The SID that uniquely identifies the assigned Add-on installation </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssignedAddOnExtension </returns>
+    public static ResourceSet<AssignedAddOnExtensionResource> Read(string pathResourceSid,
+                                                                   string pathAssignedAddOnSid,
+                                                                   string pathAccountSid = null,
+                                                                   int? pageSize = null,
+                                                                   long? limit = null,
+                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadAssignedAddOnExtensionOptions(pathResourceSid, pathAssignedAddOnSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Extensions for the Assigned Add-on.
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number to which the Add-on is assigned </param>
+    /// <param name="pathAssignedAddOnSid"> The SID that uniquely identifies the assigned Add-on installation </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssignedAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AssignedAddOnExtensionResource>> ReadAsync(string pathResourceSid,
+                                                                                                           string pathAssignedAddOnSid,
+                                                                                                           string pathAccountSid = null,
+                                                                                                           int? pageSize = null,
+                                                                                                           long? limit = null,
+                                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadAssignedAddOnExtensionOptions(pathResourceSid, pathAssignedAddOnSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AssignedAddOnExtensionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AssignedAddOnExtensionResource>.FromJson("extensions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AssignedAddOnExtensionResource> NextPage(Page<AssignedAddOnExtensionResource> page,
+                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AssignedAddOnExtensionResource>.FromJson("extensions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AssignedAddOnExtensionResource> PreviousPage(Page<AssignedAddOnExtensionResource> page,
+                                                                    ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AssignedAddOnExtensionResource>.FromJson("extensions", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a AssignedAddOnExtensionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AssignedAddOnExtensionResource object represented by the provided JSON </returns>
+    public static AssignedAddOnExtensionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AssignedAddOnExtensionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Phone Number to which the Add-on is assigned
+    /// </summary>
+    [JsonProperty("resource_sid")]
+    public string ResourceSid { get; private set; }
+    /// <summary>
+    /// The SID that uniquely identifies the assigned Add-on installation
+    /// </summary>
+    [JsonProperty("assigned_add_on_sid")]
+    public string AssignedAddOnSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A string that you assigned to describe the Product this Extension is used within
+    /// </summary>
+    [JsonProperty("product_name")]
+    public string ProductName { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// Whether the Extension will be invoked
+    /// </summary>
+    [JsonProperty("enabled")]
+    public bool? Enabled { get; private set; }
+
+    private AssignedAddOnExtensionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOnOptions.cs b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOnOptions.cs
index 00aff5c50..3ed08ba0a 100644
--- a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOnOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOnOptions.cs
@@ -9,174 +9,174 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.IncomingPhoneNumber
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch an instance of an Add-on installation currently assigned to this Number.
+  /// </summary>
+  public class FetchAssignedAddOnOptions : IOptions<AssignedAddOnResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch an instance of an Add-on installation currently assigned to this Number.
-    /// </summary>
-    public class FetchAssignedAddOnOptions : IOptions<AssignedAddOnResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Phone Number that installed this Add-on
-        /// </summary>
-        public string PathResourceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAssignedAddOnOptions
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchAssignedAddOnOptions(string pathResourceSid, string pathSid)
-        {
-            PathResourceSid = pathResourceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of Add-on installations currently assigned to this Number.
-    /// </summary>
-    public class ReadAssignedAddOnOptions : ReadOptions<AssignedAddOnResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Phone Number that installed this Add-on
-        /// </summary>
-        public string PathResourceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadAssignedAddOnOptions
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
-        public ReadAssignedAddOnOptions(string pathResourceSid)
-        {
-            PathResourceSid = pathResourceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Phone Number that installed this Add-on
+    /// </summary>
+    public string PathResourceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Assign an Add-on installation to the Number specified.
-    /// </summary>
-    public class CreateAssignedAddOnOptions : IOptions<AssignedAddOnResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Phone Number to assign the Add-on
-        /// </summary>
-        public string PathResourceSid { get; }
-        /// <summary>
-        /// The SID that identifies the Add-on installation
-        /// </summary>
-        public string InstalledAddOnSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateAssignedAddOnOptions
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number to assign the Add-on </param>
-        /// <param name="installedAddOnSid"> The SID that identifies the Add-on installation </param>
-        public CreateAssignedAddOnOptions(string pathResourceSid, string installedAddOnSid)
-        {
-            PathResourceSid = pathResourceSid;
-            InstalledAddOnSid = installedAddOnSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (InstalledAddOnSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InstalledAddOnSid", InstalledAddOnSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Remove the assignment of an Add-on installation from the Number specified.
-    /// </summary>
-    public class DeleteAssignedAddOnOptions : IOptions<AssignedAddOnResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Phone Number that installed this Add-on
-        /// </summary>
-        public string PathResourceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteAssignedAddOnOptions
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteAssignedAddOnOptions(string pathResourceSid, string pathSid)
-        {
-            PathResourceSid = pathResourceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new FetchAssignedAddOnOptions
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchAssignedAddOnOptions(string pathResourceSid, string pathSid)
+    {
+      PathResourceSid = pathResourceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of Add-on installations currently assigned to this Number.
+  /// </summary>
+  public class ReadAssignedAddOnOptions : ReadOptions<AssignedAddOnResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the Phone Number that installed this Add-on
+    /// </summary>
+    public string PathResourceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadAssignedAddOnOptions
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
+    public ReadAssignedAddOnOptions(string pathResourceSid)
+    {
+      PathResourceSid = pathResourceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Assign an Add-on installation to the Number specified.
+  /// </summary>
+  public class CreateAssignedAddOnOptions : IOptions<AssignedAddOnResource>
+  {
+    /// <summary>
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the Phone Number to assign the Add-on
+    /// </summary>
+    public string PathResourceSid { get; }
+    /// <summary>
+    /// The SID that identifies the Add-on installation
+    /// </summary>
+    public string InstalledAddOnSid { get; }
+
+    /// <summary>
+    /// Construct a new CreateAssignedAddOnOptions
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number to assign the Add-on </param>
+    /// <param name="installedAddOnSid"> The SID that identifies the Add-on installation </param>
+    public CreateAssignedAddOnOptions(string pathResourceSid, string installedAddOnSid)
+    {
+      PathResourceSid = pathResourceSid;
+      InstalledAddOnSid = installedAddOnSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (InstalledAddOnSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InstalledAddOnSid", InstalledAddOnSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Remove the assignment of an Add-on installation from the Number specified.
+  /// </summary>
+  public class DeleteAssignedAddOnOptions : IOptions<AssignedAddOnResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the Phone Number that installed this Add-on
+    /// </summary>
+    public string PathResourceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteAssignedAddOnOptions
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteAssignedAddOnOptions(string pathResourceSid, string pathSid)
+    {
+      PathResourceSid = pathResourceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOnResource.cs b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOnResource.cs
index c21cca29f..e6dbb7fad 100644
--- a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOnResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/AssignedAddOnResource.cs
@@ -18,454 +18,454 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.IncomingPhoneNumber
-{
-
-    public class AssignedAddOnResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchAssignedAddOnOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathResourceSid + "/AssignedAddOns/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of an Add-on installation currently assigned to this Number.
-        /// </summary>
-        /// <param name="options"> Fetch AssignedAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssignedAddOn </returns>
-        public static AssignedAddOnResource Fetch(FetchAssignedAddOnOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an Add-on installation currently assigned to this Number.
-        /// </summary>
-        /// <param name="options"> Fetch AssignedAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
-        public static async System.Threading.Tasks.Task<AssignedAddOnResource> FetchAsync(FetchAssignedAddOnOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of an Add-on installation currently assigned to this Number.
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssignedAddOn </returns>
-        public static AssignedAddOnResource Fetch(string pathResourceSid,
-                                                  string pathSid,
-                                                  string pathAccountSid = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchAssignedAddOnOptions(pathResourceSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an Add-on installation currently assigned to this Number.
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
-        public static async System.Threading.Tasks.Task<AssignedAddOnResource> FetchAsync(string pathResourceSid,
-                                                                                          string pathSid,
-                                                                                          string pathAccountSid = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchAssignedAddOnOptions(pathResourceSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAssignedAddOnOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathResourceSid + "/AssignedAddOns.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Add-on installations currently assigned to this Number.
-        /// </summary>
-        /// <param name="options"> Read AssignedAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssignedAddOn </returns>
-        public static ResourceSet<AssignedAddOnResource> Read(ReadAssignedAddOnOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AssignedAddOnResource>.FromJson("assigned_add_ons", response.Content);
-            return new ResourceSet<AssignedAddOnResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Add-on installations currently assigned to this Number.
-        /// </summary>
-        /// <param name="options"> Read AssignedAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AssignedAddOnResource>> ReadAsync(ReadAssignedAddOnOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AssignedAddOnResource>.FromJson("assigned_add_ons", response.Content);
-            return new ResourceSet<AssignedAddOnResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Add-on installations currently assigned to this Number.
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssignedAddOn </returns>
-        public static ResourceSet<AssignedAddOnResource> Read(string pathResourceSid,
-                                                              string pathAccountSid = null,
-                                                              int? pageSize = null,
-                                                              long? limit = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadAssignedAddOnOptions(pathResourceSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Add-on installations currently assigned to this Number.
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AssignedAddOnResource>> ReadAsync(string pathResourceSid,
-                                                                                                      string pathAccountSid = null,
-                                                                                                      int? pageSize = null,
-                                                                                                      long? limit = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadAssignedAddOnOptions(pathResourceSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AssignedAddOnResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AssignedAddOnResource>.FromJson("assigned_add_ons", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AssignedAddOnResource> NextPage(Page<AssignedAddOnResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AssignedAddOnResource>.FromJson("assigned_add_ons", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AssignedAddOnResource> PreviousPage(Page<AssignedAddOnResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AssignedAddOnResource>.FromJson("assigned_add_ons", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateAssignedAddOnOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathResourceSid + "/AssignedAddOns.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Assign an Add-on installation to the Number specified.
-        /// </summary>
-        /// <param name="options"> Create AssignedAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssignedAddOn </returns>
-        public static AssignedAddOnResource Create(CreateAssignedAddOnOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Assign an Add-on installation to the Number specified.
-        /// </summary>
-        /// <param name="options"> Create AssignedAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
-        public static async System.Threading.Tasks.Task<AssignedAddOnResource> CreateAsync(CreateAssignedAddOnOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Assign an Add-on installation to the Number specified.
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number to assign the Add-on </param>
-        /// <param name="installedAddOnSid"> The SID that identifies the Add-on installation </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssignedAddOn </returns>
-        public static AssignedAddOnResource Create(string pathResourceSid,
-                                                   string installedAddOnSid,
-                                                   string pathAccountSid = null,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateAssignedAddOnOptions(pathResourceSid, installedAddOnSid){PathAccountSid = pathAccountSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Assign an Add-on installation to the Number specified.
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number to assign the Add-on </param>
-        /// <param name="installedAddOnSid"> The SID that identifies the Add-on installation </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
-        public static async System.Threading.Tasks.Task<AssignedAddOnResource> CreateAsync(string pathResourceSid,
-                                                                                           string installedAddOnSid,
-                                                                                           string pathAccountSid = null,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateAssignedAddOnOptions(pathResourceSid, installedAddOnSid){PathAccountSid = pathAccountSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteAssignedAddOnOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathResourceSid + "/AssignedAddOns/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove the assignment of an Add-on installation from the Number specified.
-        /// </summary>
-        /// <param name="options"> Delete AssignedAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssignedAddOn </returns>
-        public static bool Delete(DeleteAssignedAddOnOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove the assignment of an Add-on installation from the Number specified.
-        /// </summary>
-        /// <param name="options"> Delete AssignedAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAssignedAddOnOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove the assignment of an Add-on installation from the Number specified.
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssignedAddOn </returns>
-        public static bool Delete(string pathResourceSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteAssignedAddOnOptions(pathResourceSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove the assignment of an Add-on installation from the Number specified.
-        /// </summary>
-        /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathResourceSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteAssignedAddOnOptions(pathResourceSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AssignedAddOnResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AssignedAddOnResource object represented by the provided JSON </returns>
-        public static AssignedAddOnResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AssignedAddOnResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Phone Number that installed this Add-on
-        /// </summary>
-        [JsonProperty("resource_sid")]
-        public string ResourceSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A short description of the Add-on functionality
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// A JSON string that represents the current configuration
-        /// </summary>
-        [JsonProperty("configuration")]
-        public object Configuration { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-
-        private AssignedAddOnResource()
-        {
-
-        }
-    }
+{
+
+  public class AssignedAddOnResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchAssignedAddOnOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathResourceSid + "/AssignedAddOns/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of an Add-on installation currently assigned to this Number.
+    /// </summary>
+    /// <param name="options"> Fetch AssignedAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssignedAddOn </returns>
+    public static AssignedAddOnResource Fetch(FetchAssignedAddOnOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an Add-on installation currently assigned to this Number.
+    /// </summary>
+    /// <param name="options"> Fetch AssignedAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
+    public static async System.Threading.Tasks.Task<AssignedAddOnResource> FetchAsync(FetchAssignedAddOnOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of an Add-on installation currently assigned to this Number.
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssignedAddOn </returns>
+    public static AssignedAddOnResource Fetch(string pathResourceSid,
+                                              string pathSid,
+                                              string pathAccountSid = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchAssignedAddOnOptions(pathResourceSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an Add-on installation currently assigned to this Number.
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
+    public static async System.Threading.Tasks.Task<AssignedAddOnResource> FetchAsync(string pathResourceSid,
+                                                                                      string pathSid,
+                                                                                      string pathAccountSid = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchAssignedAddOnOptions(pathResourceSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAssignedAddOnOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathResourceSid + "/AssignedAddOns.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Add-on installations currently assigned to this Number.
+    /// </summary>
+    /// <param name="options"> Read AssignedAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssignedAddOn </returns>
+    public static ResourceSet<AssignedAddOnResource> Read(ReadAssignedAddOnOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AssignedAddOnResource>.FromJson("assigned_add_ons", response.Content);
+      return new ResourceSet<AssignedAddOnResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Add-on installations currently assigned to this Number.
+    /// </summary>
+    /// <param name="options"> Read AssignedAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AssignedAddOnResource>> ReadAsync(ReadAssignedAddOnOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AssignedAddOnResource>.FromJson("assigned_add_ons", response.Content);
+      return new ResourceSet<AssignedAddOnResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Add-on installations currently assigned to this Number.
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssignedAddOn </returns>
+    public static ResourceSet<AssignedAddOnResource> Read(string pathResourceSid,
+                                                          string pathAccountSid = null,
+                                                          int? pageSize = null,
+                                                          long? limit = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadAssignedAddOnOptions(pathResourceSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Add-on installations currently assigned to this Number.
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AssignedAddOnResource>> ReadAsync(string pathResourceSid,
+                                                                                                  string pathAccountSid = null,
+                                                                                                  int? pageSize = null,
+                                                                                                  long? limit = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadAssignedAddOnOptions(pathResourceSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AssignedAddOnResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AssignedAddOnResource>.FromJson("assigned_add_ons", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AssignedAddOnResource> NextPage(Page<AssignedAddOnResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AssignedAddOnResource>.FromJson("assigned_add_ons", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AssignedAddOnResource> PreviousPage(Page<AssignedAddOnResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AssignedAddOnResource>.FromJson("assigned_add_ons", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateAssignedAddOnOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathResourceSid + "/AssignedAddOns.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Assign an Add-on installation to the Number specified.
+    /// </summary>
+    /// <param name="options"> Create AssignedAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssignedAddOn </returns>
+    public static AssignedAddOnResource Create(CreateAssignedAddOnOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Assign an Add-on installation to the Number specified.
+    /// </summary>
+    /// <param name="options"> Create AssignedAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
+    public static async System.Threading.Tasks.Task<AssignedAddOnResource> CreateAsync(CreateAssignedAddOnOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Assign an Add-on installation to the Number specified.
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number to assign the Add-on </param>
+    /// <param name="installedAddOnSid"> The SID that identifies the Add-on installation </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssignedAddOn </returns>
+    public static AssignedAddOnResource Create(string pathResourceSid,
+                                               string installedAddOnSid,
+                                               string pathAccountSid = null,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateAssignedAddOnOptions(pathResourceSid, installedAddOnSid) { PathAccountSid = pathAccountSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Assign an Add-on installation to the Number specified.
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number to assign the Add-on </param>
+    /// <param name="installedAddOnSid"> The SID that identifies the Add-on installation </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
+    public static async System.Threading.Tasks.Task<AssignedAddOnResource> CreateAsync(string pathResourceSid,
+                                                                                       string installedAddOnSid,
+                                                                                       string pathAccountSid = null,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateAssignedAddOnOptions(pathResourceSid, installedAddOnSid) { PathAccountSid = pathAccountSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteAssignedAddOnOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathResourceSid + "/AssignedAddOns/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove the assignment of an Add-on installation from the Number specified.
+    /// </summary>
+    /// <param name="options"> Delete AssignedAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssignedAddOn </returns>
+    public static bool Delete(DeleteAssignedAddOnOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove the assignment of an Add-on installation from the Number specified.
+    /// </summary>
+    /// <param name="options"> Delete AssignedAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAssignedAddOnOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove the assignment of an Add-on installation from the Number specified.
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssignedAddOn </returns>
+    public static bool Delete(string pathResourceSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteAssignedAddOnOptions(pathResourceSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove the assignment of an Add-on installation from the Number specified.
+    /// </summary>
+    /// <param name="pathResourceSid"> The SID of the Phone Number that installed this Add-on </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssignedAddOn </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathResourceSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteAssignedAddOnOptions(pathResourceSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AssignedAddOnResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AssignedAddOnResource object represented by the provided JSON </returns>
+    public static AssignedAddOnResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AssignedAddOnResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Phone Number that installed this Add-on
+    /// </summary>
+    [JsonProperty("resource_sid")]
+    public string ResourceSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A short description of the Add-on functionality
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// A JSON string that represents the current configuration
+    /// </summary>
+    [JsonProperty("configuration")]
+    public object Configuration { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+
+    private AssignedAddOnResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/LocalOptions.cs b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/LocalOptions.cs
index a6bab6200..9d81c99ce 100644
--- a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/LocalOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/LocalOptions.cs
@@ -9,303 +9,303 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.IncomingPhoneNumber
-{
-
+{
+
+  /// <summary>
+  /// ReadLocalOptions
+  /// </summary>
+  public class ReadLocalOptions : ReadOptions<LocalResource>
+  {
     /// <summary>
-    /// ReadLocalOptions
-    /// </summary>
-    public class ReadLocalOptions : ReadOptions<LocalResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Whether to include new phone numbers
-        /// </summary>
-        public bool? Beta { get; set; }
-        /// <summary>
-        /// A string that identifies the resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The phone numbers of the resources to read
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; set; }
-        /// <summary>
-        /// Include phone numbers based on their origin. By default, phone numbers of all origin are included.
-        /// </summary>
-        public string Origin { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Beta != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (Origin != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Origin", Origin));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// CreateLocalOptions
-    /// </summary>
-    public class CreateLocalOptions : IOptions<LocalResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The phone number to purchase in E.164 format
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; }
-        /// <summary>
-        /// The API version to use for incoming calls made to the new phone number
-        /// </summary>
-        public string ApiVersion { get; set; }
-        /// <summary>
-        /// A string to describe the new phone number
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The SID of the application to handle SMS messages
-        /// </summary>
-        public string SmsApplicationSid { get; set; }
-        /// <summary>
-        /// The HTTP method we use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we call when an error occurs while executing TwiML
-        /// </summary>
-        public Uri SmsFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with sms url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when the new phone number receives an incoming SMS message
-        /// </summary>
-        public Uri SmsUrl { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// HTTP method we should use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The SID of the application to handle the new phone number
-        /// </summary>
-        public string VoiceApplicationSid { get; set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        public bool? VoiceCallerIdLookup { get; set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we will call when an error occurs in TwiML
-        /// </summary>
-        public Uri VoiceFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method used with the voice_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when the phone number receives a call
-        /// </summary>
-        public Uri VoiceUrl { get; set; }
-        /// <summary>
-        /// The SID of the Identity resource to associate with the new phone number
-        /// </summary>
-        public string IdentitySid { get; set; }
-        /// <summary>
-        /// The SID of the Address resource associated with the phone number
-        /// </summary>
-        public string AddressSid { get; set; }
-        /// <summary>
-        /// Displays if emergency calling is enabled for this number.
-        /// </summary>
-        public LocalResource.EmergencyStatusEnum EmergencyStatus { get; set; }
-        /// <summary>
-        /// The emergency address configuration to use for emergency calling
-        /// </summary>
-        public string EmergencyAddressSid { get; set; }
-        /// <summary>
-        /// SID of the trunk to handle calls to the new phone number
-        /// </summary>
-        public string TrunkSid { get; set; }
-        /// <summary>
-        /// Incoming call type: fax or voice
-        /// </summary>
-        public LocalResource.VoiceReceiveModeEnum VoiceReceiveMode { get; set; }
-        /// <summary>
-        /// The SID of the Bundle resource associated with number
-        /// </summary>
-        public string BundleSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateLocalOptions
-        /// </summary>
-        /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
-        public CreateLocalOptions(Types.PhoneNumber phoneNumber)
-        {
-            PhoneNumber = phoneNumber;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (ApiVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (SmsApplicationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsApplicationSid", SmsApplicationSid.ToString()));
-            }
-
-            if (SmsFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
-            }
-
-            if (SmsFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
-            }
-
-            if (SmsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
-            }
-
-            if (SmsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (VoiceApplicationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceApplicationSid", VoiceApplicationSid.ToString()));
-            }
-
-            if (VoiceCallerIdLookup != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
-            }
-
-            if (VoiceFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
-            }
-
-            if (VoiceFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
-            }
-
-            if (VoiceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
-            }
-
-            if (VoiceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
-            }
-
-            if (IdentitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IdentitySid", IdentitySid.ToString()));
-            }
-
-            if (AddressSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
-            }
-
-            if (EmergencyStatus != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyStatus", EmergencyStatus.ToString()));
-            }
-
-            if (EmergencyAddressSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyAddressSid", EmergencyAddressSid.ToString()));
-            }
-
-            if (TrunkSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TrunkSid", TrunkSid.ToString()));
-            }
-
-            if (VoiceReceiveMode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceReceiveMode", VoiceReceiveMode.ToString()));
-            }
-
-            if (BundleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BundleSid", BundleSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Whether to include new phone numbers
+    /// </summary>
+    public bool? Beta { get; set; }
+    /// <summary>
+    /// A string that identifies the resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The phone numbers of the resources to read
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; set; }
+    /// <summary>
+    /// Include phone numbers based on their origin. By default, phone numbers of all origin are included.
+    /// </summary>
+    public string Origin { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Beta != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (Origin != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Origin", Origin));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateLocalOptions
+  /// </summary>
+  public class CreateLocalOptions : IOptions<LocalResource>
+  {
+    /// <summary>
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The phone number to purchase in E.164 format
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; }
+    /// <summary>
+    /// The API version to use for incoming calls made to the new phone number
+    /// </summary>
+    public string ApiVersion { get; set; }
+    /// <summary>
+    /// A string to describe the new phone number
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The SID of the application to handle SMS messages
+    /// </summary>
+    public string SmsApplicationSid { get; set; }
+    /// <summary>
+    /// The HTTP method we use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we call when an error occurs while executing TwiML
+    /// </summary>
+    public Uri SmsFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with sms url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when the new phone number receives an incoming SMS message
+    /// </summary>
+    public Uri SmsUrl { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// HTTP method we should use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The SID of the application to handle the new phone number
+    /// </summary>
+    public string VoiceApplicationSid { get; set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    public bool? VoiceCallerIdLookup { get; set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we will call when an error occurs in TwiML
+    /// </summary>
+    public Uri VoiceFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method used with the voice_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when the phone number receives a call
+    /// </summary>
+    public Uri VoiceUrl { get; set; }
+    /// <summary>
+    /// The SID of the Identity resource to associate with the new phone number
+    /// </summary>
+    public string IdentitySid { get; set; }
+    /// <summary>
+    /// The SID of the Address resource associated with the phone number
+    /// </summary>
+    public string AddressSid { get; set; }
+    /// <summary>
+    /// Displays if emergency calling is enabled for this number.
+    /// </summary>
+    public LocalResource.EmergencyStatusEnum EmergencyStatus { get; set; }
+    /// <summary>
+    /// The emergency address configuration to use for emergency calling
+    /// </summary>
+    public string EmergencyAddressSid { get; set; }
+    /// <summary>
+    /// SID of the trunk to handle calls to the new phone number
+    /// </summary>
+    public string TrunkSid { get; set; }
+    /// <summary>
+    /// Incoming call type: fax or voice
+    /// </summary>
+    public LocalResource.VoiceReceiveModeEnum VoiceReceiveMode { get; set; }
+    /// <summary>
+    /// The SID of the Bundle resource associated with number
+    /// </summary>
+    public string BundleSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateLocalOptions
+    /// </summary>
+    /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
+    public CreateLocalOptions(Types.PhoneNumber phoneNumber)
+    {
+      PhoneNumber = phoneNumber;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (ApiVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (SmsApplicationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsApplicationSid", SmsApplicationSid.ToString()));
+      }
+
+      if (SmsFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
+      }
+
+      if (SmsFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
+      }
+
+      if (SmsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
+      }
+
+      if (SmsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (VoiceApplicationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceApplicationSid", VoiceApplicationSid.ToString()));
+      }
+
+      if (VoiceCallerIdLookup != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
+      }
+
+      if (VoiceFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
+      }
+
+      if (VoiceFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
+      }
+
+      if (VoiceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
+      }
+
+      if (VoiceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
+      }
+
+      if (IdentitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IdentitySid", IdentitySid.ToString()));
+      }
+
+      if (AddressSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
+      }
+
+      if (EmergencyStatus != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyStatus", EmergencyStatus.ToString()));
+      }
+
+      if (EmergencyAddressSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyAddressSid", EmergencyAddressSid.ToString()));
+      }
+
+      if (TrunkSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TrunkSid", TrunkSid.ToString()));
+      }
+
+      if (VoiceReceiveMode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceReceiveMode", VoiceReceiveMode.ToString()));
+      }
+
+      if (BundleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BundleSid", BundleSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/LocalResource.cs b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/LocalResource.cs
index c26a801f6..33e1069d0 100644
--- a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/LocalResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/LocalResource.cs
@@ -17,582 +17,582 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.IncomingPhoneNumber
-{
-
-    public class LocalResource : Resource
-    {
-        public sealed class AddressRequirementEnum : StringEnum
-        {
-            private AddressRequirementEnum(string value) : base(value) {}
-            public AddressRequirementEnum() {}
-            public static implicit operator AddressRequirementEnum(string value)
-            {
-                return new AddressRequirementEnum(value);
-            }
-
-            public static readonly AddressRequirementEnum None = new AddressRequirementEnum("none");
-            public static readonly AddressRequirementEnum Any = new AddressRequirementEnum("any");
-            public static readonly AddressRequirementEnum Local = new AddressRequirementEnum("local");
-            public static readonly AddressRequirementEnum Foreign = new AddressRequirementEnum("foreign");
-        }
-
-        public sealed class EmergencyStatusEnum : StringEnum
-        {
-            private EmergencyStatusEnum(string value) : base(value) {}
-            public EmergencyStatusEnum() {}
-            public static implicit operator EmergencyStatusEnum(string value)
-            {
-                return new EmergencyStatusEnum(value);
-            }
-
-            public static readonly EmergencyStatusEnum Active = new EmergencyStatusEnum("Active");
-            public static readonly EmergencyStatusEnum Inactive = new EmergencyStatusEnum("Inactive");
-        }
-
-        public sealed class EmergencyAddressStatusEnum : StringEnum
-        {
-            private EmergencyAddressStatusEnum(string value) : base(value) {}
-            public EmergencyAddressStatusEnum() {}
-            public static implicit operator EmergencyAddressStatusEnum(string value)
-            {
-                return new EmergencyAddressStatusEnum(value);
-            }
-
-            public static readonly EmergencyAddressStatusEnum Registered = new EmergencyAddressStatusEnum("registered");
-            public static readonly EmergencyAddressStatusEnum Unregistered = new EmergencyAddressStatusEnum("unregistered");
-            public static readonly EmergencyAddressStatusEnum PendingRegistration = new EmergencyAddressStatusEnum("pending-registration");
-            public static readonly EmergencyAddressStatusEnum RegistrationFailure = new EmergencyAddressStatusEnum("registration-failure");
-            public static readonly EmergencyAddressStatusEnum PendingUnregistration = new EmergencyAddressStatusEnum("pending-unregistration");
-            public static readonly EmergencyAddressStatusEnum UnregistrationFailure = new EmergencyAddressStatusEnum("unregistration-failure");
-        }
-
-        public sealed class VoiceReceiveModeEnum : StringEnum
-        {
-            private VoiceReceiveModeEnum(string value) : base(value) {}
-            public VoiceReceiveModeEnum() {}
-            public static implicit operator VoiceReceiveModeEnum(string value)
-            {
-                return new VoiceReceiveModeEnum(value);
-            }
-
-            public static readonly VoiceReceiveModeEnum Voice = new VoiceReceiveModeEnum("voice");
-            public static readonly VoiceReceiveModeEnum Fax = new VoiceReceiveModeEnum("fax");
-        }
-
-        private static Request BuildReadRequest(ReadLocalOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/Local.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Local parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Local </returns>
-        public static ResourceSet<LocalResource> Read(ReadLocalOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<LocalResource>.FromJson("incoming_phone_numbers", response.Content);
-            return new ResourceSet<LocalResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Local parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Local </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<LocalResource>> ReadAsync(ReadLocalOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<LocalResource>.FromJson("incoming_phone_numbers", response.Content);
-            return new ResourceSet<LocalResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="beta"> Whether to include new phone numbers </param>
-        /// <param name="friendlyName"> A string that identifies the resources to read </param>
-        /// <param name="phoneNumber"> The phone numbers of the resources to read </param>
-        /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
-        ///              included. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Local </returns>
-        public static ResourceSet<LocalResource> Read(string pathAccountSid = null,
-                                                      bool? beta = null,
-                                                      string friendlyName = null,
-                                                      Types.PhoneNumber phoneNumber = null,
-                                                      string origin = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadLocalOptions(){PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="beta"> Whether to include new phone numbers </param>
-        /// <param name="friendlyName"> A string that identifies the resources to read </param>
-        /// <param name="phoneNumber"> The phone numbers of the resources to read </param>
-        /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
-        ///              included. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Local </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<LocalResource>> ReadAsync(string pathAccountSid = null,
-                                                                                              bool? beta = null,
-                                                                                              string friendlyName = null,
-                                                                                              Types.PhoneNumber phoneNumber = null,
-                                                                                              string origin = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadLocalOptions(){PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<LocalResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<LocalResource>.FromJson("incoming_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<LocalResource> NextPage(Page<LocalResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<LocalResource>.FromJson("incoming_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<LocalResource> PreviousPage(Page<LocalResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<LocalResource>.FromJson("incoming_phone_numbers", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateLocalOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/Local.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Local parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Local </returns>
-        public static LocalResource Create(CreateLocalOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Local parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Local </returns>
-        public static async System.Threading.Tasks.Task<LocalResource> CreateAsync(CreateLocalOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
-        /// <param name="friendlyName"> A string to describe the new phone number </param>
-        /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
-        /// <param name="smsFallbackMethod"> The HTTP method we use to call status_callback </param>
-        /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms url </param>
-        /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> HTTP method we should use to call status_callback </param>
-        /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
-        /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
-        /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
-        /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
-        /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
-        /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
-        /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
-        /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
-        /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
-        /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Local </returns>
-        public static LocalResource Create(Types.PhoneNumber phoneNumber,
-                                           string pathAccountSid = null,
-                                           string apiVersion = null,
-                                           string friendlyName = null,
-                                           string smsApplicationSid = null,
-                                           Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                           Uri smsFallbackUrl = null,
-                                           Twilio.Http.HttpMethod smsMethod = null,
-                                           Uri smsUrl = null,
-                                           Uri statusCallback = null,
-                                           Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                           string voiceApplicationSid = null,
-                                           bool? voiceCallerIdLookup = null,
-                                           Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                           Uri voiceFallbackUrl = null,
-                                           Twilio.Http.HttpMethod voiceMethod = null,
-                                           Uri voiceUrl = null,
-                                           string identitySid = null,
-                                           string addressSid = null,
-                                           LocalResource.EmergencyStatusEnum emergencyStatus = null,
-                                           string emergencyAddressSid = null,
-                                           string trunkSid = null,
-                                           LocalResource.VoiceReceiveModeEnum voiceReceiveMode = null,
-                                           string bundleSid = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateLocalOptions(phoneNumber){PathAccountSid = pathAccountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, IdentitySid = identitySid, AddressSid = addressSid, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
-        /// <param name="friendlyName"> A string to describe the new phone number </param>
-        /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
-        /// <param name="smsFallbackMethod"> The HTTP method we use to call status_callback </param>
-        /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms url </param>
-        /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> HTTP method we should use to call status_callback </param>
-        /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
-        /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
-        /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
-        /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
-        /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
-        /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
-        /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
-        /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
-        /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
-        /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Local </returns>
-        public static async System.Threading.Tasks.Task<LocalResource> CreateAsync(Types.PhoneNumber phoneNumber,
-                                                                                   string pathAccountSid = null,
-                                                                                   string apiVersion = null,
-                                                                                   string friendlyName = null,
-                                                                                   string smsApplicationSid = null,
-                                                                                   Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                                                   Uri smsFallbackUrl = null,
-                                                                                   Twilio.Http.HttpMethod smsMethod = null,
-                                                                                   Uri smsUrl = null,
-                                                                                   Uri statusCallback = null,
-                                                                                   Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                   string voiceApplicationSid = null,
-                                                                                   bool? voiceCallerIdLookup = null,
-                                                                                   Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                                                   Uri voiceFallbackUrl = null,
-                                                                                   Twilio.Http.HttpMethod voiceMethod = null,
-                                                                                   Uri voiceUrl = null,
-                                                                                   string identitySid = null,
-                                                                                   string addressSid = null,
-                                                                                   LocalResource.EmergencyStatusEnum emergencyStatus = null,
-                                                                                   string emergencyAddressSid = null,
-                                                                                   string trunkSid = null,
-                                                                                   LocalResource.VoiceReceiveModeEnum voiceReceiveMode = null,
-                                                                                   string bundleSid = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateLocalOptions(phoneNumber){PathAccountSid = pathAccountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, IdentitySid = identitySid, AddressSid = addressSid, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a LocalResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> LocalResource object represented by the provided JSON </returns>
-        public static LocalResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<LocalResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Address resource associated with the phone number
-        /// </summary>
-        [JsonProperty("address_sid")]
-        public string AddressSid { get; private set; }
-        /// <summary>
-        /// Whether the phone number requires an Address registered with Twilio.
-        /// </summary>
-        [JsonProperty("address_requirements")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public LocalResource.AddressRequirementEnum AddressRequirements { get; private set; }
-        /// <summary>
-        /// The API version used to start a new TwiML session
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Whether the phone number is new to the Twilio platform
-        /// </summary>
-        [JsonProperty("beta")]
-        public bool? Beta { get; private set; }
-        /// <summary>
-        /// Indicate if a phone can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The SID of the Identity resource associated with number
-        /// </summary>
-        [JsonProperty("identity_sid")]
-        public string IdentitySid { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The phone number's origin. Can be twilio or hosted.
-        /// </summary>
-        [JsonProperty("origin")]
-        public string Origin { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Application resource to handle SMS messages
-        /// </summary>
-        [JsonProperty("sms_application_sid")]
-        public string SmsApplicationSid { get; private set; }
-        /// <summary>
-        /// The HTTP method used with sms_fallback_url
-        /// </summary>
-        [JsonProperty("sms_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL that we call when an error occurs while retrieving or executing the TwiML
-        /// </summary>
-        [JsonProperty("sms_fallback_url")]
-        public Uri SmsFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method to use with sms_url
-        /// </summary>
-        [JsonProperty("sms_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when the phone number receives an incoming SMS message
-        /// </summary>
-        [JsonProperty("sms_url")]
-        public Uri SmsUrl { get; private set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call status_callback
-        /// </summary>
-        [JsonProperty("status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// The SID of the Trunk that handles calls to the phone number
-        /// </summary>
-        [JsonProperty("trunk_sid")]
-        public string TrunkSid { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The voice_receive_mode
-        /// </summary>
-        [JsonProperty("voice_receive_mode")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public LocalResource.VoiceReceiveModeEnum VoiceReceiveMode { get; private set; }
-        /// <summary>
-        /// The SID of the application that handles calls to the phone number
-        /// </summary>
-        [JsonProperty("voice_application_sid")]
-        public string VoiceApplicationSid { get; private set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        [JsonProperty("voice_caller_id_lookup")]
-        public bool? VoiceCallerIdLookup { get; private set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        [JsonProperty("voice_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when an error occurs in TwiML
-        /// </summary>
-        [JsonProperty("voice_fallback_url")]
-        public Uri VoiceFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method used with the voice_url
-        /// </summary>
-        [JsonProperty("voice_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when this phone number receives a call
-        /// </summary>
-        [JsonProperty("voice_url")]
-        public Uri VoiceUrl { get; private set; }
-        /// <summary>
-        /// Displays if emergency calling is enabled for this number.
-        /// </summary>
-        [JsonProperty("emergency_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public LocalResource.EmergencyStatusEnum EmergencyStatus { get; private set; }
-        /// <summary>
-        /// The emergency address configuration to use for emergency calling
-        /// </summary>
-        [JsonProperty("emergency_address_sid")]
-        public string EmergencyAddressSid { get; private set; }
-        /// <summary>
-        /// State of the emergency address configuration for the phone number
-        /// </summary>
-        [JsonProperty("emergency_address_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public LocalResource.EmergencyAddressStatusEnum EmergencyAddressStatus { get; private set; }
-        /// <summary>
-        /// The SID of the Bundle resource associated with number
-        /// </summary>
-        [JsonProperty("bundle_sid")]
-        public string BundleSid { get; private set; }
-        /// <summary>
-        /// The status
-        /// </summary>
-        [JsonProperty("status")]
-        public string Status { get; private set; }
-
-        private LocalResource()
-        {
-
-        }
-    }
+{
+
+  public class LocalResource : Resource
+  {
+    public sealed class AddressRequirementEnum : StringEnum
+    {
+      private AddressRequirementEnum(string value) : base(value) { }
+      public AddressRequirementEnum() { }
+      public static implicit operator AddressRequirementEnum(string value)
+      {
+        return new AddressRequirementEnum(value);
+      }
+
+      public static readonly AddressRequirementEnum None = new AddressRequirementEnum("none");
+      public static readonly AddressRequirementEnum Any = new AddressRequirementEnum("any");
+      public static readonly AddressRequirementEnum Local = new AddressRequirementEnum("local");
+      public static readonly AddressRequirementEnum Foreign = new AddressRequirementEnum("foreign");
+    }
+
+    public sealed class EmergencyStatusEnum : StringEnum
+    {
+      private EmergencyStatusEnum(string value) : base(value) { }
+      public EmergencyStatusEnum() { }
+      public static implicit operator EmergencyStatusEnum(string value)
+      {
+        return new EmergencyStatusEnum(value);
+      }
+
+      public static readonly EmergencyStatusEnum Active = new EmergencyStatusEnum("Active");
+      public static readonly EmergencyStatusEnum Inactive = new EmergencyStatusEnum("Inactive");
+    }
+
+    public sealed class EmergencyAddressStatusEnum : StringEnum
+    {
+      private EmergencyAddressStatusEnum(string value) : base(value) { }
+      public EmergencyAddressStatusEnum() { }
+      public static implicit operator EmergencyAddressStatusEnum(string value)
+      {
+        return new EmergencyAddressStatusEnum(value);
+      }
+
+      public static readonly EmergencyAddressStatusEnum Registered = new EmergencyAddressStatusEnum("registered");
+      public static readonly EmergencyAddressStatusEnum Unregistered = new EmergencyAddressStatusEnum("unregistered");
+      public static readonly EmergencyAddressStatusEnum PendingRegistration = new EmergencyAddressStatusEnum("pending-registration");
+      public static readonly EmergencyAddressStatusEnum RegistrationFailure = new EmergencyAddressStatusEnum("registration-failure");
+      public static readonly EmergencyAddressStatusEnum PendingUnregistration = new EmergencyAddressStatusEnum("pending-unregistration");
+      public static readonly EmergencyAddressStatusEnum UnregistrationFailure = new EmergencyAddressStatusEnum("unregistration-failure");
+    }
+
+    public sealed class VoiceReceiveModeEnum : StringEnum
+    {
+      private VoiceReceiveModeEnum(string value) : base(value) { }
+      public VoiceReceiveModeEnum() { }
+      public static implicit operator VoiceReceiveModeEnum(string value)
+      {
+        return new VoiceReceiveModeEnum(value);
+      }
+
+      public static readonly VoiceReceiveModeEnum Voice = new VoiceReceiveModeEnum("voice");
+      public static readonly VoiceReceiveModeEnum Fax = new VoiceReceiveModeEnum("fax");
+    }
+
+    private static Request BuildReadRequest(ReadLocalOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/Local.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Local parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Local </returns>
+    public static ResourceSet<LocalResource> Read(ReadLocalOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<LocalResource>.FromJson("incoming_phone_numbers", response.Content);
+      return new ResourceSet<LocalResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Local parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Local </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<LocalResource>> ReadAsync(ReadLocalOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<LocalResource>.FromJson("incoming_phone_numbers", response.Content);
+      return new ResourceSet<LocalResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="beta"> Whether to include new phone numbers </param>
+    /// <param name="friendlyName"> A string that identifies the resources to read </param>
+    /// <param name="phoneNumber"> The phone numbers of the resources to read </param>
+    /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
+    ///              included. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Local </returns>
+    public static ResourceSet<LocalResource> Read(string pathAccountSid = null,
+                                                  bool? beta = null,
+                                                  string friendlyName = null,
+                                                  Types.PhoneNumber phoneNumber = null,
+                                                  string origin = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadLocalOptions() { PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="beta"> Whether to include new phone numbers </param>
+    /// <param name="friendlyName"> A string that identifies the resources to read </param>
+    /// <param name="phoneNumber"> The phone numbers of the resources to read </param>
+    /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
+    ///              included. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Local </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<LocalResource>> ReadAsync(string pathAccountSid = null,
+                                                                                          bool? beta = null,
+                                                                                          string friendlyName = null,
+                                                                                          Types.PhoneNumber phoneNumber = null,
+                                                                                          string origin = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadLocalOptions() { PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<LocalResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<LocalResource>.FromJson("incoming_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<LocalResource> NextPage(Page<LocalResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<LocalResource>.FromJson("incoming_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<LocalResource> PreviousPage(Page<LocalResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<LocalResource>.FromJson("incoming_phone_numbers", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateLocalOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/Local.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Local parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Local </returns>
+    public static LocalResource Create(CreateLocalOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Local parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Local </returns>
+    public static async System.Threading.Tasks.Task<LocalResource> CreateAsync(CreateLocalOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
+    /// <param name="friendlyName"> A string to describe the new phone number </param>
+    /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
+    /// <param name="smsFallbackMethod"> The HTTP method we use to call status_callback </param>
+    /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms url </param>
+    /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> HTTP method we should use to call status_callback </param>
+    /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
+    /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
+    /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
+    /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
+    /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
+    /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
+    /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
+    /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
+    /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
+    /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Local </returns>
+    public static LocalResource Create(Types.PhoneNumber phoneNumber,
+                                       string pathAccountSid = null,
+                                       string apiVersion = null,
+                                       string friendlyName = null,
+                                       string smsApplicationSid = null,
+                                       Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                       Uri smsFallbackUrl = null,
+                                       Twilio.Http.HttpMethod smsMethod = null,
+                                       Uri smsUrl = null,
+                                       Uri statusCallback = null,
+                                       Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                       string voiceApplicationSid = null,
+                                       bool? voiceCallerIdLookup = null,
+                                       Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                       Uri voiceFallbackUrl = null,
+                                       Twilio.Http.HttpMethod voiceMethod = null,
+                                       Uri voiceUrl = null,
+                                       string identitySid = null,
+                                       string addressSid = null,
+                                       LocalResource.EmergencyStatusEnum emergencyStatus = null,
+                                       string emergencyAddressSid = null,
+                                       string trunkSid = null,
+                                       LocalResource.VoiceReceiveModeEnum voiceReceiveMode = null,
+                                       string bundleSid = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateLocalOptions(phoneNumber) { PathAccountSid = pathAccountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, IdentitySid = identitySid, AddressSid = addressSid, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
+    /// <param name="friendlyName"> A string to describe the new phone number </param>
+    /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
+    /// <param name="smsFallbackMethod"> The HTTP method we use to call status_callback </param>
+    /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms url </param>
+    /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> HTTP method we should use to call status_callback </param>
+    /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
+    /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
+    /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
+    /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
+    /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
+    /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
+    /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
+    /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
+    /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
+    /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Local </returns>
+    public static async System.Threading.Tasks.Task<LocalResource> CreateAsync(Types.PhoneNumber phoneNumber,
+                                                                               string pathAccountSid = null,
+                                                                               string apiVersion = null,
+                                                                               string friendlyName = null,
+                                                                               string smsApplicationSid = null,
+                                                                               Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                                               Uri smsFallbackUrl = null,
+                                                                               Twilio.Http.HttpMethod smsMethod = null,
+                                                                               Uri smsUrl = null,
+                                                                               Uri statusCallback = null,
+                                                                               Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                               string voiceApplicationSid = null,
+                                                                               bool? voiceCallerIdLookup = null,
+                                                                               Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                                               Uri voiceFallbackUrl = null,
+                                                                               Twilio.Http.HttpMethod voiceMethod = null,
+                                                                               Uri voiceUrl = null,
+                                                                               string identitySid = null,
+                                                                               string addressSid = null,
+                                                                               LocalResource.EmergencyStatusEnum emergencyStatus = null,
+                                                                               string emergencyAddressSid = null,
+                                                                               string trunkSid = null,
+                                                                               LocalResource.VoiceReceiveModeEnum voiceReceiveMode = null,
+                                                                               string bundleSid = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateLocalOptions(phoneNumber) { PathAccountSid = pathAccountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, IdentitySid = identitySid, AddressSid = addressSid, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a LocalResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> LocalResource object represented by the provided JSON </returns>
+    public static LocalResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<LocalResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Address resource associated with the phone number
+    /// </summary>
+    [JsonProperty("address_sid")]
+    public string AddressSid { get; private set; }
+    /// <summary>
+    /// Whether the phone number requires an Address registered with Twilio.
+    /// </summary>
+    [JsonProperty("address_requirements")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public LocalResource.AddressRequirementEnum AddressRequirements { get; private set; }
+    /// <summary>
+    /// The API version used to start a new TwiML session
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Whether the phone number is new to the Twilio platform
+    /// </summary>
+    [JsonProperty("beta")]
+    public bool? Beta { get; private set; }
+    /// <summary>
+    /// Indicate if a phone can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The SID of the Identity resource associated with number
+    /// </summary>
+    [JsonProperty("identity_sid")]
+    public string IdentitySid { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The phone number's origin. Can be twilio or hosted.
+    /// </summary>
+    [JsonProperty("origin")]
+    public string Origin { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Application resource to handle SMS messages
+    /// </summary>
+    [JsonProperty("sms_application_sid")]
+    public string SmsApplicationSid { get; private set; }
+    /// <summary>
+    /// The HTTP method used with sms_fallback_url
+    /// </summary>
+    [JsonProperty("sms_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL that we call when an error occurs while retrieving or executing the TwiML
+    /// </summary>
+    [JsonProperty("sms_fallback_url")]
+    public Uri SmsFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method to use with sms_url
+    /// </summary>
+    [JsonProperty("sms_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when the phone number receives an incoming SMS message
+    /// </summary>
+    [JsonProperty("sms_url")]
+    public Uri SmsUrl { get; private set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call status_callback
+    /// </summary>
+    [JsonProperty("status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// The SID of the Trunk that handles calls to the phone number
+    /// </summary>
+    [JsonProperty("trunk_sid")]
+    public string TrunkSid { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The voice_receive_mode
+    /// </summary>
+    [JsonProperty("voice_receive_mode")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public LocalResource.VoiceReceiveModeEnum VoiceReceiveMode { get; private set; }
+    /// <summary>
+    /// The SID of the application that handles calls to the phone number
+    /// </summary>
+    [JsonProperty("voice_application_sid")]
+    public string VoiceApplicationSid { get; private set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    [JsonProperty("voice_caller_id_lookup")]
+    public bool? VoiceCallerIdLookup { get; private set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    [JsonProperty("voice_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when an error occurs in TwiML
+    /// </summary>
+    [JsonProperty("voice_fallback_url")]
+    public Uri VoiceFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method used with the voice_url
+    /// </summary>
+    [JsonProperty("voice_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when this phone number receives a call
+    /// </summary>
+    [JsonProperty("voice_url")]
+    public Uri VoiceUrl { get; private set; }
+    /// <summary>
+    /// Displays if emergency calling is enabled for this number.
+    /// </summary>
+    [JsonProperty("emergency_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public LocalResource.EmergencyStatusEnum EmergencyStatus { get; private set; }
+    /// <summary>
+    /// The emergency address configuration to use for emergency calling
+    /// </summary>
+    [JsonProperty("emergency_address_sid")]
+    public string EmergencyAddressSid { get; private set; }
+    /// <summary>
+    /// State of the emergency address configuration for the phone number
+    /// </summary>
+    [JsonProperty("emergency_address_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public LocalResource.EmergencyAddressStatusEnum EmergencyAddressStatus { get; private set; }
+    /// <summary>
+    /// The SID of the Bundle resource associated with number
+    /// </summary>
+    [JsonProperty("bundle_sid")]
+    public string BundleSid { get; private set; }
+    /// <summary>
+    /// The status
+    /// </summary>
+    [JsonProperty("status")]
+    public string Status { get; private set; }
+
+    private LocalResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/MobileOptions.cs b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/MobileOptions.cs
index d71764b45..b1cdc7654 100644
--- a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/MobileOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/MobileOptions.cs
@@ -9,303 +9,303 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.IncomingPhoneNumber
-{
-
+{
+
+  /// <summary>
+  /// ReadMobileOptions
+  /// </summary>
+  public class ReadMobileOptions : ReadOptions<MobileResource>
+  {
     /// <summary>
-    /// ReadMobileOptions
-    /// </summary>
-    public class ReadMobileOptions : ReadOptions<MobileResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Whether to include new phone numbers
-        /// </summary>
-        public bool? Beta { get; set; }
-        /// <summary>
-        /// A string that identifies the resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The phone numbers of the resources to read
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; set; }
-        /// <summary>
-        /// Include phone numbers based on their origin. By default, phone numbers of all origin are included.
-        /// </summary>
-        public string Origin { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Beta != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (Origin != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Origin", Origin));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// CreateMobileOptions
-    /// </summary>
-    public class CreateMobileOptions : IOptions<MobileResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The phone number to purchase in E.164 format
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; }
-        /// <summary>
-        /// The API version to use for incoming calls made to the new phone number
-        /// </summary>
-        public string ApiVersion { get; set; }
-        /// <summary>
-        /// A string to describe the new phone number
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The SID of the application to handle SMS messages
-        /// </summary>
-        public string SmsApplicationSid { get; set; }
-        /// <summary>
-        /// HTTP method used with sms_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we call when an error occurs while executing TwiML
-        /// </summary>
-        public Uri SmsFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with sms url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when the new phone number receives an incoming SMS message
-        /// </summary>
-        public Uri SmsUrl { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The SID of the application to handle the new phone number
-        /// </summary>
-        public string VoiceApplicationSid { get; set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        public bool? VoiceCallerIdLookup { get; set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we will call when an error occurs in TwiML
-        /// </summary>
-        public Uri VoiceFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method used with the voice_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when the phone number receives a call
-        /// </summary>
-        public Uri VoiceUrl { get; set; }
-        /// <summary>
-        /// The SID of the Identity resource to associate with the new phone number
-        /// </summary>
-        public string IdentitySid { get; set; }
-        /// <summary>
-        /// The SID of the Address resource associated with the phone number
-        /// </summary>
-        public string AddressSid { get; set; }
-        /// <summary>
-        /// Displays if emergency calling is enabled for this number.
-        /// </summary>
-        public MobileResource.EmergencyStatusEnum EmergencyStatus { get; set; }
-        /// <summary>
-        /// The emergency address configuration to use for emergency calling
-        /// </summary>
-        public string EmergencyAddressSid { get; set; }
-        /// <summary>
-        /// SID of the trunk to handle calls to the new phone number
-        /// </summary>
-        public string TrunkSid { get; set; }
-        /// <summary>
-        /// Incoming call type: fax or voice
-        /// </summary>
-        public MobileResource.VoiceReceiveModeEnum VoiceReceiveMode { get; set; }
-        /// <summary>
-        /// The SID of the Bundle resource associated with number
-        /// </summary>
-        public string BundleSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMobileOptions
-        /// </summary>
-        /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
-        public CreateMobileOptions(Types.PhoneNumber phoneNumber)
-        {
-            PhoneNumber = phoneNumber;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (ApiVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (SmsApplicationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsApplicationSid", SmsApplicationSid.ToString()));
-            }
-
-            if (SmsFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
-            }
-
-            if (SmsFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
-            }
-
-            if (SmsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
-            }
-
-            if (SmsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (VoiceApplicationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceApplicationSid", VoiceApplicationSid.ToString()));
-            }
-
-            if (VoiceCallerIdLookup != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
-            }
-
-            if (VoiceFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
-            }
-
-            if (VoiceFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
-            }
-
-            if (VoiceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
-            }
-
-            if (VoiceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
-            }
-
-            if (IdentitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IdentitySid", IdentitySid.ToString()));
-            }
-
-            if (AddressSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
-            }
-
-            if (EmergencyStatus != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyStatus", EmergencyStatus.ToString()));
-            }
-
-            if (EmergencyAddressSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyAddressSid", EmergencyAddressSid.ToString()));
-            }
-
-            if (TrunkSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TrunkSid", TrunkSid.ToString()));
-            }
-
-            if (VoiceReceiveMode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceReceiveMode", VoiceReceiveMode.ToString()));
-            }
-
-            if (BundleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BundleSid", BundleSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Whether to include new phone numbers
+    /// </summary>
+    public bool? Beta { get; set; }
+    /// <summary>
+    /// A string that identifies the resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The phone numbers of the resources to read
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; set; }
+    /// <summary>
+    /// Include phone numbers based on their origin. By default, phone numbers of all origin are included.
+    /// </summary>
+    public string Origin { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Beta != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (Origin != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Origin", Origin));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateMobileOptions
+  /// </summary>
+  public class CreateMobileOptions : IOptions<MobileResource>
+  {
+    /// <summary>
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The phone number to purchase in E.164 format
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; }
+    /// <summary>
+    /// The API version to use for incoming calls made to the new phone number
+    /// </summary>
+    public string ApiVersion { get; set; }
+    /// <summary>
+    /// A string to describe the new phone number
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The SID of the application to handle SMS messages
+    /// </summary>
+    public string SmsApplicationSid { get; set; }
+    /// <summary>
+    /// HTTP method used with sms_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we call when an error occurs while executing TwiML
+    /// </summary>
+    public Uri SmsFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with sms url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when the new phone number receives an incoming SMS message
+    /// </summary>
+    public Uri SmsUrl { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The SID of the application to handle the new phone number
+    /// </summary>
+    public string VoiceApplicationSid { get; set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    public bool? VoiceCallerIdLookup { get; set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we will call when an error occurs in TwiML
+    /// </summary>
+    public Uri VoiceFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method used with the voice_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when the phone number receives a call
+    /// </summary>
+    public Uri VoiceUrl { get; set; }
+    /// <summary>
+    /// The SID of the Identity resource to associate with the new phone number
+    /// </summary>
+    public string IdentitySid { get; set; }
+    /// <summary>
+    /// The SID of the Address resource associated with the phone number
+    /// </summary>
+    public string AddressSid { get; set; }
+    /// <summary>
+    /// Displays if emergency calling is enabled for this number.
+    /// </summary>
+    public MobileResource.EmergencyStatusEnum EmergencyStatus { get; set; }
+    /// <summary>
+    /// The emergency address configuration to use for emergency calling
+    /// </summary>
+    public string EmergencyAddressSid { get; set; }
+    /// <summary>
+    /// SID of the trunk to handle calls to the new phone number
+    /// </summary>
+    public string TrunkSid { get; set; }
+    /// <summary>
+    /// Incoming call type: fax or voice
+    /// </summary>
+    public MobileResource.VoiceReceiveModeEnum VoiceReceiveMode { get; set; }
+    /// <summary>
+    /// The SID of the Bundle resource associated with number
+    /// </summary>
+    public string BundleSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMobileOptions
+    /// </summary>
+    /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
+    public CreateMobileOptions(Types.PhoneNumber phoneNumber)
+    {
+      PhoneNumber = phoneNumber;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (ApiVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (SmsApplicationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsApplicationSid", SmsApplicationSid.ToString()));
+      }
+
+      if (SmsFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
+      }
+
+      if (SmsFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
+      }
+
+      if (SmsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
+      }
+
+      if (SmsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (VoiceApplicationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceApplicationSid", VoiceApplicationSid.ToString()));
+      }
+
+      if (VoiceCallerIdLookup != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
+      }
+
+      if (VoiceFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
+      }
+
+      if (VoiceFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
+      }
+
+      if (VoiceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
+      }
+
+      if (VoiceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
+      }
+
+      if (IdentitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IdentitySid", IdentitySid.ToString()));
+      }
+
+      if (AddressSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
+      }
+
+      if (EmergencyStatus != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyStatus", EmergencyStatus.ToString()));
+      }
+
+      if (EmergencyAddressSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyAddressSid", EmergencyAddressSid.ToString()));
+      }
+
+      if (TrunkSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TrunkSid", TrunkSid.ToString()));
+      }
+
+      if (VoiceReceiveMode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceReceiveMode", VoiceReceiveMode.ToString()));
+      }
+
+      if (BundleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BundleSid", BundleSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/MobileResource.cs b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/MobileResource.cs
index ace42a1b9..17e12a599 100644
--- a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/MobileResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/MobileResource.cs
@@ -17,582 +17,582 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.IncomingPhoneNumber
-{
-
-    public class MobileResource : Resource
-    {
-        public sealed class AddressRequirementEnum : StringEnum
-        {
-            private AddressRequirementEnum(string value) : base(value) {}
-            public AddressRequirementEnum() {}
-            public static implicit operator AddressRequirementEnum(string value)
-            {
-                return new AddressRequirementEnum(value);
-            }
-
-            public static readonly AddressRequirementEnum None = new AddressRequirementEnum("none");
-            public static readonly AddressRequirementEnum Any = new AddressRequirementEnum("any");
-            public static readonly AddressRequirementEnum Local = new AddressRequirementEnum("local");
-            public static readonly AddressRequirementEnum Foreign = new AddressRequirementEnum("foreign");
-        }
-
-        public sealed class EmergencyStatusEnum : StringEnum
-        {
-            private EmergencyStatusEnum(string value) : base(value) {}
-            public EmergencyStatusEnum() {}
-            public static implicit operator EmergencyStatusEnum(string value)
-            {
-                return new EmergencyStatusEnum(value);
-            }
-
-            public static readonly EmergencyStatusEnum Active = new EmergencyStatusEnum("Active");
-            public static readonly EmergencyStatusEnum Inactive = new EmergencyStatusEnum("Inactive");
-        }
-
-        public sealed class EmergencyAddressStatusEnum : StringEnum
-        {
-            private EmergencyAddressStatusEnum(string value) : base(value) {}
-            public EmergencyAddressStatusEnum() {}
-            public static implicit operator EmergencyAddressStatusEnum(string value)
-            {
-                return new EmergencyAddressStatusEnum(value);
-            }
-
-            public static readonly EmergencyAddressStatusEnum Registered = new EmergencyAddressStatusEnum("registered");
-            public static readonly EmergencyAddressStatusEnum Unregistered = new EmergencyAddressStatusEnum("unregistered");
-            public static readonly EmergencyAddressStatusEnum PendingRegistration = new EmergencyAddressStatusEnum("pending-registration");
-            public static readonly EmergencyAddressStatusEnum RegistrationFailure = new EmergencyAddressStatusEnum("registration-failure");
-            public static readonly EmergencyAddressStatusEnum PendingUnregistration = new EmergencyAddressStatusEnum("pending-unregistration");
-            public static readonly EmergencyAddressStatusEnum UnregistrationFailure = new EmergencyAddressStatusEnum("unregistration-failure");
-        }
-
-        public sealed class VoiceReceiveModeEnum : StringEnum
-        {
-            private VoiceReceiveModeEnum(string value) : base(value) {}
-            public VoiceReceiveModeEnum() {}
-            public static implicit operator VoiceReceiveModeEnum(string value)
-            {
-                return new VoiceReceiveModeEnum(value);
-            }
-
-            public static readonly VoiceReceiveModeEnum Voice = new VoiceReceiveModeEnum("voice");
-            public static readonly VoiceReceiveModeEnum Fax = new VoiceReceiveModeEnum("fax");
-        }
-
-        private static Request BuildReadRequest(ReadMobileOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/Mobile.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Mobile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Mobile </returns>
-        public static ResourceSet<MobileResource> Read(ReadMobileOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MobileResource>.FromJson("incoming_phone_numbers", response.Content);
-            return new ResourceSet<MobileResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Mobile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Mobile </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MobileResource>> ReadAsync(ReadMobileOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MobileResource>.FromJson("incoming_phone_numbers", response.Content);
-            return new ResourceSet<MobileResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="beta"> Whether to include new phone numbers </param>
-        /// <param name="friendlyName"> A string that identifies the resources to read </param>
-        /// <param name="phoneNumber"> The phone numbers of the resources to read </param>
-        /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
-        ///              included. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Mobile </returns>
-        public static ResourceSet<MobileResource> Read(string pathAccountSid = null,
-                                                       bool? beta = null,
-                                                       string friendlyName = null,
-                                                       Types.PhoneNumber phoneNumber = null,
-                                                       string origin = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadMobileOptions(){PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="beta"> Whether to include new phone numbers </param>
-        /// <param name="friendlyName"> A string that identifies the resources to read </param>
-        /// <param name="phoneNumber"> The phone numbers of the resources to read </param>
-        /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
-        ///              included. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Mobile </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MobileResource>> ReadAsync(string pathAccountSid = null,
-                                                                                               bool? beta = null,
-                                                                                               string friendlyName = null,
-                                                                                               Types.PhoneNumber phoneNumber = null,
-                                                                                               string origin = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadMobileOptions(){PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MobileResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MobileResource>.FromJson("incoming_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MobileResource> NextPage(Page<MobileResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MobileResource>.FromJson("incoming_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MobileResource> PreviousPage(Page<MobileResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MobileResource>.FromJson("incoming_phone_numbers", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateMobileOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/Mobile.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Mobile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Mobile </returns>
-        public static MobileResource Create(CreateMobileOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Mobile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Mobile </returns>
-        public static async System.Threading.Tasks.Task<MobileResource> CreateAsync(CreateMobileOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
-        /// <param name="friendlyName"> A string to describe the new phone number </param>
-        /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
-        /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
-        /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms url </param>
-        /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
-        /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
-        /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
-        /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
-        /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
-        /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
-        /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
-        /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
-        /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
-        /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Mobile </returns>
-        public static MobileResource Create(Types.PhoneNumber phoneNumber,
-                                            string pathAccountSid = null,
-                                            string apiVersion = null,
-                                            string friendlyName = null,
-                                            string smsApplicationSid = null,
-                                            Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                            Uri smsFallbackUrl = null,
-                                            Twilio.Http.HttpMethod smsMethod = null,
-                                            Uri smsUrl = null,
-                                            Uri statusCallback = null,
-                                            Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                            string voiceApplicationSid = null,
-                                            bool? voiceCallerIdLookup = null,
-                                            Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                            Uri voiceFallbackUrl = null,
-                                            Twilio.Http.HttpMethod voiceMethod = null,
-                                            Uri voiceUrl = null,
-                                            string identitySid = null,
-                                            string addressSid = null,
-                                            MobileResource.EmergencyStatusEnum emergencyStatus = null,
-                                            string emergencyAddressSid = null,
-                                            string trunkSid = null,
-                                            MobileResource.VoiceReceiveModeEnum voiceReceiveMode = null,
-                                            string bundleSid = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateMobileOptions(phoneNumber){PathAccountSid = pathAccountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, IdentitySid = identitySid, AddressSid = addressSid, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
-        /// <param name="friendlyName"> A string to describe the new phone number </param>
-        /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
-        /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
-        /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms url </param>
-        /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
-        /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
-        /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
-        /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
-        /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
-        /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
-        /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
-        /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
-        /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
-        /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Mobile </returns>
-        public static async System.Threading.Tasks.Task<MobileResource> CreateAsync(Types.PhoneNumber phoneNumber,
-                                                                                    string pathAccountSid = null,
-                                                                                    string apiVersion = null,
-                                                                                    string friendlyName = null,
-                                                                                    string smsApplicationSid = null,
-                                                                                    Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                                                    Uri smsFallbackUrl = null,
-                                                                                    Twilio.Http.HttpMethod smsMethod = null,
-                                                                                    Uri smsUrl = null,
-                                                                                    Uri statusCallback = null,
-                                                                                    Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                    string voiceApplicationSid = null,
-                                                                                    bool? voiceCallerIdLookup = null,
-                                                                                    Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                                                    Uri voiceFallbackUrl = null,
-                                                                                    Twilio.Http.HttpMethod voiceMethod = null,
-                                                                                    Uri voiceUrl = null,
-                                                                                    string identitySid = null,
-                                                                                    string addressSid = null,
-                                                                                    MobileResource.EmergencyStatusEnum emergencyStatus = null,
-                                                                                    string emergencyAddressSid = null,
-                                                                                    string trunkSid = null,
-                                                                                    MobileResource.VoiceReceiveModeEnum voiceReceiveMode = null,
-                                                                                    string bundleSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateMobileOptions(phoneNumber){PathAccountSid = pathAccountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, IdentitySid = identitySid, AddressSid = addressSid, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a MobileResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MobileResource object represented by the provided JSON </returns>
-        public static MobileResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MobileResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Address resource associated with the phone number
-        /// </summary>
-        [JsonProperty("address_sid")]
-        public string AddressSid { get; private set; }
-        /// <summary>
-        /// Whether the phone number requires an Address registered with Twilio.
-        /// </summary>
-        [JsonProperty("address_requirements")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public MobileResource.AddressRequirementEnum AddressRequirements { get; private set; }
-        /// <summary>
-        /// The API version used to start a new TwiML session
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Whether the phone number is new to the Twilio platform
-        /// </summary>
-        [JsonProperty("beta")]
-        public bool? Beta { get; private set; }
-        /// <summary>
-        /// Indicate if a phone can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The SID of the Identity resource associated with number
-        /// </summary>
-        [JsonProperty("identity_sid")]
-        public string IdentitySid { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The phone number's origin. Can be twilio or hosted.
-        /// </summary>
-        [JsonProperty("origin")]
-        public string Origin { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the application that handles SMS messages sent to the phone number
-        /// </summary>
-        [JsonProperty("sms_application_sid")]
-        public string SmsApplicationSid { get; private set; }
-        /// <summary>
-        /// The HTTP method used with sms_fallback_url
-        /// </summary>
-        [JsonProperty("sms_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL that we call when an error occurs while retrieving or executing the TwiML
-        /// </summary>
-        [JsonProperty("sms_fallback_url")]
-        public Uri SmsFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method to use with sms_url
-        /// </summary>
-        [JsonProperty("sms_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when the phone number receives an incoming SMS message
-        /// </summary>
-        [JsonProperty("sms_url")]
-        public Uri SmsUrl { get; private set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call status_callback
-        /// </summary>
-        [JsonProperty("status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// The SID of the Trunk that handles calls to the phone number
-        /// </summary>
-        [JsonProperty("trunk_sid")]
-        public string TrunkSid { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The voice_receive_mode
-        /// </summary>
-        [JsonProperty("voice_receive_mode")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public MobileResource.VoiceReceiveModeEnum VoiceReceiveMode { get; private set; }
-        /// <summary>
-        /// The SID of the application that handles calls to the phone number
-        /// </summary>
-        [JsonProperty("voice_application_sid")]
-        public string VoiceApplicationSid { get; private set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        [JsonProperty("voice_caller_id_lookup")]
-        public bool? VoiceCallerIdLookup { get; private set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        [JsonProperty("voice_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when an error occurs in TwiML
-        /// </summary>
-        [JsonProperty("voice_fallback_url")]
-        public Uri VoiceFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method used with the voice_url
-        /// </summary>
-        [JsonProperty("voice_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when the phone number receives a call
-        /// </summary>
-        [JsonProperty("voice_url")]
-        public Uri VoiceUrl { get; private set; }
-        /// <summary>
-        /// Displays if emergency calling is enabled for this number.
-        /// </summary>
-        [JsonProperty("emergency_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public MobileResource.EmergencyStatusEnum EmergencyStatus { get; private set; }
-        /// <summary>
-        /// The emergency address configuration to use for emergency calling
-        /// </summary>
-        [JsonProperty("emergency_address_sid")]
-        public string EmergencyAddressSid { get; private set; }
-        /// <summary>
-        /// State of the emergency address configuration for the phone number
-        /// </summary>
-        [JsonProperty("emergency_address_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public MobileResource.EmergencyAddressStatusEnum EmergencyAddressStatus { get; private set; }
-        /// <summary>
-        /// The SID of the Bundle resource associated with number
-        /// </summary>
-        [JsonProperty("bundle_sid")]
-        public string BundleSid { get; private set; }
-        /// <summary>
-        /// The status
-        /// </summary>
-        [JsonProperty("status")]
-        public string Status { get; private set; }
-
-        private MobileResource()
-        {
-
-        }
-    }
+{
+
+  public class MobileResource : Resource
+  {
+    public sealed class AddressRequirementEnum : StringEnum
+    {
+      private AddressRequirementEnum(string value) : base(value) { }
+      public AddressRequirementEnum() { }
+      public static implicit operator AddressRequirementEnum(string value)
+      {
+        return new AddressRequirementEnum(value);
+      }
+
+      public static readonly AddressRequirementEnum None = new AddressRequirementEnum("none");
+      public static readonly AddressRequirementEnum Any = new AddressRequirementEnum("any");
+      public static readonly AddressRequirementEnum Local = new AddressRequirementEnum("local");
+      public static readonly AddressRequirementEnum Foreign = new AddressRequirementEnum("foreign");
+    }
+
+    public sealed class EmergencyStatusEnum : StringEnum
+    {
+      private EmergencyStatusEnum(string value) : base(value) { }
+      public EmergencyStatusEnum() { }
+      public static implicit operator EmergencyStatusEnum(string value)
+      {
+        return new EmergencyStatusEnum(value);
+      }
+
+      public static readonly EmergencyStatusEnum Active = new EmergencyStatusEnum("Active");
+      public static readonly EmergencyStatusEnum Inactive = new EmergencyStatusEnum("Inactive");
+    }
+
+    public sealed class EmergencyAddressStatusEnum : StringEnum
+    {
+      private EmergencyAddressStatusEnum(string value) : base(value) { }
+      public EmergencyAddressStatusEnum() { }
+      public static implicit operator EmergencyAddressStatusEnum(string value)
+      {
+        return new EmergencyAddressStatusEnum(value);
+      }
+
+      public static readonly EmergencyAddressStatusEnum Registered = new EmergencyAddressStatusEnum("registered");
+      public static readonly EmergencyAddressStatusEnum Unregistered = new EmergencyAddressStatusEnum("unregistered");
+      public static readonly EmergencyAddressStatusEnum PendingRegistration = new EmergencyAddressStatusEnum("pending-registration");
+      public static readonly EmergencyAddressStatusEnum RegistrationFailure = new EmergencyAddressStatusEnum("registration-failure");
+      public static readonly EmergencyAddressStatusEnum PendingUnregistration = new EmergencyAddressStatusEnum("pending-unregistration");
+      public static readonly EmergencyAddressStatusEnum UnregistrationFailure = new EmergencyAddressStatusEnum("unregistration-failure");
+    }
+
+    public sealed class VoiceReceiveModeEnum : StringEnum
+    {
+      private VoiceReceiveModeEnum(string value) : base(value) { }
+      public VoiceReceiveModeEnum() { }
+      public static implicit operator VoiceReceiveModeEnum(string value)
+      {
+        return new VoiceReceiveModeEnum(value);
+      }
+
+      public static readonly VoiceReceiveModeEnum Voice = new VoiceReceiveModeEnum("voice");
+      public static readonly VoiceReceiveModeEnum Fax = new VoiceReceiveModeEnum("fax");
+    }
+
+    private static Request BuildReadRequest(ReadMobileOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/Mobile.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Mobile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Mobile </returns>
+    public static ResourceSet<MobileResource> Read(ReadMobileOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MobileResource>.FromJson("incoming_phone_numbers", response.Content);
+      return new ResourceSet<MobileResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Mobile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Mobile </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MobileResource>> ReadAsync(ReadMobileOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MobileResource>.FromJson("incoming_phone_numbers", response.Content);
+      return new ResourceSet<MobileResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="beta"> Whether to include new phone numbers </param>
+    /// <param name="friendlyName"> A string that identifies the resources to read </param>
+    /// <param name="phoneNumber"> The phone numbers of the resources to read </param>
+    /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
+    ///              included. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Mobile </returns>
+    public static ResourceSet<MobileResource> Read(string pathAccountSid = null,
+                                                   bool? beta = null,
+                                                   string friendlyName = null,
+                                                   Types.PhoneNumber phoneNumber = null,
+                                                   string origin = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadMobileOptions() { PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="beta"> Whether to include new phone numbers </param>
+    /// <param name="friendlyName"> A string that identifies the resources to read </param>
+    /// <param name="phoneNumber"> The phone numbers of the resources to read </param>
+    /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
+    ///              included. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Mobile </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MobileResource>> ReadAsync(string pathAccountSid = null,
+                                                                                           bool? beta = null,
+                                                                                           string friendlyName = null,
+                                                                                           Types.PhoneNumber phoneNumber = null,
+                                                                                           string origin = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadMobileOptions() { PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MobileResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MobileResource>.FromJson("incoming_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MobileResource> NextPage(Page<MobileResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MobileResource>.FromJson("incoming_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MobileResource> PreviousPage(Page<MobileResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MobileResource>.FromJson("incoming_phone_numbers", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateMobileOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/Mobile.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Mobile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Mobile </returns>
+    public static MobileResource Create(CreateMobileOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Mobile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Mobile </returns>
+    public static async System.Threading.Tasks.Task<MobileResource> CreateAsync(CreateMobileOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
+    /// <param name="friendlyName"> A string to describe the new phone number </param>
+    /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
+    /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
+    /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms url </param>
+    /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
+    /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
+    /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
+    /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
+    /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
+    /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
+    /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
+    /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
+    /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
+    /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Mobile </returns>
+    public static MobileResource Create(Types.PhoneNumber phoneNumber,
+                                        string pathAccountSid = null,
+                                        string apiVersion = null,
+                                        string friendlyName = null,
+                                        string smsApplicationSid = null,
+                                        Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                        Uri smsFallbackUrl = null,
+                                        Twilio.Http.HttpMethod smsMethod = null,
+                                        Uri smsUrl = null,
+                                        Uri statusCallback = null,
+                                        Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                        string voiceApplicationSid = null,
+                                        bool? voiceCallerIdLookup = null,
+                                        Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                        Uri voiceFallbackUrl = null,
+                                        Twilio.Http.HttpMethod voiceMethod = null,
+                                        Uri voiceUrl = null,
+                                        string identitySid = null,
+                                        string addressSid = null,
+                                        MobileResource.EmergencyStatusEnum emergencyStatus = null,
+                                        string emergencyAddressSid = null,
+                                        string trunkSid = null,
+                                        MobileResource.VoiceReceiveModeEnum voiceReceiveMode = null,
+                                        string bundleSid = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateMobileOptions(phoneNumber) { PathAccountSid = pathAccountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, IdentitySid = identitySid, AddressSid = addressSid, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
+    /// <param name="friendlyName"> A string to describe the new phone number </param>
+    /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
+    /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
+    /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms url </param>
+    /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
+    /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
+    /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
+    /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
+    /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
+    /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
+    /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
+    /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
+    /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
+    /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Mobile </returns>
+    public static async System.Threading.Tasks.Task<MobileResource> CreateAsync(Types.PhoneNumber phoneNumber,
+                                                                                string pathAccountSid = null,
+                                                                                string apiVersion = null,
+                                                                                string friendlyName = null,
+                                                                                string smsApplicationSid = null,
+                                                                                Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                                                Uri smsFallbackUrl = null,
+                                                                                Twilio.Http.HttpMethod smsMethod = null,
+                                                                                Uri smsUrl = null,
+                                                                                Uri statusCallback = null,
+                                                                                Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                string voiceApplicationSid = null,
+                                                                                bool? voiceCallerIdLookup = null,
+                                                                                Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                                                Uri voiceFallbackUrl = null,
+                                                                                Twilio.Http.HttpMethod voiceMethod = null,
+                                                                                Uri voiceUrl = null,
+                                                                                string identitySid = null,
+                                                                                string addressSid = null,
+                                                                                MobileResource.EmergencyStatusEnum emergencyStatus = null,
+                                                                                string emergencyAddressSid = null,
+                                                                                string trunkSid = null,
+                                                                                MobileResource.VoiceReceiveModeEnum voiceReceiveMode = null,
+                                                                                string bundleSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateMobileOptions(phoneNumber) { PathAccountSid = pathAccountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, IdentitySid = identitySid, AddressSid = addressSid, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a MobileResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MobileResource object represented by the provided JSON </returns>
+    public static MobileResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MobileResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Address resource associated with the phone number
+    /// </summary>
+    [JsonProperty("address_sid")]
+    public string AddressSid { get; private set; }
+    /// <summary>
+    /// Whether the phone number requires an Address registered with Twilio.
+    /// </summary>
+    [JsonProperty("address_requirements")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public MobileResource.AddressRequirementEnum AddressRequirements { get; private set; }
+    /// <summary>
+    /// The API version used to start a new TwiML session
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Whether the phone number is new to the Twilio platform
+    /// </summary>
+    [JsonProperty("beta")]
+    public bool? Beta { get; private set; }
+    /// <summary>
+    /// Indicate if a phone can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The SID of the Identity resource associated with number
+    /// </summary>
+    [JsonProperty("identity_sid")]
+    public string IdentitySid { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The phone number's origin. Can be twilio or hosted.
+    /// </summary>
+    [JsonProperty("origin")]
+    public string Origin { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the application that handles SMS messages sent to the phone number
+    /// </summary>
+    [JsonProperty("sms_application_sid")]
+    public string SmsApplicationSid { get; private set; }
+    /// <summary>
+    /// The HTTP method used with sms_fallback_url
+    /// </summary>
+    [JsonProperty("sms_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL that we call when an error occurs while retrieving or executing the TwiML
+    /// </summary>
+    [JsonProperty("sms_fallback_url")]
+    public Uri SmsFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method to use with sms_url
+    /// </summary>
+    [JsonProperty("sms_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when the phone number receives an incoming SMS message
+    /// </summary>
+    [JsonProperty("sms_url")]
+    public Uri SmsUrl { get; private set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call status_callback
+    /// </summary>
+    [JsonProperty("status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// The SID of the Trunk that handles calls to the phone number
+    /// </summary>
+    [JsonProperty("trunk_sid")]
+    public string TrunkSid { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The voice_receive_mode
+    /// </summary>
+    [JsonProperty("voice_receive_mode")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public MobileResource.VoiceReceiveModeEnum VoiceReceiveMode { get; private set; }
+    /// <summary>
+    /// The SID of the application that handles calls to the phone number
+    /// </summary>
+    [JsonProperty("voice_application_sid")]
+    public string VoiceApplicationSid { get; private set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    [JsonProperty("voice_caller_id_lookup")]
+    public bool? VoiceCallerIdLookup { get; private set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    [JsonProperty("voice_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when an error occurs in TwiML
+    /// </summary>
+    [JsonProperty("voice_fallback_url")]
+    public Uri VoiceFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method used with the voice_url
+    /// </summary>
+    [JsonProperty("voice_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when the phone number receives a call
+    /// </summary>
+    [JsonProperty("voice_url")]
+    public Uri VoiceUrl { get; private set; }
+    /// <summary>
+    /// Displays if emergency calling is enabled for this number.
+    /// </summary>
+    [JsonProperty("emergency_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public MobileResource.EmergencyStatusEnum EmergencyStatus { get; private set; }
+    /// <summary>
+    /// The emergency address configuration to use for emergency calling
+    /// </summary>
+    [JsonProperty("emergency_address_sid")]
+    public string EmergencyAddressSid { get; private set; }
+    /// <summary>
+    /// State of the emergency address configuration for the phone number
+    /// </summary>
+    [JsonProperty("emergency_address_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public MobileResource.EmergencyAddressStatusEnum EmergencyAddressStatus { get; private set; }
+    /// <summary>
+    /// The SID of the Bundle resource associated with number
+    /// </summary>
+    [JsonProperty("bundle_sid")]
+    public string BundleSid { get; private set; }
+    /// <summary>
+    /// The status
+    /// </summary>
+    [JsonProperty("status")]
+    public string Status { get; private set; }
+
+    private MobileResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/TollFreeOptions.cs b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/TollFreeOptions.cs
index 226e8dd12..c093015e3 100644
--- a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/TollFreeOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/TollFreeOptions.cs
@@ -9,303 +9,303 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.IncomingPhoneNumber
-{
-
+{
+
+  /// <summary>
+  /// ReadTollFreeOptions
+  /// </summary>
+  public class ReadTollFreeOptions : ReadOptions<TollFreeResource>
+  {
     /// <summary>
-    /// ReadTollFreeOptions
-    /// </summary>
-    public class ReadTollFreeOptions : ReadOptions<TollFreeResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Whether to include new phone numbers
-        /// </summary>
-        public bool? Beta { get; set; }
-        /// <summary>
-        /// A string that identifies the resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The phone numbers of the resources to read
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; set; }
-        /// <summary>
-        /// Include phone numbers based on their origin. By default, phone numbers of all origin are included.
-        /// </summary>
-        public string Origin { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Beta != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (Origin != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Origin", Origin));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// CreateTollFreeOptions
-    /// </summary>
-    public class CreateTollFreeOptions : IOptions<TollFreeResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The phone number to purchase in E.164 format
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; }
-        /// <summary>
-        /// The API version to use for incoming calls made to the new phone number
-        /// </summary>
-        public string ApiVersion { get; set; }
-        /// <summary>
-        /// A string to describe the new phone number
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The SID of the application to handle SMS messages
-        /// </summary>
-        public string SmsApplicationSid { get; set; }
-        /// <summary>
-        /// HTTP method used with sms_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we call when an error occurs while executing TwiML
-        /// </summary>
-        public Uri SmsFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with sms_url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when the new phone number receives an incoming SMS message
-        /// </summary>
-        public Uri SmsUrl { get; set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The SID of the application to handle the new phone number
-        /// </summary>
-        public string VoiceApplicationSid { get; set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        public bool? VoiceCallerIdLookup { get; set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we will call when an error occurs in TwiML
-        /// </summary>
-        public Uri VoiceFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method used with the voice_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when the phone number receives a call
-        /// </summary>
-        public Uri VoiceUrl { get; set; }
-        /// <summary>
-        /// The SID of the Identity resource to associate with the new phone number
-        /// </summary>
-        public string IdentitySid { get; set; }
-        /// <summary>
-        /// The SID of the Address resource associated with the phone number
-        /// </summary>
-        public string AddressSid { get; set; }
-        /// <summary>
-        /// Displays if emergency calling is enabled for this number.
-        /// </summary>
-        public TollFreeResource.EmergencyStatusEnum EmergencyStatus { get; set; }
-        /// <summary>
-        /// The emergency address configuration to use for emergency calling
-        /// </summary>
-        public string EmergencyAddressSid { get; set; }
-        /// <summary>
-        /// SID of the trunk to handle calls to the new phone number
-        /// </summary>
-        public string TrunkSid { get; set; }
-        /// <summary>
-        /// Incoming call type: fax or voice
-        /// </summary>
-        public TollFreeResource.VoiceReceiveModeEnum VoiceReceiveMode { get; set; }
-        /// <summary>
-        /// The SID of the Bundle resource associated with number
-        /// </summary>
-        public string BundleSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateTollFreeOptions
-        /// </summary>
-        /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
-        public CreateTollFreeOptions(Types.PhoneNumber phoneNumber)
-        {
-            PhoneNumber = phoneNumber;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (ApiVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (SmsApplicationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsApplicationSid", SmsApplicationSid.ToString()));
-            }
-
-            if (SmsFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
-            }
-
-            if (SmsFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
-            }
-
-            if (SmsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
-            }
-
-            if (SmsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (VoiceApplicationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceApplicationSid", VoiceApplicationSid.ToString()));
-            }
-
-            if (VoiceCallerIdLookup != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
-            }
-
-            if (VoiceFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
-            }
-
-            if (VoiceFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
-            }
-
-            if (VoiceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
-            }
-
-            if (VoiceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
-            }
-
-            if (IdentitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IdentitySid", IdentitySid.ToString()));
-            }
-
-            if (AddressSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
-            }
-
-            if (EmergencyStatus != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyStatus", EmergencyStatus.ToString()));
-            }
-
-            if (EmergencyAddressSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyAddressSid", EmergencyAddressSid.ToString()));
-            }
-
-            if (TrunkSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TrunkSid", TrunkSid.ToString()));
-            }
-
-            if (VoiceReceiveMode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceReceiveMode", VoiceReceiveMode.ToString()));
-            }
-
-            if (BundleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BundleSid", BundleSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Whether to include new phone numbers
+    /// </summary>
+    public bool? Beta { get; set; }
+    /// <summary>
+    /// A string that identifies the resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The phone numbers of the resources to read
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; set; }
+    /// <summary>
+    /// Include phone numbers based on their origin. By default, phone numbers of all origin are included.
+    /// </summary>
+    public string Origin { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Beta != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (Origin != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Origin", Origin));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateTollFreeOptions
+  /// </summary>
+  public class CreateTollFreeOptions : IOptions<TollFreeResource>
+  {
+    /// <summary>
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The phone number to purchase in E.164 format
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; }
+    /// <summary>
+    /// The API version to use for incoming calls made to the new phone number
+    /// </summary>
+    public string ApiVersion { get; set; }
+    /// <summary>
+    /// A string to describe the new phone number
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The SID of the application to handle SMS messages
+    /// </summary>
+    public string SmsApplicationSid { get; set; }
+    /// <summary>
+    /// HTTP method used with sms_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we call when an error occurs while executing TwiML
+    /// </summary>
+    public Uri SmsFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with sms_url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when the new phone number receives an incoming SMS message
+    /// </summary>
+    public Uri SmsUrl { get; set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The SID of the application to handle the new phone number
+    /// </summary>
+    public string VoiceApplicationSid { get; set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    public bool? VoiceCallerIdLookup { get; set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we will call when an error occurs in TwiML
+    /// </summary>
+    public Uri VoiceFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method used with the voice_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when the phone number receives a call
+    /// </summary>
+    public Uri VoiceUrl { get; set; }
+    /// <summary>
+    /// The SID of the Identity resource to associate with the new phone number
+    /// </summary>
+    public string IdentitySid { get; set; }
+    /// <summary>
+    /// The SID of the Address resource associated with the phone number
+    /// </summary>
+    public string AddressSid { get; set; }
+    /// <summary>
+    /// Displays if emergency calling is enabled for this number.
+    /// </summary>
+    public TollFreeResource.EmergencyStatusEnum EmergencyStatus { get; set; }
+    /// <summary>
+    /// The emergency address configuration to use for emergency calling
+    /// </summary>
+    public string EmergencyAddressSid { get; set; }
+    /// <summary>
+    /// SID of the trunk to handle calls to the new phone number
+    /// </summary>
+    public string TrunkSid { get; set; }
+    /// <summary>
+    /// Incoming call type: fax or voice
+    /// </summary>
+    public TollFreeResource.VoiceReceiveModeEnum VoiceReceiveMode { get; set; }
+    /// <summary>
+    /// The SID of the Bundle resource associated with number
+    /// </summary>
+    public string BundleSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateTollFreeOptions
+    /// </summary>
+    /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
+    public CreateTollFreeOptions(Types.PhoneNumber phoneNumber)
+    {
+      PhoneNumber = phoneNumber;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (ApiVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (SmsApplicationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsApplicationSid", SmsApplicationSid.ToString()));
+      }
+
+      if (SmsFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
+      }
+
+      if (SmsFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
+      }
+
+      if (SmsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
+      }
+
+      if (SmsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (VoiceApplicationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceApplicationSid", VoiceApplicationSid.ToString()));
+      }
+
+      if (VoiceCallerIdLookup != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
+      }
+
+      if (VoiceFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
+      }
+
+      if (VoiceFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
+      }
+
+      if (VoiceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
+      }
+
+      if (VoiceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
+      }
+
+      if (IdentitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IdentitySid", IdentitySid.ToString()));
+      }
+
+      if (AddressSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
+      }
+
+      if (EmergencyStatus != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyStatus", EmergencyStatus.ToString()));
+      }
+
+      if (EmergencyAddressSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyAddressSid", EmergencyAddressSid.ToString()));
+      }
+
+      if (TrunkSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TrunkSid", TrunkSid.ToString()));
+      }
+
+      if (VoiceReceiveMode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceReceiveMode", VoiceReceiveMode.ToString()));
+      }
+
+      if (BundleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BundleSid", BundleSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/TollFreeResource.cs b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/TollFreeResource.cs
index c08d4cda7..3914804ae 100644
--- a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/TollFreeResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumber/TollFreeResource.cs
@@ -17,582 +17,582 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.IncomingPhoneNumber
-{
-
-    public class TollFreeResource : Resource
-    {
-        public sealed class AddressRequirementEnum : StringEnum
-        {
-            private AddressRequirementEnum(string value) : base(value) {}
-            public AddressRequirementEnum() {}
-            public static implicit operator AddressRequirementEnum(string value)
-            {
-                return new AddressRequirementEnum(value);
-            }
-
-            public static readonly AddressRequirementEnum None = new AddressRequirementEnum("none");
-            public static readonly AddressRequirementEnum Any = new AddressRequirementEnum("any");
-            public static readonly AddressRequirementEnum Local = new AddressRequirementEnum("local");
-            public static readonly AddressRequirementEnum Foreign = new AddressRequirementEnum("foreign");
-        }
-
-        public sealed class EmergencyStatusEnum : StringEnum
-        {
-            private EmergencyStatusEnum(string value) : base(value) {}
-            public EmergencyStatusEnum() {}
-            public static implicit operator EmergencyStatusEnum(string value)
-            {
-                return new EmergencyStatusEnum(value);
-            }
-
-            public static readonly EmergencyStatusEnum Active = new EmergencyStatusEnum("Active");
-            public static readonly EmergencyStatusEnum Inactive = new EmergencyStatusEnum("Inactive");
-        }
-
-        public sealed class EmergencyAddressStatusEnum : StringEnum
-        {
-            private EmergencyAddressStatusEnum(string value) : base(value) {}
-            public EmergencyAddressStatusEnum() {}
-            public static implicit operator EmergencyAddressStatusEnum(string value)
-            {
-                return new EmergencyAddressStatusEnum(value);
-            }
-
-            public static readonly EmergencyAddressStatusEnum Registered = new EmergencyAddressStatusEnum("registered");
-            public static readonly EmergencyAddressStatusEnum Unregistered = new EmergencyAddressStatusEnum("unregistered");
-            public static readonly EmergencyAddressStatusEnum PendingRegistration = new EmergencyAddressStatusEnum("pending-registration");
-            public static readonly EmergencyAddressStatusEnum RegistrationFailure = new EmergencyAddressStatusEnum("registration-failure");
-            public static readonly EmergencyAddressStatusEnum PendingUnregistration = new EmergencyAddressStatusEnum("pending-unregistration");
-            public static readonly EmergencyAddressStatusEnum UnregistrationFailure = new EmergencyAddressStatusEnum("unregistration-failure");
-        }
-
-        public sealed class VoiceReceiveModeEnum : StringEnum
-        {
-            private VoiceReceiveModeEnum(string value) : base(value) {}
-            public VoiceReceiveModeEnum() {}
-            public static implicit operator VoiceReceiveModeEnum(string value)
-            {
-                return new VoiceReceiveModeEnum(value);
-            }
-
-            public static readonly VoiceReceiveModeEnum Voice = new VoiceReceiveModeEnum("voice");
-            public static readonly VoiceReceiveModeEnum Fax = new VoiceReceiveModeEnum("fax");
-        }
-
-        private static Request BuildReadRequest(ReadTollFreeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/TollFree.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read TollFree parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TollFree </returns>
-        public static ResourceSet<TollFreeResource> Read(ReadTollFreeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TollFreeResource>.FromJson("incoming_phone_numbers", response.Content);
-            return new ResourceSet<TollFreeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read TollFree parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TollFree </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TollFreeResource>> ReadAsync(ReadTollFreeOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TollFreeResource>.FromJson("incoming_phone_numbers", response.Content);
-            return new ResourceSet<TollFreeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="beta"> Whether to include new phone numbers </param>
-        /// <param name="friendlyName"> A string that identifies the resources to read </param>
-        /// <param name="phoneNumber"> The phone numbers of the resources to read </param>
-        /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
-        ///              included. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TollFree </returns>
-        public static ResourceSet<TollFreeResource> Read(string pathAccountSid = null,
-                                                         bool? beta = null,
-                                                         string friendlyName = null,
-                                                         Types.PhoneNumber phoneNumber = null,
-                                                         string origin = null,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadTollFreeOptions(){PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="beta"> Whether to include new phone numbers </param>
-        /// <param name="friendlyName"> A string that identifies the resources to read </param>
-        /// <param name="phoneNumber"> The phone numbers of the resources to read </param>
-        /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
-        ///              included. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TollFree </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TollFreeResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                 bool? beta = null,
-                                                                                                 string friendlyName = null,
-                                                                                                 Types.PhoneNumber phoneNumber = null,
-                                                                                                 string origin = null,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadTollFreeOptions(){PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TollFreeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TollFreeResource>.FromJson("incoming_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TollFreeResource> NextPage(Page<TollFreeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<TollFreeResource>.FromJson("incoming_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TollFreeResource> PreviousPage(Page<TollFreeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<TollFreeResource>.FromJson("incoming_phone_numbers", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateTollFreeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/TollFree.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create TollFree parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TollFree </returns>
-        public static TollFreeResource Create(CreateTollFreeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create TollFree parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TollFree </returns>
-        public static async System.Threading.Tasks.Task<TollFreeResource> CreateAsync(CreateTollFreeOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
-        /// <param name="friendlyName"> A string to describe the new phone number </param>
-        /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
-        /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
-        /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
-        /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
-        /// <param name="statusCallback"> The URL to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
-        /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
-        /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
-        /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
-        /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
-        /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
-        /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
-        /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
-        /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
-        /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TollFree </returns>
-        public static TollFreeResource Create(Types.PhoneNumber phoneNumber,
-                                              string pathAccountSid = null,
-                                              string apiVersion = null,
-                                              string friendlyName = null,
-                                              string smsApplicationSid = null,
-                                              Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                              Uri smsFallbackUrl = null,
-                                              Twilio.Http.HttpMethod smsMethod = null,
-                                              Uri smsUrl = null,
-                                              Uri statusCallback = null,
-                                              Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                              string voiceApplicationSid = null,
-                                              bool? voiceCallerIdLookup = null,
-                                              Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                              Uri voiceFallbackUrl = null,
-                                              Twilio.Http.HttpMethod voiceMethod = null,
-                                              Uri voiceUrl = null,
-                                              string identitySid = null,
-                                              string addressSid = null,
-                                              TollFreeResource.EmergencyStatusEnum emergencyStatus = null,
-                                              string emergencyAddressSid = null,
-                                              string trunkSid = null,
-                                              TollFreeResource.VoiceReceiveModeEnum voiceReceiveMode = null,
-                                              string bundleSid = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateTollFreeOptions(phoneNumber){PathAccountSid = pathAccountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, IdentitySid = identitySid, AddressSid = addressSid, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
-        /// <param name="friendlyName"> A string to describe the new phone number </param>
-        /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
-        /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
-        /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
-        /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
-        /// <param name="statusCallback"> The URL to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
-        /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
-        /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
-        /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
-        /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
-        /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
-        /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
-        /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
-        /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
-        /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TollFree </returns>
-        public static async System.Threading.Tasks.Task<TollFreeResource> CreateAsync(Types.PhoneNumber phoneNumber,
-                                                                                      string pathAccountSid = null,
-                                                                                      string apiVersion = null,
-                                                                                      string friendlyName = null,
-                                                                                      string smsApplicationSid = null,
-                                                                                      Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                                                      Uri smsFallbackUrl = null,
-                                                                                      Twilio.Http.HttpMethod smsMethod = null,
-                                                                                      Uri smsUrl = null,
-                                                                                      Uri statusCallback = null,
-                                                                                      Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                      string voiceApplicationSid = null,
-                                                                                      bool? voiceCallerIdLookup = null,
-                                                                                      Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                                                      Uri voiceFallbackUrl = null,
-                                                                                      Twilio.Http.HttpMethod voiceMethod = null,
-                                                                                      Uri voiceUrl = null,
-                                                                                      string identitySid = null,
-                                                                                      string addressSid = null,
-                                                                                      TollFreeResource.EmergencyStatusEnum emergencyStatus = null,
-                                                                                      string emergencyAddressSid = null,
-                                                                                      string trunkSid = null,
-                                                                                      TollFreeResource.VoiceReceiveModeEnum voiceReceiveMode = null,
-                                                                                      string bundleSid = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateTollFreeOptions(phoneNumber){PathAccountSid = pathAccountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, IdentitySid = identitySid, AddressSid = addressSid, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TollFreeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TollFreeResource object represented by the provided JSON </returns>
-        public static TollFreeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TollFreeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Address resource associated with the phone number
-        /// </summary>
-        [JsonProperty("address_sid")]
-        public string AddressSid { get; private set; }
-        /// <summary>
-        /// Whether the phone number requires an Address registered with Twilio.
-        /// </summary>
-        [JsonProperty("address_requirements")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TollFreeResource.AddressRequirementEnum AddressRequirements { get; private set; }
-        /// <summary>
-        /// The API version used to start a new TwiML session
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Whether the phone number is new to the Twilio platform
-        /// </summary>
-        [JsonProperty("beta")]
-        public bool? Beta { get; private set; }
-        /// <summary>
-        /// Indicate if a phone can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The SID of the Identity resource associated with number
-        /// </summary>
-        [JsonProperty("identity_sid")]
-        public string IdentitySid { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The phone number's origin. Can be twilio or hosted.
-        /// </summary>
-        [JsonProperty("origin")]
-        public string Origin { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the application that handles SMS messages sent to the phone number
-        /// </summary>
-        [JsonProperty("sms_application_sid")]
-        public string SmsApplicationSid { get; private set; }
-        /// <summary>
-        /// The HTTP method used with sms_fallback_url
-        /// </summary>
-        [JsonProperty("sms_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL that we call when an error occurs while retrieving or executing the TwiML
-        /// </summary>
-        [JsonProperty("sms_fallback_url")]
-        public Uri SmsFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method to use with sms_url
-        /// </summary>
-        [JsonProperty("sms_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when the phone number receives an incoming SMS message
-        /// </summary>
-        [JsonProperty("sms_url")]
-        public Uri SmsUrl { get; private set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call status_callback
-        /// </summary>
-        [JsonProperty("status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// The SID of the Trunk that handles calls to the phone number
-        /// </summary>
-        [JsonProperty("trunk_sid")]
-        public string TrunkSid { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The voice_receive_mode
-        /// </summary>
-        [JsonProperty("voice_receive_mode")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TollFreeResource.VoiceReceiveModeEnum VoiceReceiveMode { get; private set; }
-        /// <summary>
-        /// The SID of the application that handles calls to the phone number
-        /// </summary>
-        [JsonProperty("voice_application_sid")]
-        public string VoiceApplicationSid { get; private set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        [JsonProperty("voice_caller_id_lookup")]
-        public bool? VoiceCallerIdLookup { get; private set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        [JsonProperty("voice_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when an error occurs in TwiML
-        /// </summary>
-        [JsonProperty("voice_fallback_url")]
-        public Uri VoiceFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method used with the voice_url
-        /// </summary>
-        [JsonProperty("voice_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when the phone number receives a call
-        /// </summary>
-        [JsonProperty("voice_url")]
-        public Uri VoiceUrl { get; private set; }
-        /// <summary>
-        /// Displays if emergency calling is enabled for this number.
-        /// </summary>
-        [JsonProperty("emergency_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TollFreeResource.EmergencyStatusEnum EmergencyStatus { get; private set; }
-        /// <summary>
-        /// The emergency address configuration to use for emergency calling
-        /// </summary>
-        [JsonProperty("emergency_address_sid")]
-        public string EmergencyAddressSid { get; private set; }
-        /// <summary>
-        /// State of the emergency address configuration for the phone number
-        /// </summary>
-        [JsonProperty("emergency_address_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TollFreeResource.EmergencyAddressStatusEnum EmergencyAddressStatus { get; private set; }
-        /// <summary>
-        /// The SID of the Bundle resource associated with number
-        /// </summary>
-        [JsonProperty("bundle_sid")]
-        public string BundleSid { get; private set; }
-        /// <summary>
-        /// The status
-        /// </summary>
-        [JsonProperty("status")]
-        public string Status { get; private set; }
-
-        private TollFreeResource()
-        {
-
-        }
-    }
+{
+
+  public class TollFreeResource : Resource
+  {
+    public sealed class AddressRequirementEnum : StringEnum
+    {
+      private AddressRequirementEnum(string value) : base(value) { }
+      public AddressRequirementEnum() { }
+      public static implicit operator AddressRequirementEnum(string value)
+      {
+        return new AddressRequirementEnum(value);
+      }
+
+      public static readonly AddressRequirementEnum None = new AddressRequirementEnum("none");
+      public static readonly AddressRequirementEnum Any = new AddressRequirementEnum("any");
+      public static readonly AddressRequirementEnum Local = new AddressRequirementEnum("local");
+      public static readonly AddressRequirementEnum Foreign = new AddressRequirementEnum("foreign");
+    }
+
+    public sealed class EmergencyStatusEnum : StringEnum
+    {
+      private EmergencyStatusEnum(string value) : base(value) { }
+      public EmergencyStatusEnum() { }
+      public static implicit operator EmergencyStatusEnum(string value)
+      {
+        return new EmergencyStatusEnum(value);
+      }
+
+      public static readonly EmergencyStatusEnum Active = new EmergencyStatusEnum("Active");
+      public static readonly EmergencyStatusEnum Inactive = new EmergencyStatusEnum("Inactive");
+    }
+
+    public sealed class EmergencyAddressStatusEnum : StringEnum
+    {
+      private EmergencyAddressStatusEnum(string value) : base(value) { }
+      public EmergencyAddressStatusEnum() { }
+      public static implicit operator EmergencyAddressStatusEnum(string value)
+      {
+        return new EmergencyAddressStatusEnum(value);
+      }
+
+      public static readonly EmergencyAddressStatusEnum Registered = new EmergencyAddressStatusEnum("registered");
+      public static readonly EmergencyAddressStatusEnum Unregistered = new EmergencyAddressStatusEnum("unregistered");
+      public static readonly EmergencyAddressStatusEnum PendingRegistration = new EmergencyAddressStatusEnum("pending-registration");
+      public static readonly EmergencyAddressStatusEnum RegistrationFailure = new EmergencyAddressStatusEnum("registration-failure");
+      public static readonly EmergencyAddressStatusEnum PendingUnregistration = new EmergencyAddressStatusEnum("pending-unregistration");
+      public static readonly EmergencyAddressStatusEnum UnregistrationFailure = new EmergencyAddressStatusEnum("unregistration-failure");
+    }
+
+    public sealed class VoiceReceiveModeEnum : StringEnum
+    {
+      private VoiceReceiveModeEnum(string value) : base(value) { }
+      public VoiceReceiveModeEnum() { }
+      public static implicit operator VoiceReceiveModeEnum(string value)
+      {
+        return new VoiceReceiveModeEnum(value);
+      }
+
+      public static readonly VoiceReceiveModeEnum Voice = new VoiceReceiveModeEnum("voice");
+      public static readonly VoiceReceiveModeEnum Fax = new VoiceReceiveModeEnum("fax");
+    }
+
+    private static Request BuildReadRequest(ReadTollFreeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/TollFree.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read TollFree parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TollFree </returns>
+    public static ResourceSet<TollFreeResource> Read(ReadTollFreeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TollFreeResource>.FromJson("incoming_phone_numbers", response.Content);
+      return new ResourceSet<TollFreeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read TollFree parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TollFree </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TollFreeResource>> ReadAsync(ReadTollFreeOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TollFreeResource>.FromJson("incoming_phone_numbers", response.Content);
+      return new ResourceSet<TollFreeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="beta"> Whether to include new phone numbers </param>
+    /// <param name="friendlyName"> A string that identifies the resources to read </param>
+    /// <param name="phoneNumber"> The phone numbers of the resources to read </param>
+    /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
+    ///              included. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TollFree </returns>
+    public static ResourceSet<TollFreeResource> Read(string pathAccountSid = null,
+                                                     bool? beta = null,
+                                                     string friendlyName = null,
+                                                     Types.PhoneNumber phoneNumber = null,
+                                                     string origin = null,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadTollFreeOptions() { PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="beta"> Whether to include new phone numbers </param>
+    /// <param name="friendlyName"> A string that identifies the resources to read </param>
+    /// <param name="phoneNumber"> The phone numbers of the resources to read </param>
+    /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
+    ///              included. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TollFree </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TollFreeResource>> ReadAsync(string pathAccountSid = null,
+                                                                                             bool? beta = null,
+                                                                                             string friendlyName = null,
+                                                                                             Types.PhoneNumber phoneNumber = null,
+                                                                                             string origin = null,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadTollFreeOptions() { PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TollFreeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TollFreeResource>.FromJson("incoming_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TollFreeResource> NextPage(Page<TollFreeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<TollFreeResource>.FromJson("incoming_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TollFreeResource> PreviousPage(Page<TollFreeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<TollFreeResource>.FromJson("incoming_phone_numbers", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateTollFreeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/TollFree.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create TollFree parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TollFree </returns>
+    public static TollFreeResource Create(CreateTollFreeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create TollFree parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TollFree </returns>
+    public static async System.Threading.Tasks.Task<TollFreeResource> CreateAsync(CreateTollFreeOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
+    /// <param name="friendlyName"> A string to describe the new phone number </param>
+    /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
+    /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
+    /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
+    /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
+    /// <param name="statusCallback"> The URL to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
+    /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
+    /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
+    /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
+    /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
+    /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
+    /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
+    /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
+    /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
+    /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TollFree </returns>
+    public static TollFreeResource Create(Types.PhoneNumber phoneNumber,
+                                          string pathAccountSid = null,
+                                          string apiVersion = null,
+                                          string friendlyName = null,
+                                          string smsApplicationSid = null,
+                                          Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                          Uri smsFallbackUrl = null,
+                                          Twilio.Http.HttpMethod smsMethod = null,
+                                          Uri smsUrl = null,
+                                          Uri statusCallback = null,
+                                          Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                          string voiceApplicationSid = null,
+                                          bool? voiceCallerIdLookup = null,
+                                          Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                          Uri voiceFallbackUrl = null,
+                                          Twilio.Http.HttpMethod voiceMethod = null,
+                                          Uri voiceUrl = null,
+                                          string identitySid = null,
+                                          string addressSid = null,
+                                          TollFreeResource.EmergencyStatusEnum emergencyStatus = null,
+                                          string emergencyAddressSid = null,
+                                          string trunkSid = null,
+                                          TollFreeResource.VoiceReceiveModeEnum voiceReceiveMode = null,
+                                          string bundleSid = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateTollFreeOptions(phoneNumber) { PathAccountSid = pathAccountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, IdentitySid = identitySid, AddressSid = addressSid, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
+    /// <param name="friendlyName"> A string to describe the new phone number </param>
+    /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
+    /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
+    /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
+    /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
+    /// <param name="statusCallback"> The URL to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
+    /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
+    /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
+    /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
+    /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
+    /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
+    /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
+    /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
+    /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
+    /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TollFree </returns>
+    public static async System.Threading.Tasks.Task<TollFreeResource> CreateAsync(Types.PhoneNumber phoneNumber,
+                                                                                  string pathAccountSid = null,
+                                                                                  string apiVersion = null,
+                                                                                  string friendlyName = null,
+                                                                                  string smsApplicationSid = null,
+                                                                                  Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                                                  Uri smsFallbackUrl = null,
+                                                                                  Twilio.Http.HttpMethod smsMethod = null,
+                                                                                  Uri smsUrl = null,
+                                                                                  Uri statusCallback = null,
+                                                                                  Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                  string voiceApplicationSid = null,
+                                                                                  bool? voiceCallerIdLookup = null,
+                                                                                  Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                                                  Uri voiceFallbackUrl = null,
+                                                                                  Twilio.Http.HttpMethod voiceMethod = null,
+                                                                                  Uri voiceUrl = null,
+                                                                                  string identitySid = null,
+                                                                                  string addressSid = null,
+                                                                                  TollFreeResource.EmergencyStatusEnum emergencyStatus = null,
+                                                                                  string emergencyAddressSid = null,
+                                                                                  string trunkSid = null,
+                                                                                  TollFreeResource.VoiceReceiveModeEnum voiceReceiveMode = null,
+                                                                                  string bundleSid = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateTollFreeOptions(phoneNumber) { PathAccountSid = pathAccountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, IdentitySid = identitySid, AddressSid = addressSid, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TollFreeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TollFreeResource object represented by the provided JSON </returns>
+    public static TollFreeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TollFreeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Address resource associated with the phone number
+    /// </summary>
+    [JsonProperty("address_sid")]
+    public string AddressSid { get; private set; }
+    /// <summary>
+    /// Whether the phone number requires an Address registered with Twilio.
+    /// </summary>
+    [JsonProperty("address_requirements")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TollFreeResource.AddressRequirementEnum AddressRequirements { get; private set; }
+    /// <summary>
+    /// The API version used to start a new TwiML session
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Whether the phone number is new to the Twilio platform
+    /// </summary>
+    [JsonProperty("beta")]
+    public bool? Beta { get; private set; }
+    /// <summary>
+    /// Indicate if a phone can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The SID of the Identity resource associated with number
+    /// </summary>
+    [JsonProperty("identity_sid")]
+    public string IdentitySid { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The phone number's origin. Can be twilio or hosted.
+    /// </summary>
+    [JsonProperty("origin")]
+    public string Origin { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the application that handles SMS messages sent to the phone number
+    /// </summary>
+    [JsonProperty("sms_application_sid")]
+    public string SmsApplicationSid { get; private set; }
+    /// <summary>
+    /// The HTTP method used with sms_fallback_url
+    /// </summary>
+    [JsonProperty("sms_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL that we call when an error occurs while retrieving or executing the TwiML
+    /// </summary>
+    [JsonProperty("sms_fallback_url")]
+    public Uri SmsFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method to use with sms_url
+    /// </summary>
+    [JsonProperty("sms_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when the phone number receives an incoming SMS message
+    /// </summary>
+    [JsonProperty("sms_url")]
+    public Uri SmsUrl { get; private set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call status_callback
+    /// </summary>
+    [JsonProperty("status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// The SID of the Trunk that handles calls to the phone number
+    /// </summary>
+    [JsonProperty("trunk_sid")]
+    public string TrunkSid { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The voice_receive_mode
+    /// </summary>
+    [JsonProperty("voice_receive_mode")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TollFreeResource.VoiceReceiveModeEnum VoiceReceiveMode { get; private set; }
+    /// <summary>
+    /// The SID of the application that handles calls to the phone number
+    /// </summary>
+    [JsonProperty("voice_application_sid")]
+    public string VoiceApplicationSid { get; private set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    [JsonProperty("voice_caller_id_lookup")]
+    public bool? VoiceCallerIdLookup { get; private set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    [JsonProperty("voice_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when an error occurs in TwiML
+    /// </summary>
+    [JsonProperty("voice_fallback_url")]
+    public Uri VoiceFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method used with the voice_url
+    /// </summary>
+    [JsonProperty("voice_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when the phone number receives a call
+    /// </summary>
+    [JsonProperty("voice_url")]
+    public Uri VoiceUrl { get; private set; }
+    /// <summary>
+    /// Displays if emergency calling is enabled for this number.
+    /// </summary>
+    [JsonProperty("emergency_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TollFreeResource.EmergencyStatusEnum EmergencyStatus { get; private set; }
+    /// <summary>
+    /// The emergency address configuration to use for emergency calling
+    /// </summary>
+    [JsonProperty("emergency_address_sid")]
+    public string EmergencyAddressSid { get; private set; }
+    /// <summary>
+    /// State of the emergency address configuration for the phone number
+    /// </summary>
+    [JsonProperty("emergency_address_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TollFreeResource.EmergencyAddressStatusEnum EmergencyAddressStatus { get; private set; }
+    /// <summary>
+    /// The SID of the Bundle resource associated with number
+    /// </summary>
+    [JsonProperty("bundle_sid")]
+    public string BundleSid { get; private set; }
+    /// <summary>
+    /// The status
+    /// </summary>
+    [JsonProperty("status")]
+    public string Status { get; private set; }
+
+    private TollFreeResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumberOptions.cs b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumberOptions.cs
index 9c8bf2874..43c23bfc1 100644
--- a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumberOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumberOptions.cs
@@ -9,609 +9,609 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Update an incoming-phone-number instance.
+  /// </summary>
+  public class UpdateIncomingPhoneNumberOptions : IOptions<IncomingPhoneNumberResource>
+  {
     /// <summary>
-    /// Update an incoming-phone-number instance.
-    /// </summary>
-    public class UpdateIncomingPhoneNumberOptions : IOptions<IncomingPhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The SID of the Account that created the resource to update
-        /// </summary>
-        public string AccountSid { get; set; }
-        /// <summary>
-        /// The API version to use for incoming calls made to the phone number
-        /// </summary>
-        public string ApiVersion { get; set; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Unique string that identifies the application
-        /// </summary>
-        public string SmsApplicationSid { get; set; }
-        /// <summary>
-        /// HTTP method used with sms_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we call when an error occurs while executing TwiML
-        /// </summary>
-        public Uri SmsFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with sms_url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when the phone number receives an incoming SMS message
-        /// </summary>
-        public Uri SmsUrl { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The SID of the application to handle the phone number
-        /// </summary>
-        public string VoiceApplicationSid { get; set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        public bool? VoiceCallerIdLookup { get; set; }
-        /// <summary>
-        /// The HTTP method used with fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we will call when an error occurs in TwiML
-        /// </summary>
-        public Uri VoiceFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method used with the voice_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when the phone number receives a call
-        /// </summary>
-        public Uri VoiceUrl { get; set; }
-        /// <summary>
-        /// Displays if emergency calling is enabled for this number.
-        /// </summary>
-        public IncomingPhoneNumberResource.EmergencyStatusEnum EmergencyStatus { get; set; }
-        /// <summary>
-        /// The emergency address configuration to use for emergency calling
-        /// </summary>
-        public string EmergencyAddressSid { get; set; }
-        /// <summary>
-        /// SID of the trunk to handle phone calls to the phone number
-        /// </summary>
-        public string TrunkSid { get; set; }
-        /// <summary>
-        /// Incoming call type: fax or voice
-        /// </summary>
-        public IncomingPhoneNumberResource.VoiceReceiveModeEnum VoiceReceiveMode { get; set; }
-        /// <summary>
-        /// Unique string that identifies the identity associated with number
-        /// </summary>
-        public string IdentitySid { get; set; }
-        /// <summary>
-        /// The SID of the Address resource associated with the phone number
-        /// </summary>
-        public string AddressSid { get; set; }
-        /// <summary>
-        /// The SID of the Bundle resource associated with number
-        /// </summary>
-        public string BundleSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateIncomingPhoneNumberOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateIncomingPhoneNumberOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AccountSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AccountSid", AccountSid.ToString()));
-            }
-
-            if (ApiVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (SmsApplicationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsApplicationSid", SmsApplicationSid.ToString()));
-            }
-
-            if (SmsFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
-            }
-
-            if (SmsFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
-            }
-
-            if (SmsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
-            }
-
-            if (SmsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (VoiceApplicationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceApplicationSid", VoiceApplicationSid.ToString()));
-            }
-
-            if (VoiceCallerIdLookup != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
-            }
-
-            if (VoiceFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
-            }
-
-            if (VoiceFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
-            }
-
-            if (VoiceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
-            }
-
-            if (VoiceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
-            }
-
-            if (EmergencyStatus != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyStatus", EmergencyStatus.ToString()));
-            }
-
-            if (EmergencyAddressSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyAddressSid", EmergencyAddressSid.ToString()));
-            }
-
-            if (TrunkSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TrunkSid", TrunkSid.ToString()));
-            }
-
-            if (VoiceReceiveMode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceReceiveMode", VoiceReceiveMode.ToString()));
-            }
-
-            if (IdentitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IdentitySid", IdentitySid.ToString()));
-            }
-
-            if (AddressSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
-            }
-
-            if (BundleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BundleSid", BundleSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resource to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Fetch an incoming-phone-number belonging to the account used to make the request.
-    /// </summary>
-    public class FetchIncomingPhoneNumberOptions : IOptions<IncomingPhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchIncomingPhoneNumberOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchIncomingPhoneNumberOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
     /// <summary>
-    /// Delete a phone-numbers belonging to the account used to make the request.
-    /// </summary>
-    public class DeleteIncomingPhoneNumberOptions : IOptions<IncomingPhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteIncomingPhoneNumberOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteIncomingPhoneNumberOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resource to update
+    /// </summary>
+    public string AccountSid { get; set; }
     /// <summary>
-    /// Retrieve a list of incoming-phone-numbers belonging to the account used to make the request.
-    /// </summary>
-    public class ReadIncomingPhoneNumberOptions : ReadOptions<IncomingPhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Whether to include new phone numbers
-        /// </summary>
-        public bool? Beta { get; set; }
-        /// <summary>
-        /// A string that identifies the IncomingPhoneNumber resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The phone numbers of the IncomingPhoneNumber resources to read
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; set; }
-        /// <summary>
-        /// Include phone numbers based on their origin. By default, phone numbers of all origin are included.
-        /// </summary>
-        public string Origin { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Beta != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (Origin != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Origin", Origin));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The API version to use for incoming calls made to the phone number
+    /// </summary>
+    public string ApiVersion { get; set; }
     /// <summary>
-    /// Purchase a phone-number for the account.
-    /// </summary>
-    public class CreateIncomingPhoneNumberOptions : IOptions<IncomingPhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The phone number to purchase in E.164 format
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; set; }
-        /// <summary>
-        /// The desired area code for the new phone number
-        /// </summary>
-        public string AreaCode { get; set; }
-        /// <summary>
-        /// The API version to use for incoming calls made to the new phone number
-        /// </summary>
-        public string ApiVersion { get; set; }
-        /// <summary>
-        /// A string to describe the new phone number
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The SID of the application to handle SMS messages
-        /// </summary>
-        public string SmsApplicationSid { get; set; }
-        /// <summary>
-        /// HTTP method used with sms_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we call when an error occurs while executing TwiML
-        /// </summary>
-        public Uri SmsFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with sms url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when the new phone number receives an incoming SMS message
-        /// </summary>
-        public Uri SmsUrl { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// HTTP method we should use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The SID of the application to handle the new phone number
-        /// </summary>
-        public string VoiceApplicationSid { get; set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        public bool? VoiceCallerIdLookup { get; set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we will call when an error occurs in TwiML
-        /// </summary>
-        public Uri VoiceFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method used with the voice_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when the phone number receives a call
-        /// </summary>
-        public Uri VoiceUrl { get; set; }
-        /// <summary>
-        /// Displays if emergency calling is enabled for this number.
-        /// </summary>
-        public IncomingPhoneNumberResource.EmergencyStatusEnum EmergencyStatus { get; set; }
-        /// <summary>
-        /// The emergency address configuration to use for emergency calling
-        /// </summary>
-        public string EmergencyAddressSid { get; set; }
-        /// <summary>
-        /// SID of the trunk to handle calls to the new phone number
-        /// </summary>
-        public string TrunkSid { get; set; }
-        /// <summary>
-        /// The SID of the Identity resource to associate with the new phone number
-        /// </summary>
-        public string IdentitySid { get; set; }
-        /// <summary>
-        /// The SID of the Address resource associated with the phone number
-        /// </summary>
-        public string AddressSid { get; set; }
-        /// <summary>
-        /// Incoming call type: fax or voice
-        /// </summary>
-        public IncomingPhoneNumberResource.VoiceReceiveModeEnum VoiceReceiveMode { get; set; }
-        /// <summary>
-        /// The SID of the Bundle resource associated with number
-        /// </summary>
-        public string BundleSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (AreaCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode));
-            }
-
-            if (ApiVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (SmsApplicationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsApplicationSid", SmsApplicationSid.ToString()));
-            }
-
-            if (SmsFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
-            }
-
-            if (SmsFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
-            }
-
-            if (SmsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
-            }
-
-            if (SmsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (VoiceApplicationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceApplicationSid", VoiceApplicationSid.ToString()));
-            }
-
-            if (VoiceCallerIdLookup != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
-            }
-
-            if (VoiceFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
-            }
-
-            if (VoiceFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
-            }
-
-            if (VoiceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
-            }
-
-            if (VoiceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
-            }
-
-            if (EmergencyStatus != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyStatus", EmergencyStatus.ToString()));
-            }
-
-            if (EmergencyAddressSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyAddressSid", EmergencyAddressSid.ToString()));
-            }
-
-            if (TrunkSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TrunkSid", TrunkSid.ToString()));
-            }
-
-            if (IdentitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IdentitySid", IdentitySid.ToString()));
-            }
-
-            if (AddressSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
-            }
-
-            if (VoiceReceiveMode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceReceiveMode", VoiceReceiveMode.ToString()));
-            }
-
-            if (BundleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BundleSid", BundleSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Unique string that identifies the application
+    /// </summary>
+    public string SmsApplicationSid { get; set; }
+    /// <summary>
+    /// HTTP method used with sms_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we call when an error occurs while executing TwiML
+    /// </summary>
+    public Uri SmsFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with sms_url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when the phone number receives an incoming SMS message
+    /// </summary>
+    public Uri SmsUrl { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The SID of the application to handle the phone number
+    /// </summary>
+    public string VoiceApplicationSid { get; set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    public bool? VoiceCallerIdLookup { get; set; }
+    /// <summary>
+    /// The HTTP method used with fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we will call when an error occurs in TwiML
+    /// </summary>
+    public Uri VoiceFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method used with the voice_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when the phone number receives a call
+    /// </summary>
+    public Uri VoiceUrl { get; set; }
+    /// <summary>
+    /// Displays if emergency calling is enabled for this number.
+    /// </summary>
+    public IncomingPhoneNumberResource.EmergencyStatusEnum EmergencyStatus { get; set; }
+    /// <summary>
+    /// The emergency address configuration to use for emergency calling
+    /// </summary>
+    public string EmergencyAddressSid { get; set; }
+    /// <summary>
+    /// SID of the trunk to handle phone calls to the phone number
+    /// </summary>
+    public string TrunkSid { get; set; }
+    /// <summary>
+    /// Incoming call type: fax or voice
+    /// </summary>
+    public IncomingPhoneNumberResource.VoiceReceiveModeEnum VoiceReceiveMode { get; set; }
+    /// <summary>
+    /// Unique string that identifies the identity associated with number
+    /// </summary>
+    public string IdentitySid { get; set; }
+    /// <summary>
+    /// The SID of the Address resource associated with the phone number
+    /// </summary>
+    public string AddressSid { get; set; }
+    /// <summary>
+    /// The SID of the Bundle resource associated with number
+    /// </summary>
+    public string BundleSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateIncomingPhoneNumberOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateIncomingPhoneNumberOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AccountSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AccountSid", AccountSid.ToString()));
+      }
+
+      if (ApiVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (SmsApplicationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsApplicationSid", SmsApplicationSid.ToString()));
+      }
+
+      if (SmsFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
+      }
+
+      if (SmsFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
+      }
+
+      if (SmsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
+      }
+
+      if (SmsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (VoiceApplicationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceApplicationSid", VoiceApplicationSid.ToString()));
+      }
+
+      if (VoiceCallerIdLookup != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
+      }
+
+      if (VoiceFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
+      }
+
+      if (VoiceFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
+      }
+
+      if (VoiceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
+      }
+
+      if (VoiceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
+      }
+
+      if (EmergencyStatus != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyStatus", EmergencyStatus.ToString()));
+      }
+
+      if (EmergencyAddressSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyAddressSid", EmergencyAddressSid.ToString()));
+      }
+
+      if (TrunkSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TrunkSid", TrunkSid.ToString()));
+      }
+
+      if (VoiceReceiveMode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceReceiveMode", VoiceReceiveMode.ToString()));
+      }
+
+      if (IdentitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IdentitySid", IdentitySid.ToString()));
+      }
+
+      if (AddressSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
+      }
+
+      if (BundleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BundleSid", BundleSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch an incoming-phone-number belonging to the account used to make the request.
+  /// </summary>
+  public class FetchIncomingPhoneNumberOptions : IOptions<IncomingPhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchIncomingPhoneNumberOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchIncomingPhoneNumberOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a phone-numbers belonging to the account used to make the request.
+  /// </summary>
+  public class DeleteIncomingPhoneNumberOptions : IOptions<IncomingPhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteIncomingPhoneNumberOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteIncomingPhoneNumberOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of incoming-phone-numbers belonging to the account used to make the request.
+  /// </summary>
+  public class ReadIncomingPhoneNumberOptions : ReadOptions<IncomingPhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// Whether to include new phone numbers
+    /// </summary>
+    public bool? Beta { get; set; }
+    /// <summary>
+    /// A string that identifies the IncomingPhoneNumber resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The phone numbers of the IncomingPhoneNumber resources to read
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; set; }
+    /// <summary>
+    /// Include phone numbers based on their origin. By default, phone numbers of all origin are included.
+    /// </summary>
+    public string Origin { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Beta != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beta", Beta.Value.ToString().ToLower()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (Origin != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Origin", Origin));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Purchase a phone-number for the account.
+  /// </summary>
+  public class CreateIncomingPhoneNumberOptions : IOptions<IncomingPhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The phone number to purchase in E.164 format
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; set; }
+    /// <summary>
+    /// The desired area code for the new phone number
+    /// </summary>
+    public string AreaCode { get; set; }
+    /// <summary>
+    /// The API version to use for incoming calls made to the new phone number
+    /// </summary>
+    public string ApiVersion { get; set; }
+    /// <summary>
+    /// A string to describe the new phone number
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The SID of the application to handle SMS messages
+    /// </summary>
+    public string SmsApplicationSid { get; set; }
+    /// <summary>
+    /// HTTP method used with sms_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we call when an error occurs while executing TwiML
+    /// </summary>
+    public Uri SmsFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with sms url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when the new phone number receives an incoming SMS message
+    /// </summary>
+    public Uri SmsUrl { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// HTTP method we should use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The SID of the application to handle the new phone number
+    /// </summary>
+    public string VoiceApplicationSid { get; set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    public bool? VoiceCallerIdLookup { get; set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we will call when an error occurs in TwiML
+    /// </summary>
+    public Uri VoiceFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method used with the voice_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when the phone number receives a call
+    /// </summary>
+    public Uri VoiceUrl { get; set; }
+    /// <summary>
+    /// Displays if emergency calling is enabled for this number.
+    /// </summary>
+    public IncomingPhoneNumberResource.EmergencyStatusEnum EmergencyStatus { get; set; }
+    /// <summary>
+    /// The emergency address configuration to use for emergency calling
+    /// </summary>
+    public string EmergencyAddressSid { get; set; }
+    /// <summary>
+    /// SID of the trunk to handle calls to the new phone number
+    /// </summary>
+    public string TrunkSid { get; set; }
+    /// <summary>
+    /// The SID of the Identity resource to associate with the new phone number
+    /// </summary>
+    public string IdentitySid { get; set; }
+    /// <summary>
+    /// The SID of the Address resource associated with the phone number
+    /// </summary>
+    public string AddressSid { get; set; }
+    /// <summary>
+    /// Incoming call type: fax or voice
+    /// </summary>
+    public IncomingPhoneNumberResource.VoiceReceiveModeEnum VoiceReceiveMode { get; set; }
+    /// <summary>
+    /// The SID of the Bundle resource associated with number
+    /// </summary>
+    public string BundleSid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (AreaCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AreaCode", AreaCode));
+      }
+
+      if (ApiVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (SmsApplicationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsApplicationSid", SmsApplicationSid.ToString()));
+      }
+
+      if (SmsFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
+      }
+
+      if (SmsFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
+      }
+
+      if (SmsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
+      }
+
+      if (SmsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (VoiceApplicationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceApplicationSid", VoiceApplicationSid.ToString()));
+      }
+
+      if (VoiceCallerIdLookup != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceCallerIdLookup", VoiceCallerIdLookup.Value.ToString().ToLower()));
+      }
+
+      if (VoiceFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
+      }
+
+      if (VoiceFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
+      }
+
+      if (VoiceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
+      }
+
+      if (VoiceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
+      }
+
+      if (EmergencyStatus != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyStatus", EmergencyStatus.ToString()));
+      }
+
+      if (EmergencyAddressSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyAddressSid", EmergencyAddressSid.ToString()));
+      }
+
+      if (TrunkSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TrunkSid", TrunkSid.ToString()));
+      }
+
+      if (IdentitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IdentitySid", IdentitySid.ToString()));
+      }
+
+      if (AddressSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
+      }
+
+      if (VoiceReceiveMode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceReceiveMode", VoiceReceiveMode.ToString()));
+      }
+
+      if (BundleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BundleSid", BundleSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumberResource.cs b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumberResource.cs
index 0eb22ecaf..bf9567b15 100644
--- a/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumberResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/IncomingPhoneNumberResource.cs
@@ -17,898 +17,898 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class IncomingPhoneNumberResource : Resource
-    {
-        public sealed class AddressRequirementEnum : StringEnum
-        {
-            private AddressRequirementEnum(string value) : base(value) {}
-            public AddressRequirementEnum() {}
-            public static implicit operator AddressRequirementEnum(string value)
-            {
-                return new AddressRequirementEnum(value);
-            }
-
-            public static readonly AddressRequirementEnum None = new AddressRequirementEnum("none");
-            public static readonly AddressRequirementEnum Any = new AddressRequirementEnum("any");
-            public static readonly AddressRequirementEnum Local = new AddressRequirementEnum("local");
-            public static readonly AddressRequirementEnum Foreign = new AddressRequirementEnum("foreign");
-        }
-
-        public sealed class EmergencyStatusEnum : StringEnum
-        {
-            private EmergencyStatusEnum(string value) : base(value) {}
-            public EmergencyStatusEnum() {}
-            public static implicit operator EmergencyStatusEnum(string value)
-            {
-                return new EmergencyStatusEnum(value);
-            }
-
-            public static readonly EmergencyStatusEnum Active = new EmergencyStatusEnum("Active");
-            public static readonly EmergencyStatusEnum Inactive = new EmergencyStatusEnum("Inactive");
-        }
-
-        public sealed class EmergencyAddressStatusEnum : StringEnum
-        {
-            private EmergencyAddressStatusEnum(string value) : base(value) {}
-            public EmergencyAddressStatusEnum() {}
-            public static implicit operator EmergencyAddressStatusEnum(string value)
-            {
-                return new EmergencyAddressStatusEnum(value);
-            }
-
-            public static readonly EmergencyAddressStatusEnum Registered = new EmergencyAddressStatusEnum("registered");
-            public static readonly EmergencyAddressStatusEnum Unregistered = new EmergencyAddressStatusEnum("unregistered");
-            public static readonly EmergencyAddressStatusEnum PendingRegistration = new EmergencyAddressStatusEnum("pending-registration");
-            public static readonly EmergencyAddressStatusEnum RegistrationFailure = new EmergencyAddressStatusEnum("registration-failure");
-            public static readonly EmergencyAddressStatusEnum PendingUnregistration = new EmergencyAddressStatusEnum("pending-unregistration");
-            public static readonly EmergencyAddressStatusEnum UnregistrationFailure = new EmergencyAddressStatusEnum("unregistration-failure");
-        }
-
-        public sealed class VoiceReceiveModeEnum : StringEnum
-        {
-            private VoiceReceiveModeEnum(string value) : base(value) {}
-            public VoiceReceiveModeEnum() {}
-            public static implicit operator VoiceReceiveModeEnum(string value)
-            {
-                return new VoiceReceiveModeEnum(value);
-            }
-
-            public static readonly VoiceReceiveModeEnum Voice = new VoiceReceiveModeEnum("voice");
-            public static readonly VoiceReceiveModeEnum Fax = new VoiceReceiveModeEnum("fax");
-        }
-
-        private static Request BuildUpdateRequest(UpdateIncomingPhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an incoming-phone-number instance.
-        /// </summary>
-        /// <param name="options"> Update IncomingPhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IncomingPhoneNumber </returns>
-        public static IncomingPhoneNumberResource Update(UpdateIncomingPhoneNumberOptions options,
-                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an incoming-phone-number instance.
-        /// </summary>
-        /// <param name="options"> Update IncomingPhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<IncomingPhoneNumberResource> UpdateAsync(UpdateIncomingPhoneNumberOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an incoming-phone-number instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
-        /// <param name="accountSid"> The SID of the Account that created the resource to update </param>
-        /// <param name="apiVersion"> The API version to use for incoming calls made to the phone number </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="smsApplicationSid"> Unique string that identifies the application </param>
-        /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
-        /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
-        /// <param name="smsUrl"> The URL we should call when the phone number receives an incoming SMS message </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="voiceApplicationSid"> The SID of the application to handle the phone number </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with fallback_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
-        /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
-        /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
-        /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
-        /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
-        /// <param name="trunkSid"> SID of the trunk to handle phone calls to the phone number </param>
-        /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
-        /// <param name="identitySid"> Unique string that identifies the identity associated with number </param>
-        /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
-        /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IncomingPhoneNumber </returns>
-        public static IncomingPhoneNumberResource Update(string pathSid,
-                                                         string pathAccountSid = null,
-                                                         string accountSid = null,
-                                                         string apiVersion = null,
-                                                         string friendlyName = null,
-                                                         string smsApplicationSid = null,
-                                                         Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                         Uri smsFallbackUrl = null,
-                                                         Twilio.Http.HttpMethod smsMethod = null,
-                                                         Uri smsUrl = null,
-                                                         Uri statusCallback = null,
-                                                         Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                         string voiceApplicationSid = null,
-                                                         bool? voiceCallerIdLookup = null,
-                                                         Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                         Uri voiceFallbackUrl = null,
-                                                         Twilio.Http.HttpMethod voiceMethod = null,
-                                                         Uri voiceUrl = null,
-                                                         IncomingPhoneNumberResource.EmergencyStatusEnum emergencyStatus = null,
-                                                         string emergencyAddressSid = null,
-                                                         string trunkSid = null,
-                                                         IncomingPhoneNumberResource.VoiceReceiveModeEnum voiceReceiveMode = null,
-                                                         string identitySid = null,
-                                                         string addressSid = null,
-                                                         string bundleSid = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateIncomingPhoneNumberOptions(pathSid){PathAccountSid = pathAccountSid, AccountSid = accountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, IdentitySid = identitySid, AddressSid = addressSid, BundleSid = bundleSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an incoming-phone-number instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
-        /// <param name="accountSid"> The SID of the Account that created the resource to update </param>
-        /// <param name="apiVersion"> The API version to use for incoming calls made to the phone number </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="smsApplicationSid"> Unique string that identifies the application </param>
-        /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
-        /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
-        /// <param name="smsUrl"> The URL we should call when the phone number receives an incoming SMS message </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="voiceApplicationSid"> The SID of the application to handle the phone number </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with fallback_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
-        /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
-        /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
-        /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
-        /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
-        /// <param name="trunkSid"> SID of the trunk to handle phone calls to the phone number </param>
-        /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
-        /// <param name="identitySid"> Unique string that identifies the identity associated with number </param>
-        /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
-        /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<IncomingPhoneNumberResource> UpdateAsync(string pathSid,
-                                                                                                 string pathAccountSid = null,
-                                                                                                 string accountSid = null,
-                                                                                                 string apiVersion = null,
-                                                                                                 string friendlyName = null,
-                                                                                                 string smsApplicationSid = null,
-                                                                                                 Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                                                                 Uri smsFallbackUrl = null,
-                                                                                                 Twilio.Http.HttpMethod smsMethod = null,
-                                                                                                 Uri smsUrl = null,
-                                                                                                 Uri statusCallback = null,
-                                                                                                 Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                                 string voiceApplicationSid = null,
-                                                                                                 bool? voiceCallerIdLookup = null,
-                                                                                                 Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                                                                 Uri voiceFallbackUrl = null,
-                                                                                                 Twilio.Http.HttpMethod voiceMethod = null,
-                                                                                                 Uri voiceUrl = null,
-                                                                                                 IncomingPhoneNumberResource.EmergencyStatusEnum emergencyStatus = null,
-                                                                                                 string emergencyAddressSid = null,
-                                                                                                 string trunkSid = null,
-                                                                                                 IncomingPhoneNumberResource.VoiceReceiveModeEnum voiceReceiveMode = null,
-                                                                                                 string identitySid = null,
-                                                                                                 string addressSid = null,
-                                                                                                 string bundleSid = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateIncomingPhoneNumberOptions(pathSid){PathAccountSid = pathAccountSid, AccountSid = accountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, IdentitySid = identitySid, AddressSid = addressSid, BundleSid = bundleSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchIncomingPhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an incoming-phone-number belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="options"> Fetch IncomingPhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IncomingPhoneNumber </returns>
-        public static IncomingPhoneNumberResource Fetch(FetchIncomingPhoneNumberOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an incoming-phone-number belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="options"> Fetch IncomingPhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<IncomingPhoneNumberResource> FetchAsync(FetchIncomingPhoneNumberOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an incoming-phone-number belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IncomingPhoneNumber </returns>
-        public static IncomingPhoneNumberResource Fetch(string pathSid,
-                                                        string pathAccountSid = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchIncomingPhoneNumberOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an incoming-phone-number belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<IncomingPhoneNumberResource> FetchAsync(string pathSid,
-                                                                                                string pathAccountSid = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchIncomingPhoneNumberOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteIncomingPhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a phone-numbers belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="options"> Delete IncomingPhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IncomingPhoneNumber </returns>
-        public static bool Delete(DeleteIncomingPhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a phone-numbers belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="options"> Delete IncomingPhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteIncomingPhoneNumberOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a phone-numbers belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IncomingPhoneNumber </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteIncomingPhoneNumberOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a phone-numbers belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteIncomingPhoneNumberOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadIncomingPhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of incoming-phone-numbers belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="options"> Read IncomingPhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IncomingPhoneNumber </returns>
-        public static ResourceSet<IncomingPhoneNumberResource> Read(ReadIncomingPhoneNumberOptions options,
-                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<IncomingPhoneNumberResource>.FromJson("incoming_phone_numbers", response.Content);
-            return new ResourceSet<IncomingPhoneNumberResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of incoming-phone-numbers belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="options"> Read IncomingPhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IncomingPhoneNumberResource>> ReadAsync(ReadIncomingPhoneNumberOptions options,
-                                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<IncomingPhoneNumberResource>.FromJson("incoming_phone_numbers", response.Content);
-            return new ResourceSet<IncomingPhoneNumberResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of incoming-phone-numbers belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="beta"> Whether to include new phone numbers </param>
-        /// <param name="friendlyName"> A string that identifies the IncomingPhoneNumber resources to read </param>
-        /// <param name="phoneNumber"> The phone numbers of the IncomingPhoneNumber resources to read </param>
-        /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
-        ///              included. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IncomingPhoneNumber </returns>
-        public static ResourceSet<IncomingPhoneNumberResource> Read(string pathAccountSid = null,
-                                                                    bool? beta = null,
-                                                                    string friendlyName = null,
-                                                                    Types.PhoneNumber phoneNumber = null,
-                                                                    string origin = null,
-                                                                    int? pageSize = null,
-                                                                    long? limit = null,
-                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadIncomingPhoneNumberOptions(){PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of incoming-phone-numbers belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="beta"> Whether to include new phone numbers </param>
-        /// <param name="friendlyName"> A string that identifies the IncomingPhoneNumber resources to read </param>
-        /// <param name="phoneNumber"> The phone numbers of the IncomingPhoneNumber resources to read </param>
-        /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
-        ///              included. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IncomingPhoneNumberResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                            bool? beta = null,
-                                                                                                            string friendlyName = null,
-                                                                                                            Types.PhoneNumber phoneNumber = null,
-                                                                                                            string origin = null,
-                                                                                                            int? pageSize = null,
-                                                                                                            long? limit = null,
-                                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadIncomingPhoneNumberOptions(){PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<IncomingPhoneNumberResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<IncomingPhoneNumberResource>.FromJson("incoming_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<IncomingPhoneNumberResource> NextPage(Page<IncomingPhoneNumberResource> page,
-                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<IncomingPhoneNumberResource>.FromJson("incoming_phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<IncomingPhoneNumberResource> PreviousPage(Page<IncomingPhoneNumberResource> page,
-                                                                     ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<IncomingPhoneNumberResource>.FromJson("incoming_phone_numbers", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateIncomingPhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Purchase a phone-number for the account.
-        /// </summary>
-        /// <param name="options"> Create IncomingPhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IncomingPhoneNumber </returns>
-        public static IncomingPhoneNumberResource Create(CreateIncomingPhoneNumberOptions options,
-                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Purchase a phone-number for the account.
-        /// </summary>
-        /// <param name="options"> Create IncomingPhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<IncomingPhoneNumberResource> CreateAsync(CreateIncomingPhoneNumberOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Purchase a phone-number for the account.
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
-        /// <param name="areaCode"> The desired area code for the new phone number </param>
-        /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
-        /// <param name="friendlyName"> A string to describe the new phone number </param>
-        /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
-        /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
-        /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms url </param>
-        /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> HTTP method we should use to call status_callback </param>
-        /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
-        /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
-        /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
-        /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
-        /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
-        /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
-        /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
-        /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
-        /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
-        /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IncomingPhoneNumber </returns>
-        public static IncomingPhoneNumberResource Create(string pathAccountSid = null,
-                                                         Types.PhoneNumber phoneNumber = null,
-                                                         string areaCode = null,
-                                                         string apiVersion = null,
-                                                         string friendlyName = null,
-                                                         string smsApplicationSid = null,
-                                                         Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                         Uri smsFallbackUrl = null,
-                                                         Twilio.Http.HttpMethod smsMethod = null,
-                                                         Uri smsUrl = null,
-                                                         Uri statusCallback = null,
-                                                         Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                         string voiceApplicationSid = null,
-                                                         bool? voiceCallerIdLookup = null,
-                                                         Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                         Uri voiceFallbackUrl = null,
-                                                         Twilio.Http.HttpMethod voiceMethod = null,
-                                                         Uri voiceUrl = null,
-                                                         IncomingPhoneNumberResource.EmergencyStatusEnum emergencyStatus = null,
-                                                         string emergencyAddressSid = null,
-                                                         string trunkSid = null,
-                                                         string identitySid = null,
-                                                         string addressSid = null,
-                                                         IncomingPhoneNumberResource.VoiceReceiveModeEnum voiceReceiveMode = null,
-                                                         string bundleSid = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateIncomingPhoneNumberOptions(){PathAccountSid = pathAccountSid, PhoneNumber = phoneNumber, AreaCode = areaCode, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, IdentitySid = identitySid, AddressSid = addressSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Purchase a phone-number for the account.
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
-        /// <param name="areaCode"> The desired area code for the new phone number </param>
-        /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
-        /// <param name="friendlyName"> A string to describe the new phone number </param>
-        /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
-        /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
-        /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
-        /// <param name="smsMethod"> The HTTP method to use with sms url </param>
-        /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> HTTP method we should use to call status_callback </param>
-        /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
-        /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
-        /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
-        /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
-        /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
-        /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
-        /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
-        /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
-        /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
-        /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
-        /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<IncomingPhoneNumberResource> CreateAsync(string pathAccountSid = null,
-                                                                                                 Types.PhoneNumber phoneNumber = null,
-                                                                                                 string areaCode = null,
-                                                                                                 string apiVersion = null,
-                                                                                                 string friendlyName = null,
-                                                                                                 string smsApplicationSid = null,
-                                                                                                 Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                                                                 Uri smsFallbackUrl = null,
-                                                                                                 Twilio.Http.HttpMethod smsMethod = null,
-                                                                                                 Uri smsUrl = null,
-                                                                                                 Uri statusCallback = null,
-                                                                                                 Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                                 string voiceApplicationSid = null,
-                                                                                                 bool? voiceCallerIdLookup = null,
-                                                                                                 Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                                                                 Uri voiceFallbackUrl = null,
-                                                                                                 Twilio.Http.HttpMethod voiceMethod = null,
-                                                                                                 Uri voiceUrl = null,
-                                                                                                 IncomingPhoneNumberResource.EmergencyStatusEnum emergencyStatus = null,
-                                                                                                 string emergencyAddressSid = null,
-                                                                                                 string trunkSid = null,
-                                                                                                 string identitySid = null,
-                                                                                                 string addressSid = null,
-                                                                                                 IncomingPhoneNumberResource.VoiceReceiveModeEnum voiceReceiveMode = null,
-                                                                                                 string bundleSid = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateIncomingPhoneNumberOptions(){PathAccountSid = pathAccountSid, PhoneNumber = phoneNumber, AreaCode = areaCode, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, IdentitySid = identitySid, AddressSid = addressSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a IncomingPhoneNumberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> IncomingPhoneNumberResource object represented by the provided JSON </returns>
-        public static IncomingPhoneNumberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<IncomingPhoneNumberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Address resource associated with the phone number
-        /// </summary>
-        [JsonProperty("address_sid")]
-        public string AddressSid { get; private set; }
-        /// <summary>
-        /// Whether the phone number requires an Address registered with Twilio.
-        /// </summary>
-        [JsonProperty("address_requirements")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public IncomingPhoneNumberResource.AddressRequirementEnum AddressRequirements { get; private set; }
-        /// <summary>
-        /// The API version used to start a new TwiML session
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Whether the phone number is new to the Twilio platform
-        /// </summary>
-        [JsonProperty("beta")]
-        public bool? Beta { get; private set; }
-        /// <summary>
-        /// Indicate if a phone can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The SID of the Identity resource associated with number
-        /// </summary>
-        [JsonProperty("identity_sid")]
-        public string IdentitySid { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The phone number's origin. Can be twilio or hosted.
-        /// </summary>
-        [JsonProperty("origin")]
-        public string Origin { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the application that handles SMS messages sent to the phone number
-        /// </summary>
-        [JsonProperty("sms_application_sid")]
-        public string SmsApplicationSid { get; private set; }
-        /// <summary>
-        /// The HTTP method used with sms_fallback_url
-        /// </summary>
-        [JsonProperty("sms_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL that we call when an error occurs while retrieving or executing the TwiML
-        /// </summary>
-        [JsonProperty("sms_fallback_url")]
-        public Uri SmsFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method to use with sms_url
-        /// </summary>
-        [JsonProperty("sms_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when the phone number receives an incoming SMS message
-        /// </summary>
-        [JsonProperty("sms_url")]
-        public Uri SmsUrl { get; private set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call status_callback
-        /// </summary>
-        [JsonProperty("status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// The SID of the Trunk that handles calls to the phone number
-        /// </summary>
-        [JsonProperty("trunk_sid")]
-        public string TrunkSid { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The voice_receive_mode
-        /// </summary>
-        [JsonProperty("voice_receive_mode")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public IncomingPhoneNumberResource.VoiceReceiveModeEnum VoiceReceiveMode { get; private set; }
-        /// <summary>
-        /// The SID of the application that handles calls to the phone number
-        /// </summary>
-        [JsonProperty("voice_application_sid")]
-        public string VoiceApplicationSid { get; private set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        [JsonProperty("voice_caller_id_lookup")]
-        public bool? VoiceCallerIdLookup { get; private set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        [JsonProperty("voice_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when an error occurs in TwiML
-        /// </summary>
-        [JsonProperty("voice_fallback_url")]
-        public Uri VoiceFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method used with the voice_url
-        /// </summary>
-        [JsonProperty("voice_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when the phone number receives a call
-        /// </summary>
-        [JsonProperty("voice_url")]
-        public Uri VoiceUrl { get; private set; }
-        /// <summary>
-        /// Displays if emergency calling is enabled for this number.
-        /// </summary>
-        [JsonProperty("emergency_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public IncomingPhoneNumberResource.EmergencyStatusEnum EmergencyStatus { get; private set; }
-        /// <summary>
-        /// The emergency address configuration to use for emergency calling
-        /// </summary>
-        [JsonProperty("emergency_address_sid")]
-        public string EmergencyAddressSid { get; private set; }
-        /// <summary>
-        /// State of the emergency address configuration for the phone number
-        /// </summary>
-        [JsonProperty("emergency_address_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public IncomingPhoneNumberResource.EmergencyAddressStatusEnum EmergencyAddressStatus { get; private set; }
-        /// <summary>
-        /// The SID of the Bundle resource associated with number
-        /// </summary>
-        [JsonProperty("bundle_sid")]
-        public string BundleSid { get; private set; }
-        /// <summary>
-        /// The status
-        /// </summary>
-        [JsonProperty("status")]
-        public string Status { get; private set; }
-
-        private IncomingPhoneNumberResource()
-        {
-
-        }
-    }
+{
+
+  public class IncomingPhoneNumberResource : Resource
+  {
+    public sealed class AddressRequirementEnum : StringEnum
+    {
+      private AddressRequirementEnum(string value) : base(value) { }
+      public AddressRequirementEnum() { }
+      public static implicit operator AddressRequirementEnum(string value)
+      {
+        return new AddressRequirementEnum(value);
+      }
+
+      public static readonly AddressRequirementEnum None = new AddressRequirementEnum("none");
+      public static readonly AddressRequirementEnum Any = new AddressRequirementEnum("any");
+      public static readonly AddressRequirementEnum Local = new AddressRequirementEnum("local");
+      public static readonly AddressRequirementEnum Foreign = new AddressRequirementEnum("foreign");
+    }
+
+    public sealed class EmergencyStatusEnum : StringEnum
+    {
+      private EmergencyStatusEnum(string value) : base(value) { }
+      public EmergencyStatusEnum() { }
+      public static implicit operator EmergencyStatusEnum(string value)
+      {
+        return new EmergencyStatusEnum(value);
+      }
+
+      public static readonly EmergencyStatusEnum Active = new EmergencyStatusEnum("Active");
+      public static readonly EmergencyStatusEnum Inactive = new EmergencyStatusEnum("Inactive");
+    }
+
+    public sealed class EmergencyAddressStatusEnum : StringEnum
+    {
+      private EmergencyAddressStatusEnum(string value) : base(value) { }
+      public EmergencyAddressStatusEnum() { }
+      public static implicit operator EmergencyAddressStatusEnum(string value)
+      {
+        return new EmergencyAddressStatusEnum(value);
+      }
+
+      public static readonly EmergencyAddressStatusEnum Registered = new EmergencyAddressStatusEnum("registered");
+      public static readonly EmergencyAddressStatusEnum Unregistered = new EmergencyAddressStatusEnum("unregistered");
+      public static readonly EmergencyAddressStatusEnum PendingRegistration = new EmergencyAddressStatusEnum("pending-registration");
+      public static readonly EmergencyAddressStatusEnum RegistrationFailure = new EmergencyAddressStatusEnum("registration-failure");
+      public static readonly EmergencyAddressStatusEnum PendingUnregistration = new EmergencyAddressStatusEnum("pending-unregistration");
+      public static readonly EmergencyAddressStatusEnum UnregistrationFailure = new EmergencyAddressStatusEnum("unregistration-failure");
+    }
+
+    public sealed class VoiceReceiveModeEnum : StringEnum
+    {
+      private VoiceReceiveModeEnum(string value) : base(value) { }
+      public VoiceReceiveModeEnum() { }
+      public static implicit operator VoiceReceiveModeEnum(string value)
+      {
+        return new VoiceReceiveModeEnum(value);
+      }
+
+      public static readonly VoiceReceiveModeEnum Voice = new VoiceReceiveModeEnum("voice");
+      public static readonly VoiceReceiveModeEnum Fax = new VoiceReceiveModeEnum("fax");
+    }
+
+    private static Request BuildUpdateRequest(UpdateIncomingPhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an incoming-phone-number instance.
+    /// </summary>
+    /// <param name="options"> Update IncomingPhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IncomingPhoneNumber </returns>
+    public static IncomingPhoneNumberResource Update(UpdateIncomingPhoneNumberOptions options,
+                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an incoming-phone-number instance.
+    /// </summary>
+    /// <param name="options"> Update IncomingPhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<IncomingPhoneNumberResource> UpdateAsync(UpdateIncomingPhoneNumberOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an incoming-phone-number instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
+    /// <param name="accountSid"> The SID of the Account that created the resource to update </param>
+    /// <param name="apiVersion"> The API version to use for incoming calls made to the phone number </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="smsApplicationSid"> Unique string that identifies the application </param>
+    /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
+    /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
+    /// <param name="smsUrl"> The URL we should call when the phone number receives an incoming SMS message </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="voiceApplicationSid"> The SID of the application to handle the phone number </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with fallback_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
+    /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
+    /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
+    /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
+    /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
+    /// <param name="trunkSid"> SID of the trunk to handle phone calls to the phone number </param>
+    /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
+    /// <param name="identitySid"> Unique string that identifies the identity associated with number </param>
+    /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
+    /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IncomingPhoneNumber </returns>
+    public static IncomingPhoneNumberResource Update(string pathSid,
+                                                     string pathAccountSid = null,
+                                                     string accountSid = null,
+                                                     string apiVersion = null,
+                                                     string friendlyName = null,
+                                                     string smsApplicationSid = null,
+                                                     Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                     Uri smsFallbackUrl = null,
+                                                     Twilio.Http.HttpMethod smsMethod = null,
+                                                     Uri smsUrl = null,
+                                                     Uri statusCallback = null,
+                                                     Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                     string voiceApplicationSid = null,
+                                                     bool? voiceCallerIdLookup = null,
+                                                     Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                     Uri voiceFallbackUrl = null,
+                                                     Twilio.Http.HttpMethod voiceMethod = null,
+                                                     Uri voiceUrl = null,
+                                                     IncomingPhoneNumberResource.EmergencyStatusEnum emergencyStatus = null,
+                                                     string emergencyAddressSid = null,
+                                                     string trunkSid = null,
+                                                     IncomingPhoneNumberResource.VoiceReceiveModeEnum voiceReceiveMode = null,
+                                                     string identitySid = null,
+                                                     string addressSid = null,
+                                                     string bundleSid = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateIncomingPhoneNumberOptions(pathSid) { PathAccountSid = pathAccountSid, AccountSid = accountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, IdentitySid = identitySid, AddressSid = addressSid, BundleSid = bundleSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an incoming-phone-number instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
+    /// <param name="accountSid"> The SID of the Account that created the resource to update </param>
+    /// <param name="apiVersion"> The API version to use for incoming calls made to the phone number </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="smsApplicationSid"> Unique string that identifies the application </param>
+    /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
+    /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms_url </param>
+    /// <param name="smsUrl"> The URL we should call when the phone number receives an incoming SMS message </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="voiceApplicationSid"> The SID of the application to handle the phone number </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with fallback_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
+    /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
+    /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
+    /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
+    /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
+    /// <param name="trunkSid"> SID of the trunk to handle phone calls to the phone number </param>
+    /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
+    /// <param name="identitySid"> Unique string that identifies the identity associated with number </param>
+    /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
+    /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<IncomingPhoneNumberResource> UpdateAsync(string pathSid,
+                                                                                             string pathAccountSid = null,
+                                                                                             string accountSid = null,
+                                                                                             string apiVersion = null,
+                                                                                             string friendlyName = null,
+                                                                                             string smsApplicationSid = null,
+                                                                                             Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                                                             Uri smsFallbackUrl = null,
+                                                                                             Twilio.Http.HttpMethod smsMethod = null,
+                                                                                             Uri smsUrl = null,
+                                                                                             Uri statusCallback = null,
+                                                                                             Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                             string voiceApplicationSid = null,
+                                                                                             bool? voiceCallerIdLookup = null,
+                                                                                             Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                                                             Uri voiceFallbackUrl = null,
+                                                                                             Twilio.Http.HttpMethod voiceMethod = null,
+                                                                                             Uri voiceUrl = null,
+                                                                                             IncomingPhoneNumberResource.EmergencyStatusEnum emergencyStatus = null,
+                                                                                             string emergencyAddressSid = null,
+                                                                                             string trunkSid = null,
+                                                                                             IncomingPhoneNumberResource.VoiceReceiveModeEnum voiceReceiveMode = null,
+                                                                                             string identitySid = null,
+                                                                                             string addressSid = null,
+                                                                                             string bundleSid = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateIncomingPhoneNumberOptions(pathSid) { PathAccountSid = pathAccountSid, AccountSid = accountSid, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, VoiceReceiveMode = voiceReceiveMode, IdentitySid = identitySid, AddressSid = addressSid, BundleSid = bundleSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchIncomingPhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an incoming-phone-number belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="options"> Fetch IncomingPhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IncomingPhoneNumber </returns>
+    public static IncomingPhoneNumberResource Fetch(FetchIncomingPhoneNumberOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an incoming-phone-number belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="options"> Fetch IncomingPhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<IncomingPhoneNumberResource> FetchAsync(FetchIncomingPhoneNumberOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an incoming-phone-number belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IncomingPhoneNumber </returns>
+    public static IncomingPhoneNumberResource Fetch(string pathSid,
+                                                    string pathAccountSid = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchIncomingPhoneNumberOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an incoming-phone-number belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<IncomingPhoneNumberResource> FetchAsync(string pathSid,
+                                                                                            string pathAccountSid = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchIncomingPhoneNumberOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteIncomingPhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a phone-numbers belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="options"> Delete IncomingPhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IncomingPhoneNumber </returns>
+    public static bool Delete(DeleteIncomingPhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a phone-numbers belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="options"> Delete IncomingPhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteIncomingPhoneNumberOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a phone-numbers belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IncomingPhoneNumber </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteIncomingPhoneNumberOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a phone-numbers belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteIncomingPhoneNumberOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadIncomingPhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of incoming-phone-numbers belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="options"> Read IncomingPhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IncomingPhoneNumber </returns>
+    public static ResourceSet<IncomingPhoneNumberResource> Read(ReadIncomingPhoneNumberOptions options,
+                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<IncomingPhoneNumberResource>.FromJson("incoming_phone_numbers", response.Content);
+      return new ResourceSet<IncomingPhoneNumberResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of incoming-phone-numbers belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="options"> Read IncomingPhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IncomingPhoneNumberResource>> ReadAsync(ReadIncomingPhoneNumberOptions options,
+                                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<IncomingPhoneNumberResource>.FromJson("incoming_phone_numbers", response.Content);
+      return new ResourceSet<IncomingPhoneNumberResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of incoming-phone-numbers belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="beta"> Whether to include new phone numbers </param>
+    /// <param name="friendlyName"> A string that identifies the IncomingPhoneNumber resources to read </param>
+    /// <param name="phoneNumber"> The phone numbers of the IncomingPhoneNumber resources to read </param>
+    /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
+    ///              included. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IncomingPhoneNumber </returns>
+    public static ResourceSet<IncomingPhoneNumberResource> Read(string pathAccountSid = null,
+                                                                bool? beta = null,
+                                                                string friendlyName = null,
+                                                                Types.PhoneNumber phoneNumber = null,
+                                                                string origin = null,
+                                                                int? pageSize = null,
+                                                                long? limit = null,
+                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadIncomingPhoneNumberOptions() { PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of incoming-phone-numbers belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="beta"> Whether to include new phone numbers </param>
+    /// <param name="friendlyName"> A string that identifies the IncomingPhoneNumber resources to read </param>
+    /// <param name="phoneNumber"> The phone numbers of the IncomingPhoneNumber resources to read </param>
+    /// <param name="origin"> Include phone numbers based on their origin. By default, phone numbers of all origin are
+    ///              included. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IncomingPhoneNumberResource>> ReadAsync(string pathAccountSid = null,
+                                                                                                        bool? beta = null,
+                                                                                                        string friendlyName = null,
+                                                                                                        Types.PhoneNumber phoneNumber = null,
+                                                                                                        string origin = null,
+                                                                                                        int? pageSize = null,
+                                                                                                        long? limit = null,
+                                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadIncomingPhoneNumberOptions() { PathAccountSid = pathAccountSid, Beta = beta, FriendlyName = friendlyName, PhoneNumber = phoneNumber, Origin = origin, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<IncomingPhoneNumberResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<IncomingPhoneNumberResource>.FromJson("incoming_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<IncomingPhoneNumberResource> NextPage(Page<IncomingPhoneNumberResource> page,
+                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<IncomingPhoneNumberResource>.FromJson("incoming_phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<IncomingPhoneNumberResource> PreviousPage(Page<IncomingPhoneNumberResource> page,
+                                                                 ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<IncomingPhoneNumberResource>.FromJson("incoming_phone_numbers", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateIncomingPhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/IncomingPhoneNumbers.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Purchase a phone-number for the account.
+    /// </summary>
+    /// <param name="options"> Create IncomingPhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IncomingPhoneNumber </returns>
+    public static IncomingPhoneNumberResource Create(CreateIncomingPhoneNumberOptions options,
+                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Purchase a phone-number for the account.
+    /// </summary>
+    /// <param name="options"> Create IncomingPhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<IncomingPhoneNumberResource> CreateAsync(CreateIncomingPhoneNumberOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Purchase a phone-number for the account.
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
+    /// <param name="areaCode"> The desired area code for the new phone number </param>
+    /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
+    /// <param name="friendlyName"> A string to describe the new phone number </param>
+    /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
+    /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
+    /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms url </param>
+    /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> HTTP method we should use to call status_callback </param>
+    /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
+    /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
+    /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
+    /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
+    /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
+    /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
+    /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
+    /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
+    /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
+    /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IncomingPhoneNumber </returns>
+    public static IncomingPhoneNumberResource Create(string pathAccountSid = null,
+                                                     Types.PhoneNumber phoneNumber = null,
+                                                     string areaCode = null,
+                                                     string apiVersion = null,
+                                                     string friendlyName = null,
+                                                     string smsApplicationSid = null,
+                                                     Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                     Uri smsFallbackUrl = null,
+                                                     Twilio.Http.HttpMethod smsMethod = null,
+                                                     Uri smsUrl = null,
+                                                     Uri statusCallback = null,
+                                                     Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                     string voiceApplicationSid = null,
+                                                     bool? voiceCallerIdLookup = null,
+                                                     Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                     Uri voiceFallbackUrl = null,
+                                                     Twilio.Http.HttpMethod voiceMethod = null,
+                                                     Uri voiceUrl = null,
+                                                     IncomingPhoneNumberResource.EmergencyStatusEnum emergencyStatus = null,
+                                                     string emergencyAddressSid = null,
+                                                     string trunkSid = null,
+                                                     string identitySid = null,
+                                                     string addressSid = null,
+                                                     IncomingPhoneNumberResource.VoiceReceiveModeEnum voiceReceiveMode = null,
+                                                     string bundleSid = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateIncomingPhoneNumberOptions() { PathAccountSid = pathAccountSid, PhoneNumber = phoneNumber, AreaCode = areaCode, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, IdentitySid = identitySid, AddressSid = addressSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Purchase a phone-number for the account.
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="phoneNumber"> The phone number to purchase in E.164 format </param>
+    /// <param name="areaCode"> The desired area code for the new phone number </param>
+    /// <param name="apiVersion"> The API version to use for incoming calls made to the new phone number </param>
+    /// <param name="friendlyName"> A string to describe the new phone number </param>
+    /// <param name="smsApplicationSid"> The SID of the application to handle SMS messages </param>
+    /// <param name="smsFallbackMethod"> HTTP method used with sms_fallback_url </param>
+    /// <param name="smsFallbackUrl"> The URL we call when an error occurs while executing TwiML </param>
+    /// <param name="smsMethod"> The HTTP method to use with sms url </param>
+    /// <param name="smsUrl"> The URL we should call when the new phone number receives an incoming SMS message </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> HTTP method we should use to call status_callback </param>
+    /// <param name="voiceApplicationSid"> The SID of the application to handle the new phone number </param>
+    /// <param name="voiceCallerIdLookup"> Whether to lookup the caller's name </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we will call when an error occurs in TwiML </param>
+    /// <param name="voiceMethod"> The HTTP method used with the voice_url </param>
+    /// <param name="voiceUrl"> The URL we should call when the phone number receives a call </param>
+    /// <param name="emergencyStatus"> Displays if emergency calling is enabled for this number. </param>
+    /// <param name="emergencyAddressSid"> The emergency address configuration to use for emergency calling </param>
+    /// <param name="trunkSid"> SID of the trunk to handle calls to the new phone number </param>
+    /// <param name="identitySid"> The SID of the Identity resource to associate with the new phone number </param>
+    /// <param name="addressSid"> The SID of the Address resource associated with the phone number </param>
+    /// <param name="voiceReceiveMode"> Incoming call type: fax or voice </param>
+    /// <param name="bundleSid"> The SID of the Bundle resource associated with number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IncomingPhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<IncomingPhoneNumberResource> CreateAsync(string pathAccountSid = null,
+                                                                                             Types.PhoneNumber phoneNumber = null,
+                                                                                             string areaCode = null,
+                                                                                             string apiVersion = null,
+                                                                                             string friendlyName = null,
+                                                                                             string smsApplicationSid = null,
+                                                                                             Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                                                             Uri smsFallbackUrl = null,
+                                                                                             Twilio.Http.HttpMethod smsMethod = null,
+                                                                                             Uri smsUrl = null,
+                                                                                             Uri statusCallback = null,
+                                                                                             Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                             string voiceApplicationSid = null,
+                                                                                             bool? voiceCallerIdLookup = null,
+                                                                                             Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                                                             Uri voiceFallbackUrl = null,
+                                                                                             Twilio.Http.HttpMethod voiceMethod = null,
+                                                                                             Uri voiceUrl = null,
+                                                                                             IncomingPhoneNumberResource.EmergencyStatusEnum emergencyStatus = null,
+                                                                                             string emergencyAddressSid = null,
+                                                                                             string trunkSid = null,
+                                                                                             string identitySid = null,
+                                                                                             string addressSid = null,
+                                                                                             IncomingPhoneNumberResource.VoiceReceiveModeEnum voiceReceiveMode = null,
+                                                                                             string bundleSid = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateIncomingPhoneNumberOptions() { PathAccountSid = pathAccountSid, PhoneNumber = phoneNumber, AreaCode = areaCode, ApiVersion = apiVersion, FriendlyName = friendlyName, SmsApplicationSid = smsApplicationSid, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, VoiceApplicationSid = voiceApplicationSid, VoiceCallerIdLookup = voiceCallerIdLookup, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, EmergencyStatus = emergencyStatus, EmergencyAddressSid = emergencyAddressSid, TrunkSid = trunkSid, IdentitySid = identitySid, AddressSid = addressSid, VoiceReceiveMode = voiceReceiveMode, BundleSid = bundleSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a IncomingPhoneNumberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> IncomingPhoneNumberResource object represented by the provided JSON </returns>
+    public static IncomingPhoneNumberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<IncomingPhoneNumberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Address resource associated with the phone number
+    /// </summary>
+    [JsonProperty("address_sid")]
+    public string AddressSid { get; private set; }
+    /// <summary>
+    /// Whether the phone number requires an Address registered with Twilio.
+    /// </summary>
+    [JsonProperty("address_requirements")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public IncomingPhoneNumberResource.AddressRequirementEnum AddressRequirements { get; private set; }
+    /// <summary>
+    /// The API version used to start a new TwiML session
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Whether the phone number is new to the Twilio platform
+    /// </summary>
+    [JsonProperty("beta")]
+    public bool? Beta { get; private set; }
+    /// <summary>
+    /// Indicate if a phone can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The SID of the Identity resource associated with number
+    /// </summary>
+    [JsonProperty("identity_sid")]
+    public string IdentitySid { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The phone number's origin. Can be twilio or hosted.
+    /// </summary>
+    [JsonProperty("origin")]
+    public string Origin { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the application that handles SMS messages sent to the phone number
+    /// </summary>
+    [JsonProperty("sms_application_sid")]
+    public string SmsApplicationSid { get; private set; }
+    /// <summary>
+    /// The HTTP method used with sms_fallback_url
+    /// </summary>
+    [JsonProperty("sms_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL that we call when an error occurs while retrieving or executing the TwiML
+    /// </summary>
+    [JsonProperty("sms_fallback_url")]
+    public Uri SmsFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method to use with sms_url
+    /// </summary>
+    [JsonProperty("sms_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when the phone number receives an incoming SMS message
+    /// </summary>
+    [JsonProperty("sms_url")]
+    public Uri SmsUrl { get; private set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call status_callback
+    /// </summary>
+    [JsonProperty("status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// The SID of the Trunk that handles calls to the phone number
+    /// </summary>
+    [JsonProperty("trunk_sid")]
+    public string TrunkSid { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The voice_receive_mode
+    /// </summary>
+    [JsonProperty("voice_receive_mode")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public IncomingPhoneNumberResource.VoiceReceiveModeEnum VoiceReceiveMode { get; private set; }
+    /// <summary>
+    /// The SID of the application that handles calls to the phone number
+    /// </summary>
+    [JsonProperty("voice_application_sid")]
+    public string VoiceApplicationSid { get; private set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    [JsonProperty("voice_caller_id_lookup")]
+    public bool? VoiceCallerIdLookup { get; private set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    [JsonProperty("voice_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when an error occurs in TwiML
+    /// </summary>
+    [JsonProperty("voice_fallback_url")]
+    public Uri VoiceFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method used with the voice_url
+    /// </summary>
+    [JsonProperty("voice_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when the phone number receives a call
+    /// </summary>
+    [JsonProperty("voice_url")]
+    public Uri VoiceUrl { get; private set; }
+    /// <summary>
+    /// Displays if emergency calling is enabled for this number.
+    /// </summary>
+    [JsonProperty("emergency_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public IncomingPhoneNumberResource.EmergencyStatusEnum EmergencyStatus { get; private set; }
+    /// <summary>
+    /// The emergency address configuration to use for emergency calling
+    /// </summary>
+    [JsonProperty("emergency_address_sid")]
+    public string EmergencyAddressSid { get; private set; }
+    /// <summary>
+    /// State of the emergency address configuration for the phone number
+    /// </summary>
+    [JsonProperty("emergency_address_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public IncomingPhoneNumberResource.EmergencyAddressStatusEnum EmergencyAddressStatus { get; private set; }
+    /// <summary>
+    /// The SID of the Bundle resource associated with number
+    /// </summary>
+    [JsonProperty("bundle_sid")]
+    public string BundleSid { get; private set; }
+    /// <summary>
+    /// The status
+    /// </summary>
+    [JsonProperty("status")]
+    public string Status { get; private set; }
+
+    private IncomingPhoneNumberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/KeyOptions.cs b/src/Twilio/Rest/Api/V2010/Account/KeyOptions.cs
index 2e6b16271..be21d6886 100644
--- a/src/Twilio/Rest/Api/V2010/Account/KeyOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/KeyOptions.cs
@@ -9,139 +9,139 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// FetchKeyOptions
+  /// </summary>
+  public class FetchKeyOptions : IOptions<KeyResource>
+  {
     /// <summary>
-    /// FetchKeyOptions
+    /// The SID of the Account that created the resource to fetch
     /// </summary>
-    public class FetchKeyOptions : IOptions<KeyResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchKeyOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchKeyOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// UpdateKeyOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class UpdateKeyOptions : IOptions<KeyResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateKeyOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateKeyOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteKeyOptions
+    /// Construct a new FetchKeyOptions
     /// </summary>
-    public class DeleteKeyOptions : IOptions<KeyResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteKeyOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteKeyOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchKeyOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadKeyOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadKeyOptions : ReadOptions<KeyResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateKeyOptions
+  /// </summary>
+  public class UpdateKeyOptions : IOptions<KeyResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateKeyOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateKeyOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteKeyOptions
+  /// </summary>
+  public class DeleteKeyOptions : IOptions<KeyResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteKeyOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteKeyOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadKeyOptions
+  /// </summary>
+  public class ReadKeyOptions : ReadOptions<KeyResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/KeyResource.cs b/src/Twilio/Rest/Api/V2010/Account/KeyResource.cs
index b39df70f3..fa62af6e0 100644
--- a/src/Twilio/Rest/Api/V2010/Account/KeyResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/KeyResource.cs
@@ -16,402 +16,402 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class KeyResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Keys/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static KeyResource Fetch(FetchKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<KeyResource> FetchAsync(FetchKeyOptions options,
-                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static KeyResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchKeyOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<KeyResource> FetchAsync(string pathSid,
-                                                                                string pathAccountSid = null,
-                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchKeyOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Keys/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static KeyResource Update(UpdateKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<KeyResource> UpdateAsync(UpdateKeyOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static KeyResource Update(string pathSid,
-                                         string pathAccountSid = null,
-                                         string friendlyName = null,
-                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateKeyOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<KeyResource> UpdateAsync(string pathSid,
-                                                                                 string pathAccountSid = null,
-                                                                                 string friendlyName = null,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateKeyOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Keys/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static bool Delete(DeleteKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteKeyOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteKeyOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteKeyOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Keys.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static ResourceSet<KeyResource> Read(ReadKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<KeyResource>.FromJson("keys", response.Content);
-            return new ResourceSet<KeyResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<KeyResource>> ReadAsync(ReadKeyOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<KeyResource>.FromJson("keys", response.Content);
-            return new ResourceSet<KeyResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static ResourceSet<KeyResource> Read(string pathAccountSid = null,
-                                                    int? pageSize = null,
-                                                    long? limit = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadKeyOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<KeyResource>> ReadAsync(string pathAccountSid = null,
-                                                                                            int? pageSize = null,
-                                                                                            long? limit = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadKeyOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<KeyResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<KeyResource>.FromJson("keys", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<KeyResource> NextPage(Page<KeyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<KeyResource>.FromJson("keys", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<KeyResource> PreviousPage(Page<KeyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<KeyResource>.FromJson("keys", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a KeyResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> KeyResource object represented by the provided JSON </returns>
-        public static KeyResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<KeyResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private KeyResource()
-        {
-
-        }
-    }
+{
+
+  public class KeyResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Keys/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static KeyResource Fetch(FetchKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<KeyResource> FetchAsync(FetchKeyOptions options,
+                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static KeyResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchKeyOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<KeyResource> FetchAsync(string pathSid,
+                                                                            string pathAccountSid = null,
+                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchKeyOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Keys/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static KeyResource Update(UpdateKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<KeyResource> UpdateAsync(UpdateKeyOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static KeyResource Update(string pathSid,
+                                     string pathAccountSid = null,
+                                     string friendlyName = null,
+                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateKeyOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<KeyResource> UpdateAsync(string pathSid,
+                                                                             string pathAccountSid = null,
+                                                                             string friendlyName = null,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateKeyOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Keys/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static bool Delete(DeleteKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteKeyOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteKeyOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteKeyOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Keys.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static ResourceSet<KeyResource> Read(ReadKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<KeyResource>.FromJson("keys", response.Content);
+      return new ResourceSet<KeyResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<KeyResource>> ReadAsync(ReadKeyOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<KeyResource>.FromJson("keys", response.Content);
+      return new ResourceSet<KeyResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static ResourceSet<KeyResource> Read(string pathAccountSid = null,
+                                                int? pageSize = null,
+                                                long? limit = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadKeyOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<KeyResource>> ReadAsync(string pathAccountSid = null,
+                                                                                        int? pageSize = null,
+                                                                                        long? limit = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadKeyOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<KeyResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<KeyResource>.FromJson("keys", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<KeyResource> NextPage(Page<KeyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<KeyResource>.FromJson("keys", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<KeyResource> PreviousPage(Page<KeyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<KeyResource>.FromJson("keys", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a KeyResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> KeyResource object represented by the provided JSON </returns>
+    public static KeyResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<KeyResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private KeyResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Message/FeedbackOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Message/FeedbackOptions.cs
index be36d3224..e0546ba7d 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Message/FeedbackOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Message/FeedbackOptions.cs
@@ -9,48 +9,48 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Message
-{
-
+{
+
+  /// <summary>
+  /// CreateFeedbackOptions
+  /// </summary>
+  public class CreateFeedbackOptions : IOptions<FeedbackResource>
+  {
     /// <summary>
-    /// CreateFeedbackOptions
+    /// The SID of the Account that will create the resource
     /// </summary>
-    public class CreateFeedbackOptions : IOptions<FeedbackResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Message resource for which the feedback was provided
-        /// </summary>
-        public string PathMessageSid { get; }
-        /// <summary>
-        /// Whether the feedback has arrived
-        /// </summary>
-        public FeedbackResource.OutcomeEnum Outcome { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateFeedbackOptions
-        /// </summary>
-        /// <param name="pathMessageSid"> The SID of the Message resource for which the feedback was provided </param>
-        public CreateFeedbackOptions(string pathMessageSid)
-        {
-            PathMessageSid = pathMessageSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Outcome != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Outcome", Outcome.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the Message resource for which the feedback was provided
+    /// </summary>
+    public string PathMessageSid { get; }
+    /// <summary>
+    /// Whether the feedback has arrived
+    /// </summary>
+    public FeedbackResource.OutcomeEnum Outcome { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateFeedbackOptions
+    /// </summary>
+    /// <param name="pathMessageSid"> The SID of the Message resource for which the feedback was provided </param>
+    public CreateFeedbackOptions(string pathMessageSid)
+    {
+      PathMessageSid = pathMessageSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Outcome != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Outcome", Outcome.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Message/FeedbackResource.cs b/src/Twilio/Rest/Api/V2010/Account/Message/FeedbackResource.cs
index 6952048ab..733dd9fe1 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Message/FeedbackResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Message/FeedbackResource.cs
@@ -17,153 +17,153 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Message
-{
-
-    public class FeedbackResource : Resource
-    {
-        public sealed class OutcomeEnum : StringEnum
-        {
-            private OutcomeEnum(string value) : base(value) {}
-            public OutcomeEnum() {}
-            public static implicit operator OutcomeEnum(string value)
-            {
-                return new OutcomeEnum(value);
-            }
-
-            public static readonly OutcomeEnum Confirmed = new OutcomeEnum("confirmed");
-            public static readonly OutcomeEnum Unconfirmed = new OutcomeEnum("unconfirmed");
-        }
-
-        private static Request BuildCreateRequest(CreateFeedbackOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathMessageSid + "/Feedback.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Feedback parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Feedback </returns>
-        public static FeedbackResource Create(CreateFeedbackOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Feedback parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Feedback </returns>
-        public static async System.Threading.Tasks.Task<FeedbackResource> CreateAsync(CreateFeedbackOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathMessageSid"> The SID of the Message resource for which the feedback was provided </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="outcome"> Whether the feedback has arrived </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Feedback </returns>
-        public static FeedbackResource Create(string pathMessageSid,
-                                              string pathAccountSid = null,
-                                              FeedbackResource.OutcomeEnum outcome = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateFeedbackOptions(pathMessageSid){PathAccountSid = pathAccountSid, Outcome = outcome};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathMessageSid"> The SID of the Message resource for which the feedback was provided </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="outcome"> Whether the feedback has arrived </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Feedback </returns>
-        public static async System.Threading.Tasks.Task<FeedbackResource> CreateAsync(string pathMessageSid,
-                                                                                      string pathAccountSid = null,
-                                                                                      FeedbackResource.OutcomeEnum outcome = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateFeedbackOptions(pathMessageSid){PathAccountSid = pathAccountSid, Outcome = outcome};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FeedbackResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FeedbackResource object represented by the provided JSON </returns>
-        public static FeedbackResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FeedbackResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Message resource for which the feedback was provided
-        /// </summary>
-        [JsonProperty("message_sid")]
-        public string MessageSid { get; private set; }
-        /// <summary>
-        /// Whether the feedback has arrived
-        /// </summary>
-        [JsonProperty("outcome")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FeedbackResource.OutcomeEnum Outcome { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private FeedbackResource()
-        {
-
-        }
-    }
+{
+
+  public class FeedbackResource : Resource
+  {
+    public sealed class OutcomeEnum : StringEnum
+    {
+      private OutcomeEnum(string value) : base(value) { }
+      public OutcomeEnum() { }
+      public static implicit operator OutcomeEnum(string value)
+      {
+        return new OutcomeEnum(value);
+      }
+
+      public static readonly OutcomeEnum Confirmed = new OutcomeEnum("confirmed");
+      public static readonly OutcomeEnum Unconfirmed = new OutcomeEnum("unconfirmed");
+    }
+
+    private static Request BuildCreateRequest(CreateFeedbackOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathMessageSid + "/Feedback.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Feedback parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Feedback </returns>
+    public static FeedbackResource Create(CreateFeedbackOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Feedback parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Feedback </returns>
+    public static async System.Threading.Tasks.Task<FeedbackResource> CreateAsync(CreateFeedbackOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathMessageSid"> The SID of the Message resource for which the feedback was provided </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="outcome"> Whether the feedback has arrived </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Feedback </returns>
+    public static FeedbackResource Create(string pathMessageSid,
+                                          string pathAccountSid = null,
+                                          FeedbackResource.OutcomeEnum outcome = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateFeedbackOptions(pathMessageSid) { PathAccountSid = pathAccountSid, Outcome = outcome };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathMessageSid"> The SID of the Message resource for which the feedback was provided </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="outcome"> Whether the feedback has arrived </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Feedback </returns>
+    public static async System.Threading.Tasks.Task<FeedbackResource> CreateAsync(string pathMessageSid,
+                                                                                  string pathAccountSid = null,
+                                                                                  FeedbackResource.OutcomeEnum outcome = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateFeedbackOptions(pathMessageSid) { PathAccountSid = pathAccountSid, Outcome = outcome };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FeedbackResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FeedbackResource object represented by the provided JSON </returns>
+    public static FeedbackResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FeedbackResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Message resource for which the feedback was provided
+    /// </summary>
+    [JsonProperty("message_sid")]
+    public string MessageSid { get; private set; }
+    /// <summary>
+    /// Whether the feedback has arrived
+    /// </summary>
+    [JsonProperty("outcome")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FeedbackResource.OutcomeEnum Outcome { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private FeedbackResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Message/MediaOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Message/MediaOptions.cs
index e811f1412..0a4eb958e 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Message/MediaOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Message/MediaOptions.cs
@@ -9,151 +9,151 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Message
-{
-
+{
+
+  /// <summary>
+  /// Delete media from your account. Once delete, you will no longer be billed
+  /// </summary>
+  public class DeleteMediaOptions : IOptions<MediaResource>
+  {
     /// <summary>
-    /// Delete media from your account. Once delete, you will no longer be billed
-    /// </summary>
-    public class DeleteMediaOptions : IOptions<MediaResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Message resource that this Media resource belongs to
-        /// </summary>
-        public string PathMessageSid { get; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteMediaOptions
-        /// </summary>
-        /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        public DeleteMediaOptions(string pathMessageSid, string pathSid)
-        {
-            PathMessageSid = pathMessageSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resource(s) to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Fetch a single media instance belonging to the account used to make the request
-    /// </summary>
-    public class FetchMediaOptions : IOptions<MediaResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Message resource that this Media resource belongs to
-        /// </summary>
-        public string PathMessageSid { get; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMediaOptions
-        /// </summary>
-        /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        public FetchMediaOptions(string pathMessageSid, string pathSid)
-        {
-            PathMessageSid = pathMessageSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Message resource that this Media resource belongs to
+    /// </summary>
+    public string PathMessageSid { get; }
     /// <summary>
-    /// Retrieve a list of Media resources belonging to the account used to make the request
-    /// </summary>
-    public class ReadMediaOptions : ReadOptions<MediaResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Message resource that this Media resource belongs to
-        /// </summary>
-        public string PathMessageSid { get; }
-        /// <summary>
-        /// Only include media that was created on this date
-        /// </summary>
-        public DateTime? DateCreatedBefore { get; set; }
-        /// <summary>
-        /// Only include media that was created on this date
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// Only include media that was created on this date
-        /// </summary>
-        public DateTime? DateCreatedAfter { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMediaOptions
-        /// </summary>
-        /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
-        public ReadMediaOptions(string pathMessageSid)
-        {
-            PathMessageSid = pathMessageSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-            else
-            {
-                if (DateCreatedBefore != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateCreated<", Serializers.DateTimeIso8601(DateCreatedBefore)));
-                }
-
-                if (DateCreatedAfter != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateCreated>", Serializers.DateTimeIso8601(DateCreatedAfter)));
-                }
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The unique string that identifies this resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteMediaOptions
+    /// </summary>
+    /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    public DeleteMediaOptions(string pathMessageSid, string pathSid)
+    {
+      PathMessageSid = pathMessageSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a single media instance belonging to the account used to make the request
+  /// </summary>
+  public class FetchMediaOptions : IOptions<MediaResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the Message resource that this Media resource belongs to
+    /// </summary>
+    public string PathMessageSid { get; }
+    /// <summary>
+    /// The unique string that identifies this resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchMediaOptions
+    /// </summary>
+    /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    public FetchMediaOptions(string pathMessageSid, string pathSid)
+    {
+      PathMessageSid = pathMessageSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of Media resources belonging to the account used to make the request
+  /// </summary>
+  public class ReadMediaOptions : ReadOptions<MediaResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the Message resource that this Media resource belongs to
+    /// </summary>
+    public string PathMessageSid { get; }
+    /// <summary>
+    /// Only include media that was created on this date
+    /// </summary>
+    public DateTime? DateCreatedBefore { get; set; }
+    /// <summary>
+    /// Only include media that was created on this date
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// Only include media that was created on this date
+    /// </summary>
+    public DateTime? DateCreatedAfter { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMediaOptions
+    /// </summary>
+    /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
+    public ReadMediaOptions(string pathMessageSid)
+    {
+      PathMessageSid = pathMessageSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+      else
+      {
+        if (DateCreatedBefore != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateCreated<", Serializers.DateTimeIso8601(DateCreatedBefore)));
+        }
+
+        if (DateCreatedAfter != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateCreated>", Serializers.DateTimeIso8601(DateCreatedAfter)));
+        }
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Message/MediaResource.cs b/src/Twilio/Rest/Api/V2010/Account/Message/MediaResource.cs
index ae656e21f..987143584 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Message/MediaResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Message/MediaResource.cs
@@ -16,369 +16,369 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Message
-{
-
-    public class MediaResource : Resource
-    {
-        private static Request BuildDeleteRequest(DeleteMediaOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathMessageSid + "/Media/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete media from your account. Once delete, you will no longer be billed
-        /// </summary>
-        /// <param name="options"> Delete Media parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Media </returns>
-        public static bool Delete(DeleteMediaOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete media from your account. Once delete, you will no longer be billed
-        /// </summary>
-        /// <param name="options"> Delete Media parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Media </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMediaOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete media from your account. Once delete, you will no longer be billed
-        /// </summary>
-        /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Media </returns>
-        public static bool Delete(string pathMessageSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteMediaOptions(pathMessageSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete media from your account. Once delete, you will no longer be billed
-        /// </summary>
-        /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Media </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathMessageSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteMediaOptions(pathMessageSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchMediaOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathMessageSid + "/Media/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a single media instance belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Fetch Media parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Media </returns>
-        public static MediaResource Fetch(FetchMediaOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a single media instance belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Fetch Media parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Media </returns>
-        public static async System.Threading.Tasks.Task<MediaResource> FetchAsync(FetchMediaOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a single media instance belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Media </returns>
-        public static MediaResource Fetch(string pathMessageSid,
-                                          string pathSid,
-                                          string pathAccountSid = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchMediaOptions(pathMessageSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a single media instance belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Media </returns>
-        public static async System.Threading.Tasks.Task<MediaResource> FetchAsync(string pathMessageSid,
-                                                                                  string pathSid,
-                                                                                  string pathAccountSid = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchMediaOptions(pathMessageSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMediaOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathMessageSid + "/Media.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Media resources belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Media parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Media </returns>
-        public static ResourceSet<MediaResource> Read(ReadMediaOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MediaResource>.FromJson("media_list", response.Content);
-            return new ResourceSet<MediaResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Media resources belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Media parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Media </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MediaResource>> ReadAsync(ReadMediaOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MediaResource>.FromJson("media_list", response.Content);
-            return new ResourceSet<MediaResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Media resources belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
-        /// <param name="dateCreatedBefore"> Only include media that was created on this date </param>
-        /// <param name="dateCreated"> Only include media that was created on this date </param>
-        /// <param name="dateCreatedAfter"> Only include media that was created on this date </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Media </returns>
-        public static ResourceSet<MediaResource> Read(string pathMessageSid,
-                                                      string pathAccountSid = null,
-                                                      DateTime? dateCreatedBefore = null,
-                                                      DateTime? dateCreated = null,
-                                                      DateTime? dateCreatedAfter = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadMediaOptions(pathMessageSid){PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Media resources belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
-        /// <param name="dateCreatedBefore"> Only include media that was created on this date </param>
-        /// <param name="dateCreated"> Only include media that was created on this date </param>
-        /// <param name="dateCreatedAfter"> Only include media that was created on this date </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Media </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MediaResource>> ReadAsync(string pathMessageSid,
-                                                                                              string pathAccountSid = null,
-                                                                                              DateTime? dateCreatedBefore = null,
-                                                                                              DateTime? dateCreated = null,
-                                                                                              DateTime? dateCreatedAfter = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadMediaOptions(pathMessageSid){PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MediaResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MediaResource>.FromJson("media_list", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MediaResource> NextPage(Page<MediaResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MediaResource>.FromJson("media_list", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MediaResource> PreviousPage(Page<MediaResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MediaResource>.FromJson("media_list", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a MediaResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MediaResource object represented by the provided JSON </returns>
-        public static MediaResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MediaResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created this resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The default mime-type of the media
-        /// </summary>
-        [JsonProperty("content_type")]
-        public string ContentType { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The SID of the resource that created the media
-        /// </summary>
-        [JsonProperty("parent_sid")]
-        public string ParentSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The URI of this resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private MediaResource()
-        {
-
-        }
-    }
+{
+
+  public class MediaResource : Resource
+  {
+    private static Request BuildDeleteRequest(DeleteMediaOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathMessageSid + "/Media/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete media from your account. Once delete, you will no longer be billed
+    /// </summary>
+    /// <param name="options"> Delete Media parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Media </returns>
+    public static bool Delete(DeleteMediaOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete media from your account. Once delete, you will no longer be billed
+    /// </summary>
+    /// <param name="options"> Delete Media parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Media </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMediaOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete media from your account. Once delete, you will no longer be billed
+    /// </summary>
+    /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Media </returns>
+    public static bool Delete(string pathMessageSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteMediaOptions(pathMessageSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete media from your account. Once delete, you will no longer be billed
+    /// </summary>
+    /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Media </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathMessageSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteMediaOptions(pathMessageSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchMediaOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathMessageSid + "/Media/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a single media instance belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Fetch Media parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Media </returns>
+    public static MediaResource Fetch(FetchMediaOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a single media instance belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Fetch Media parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Media </returns>
+    public static async System.Threading.Tasks.Task<MediaResource> FetchAsync(FetchMediaOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a single media instance belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Media </returns>
+    public static MediaResource Fetch(string pathMessageSid,
+                                      string pathSid,
+                                      string pathAccountSid = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchMediaOptions(pathMessageSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a single media instance belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Media </returns>
+    public static async System.Threading.Tasks.Task<MediaResource> FetchAsync(string pathMessageSid,
+                                                                              string pathSid,
+                                                                              string pathAccountSid = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchMediaOptions(pathMessageSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMediaOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathMessageSid + "/Media.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Media resources belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Media parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Media </returns>
+    public static ResourceSet<MediaResource> Read(ReadMediaOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MediaResource>.FromJson("media_list", response.Content);
+      return new ResourceSet<MediaResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Media resources belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Media parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Media </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MediaResource>> ReadAsync(ReadMediaOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MediaResource>.FromJson("media_list", response.Content);
+      return new ResourceSet<MediaResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Media resources belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
+    /// <param name="dateCreatedBefore"> Only include media that was created on this date </param>
+    /// <param name="dateCreated"> Only include media that was created on this date </param>
+    /// <param name="dateCreatedAfter"> Only include media that was created on this date </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Media </returns>
+    public static ResourceSet<MediaResource> Read(string pathMessageSid,
+                                                  string pathAccountSid = null,
+                                                  DateTime? dateCreatedBefore = null,
+                                                  DateTime? dateCreated = null,
+                                                  DateTime? dateCreatedAfter = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadMediaOptions(pathMessageSid) { PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Media resources belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathMessageSid"> The SID of the Message resource that this Media resource belongs to </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
+    /// <param name="dateCreatedBefore"> Only include media that was created on this date </param>
+    /// <param name="dateCreated"> Only include media that was created on this date </param>
+    /// <param name="dateCreatedAfter"> Only include media that was created on this date </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Media </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MediaResource>> ReadAsync(string pathMessageSid,
+                                                                                          string pathAccountSid = null,
+                                                                                          DateTime? dateCreatedBefore = null,
+                                                                                          DateTime? dateCreated = null,
+                                                                                          DateTime? dateCreatedAfter = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadMediaOptions(pathMessageSid) { PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MediaResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MediaResource>.FromJson("media_list", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MediaResource> NextPage(Page<MediaResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MediaResource>.FromJson("media_list", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MediaResource> PreviousPage(Page<MediaResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MediaResource>.FromJson("media_list", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a MediaResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MediaResource object represented by the provided JSON </returns>
+    public static MediaResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MediaResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created this resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The default mime-type of the media
+    /// </summary>
+    [JsonProperty("content_type")]
+    public string ContentType { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The SID of the resource that created the media
+    /// </summary>
+    [JsonProperty("parent_sid")]
+    public string ParentSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies this resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The URI of this resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private MediaResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/MessageOptions.cs b/src/Twilio/Rest/Api/V2010/Account/MessageOptions.cs
index 58b0d02c8..ade492061 100644
--- a/src/Twilio/Rest/Api/V2010/Account/MessageOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/MessageOptions.cs
@@ -10,370 +10,370 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Send a message from the account used to make the request
+  /// </summary>
+  public class CreateMessageOptions : IOptions<MessageResource>
+  {
     /// <summary>
-    /// Send a message from the account used to make the request
-    /// </summary>
-    public class CreateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The destination phone number
-        /// </summary>
-        public Types.PhoneNumber To { get; }
-        /// <summary>
-        /// The phone number that initiated the message
-        /// </summary>
-        public Types.PhoneNumber From { get; set; }
-        /// <summary>
-        /// The SID of the Messaging Service you want to associate with the message.
-        /// </summary>
-        public string MessagingServiceSid { get; set; }
-        /// <summary>
-        /// The text of the message you want to send. Can be up to 1,600 characters in length.
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        /// The URL of the media to send with the message
-        /// </summary>
-        public List<Uri> MediaUrl { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The application to use for callbacks
-        /// </summary>
-        public string ApplicationSid { get; set; }
-        /// <summary>
-        /// The total maximum price up to 4 decimal places in US dollars acceptable for the message to be delivered.
-        /// </summary>
-        public decimal? MaxPrice { get; set; }
-        /// <summary>
-        /// Whether to confirm delivery of the message
-        /// </summary>
-        public bool? ProvideFeedback { get; set; }
-        /// <summary>
-        /// Total numer of attempts made , this inclusive to send out the message
-        /// </summary>
-        public int? Attempt { get; set; }
-        /// <summary>
-        /// The number of seconds that the message can remain in our outgoing queue.
-        /// </summary>
-        public int? ValidityPeriod { get; set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        public bool? ForceDelivery { get; set; }
-        /// <summary>
-        /// Determines if the message content can be stored or redacted based on privacy settings
-        /// </summary>
-        public MessageResource.ContentRetentionEnum ContentRetention { get; set; }
-        /// <summary>
-        /// Determines if the address can be stored or obfuscated based on privacy settings
-        /// </summary>
-        public MessageResource.AddressRetentionEnum AddressRetention { get; set; }
-        /// <summary>
-        /// Whether to detect Unicode characters that have a similar GSM-7 character and replace them
-        /// </summary>
-        public bool? SmartEncoded { get; set; }
-        /// <summary>
-        /// Rich actions for Channels Messages.
-        /// </summary>
-        public List<string> PersistentAction { get; set; }
-        /// <summary>
-        /// If set to True, Twilio will deliver the message as a single MMS message, regardless of the presence of media
-        /// </summary>
-        public bool? SendAsMms { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMessageOptions
-        /// </summary>
-        /// <param name="to"> The destination phone number </param>
-        public CreateMessageOptions(Types.PhoneNumber to)
-        {
-            To = to;
-            MediaUrl = new List<Uri>();
-            PersistentAction = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To.ToString()));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From.ToString()));
-            }
-
-            if (MessagingServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
-            }
-
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (MediaUrl != null)
-            {
-                p.AddRange(MediaUrl.Select(prop => new KeyValuePair<string, string>("MediaUrl", Serializers.Url(prop))));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (ApplicationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApplicationSid", ApplicationSid.ToString()));
-            }
-
-            if (MaxPrice != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MaxPrice", MaxPrice.Value.ToString()));
-            }
-
-            if (ProvideFeedback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ProvideFeedback", ProvideFeedback.Value.ToString().ToLower()));
-            }
-
-            if (Attempt != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attempt", Attempt.ToString()));
-            }
-
-            if (ValidityPeriod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ValidityPeriod", ValidityPeriod.ToString()));
-            }
-
-            if (ForceDelivery != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ForceDelivery", ForceDelivery.Value.ToString().ToLower()));
-            }
-
-            if (ContentRetention != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ContentRetention", ContentRetention.ToString()));
-            }
-
-            if (AddressRetention != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AddressRetention", AddressRetention.ToString()));
-            }
-
-            if (SmartEncoded != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmartEncoded", SmartEncoded.Value.ToString().ToLower()));
-            }
-
-            if (PersistentAction != null)
-            {
-                p.AddRange(PersistentAction.Select(prop => new KeyValuePair<string, string>("PersistentAction", prop)));
-            }
-
-            if (SendAsMms != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SendAsMms", SendAsMms.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Deletes a message record from your account
-    /// </summary>
-    public class DeleteMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteMessageOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteMessageOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The destination phone number
+    /// </summary>
+    public Types.PhoneNumber To { get; }
     /// <summary>
-    /// Fetch a message belonging to the account used to make the request
-    /// </summary>
-    public class FetchMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMessageOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchMessageOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The phone number that initiated the message
+    /// </summary>
+    public Types.PhoneNumber From { get; set; }
     /// <summary>
-    /// Retrieve a list of messages belonging to the account used to make the request
-    /// </summary>
-    public class ReadMessageOptions : ReadOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Filter by messages sent to this number
-        /// </summary>
-        public Types.PhoneNumber To { get; set; }
-        /// <summary>
-        /// Filter by from number
-        /// </summary>
-        public Types.PhoneNumber From { get; set; }
-        /// <summary>
-        /// Filter by date sent
-        /// </summary>
-        public DateTime? DateSentBefore { get; set; }
-        /// <summary>
-        /// Filter by date sent
-        /// </summary>
-        public DateTime? DateSent { get; set; }
-        /// <summary>
-        /// Filter by date sent
-        /// </summary>
-        public DateTime? DateSentAfter { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To.ToString()));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From.ToString()));
-            }
-
-            if (DateSent != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateSent", Serializers.DateTimeIso8601(DateSent)));
-            }
-            else
-            {
-                if (DateSentBefore != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateSent<", Serializers.DateTimeIso8601(DateSentBefore)));
-                }
-
-                if (DateSentAfter != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateSent>", Serializers.DateTimeIso8601(DateSentAfter)));
-                }
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Messaging Service you want to associate with the message.
+    /// </summary>
+    public string MessagingServiceSid { get; set; }
     /// <summary>
-    /// To redact a message-body from a post-flight message record, post to the message instance resource with an empty body
-    /// </summary>
-    public class UpdateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The text of the message you want to send
-        /// </summary>
-        public string Body { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateMessageOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateMessageOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            return p;
-        }
-    }
+    /// The text of the message you want to send. Can be up to 1,600 characters in length.
+    /// </summary>
+    public string Body { get; set; }
+    /// <summary>
+    /// The URL of the media to send with the message
+    /// </summary>
+    public List<Uri> MediaUrl { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The application to use for callbacks
+    /// </summary>
+    public string ApplicationSid { get; set; }
+    /// <summary>
+    /// The total maximum price up to 4 decimal places in US dollars acceptable for the message to be delivered.
+    /// </summary>
+    public decimal? MaxPrice { get; set; }
+    /// <summary>
+    /// Whether to confirm delivery of the message
+    /// </summary>
+    public bool? ProvideFeedback { get; set; }
+    /// <summary>
+    /// Total numer of attempts made , this inclusive to send out the message
+    /// </summary>
+    public int? Attempt { get; set; }
+    /// <summary>
+    /// The number of seconds that the message can remain in our outgoing queue.
+    /// </summary>
+    public int? ValidityPeriod { get; set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    public bool? ForceDelivery { get; set; }
+    /// <summary>
+    /// Determines if the message content can be stored or redacted based on privacy settings
+    /// </summary>
+    public MessageResource.ContentRetentionEnum ContentRetention { get; set; }
+    /// <summary>
+    /// Determines if the address can be stored or obfuscated based on privacy settings
+    /// </summary>
+    public MessageResource.AddressRetentionEnum AddressRetention { get; set; }
+    /// <summary>
+    /// Whether to detect Unicode characters that have a similar GSM-7 character and replace them
+    /// </summary>
+    public bool? SmartEncoded { get; set; }
+    /// <summary>
+    /// Rich actions for Channels Messages.
+    /// </summary>
+    public List<string> PersistentAction { get; set; }
+    /// <summary>
+    /// If set to True, Twilio will deliver the message as a single MMS message, regardless of the presence of media
+    /// </summary>
+    public bool? SendAsMms { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMessageOptions
+    /// </summary>
+    /// <param name="to"> The destination phone number </param>
+    public CreateMessageOptions(Types.PhoneNumber to)
+    {
+      To = to;
+      MediaUrl = new List<Uri>();
+      PersistentAction = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To.ToString()));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From.ToString()));
+      }
+
+      if (MessagingServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
+      }
+
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (MediaUrl != null)
+      {
+        p.AddRange(MediaUrl.Select(prop => new KeyValuePair<string, string>("MediaUrl", Serializers.Url(prop))));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (ApplicationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApplicationSid", ApplicationSid.ToString()));
+      }
+
+      if (MaxPrice != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MaxPrice", MaxPrice.Value.ToString()));
+      }
+
+      if (ProvideFeedback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ProvideFeedback", ProvideFeedback.Value.ToString().ToLower()));
+      }
+
+      if (Attempt != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attempt", Attempt.ToString()));
+      }
+
+      if (ValidityPeriod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ValidityPeriod", ValidityPeriod.ToString()));
+      }
+
+      if (ForceDelivery != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ForceDelivery", ForceDelivery.Value.ToString().ToLower()));
+      }
+
+      if (ContentRetention != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ContentRetention", ContentRetention.ToString()));
+      }
+
+      if (AddressRetention != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AddressRetention", AddressRetention.ToString()));
+      }
+
+      if (SmartEncoded != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmartEncoded", SmartEncoded.Value.ToString().ToLower()));
+      }
+
+      if (PersistentAction != null)
+      {
+        p.AddRange(PersistentAction.Select(prop => new KeyValuePair<string, string>("PersistentAction", prop)));
+      }
+
+      if (SendAsMms != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SendAsMms", SendAsMms.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Deletes a message record from your account
+  /// </summary>
+  public class DeleteMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteMessageOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteMessageOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a message belonging to the account used to make the request
+  /// </summary>
+  public class FetchMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchMessageOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchMessageOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of messages belonging to the account used to make the request
+  /// </summary>
+  public class ReadMessageOptions : ReadOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// Filter by messages sent to this number
+    /// </summary>
+    public Types.PhoneNumber To { get; set; }
+    /// <summary>
+    /// Filter by from number
+    /// </summary>
+    public Types.PhoneNumber From { get; set; }
+    /// <summary>
+    /// Filter by date sent
+    /// </summary>
+    public DateTime? DateSentBefore { get; set; }
+    /// <summary>
+    /// Filter by date sent
+    /// </summary>
+    public DateTime? DateSent { get; set; }
+    /// <summary>
+    /// Filter by date sent
+    /// </summary>
+    public DateTime? DateSentAfter { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To.ToString()));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From.ToString()));
+      }
+
+      if (DateSent != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateSent", Serializers.DateTimeIso8601(DateSent)));
+      }
+      else
+      {
+        if (DateSentBefore != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateSent<", Serializers.DateTimeIso8601(DateSentBefore)));
+        }
+
+        if (DateSentAfter != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateSent>", Serializers.DateTimeIso8601(DateSentAfter)));
+        }
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// To redact a message-body from a post-flight message record, post to the message instance resource with an empty body
+  /// </summary>
+  public class UpdateMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The text of the message you want to send
+    /// </summary>
+    public string Body { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateMessageOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateMessageOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/MessageResource.cs b/src/Twilio/Rest/Api/V2010/Account/MessageResource.cs
index 56ac37356..6e2575632 100644
--- a/src/Twilio/Rest/Api/V2010/Account/MessageResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/MessageResource.cs
@@ -17,751 +17,751 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class MessageResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Queued = new StatusEnum("queued");
-            public static readonly StatusEnum Sending = new StatusEnum("sending");
-            public static readonly StatusEnum Sent = new StatusEnum("sent");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-            public static readonly StatusEnum Delivered = new StatusEnum("delivered");
-            public static readonly StatusEnum Undelivered = new StatusEnum("undelivered");
-            public static readonly StatusEnum Receiving = new StatusEnum("receiving");
-            public static readonly StatusEnum Received = new StatusEnum("received");
-            public static readonly StatusEnum Accepted = new StatusEnum("accepted");
-            public static readonly StatusEnum Scheduled = new StatusEnum("scheduled");
-            public static readonly StatusEnum Read = new StatusEnum("read");
-            public static readonly StatusEnum PartiallyDelivered = new StatusEnum("partially_delivered");
-            public static readonly StatusEnum Canceled = new StatusEnum("canceled");
-        }
-
-        public sealed class UpdateStatusEnum : StringEnum
-        {
-            private UpdateStatusEnum(string value) : base(value) {}
-            public UpdateStatusEnum() {}
-            public static implicit operator UpdateStatusEnum(string value)
-            {
-                return new UpdateStatusEnum(value);
-            }
-
-            public static readonly UpdateStatusEnum Canceled = new UpdateStatusEnum("canceled");
-        }
-
-        public sealed class DirectionEnum : StringEnum
-        {
-            private DirectionEnum(string value) : base(value) {}
-            public DirectionEnum() {}
-            public static implicit operator DirectionEnum(string value)
-            {
-                return new DirectionEnum(value);
-            }
-
-            public static readonly DirectionEnum Inbound = new DirectionEnum("inbound");
-            public static readonly DirectionEnum OutboundApi = new DirectionEnum("outbound-api");
-            public static readonly DirectionEnum OutboundCall = new DirectionEnum("outbound-call");
-            public static readonly DirectionEnum OutboundReply = new DirectionEnum("outbound-reply");
-        }
-
-        public sealed class ContentRetentionEnum : StringEnum
-        {
-            private ContentRetentionEnum(string value) : base(value) {}
-            public ContentRetentionEnum() {}
-            public static implicit operator ContentRetentionEnum(string value)
-            {
-                return new ContentRetentionEnum(value);
-            }
-
-            public static readonly ContentRetentionEnum Retain = new ContentRetentionEnum("retain");
-        }
-
-        public sealed class AddressRetentionEnum : StringEnum
-        {
-            private AddressRetentionEnum(string value) : base(value) {}
-            public AddressRetentionEnum() {}
-            public static implicit operator AddressRetentionEnum(string value)
-            {
-                return new AddressRetentionEnum(value);
-            }
-
-            public static readonly AddressRetentionEnum Retain = new AddressRetentionEnum("retain");
-        }
-
-        public sealed class TrafficTypeEnum : StringEnum
-        {
-            private TrafficTypeEnum(string value) : base(value) {}
-            public TrafficTypeEnum() {}
-            public static implicit operator TrafficTypeEnum(string value)
-            {
-                return new TrafficTypeEnum(value);
-            }
-
-            public static readonly TrafficTypeEnum Free = new TrafficTypeEnum("free");
-        }
-
-        public sealed class ScheduleTypeEnum : StringEnum
-        {
-            private ScheduleTypeEnum(string value) : base(value) {}
-            public ScheduleTypeEnum() {}
-            public static implicit operator ScheduleTypeEnum(string value)
-            {
-                return new ScheduleTypeEnum(value);
-            }
-
-            public static readonly ScheduleTypeEnum Fixed = new ScheduleTypeEnum("fixed");
-            public static readonly ScheduleTypeEnum Optimize = new ScheduleTypeEnum("optimize");
-        }
-
-        private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Send a message from the account used to make the request
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Send a message from the account used to make the request
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Send a message from the account used to make the request
-        /// </summary>
-        /// <param name="to"> The destination phone number </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="from"> The phone number that initiated the message </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service you want to associate with the message. </param>
-        /// <param name="body"> The text of the message you want to send. Can be up to 1,600 characters in length. </param>
-        /// <param name="mediaUrl"> The URL of the media to send with the message </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="applicationSid"> The application to use for callbacks </param>
-        /// <param name="maxPrice"> The total maximum price up to 4 decimal places in US dollars acceptable for the message to
-        ///                be delivered. </param>
-        /// <param name="provideFeedback"> Whether to confirm delivery of the message </param>
-        /// <param name="attempt"> Total numer of attempts made , this inclusive to send out the message </param>
-        /// <param name="validityPeriod"> The number of seconds that the message can remain in our outgoing queue. </param>
-        /// <param name="forceDelivery"> Reserved </param>
-        /// <param name="contentRetention"> Determines if the message content can be stored or redacted based on privacy
-        ///                        settings </param>
-        /// <param name="addressRetention"> Determines if the address can be stored or obfuscated based on privacy settings
-        ///                        </param>
-        /// <param name="smartEncoded"> Whether to detect Unicode characters that have a similar GSM-7 character and replace
-        ///                    them </param>
-        /// <param name="persistentAction"> Rich actions for Channels Messages. </param>
-        /// <param name="sendAsMms"> If set to True, Twilio will deliver the message as a single MMS message, regardless of the
-        ///                 presence of media </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(Types.PhoneNumber to,
-                                             string pathAccountSid = null,
-                                             Types.PhoneNumber from = null,
-                                             string messagingServiceSid = null,
-                                             string body = null,
-                                             List<Uri> mediaUrl = null,
-                                             Uri statusCallback = null,
-                                             string applicationSid = null,
-                                             decimal? maxPrice = null,
-                                             bool? provideFeedback = null,
-                                             int? attempt = null,
-                                             int? validityPeriod = null,
-                                             bool? forceDelivery = null,
-                                             MessageResource.ContentRetentionEnum contentRetention = null,
-                                             MessageResource.AddressRetentionEnum addressRetention = null,
-                                             bool? smartEncoded = null,
-                                             List<string> persistentAction = null,
-                                             bool? sendAsMms = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(to){PathAccountSid = pathAccountSid, From = from, MessagingServiceSid = messagingServiceSid, Body = body, MediaUrl = mediaUrl, StatusCallback = statusCallback, ApplicationSid = applicationSid, MaxPrice = maxPrice, ProvideFeedback = provideFeedback, Attempt = attempt, ValidityPeriod = validityPeriod, ForceDelivery = forceDelivery, ContentRetention = contentRetention, AddressRetention = addressRetention, SmartEncoded = smartEncoded, PersistentAction = persistentAction, SendAsMms = sendAsMms};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Send a message from the account used to make the request
-        /// </summary>
-        /// <param name="to"> The destination phone number </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="from"> The phone number that initiated the message </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service you want to associate with the message. </param>
-        /// <param name="body"> The text of the message you want to send. Can be up to 1,600 characters in length. </param>
-        /// <param name="mediaUrl"> The URL of the media to send with the message </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="applicationSid"> The application to use for callbacks </param>
-        /// <param name="maxPrice"> The total maximum price up to 4 decimal places in US dollars acceptable for the message to
-        ///                be delivered. </param>
-        /// <param name="provideFeedback"> Whether to confirm delivery of the message </param>
-        /// <param name="attempt"> Total numer of attempts made , this inclusive to send out the message </param>
-        /// <param name="validityPeriod"> The number of seconds that the message can remain in our outgoing queue. </param>
-        /// <param name="forceDelivery"> Reserved </param>
-        /// <param name="contentRetention"> Determines if the message content can be stored or redacted based on privacy
-        ///                        settings </param>
-        /// <param name="addressRetention"> Determines if the address can be stored or obfuscated based on privacy settings
-        ///                        </param>
-        /// <param name="smartEncoded"> Whether to detect Unicode characters that have a similar GSM-7 character and replace
-        ///                    them </param>
-        /// <param name="persistentAction"> Rich actions for Channels Messages. </param>
-        /// <param name="sendAsMms"> If set to True, Twilio will deliver the message as a single MMS message, regardless of the
-        ///                 presence of media </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(Types.PhoneNumber to,
-                                                                                     string pathAccountSid = null,
-                                                                                     Types.PhoneNumber from = null,
-                                                                                     string messagingServiceSid = null,
-                                                                                     string body = null,
-                                                                                     List<Uri> mediaUrl = null,
-                                                                                     Uri statusCallback = null,
-                                                                                     string applicationSid = null,
-                                                                                     decimal? maxPrice = null,
-                                                                                     bool? provideFeedback = null,
-                                                                                     int? attempt = null,
-                                                                                     int? validityPeriod = null,
-                                                                                     bool? forceDelivery = null,
-                                                                                     MessageResource.ContentRetentionEnum contentRetention = null,
-                                                                                     MessageResource.AddressRetentionEnum addressRetention = null,
-                                                                                     bool? smartEncoded = null,
-                                                                                     List<string> persistentAction = null,
-                                                                                     bool? sendAsMms = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(to){PathAccountSid = pathAccountSid, From = from, MessagingServiceSid = messagingServiceSid, Body = body, MediaUrl = mediaUrl, StatusCallback = statusCallback, ApplicationSid = applicationSid, MaxPrice = maxPrice, ProvideFeedback = provideFeedback, Attempt = attempt, ValidityPeriod = validityPeriod, ForceDelivery = forceDelivery, ContentRetention = contentRetention, AddressRetention = addressRetention, SmartEncoded = smartEncoded, PersistentAction = persistentAction, SendAsMms = sendAsMms};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Deletes a message record from your account
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Deletes a message record from your account
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Deletes a message record from your account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Deletes a message record from your account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a message belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a message belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a message belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a message belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathSid,
-                                                                                    string pathAccountSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of messages belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of messages belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of messages belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="to"> Filter by messages sent to this number </param>
-        /// <param name="from"> Filter by from number </param>
-        /// <param name="dateSentBefore"> Filter by date sent </param>
-        /// <param name="dateSent"> Filter by date sent </param>
-        /// <param name="dateSentAfter"> Filter by date sent </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(string pathAccountSid = null,
-                                                        Types.PhoneNumber to = null,
-                                                        Types.PhoneNumber from = null,
-                                                        DateTime? dateSentBefore = null,
-                                                        DateTime? dateSent = null,
-                                                        DateTime? dateSentAfter = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(){PathAccountSid = pathAccountSid, To = to, From = from, DateSentBefore = dateSentBefore, DateSent = dateSent, DateSentAfter = dateSentAfter, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of messages belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="to"> Filter by messages sent to this number </param>
-        /// <param name="from"> Filter by from number </param>
-        /// <param name="dateSentBefore"> Filter by date sent </param>
-        /// <param name="dateSent"> Filter by date sent </param>
-        /// <param name="dateSentAfter"> Filter by date sent </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                Types.PhoneNumber to = null,
-                                                                                                Types.PhoneNumber from = null,
-                                                                                                DateTime? dateSentBefore = null,
-                                                                                                DateTime? dateSent = null,
-                                                                                                DateTime? dateSentAfter = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(){PathAccountSid = pathAccountSid, To = to, From = from, DateSentBefore = dateSentBefore, DateSent = dateSent, DateSentAfter = dateSentAfter, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// To redact a message-body from a post-flight message record, post to the message instance resource with an empty body
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// To redact a message-body from a post-flight message record, post to the message instance resource with an empty body
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// To redact a message-body from a post-flight message record, post to the message instance resource with an empty body
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
-        /// <param name="body"> The text of the message you want to send </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(string pathSid,
-                                             string pathAccountSid = null,
-                                             string body = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathSid){PathAccountSid = pathAccountSid, Body = body};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// To redact a message-body from a post-flight message record, post to the message instance resource with an empty body
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
-        /// <param name="body"> The text of the message you want to send </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathSid,
-                                                                                     string pathAccountSid = null,
-                                                                                     string body = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathSid){PathAccountSid = pathAccountSid, Body = body};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a MessageResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MessageResource object represented by the provided JSON </returns>
-        public static MessageResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MessageResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The message text
-        /// </summary>
-        [JsonProperty("body")]
-        public string Body { get; private set; }
-        /// <summary>
-        /// The number of messages used to deliver the message body
-        /// </summary>
-        [JsonProperty("num_segments")]
-        public string NumSegments { get; private set; }
-        /// <summary>
-        /// The direction of the message
-        /// </summary>
-        [JsonProperty("direction")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public MessageResource.DirectionEnum Direction { get; private set; }
-        /// <summary>
-        /// The phone number that initiated the message
-        /// </summary>
-        [JsonProperty("from")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber From { get; private set; }
-        /// <summary>
-        /// The phone number that received the message
-        /// </summary>
-        [JsonProperty("to")]
-        public string To { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The amount billed for the message
-        /// </summary>
-        [JsonProperty("price")]
-        public string Price { get; private set; }
-        /// <summary>
-        /// The description of the error_code
-        /// </summary>
-        [JsonProperty("error_message")]
-        public string ErrorMessage { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The number of media files associated with the message
-        /// </summary>
-        [JsonProperty("num_media")]
-        public string NumMedia { get; private set; }
-        /// <summary>
-        /// The status of the message
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public MessageResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The SID of the Messaging Service used with the message.
-        /// </summary>
-        [JsonProperty("messaging_service_sid")]
-        public string MessagingServiceSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the message was sent
-        /// </summary>
-        [JsonProperty("date_sent")]
-        public DateTime? DateSent { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The error code associated with the message
-        /// </summary>
-        [JsonProperty("error_code")]
-        public int? ErrorCode { get; private set; }
-        /// <summary>
-        /// The currency in which price is measured
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The API version used to process the message
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-
-        private MessageResource()
-        {
-
-        }
-    }
+{
+
+  public class MessageResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Queued = new StatusEnum("queued");
+      public static readonly StatusEnum Sending = new StatusEnum("sending");
+      public static readonly StatusEnum Sent = new StatusEnum("sent");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+      public static readonly StatusEnum Delivered = new StatusEnum("delivered");
+      public static readonly StatusEnum Undelivered = new StatusEnum("undelivered");
+      public static readonly StatusEnum Receiving = new StatusEnum("receiving");
+      public static readonly StatusEnum Received = new StatusEnum("received");
+      public static readonly StatusEnum Accepted = new StatusEnum("accepted");
+      public static readonly StatusEnum Scheduled = new StatusEnum("scheduled");
+      public static readonly StatusEnum Read = new StatusEnum("read");
+      public static readonly StatusEnum PartiallyDelivered = new StatusEnum("partially_delivered");
+      public static readonly StatusEnum Canceled = new StatusEnum("canceled");
+    }
+
+    public sealed class UpdateStatusEnum : StringEnum
+    {
+      private UpdateStatusEnum(string value) : base(value) { }
+      public UpdateStatusEnum() { }
+      public static implicit operator UpdateStatusEnum(string value)
+      {
+        return new UpdateStatusEnum(value);
+      }
+
+      public static readonly UpdateStatusEnum Canceled = new UpdateStatusEnum("canceled");
+    }
+
+    public sealed class DirectionEnum : StringEnum
+    {
+      private DirectionEnum(string value) : base(value) { }
+      public DirectionEnum() { }
+      public static implicit operator DirectionEnum(string value)
+      {
+        return new DirectionEnum(value);
+      }
+
+      public static readonly DirectionEnum Inbound = new DirectionEnum("inbound");
+      public static readonly DirectionEnum OutboundApi = new DirectionEnum("outbound-api");
+      public static readonly DirectionEnum OutboundCall = new DirectionEnum("outbound-call");
+      public static readonly DirectionEnum OutboundReply = new DirectionEnum("outbound-reply");
+    }
+
+    public sealed class ContentRetentionEnum : StringEnum
+    {
+      private ContentRetentionEnum(string value) : base(value) { }
+      public ContentRetentionEnum() { }
+      public static implicit operator ContentRetentionEnum(string value)
+      {
+        return new ContentRetentionEnum(value);
+      }
+
+      public static readonly ContentRetentionEnum Retain = new ContentRetentionEnum("retain");
+    }
+
+    public sealed class AddressRetentionEnum : StringEnum
+    {
+      private AddressRetentionEnum(string value) : base(value) { }
+      public AddressRetentionEnum() { }
+      public static implicit operator AddressRetentionEnum(string value)
+      {
+        return new AddressRetentionEnum(value);
+      }
+
+      public static readonly AddressRetentionEnum Retain = new AddressRetentionEnum("retain");
+    }
+
+    public sealed class TrafficTypeEnum : StringEnum
+    {
+      private TrafficTypeEnum(string value) : base(value) { }
+      public TrafficTypeEnum() { }
+      public static implicit operator TrafficTypeEnum(string value)
+      {
+        return new TrafficTypeEnum(value);
+      }
+
+      public static readonly TrafficTypeEnum Free = new TrafficTypeEnum("free");
+    }
+
+    public sealed class ScheduleTypeEnum : StringEnum
+    {
+      private ScheduleTypeEnum(string value) : base(value) { }
+      public ScheduleTypeEnum() { }
+      public static implicit operator ScheduleTypeEnum(string value)
+      {
+        return new ScheduleTypeEnum(value);
+      }
+
+      public static readonly ScheduleTypeEnum Fixed = new ScheduleTypeEnum("fixed");
+      public static readonly ScheduleTypeEnum Optimize = new ScheduleTypeEnum("optimize");
+    }
+
+    private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Send a message from the account used to make the request
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Send a message from the account used to make the request
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Send a message from the account used to make the request
+    /// </summary>
+    /// <param name="to"> The destination phone number </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="from"> The phone number that initiated the message </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service you want to associate with the message. </param>
+    /// <param name="body"> The text of the message you want to send. Can be up to 1,600 characters in length. </param>
+    /// <param name="mediaUrl"> The URL of the media to send with the message </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="applicationSid"> The application to use for callbacks </param>
+    /// <param name="maxPrice"> The total maximum price up to 4 decimal places in US dollars acceptable for the message to
+    ///                be delivered. </param>
+    /// <param name="provideFeedback"> Whether to confirm delivery of the message </param>
+    /// <param name="attempt"> Total numer of attempts made , this inclusive to send out the message </param>
+    /// <param name="validityPeriod"> The number of seconds that the message can remain in our outgoing queue. </param>
+    /// <param name="forceDelivery"> Reserved </param>
+    /// <param name="contentRetention"> Determines if the message content can be stored or redacted based on privacy
+    ///                        settings </param>
+    /// <param name="addressRetention"> Determines if the address can be stored or obfuscated based on privacy settings
+    ///                        </param>
+    /// <param name="smartEncoded"> Whether to detect Unicode characters that have a similar GSM-7 character and replace
+    ///                    them </param>
+    /// <param name="persistentAction"> Rich actions for Channels Messages. </param>
+    /// <param name="sendAsMms"> If set to True, Twilio will deliver the message as a single MMS message, regardless of the
+    ///                 presence of media </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(Types.PhoneNumber to,
+                                         string pathAccountSid = null,
+                                         Types.PhoneNumber from = null,
+                                         string messagingServiceSid = null,
+                                         string body = null,
+                                         List<Uri> mediaUrl = null,
+                                         Uri statusCallback = null,
+                                         string applicationSid = null,
+                                         decimal? maxPrice = null,
+                                         bool? provideFeedback = null,
+                                         int? attempt = null,
+                                         int? validityPeriod = null,
+                                         bool? forceDelivery = null,
+                                         MessageResource.ContentRetentionEnum contentRetention = null,
+                                         MessageResource.AddressRetentionEnum addressRetention = null,
+                                         bool? smartEncoded = null,
+                                         List<string> persistentAction = null,
+                                         bool? sendAsMms = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(to) { PathAccountSid = pathAccountSid, From = from, MessagingServiceSid = messagingServiceSid, Body = body, MediaUrl = mediaUrl, StatusCallback = statusCallback, ApplicationSid = applicationSid, MaxPrice = maxPrice, ProvideFeedback = provideFeedback, Attempt = attempt, ValidityPeriod = validityPeriod, ForceDelivery = forceDelivery, ContentRetention = contentRetention, AddressRetention = addressRetention, SmartEncoded = smartEncoded, PersistentAction = persistentAction, SendAsMms = sendAsMms };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Send a message from the account used to make the request
+    /// </summary>
+    /// <param name="to"> The destination phone number </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="from"> The phone number that initiated the message </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service you want to associate with the message. </param>
+    /// <param name="body"> The text of the message you want to send. Can be up to 1,600 characters in length. </param>
+    /// <param name="mediaUrl"> The URL of the media to send with the message </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="applicationSid"> The application to use for callbacks </param>
+    /// <param name="maxPrice"> The total maximum price up to 4 decimal places in US dollars acceptable for the message to
+    ///                be delivered. </param>
+    /// <param name="provideFeedback"> Whether to confirm delivery of the message </param>
+    /// <param name="attempt"> Total numer of attempts made , this inclusive to send out the message </param>
+    /// <param name="validityPeriod"> The number of seconds that the message can remain in our outgoing queue. </param>
+    /// <param name="forceDelivery"> Reserved </param>
+    /// <param name="contentRetention"> Determines if the message content can be stored or redacted based on privacy
+    ///                        settings </param>
+    /// <param name="addressRetention"> Determines if the address can be stored or obfuscated based on privacy settings
+    ///                        </param>
+    /// <param name="smartEncoded"> Whether to detect Unicode characters that have a similar GSM-7 character and replace
+    ///                    them </param>
+    /// <param name="persistentAction"> Rich actions for Channels Messages. </param>
+    /// <param name="sendAsMms"> If set to True, Twilio will deliver the message as a single MMS message, regardless of the
+    ///                 presence of media </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(Types.PhoneNumber to,
+                                                                                 string pathAccountSid = null,
+                                                                                 Types.PhoneNumber from = null,
+                                                                                 string messagingServiceSid = null,
+                                                                                 string body = null,
+                                                                                 List<Uri> mediaUrl = null,
+                                                                                 Uri statusCallback = null,
+                                                                                 string applicationSid = null,
+                                                                                 decimal? maxPrice = null,
+                                                                                 bool? provideFeedback = null,
+                                                                                 int? attempt = null,
+                                                                                 int? validityPeriod = null,
+                                                                                 bool? forceDelivery = null,
+                                                                                 MessageResource.ContentRetentionEnum contentRetention = null,
+                                                                                 MessageResource.AddressRetentionEnum addressRetention = null,
+                                                                                 bool? smartEncoded = null,
+                                                                                 List<string> persistentAction = null,
+                                                                                 bool? sendAsMms = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(to) { PathAccountSid = pathAccountSid, From = from, MessagingServiceSid = messagingServiceSid, Body = body, MediaUrl = mediaUrl, StatusCallback = statusCallback, ApplicationSid = applicationSid, MaxPrice = maxPrice, ProvideFeedback = provideFeedback, Attempt = attempt, ValidityPeriod = validityPeriod, ForceDelivery = forceDelivery, ContentRetention = contentRetention, AddressRetention = addressRetention, SmartEncoded = smartEncoded, PersistentAction = persistentAction, SendAsMms = sendAsMms };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Deletes a message record from your account
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Deletes a message record from your account
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Deletes a message record from your account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Deletes a message record from your account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a message belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a message belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a message belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a message belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathSid,
+                                                                                string pathAccountSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of messages belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of messages belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of messages belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="to"> Filter by messages sent to this number </param>
+    /// <param name="from"> Filter by from number </param>
+    /// <param name="dateSentBefore"> Filter by date sent </param>
+    /// <param name="dateSent"> Filter by date sent </param>
+    /// <param name="dateSentAfter"> Filter by date sent </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(string pathAccountSid = null,
+                                                    Types.PhoneNumber to = null,
+                                                    Types.PhoneNumber from = null,
+                                                    DateTime? dateSentBefore = null,
+                                                    DateTime? dateSent = null,
+                                                    DateTime? dateSentAfter = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions() { PathAccountSid = pathAccountSid, To = to, From = from, DateSentBefore = dateSentBefore, DateSent = dateSent, DateSentAfter = dateSentAfter, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of messages belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="to"> Filter by messages sent to this number </param>
+    /// <param name="from"> Filter by from number </param>
+    /// <param name="dateSentBefore"> Filter by date sent </param>
+    /// <param name="dateSent"> Filter by date sent </param>
+    /// <param name="dateSentAfter"> Filter by date sent </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathAccountSid = null,
+                                                                                            Types.PhoneNumber to = null,
+                                                                                            Types.PhoneNumber from = null,
+                                                                                            DateTime? dateSentBefore = null,
+                                                                                            DateTime? dateSent = null,
+                                                                                            DateTime? dateSentAfter = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions() { PathAccountSid = pathAccountSid, To = to, From = from, DateSentBefore = dateSentBefore, DateSent = dateSent, DateSentAfter = dateSentAfter, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Messages/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// To redact a message-body from a post-flight message record, post to the message instance resource with an empty body
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// To redact a message-body from a post-flight message record, post to the message instance resource with an empty body
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// To redact a message-body from a post-flight message record, post to the message instance resource with an empty body
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
+    /// <param name="body"> The text of the message you want to send </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(string pathSid,
+                                         string pathAccountSid = null,
+                                         string body = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathSid) { PathAccountSid = pathAccountSid, Body = body };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// To redact a message-body from a post-flight message record, post to the message instance resource with an empty body
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
+    /// <param name="body"> The text of the message you want to send </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathSid,
+                                                                                 string pathAccountSid = null,
+                                                                                 string body = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathSid) { PathAccountSid = pathAccountSid, Body = body };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a MessageResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MessageResource object represented by the provided JSON </returns>
+    public static MessageResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MessageResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The message text
+    /// </summary>
+    [JsonProperty("body")]
+    public string Body { get; private set; }
+    /// <summary>
+    /// The number of messages used to deliver the message body
+    /// </summary>
+    [JsonProperty("num_segments")]
+    public string NumSegments { get; private set; }
+    /// <summary>
+    /// The direction of the message
+    /// </summary>
+    [JsonProperty("direction")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public MessageResource.DirectionEnum Direction { get; private set; }
+    /// <summary>
+    /// The phone number that initiated the message
+    /// </summary>
+    [JsonProperty("from")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber From { get; private set; }
+    /// <summary>
+    /// The phone number that received the message
+    /// </summary>
+    [JsonProperty("to")]
+    public string To { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The amount billed for the message
+    /// </summary>
+    [JsonProperty("price")]
+    public string Price { get; private set; }
+    /// <summary>
+    /// The description of the error_code
+    /// </summary>
+    [JsonProperty("error_message")]
+    public string ErrorMessage { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The number of media files associated with the message
+    /// </summary>
+    [JsonProperty("num_media")]
+    public string NumMedia { get; private set; }
+    /// <summary>
+    /// The status of the message
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public MessageResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The SID of the Messaging Service used with the message.
+    /// </summary>
+    [JsonProperty("messaging_service_sid")]
+    public string MessagingServiceSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the message was sent
+    /// </summary>
+    [JsonProperty("date_sent")]
+    public DateTime? DateSent { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The error code associated with the message
+    /// </summary>
+    [JsonProperty("error_code")]
+    public int? ErrorCode { get; private set; }
+    /// <summary>
+    /// The currency in which price is measured
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The API version used to process the message
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+
+    private MessageResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/NewKeyOptions.cs b/src/Twilio/Rest/Api/V2010/Account/NewKeyOptions.cs
index c8ad71ce2..85ba02ad6 100644
--- a/src/Twilio/Rest/Api/V2010/Account/NewKeyOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/NewKeyOptions.cs
@@ -9,35 +9,35 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// CreateNewKeyOptions
+  /// </summary>
+  public class CreateNewKeyOptions : IOptions<NewKeyResource>
+  {
     /// <summary>
-    /// CreateNewKeyOptions
+    /// The SID of the Account that will be responsible for the new Key resource
     /// </summary>
-    public class CreateNewKeyOptions : IOptions<NewKeyResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will be responsible for the new Key resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/NewKeyResource.cs b/src/Twilio/Rest/Api/V2010/Account/NewKeyResource.cs
index 04d61631c..22ab1034f 100644
--- a/src/Twilio/Rest/Api/V2010/Account/NewKeyResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/NewKeyResource.cs
@@ -16,130 +16,130 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class NewKeyResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateNewKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Keys.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create NewKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NewKey </returns>
-        public static NewKeyResource Create(CreateNewKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create NewKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NewKey </returns>
-        public static async System.Threading.Tasks.Task<NewKeyResource> CreateAsync(CreateNewKeyOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that will be responsible for the new Key resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NewKey </returns>
-        public static NewKeyResource Create(string pathAccountSid = null,
-                                            string friendlyName = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateNewKeyOptions(){PathAccountSid = pathAccountSid, FriendlyName = friendlyName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that will be responsible for the new Key resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NewKey </returns>
-        public static async System.Threading.Tasks.Task<NewKeyResource> CreateAsync(string pathAccountSid = null,
-                                                                                    string friendlyName = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateNewKeyOptions(){PathAccountSid = pathAccountSid, FriendlyName = friendlyName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a NewKeyResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NewKeyResource object represented by the provided JSON </returns>
-        public static NewKeyResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NewKeyResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The secret your application uses to sign Access Tokens and to authenticate to the REST API.
-        /// </summary>
-        [JsonProperty("secret")]
-        public string Secret { get; private set; }
-
-        private NewKeyResource()
-        {
-
-        }
-    }
+{
+
+  public class NewKeyResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateNewKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Keys.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create NewKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NewKey </returns>
+    public static NewKeyResource Create(CreateNewKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create NewKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NewKey </returns>
+    public static async System.Threading.Tasks.Task<NewKeyResource> CreateAsync(CreateNewKeyOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that will be responsible for the new Key resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NewKey </returns>
+    public static NewKeyResource Create(string pathAccountSid = null,
+                                        string friendlyName = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateNewKeyOptions() { PathAccountSid = pathAccountSid, FriendlyName = friendlyName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that will be responsible for the new Key resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NewKey </returns>
+    public static async System.Threading.Tasks.Task<NewKeyResource> CreateAsync(string pathAccountSid = null,
+                                                                                string friendlyName = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateNewKeyOptions() { PathAccountSid = pathAccountSid, FriendlyName = friendlyName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a NewKeyResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NewKeyResource object represented by the provided JSON </returns>
+    public static NewKeyResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NewKeyResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The secret your application uses to sign Access Tokens and to authenticate to the REST API.
+    /// </summary>
+    [JsonProperty("secret")]
+    public string Secret { get; private set; }
+
+    private NewKeyResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/NewSigningKeyOptions.cs b/src/Twilio/Rest/Api/V2010/Account/NewSigningKeyOptions.cs
index f10231695..516928c29 100644
--- a/src/Twilio/Rest/Api/V2010/Account/NewSigningKeyOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/NewSigningKeyOptions.cs
@@ -9,35 +9,35 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Create a new Signing Key for the account making the request.
+  /// </summary>
+  public class CreateNewSigningKeyOptions : IOptions<NewSigningKeyResource>
+  {
     /// <summary>
-    /// Create a new Signing Key for the account making the request.
+    /// The SID of the Account that will be responsible for the new Key resource
     /// </summary>
-    public class CreateNewSigningKeyOptions : IOptions<NewSigningKeyResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will be responsible for the new Key resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/NewSigningKeyResource.cs b/src/Twilio/Rest/Api/V2010/Account/NewSigningKeyResource.cs
index 4efc24c78..61a10fed2 100644
--- a/src/Twilio/Rest/Api/V2010/Account/NewSigningKeyResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/NewSigningKeyResource.cs
@@ -16,130 +16,130 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class NewSigningKeyResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateNewSigningKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SigningKeys.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Signing Key for the account making the request.
-        /// </summary>
-        /// <param name="options"> Create NewSigningKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NewSigningKey </returns>
-        public static NewSigningKeyResource Create(CreateNewSigningKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Signing Key for the account making the request.
-        /// </summary>
-        /// <param name="options"> Create NewSigningKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NewSigningKey </returns>
-        public static async System.Threading.Tasks.Task<NewSigningKeyResource> CreateAsync(CreateNewSigningKeyOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Signing Key for the account making the request.
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that will be responsible for the new Key resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NewSigningKey </returns>
-        public static NewSigningKeyResource Create(string pathAccountSid = null,
-                                                   string friendlyName = null,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateNewSigningKeyOptions(){PathAccountSid = pathAccountSid, FriendlyName = friendlyName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Signing Key for the account making the request.
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that will be responsible for the new Key resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NewSigningKey </returns>
-        public static async System.Threading.Tasks.Task<NewSigningKeyResource> CreateAsync(string pathAccountSid = null,
-                                                                                           string friendlyName = null,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateNewSigningKeyOptions(){PathAccountSid = pathAccountSid, FriendlyName = friendlyName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a NewSigningKeyResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NewSigningKeyResource object represented by the provided JSON </returns>
-        public static NewSigningKeyResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NewSigningKeyResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The secret your application uses to sign Access Tokens and to authenticate to the REST API.
-        /// </summary>
-        [JsonProperty("secret")]
-        public string Secret { get; private set; }
-
-        private NewSigningKeyResource()
-        {
-
-        }
-    }
+{
+
+  public class NewSigningKeyResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateNewSigningKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SigningKeys.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Signing Key for the account making the request.
+    /// </summary>
+    /// <param name="options"> Create NewSigningKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NewSigningKey </returns>
+    public static NewSigningKeyResource Create(CreateNewSigningKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Signing Key for the account making the request.
+    /// </summary>
+    /// <param name="options"> Create NewSigningKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NewSigningKey </returns>
+    public static async System.Threading.Tasks.Task<NewSigningKeyResource> CreateAsync(CreateNewSigningKeyOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Signing Key for the account making the request.
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that will be responsible for the new Key resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NewSigningKey </returns>
+    public static NewSigningKeyResource Create(string pathAccountSid = null,
+                                               string friendlyName = null,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateNewSigningKeyOptions() { PathAccountSid = pathAccountSid, FriendlyName = friendlyName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Signing Key for the account making the request.
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that will be responsible for the new Key resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NewSigningKey </returns>
+    public static async System.Threading.Tasks.Task<NewSigningKeyResource> CreateAsync(string pathAccountSid = null,
+                                                                                       string friendlyName = null,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateNewSigningKeyOptions() { PathAccountSid = pathAccountSid, FriendlyName = friendlyName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a NewSigningKeyResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NewSigningKeyResource object represented by the provided JSON </returns>
+    public static NewSigningKeyResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NewSigningKeyResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The secret your application uses to sign Access Tokens and to authenticate to the REST API.
+    /// </summary>
+    [JsonProperty("secret")]
+    public string Secret { get; private set; }
+
+    private NewSigningKeyResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/NotificationOptions.cs b/src/Twilio/Rest/Api/V2010/Account/NotificationOptions.cs
index e563d6afd..6a1f49d96 100644
--- a/src/Twilio/Rest/Api/V2010/Account/NotificationOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/NotificationOptions.cs
@@ -9,102 +9,102 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Fetch a notification belonging to the account used to make the request
+  /// </summary>
+  public class FetchNotificationOptions : IOptions<NotificationResource>
+  {
     /// <summary>
-    /// Fetch a notification belonging to the account used to make the request
+    /// The SID of the Account that created the resource to fetch
     /// </summary>
-    public class FetchNotificationOptions : IOptions<NotificationResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchNotificationOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchNotificationOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Retrieve a list of notifications belonging to the account used to make the request
+    /// The unique string that identifies the resource
     /// </summary>
-    public class ReadNotificationOptions : ReadOptions<NotificationResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Filter by log level
-        /// </summary>
-        public int? Log { get; set; }
-        /// <summary>
-        /// Filter by date
-        /// </summary>
-        public DateTime? MessageDateBefore { get; set; }
-        /// <summary>
-        /// Filter by date
-        /// </summary>
-        public DateTime? MessageDate { get; set; }
-        /// <summary>
-        /// Filter by date
-        /// </summary>
-        public DateTime? MessageDateAfter { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Log != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Log", Log.ToString()));
-            }
-
-            if (MessageDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessageDate", MessageDate.Value.ToString("yyyy-MM-dd")));
-            }
-            else
-            {
-                if (MessageDateBefore != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("MessageDate<", MessageDateBefore.Value.ToString("yyyy-MM-dd")));
-                }
-
-                if (MessageDateAfter != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("MessageDate>", MessageDateAfter.Value.ToString("yyyy-MM-dd")));
-                }
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchNotificationOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchNotificationOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of notifications belonging to the account used to make the request
+  /// </summary>
+  public class ReadNotificationOptions : ReadOptions<NotificationResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// Filter by log level
+    /// </summary>
+    public int? Log { get; set; }
+    /// <summary>
+    /// Filter by date
+    /// </summary>
+    public DateTime? MessageDateBefore { get; set; }
+    /// <summary>
+    /// Filter by date
+    /// </summary>
+    public DateTime? MessageDate { get; set; }
+    /// <summary>
+    /// Filter by date
+    /// </summary>
+    public DateTime? MessageDateAfter { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Log != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Log", Log.ToString()));
+      }
+
+      if (MessageDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessageDate", MessageDate.Value.ToString("yyyy-MM-dd")));
+      }
+      else
+      {
+        if (MessageDateBefore != null)
+        {
+          p.Add(new KeyValuePair<string, string>("MessageDate<", MessageDateBefore.Value.ToString("yyyy-MM-dd")));
+        }
+
+        if (MessageDateAfter != null)
+        {
+          p.Add(new KeyValuePair<string, string>("MessageDate>", MessageDateAfter.Value.ToString("yyyy-MM-dd")));
+        }
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/NotificationResource.cs b/src/Twilio/Rest/Api/V2010/Account/NotificationResource.cs
index 7899eb773..a07acf5d9 100644
--- a/src/Twilio/Rest/Api/V2010/Account/NotificationResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/NotificationResource.cs
@@ -16,341 +16,341 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class NotificationResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchNotificationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Notifications/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a notification belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Fetch Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static NotificationResource Fetch(FetchNotificationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a notification belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Fetch Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<NotificationResource> FetchAsync(FetchNotificationOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a notification belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static NotificationResource Fetch(string pathSid,
-                                                 string pathAccountSid = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchNotificationOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a notification belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<NotificationResource> FetchAsync(string pathSid,
-                                                                                         string pathAccountSid = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchNotificationOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadNotificationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Notifications.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of notifications belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static ResourceSet<NotificationResource> Read(ReadNotificationOptions options,
-                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<NotificationResource>.FromJson("notifications", response.Content);
-            return new ResourceSet<NotificationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of notifications belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<NotificationResource>> ReadAsync(ReadNotificationOptions options,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<NotificationResource>.FromJson("notifications", response.Content);
-            return new ResourceSet<NotificationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of notifications belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="log"> Filter by log level </param>
-        /// <param name="messageDateBefore"> Filter by date </param>
-        /// <param name="messageDate"> Filter by date </param>
-        /// <param name="messageDateAfter"> Filter by date </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static ResourceSet<NotificationResource> Read(string pathAccountSid = null,
-                                                             int? log = null,
-                                                             DateTime? messageDateBefore = null,
-                                                             DateTime? messageDate = null,
-                                                             DateTime? messageDateAfter = null,
-                                                             int? pageSize = null,
-                                                             long? limit = null,
-                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadNotificationOptions(){PathAccountSid = pathAccountSid, Log = log, MessageDateBefore = messageDateBefore, MessageDate = messageDate, MessageDateAfter = messageDateAfter, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of notifications belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="log"> Filter by log level </param>
-        /// <param name="messageDateBefore"> Filter by date </param>
-        /// <param name="messageDate"> Filter by date </param>
-        /// <param name="messageDateAfter"> Filter by date </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<NotificationResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                     int? log = null,
-                                                                                                     DateTime? messageDateBefore = null,
-                                                                                                     DateTime? messageDate = null,
-                                                                                                     DateTime? messageDateAfter = null,
-                                                                                                     int? pageSize = null,
-                                                                                                     long? limit = null,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadNotificationOptions(){PathAccountSid = pathAccountSid, Log = log, MessageDateBefore = messageDateBefore, MessageDate = messageDate, MessageDateAfter = messageDateAfter, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<NotificationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<NotificationResource>.FromJson("notifications", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<NotificationResource> NextPage(Page<NotificationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<NotificationResource>.FromJson("notifications", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<NotificationResource> PreviousPage(Page<NotificationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<NotificationResource>.FromJson("notifications", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a NotificationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NotificationResource object represented by the provided JSON </returns>
-        public static NotificationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NotificationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to generate the notification
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The SID of the Call the resource is associated with
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// A unique error code corresponding to the notification
-        /// </summary>
-        [JsonProperty("error_code")]
-        public string ErrorCode { get; private set; }
-        /// <summary>
-        /// An integer log level
-        /// </summary>
-        [JsonProperty("log")]
-        public string Log { get; private set; }
-        /// <summary>
-        /// The date the notification was generated
-        /// </summary>
-        [JsonProperty("message_date")]
-        public DateTime? MessageDate { get; private set; }
-        /// <summary>
-        /// The text of the notification
-        /// </summary>
-        [JsonProperty("message_text")]
-        public string MessageText { get; private set; }
-        /// <summary>
-        /// A URL for more information about the error code
-        /// </summary>
-        [JsonProperty("more_info")]
-        public Uri MoreInfo { get; private set; }
-        /// <summary>
-        /// HTTP method used with the request url
-        /// </summary>
-        [JsonProperty("request_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod RequestMethod { get; private set; }
-        /// <summary>
-        /// URL of the resource that generated the notification
-        /// </summary>
-        [JsonProperty("request_url")]
-        public Uri RequestUrl { get; private set; }
-        /// <summary>
-        /// Twilio-generated HTTP variables sent to the server
-        /// </summary>
-        [JsonProperty("request_variables")]
-        public string RequestVariables { get; private set; }
-        /// <summary>
-        /// The HTTP body returned by your server
-        /// </summary>
-        [JsonProperty("response_body")]
-        public string ResponseBody { get; private set; }
-        /// <summary>
-        /// The HTTP headers returned by your server
-        /// </summary>
-        [JsonProperty("response_headers")]
-        public string ResponseHeaders { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private NotificationResource()
-        {
-
-        }
-    }
+{
+
+  public class NotificationResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchNotificationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Notifications/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a notification belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Fetch Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static NotificationResource Fetch(FetchNotificationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a notification belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Fetch Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<NotificationResource> FetchAsync(FetchNotificationOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a notification belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static NotificationResource Fetch(string pathSid,
+                                             string pathAccountSid = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchNotificationOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a notification belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<NotificationResource> FetchAsync(string pathSid,
+                                                                                     string pathAccountSid = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchNotificationOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadNotificationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Notifications.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of notifications belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static ResourceSet<NotificationResource> Read(ReadNotificationOptions options,
+                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<NotificationResource>.FromJson("notifications", response.Content);
+      return new ResourceSet<NotificationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of notifications belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<NotificationResource>> ReadAsync(ReadNotificationOptions options,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<NotificationResource>.FromJson("notifications", response.Content);
+      return new ResourceSet<NotificationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of notifications belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="log"> Filter by log level </param>
+    /// <param name="messageDateBefore"> Filter by date </param>
+    /// <param name="messageDate"> Filter by date </param>
+    /// <param name="messageDateAfter"> Filter by date </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static ResourceSet<NotificationResource> Read(string pathAccountSid = null,
+                                                         int? log = null,
+                                                         DateTime? messageDateBefore = null,
+                                                         DateTime? messageDate = null,
+                                                         DateTime? messageDateAfter = null,
+                                                         int? pageSize = null,
+                                                         long? limit = null,
+                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadNotificationOptions() { PathAccountSid = pathAccountSid, Log = log, MessageDateBefore = messageDateBefore, MessageDate = messageDate, MessageDateAfter = messageDateAfter, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of notifications belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="log"> Filter by log level </param>
+    /// <param name="messageDateBefore"> Filter by date </param>
+    /// <param name="messageDate"> Filter by date </param>
+    /// <param name="messageDateAfter"> Filter by date </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<NotificationResource>> ReadAsync(string pathAccountSid = null,
+                                                                                                 int? log = null,
+                                                                                                 DateTime? messageDateBefore = null,
+                                                                                                 DateTime? messageDate = null,
+                                                                                                 DateTime? messageDateAfter = null,
+                                                                                                 int? pageSize = null,
+                                                                                                 long? limit = null,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadNotificationOptions() { PathAccountSid = pathAccountSid, Log = log, MessageDateBefore = messageDateBefore, MessageDate = messageDate, MessageDateAfter = messageDateAfter, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<NotificationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<NotificationResource>.FromJson("notifications", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<NotificationResource> NextPage(Page<NotificationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<NotificationResource>.FromJson("notifications", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<NotificationResource> PreviousPage(Page<NotificationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<NotificationResource>.FromJson("notifications", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a NotificationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NotificationResource object represented by the provided JSON </returns>
+    public static NotificationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NotificationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to generate the notification
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The SID of the Call the resource is associated with
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// A unique error code corresponding to the notification
+    /// </summary>
+    [JsonProperty("error_code")]
+    public string ErrorCode { get; private set; }
+    /// <summary>
+    /// An integer log level
+    /// </summary>
+    [JsonProperty("log")]
+    public string Log { get; private set; }
+    /// <summary>
+    /// The date the notification was generated
+    /// </summary>
+    [JsonProperty("message_date")]
+    public DateTime? MessageDate { get; private set; }
+    /// <summary>
+    /// The text of the notification
+    /// </summary>
+    [JsonProperty("message_text")]
+    public string MessageText { get; private set; }
+    /// <summary>
+    /// A URL for more information about the error code
+    /// </summary>
+    [JsonProperty("more_info")]
+    public Uri MoreInfo { get; private set; }
+    /// <summary>
+    /// HTTP method used with the request url
+    /// </summary>
+    [JsonProperty("request_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod RequestMethod { get; private set; }
+    /// <summary>
+    /// URL of the resource that generated the notification
+    /// </summary>
+    [JsonProperty("request_url")]
+    public Uri RequestUrl { get; private set; }
+    /// <summary>
+    /// Twilio-generated HTTP variables sent to the server
+    /// </summary>
+    [JsonProperty("request_variables")]
+    public string RequestVariables { get; private set; }
+    /// <summary>
+    /// The HTTP body returned by your server
+    /// </summary>
+    [JsonProperty("response_body")]
+    public string ResponseBody { get; private set; }
+    /// <summary>
+    /// The HTTP headers returned by your server
+    /// </summary>
+    [JsonProperty("response_headers")]
+    public string ResponseHeaders { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private NotificationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/OutgoingCallerIdOptions.cs b/src/Twilio/Rest/Api/V2010/Account/OutgoingCallerIdOptions.cs
index c501c7a69..c220c2733 100644
--- a/src/Twilio/Rest/Api/V2010/Account/OutgoingCallerIdOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/OutgoingCallerIdOptions.cs
@@ -9,157 +9,157 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Fetch an outgoing-caller-id belonging to the account used to make the request
+  /// </summary>
+  public class FetchOutgoingCallerIdOptions : IOptions<OutgoingCallerIdResource>
+  {
     /// <summary>
-    /// Fetch an outgoing-caller-id belonging to the account used to make the request
-    /// </summary>
-    public class FetchOutgoingCallerIdOptions : IOptions<OutgoingCallerIdResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchOutgoingCallerIdOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchOutgoingCallerIdOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Updates the caller-id
-    /// </summary>
-    public class UpdateOutgoingCallerIdOptions : IOptions<OutgoingCallerIdResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateOutgoingCallerIdOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateOutgoingCallerIdOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// Delete the caller-id specified from the account
-    /// </summary>
-    public class DeleteOutgoingCallerIdOptions : IOptions<OutgoingCallerIdResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteOutgoingCallerIdOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteOutgoingCallerIdOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new FetchOutgoingCallerIdOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchOutgoingCallerIdOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// Retrieve a list of outgoing-caller-ids belonging to the account used to make the request
-    /// </summary>
-    public class ReadOutgoingCallerIdOptions : ReadOptions<OutgoingCallerIdResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The phone number of the OutgoingCallerId resources to read
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; set; }
-        /// <summary>
-        /// The string that identifies the OutgoingCallerId resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Updates the caller-id
+  /// </summary>
+  public class UpdateOutgoingCallerIdOptions : IOptions<OutgoingCallerIdResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateOutgoingCallerIdOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateOutgoingCallerIdOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete the caller-id specified from the account
+  /// </summary>
+  public class DeleteOutgoingCallerIdOptions : IOptions<OutgoingCallerIdResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteOutgoingCallerIdOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteOutgoingCallerIdOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of outgoing-caller-ids belonging to the account used to make the request
+  /// </summary>
+  public class ReadOutgoingCallerIdOptions : ReadOptions<OutgoingCallerIdResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The phone number of the OutgoingCallerId resources to read
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; set; }
+    /// <summary>
+    /// The string that identifies the OutgoingCallerId resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/OutgoingCallerIdResource.cs b/src/Twilio/Rest/Api/V2010/Account/OutgoingCallerIdResource.cs
index 3115ab484..063436101 100644
--- a/src/Twilio/Rest/Api/V2010/Account/OutgoingCallerIdResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/OutgoingCallerIdResource.cs
@@ -16,430 +16,430 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class OutgoingCallerIdResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchOutgoingCallerIdOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/OutgoingCallerIds/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an outgoing-caller-id belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Fetch OutgoingCallerId parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OutgoingCallerId </returns>
-        public static OutgoingCallerIdResource Fetch(FetchOutgoingCallerIdOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an outgoing-caller-id belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Fetch OutgoingCallerId parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
-        public static async System.Threading.Tasks.Task<OutgoingCallerIdResource> FetchAsync(FetchOutgoingCallerIdOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an outgoing-caller-id belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OutgoingCallerId </returns>
-        public static OutgoingCallerIdResource Fetch(string pathSid,
-                                                     string pathAccountSid = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchOutgoingCallerIdOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an outgoing-caller-id belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
-        public static async System.Threading.Tasks.Task<OutgoingCallerIdResource> FetchAsync(string pathSid,
-                                                                                             string pathAccountSid = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new FetchOutgoingCallerIdOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateOutgoingCallerIdOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/OutgoingCallerIds/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates the caller-id
-        /// </summary>
-        /// <param name="options"> Update OutgoingCallerId parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OutgoingCallerId </returns>
-        public static OutgoingCallerIdResource Update(UpdateOutgoingCallerIdOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the caller-id
-        /// </summary>
-        /// <param name="options"> Update OutgoingCallerId parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
-        public static async System.Threading.Tasks.Task<OutgoingCallerIdResource> UpdateAsync(UpdateOutgoingCallerIdOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates the caller-id
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OutgoingCallerId </returns>
-        public static OutgoingCallerIdResource Update(string pathSid,
-                                                      string pathAccountSid = null,
-                                                      string friendlyName = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateOutgoingCallerIdOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the caller-id
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
-        public static async System.Threading.Tasks.Task<OutgoingCallerIdResource> UpdateAsync(string pathSid,
-                                                                                              string pathAccountSid = null,
-                                                                                              string friendlyName = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateOutgoingCallerIdOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteOutgoingCallerIdOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/OutgoingCallerIds/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete the caller-id specified from the account
-        /// </summary>
-        /// <param name="options"> Delete OutgoingCallerId parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OutgoingCallerId </returns>
-        public static bool Delete(DeleteOutgoingCallerIdOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete the caller-id specified from the account
-        /// </summary>
-        /// <param name="options"> Delete OutgoingCallerId parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteOutgoingCallerIdOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete the caller-id specified from the account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OutgoingCallerId </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteOutgoingCallerIdOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete the caller-id specified from the account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteOutgoingCallerIdOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadOutgoingCallerIdOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/OutgoingCallerIds.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of outgoing-caller-ids belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read OutgoingCallerId parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OutgoingCallerId </returns>
-        public static ResourceSet<OutgoingCallerIdResource> Read(ReadOutgoingCallerIdOptions options,
-                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<OutgoingCallerIdResource>.FromJson("outgoing_caller_ids", response.Content);
-            return new ResourceSet<OutgoingCallerIdResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of outgoing-caller-ids belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read OutgoingCallerId parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<OutgoingCallerIdResource>> ReadAsync(ReadOutgoingCallerIdOptions options,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<OutgoingCallerIdResource>.FromJson("outgoing_caller_ids", response.Content);
-            return new ResourceSet<OutgoingCallerIdResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of outgoing-caller-ids belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="phoneNumber"> The phone number of the OutgoingCallerId resources to read </param>
-        /// <param name="friendlyName"> The string that identifies the OutgoingCallerId resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OutgoingCallerId </returns>
-        public static ResourceSet<OutgoingCallerIdResource> Read(string pathAccountSid = null,
-                                                                 Types.PhoneNumber phoneNumber = null,
-                                                                 string friendlyName = null,
-                                                                 int? pageSize = null,
-                                                                 long? limit = null,
-                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadOutgoingCallerIdOptions(){PathAccountSid = pathAccountSid, PhoneNumber = phoneNumber, FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of outgoing-caller-ids belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="phoneNumber"> The phone number of the OutgoingCallerId resources to read </param>
-        /// <param name="friendlyName"> The string that identifies the OutgoingCallerId resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<OutgoingCallerIdResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                         Types.PhoneNumber phoneNumber = null,
-                                                                                                         string friendlyName = null,
-                                                                                                         int? pageSize = null,
-                                                                                                         long? limit = null,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadOutgoingCallerIdOptions(){PathAccountSid = pathAccountSid, PhoneNumber = phoneNumber, FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<OutgoingCallerIdResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<OutgoingCallerIdResource>.FromJson("outgoing_caller_ids", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<OutgoingCallerIdResource> NextPage(Page<OutgoingCallerIdResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<OutgoingCallerIdResource>.FromJson("outgoing_caller_ids", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<OutgoingCallerIdResource> PreviousPage(Page<OutgoingCallerIdResource> page,
-                                                                  ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<OutgoingCallerIdResource>.FromJson("outgoing_caller_ids", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a OutgoingCallerIdResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> OutgoingCallerIdResource object represented by the provided JSON </returns>
-        public static OutgoingCallerIdResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<OutgoingCallerIdResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private OutgoingCallerIdResource()
-        {
-
-        }
-    }
+{
+
+  public class OutgoingCallerIdResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchOutgoingCallerIdOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/OutgoingCallerIds/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an outgoing-caller-id belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Fetch OutgoingCallerId parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OutgoingCallerId </returns>
+    public static OutgoingCallerIdResource Fetch(FetchOutgoingCallerIdOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an outgoing-caller-id belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Fetch OutgoingCallerId parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
+    public static async System.Threading.Tasks.Task<OutgoingCallerIdResource> FetchAsync(FetchOutgoingCallerIdOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an outgoing-caller-id belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OutgoingCallerId </returns>
+    public static OutgoingCallerIdResource Fetch(string pathSid,
+                                                 string pathAccountSid = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchOutgoingCallerIdOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an outgoing-caller-id belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
+    public static async System.Threading.Tasks.Task<OutgoingCallerIdResource> FetchAsync(string pathSid,
+                                                                                         string pathAccountSid = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new FetchOutgoingCallerIdOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateOutgoingCallerIdOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/OutgoingCallerIds/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates the caller-id
+    /// </summary>
+    /// <param name="options"> Update OutgoingCallerId parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OutgoingCallerId </returns>
+    public static OutgoingCallerIdResource Update(UpdateOutgoingCallerIdOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the caller-id
+    /// </summary>
+    /// <param name="options"> Update OutgoingCallerId parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
+    public static async System.Threading.Tasks.Task<OutgoingCallerIdResource> UpdateAsync(UpdateOutgoingCallerIdOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates the caller-id
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OutgoingCallerId </returns>
+    public static OutgoingCallerIdResource Update(string pathSid,
+                                                  string pathAccountSid = null,
+                                                  string friendlyName = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateOutgoingCallerIdOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the caller-id
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
+    public static async System.Threading.Tasks.Task<OutgoingCallerIdResource> UpdateAsync(string pathSid,
+                                                                                          string pathAccountSid = null,
+                                                                                          string friendlyName = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateOutgoingCallerIdOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteOutgoingCallerIdOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/OutgoingCallerIds/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete the caller-id specified from the account
+    /// </summary>
+    /// <param name="options"> Delete OutgoingCallerId parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OutgoingCallerId </returns>
+    public static bool Delete(DeleteOutgoingCallerIdOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete the caller-id specified from the account
+    /// </summary>
+    /// <param name="options"> Delete OutgoingCallerId parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteOutgoingCallerIdOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete the caller-id specified from the account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OutgoingCallerId </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteOutgoingCallerIdOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete the caller-id specified from the account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteOutgoingCallerIdOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadOutgoingCallerIdOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/OutgoingCallerIds.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of outgoing-caller-ids belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read OutgoingCallerId parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OutgoingCallerId </returns>
+    public static ResourceSet<OutgoingCallerIdResource> Read(ReadOutgoingCallerIdOptions options,
+                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<OutgoingCallerIdResource>.FromJson("outgoing_caller_ids", response.Content);
+      return new ResourceSet<OutgoingCallerIdResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of outgoing-caller-ids belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read OutgoingCallerId parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<OutgoingCallerIdResource>> ReadAsync(ReadOutgoingCallerIdOptions options,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<OutgoingCallerIdResource>.FromJson("outgoing_caller_ids", response.Content);
+      return new ResourceSet<OutgoingCallerIdResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of outgoing-caller-ids belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="phoneNumber"> The phone number of the OutgoingCallerId resources to read </param>
+    /// <param name="friendlyName"> The string that identifies the OutgoingCallerId resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OutgoingCallerId </returns>
+    public static ResourceSet<OutgoingCallerIdResource> Read(string pathAccountSid = null,
+                                                             Types.PhoneNumber phoneNumber = null,
+                                                             string friendlyName = null,
+                                                             int? pageSize = null,
+                                                             long? limit = null,
+                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadOutgoingCallerIdOptions() { PathAccountSid = pathAccountSid, PhoneNumber = phoneNumber, FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of outgoing-caller-ids belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="phoneNumber"> The phone number of the OutgoingCallerId resources to read </param>
+    /// <param name="friendlyName"> The string that identifies the OutgoingCallerId resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OutgoingCallerId </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<OutgoingCallerIdResource>> ReadAsync(string pathAccountSid = null,
+                                                                                                     Types.PhoneNumber phoneNumber = null,
+                                                                                                     string friendlyName = null,
+                                                                                                     int? pageSize = null,
+                                                                                                     long? limit = null,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadOutgoingCallerIdOptions() { PathAccountSid = pathAccountSid, PhoneNumber = phoneNumber, FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<OutgoingCallerIdResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<OutgoingCallerIdResource>.FromJson("outgoing_caller_ids", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<OutgoingCallerIdResource> NextPage(Page<OutgoingCallerIdResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<OutgoingCallerIdResource>.FromJson("outgoing_caller_ids", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<OutgoingCallerIdResource> PreviousPage(Page<OutgoingCallerIdResource> page,
+                                                              ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<OutgoingCallerIdResource>.FromJson("outgoing_caller_ids", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a OutgoingCallerIdResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> OutgoingCallerIdResource object represented by the provided JSON </returns>
+    public static OutgoingCallerIdResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<OutgoingCallerIdResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private OutgoingCallerIdResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Queue/MemberOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Queue/MemberOptions.cs
index 35176a255..9d03c722f 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Queue/MemberOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Queue/MemberOptions.cs
@@ -9,142 +9,142 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Queue
-{
-
+{
+
+  /// <summary>
+  /// Fetch a specific member from the queue
+  /// </summary>
+  public class FetchMemberOptions : IOptions<MemberResource>
+  {
     /// <summary>
-    /// Fetch a specific member from the queue
-    /// </summary>
-    public class FetchMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Queue in which to find the members
-        /// </summary>
-        public string PathQueueSid { get; }
-        /// <summary>
-        /// The Call SID of the resource(s) to fetch
-        /// </summary>
-        public string PathCallSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMemberOptions
-        /// </summary>
-        /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
-        /// <param name="pathCallSid"> The Call SID of the resource(s) to fetch </param>
-        public FetchMemberOptions(string pathQueueSid, string pathCallSid)
-        {
-            PathQueueSid = pathQueueSid;
-            PathCallSid = pathCallSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resource(s) to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Dequeue a member from a queue and have the member's call begin executing the TwiML document at that URL
-    /// </summary>
-    public class UpdateMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Queue in which to find the members
-        /// </summary>
-        public string PathQueueSid { get; }
-        /// <summary>
-        /// The Call SID of the resource(s) to update
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The absolute URL of the Queue resource
-        /// </summary>
-        public Uri Url { get; }
-        /// <summary>
-        /// How to pass the update request data
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateMemberOptions
-        /// </summary>
-        /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
-        /// <param name="pathCallSid"> The Call SID of the resource(s) to update </param>
-        /// <param name="url"> The absolute URL of the Queue resource </param>
-        public UpdateMemberOptions(string pathQueueSid, string pathCallSid, Uri url)
-        {
-            PathQueueSid = pathQueueSid;
-            PathCallSid = pathCallSid;
-            Url = url;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Url != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Url", Serializers.Url(Url)));
-            }
-
-            if (Method != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Method", Method.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Queue in which to find the members
+    /// </summary>
+    public string PathQueueSid { get; }
     /// <summary>
-    /// Retrieve the members of the queue
-    /// </summary>
-    public class ReadMemberOptions : ReadOptions<MemberResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the Queue in which to find the members
-        /// </summary>
-        public string PathQueueSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadMemberOptions
-        /// </summary>
-        /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
-        public ReadMemberOptions(string pathQueueSid)
-        {
-            PathQueueSid = pathQueueSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The Call SID of the resource(s) to fetch
+    /// </summary>
+    public string PathCallSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchMemberOptions
+    /// </summary>
+    /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
+    /// <param name="pathCallSid"> The Call SID of the resource(s) to fetch </param>
+    public FetchMemberOptions(string pathQueueSid, string pathCallSid)
+    {
+      PathQueueSid = pathQueueSid;
+      PathCallSid = pathCallSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Dequeue a member from a queue and have the member's call begin executing the TwiML document at that URL
+  /// </summary>
+  public class UpdateMemberOptions : IOptions<MemberResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the Queue in which to find the members
+    /// </summary>
+    public string PathQueueSid { get; }
+    /// <summary>
+    /// The Call SID of the resource(s) to update
+    /// </summary>
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The absolute URL of the Queue resource
+    /// </summary>
+    public Uri Url { get; }
+    /// <summary>
+    /// How to pass the update request data
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateMemberOptions
+    /// </summary>
+    /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
+    /// <param name="pathCallSid"> The Call SID of the resource(s) to update </param>
+    /// <param name="url"> The absolute URL of the Queue resource </param>
+    public UpdateMemberOptions(string pathQueueSid, string pathCallSid, Uri url)
+    {
+      PathQueueSid = pathQueueSid;
+      PathCallSid = pathCallSid;
+      Url = url;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Url != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Url", Serializers.Url(Url)));
+      }
+
+      if (Method != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Method", Method.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve the members of the queue
+  /// </summary>
+  public class ReadMemberOptions : ReadOptions<MemberResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the Queue in which to find the members
+    /// </summary>
+    public string PathQueueSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadMemberOptions
+    /// </summary>
+    /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
+    public ReadMemberOptions(string pathQueueSid)
+    {
+      PathQueueSid = pathQueueSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Queue/MemberResource.cs b/src/Twilio/Rest/Api/V2010/Account/Queue/MemberResource.cs
index 0431d4592..a862fcba7 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Queue/MemberResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Queue/MemberResource.cs
@@ -16,360 +16,360 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Queue
-{
-
-    public class MemberResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues/" + options.PathQueueSid + "/Members/" + options.PathCallSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific member from the queue
-        /// </summary>
-        /// <param name="options"> Fetch Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Fetch(FetchMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific member from the queue
-        /// </summary>
-        /// <param name="options"> Fetch Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(FetchMemberOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific member from the queue
-        /// </summary>
-        /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
-        /// <param name="pathCallSid"> The Call SID of the resource(s) to fetch </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Fetch(string pathQueueSid,
-                                           string pathCallSid,
-                                           string pathAccountSid = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchMemberOptions(pathQueueSid, pathCallSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific member from the queue
-        /// </summary>
-        /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
-        /// <param name="pathCallSid"> The Call SID of the resource(s) to fetch </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(string pathQueueSid,
-                                                                                   string pathCallSid,
-                                                                                   string pathAccountSid = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchMemberOptions(pathQueueSid, pathCallSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues/" + options.PathQueueSid + "/Members/" + options.PathCallSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Dequeue a member from a queue and have the member's call begin executing the TwiML document at that URL
-        /// </summary>
-        /// <param name="options"> Update Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Update(UpdateMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Dequeue a member from a queue and have the member's call begin executing the TwiML document at that URL
-        /// </summary>
-        /// <param name="options"> Update Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(UpdateMemberOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Dequeue a member from a queue and have the member's call begin executing the TwiML document at that URL
-        /// </summary>
-        /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
-        /// <param name="pathCallSid"> The Call SID of the resource(s) to update </param>
-        /// <param name="url"> The absolute URL of the Queue resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
-        /// <param name="method"> How to pass the update request data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Update(string pathQueueSid,
-                                            string pathCallSid,
-                                            Uri url,
-                                            string pathAccountSid = null,
-                                            Twilio.Http.HttpMethod method = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateMemberOptions(pathQueueSid, pathCallSid, url){PathAccountSid = pathAccountSid, Method = method};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Dequeue a member from a queue and have the member's call begin executing the TwiML document at that URL
-        /// </summary>
-        /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
-        /// <param name="pathCallSid"> The Call SID of the resource(s) to update </param>
-        /// <param name="url"> The absolute URL of the Queue resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
-        /// <param name="method"> How to pass the update request data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(string pathQueueSid,
-                                                                                    string pathCallSid,
-                                                                                    Uri url,
-                                                                                    string pathAccountSid = null,
-                                                                                    Twilio.Http.HttpMethod method = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateMemberOptions(pathQueueSid, pathCallSid, url){PathAccountSid = pathAccountSid, Method = method};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues/" + options.PathQueueSid + "/Members.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve the members of the queue
-        /// </summary>
-        /// <param name="options"> Read Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static ResourceSet<MemberResource> Read(ReadMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MemberResource>.FromJson("queue_members", response.Content);
-            return new ResourceSet<MemberResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the members of the queue
-        /// </summary>
-        /// <param name="options"> Read Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(ReadMemberOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MemberResource>.FromJson("queue_members", response.Content);
-            return new ResourceSet<MemberResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve the members of the queue
-        /// </summary>
-        /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static ResourceSet<MemberResource> Read(string pathQueueSid,
-                                                       string pathAccountSid = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadMemberOptions(pathQueueSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the members of the queue
-        /// </summary>
-        /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(string pathQueueSid,
-                                                                                               string pathAccountSid = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadMemberOptions(pathQueueSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MemberResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("queue_members", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MemberResource> NextPage(Page<MemberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("queue_members", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MemberResource> PreviousPage(Page<MemberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("queue_members", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a MemberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MemberResource object represented by the provided JSON </returns>
-        public static MemberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MemberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Call the resource is associated with
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The date the member was enqueued
-        /// </summary>
-        [JsonProperty("date_enqueued")]
-        public DateTime? DateEnqueued { get; private set; }
-        /// <summary>
-        /// This member's current position in the queue.
-        /// </summary>
-        [JsonProperty("position")]
-        public int? Position { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The number of seconds the member has been in the queue.
-        /// </summary>
-        [JsonProperty("wait_time")]
-        public int? WaitTime { get; private set; }
-        /// <summary>
-        /// The SID of the Queue the member is in
-        /// </summary>
-        [JsonProperty("queue_sid")]
-        public string QueueSid { get; private set; }
-
-        private MemberResource()
-        {
-
-        }
-    }
+{
+
+  public class MemberResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues/" + options.PathQueueSid + "/Members/" + options.PathCallSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific member from the queue
+    /// </summary>
+    /// <param name="options"> Fetch Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Fetch(FetchMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific member from the queue
+    /// </summary>
+    /// <param name="options"> Fetch Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(FetchMemberOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific member from the queue
+    /// </summary>
+    /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
+    /// <param name="pathCallSid"> The Call SID of the resource(s) to fetch </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Fetch(string pathQueueSid,
+                                       string pathCallSid,
+                                       string pathAccountSid = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchMemberOptions(pathQueueSid, pathCallSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific member from the queue
+    /// </summary>
+    /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
+    /// <param name="pathCallSid"> The Call SID of the resource(s) to fetch </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(string pathQueueSid,
+                                                                               string pathCallSid,
+                                                                               string pathAccountSid = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchMemberOptions(pathQueueSid, pathCallSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues/" + options.PathQueueSid + "/Members/" + options.PathCallSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Dequeue a member from a queue and have the member's call begin executing the TwiML document at that URL
+    /// </summary>
+    /// <param name="options"> Update Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Update(UpdateMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Dequeue a member from a queue and have the member's call begin executing the TwiML document at that URL
+    /// </summary>
+    /// <param name="options"> Update Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(UpdateMemberOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Dequeue a member from a queue and have the member's call begin executing the TwiML document at that URL
+    /// </summary>
+    /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
+    /// <param name="pathCallSid"> The Call SID of the resource(s) to update </param>
+    /// <param name="url"> The absolute URL of the Queue resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
+    /// <param name="method"> How to pass the update request data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Update(string pathQueueSid,
+                                        string pathCallSid,
+                                        Uri url,
+                                        string pathAccountSid = null,
+                                        Twilio.Http.HttpMethod method = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateMemberOptions(pathQueueSid, pathCallSid, url) { PathAccountSid = pathAccountSid, Method = method };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Dequeue a member from a queue and have the member's call begin executing the TwiML document at that URL
+    /// </summary>
+    /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
+    /// <param name="pathCallSid"> The Call SID of the resource(s) to update </param>
+    /// <param name="url"> The absolute URL of the Queue resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
+    /// <param name="method"> How to pass the update request data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(string pathQueueSid,
+                                                                                string pathCallSid,
+                                                                                Uri url,
+                                                                                string pathAccountSid = null,
+                                                                                Twilio.Http.HttpMethod method = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateMemberOptions(pathQueueSid, pathCallSid, url) { PathAccountSid = pathAccountSid, Method = method };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues/" + options.PathQueueSid + "/Members.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve the members of the queue
+    /// </summary>
+    /// <param name="options"> Read Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static ResourceSet<MemberResource> Read(ReadMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MemberResource>.FromJson("queue_members", response.Content);
+      return new ResourceSet<MemberResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the members of the queue
+    /// </summary>
+    /// <param name="options"> Read Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(ReadMemberOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MemberResource>.FromJson("queue_members", response.Content);
+      return new ResourceSet<MemberResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve the members of the queue
+    /// </summary>
+    /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static ResourceSet<MemberResource> Read(string pathQueueSid,
+                                                   string pathAccountSid = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadMemberOptions(pathQueueSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the members of the queue
+    /// </summary>
+    /// <param name="pathQueueSid"> The SID of the Queue in which to find the members </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(string pathQueueSid,
+                                                                                           string pathAccountSid = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadMemberOptions(pathQueueSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MemberResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("queue_members", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MemberResource> NextPage(Page<MemberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("queue_members", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MemberResource> PreviousPage(Page<MemberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("queue_members", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a MemberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MemberResource object represented by the provided JSON </returns>
+    public static MemberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MemberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Call the resource is associated with
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The date the member was enqueued
+    /// </summary>
+    [JsonProperty("date_enqueued")]
+    public DateTime? DateEnqueued { get; private set; }
+    /// <summary>
+    /// This member's current position in the queue.
+    /// </summary>
+    [JsonProperty("position")]
+    public int? Position { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The number of seconds the member has been in the queue.
+    /// </summary>
+    [JsonProperty("wait_time")]
+    public int? WaitTime { get; private set; }
+    /// <summary>
+    /// The SID of the Queue the member is in
+    /// </summary>
+    [JsonProperty("queue_sid")]
+    public string QueueSid { get; private set; }
+
+    private MemberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/QueueOptions.cs b/src/Twilio/Rest/Api/V2010/Account/QueueOptions.cs
index b01ff65f9..a0090240f 100644
--- a/src/Twilio/Rest/Api/V2010/Account/QueueOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/QueueOptions.cs
@@ -9,195 +9,195 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Fetch an instance of a queue identified by the QueueSid
+  /// </summary>
+  public class FetchQueueOptions : IOptions<QueueResource>
+  {
     /// <summary>
-    /// Fetch an instance of a queue identified by the QueueSid
-    /// </summary>
-    public class FetchQueueOptions : IOptions<QueueResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchQueueOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        public FetchQueueOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resource(s) to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Update the queue with the new parameters
-    /// </summary>
-    public class UpdateQueueOptions : IOptions<QueueResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe this resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The max number of calls allowed in the queue
-        /// </summary>
-        public int? MaxSize { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateQueueOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        public UpdateQueueOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (MaxSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MaxSize", MaxSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies this resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// Remove an empty queue
-    /// </summary>
-    public class DeleteQueueOptions : IOptions<QueueResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteQueueOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        public DeleteQueueOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new FetchQueueOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    public FetchQueueOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// Retrieve a list of queues belonging to the account used to make the request
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadQueueOptions : ReadOptions<QueueResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update the queue with the new parameters
+  /// </summary>
+  public class UpdateQueueOptions : IOptions<QueueResource>
+  {
     /// <summary>
-    /// Create a queue
-    /// </summary>
-    public class CreateQueueOptions : IOptions<QueueResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string to describe this resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The max number of calls allowed in the queue
-        /// </summary>
-        public int? MaxSize { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateQueueOptions
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe this resource </param>
-        public CreateQueueOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (MaxSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MaxSize", MaxSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Account that created the resource(s) to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies this resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe this resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The max number of calls allowed in the queue
+    /// </summary>
+    public int? MaxSize { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateQueueOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    public UpdateQueueOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (MaxSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MaxSize", MaxSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove an empty queue
+  /// </summary>
+  public class DeleteQueueOptions : IOptions<QueueResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies this resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteQueueOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    public DeleteQueueOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of queues belonging to the account used to make the request
+  /// </summary>
+  public class ReadQueueOptions : ReadOptions<QueueResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Create a queue
+  /// </summary>
+  public class CreateQueueOptions : IOptions<QueueResource>
+  {
+    /// <summary>
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string to describe this resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The max number of calls allowed in the queue
+    /// </summary>
+    public int? MaxSize { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateQueueOptions
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe this resource </param>
+    public CreateQueueOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (MaxSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MaxSize", MaxSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/QueueResource.cs b/src/Twilio/Rest/Api/V2010/Account/QueueResource.cs
index dedc66885..c8a2dbb01 100644
--- a/src/Twilio/Rest/Api/V2010/Account/QueueResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/QueueResource.cs
@@ -16,507 +16,507 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class QueueResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchQueueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of a queue identified by the QueueSid
-        /// </summary>
-        /// <param name="options"> Fetch Queue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Queue </returns>
-        public static QueueResource Fetch(FetchQueueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a queue identified by the QueueSid
-        /// </summary>
-        /// <param name="options"> Fetch Queue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Queue </returns>
-        public static async System.Threading.Tasks.Task<QueueResource> FetchAsync(FetchQueueOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of a queue identified by the QueueSid
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Queue </returns>
-        public static QueueResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchQueueOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a queue identified by the QueueSid
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Queue </returns>
-        public static async System.Threading.Tasks.Task<QueueResource> FetchAsync(string pathSid,
-                                                                                  string pathAccountSid = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchQueueOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateQueueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update the queue with the new parameters
-        /// </summary>
-        /// <param name="options"> Update Queue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Queue </returns>
-        public static QueueResource Update(UpdateQueueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the queue with the new parameters
-        /// </summary>
-        /// <param name="options"> Update Queue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Queue </returns>
-        public static async System.Threading.Tasks.Task<QueueResource> UpdateAsync(UpdateQueueOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update the queue with the new parameters
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
-        /// <param name="friendlyName"> A string to describe this resource </param>
-        /// <param name="maxSize"> The max number of calls allowed in the queue </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Queue </returns>
-        public static QueueResource Update(string pathSid,
-                                           string pathAccountSid = null,
-                                           string friendlyName = null,
-                                           int? maxSize = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new UpdateQueueOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, MaxSize = maxSize};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the queue with the new parameters
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
-        /// <param name="friendlyName"> A string to describe this resource </param>
-        /// <param name="maxSize"> The max number of calls allowed in the queue </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Queue </returns>
-        public static async System.Threading.Tasks.Task<QueueResource> UpdateAsync(string pathSid,
-                                                                                   string pathAccountSid = null,
-                                                                                   string friendlyName = null,
-                                                                                   int? maxSize = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new UpdateQueueOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, MaxSize = maxSize};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteQueueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove an empty queue
-        /// </summary>
-        /// <param name="options"> Delete Queue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Queue </returns>
-        public static bool Delete(DeleteQueueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an empty queue
-        /// </summary>
-        /// <param name="options"> Delete Queue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Queue </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteQueueOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove an empty queue
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Queue </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteQueueOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an empty queue
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Queue </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteQueueOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadQueueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of queues belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Queue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Queue </returns>
-        public static ResourceSet<QueueResource> Read(ReadQueueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<QueueResource>.FromJson("queues", response.Content);
-            return new ResourceSet<QueueResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of queues belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Queue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Queue </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<QueueResource>> ReadAsync(ReadQueueOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<QueueResource>.FromJson("queues", response.Content);
-            return new ResourceSet<QueueResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of queues belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Queue </returns>
-        public static ResourceSet<QueueResource> Read(string pathAccountSid = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadQueueOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of queues belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Queue </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<QueueResource>> ReadAsync(string pathAccountSid = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadQueueOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<QueueResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<QueueResource>.FromJson("queues", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<QueueResource> NextPage(Page<QueueResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<QueueResource>.FromJson("queues", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<QueueResource> PreviousPage(Page<QueueResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<QueueResource>.FromJson("queues", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateQueueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a queue
-        /// </summary>
-        /// <param name="options"> Create Queue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Queue </returns>
-        public static QueueResource Create(CreateQueueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a queue
-        /// </summary>
-        /// <param name="options"> Create Queue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Queue </returns>
-        public static async System.Threading.Tasks.Task<QueueResource> CreateAsync(CreateQueueOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a queue
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="maxSize"> The max number of calls allowed in the queue </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Queue </returns>
-        public static QueueResource Create(string friendlyName,
-                                           string pathAccountSid = null,
-                                           int? maxSize = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateQueueOptions(friendlyName){PathAccountSid = pathAccountSid, MaxSize = maxSize};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a queue
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="maxSize"> The max number of calls allowed in the queue </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Queue </returns>
-        public static async System.Threading.Tasks.Task<QueueResource> CreateAsync(string friendlyName,
-                                                                                   string pathAccountSid = null,
-                                                                                   int? maxSize = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateQueueOptions(friendlyName){PathAccountSid = pathAccountSid, MaxSize = maxSize};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a QueueResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> QueueResource object represented by the provided JSON </returns>
-        public static QueueResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<QueueResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The number of calls currently in the queue.
-        /// </summary>
-        [JsonProperty("current_size")]
-        public int? CurrentSize { get; private set; }
-        /// <summary>
-        /// A string that you assigned to describe this resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The URI of this resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created this resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Average wait time of members in the queue
-        /// </summary>
-        [JsonProperty("average_wait_time")]
-        public int? AverageWaitTime { get; private set; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The max number of calls allowed in the queue
-        /// </summary>
-        [JsonProperty("max_size")]
-        public int? MaxSize { get; private set; }
-
-        private QueueResource()
-        {
-
-        }
-    }
+{
+
+  public class QueueResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchQueueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of a queue identified by the QueueSid
+    /// </summary>
+    /// <param name="options"> Fetch Queue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Queue </returns>
+    public static QueueResource Fetch(FetchQueueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a queue identified by the QueueSid
+    /// </summary>
+    /// <param name="options"> Fetch Queue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Queue </returns>
+    public static async System.Threading.Tasks.Task<QueueResource> FetchAsync(FetchQueueOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of a queue identified by the QueueSid
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Queue </returns>
+    public static QueueResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchQueueOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a queue identified by the QueueSid
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Queue </returns>
+    public static async System.Threading.Tasks.Task<QueueResource> FetchAsync(string pathSid,
+                                                                              string pathAccountSid = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchQueueOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateQueueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update the queue with the new parameters
+    /// </summary>
+    /// <param name="options"> Update Queue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Queue </returns>
+    public static QueueResource Update(UpdateQueueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the queue with the new parameters
+    /// </summary>
+    /// <param name="options"> Update Queue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Queue </returns>
+    public static async System.Threading.Tasks.Task<QueueResource> UpdateAsync(UpdateQueueOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update the queue with the new parameters
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
+    /// <param name="friendlyName"> A string to describe this resource </param>
+    /// <param name="maxSize"> The max number of calls allowed in the queue </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Queue </returns>
+    public static QueueResource Update(string pathSid,
+                                       string pathAccountSid = null,
+                                       string friendlyName = null,
+                                       int? maxSize = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new UpdateQueueOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, MaxSize = maxSize };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the queue with the new parameters
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
+    /// <param name="friendlyName"> A string to describe this resource </param>
+    /// <param name="maxSize"> The max number of calls allowed in the queue </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Queue </returns>
+    public static async System.Threading.Tasks.Task<QueueResource> UpdateAsync(string pathSid,
+                                                                               string pathAccountSid = null,
+                                                                               string friendlyName = null,
+                                                                               int? maxSize = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new UpdateQueueOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, MaxSize = maxSize };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteQueueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove an empty queue
+    /// </summary>
+    /// <param name="options"> Delete Queue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Queue </returns>
+    public static bool Delete(DeleteQueueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an empty queue
+    /// </summary>
+    /// <param name="options"> Delete Queue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Queue </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteQueueOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove an empty queue
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Queue </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteQueueOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an empty queue
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Queue </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteQueueOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadQueueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of queues belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Queue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Queue </returns>
+    public static ResourceSet<QueueResource> Read(ReadQueueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<QueueResource>.FromJson("queues", response.Content);
+      return new ResourceSet<QueueResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of queues belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Queue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Queue </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<QueueResource>> ReadAsync(ReadQueueOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<QueueResource>.FromJson("queues", response.Content);
+      return new ResourceSet<QueueResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of queues belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Queue </returns>
+    public static ResourceSet<QueueResource> Read(string pathAccountSid = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadQueueOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of queues belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Queue </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<QueueResource>> ReadAsync(string pathAccountSid = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadQueueOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<QueueResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<QueueResource>.FromJson("queues", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<QueueResource> NextPage(Page<QueueResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<QueueResource>.FromJson("queues", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<QueueResource> PreviousPage(Page<QueueResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<QueueResource>.FromJson("queues", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateQueueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Queues.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a queue
+    /// </summary>
+    /// <param name="options"> Create Queue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Queue </returns>
+    public static QueueResource Create(CreateQueueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a queue
+    /// </summary>
+    /// <param name="options"> Create Queue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Queue </returns>
+    public static async System.Threading.Tasks.Task<QueueResource> CreateAsync(CreateQueueOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a queue
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="maxSize"> The max number of calls allowed in the queue </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Queue </returns>
+    public static QueueResource Create(string friendlyName,
+                                       string pathAccountSid = null,
+                                       int? maxSize = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateQueueOptions(friendlyName) { PathAccountSid = pathAccountSid, MaxSize = maxSize };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a queue
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="maxSize"> The max number of calls allowed in the queue </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Queue </returns>
+    public static async System.Threading.Tasks.Task<QueueResource> CreateAsync(string friendlyName,
+                                                                               string pathAccountSid = null,
+                                                                               int? maxSize = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateQueueOptions(friendlyName) { PathAccountSid = pathAccountSid, MaxSize = maxSize };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a QueueResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> QueueResource object represented by the provided JSON </returns>
+    public static QueueResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<QueueResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The number of calls currently in the queue.
+    /// </summary>
+    [JsonProperty("current_size")]
+    public int? CurrentSize { get; private set; }
+    /// <summary>
+    /// A string that you assigned to describe this resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The URI of this resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created this resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Average wait time of members in the queue
+    /// </summary>
+    [JsonProperty("average_wait_time")]
+    public int? AverageWaitTime { get; private set; }
+    /// <summary>
+    /// The unique string that identifies this resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The max number of calls allowed in the queue
+    /// </summary>
+    [JsonProperty("max_size")]
+    public int? MaxSize { get; private set; }
+
+    private QueueResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResult/PayloadOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResult/PayloadOptions.cs
index 6e9575482..a3b5670f2 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResult/PayloadOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResult/PayloadOptions.cs
@@ -9,143 +9,143 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Recording.AddOnResult
-{
-
+{
+
+  /// <summary>
+  /// Fetch an instance of a result payload
+  /// </summary>
+  public class FetchPayloadOptions : IOptions<PayloadResource>
+  {
     /// <summary>
-    /// Fetch an instance of a result payload
-    /// </summary>
-    public class FetchPayloadOptions : IOptions<PayloadResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the recording to which the AddOnResult resource that contains the payload to fetch belongs
-        /// </summary>
-        public string PathReferenceSid { get; }
-        /// <summary>
-        /// The SID of the AddOnResult to which the payload to fetch belongs
-        /// </summary>
-        public string PathAddOnResultSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchPayloadOptions
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
-        ///                        payload to fetch belongs </param>
-        /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payload to fetch belongs </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        public FetchPayloadOptions(string pathReferenceSid, string pathAddOnResultSid, string pathSid)
-        {
-            PathReferenceSid = pathReferenceSid;
-            PathAddOnResultSid = pathAddOnResultSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Retrieve a list of payloads belonging to the AddOnResult
-    /// </summary>
-    public class ReadPayloadOptions : ReadOptions<PayloadResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the recording to which the AddOnResult resource that contains the payloads to read belongs
-        /// </summary>
-        public string PathReferenceSid { get; }
-        /// <summary>
-        /// The SID of the AddOnResult to which the payloads to read belongs
-        /// </summary>
-        public string PathAddOnResultSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadPayloadOptions
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
-        ///                        payloads to read belongs </param>
-        /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payloads to read belongs </param>
-        public ReadPayloadOptions(string pathReferenceSid, string pathAddOnResultSid)
-        {
-            PathReferenceSid = pathReferenceSid;
-            PathAddOnResultSid = pathAddOnResultSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the recording to which the AddOnResult resource that contains the payload to fetch belongs
+    /// </summary>
+    public string PathReferenceSid { get; }
     /// <summary>
-    /// Delete a payload from the result along with all associated Data
-    /// </summary>
-    public class DeletePayloadOptions : IOptions<PayloadResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the recording to which the AddOnResult resource that contains the payloads to delete belongs
-        /// </summary>
-        public string PathReferenceSid { get; }
-        /// <summary>
-        /// The SID of the AddOnResult to which the payloads to delete belongs
-        /// </summary>
-        public string PathAddOnResultSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeletePayloadOptions
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
-        ///                        payloads to delete belongs </param>
-        /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payloads to delete belongs </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeletePayloadOptions(string pathReferenceSid, string pathAddOnResultSid, string pathSid)
-        {
-            PathReferenceSid = pathReferenceSid;
-            PathAddOnResultSid = pathAddOnResultSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// The SID of the AddOnResult to which the payload to fetch belongs
+    /// </summary>
+    public string PathAddOnResultSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchPayloadOptions
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
+    ///                        payload to fetch belongs </param>
+    /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payload to fetch belongs </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    public FetchPayloadOptions(string pathReferenceSid, string pathAddOnResultSid, string pathSid)
+    {
+      PathReferenceSid = pathReferenceSid;
+      PathAddOnResultSid = pathAddOnResultSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of payloads belonging to the AddOnResult
+  /// </summary>
+  public class ReadPayloadOptions : ReadOptions<PayloadResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the recording to which the AddOnResult resource that contains the payloads to read belongs
+    /// </summary>
+    public string PathReferenceSid { get; }
+    /// <summary>
+    /// The SID of the AddOnResult to which the payloads to read belongs
+    /// </summary>
+    public string PathAddOnResultSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadPayloadOptions
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
+    ///                        payloads to read belongs </param>
+    /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payloads to read belongs </param>
+    public ReadPayloadOptions(string pathReferenceSid, string pathAddOnResultSid)
+    {
+      PathReferenceSid = pathReferenceSid;
+      PathAddOnResultSid = pathAddOnResultSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a payload from the result along with all associated Data
+  /// </summary>
+  public class DeletePayloadOptions : IOptions<PayloadResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the recording to which the AddOnResult resource that contains the payloads to delete belongs
+    /// </summary>
+    public string PathReferenceSid { get; }
+    /// <summary>
+    /// The SID of the AddOnResult to which the payloads to delete belongs
+    /// </summary>
+    public string PathAddOnResultSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeletePayloadOptions
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
+    ///                        payloads to delete belongs </param>
+    /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payloads to delete belongs </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeletePayloadOptions(string pathReferenceSid, string pathAddOnResultSid, string pathSid)
+    {
+      PathReferenceSid = pathReferenceSid;
+      PathAddOnResultSid = pathAddOnResultSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResult/PayloadResource.cs b/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResult/PayloadResource.cs
index ac0b76719..8c3208864 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResult/PayloadResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResult/PayloadResource.cs
@@ -16,395 +16,395 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Recording.AddOnResult
-{
-
-    public class PayloadResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchPayloadOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathReferenceSid + "/AddOnResults/" + options.PathAddOnResultSid + "/Payloads/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of a result payload
-        /// </summary>
-        /// <param name="options"> Fetch Payload parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Payload </returns>
-        public static PayloadResource Fetch(FetchPayloadOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a result payload
-        /// </summary>
-        /// <param name="options"> Fetch Payload parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Payload </returns>
-        public static async System.Threading.Tasks.Task<PayloadResource> FetchAsync(FetchPayloadOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of a result payload
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
-        ///                        payload to fetch belongs </param>
-        /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payload to fetch belongs </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Payload </returns>
-        public static PayloadResource Fetch(string pathReferenceSid,
-                                            string pathAddOnResultSid,
-                                            string pathSid,
-                                            string pathAccountSid = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchPayloadOptions(pathReferenceSid, pathAddOnResultSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a result payload
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
-        ///                        payload to fetch belongs </param>
-        /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payload to fetch belongs </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Payload </returns>
-        public static async System.Threading.Tasks.Task<PayloadResource> FetchAsync(string pathReferenceSid,
-                                                                                    string pathAddOnResultSid,
-                                                                                    string pathSid,
-                                                                                    string pathAccountSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchPayloadOptions(pathReferenceSid, pathAddOnResultSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadPayloadOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathReferenceSid + "/AddOnResults/" + options.PathAddOnResultSid + "/Payloads.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of payloads belonging to the AddOnResult
-        /// </summary>
-        /// <param name="options"> Read Payload parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Payload </returns>
-        public static ResourceSet<PayloadResource> Read(ReadPayloadOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<PayloadResource>.FromJson("payloads", response.Content);
-            return new ResourceSet<PayloadResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of payloads belonging to the AddOnResult
-        /// </summary>
-        /// <param name="options"> Read Payload parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Payload </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PayloadResource>> ReadAsync(ReadPayloadOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<PayloadResource>.FromJson("payloads", response.Content);
-            return new ResourceSet<PayloadResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of payloads belonging to the AddOnResult
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
-        ///                        payloads to read belongs </param>
-        /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payloads to read belongs </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Payload </returns>
-        public static ResourceSet<PayloadResource> Read(string pathReferenceSid,
-                                                        string pathAddOnResultSid,
-                                                        string pathAccountSid = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadPayloadOptions(pathReferenceSid, pathAddOnResultSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of payloads belonging to the AddOnResult
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
-        ///                        payloads to read belongs </param>
-        /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payloads to read belongs </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Payload </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PayloadResource>> ReadAsync(string pathReferenceSid,
-                                                                                                string pathAddOnResultSid,
-                                                                                                string pathAccountSid = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadPayloadOptions(pathReferenceSid, pathAddOnResultSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<PayloadResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<PayloadResource>.FromJson("payloads", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<PayloadResource> NextPage(Page<PayloadResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<PayloadResource>.FromJson("payloads", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<PayloadResource> PreviousPage(Page<PayloadResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<PayloadResource>.FromJson("payloads", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeletePayloadOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathReferenceSid + "/AddOnResults/" + options.PathAddOnResultSid + "/Payloads/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a payload from the result along with all associated Data
-        /// </summary>
-        /// <param name="options"> Delete Payload parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Payload </returns>
-        public static bool Delete(DeletePayloadOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a payload from the result along with all associated Data
-        /// </summary>
-        /// <param name="options"> Delete Payload parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Payload </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeletePayloadOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a payload from the result along with all associated Data
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
-        ///                        payloads to delete belongs </param>
-        /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payloads to delete belongs </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Payload </returns>
-        public static bool Delete(string pathReferenceSid,
-                                  string pathAddOnResultSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeletePayloadOptions(pathReferenceSid, pathAddOnResultSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a payload from the result along with all associated Data
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
-        ///                        payloads to delete belongs </param>
-        /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payloads to delete belongs </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Payload </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathReferenceSid,
-                                                                          string pathAddOnResultSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeletePayloadOptions(pathReferenceSid, pathAddOnResultSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a PayloadResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> PayloadResource object represented by the provided JSON </returns>
-        public static PayloadResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<PayloadResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the AddOnResult to which the payload belongs
-        /// </summary>
-        [JsonProperty("add_on_result_sid")]
-        public string AddOnResultSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that describes the payload
-        /// </summary>
-        [JsonProperty("label")]
-        public string Label { get; private set; }
-        /// <summary>
-        /// The SID of the Add-on to which the result belongs
-        /// </summary>
-        [JsonProperty("add_on_sid")]
-        public string AddOnSid { get; private set; }
-        /// <summary>
-        /// The SID of the Add-on configuration
-        /// </summary>
-        [JsonProperty("add_on_configuration_sid")]
-        public string AddOnConfigurationSid { get; private set; }
-        /// <summary>
-        /// The MIME type of the payload
-        /// </summary>
-        [JsonProperty("content_type")]
-        public string ContentType { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The SID of the recording to which the AddOnResult resource that contains the payload belongs
-        /// </summary>
-        [JsonProperty("reference_sid")]
-        public string ReferenceSid { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-
-        private PayloadResource()
-        {
-
-        }
-    }
+{
+
+  public class PayloadResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchPayloadOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathReferenceSid + "/AddOnResults/" + options.PathAddOnResultSid + "/Payloads/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of a result payload
+    /// </summary>
+    /// <param name="options"> Fetch Payload parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Payload </returns>
+    public static PayloadResource Fetch(FetchPayloadOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a result payload
+    /// </summary>
+    /// <param name="options"> Fetch Payload parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Payload </returns>
+    public static async System.Threading.Tasks.Task<PayloadResource> FetchAsync(FetchPayloadOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of a result payload
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
+    ///                        payload to fetch belongs </param>
+    /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payload to fetch belongs </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Payload </returns>
+    public static PayloadResource Fetch(string pathReferenceSid,
+                                        string pathAddOnResultSid,
+                                        string pathSid,
+                                        string pathAccountSid = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchPayloadOptions(pathReferenceSid, pathAddOnResultSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a result payload
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
+    ///                        payload to fetch belongs </param>
+    /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payload to fetch belongs </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Payload </returns>
+    public static async System.Threading.Tasks.Task<PayloadResource> FetchAsync(string pathReferenceSid,
+                                                                                string pathAddOnResultSid,
+                                                                                string pathSid,
+                                                                                string pathAccountSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchPayloadOptions(pathReferenceSid, pathAddOnResultSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadPayloadOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathReferenceSid + "/AddOnResults/" + options.PathAddOnResultSid + "/Payloads.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of payloads belonging to the AddOnResult
+    /// </summary>
+    /// <param name="options"> Read Payload parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Payload </returns>
+    public static ResourceSet<PayloadResource> Read(ReadPayloadOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<PayloadResource>.FromJson("payloads", response.Content);
+      return new ResourceSet<PayloadResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of payloads belonging to the AddOnResult
+    /// </summary>
+    /// <param name="options"> Read Payload parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Payload </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PayloadResource>> ReadAsync(ReadPayloadOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<PayloadResource>.FromJson("payloads", response.Content);
+      return new ResourceSet<PayloadResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of payloads belonging to the AddOnResult
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
+    ///                        payloads to read belongs </param>
+    /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payloads to read belongs </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Payload </returns>
+    public static ResourceSet<PayloadResource> Read(string pathReferenceSid,
+                                                    string pathAddOnResultSid,
+                                                    string pathAccountSid = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadPayloadOptions(pathReferenceSid, pathAddOnResultSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of payloads belonging to the AddOnResult
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
+    ///                        payloads to read belongs </param>
+    /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payloads to read belongs </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Payload </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PayloadResource>> ReadAsync(string pathReferenceSid,
+                                                                                            string pathAddOnResultSid,
+                                                                                            string pathAccountSid = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadPayloadOptions(pathReferenceSid, pathAddOnResultSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<PayloadResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<PayloadResource>.FromJson("payloads", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<PayloadResource> NextPage(Page<PayloadResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<PayloadResource>.FromJson("payloads", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<PayloadResource> PreviousPage(Page<PayloadResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<PayloadResource>.FromJson("payloads", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeletePayloadOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathReferenceSid + "/AddOnResults/" + options.PathAddOnResultSid + "/Payloads/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a payload from the result along with all associated Data
+    /// </summary>
+    /// <param name="options"> Delete Payload parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Payload </returns>
+    public static bool Delete(DeletePayloadOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a payload from the result along with all associated Data
+    /// </summary>
+    /// <param name="options"> Delete Payload parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Payload </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeletePayloadOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a payload from the result along with all associated Data
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
+    ///                        payloads to delete belongs </param>
+    /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payloads to delete belongs </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Payload </returns>
+    public static bool Delete(string pathReferenceSid,
+                              string pathAddOnResultSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeletePayloadOptions(pathReferenceSid, pathAddOnResultSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a payload from the result along with all associated Data
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the AddOnResult resource that contains the
+    ///                        payloads to delete belongs </param>
+    /// <param name="pathAddOnResultSid"> The SID of the AddOnResult to which the payloads to delete belongs </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Payload </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathReferenceSid,
+                                                                      string pathAddOnResultSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeletePayloadOptions(pathReferenceSid, pathAddOnResultSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a PayloadResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> PayloadResource object represented by the provided JSON </returns>
+    public static PayloadResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<PayloadResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the AddOnResult to which the payload belongs
+    /// </summary>
+    [JsonProperty("add_on_result_sid")]
+    public string AddOnResultSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that describes the payload
+    /// </summary>
+    [JsonProperty("label")]
+    public string Label { get; private set; }
+    /// <summary>
+    /// The SID of the Add-on to which the result belongs
+    /// </summary>
+    [JsonProperty("add_on_sid")]
+    public string AddOnSid { get; private set; }
+    /// <summary>
+    /// The SID of the Add-on configuration
+    /// </summary>
+    [JsonProperty("add_on_configuration_sid")]
+    public string AddOnConfigurationSid { get; private set; }
+    /// <summary>
+    /// The MIME type of the payload
+    /// </summary>
+    [JsonProperty("content_type")]
+    public string ContentType { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The SID of the recording to which the AddOnResult resource that contains the payload belongs
+    /// </summary>
+    [JsonProperty("reference_sid")]
+    public string ReferenceSid { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+
+    private PayloadResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResultOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResultOptions.cs
index 4f0fdab4e..a4539f53e 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResultOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResultOptions.cs
@@ -9,122 +9,122 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Recording
-{
-
+{
+
+  /// <summary>
+  /// Fetch an instance of an AddOnResult
+  /// </summary>
+  public class FetchAddOnResultOptions : IOptions<AddOnResultResource>
+  {
     /// <summary>
-    /// Fetch an instance of an AddOnResult
+    /// The SID of the Account that created the resource to fetch
     /// </summary>
-    public class FetchAddOnResultOptions : IOptions<AddOnResultResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the recording to which the result to fetch belongs
-        /// </summary>
-        public string PathReferenceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAddOnResultOptions
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the result to fetch belongs </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        public FetchAddOnResultOptions(string pathReferenceSid, string pathSid)
-        {
-            PathReferenceSid = pathReferenceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Retrieve a list of results belonging to the recording
+    /// The SID of the recording to which the result to fetch belongs
     /// </summary>
-    public class ReadAddOnResultOptions : ReadOptions<AddOnResultResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the recording to which the result to read belongs
-        /// </summary>
-        public string PathReferenceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadAddOnResultOptions
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the result to read belongs </param>
-        public ReadAddOnResultOptions(string pathReferenceSid)
-        {
-            PathReferenceSid = pathReferenceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathReferenceSid { get; }
     /// <summary>
-    /// Delete a result and purge all associated Payloads
+    /// The unique string that identifies the resource to fetch
     /// </summary>
-    public class DeleteAddOnResultOptions : IOptions<AddOnResultResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the recording to which the result to delete belongs
-        /// </summary>
-        public string PathReferenceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteAddOnResultOptions
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the result to delete belongs </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
-        public DeleteAddOnResultOptions(string pathReferenceSid, string pathSid)
-        {
-            PathReferenceSid = pathReferenceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchAddOnResultOptions
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the result to fetch belongs </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    public FetchAddOnResultOptions(string pathReferenceSid, string pathSid)
+    {
+      PathReferenceSid = pathReferenceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of results belonging to the recording
+  /// </summary>
+  public class ReadAddOnResultOptions : ReadOptions<AddOnResultResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the recording to which the result to read belongs
+    /// </summary>
+    public string PathReferenceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadAddOnResultOptions
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the result to read belongs </param>
+    public ReadAddOnResultOptions(string pathReferenceSid)
+    {
+      PathReferenceSid = pathReferenceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a result and purge all associated Payloads
+  /// </summary>
+  public class DeleteAddOnResultOptions : IOptions<AddOnResultResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the recording to which the result to delete belongs
+    /// </summary>
+    public string PathReferenceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteAddOnResultOptions
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the result to delete belongs </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
+    public DeleteAddOnResultOptions(string pathReferenceSid, string pathSid)
+    {
+      PathReferenceSid = pathReferenceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResultResource.cs b/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResultResource.cs
index 5a7a56a19..5a7363cb9 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResultResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Recording/AddOnResultResource.cs
@@ -17,392 +17,392 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Recording
-{
-
-    public class AddOnResultResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Canceled = new StatusEnum("canceled");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Deleted = new StatusEnum("deleted");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-            public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
-            public static readonly StatusEnum Init = new StatusEnum("init");
-            public static readonly StatusEnum Processing = new StatusEnum("processing");
-            public static readonly StatusEnum Queued = new StatusEnum("queued");
-        }
-
-        private static Request BuildFetchRequest(FetchAddOnResultOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathReferenceSid + "/AddOnResults/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of an AddOnResult
-        /// </summary>
-        /// <param name="options"> Fetch AddOnResult parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AddOnResult </returns>
-        public static AddOnResultResource Fetch(FetchAddOnResultOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an AddOnResult
-        /// </summary>
-        /// <param name="options"> Fetch AddOnResult parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AddOnResult </returns>
-        public static async System.Threading.Tasks.Task<AddOnResultResource> FetchAsync(FetchAddOnResultOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of an AddOnResult
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the result to fetch belongs </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AddOnResult </returns>
-        public static AddOnResultResource Fetch(string pathReferenceSid,
-                                                string pathSid,
-                                                string pathAccountSid = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchAddOnResultOptions(pathReferenceSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an AddOnResult
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the result to fetch belongs </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AddOnResult </returns>
-        public static async System.Threading.Tasks.Task<AddOnResultResource> FetchAsync(string pathReferenceSid,
-                                                                                        string pathSid,
-                                                                                        string pathAccountSid = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchAddOnResultOptions(pathReferenceSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAddOnResultOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathReferenceSid + "/AddOnResults.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of results belonging to the recording
-        /// </summary>
-        /// <param name="options"> Read AddOnResult parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AddOnResult </returns>
-        public static ResourceSet<AddOnResultResource> Read(ReadAddOnResultOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AddOnResultResource>.FromJson("add_on_results", response.Content);
-            return new ResourceSet<AddOnResultResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of results belonging to the recording
-        /// </summary>
-        /// <param name="options"> Read AddOnResult parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AddOnResult </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AddOnResultResource>> ReadAsync(ReadAddOnResultOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AddOnResultResource>.FromJson("add_on_results", response.Content);
-            return new ResourceSet<AddOnResultResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of results belonging to the recording
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the result to read belongs </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AddOnResult </returns>
-        public static ResourceSet<AddOnResultResource> Read(string pathReferenceSid,
-                                                            string pathAccountSid = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadAddOnResultOptions(pathReferenceSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of results belonging to the recording
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the result to read belongs </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AddOnResult </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AddOnResultResource>> ReadAsync(string pathReferenceSid,
-                                                                                                    string pathAccountSid = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadAddOnResultOptions(pathReferenceSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AddOnResultResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AddOnResultResource>.FromJson("add_on_results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AddOnResultResource> NextPage(Page<AddOnResultResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AddOnResultResource>.FromJson("add_on_results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AddOnResultResource> PreviousPage(Page<AddOnResultResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AddOnResultResource>.FromJson("add_on_results", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteAddOnResultOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathReferenceSid + "/AddOnResults/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a result and purge all associated Payloads
-        /// </summary>
-        /// <param name="options"> Delete AddOnResult parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AddOnResult </returns>
-        public static bool Delete(DeleteAddOnResultOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a result and purge all associated Payloads
-        /// </summary>
-        /// <param name="options"> Delete AddOnResult parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AddOnResult </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAddOnResultOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a result and purge all associated Payloads
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the result to delete belongs </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AddOnResult </returns>
-        public static bool Delete(string pathReferenceSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteAddOnResultOptions(pathReferenceSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a result and purge all associated Payloads
-        /// </summary>
-        /// <param name="pathReferenceSid"> The SID of the recording to which the result to delete belongs </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AddOnResult </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathReferenceSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteAddOnResultOptions(pathReferenceSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AddOnResultResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AddOnResultResource object represented by the provided JSON </returns>
-        public static AddOnResultResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AddOnResultResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The status of the result
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public AddOnResultResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The SID of the Add-on to which the result belongs
-        /// </summary>
-        [JsonProperty("add_on_sid")]
-        public string AddOnSid { get; private set; }
-        /// <summary>
-        /// The SID of the Add-on configuration
-        /// </summary>
-        [JsonProperty("add_on_configuration_sid")]
-        public string AddOnConfigurationSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The date and time in GMT that the result was completed
-        /// </summary>
-        [JsonProperty("date_completed")]
-        public DateTime? DateCompleted { get; private set; }
-        /// <summary>
-        /// The SID of the recording to which the AddOnResult resource belongs
-        /// </summary>
-        [JsonProperty("reference_sid")]
-        public string ReferenceSid { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-
-        private AddOnResultResource()
-        {
-
-        }
-    }
+{
+
+  public class AddOnResultResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Canceled = new StatusEnum("canceled");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Deleted = new StatusEnum("deleted");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+      public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
+      public static readonly StatusEnum Init = new StatusEnum("init");
+      public static readonly StatusEnum Processing = new StatusEnum("processing");
+      public static readonly StatusEnum Queued = new StatusEnum("queued");
+    }
+
+    private static Request BuildFetchRequest(FetchAddOnResultOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathReferenceSid + "/AddOnResults/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of an AddOnResult
+    /// </summary>
+    /// <param name="options"> Fetch AddOnResult parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AddOnResult </returns>
+    public static AddOnResultResource Fetch(FetchAddOnResultOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an AddOnResult
+    /// </summary>
+    /// <param name="options"> Fetch AddOnResult parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AddOnResult </returns>
+    public static async System.Threading.Tasks.Task<AddOnResultResource> FetchAsync(FetchAddOnResultOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of an AddOnResult
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the result to fetch belongs </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AddOnResult </returns>
+    public static AddOnResultResource Fetch(string pathReferenceSid,
+                                            string pathSid,
+                                            string pathAccountSid = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchAddOnResultOptions(pathReferenceSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an AddOnResult
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the result to fetch belongs </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AddOnResult </returns>
+    public static async System.Threading.Tasks.Task<AddOnResultResource> FetchAsync(string pathReferenceSid,
+                                                                                    string pathSid,
+                                                                                    string pathAccountSid = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchAddOnResultOptions(pathReferenceSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAddOnResultOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathReferenceSid + "/AddOnResults.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of results belonging to the recording
+    /// </summary>
+    /// <param name="options"> Read AddOnResult parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AddOnResult </returns>
+    public static ResourceSet<AddOnResultResource> Read(ReadAddOnResultOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AddOnResultResource>.FromJson("add_on_results", response.Content);
+      return new ResourceSet<AddOnResultResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of results belonging to the recording
+    /// </summary>
+    /// <param name="options"> Read AddOnResult parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AddOnResult </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AddOnResultResource>> ReadAsync(ReadAddOnResultOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AddOnResultResource>.FromJson("add_on_results", response.Content);
+      return new ResourceSet<AddOnResultResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of results belonging to the recording
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the result to read belongs </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AddOnResult </returns>
+    public static ResourceSet<AddOnResultResource> Read(string pathReferenceSid,
+                                                        string pathAccountSid = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadAddOnResultOptions(pathReferenceSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of results belonging to the recording
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the result to read belongs </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AddOnResult </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AddOnResultResource>> ReadAsync(string pathReferenceSid,
+                                                                                                string pathAccountSid = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadAddOnResultOptions(pathReferenceSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AddOnResultResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AddOnResultResource>.FromJson("add_on_results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AddOnResultResource> NextPage(Page<AddOnResultResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AddOnResultResource>.FromJson("add_on_results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AddOnResultResource> PreviousPage(Page<AddOnResultResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AddOnResultResource>.FromJson("add_on_results", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteAddOnResultOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathReferenceSid + "/AddOnResults/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a result and purge all associated Payloads
+    /// </summary>
+    /// <param name="options"> Delete AddOnResult parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AddOnResult </returns>
+    public static bool Delete(DeleteAddOnResultOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a result and purge all associated Payloads
+    /// </summary>
+    /// <param name="options"> Delete AddOnResult parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AddOnResult </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAddOnResultOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a result and purge all associated Payloads
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the result to delete belongs </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AddOnResult </returns>
+    public static bool Delete(string pathReferenceSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteAddOnResultOptions(pathReferenceSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a result and purge all associated Payloads
+    /// </summary>
+    /// <param name="pathReferenceSid"> The SID of the recording to which the result to delete belongs </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AddOnResult </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathReferenceSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteAddOnResultOptions(pathReferenceSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AddOnResultResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AddOnResultResource object represented by the provided JSON </returns>
+    public static AddOnResultResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AddOnResultResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The status of the result
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public AddOnResultResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The SID of the Add-on to which the result belongs
+    /// </summary>
+    [JsonProperty("add_on_sid")]
+    public string AddOnSid { get; private set; }
+    /// <summary>
+    /// The SID of the Add-on configuration
+    /// </summary>
+    [JsonProperty("add_on_configuration_sid")]
+    public string AddOnConfigurationSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The date and time in GMT that the result was completed
+    /// </summary>
+    [JsonProperty("date_completed")]
+    public DateTime? DateCompleted { get; private set; }
+    /// <summary>
+    /// The SID of the recording to which the AddOnResult resource belongs
+    /// </summary>
+    [JsonProperty("reference_sid")]
+    public string ReferenceSid { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+
+    private AddOnResultResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Recording/TranscriptionOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Recording/TranscriptionOptions.cs
index 0529edd94..1f83098a7 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Recording/TranscriptionOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Recording/TranscriptionOptions.cs
@@ -9,122 +9,122 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Recording
-{
-
+{
+
+  /// <summary>
+  /// FetchTranscriptionOptions
+  /// </summary>
+  public class FetchTranscriptionOptions : IOptions<TranscriptionResource>
+  {
     /// <summary>
-    /// FetchTranscriptionOptions
+    /// The SID of the Account that created the resource to fetch
     /// </summary>
-    public class FetchTranscriptionOptions : IOptions<TranscriptionResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the recording that created the transcriptions to fetch
-        /// </summary>
-        public string PathRecordingSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTranscriptionOptions
-        /// </summary>
-        /// <param name="pathRecordingSid"> The SID of the recording that created the transcriptions to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchTranscriptionOptions(string pathRecordingSid, string pathSid)
-        {
-            PathRecordingSid = pathRecordingSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// DeleteTranscriptionOptions
+    /// The SID of the recording that created the transcriptions to fetch
     /// </summary>
-    public class DeleteTranscriptionOptions : IOptions<TranscriptionResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the recording that created the transcription to delete
-        /// </summary>
-        public string PathRecordingSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteTranscriptionOptions
-        /// </summary>
-        /// <param name="pathRecordingSid"> The SID of the recording that created the transcription to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteTranscriptionOptions(string pathRecordingSid, string pathSid)
-        {
-            PathRecordingSid = pathRecordingSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathRecordingSid { get; }
     /// <summary>
-    /// ReadTranscriptionOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class ReadTranscriptionOptions : ReadOptions<TranscriptionResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the recording that created the transcriptions to read
-        /// </summary>
-        public string PathRecordingSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadTranscriptionOptions
-        /// </summary>
-        /// <param name="pathRecordingSid"> The SID of the recording that created the transcriptions to read </param>
-        public ReadTranscriptionOptions(string pathRecordingSid)
-        {
-            PathRecordingSid = pathRecordingSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchTranscriptionOptions
+    /// </summary>
+    /// <param name="pathRecordingSid"> The SID of the recording that created the transcriptions to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchTranscriptionOptions(string pathRecordingSid, string pathSid)
+    {
+      PathRecordingSid = pathRecordingSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteTranscriptionOptions
+  /// </summary>
+  public class DeleteTranscriptionOptions : IOptions<TranscriptionResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the recording that created the transcription to delete
+    /// </summary>
+    public string PathRecordingSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteTranscriptionOptions
+    /// </summary>
+    /// <param name="pathRecordingSid"> The SID of the recording that created the transcription to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteTranscriptionOptions(string pathRecordingSid, string pathSid)
+    {
+      PathRecordingSid = pathRecordingSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadTranscriptionOptions
+  /// </summary>
+  public class ReadTranscriptionOptions : ReadOptions<TranscriptionResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the recording that created the transcriptions to read
+    /// </summary>
+    public string PathRecordingSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadTranscriptionOptions
+    /// </summary>
+    /// <param name="pathRecordingSid"> The SID of the recording that created the transcriptions to read </param>
+    public ReadTranscriptionOptions(string pathRecordingSid)
+    {
+      PathRecordingSid = pathRecordingSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Recording/TranscriptionResource.cs b/src/Twilio/Rest/Api/V2010/Account/Recording/TranscriptionResource.cs
index b6453291e..a2c136023 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Recording/TranscriptionResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Recording/TranscriptionResource.cs
@@ -17,403 +17,403 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Recording
-{
-
-    public class TranscriptionResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        private static Request BuildFetchRequest(FetchTranscriptionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathRecordingSid + "/Transcriptions/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Transcription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Transcription </returns>
-        public static TranscriptionResource Fetch(FetchTranscriptionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Transcription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Transcription </returns>
-        public static async System.Threading.Tasks.Task<TranscriptionResource> FetchAsync(FetchTranscriptionOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathRecordingSid"> The SID of the recording that created the transcriptions to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Transcription </returns>
-        public static TranscriptionResource Fetch(string pathRecordingSid,
-                                                  string pathSid,
-                                                  string pathAccountSid = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchTranscriptionOptions(pathRecordingSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathRecordingSid"> The SID of the recording that created the transcriptions to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Transcription </returns>
-        public static async System.Threading.Tasks.Task<TranscriptionResource> FetchAsync(string pathRecordingSid,
-                                                                                          string pathSid,
-                                                                                          string pathAccountSid = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchTranscriptionOptions(pathRecordingSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteTranscriptionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathRecordingSid + "/Transcriptions/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Transcription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Transcription </returns>
-        public static bool Delete(DeleteTranscriptionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Transcription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Transcription </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTranscriptionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathRecordingSid"> The SID of the recording that created the transcription to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Transcription </returns>
-        public static bool Delete(string pathRecordingSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteTranscriptionOptions(pathRecordingSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathRecordingSid"> The SID of the recording that created the transcription to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Transcription </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathRecordingSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteTranscriptionOptions(pathRecordingSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadTranscriptionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathRecordingSid + "/Transcriptions.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Transcription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Transcription </returns>
-        public static ResourceSet<TranscriptionResource> Read(ReadTranscriptionOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
-            return new ResourceSet<TranscriptionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Transcription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Transcription </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TranscriptionResource>> ReadAsync(ReadTranscriptionOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
-            return new ResourceSet<TranscriptionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathRecordingSid"> The SID of the recording that created the transcriptions to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Transcription </returns>
-        public static ResourceSet<TranscriptionResource> Read(string pathRecordingSid,
-                                                              string pathAccountSid = null,
-                                                              int? pageSize = null,
-                                                              long? limit = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadTranscriptionOptions(pathRecordingSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathRecordingSid"> The SID of the recording that created the transcriptions to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Transcription </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TranscriptionResource>> ReadAsync(string pathRecordingSid,
-                                                                                                      string pathAccountSid = null,
-                                                                                                      int? pageSize = null,
-                                                                                                      long? limit = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadTranscriptionOptions(pathRecordingSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TranscriptionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TranscriptionResource> NextPage(Page<TranscriptionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TranscriptionResource> PreviousPage(Page<TranscriptionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a TranscriptionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TranscriptionResource object represented by the provided JSON </returns>
-        public static TranscriptionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TranscriptionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the transcription
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The duration of the transcribed audio in seconds.
-        /// </summary>
-        [JsonProperty("duration")]
-        public string Duration { get; private set; }
-        /// <summary>
-        /// The charge for the transcription
-        /// </summary>
-        [JsonProperty("price")]
-        public decimal? Price { get; private set; }
-        /// <summary>
-        /// The currency in which price is measured
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The SID that identifies the transcription's recording
-        /// </summary>
-        [JsonProperty("recording_sid")]
-        public string RecordingSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The status of the transcription
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TranscriptionResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The text content of the transcription.
-        /// </summary>
-        [JsonProperty("transcription_text")]
-        public string TranscriptionText { get; private set; }
-        /// <summary>
-        /// The transcription type
-        /// </summary>
-        [JsonProperty("type")]
-        public string Type { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private TranscriptionResource()
-        {
-
-        }
-    }
+{
+
+  public class TranscriptionResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    private static Request BuildFetchRequest(FetchTranscriptionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathRecordingSid + "/Transcriptions/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Transcription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Transcription </returns>
+    public static TranscriptionResource Fetch(FetchTranscriptionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Transcription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Transcription </returns>
+    public static async System.Threading.Tasks.Task<TranscriptionResource> FetchAsync(FetchTranscriptionOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathRecordingSid"> The SID of the recording that created the transcriptions to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Transcription </returns>
+    public static TranscriptionResource Fetch(string pathRecordingSid,
+                                              string pathSid,
+                                              string pathAccountSid = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchTranscriptionOptions(pathRecordingSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathRecordingSid"> The SID of the recording that created the transcriptions to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Transcription </returns>
+    public static async System.Threading.Tasks.Task<TranscriptionResource> FetchAsync(string pathRecordingSid,
+                                                                                      string pathSid,
+                                                                                      string pathAccountSid = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchTranscriptionOptions(pathRecordingSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteTranscriptionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathRecordingSid + "/Transcriptions/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Transcription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Transcription </returns>
+    public static bool Delete(DeleteTranscriptionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Transcription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Transcription </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTranscriptionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathRecordingSid"> The SID of the recording that created the transcription to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Transcription </returns>
+    public static bool Delete(string pathRecordingSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteTranscriptionOptions(pathRecordingSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathRecordingSid"> The SID of the recording that created the transcription to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Transcription </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathRecordingSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteTranscriptionOptions(pathRecordingSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadTranscriptionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathRecordingSid + "/Transcriptions.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Transcription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Transcription </returns>
+    public static ResourceSet<TranscriptionResource> Read(ReadTranscriptionOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
+      return new ResourceSet<TranscriptionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Transcription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Transcription </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TranscriptionResource>> ReadAsync(ReadTranscriptionOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
+      return new ResourceSet<TranscriptionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathRecordingSid"> The SID of the recording that created the transcriptions to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Transcription </returns>
+    public static ResourceSet<TranscriptionResource> Read(string pathRecordingSid,
+                                                          string pathAccountSid = null,
+                                                          int? pageSize = null,
+                                                          long? limit = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadTranscriptionOptions(pathRecordingSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathRecordingSid"> The SID of the recording that created the transcriptions to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Transcription </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TranscriptionResource>> ReadAsync(string pathRecordingSid,
+                                                                                                  string pathAccountSid = null,
+                                                                                                  int? pageSize = null,
+                                                                                                  long? limit = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadTranscriptionOptions(pathRecordingSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TranscriptionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TranscriptionResource> NextPage(Page<TranscriptionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TranscriptionResource> PreviousPage(Page<TranscriptionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a TranscriptionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TranscriptionResource object represented by the provided JSON </returns>
+    public static TranscriptionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TranscriptionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the transcription
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The duration of the transcribed audio in seconds.
+    /// </summary>
+    [JsonProperty("duration")]
+    public string Duration { get; private set; }
+    /// <summary>
+    /// The charge for the transcription
+    /// </summary>
+    [JsonProperty("price")]
+    public decimal? Price { get; private set; }
+    /// <summary>
+    /// The currency in which price is measured
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The SID that identifies the transcription's recording
+    /// </summary>
+    [JsonProperty("recording_sid")]
+    public string RecordingSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The status of the transcription
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TranscriptionResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The text content of the transcription.
+    /// </summary>
+    [JsonProperty("transcription_text")]
+    public string TranscriptionText { get; private set; }
+    /// <summary>
+    /// The transcription type
+    /// </summary>
+    [JsonProperty("type")]
+    public string Type { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private TranscriptionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/RecordingOptions.cs b/src/Twilio/Rest/Api/V2010/Account/RecordingOptions.cs
index a80aba121..0e6ad1128 100644
--- a/src/Twilio/Rest/Api/V2010/Account/RecordingOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/RecordingOptions.cs
@@ -9,144 +9,144 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Fetch an instance of a recording
+  /// </summary>
+  public class FetchRecordingOptions : IOptions<RecordingResource>
+  {
     /// <summary>
-    /// Fetch an instance of a recording
+    /// The SID of the Account that created the resource to fetch
     /// </summary>
-    public class FetchRecordingOptions : IOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRecordingOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchRecordingOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Delete a recording from your account
+    /// The unique string that identifies the resource
     /// </summary>
-    public class DeleteRecordingOptions : IOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRecordingOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteRecordingOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// Retrieve a list of recordings belonging to the account used to make the request
+    /// Construct a new FetchRecordingOptions
     /// </summary>
-    public class ReadRecordingOptions : ReadOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Only include recordings that were created on this date
-        /// </summary>
-        public DateTime? DateCreatedBefore { get; set; }
-        /// <summary>
-        /// Only include recordings that were created on this date
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// Only include recordings that were created on this date
-        /// </summary>
-        public DateTime? DateCreatedAfter { get; set; }
-        /// <summary>
-        /// The Call SID of the resources to read
-        /// </summary>
-        public string CallSid { get; set; }
-        /// <summary>
-        /// Read by unique Conference SID for the recording
-        /// </summary>
-        public string ConferenceSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-            else
-            {
-                if (DateCreatedBefore != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateCreated<", Serializers.DateTimeIso8601(DateCreatedBefore)));
-                }
-
-                if (DateCreatedAfter != null)
-                {
-                    p.Add(new KeyValuePair<string, string>("DateCreated>", Serializers.DateTimeIso8601(DateCreatedAfter)));
-                }
-            }
-
-            if (CallSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallSid", CallSid.ToString()));
-            }
-
-            if (ConferenceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceSid", ConferenceSid.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchRecordingOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a recording from your account
+  /// </summary>
+  public class DeleteRecordingOptions : IOptions<RecordingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRecordingOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteRecordingOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of recordings belonging to the account used to make the request
+  /// </summary>
+  public class ReadRecordingOptions : ReadOptions<RecordingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// Only include recordings that were created on this date
+    /// </summary>
+    public DateTime? DateCreatedBefore { get; set; }
+    /// <summary>
+    /// Only include recordings that were created on this date
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// Only include recordings that were created on this date
+    /// </summary>
+    public DateTime? DateCreatedAfter { get; set; }
+    /// <summary>
+    /// The Call SID of the resources to read
+    /// </summary>
+    public string CallSid { get; set; }
+    /// <summary>
+    /// Read by unique Conference SID for the recording
+    /// </summary>
+    public string ConferenceSid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+      else
+      {
+        if (DateCreatedBefore != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateCreated<", Serializers.DateTimeIso8601(DateCreatedBefore)));
+        }
+
+        if (DateCreatedAfter != null)
+        {
+          p.Add(new KeyValuePair<string, string>("DateCreated>", Serializers.DateTimeIso8601(DateCreatedAfter)));
+        }
+      }
+
+      if (CallSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallSid", CallSid.ToString()));
+      }
+
+      if (ConferenceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceSid", ConferenceSid.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/RecordingResource.cs b/src/Twilio/Rest/Api/V2010/Account/RecordingResource.cs
index ee3444e25..124aa3b67 100644
--- a/src/Twilio/Rest/Api/V2010/Account/RecordingResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/RecordingResource.cs
@@ -17,453 +17,453 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class RecordingResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
-            public static readonly StatusEnum Paused = new StatusEnum("paused");
-            public static readonly StatusEnum Stopped = new StatusEnum("stopped");
-            public static readonly StatusEnum Processing = new StatusEnum("processing");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Absent = new StatusEnum("absent");
-        }
-
-        public sealed class SourceEnum : StringEnum
-        {
-            private SourceEnum(string value) : base(value) {}
-            public SourceEnum() {}
-            public static implicit operator SourceEnum(string value)
-            {
-                return new SourceEnum(value);
-            }
-
-            public static readonly SourceEnum Dialverb = new SourceEnum("DialVerb");
-            public static readonly SourceEnum Conference = new SourceEnum("Conference");
-            public static readonly SourceEnum Outboundapi = new SourceEnum("OutboundAPI");
-            public static readonly SourceEnum Trunking = new SourceEnum("Trunking");
-            public static readonly SourceEnum Recordverb = new SourceEnum("RecordVerb");
-            public static readonly SourceEnum Startcallrecordingapi = new SourceEnum("StartCallRecordingAPI");
-            public static readonly SourceEnum Startconferencerecordingapi = new SourceEnum("StartConferenceRecordingAPI");
-        }
-
-        private static Request BuildFetchRequest(FetchRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of a recording
-        /// </summary>
-        /// <param name="options"> Fetch Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Fetch(FetchRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a recording
-        /// </summary>
-        /// <param name="options"> Fetch Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(FetchRecordingOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of a recording
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a recording
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(string pathSid,
-                                                                                      string pathAccountSid = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a recording from your account
-        /// </summary>
-        /// <param name="options"> Delete Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static bool Delete(DeleteRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a recording from your account
-        /// </summary>
-        /// <param name="options"> Delete Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRecordingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a recording from your account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRecordingOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a recording from your account
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteRecordingOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of recordings belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static ResourceSet<RecordingResource> Read(ReadRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RecordingResource>.FromJson("recordings", response.Content);
-            return new ResourceSet<RecordingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of recordings belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(ReadRecordingOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RecordingResource>.FromJson("recordings", response.Content);
-            return new ResourceSet<RecordingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of recordings belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="dateCreatedBefore"> Only include recordings that were created on this date </param>
-        /// <param name="dateCreated"> Only include recordings that were created on this date </param>
-        /// <param name="dateCreatedAfter"> Only include recordings that were created on this date </param>
-        /// <param name="callSid"> The Call SID of the resources to read </param>
-        /// <param name="conferenceSid"> Read by unique Conference SID for the recording </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static ResourceSet<RecordingResource> Read(string pathAccountSid = null,
-                                                          DateTime? dateCreatedBefore = null,
-                                                          DateTime? dateCreated = null,
-                                                          DateTime? dateCreatedAfter = null,
-                                                          string callSid = null,
-                                                          string conferenceSid = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadRecordingOptions(){PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, CallSid = callSid, ConferenceSid = conferenceSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of recordings belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="dateCreatedBefore"> Only include recordings that were created on this date </param>
-        /// <param name="dateCreated"> Only include recordings that were created on this date </param>
-        /// <param name="dateCreatedAfter"> Only include recordings that were created on this date </param>
-        /// <param name="callSid"> The Call SID of the resources to read </param>
-        /// <param name="conferenceSid"> Read by unique Conference SID for the recording </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                  DateTime? dateCreatedBefore = null,
-                                                                                                  DateTime? dateCreated = null,
-                                                                                                  DateTime? dateCreatedAfter = null,
-                                                                                                  string callSid = null,
-                                                                                                  string conferenceSid = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadRecordingOptions(){PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, CallSid = callSid, ConferenceSid = conferenceSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RecordingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RecordingResource> NextPage(Page<RecordingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<RecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RecordingResource> PreviousPage(Page<RecordingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<RecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a RecordingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RecordingResource object represented by the provided JSON </returns>
-        public static RecordingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RecordingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used during the recording.
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The SID of the Call the resource is associated with
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The unique ID for the conference associated with the recording.
-        /// </summary>
-        [JsonProperty("conference_sid")]
-        public string ConferenceSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The start time of the recording, given in RFC 2822 format
-        /// </summary>
-        [JsonProperty("start_time")]
-        public DateTime? StartTime { get; private set; }
-        /// <summary>
-        /// The length of the recording in seconds.
-        /// </summary>
-        [JsonProperty("duration")]
-        public string Duration { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The one-time cost of creating the recording.
-        /// </summary>
-        [JsonProperty("price")]
-        public string Price { get; private set; }
-        /// <summary>
-        /// The currency used in the price property.
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The status of the recording.
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RecordingResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The number of channels in the final recording file as an integer.
-        /// </summary>
-        [JsonProperty("channels")]
-        public int? Channels { get; private set; }
-        /// <summary>
-        /// How the recording was created
-        /// </summary>
-        [JsonProperty("source")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RecordingResource.SourceEnum Source { get; private set; }
-        /// <summary>
-        /// More information about why the recording is missing, if status is `absent`.
-        /// </summary>
-        [JsonProperty("error_code")]
-        public int? ErrorCode { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// How to decrypt the recording.
-        /// </summary>
-        [JsonProperty("encryption_details")]
-        public object EncryptionDetails { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-
-        private RecordingResource()
-        {
-
-        }
-    }
+{
+
+  public class RecordingResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
+      public static readonly StatusEnum Paused = new StatusEnum("paused");
+      public static readonly StatusEnum Stopped = new StatusEnum("stopped");
+      public static readonly StatusEnum Processing = new StatusEnum("processing");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Absent = new StatusEnum("absent");
+    }
+
+    public sealed class SourceEnum : StringEnum
+    {
+      private SourceEnum(string value) : base(value) { }
+      public SourceEnum() { }
+      public static implicit operator SourceEnum(string value)
+      {
+        return new SourceEnum(value);
+      }
+
+      public static readonly SourceEnum Dialverb = new SourceEnum("DialVerb");
+      public static readonly SourceEnum Conference = new SourceEnum("Conference");
+      public static readonly SourceEnum Outboundapi = new SourceEnum("OutboundAPI");
+      public static readonly SourceEnum Trunking = new SourceEnum("Trunking");
+      public static readonly SourceEnum Recordverb = new SourceEnum("RecordVerb");
+      public static readonly SourceEnum Startcallrecordingapi = new SourceEnum("StartCallRecordingAPI");
+      public static readonly SourceEnum Startconferencerecordingapi = new SourceEnum("StartConferenceRecordingAPI");
+    }
+
+    private static Request BuildFetchRequest(FetchRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of a recording
+    /// </summary>
+    /// <param name="options"> Fetch Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Fetch(FetchRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a recording
+    /// </summary>
+    /// <param name="options"> Fetch Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(FetchRecordingOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of a recording
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a recording
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(string pathSid,
+                                                                                  string pathAccountSid = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a recording from your account
+    /// </summary>
+    /// <param name="options"> Delete Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static bool Delete(DeleteRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a recording from your account
+    /// </summary>
+    /// <param name="options"> Delete Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRecordingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a recording from your account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRecordingOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a recording from your account
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteRecordingOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Recordings.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of recordings belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static ResourceSet<RecordingResource> Read(ReadRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RecordingResource>.FromJson("recordings", response.Content);
+      return new ResourceSet<RecordingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of recordings belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(ReadRecordingOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RecordingResource>.FromJson("recordings", response.Content);
+      return new ResourceSet<RecordingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of recordings belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="dateCreatedBefore"> Only include recordings that were created on this date </param>
+    /// <param name="dateCreated"> Only include recordings that were created on this date </param>
+    /// <param name="dateCreatedAfter"> Only include recordings that were created on this date </param>
+    /// <param name="callSid"> The Call SID of the resources to read </param>
+    /// <param name="conferenceSid"> Read by unique Conference SID for the recording </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static ResourceSet<RecordingResource> Read(string pathAccountSid = null,
+                                                      DateTime? dateCreatedBefore = null,
+                                                      DateTime? dateCreated = null,
+                                                      DateTime? dateCreatedAfter = null,
+                                                      string callSid = null,
+                                                      string conferenceSid = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadRecordingOptions() { PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, CallSid = callSid, ConferenceSid = conferenceSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of recordings belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="dateCreatedBefore"> Only include recordings that were created on this date </param>
+    /// <param name="dateCreated"> Only include recordings that were created on this date </param>
+    /// <param name="dateCreatedAfter"> Only include recordings that were created on this date </param>
+    /// <param name="callSid"> The Call SID of the resources to read </param>
+    /// <param name="conferenceSid"> Read by unique Conference SID for the recording </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(string pathAccountSid = null,
+                                                                                              DateTime? dateCreatedBefore = null,
+                                                                                              DateTime? dateCreated = null,
+                                                                                              DateTime? dateCreatedAfter = null,
+                                                                                              string callSid = null,
+                                                                                              string conferenceSid = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadRecordingOptions() { PathAccountSid = pathAccountSid, DateCreatedBefore = dateCreatedBefore, DateCreated = dateCreated, DateCreatedAfter = dateCreatedAfter, CallSid = callSid, ConferenceSid = conferenceSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RecordingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RecordingResource> NextPage(Page<RecordingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<RecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RecordingResource> PreviousPage(Page<RecordingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<RecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a RecordingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RecordingResource object represented by the provided JSON </returns>
+    public static RecordingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RecordingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used during the recording.
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The SID of the Call the resource is associated with
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The unique ID for the conference associated with the recording.
+    /// </summary>
+    [JsonProperty("conference_sid")]
+    public string ConferenceSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The start time of the recording, given in RFC 2822 format
+    /// </summary>
+    [JsonProperty("start_time")]
+    public DateTime? StartTime { get; private set; }
+    /// <summary>
+    /// The length of the recording in seconds.
+    /// </summary>
+    [JsonProperty("duration")]
+    public string Duration { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The one-time cost of creating the recording.
+    /// </summary>
+    [JsonProperty("price")]
+    public string Price { get; private set; }
+    /// <summary>
+    /// The currency used in the price property.
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The status of the recording.
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RecordingResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The number of channels in the final recording file as an integer.
+    /// </summary>
+    [JsonProperty("channels")]
+    public int? Channels { get; private set; }
+    /// <summary>
+    /// How the recording was created
+    /// </summary>
+    [JsonProperty("source")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RecordingResource.SourceEnum Source { get; private set; }
+    /// <summary>
+    /// More information about why the recording is missing, if status is `absent`.
+    /// </summary>
+    [JsonProperty("error_code")]
+    public int? ErrorCode { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// How to decrypt the recording.
+    /// </summary>
+    [JsonProperty("encryption_details")]
+    public object EncryptionDetails { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+
+    private RecordingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/ShortCodeOptions.cs b/src/Twilio/Rest/Api/V2010/Account/ShortCodeOptions.cs
index 8321052b0..75c980942 100644
--- a/src/Twilio/Rest/Api/V2010/Account/ShortCodeOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/ShortCodeOptions.cs
@@ -9,169 +9,169 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Fetch an instance of a short code
+  /// </summary>
+  public class FetchShortCodeOptions : IOptions<ShortCodeResource>
+  {
     /// <summary>
-    /// Fetch an instance of a short code
-    /// </summary>
-    public class FetchShortCodeOptions : IOptions<ShortCodeResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchShortCodeOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        public FetchShortCodeOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Account that created the resource(s) to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Update a short code with the following parameters
-    /// </summary>
-    public class UpdateShortCodeOptions : IOptions<ShortCodeResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe this resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The API version to use to start a new TwiML session
-        /// </summary>
-        public string ApiVersion { get; set; }
-        /// <summary>
-        /// URL Twilio will request when receiving an SMS
-        /// </summary>
-        public Uri SmsUrl { get; set; }
-        /// <summary>
-        /// HTTP method to use when requesting the sms url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsMethod { get; set; }
-        /// <summary>
-        /// URL Twilio will request if an error occurs in executing TwiML
-        /// </summary>
-        public Uri SmsFallbackUrl { get; set; }
-        /// <summary>
-        /// HTTP method Twilio will use with sms_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateShortCodeOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        public UpdateShortCodeOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (ApiVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
-            }
-
-            if (SmsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
-            }
-
-            if (SmsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
-            }
-
-            if (SmsFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
-            }
-
-            if (SmsFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies this resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// Retrieve a list of short-codes belonging to the account used to make the request
-    /// </summary>
-    public class ReadShortCodeOptions : ReadOptions<ShortCodeResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource(s) to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The string that identifies the ShortCode resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Filter by ShortCode
-        /// </summary>
-        public string ShortCode { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (ShortCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ShortCode", ShortCode));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new FetchShortCodeOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    public FetchShortCodeOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update a short code with the following parameters
+  /// </summary>
+  public class UpdateShortCodeOptions : IOptions<ShortCodeResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies this resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe this resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The API version to use to start a new TwiML session
+    /// </summary>
+    public string ApiVersion { get; set; }
+    /// <summary>
+    /// URL Twilio will request when receiving an SMS
+    /// </summary>
+    public Uri SmsUrl { get; set; }
+    /// <summary>
+    /// HTTP method to use when requesting the sms url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsMethod { get; set; }
+    /// <summary>
+    /// URL Twilio will request if an error occurs in executing TwiML
+    /// </summary>
+    public Uri SmsFallbackUrl { get; set; }
+    /// <summary>
+    /// HTTP method Twilio will use with sms_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateShortCodeOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    public UpdateShortCodeOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (ApiVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiVersion", ApiVersion));
+      }
+
+      if (SmsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
+      }
+
+      if (SmsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
+      }
+
+      if (SmsFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
+      }
+
+      if (SmsFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of short-codes belonging to the account used to make the request
+  /// </summary>
+  public class ReadShortCodeOptions : ReadOptions<ShortCodeResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource(s) to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The string that identifies the ShortCode resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Filter by ShortCode
+    /// </summary>
+    public string ShortCode { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (ShortCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ShortCode", ShortCode));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/ShortCodeResource.cs b/src/Twilio/Rest/Api/V2010/Account/ShortCodeResource.cs
index 5c65faba6..6b1d1842d 100644
--- a/src/Twilio/Rest/Api/V2010/Account/ShortCodeResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/ShortCodeResource.cs
@@ -16,402 +16,402 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class ShortCodeResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchShortCodeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SMS/ShortCodes/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of a short code
-        /// </summary>
-        /// <param name="options"> Fetch ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Fetch(FetchShortCodeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a short code
-        /// </summary>
-        /// <param name="options"> Fetch ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> FetchAsync(FetchShortCodeOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of a short code
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchShortCodeOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a short code
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> FetchAsync(string pathSid,
-                                                                                      string pathAccountSid = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchShortCodeOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateShortCodeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SMS/ShortCodes/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a short code with the following parameters
-        /// </summary>
-        /// <param name="options"> Update ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Update(UpdateShortCodeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a short code with the following parameters
-        /// </summary>
-        /// <param name="options"> Update ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> UpdateAsync(UpdateShortCodeOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a short code with the following parameters
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
-        /// <param name="friendlyName"> A string to describe this resource </param>
-        /// <param name="apiVersion"> The API version to use to start a new TwiML session </param>
-        /// <param name="smsUrl"> URL Twilio will request when receiving an SMS </param>
-        /// <param name="smsMethod"> HTTP method to use when requesting the sms url </param>
-        /// <param name="smsFallbackUrl"> URL Twilio will request if an error occurs in executing TwiML </param>
-        /// <param name="smsFallbackMethod"> HTTP method Twilio will use with sms_fallback_url </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Update(string pathSid,
-                                               string pathAccountSid = null,
-                                               string friendlyName = null,
-                                               string apiVersion = null,
-                                               Uri smsUrl = null,
-                                               Twilio.Http.HttpMethod smsMethod = null,
-                                               Uri smsFallbackUrl = null,
-                                               Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateShortCodeOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, ApiVersion = apiVersion, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a short code with the following parameters
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
-        /// <param name="friendlyName"> A string to describe this resource </param>
-        /// <param name="apiVersion"> The API version to use to start a new TwiML session </param>
-        /// <param name="smsUrl"> URL Twilio will request when receiving an SMS </param>
-        /// <param name="smsMethod"> HTTP method to use when requesting the sms url </param>
-        /// <param name="smsFallbackUrl"> URL Twilio will request if an error occurs in executing TwiML </param>
-        /// <param name="smsFallbackMethod"> HTTP method Twilio will use with sms_fallback_url </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> UpdateAsync(string pathSid,
-                                                                                       string pathAccountSid = null,
-                                                                                       string friendlyName = null,
-                                                                                       string apiVersion = null,
-                                                                                       Uri smsUrl = null,
-                                                                                       Twilio.Http.HttpMethod smsMethod = null,
-                                                                                       Uri smsFallbackUrl = null,
-                                                                                       Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateShortCodeOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, ApiVersion = apiVersion, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadShortCodeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SMS/ShortCodes.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of short-codes belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ResourceSet<ShortCodeResource> Read(ReadShortCodeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-            return new ResourceSet<ShortCodeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of short-codes belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ShortCodeResource>> ReadAsync(ReadShortCodeOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-            return new ResourceSet<ShortCodeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of short-codes belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
-        /// <param name="friendlyName"> The string that identifies the ShortCode resources to read </param>
-        /// <param name="shortCode"> Filter by ShortCode </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ResourceSet<ShortCodeResource> Read(string pathAccountSid = null,
-                                                          string friendlyName = null,
-                                                          string shortCode = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadShortCodeOptions(){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, ShortCode = shortCode, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of short-codes belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
-        /// <param name="friendlyName"> The string that identifies the ShortCode resources to read </param>
-        /// <param name="shortCode"> Filter by ShortCode </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ShortCodeResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                  string friendlyName = null,
-                                                                                                  string shortCode = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadShortCodeOptions(){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, ShortCode = shortCode, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ShortCodeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ShortCodeResource> NextPage(Page<ShortCodeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ShortCodeResource> PreviousPage(Page<ShortCodeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a ShortCodeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ShortCodeResource object represented by the provided JSON </returns>
-        public static ShortCodeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ShortCodeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created this resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to start a new TwiML session
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// A string that you assigned to describe this resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The short code. e.g., 894546.
-        /// </summary>
-        [JsonProperty("short_code")]
-        public string ShortCode { get; private set; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// HTTP method we use to call the sms_fallback_url
-        /// </summary>
-        [JsonProperty("sms_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
-        /// <summary>
-        /// URL Twilio will request if an error occurs in executing TwiML
-        /// </summary>
-        [JsonProperty("sms_fallback_url")]
-        public Uri SmsFallbackUrl { get; private set; }
-        /// <summary>
-        /// HTTP method to use when requesting the sms url
-        /// </summary>
-        [JsonProperty("sms_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsMethod { get; private set; }
-        /// <summary>
-        /// URL we call when receiving an incoming SMS message to this short code
-        /// </summary>
-        [JsonProperty("sms_url")]
-        public Uri SmsUrl { get; private set; }
-        /// <summary>
-        /// The URI of this resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private ShortCodeResource()
-        {
-
-        }
-    }
+{
+
+  public class ShortCodeResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchShortCodeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SMS/ShortCodes/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of a short code
+    /// </summary>
+    /// <param name="options"> Fetch ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Fetch(FetchShortCodeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a short code
+    /// </summary>
+    /// <param name="options"> Fetch ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> FetchAsync(FetchShortCodeOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of a short code
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchShortCodeOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a short code
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> FetchAsync(string pathSid,
+                                                                                  string pathAccountSid = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchShortCodeOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateShortCodeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SMS/ShortCodes/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a short code with the following parameters
+    /// </summary>
+    /// <param name="options"> Update ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Update(UpdateShortCodeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a short code with the following parameters
+    /// </summary>
+    /// <param name="options"> Update ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> UpdateAsync(UpdateShortCodeOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a short code with the following parameters
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
+    /// <param name="friendlyName"> A string to describe this resource </param>
+    /// <param name="apiVersion"> The API version to use to start a new TwiML session </param>
+    /// <param name="smsUrl"> URL Twilio will request when receiving an SMS </param>
+    /// <param name="smsMethod"> HTTP method to use when requesting the sms url </param>
+    /// <param name="smsFallbackUrl"> URL Twilio will request if an error occurs in executing TwiML </param>
+    /// <param name="smsFallbackMethod"> HTTP method Twilio will use with sms_fallback_url </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Update(string pathSid,
+                                           string pathAccountSid = null,
+                                           string friendlyName = null,
+                                           string apiVersion = null,
+                                           Uri smsUrl = null,
+                                           Twilio.Http.HttpMethod smsMethod = null,
+                                           Uri smsFallbackUrl = null,
+                                           Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateShortCodeOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, ApiVersion = apiVersion, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a short code with the following parameters
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to update </param>
+    /// <param name="friendlyName"> A string to describe this resource </param>
+    /// <param name="apiVersion"> The API version to use to start a new TwiML session </param>
+    /// <param name="smsUrl"> URL Twilio will request when receiving an SMS </param>
+    /// <param name="smsMethod"> HTTP method to use when requesting the sms url </param>
+    /// <param name="smsFallbackUrl"> URL Twilio will request if an error occurs in executing TwiML </param>
+    /// <param name="smsFallbackMethod"> HTTP method Twilio will use with sms_fallback_url </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> UpdateAsync(string pathSid,
+                                                                                   string pathAccountSid = null,
+                                                                                   string friendlyName = null,
+                                                                                   string apiVersion = null,
+                                                                                   Uri smsUrl = null,
+                                                                                   Twilio.Http.HttpMethod smsMethod = null,
+                                                                                   Uri smsFallbackUrl = null,
+                                                                                   Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateShortCodeOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, ApiVersion = apiVersion, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadShortCodeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SMS/ShortCodes.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of short-codes belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ResourceSet<ShortCodeResource> Read(ReadShortCodeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+      return new ResourceSet<ShortCodeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of short-codes belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ShortCodeResource>> ReadAsync(ReadShortCodeOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+      return new ResourceSet<ShortCodeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of short-codes belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
+    /// <param name="friendlyName"> The string that identifies the ShortCode resources to read </param>
+    /// <param name="shortCode"> Filter by ShortCode </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ResourceSet<ShortCodeResource> Read(string pathAccountSid = null,
+                                                      string friendlyName = null,
+                                                      string shortCode = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadShortCodeOptions() { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, ShortCode = shortCode, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of short-codes belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource(s) to read </param>
+    /// <param name="friendlyName"> The string that identifies the ShortCode resources to read </param>
+    /// <param name="shortCode"> Filter by ShortCode </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ShortCodeResource>> ReadAsync(string pathAccountSid = null,
+                                                                                              string friendlyName = null,
+                                                                                              string shortCode = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadShortCodeOptions() { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, ShortCode = shortCode, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ShortCodeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ShortCodeResource> NextPage(Page<ShortCodeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ShortCodeResource> PreviousPage(Page<ShortCodeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a ShortCodeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ShortCodeResource object represented by the provided JSON </returns>
+    public static ShortCodeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ShortCodeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created this resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to start a new TwiML session
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// A string that you assigned to describe this resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The short code. e.g., 894546.
+    /// </summary>
+    [JsonProperty("short_code")]
+    public string ShortCode { get; private set; }
+    /// <summary>
+    /// The unique string that identifies this resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// HTTP method we use to call the sms_fallback_url
+    /// </summary>
+    [JsonProperty("sms_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
+    /// <summary>
+    /// URL Twilio will request if an error occurs in executing TwiML
+    /// </summary>
+    [JsonProperty("sms_fallback_url")]
+    public Uri SmsFallbackUrl { get; private set; }
+    /// <summary>
+    /// HTTP method to use when requesting the sms url
+    /// </summary>
+    [JsonProperty("sms_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsMethod { get; private set; }
+    /// <summary>
+    /// URL we call when receiving an incoming SMS message to this short code
+    /// </summary>
+    [JsonProperty("sms_url")]
+    public Uri SmsUrl { get; private set; }
+    /// <summary>
+    /// The URI of this resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private ShortCodeResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/SigningKeyOptions.cs b/src/Twilio/Rest/Api/V2010/Account/SigningKeyOptions.cs
index 484177364..93c316c75 100644
--- a/src/Twilio/Rest/Api/V2010/Account/SigningKeyOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/SigningKeyOptions.cs
@@ -9,139 +9,139 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// FetchSigningKeyOptions
+  /// </summary>
+  public class FetchSigningKeyOptions : IOptions<SigningKeyResource>
+  {
     /// <summary>
-    /// FetchSigningKeyOptions
+    /// The account_sid
     /// </summary>
-    public class FetchSigningKeyOptions : IOptions<SigningKeyResource>
-    {
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSigningKeyOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public FetchSigningKeyOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// UpdateSigningKeyOptions
+    /// The sid
     /// </summary>
-    public class UpdateSigningKeyOptions : IOptions<SigningKeyResource>
-    {
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSigningKeyOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateSigningKeyOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteSigningKeyOptions
+    /// Construct a new FetchSigningKeyOptions
     /// </summary>
-    public class DeleteSigningKeyOptions : IOptions<SigningKeyResource>
-    {
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSigningKeyOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteSigningKeyOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The sid </param>
+    public FetchSigningKeyOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadSigningKeyOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadSigningKeyOptions : ReadOptions<SigningKeyResource>
-    {
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        public string PathAccountSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateSigningKeyOptions
+  /// </summary>
+  public class UpdateSigningKeyOptions : IOptions<SigningKeyResource>
+  {
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSigningKeyOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateSigningKeyOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteSigningKeyOptions
+  /// </summary>
+  public class DeleteSigningKeyOptions : IOptions<SigningKeyResource>
+  {
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSigningKeyOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteSigningKeyOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadSigningKeyOptions
+  /// </summary>
+  public class ReadSigningKeyOptions : ReadOptions<SigningKeyResource>
+  {
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    public string PathAccountSid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/SigningKeyResource.cs b/src/Twilio/Rest/Api/V2010/Account/SigningKeyResource.cs
index 834bb1452..05ecda86a 100644
--- a/src/Twilio/Rest/Api/V2010/Account/SigningKeyResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/SigningKeyResource.cs
@@ -16,402 +16,402 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class SigningKeyResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSigningKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SigningKeys/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SigningKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SigningKey </returns>
-        public static SigningKeyResource Fetch(FetchSigningKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SigningKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SigningKey </returns>
-        public static async System.Threading.Tasks.Task<SigningKeyResource> FetchAsync(FetchSigningKeyOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="pathAccountSid"> The account_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SigningKey </returns>
-        public static SigningKeyResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchSigningKeyOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="pathAccountSid"> The account_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SigningKey </returns>
-        public static async System.Threading.Tasks.Task<SigningKeyResource> FetchAsync(string pathSid,
-                                                                                       string pathAccountSid = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchSigningKeyOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSigningKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SigningKeys/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SigningKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SigningKey </returns>
-        public static SigningKeyResource Update(UpdateSigningKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SigningKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SigningKey </returns>
-        public static async System.Threading.Tasks.Task<SigningKeyResource> UpdateAsync(UpdateSigningKeyOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="pathAccountSid"> The account_sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SigningKey </returns>
-        public static SigningKeyResource Update(string pathSid,
-                                                string pathAccountSid = null,
-                                                string friendlyName = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateSigningKeyOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="pathAccountSid"> The account_sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SigningKey </returns>
-        public static async System.Threading.Tasks.Task<SigningKeyResource> UpdateAsync(string pathSid,
-                                                                                        string pathAccountSid = null,
-                                                                                        string friendlyName = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateSigningKeyOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSigningKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SigningKeys/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SigningKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SigningKey </returns>
-        public static bool Delete(DeleteSigningKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SigningKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SigningKey </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSigningKeyOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="pathAccountSid"> The account_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SigningKey </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSigningKeyOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="pathAccountSid"> The account_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SigningKey </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSigningKeyOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSigningKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SigningKeys.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SigningKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SigningKey </returns>
-        public static ResourceSet<SigningKeyResource> Read(ReadSigningKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SigningKeyResource>.FromJson("signing_keys", response.Content);
-            return new ResourceSet<SigningKeyResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SigningKey parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SigningKey </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SigningKeyResource>> ReadAsync(ReadSigningKeyOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SigningKeyResource>.FromJson("signing_keys", response.Content);
-            return new ResourceSet<SigningKeyResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The account_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SigningKey </returns>
-        public static ResourceSet<SigningKeyResource> Read(string pathAccountSid = null,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadSigningKeyOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The account_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SigningKey </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SigningKeyResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadSigningKeyOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SigningKeyResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SigningKeyResource>.FromJson("signing_keys", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SigningKeyResource> NextPage(Page<SigningKeyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<SigningKeyResource>.FromJson("signing_keys", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SigningKeyResource> PreviousPage(Page<SigningKeyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<SigningKeyResource>.FromJson("signing_keys", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a SigningKeyResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SigningKeyResource object represented by the provided JSON </returns>
-        public static SigningKeyResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SigningKeyResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private SigningKeyResource()
-        {
-
-        }
-    }
+{
+
+  public class SigningKeyResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSigningKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SigningKeys/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SigningKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SigningKey </returns>
+    public static SigningKeyResource Fetch(FetchSigningKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SigningKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SigningKey </returns>
+    public static async System.Threading.Tasks.Task<SigningKeyResource> FetchAsync(FetchSigningKeyOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="pathAccountSid"> The account_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SigningKey </returns>
+    public static SigningKeyResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchSigningKeyOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="pathAccountSid"> The account_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SigningKey </returns>
+    public static async System.Threading.Tasks.Task<SigningKeyResource> FetchAsync(string pathSid,
+                                                                                   string pathAccountSid = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchSigningKeyOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSigningKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SigningKeys/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SigningKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SigningKey </returns>
+    public static SigningKeyResource Update(UpdateSigningKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SigningKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SigningKey </returns>
+    public static async System.Threading.Tasks.Task<SigningKeyResource> UpdateAsync(UpdateSigningKeyOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="pathAccountSid"> The account_sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SigningKey </returns>
+    public static SigningKeyResource Update(string pathSid,
+                                            string pathAccountSid = null,
+                                            string friendlyName = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateSigningKeyOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="pathAccountSid"> The account_sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SigningKey </returns>
+    public static async System.Threading.Tasks.Task<SigningKeyResource> UpdateAsync(string pathSid,
+                                                                                    string pathAccountSid = null,
+                                                                                    string friendlyName = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateSigningKeyOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSigningKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SigningKeys/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SigningKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SigningKey </returns>
+    public static bool Delete(DeleteSigningKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SigningKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SigningKey </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSigningKeyOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="pathAccountSid"> The account_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SigningKey </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSigningKeyOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="pathAccountSid"> The account_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SigningKey </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSigningKeyOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSigningKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SigningKeys.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SigningKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SigningKey </returns>
+    public static ResourceSet<SigningKeyResource> Read(ReadSigningKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SigningKeyResource>.FromJson("signing_keys", response.Content);
+      return new ResourceSet<SigningKeyResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SigningKey parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SigningKey </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SigningKeyResource>> ReadAsync(ReadSigningKeyOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SigningKeyResource>.FromJson("signing_keys", response.Content);
+      return new ResourceSet<SigningKeyResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The account_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SigningKey </returns>
+    public static ResourceSet<SigningKeyResource> Read(string pathAccountSid = null,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadSigningKeyOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The account_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SigningKey </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SigningKeyResource>> ReadAsync(string pathAccountSid = null,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadSigningKeyOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SigningKeyResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SigningKeyResource>.FromJson("signing_keys", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SigningKeyResource> NextPage(Page<SigningKeyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<SigningKeyResource>.FromJson("signing_keys", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SigningKeyResource> PreviousPage(Page<SigningKeyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<SigningKeyResource>.FromJson("signing_keys", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a SigningKeyResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SigningKeyResource object represented by the provided JSON </returns>
+    public static SigningKeyResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SigningKeyResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private SigningKeyResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialList/CredentialOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialList/CredentialOptions.cs
index c10de0370..0d9bed07e 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialList/CredentialOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialList/CredentialOptions.cs
@@ -9,230 +9,230 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.CredentialList
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of credentials.
+  /// </summary>
+  public class ReadCredentialOptions : ReadOptions<CredentialResource>
+  {
     /// <summary>
-    /// Retrieve a list of credentials.
-    /// </summary>
-    public class ReadCredentialOptions : ReadOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique id that identifies the credential list that contains the desired credentials
-        /// </summary>
-        public string PathCredentialListSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadCredentialOptions
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
-        ///                             credentials </param>
-        public ReadCredentialOptions(string pathCredentialListSid)
-        {
-            PathCredentialListSid = pathCredentialListSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Create a new credential resource.
-    /// </summary>
-    public class CreateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique id that identifies the credential list to include the created credential
-        /// </summary>
-        public string PathCredentialListSid { get; }
-        /// <summary>
-        /// The username for this credential.
-        /// </summary>
-        public string Username { get; }
-        /// <summary>
-        /// The password will not be returned in the response.
-        /// </summary>
-        public string Password { get; }
-
-        /// <summary>
-        /// Construct a new CreateCredentialOptions
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list to include the created
-        ///                             credential </param>
-        /// <param name="username"> The username for this credential. </param>
-        /// <param name="password"> The password will not be returned in the response. </param>
-        public CreateCredentialOptions(string pathCredentialListSid, string username, string password)
-        {
-            PathCredentialListSid = pathCredentialListSid;
-            Username = username;
-            Password = password;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Username != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Username", Username));
-            }
-
-            if (Password != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Password", Password));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique id that identifies the credential list that contains the desired credentials
+    /// </summary>
+    public string PathCredentialListSid { get; }
+
     /// <summary>
-    /// Fetch a single credential.
-    /// </summary>
-    public class FetchCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique id that identifies the credential list that contains the desired credential
-        /// </summary>
-        public string PathCredentialListSid { get; }
-        /// <summary>
-        /// The unique id that identifies the resource to fetch.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCredentialOptions
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
-        ///                             credential </param>
-        /// <param name="pathSid"> The unique id that identifies the resource to fetch. </param>
-        public FetchCredentialOptions(string pathCredentialListSid, string pathSid)
-        {
-            PathCredentialListSid = pathCredentialListSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new ReadCredentialOptions
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
+    ///                             credentials </param>
+    public ReadCredentialOptions(string pathCredentialListSid)
+    {
+      PathCredentialListSid = pathCredentialListSid;
+    }
+
     /// <summary>
-    /// Update a credential resource.
-    /// </summary>
-    public class UpdateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique id that identifies the credential list that includes this credential
-        /// </summary>
-        public string PathCredentialListSid { get; }
-        /// <summary>
-        /// The unique id that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The password will not be returned in the response
-        /// </summary>
-        public string Password { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateCredentialOptions
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that includes this
-        ///                             credential </param>
-        /// <param name="pathSid"> The unique id that identifies the resource to update </param>
-        public UpdateCredentialOptions(string pathCredentialListSid, string pathSid)
-        {
-            PathCredentialListSid = pathCredentialListSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Password != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Password", Password));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Create a new credential resource.
+  /// </summary>
+  public class CreateCredentialOptions : IOptions<CredentialResource>
+  {
     /// <summary>
-    /// Delete a credential resource.
-    /// </summary>
-    public class DeleteCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique id that identifies the credential list that contains the desired credentials
-        /// </summary>
-        public string PathCredentialListSid { get; }
-        /// <summary>
-        /// The unique id that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCredentialOptions
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
-        ///                             credentials </param>
-        /// <param name="pathSid"> The unique id that identifies the resource to delete </param>
-        public DeleteCredentialOptions(string pathCredentialListSid, string pathSid)
-        {
-            PathCredentialListSid = pathCredentialListSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique id that identifies the credential list to include the created credential
+    /// </summary>
+    public string PathCredentialListSid { get; }
+    /// <summary>
+    /// The username for this credential.
+    /// </summary>
+    public string Username { get; }
+    /// <summary>
+    /// The password will not be returned in the response.
+    /// </summary>
+    public string Password { get; }
+
+    /// <summary>
+    /// Construct a new CreateCredentialOptions
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list to include the created
+    ///                             credential </param>
+    /// <param name="username"> The username for this credential. </param>
+    /// <param name="password"> The password will not be returned in the response. </param>
+    public CreateCredentialOptions(string pathCredentialListSid, string username, string password)
+    {
+      PathCredentialListSid = pathCredentialListSid;
+      Username = username;
+      Password = password;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Username != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Username", Username));
+      }
+
+      if (Password != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Password", Password));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a single credential.
+  /// </summary>
+  public class FetchCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique id that identifies the credential list that contains the desired credential
+    /// </summary>
+    public string PathCredentialListSid { get; }
+    /// <summary>
+    /// The unique id that identifies the resource to fetch.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCredentialOptions
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
+    ///                             credential </param>
+    /// <param name="pathSid"> The unique id that identifies the resource to fetch. </param>
+    public FetchCredentialOptions(string pathCredentialListSid, string pathSid)
+    {
+      PathCredentialListSid = pathCredentialListSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update a credential resource.
+  /// </summary>
+  public class UpdateCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The unique id of the Account that is responsible for this resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique id that identifies the credential list that includes this credential
+    /// </summary>
+    public string PathCredentialListSid { get; }
+    /// <summary>
+    /// The unique id that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The password will not be returned in the response
+    /// </summary>
+    public string Password { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateCredentialOptions
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that includes this
+    ///                             credential </param>
+    /// <param name="pathSid"> The unique id that identifies the resource to update </param>
+    public UpdateCredentialOptions(string pathCredentialListSid, string pathSid)
+    {
+      PathCredentialListSid = pathCredentialListSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Password != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Password", Password));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a credential resource.
+  /// </summary>
+  public class DeleteCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique id that identifies the credential list that contains the desired credentials
+    /// </summary>
+    public string PathCredentialListSid { get; }
+    /// <summary>
+    /// The unique id that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCredentialOptions
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
+    ///                             credentials </param>
+    /// <param name="pathSid"> The unique id that identifies the resource to delete </param>
+    public DeleteCredentialOptions(string pathCredentialListSid, string pathSid)
+    {
+      PathCredentialListSid = pathCredentialListSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialList/CredentialResource.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialList/CredentialResource.cs
index e294391e2..b167a3cbe 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialList/CredentialResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialList/CredentialResource.cs
@@ -16,527 +16,527 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.CredentialList
-{
-
-    public class CredentialResource : Resource
-    {
-        private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathCredentialListSid + "/Credentials.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of credentials.
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of credentials.
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of credentials.
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
-        ///                             credentials </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(string pathCredentialListSid,
-                                                           string pathAccountSid = null,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(pathCredentialListSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of credentials.
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
-        ///                             credentials </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(string pathCredentialListSid,
-                                                                                                   string pathAccountSid = null,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(pathCredentialListSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathCredentialListSid + "/Credentials.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new credential resource.
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new credential resource.
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new credential resource.
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list to include the created
-        ///                             credential </param>
-        /// <param name="username"> The username for this credential. </param>
-        /// <param name="password"> The password will not be returned in the response. </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(string pathCredentialListSid,
-                                                string username,
-                                                string password,
-                                                string pathAccountSid = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(pathCredentialListSid, username, password){PathAccountSid = pathAccountSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new credential resource.
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list to include the created
-        ///                             credential </param>
-        /// <param name="username"> The username for this credential. </param>
-        /// <param name="password"> The password will not be returned in the response. </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(string pathCredentialListSid,
-                                                                                        string username,
-                                                                                        string password,
-                                                                                        string pathAccountSid = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(pathCredentialListSid, username, password){PathAccountSid = pathAccountSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathCredentialListSid + "/Credentials/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a single credential.
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a single credential.
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a single credential.
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
-        ///                             credential </param>
-        /// <param name="pathSid"> The unique id that identifies the resource to fetch. </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(string pathCredentialListSid,
-                                               string pathSid,
-                                               string pathAccountSid = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathCredentialListSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a single credential.
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
-        ///                             credential </param>
-        /// <param name="pathSid"> The unique id that identifies the resource to fetch. </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathCredentialListSid,
-                                                                                       string pathSid,
-                                                                                       string pathAccountSid = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathCredentialListSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathCredentialListSid + "/Credentials/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a credential resource.
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a credential resource.
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a credential resource.
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that includes this
-        ///                             credential </param>
-        /// <param name="pathSid"> The unique id that identifies the resource to update </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource </param>
-        /// <param name="password"> The password will not be returned in the response </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(string pathCredentialListSid,
-                                                string pathSid,
-                                                string pathAccountSid = null,
-                                                string password = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathCredentialListSid, pathSid){PathAccountSid = pathAccountSid, Password = password};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a credential resource.
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that includes this
-        ///                             credential </param>
-        /// <param name="pathSid"> The unique id that identifies the resource to update </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource </param>
-        /// <param name="password"> The password will not be returned in the response </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathCredentialListSid,
-                                                                                        string pathSid,
-                                                                                        string pathAccountSid = null,
-                                                                                        string password = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathCredentialListSid, pathSid){PathAccountSid = pathAccountSid, Password = password};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathCredentialListSid + "/Credentials/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a credential resource.
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a credential resource.
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a credential resource.
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
-        ///                             credentials </param>
-        /// <param name="pathSid"> The unique id that identifies the resource to delete </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(string pathCredentialListSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathCredentialListSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a credential resource.
-        /// </summary>
-        /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
-        ///                             credentials </param>
-        /// <param name="pathSid"> The unique id that identifies the resource to delete </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathCredentialListSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathCredentialListSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CredentialResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CredentialResource object represented by the provided JSON </returns>
-        public static CredentialResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CredentialResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique id that identifies the credential list that includes this credential
-        /// </summary>
-        [JsonProperty("credential_list_sid")]
-        public string CredentialListSid { get; private set; }
-        /// <summary>
-        /// The username for this credential.
-        /// </summary>
-        [JsonProperty("username")]
-        public string Username { get; private set; }
-        /// <summary>
-        /// The date that this resource was created, given as GMT in RFC 2822 format.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated, given as GMT in RFC 2822 format.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URI for this resource, relative to https://api.twilio.com
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private CredentialResource()
-        {
-
-        }
-    }
+{
+
+  public class CredentialResource : Resource
+  {
+    private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathCredentialListSid + "/Credentials.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of credentials.
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of credentials.
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of credentials.
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
+    ///                             credentials </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(string pathCredentialListSid,
+                                                       string pathAccountSid = null,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions(pathCredentialListSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of credentials.
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
+    ///                             credentials </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(string pathCredentialListSid,
+                                                                                               string pathAccountSid = null,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions(pathCredentialListSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathCredentialListSid + "/Credentials.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new credential resource.
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new credential resource.
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new credential resource.
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list to include the created
+    ///                             credential </param>
+    /// <param name="username"> The username for this credential. </param>
+    /// <param name="password"> The password will not be returned in the response. </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(string pathCredentialListSid,
+                                            string username,
+                                            string password,
+                                            string pathAccountSid = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(pathCredentialListSid, username, password) { PathAccountSid = pathAccountSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new credential resource.
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list to include the created
+    ///                             credential </param>
+    /// <param name="username"> The username for this credential. </param>
+    /// <param name="password"> The password will not be returned in the response. </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(string pathCredentialListSid,
+                                                                                    string username,
+                                                                                    string password,
+                                                                                    string pathAccountSid = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(pathCredentialListSid, username, password) { PathAccountSid = pathAccountSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathCredentialListSid + "/Credentials/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a single credential.
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a single credential.
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a single credential.
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
+    ///                             credential </param>
+    /// <param name="pathSid"> The unique id that identifies the resource to fetch. </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(string pathCredentialListSid,
+                                           string pathSid,
+                                           string pathAccountSid = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathCredentialListSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a single credential.
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
+    ///                             credential </param>
+    /// <param name="pathSid"> The unique id that identifies the resource to fetch. </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathCredentialListSid,
+                                                                                   string pathSid,
+                                                                                   string pathAccountSid = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathCredentialListSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathCredentialListSid + "/Credentials/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a credential resource.
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a credential resource.
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a credential resource.
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that includes this
+    ///                             credential </param>
+    /// <param name="pathSid"> The unique id that identifies the resource to update </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource </param>
+    /// <param name="password"> The password will not be returned in the response </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(string pathCredentialListSid,
+                                            string pathSid,
+                                            string pathAccountSid = null,
+                                            string password = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathCredentialListSid, pathSid) { PathAccountSid = pathAccountSid, Password = password };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a credential resource.
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that includes this
+    ///                             credential </param>
+    /// <param name="pathSid"> The unique id that identifies the resource to update </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource </param>
+    /// <param name="password"> The password will not be returned in the response </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathCredentialListSid,
+                                                                                    string pathSid,
+                                                                                    string pathAccountSid = null,
+                                                                                    string password = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathCredentialListSid, pathSid) { PathAccountSid = pathAccountSid, Password = password };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathCredentialListSid + "/Credentials/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a credential resource.
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a credential resource.
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a credential resource.
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
+    ///                             credentials </param>
+    /// <param name="pathSid"> The unique id that identifies the resource to delete </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(string pathCredentialListSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathCredentialListSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a credential resource.
+    /// </summary>
+    /// <param name="pathCredentialListSid"> The unique id that identifies the credential list that contains the desired
+    ///                             credentials </param>
+    /// <param name="pathSid"> The unique id that identifies the resource to delete </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathCredentialListSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathCredentialListSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CredentialResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CredentialResource object represented by the provided JSON </returns>
+    public static CredentialResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CredentialResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique id that identifies the credential list that includes this credential
+    /// </summary>
+    [JsonProperty("credential_list_sid")]
+    public string CredentialListSid { get; private set; }
+    /// <summary>
+    /// The username for this credential.
+    /// </summary>
+    [JsonProperty("username")]
+    public string Username { get; private set; }
+    /// <summary>
+    /// The date that this resource was created, given as GMT in RFC 2822 format.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated, given as GMT in RFC 2822 format.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URI for this resource, relative to https://api.twilio.com
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private CredentialResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialListOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialListOptions.cs
index 2c5d1245a..bfcac61e9 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialListOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialListOptions.cs
@@ -9,179 +9,179 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip
-{
-
+{
+
+  /// <summary>
+  /// Get All Credential Lists
+  /// </summary>
+  public class ReadCredentialListOptions : ReadOptions<CredentialListResource>
+  {
     /// <summary>
-    /// Get All Credential Lists
+    /// The unique id of the Account that is responsible for this resource.
     /// </summary>
-    public class ReadCredentialListOptions : ReadOptions<CredentialListResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
+
     /// <summary>
-    /// Create a Credential List
-    /// </summary>
-    public class CreateCredentialListOptions : IOptions<CredentialListResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Human readable descriptive text
-        /// </summary>
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Construct a new CreateCredentialListOptions
-        /// </summary>
-        /// <param name="friendlyName"> Human readable descriptive text </param>
-        public CreateCredentialListOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Create a Credential List
+  /// </summary>
+  public class CreateCredentialListOptions : IOptions<CredentialListResource>
+  {
     /// <summary>
-    /// Get a Credential List
-    /// </summary>
-    public class FetchCredentialListOptions : IOptions<CredentialListResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Fetch by unique credential list Sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCredentialListOptions
-        /// </summary>
-        /// <param name="pathSid"> Fetch by unique credential list Sid </param>
-        public FetchCredentialListOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Update a Credential List
-    /// </summary>
-    public class UpdateCredentialListOptions : IOptions<CredentialListResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Update by unique credential list Sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// Human readable descriptive text
-        /// </summary>
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Construct a new UpdateCredentialListOptions
-        /// </summary>
-        /// <param name="pathSid"> Update by unique credential list Sid </param>
-        /// <param name="friendlyName"> Human readable descriptive text </param>
-        public UpdateCredentialListOptions(string pathSid, string friendlyName)
-        {
-            PathSid = pathSid;
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Human readable descriptive text
+    /// </summary>
+    public string FriendlyName { get; }
+
     /// <summary>
-    /// Delete a Credential List
-    /// </summary>
-    public class DeleteCredentialListOptions : IOptions<CredentialListResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// Delete by unique credential list Sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCredentialListOptions
-        /// </summary>
-        /// <param name="pathSid"> Delete by unique credential list Sid </param>
-        public DeleteCredentialListOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new CreateCredentialListOptions
+    /// </summary>
+    /// <param name="friendlyName"> Human readable descriptive text </param>
+    public CreateCredentialListOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Get a Credential List
+  /// </summary>
+  public class FetchCredentialListOptions : IOptions<CredentialListResource>
+  {
+    /// <summary>
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// Fetch by unique credential list Sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCredentialListOptions
+    /// </summary>
+    /// <param name="pathSid"> Fetch by unique credential list Sid </param>
+    public FetchCredentialListOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update a Credential List
+  /// </summary>
+  public class UpdateCredentialListOptions : IOptions<CredentialListResource>
+  {
+    /// <summary>
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// Update by unique credential list Sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// Human readable descriptive text
+    /// </summary>
+    public string FriendlyName { get; }
+
+    /// <summary>
+    /// Construct a new UpdateCredentialListOptions
+    /// </summary>
+    /// <param name="pathSid"> Update by unique credential list Sid </param>
+    /// <param name="friendlyName"> Human readable descriptive text </param>
+    public UpdateCredentialListOptions(string pathSid, string friendlyName)
+    {
+      PathSid = pathSid;
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a Credential List
+  /// </summary>
+  public class DeleteCredentialListOptions : IOptions<CredentialListResource>
+  {
+    /// <summary>
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// Delete by unique credential list Sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCredentialListOptions
+    /// </summary>
+    /// <param name="pathSid"> Delete by unique credential list Sid </param>
+    public DeleteCredentialListOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialListResource.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialListResource.cs
index b4e7158aa..c492fcf49 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialListResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/CredentialListResource.cs
@@ -16,492 +16,492 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip
-{
-
-    public class CredentialListResource : Resource
-    {
-        private static Request BuildReadRequest(ReadCredentialListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Get All Credential Lists
-        /// </summary>
-        /// <param name="options"> Read CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static ResourceSet<CredentialListResource> Read(ReadCredentialListOptions options,
-                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CredentialListResource>.FromJson("credential_lists", response.Content);
-            return new ResourceSet<CredentialListResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Get All Credential Lists
-        /// </summary>
-        /// <param name="options"> Read CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialListResource>> ReadAsync(ReadCredentialListOptions options,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CredentialListResource>.FromJson("credential_lists", response.Content);
-            return new ResourceSet<CredentialListResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Get All Credential Lists
-        /// </summary>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static ResourceSet<CredentialListResource> Read(string pathAccountSid = null,
-                                                               int? pageSize = null,
-                                                               long? limit = null,
-                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialListOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Get All Credential Lists
-        /// </summary>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialListResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                       int? pageSize = null,
-                                                                                                       long? limit = null,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialListOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CredentialListResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialListResource>.FromJson("credential_lists", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CredentialListResource> NextPage(Page<CredentialListResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialListResource>.FromJson("credential_lists", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CredentialListResource> PreviousPage(Page<CredentialListResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialListResource>.FromJson("credential_lists", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateCredentialListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a Credential List
-        /// </summary>
-        /// <param name="options"> Create CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static CredentialListResource Create(CreateCredentialListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a Credential List
-        /// </summary>
-        /// <param name="options"> Create CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<CredentialListResource> CreateAsync(CreateCredentialListOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a Credential List
-        /// </summary>
-        /// <param name="friendlyName"> Human readable descriptive text </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static CredentialListResource Create(string friendlyName,
-                                                    string pathAccountSid = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialListOptions(friendlyName){PathAccountSid = pathAccountSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a Credential List
-        /// </summary>
-        /// <param name="friendlyName"> Human readable descriptive text </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<CredentialListResource> CreateAsync(string friendlyName,
-                                                                                            string pathAccountSid = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialListOptions(friendlyName){PathAccountSid = pathAccountSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchCredentialListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Get a Credential List
-        /// </summary>
-        /// <param name="options"> Fetch CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static CredentialListResource Fetch(FetchCredentialListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Get a Credential List
-        /// </summary>
-        /// <param name="options"> Fetch CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<CredentialListResource> FetchAsync(FetchCredentialListOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Get a Credential List
-        /// </summary>
-        /// <param name="pathSid"> Fetch by unique credential list Sid </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static CredentialListResource Fetch(string pathSid,
-                                                   string pathAccountSid = null,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialListOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Get a Credential List
-        /// </summary>
-        /// <param name="pathSid"> Fetch by unique credential list Sid </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<CredentialListResource> FetchAsync(string pathSid,
-                                                                                           string pathAccountSid = null,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialListOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateCredentialListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a Credential List
-        /// </summary>
-        /// <param name="options"> Update CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static CredentialListResource Update(UpdateCredentialListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a Credential List
-        /// </summary>
-        /// <param name="options"> Update CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<CredentialListResource> UpdateAsync(UpdateCredentialListOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a Credential List
-        /// </summary>
-        /// <param name="pathSid"> Update by unique credential list Sid </param>
-        /// <param name="friendlyName"> Human readable descriptive text </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static CredentialListResource Update(string pathSid,
-                                                    string friendlyName,
-                                                    string pathAccountSid = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialListOptions(pathSid, friendlyName){PathAccountSid = pathAccountSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a Credential List
-        /// </summary>
-        /// <param name="pathSid"> Update by unique credential list Sid </param>
-        /// <param name="friendlyName"> Human readable descriptive text </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<CredentialListResource> UpdateAsync(string pathSid,
-                                                                                            string friendlyName,
-                                                                                            string pathAccountSid = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialListOptions(pathSid, friendlyName){PathAccountSid = pathAccountSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCredentialListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a Credential List
-        /// </summary>
-        /// <param name="options"> Delete CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static bool Delete(DeleteCredentialListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Credential List
-        /// </summary>
-        /// <param name="options"> Delete CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialListOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a Credential List
-        /// </summary>
-        /// <param name="pathSid"> Delete by unique credential list Sid </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialListOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Credential List
-        /// </summary>
-        /// <param name="pathSid"> Delete by unique credential list Sid </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialListOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CredentialListResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CredentialListResource object represented by the provided JSON </returns>
-        public static CredentialListResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CredentialListResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The date this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Human readable descriptive text
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A string that uniquely identifies this credential
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The list of credentials associated with this credential list.
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// The URI for this resource
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private CredentialListResource()
-        {
-
-        }
-    }
+{
+
+  public class CredentialListResource : Resource
+  {
+    private static Request BuildReadRequest(ReadCredentialListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Get All Credential Lists
+    /// </summary>
+    /// <param name="options"> Read CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static ResourceSet<CredentialListResource> Read(ReadCredentialListOptions options,
+                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CredentialListResource>.FromJson("credential_lists", response.Content);
+      return new ResourceSet<CredentialListResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Get All Credential Lists
+    /// </summary>
+    /// <param name="options"> Read CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialListResource>> ReadAsync(ReadCredentialListOptions options,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CredentialListResource>.FromJson("credential_lists", response.Content);
+      return new ResourceSet<CredentialListResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Get All Credential Lists
+    /// </summary>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static ResourceSet<CredentialListResource> Read(string pathAccountSid = null,
+                                                           int? pageSize = null,
+                                                           long? limit = null,
+                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialListOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Get All Credential Lists
+    /// </summary>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialListResource>> ReadAsync(string pathAccountSid = null,
+                                                                                                   int? pageSize = null,
+                                                                                                   long? limit = null,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialListOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CredentialListResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialListResource>.FromJson("credential_lists", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CredentialListResource> NextPage(Page<CredentialListResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialListResource>.FromJson("credential_lists", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CredentialListResource> PreviousPage(Page<CredentialListResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialListResource>.FromJson("credential_lists", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateCredentialListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a Credential List
+    /// </summary>
+    /// <param name="options"> Create CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static CredentialListResource Create(CreateCredentialListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a Credential List
+    /// </summary>
+    /// <param name="options"> Create CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<CredentialListResource> CreateAsync(CreateCredentialListOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a Credential List
+    /// </summary>
+    /// <param name="friendlyName"> Human readable descriptive text </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static CredentialListResource Create(string friendlyName,
+                                                string pathAccountSid = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialListOptions(friendlyName) { PathAccountSid = pathAccountSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a Credential List
+    /// </summary>
+    /// <param name="friendlyName"> Human readable descriptive text </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<CredentialListResource> CreateAsync(string friendlyName,
+                                                                                        string pathAccountSid = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialListOptions(friendlyName) { PathAccountSid = pathAccountSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchCredentialListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Get a Credential List
+    /// </summary>
+    /// <param name="options"> Fetch CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static CredentialListResource Fetch(FetchCredentialListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Get a Credential List
+    /// </summary>
+    /// <param name="options"> Fetch CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<CredentialListResource> FetchAsync(FetchCredentialListOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Get a Credential List
+    /// </summary>
+    /// <param name="pathSid"> Fetch by unique credential list Sid </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static CredentialListResource Fetch(string pathSid,
+                                               string pathAccountSid = null,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialListOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Get a Credential List
+    /// </summary>
+    /// <param name="pathSid"> Fetch by unique credential list Sid </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<CredentialListResource> FetchAsync(string pathSid,
+                                                                                       string pathAccountSid = null,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialListOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateCredentialListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a Credential List
+    /// </summary>
+    /// <param name="options"> Update CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static CredentialListResource Update(UpdateCredentialListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a Credential List
+    /// </summary>
+    /// <param name="options"> Update CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<CredentialListResource> UpdateAsync(UpdateCredentialListOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a Credential List
+    /// </summary>
+    /// <param name="pathSid"> Update by unique credential list Sid </param>
+    /// <param name="friendlyName"> Human readable descriptive text </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static CredentialListResource Update(string pathSid,
+                                                string friendlyName,
+                                                string pathAccountSid = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialListOptions(pathSid, friendlyName) { PathAccountSid = pathAccountSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a Credential List
+    /// </summary>
+    /// <param name="pathSid"> Update by unique credential list Sid </param>
+    /// <param name="friendlyName"> Human readable descriptive text </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<CredentialListResource> UpdateAsync(string pathSid,
+                                                                                        string friendlyName,
+                                                                                        string pathAccountSid = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialListOptions(pathSid, friendlyName) { PathAccountSid = pathAccountSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCredentialListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/CredentialLists/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a Credential List
+    /// </summary>
+    /// <param name="options"> Delete CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static bool Delete(DeleteCredentialListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Credential List
+    /// </summary>
+    /// <param name="options"> Delete CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialListOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a Credential List
+    /// </summary>
+    /// <param name="pathSid"> Delete by unique credential list Sid </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialListOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Credential List
+    /// </summary>
+    /// <param name="pathSid"> Delete by unique credential list Sid </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialListOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CredentialListResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CredentialListResource object represented by the provided JSON </returns>
+    public static CredentialListResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CredentialListResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The date this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Human readable descriptive text
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A string that uniquely identifies this credential
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The list of credentials associated with this credential list.
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// The URI for this resource
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private CredentialListResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsCredentialListMappingOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsCredentialListMappingOptions.cs
index 6d580efd5..8813767a6 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsCredentialListMappingOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsCredentialListMappingOptions.cs
@@ -9,166 +9,166 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.Domain.AuthTypes.AuthTypeCalls
-{
-
+{
+
+  /// <summary>
+  /// Create a new credential list mapping resource
+  /// </summary>
+  public class CreateAuthCallsCredentialListMappingOptions : IOptions<AuthCallsCredentialListMappingResource>
+  {
     /// <summary>
-    /// Create a new credential list mapping resource
-    /// </summary>
-    public class CreateAuthCallsCredentialListMappingOptions : IOptions<AuthCallsCredentialListMappingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the SIP domain that will contain the new resource
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// The SID of the CredentialList resource to map to the SIP domain
-        /// </summary>
-        public string CredentialListSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateAuthCallsCredentialListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
-        /// <param name="credentialListSid"> The SID of the CredentialList resource to map to the SIP domain </param>
-        public CreateAuthCallsCredentialListMappingOptions(string pathDomainSid, string credentialListSid)
-        {
-            PathDomainSid = pathDomainSid;
-            CredentialListSid = credentialListSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (CredentialListSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CredentialListSid", CredentialListSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Retrieve a list of credential list mappings belonging to the domain used in the request
-    /// </summary>
-    public class ReadAuthCallsCredentialListMappingOptions : ReadOptions<AuthCallsCredentialListMappingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the SIP domain that contains the resources to read
-        /// </summary>
-        public string PathDomainSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadAuthCallsCredentialListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
-        public ReadAuthCallsCredentialListMappingOptions(string pathDomainSid)
-        {
-            PathDomainSid = pathDomainSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the SIP domain that will contain the new resource
+    /// </summary>
+    public string PathDomainSid { get; }
     /// <summary>
-    /// Fetch a specific instance of a credential list mapping
-    /// </summary>
-    public class FetchAuthCallsCredentialListMappingOptions : IOptions<AuthCallsCredentialListMappingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the SIP domain that contains the resource to fetch
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAuthCallsCredentialListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchAuthCallsCredentialListMappingOptions(string pathDomainSid, string pathSid)
-        {
-            PathDomainSid = pathDomainSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the CredentialList resource to map to the SIP domain
+    /// </summary>
+    public string CredentialListSid { get; }
+
     /// <summary>
-    /// Delete a credential list mapping from the requested domain
-    /// </summary>
-    public class DeleteAuthCallsCredentialListMappingOptions : IOptions<AuthCallsCredentialListMappingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the SIP domain that contains the resource to delete
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteAuthCallsCredentialListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteAuthCallsCredentialListMappingOptions(string pathDomainSid, string pathSid)
-        {
-            PathDomainSid = pathDomainSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new CreateAuthCallsCredentialListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
+    /// <param name="credentialListSid"> The SID of the CredentialList resource to map to the SIP domain </param>
+    public CreateAuthCallsCredentialListMappingOptions(string pathDomainSid, string credentialListSid)
+    {
+      PathDomainSid = pathDomainSid;
+      CredentialListSid = credentialListSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (CredentialListSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CredentialListSid", CredentialListSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of credential list mappings belonging to the domain used in the request
+  /// </summary>
+  public class ReadAuthCallsCredentialListMappingOptions : ReadOptions<AuthCallsCredentialListMappingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the SIP domain that contains the resources to read
+    /// </summary>
+    public string PathDomainSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadAuthCallsCredentialListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
+    public ReadAuthCallsCredentialListMappingOptions(string pathDomainSid)
+    {
+      PathDomainSid = pathDomainSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific instance of a credential list mapping
+  /// </summary>
+  public class FetchAuthCallsCredentialListMappingOptions : IOptions<AuthCallsCredentialListMappingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the SIP domain that contains the resource to fetch
+    /// </summary>
+    public string PathDomainSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchAuthCallsCredentialListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchAuthCallsCredentialListMappingOptions(string pathDomainSid, string pathSid)
+    {
+      PathDomainSid = pathDomainSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a credential list mapping from the requested domain
+  /// </summary>
+  public class DeleteAuthCallsCredentialListMappingOptions : IOptions<AuthCallsCredentialListMappingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the SIP domain that contains the resource to delete
+    /// </summary>
+    public string PathDomainSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteAuthCallsCredentialListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteAuthCallsCredentialListMappingOptions(string pathDomainSid, string pathSid)
+    {
+      PathDomainSid = pathDomainSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsCredentialListMappingResource.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsCredentialListMappingResource.cs
index 343cf20dd..aaead31eb 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsCredentialListMappingResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsCredentialListMappingResource.cs
@@ -16,431 +16,431 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.Domain.AuthTypes.AuthTypeCalls
-{
-
-    public class AuthCallsCredentialListMappingResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateAuthCallsCredentialListMappingOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/CredentialListMappings.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new credential list mapping resource
-        /// </summary>
-        /// <param name="options"> Create AuthCallsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
-        public static AuthCallsCredentialListMappingResource Create(CreateAuthCallsCredentialListMappingOptions options,
-                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new credential list mapping resource
-        /// </summary>
-        /// <param name="options"> Create AuthCallsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<AuthCallsCredentialListMappingResource> CreateAsync(CreateAuthCallsCredentialListMappingOptions options,
-                                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new credential list mapping resource
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
-        /// <param name="credentialListSid"> The SID of the CredentialList resource to map to the SIP domain </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
-        public static AuthCallsCredentialListMappingResource Create(string pathDomainSid,
-                                                                    string credentialListSid,
-                                                                    string pathAccountSid = null,
-                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateAuthCallsCredentialListMappingOptions(pathDomainSid, credentialListSid){PathAccountSid = pathAccountSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new credential list mapping resource
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
-        /// <param name="credentialListSid"> The SID of the CredentialList resource to map to the SIP domain </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<AuthCallsCredentialListMappingResource> CreateAsync(string pathDomainSid,
-                                                                                                            string credentialListSid,
-                                                                                                            string pathAccountSid = null,
-                                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateAuthCallsCredentialListMappingOptions(pathDomainSid, credentialListSid){PathAccountSid = pathAccountSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAuthCallsCredentialListMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/CredentialListMappings.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of credential list mappings belonging to the domain used in the request
-        /// </summary>
-        /// <param name="options"> Read AuthCallsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
-        public static ResourceSet<AuthCallsCredentialListMappingResource> Read(ReadAuthCallsCredentialListMappingOptions options,
-                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AuthCallsCredentialListMappingResource>.FromJson("contents", response.Content);
-            return new ResourceSet<AuthCallsCredentialListMappingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of credential list mappings belonging to the domain used in the request
-        /// </summary>
-        /// <param name="options"> Read AuthCallsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AuthCallsCredentialListMappingResource>> ReadAsync(ReadAuthCallsCredentialListMappingOptions options,
-                                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AuthCallsCredentialListMappingResource>.FromJson("contents", response.Content);
-            return new ResourceSet<AuthCallsCredentialListMappingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of credential list mappings belonging to the domain used in the request
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
-        public static ResourceSet<AuthCallsCredentialListMappingResource> Read(string pathDomainSid,
-                                                                               string pathAccountSid = null,
-                                                                               int? pageSize = null,
-                                                                               long? limit = null,
-                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadAuthCallsCredentialListMappingOptions(pathDomainSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of credential list mappings belonging to the domain used in the request
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AuthCallsCredentialListMappingResource>> ReadAsync(string pathDomainSid,
-                                                                                                                       string pathAccountSid = null,
-                                                                                                                       int? pageSize = null,
-                                                                                                                       long? limit = null,
-                                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadAuthCallsCredentialListMappingOptions(pathDomainSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AuthCallsCredentialListMappingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AuthCallsCredentialListMappingResource>.FromJson("contents", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AuthCallsCredentialListMappingResource> NextPage(Page<AuthCallsCredentialListMappingResource> page,
-                                                                            ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AuthCallsCredentialListMappingResource>.FromJson("contents", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AuthCallsCredentialListMappingResource> PreviousPage(Page<AuthCallsCredentialListMappingResource> page,
-                                                                                ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AuthCallsCredentialListMappingResource>.FromJson("contents", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchAuthCallsCredentialListMappingOptions options,
-                                                 ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/CredentialListMappings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific instance of a credential list mapping
-        /// </summary>
-        /// <param name="options"> Fetch AuthCallsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
-        public static AuthCallsCredentialListMappingResource Fetch(FetchAuthCallsCredentialListMappingOptions options,
-                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific instance of a credential list mapping
-        /// </summary>
-        /// <param name="options"> Fetch AuthCallsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<AuthCallsCredentialListMappingResource> FetchAsync(FetchAuthCallsCredentialListMappingOptions options,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific instance of a credential list mapping
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
-        public static AuthCallsCredentialListMappingResource Fetch(string pathDomainSid,
-                                                                   string pathSid,
-                                                                   string pathAccountSid = null,
-                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchAuthCallsCredentialListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific instance of a credential list mapping
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<AuthCallsCredentialListMappingResource> FetchAsync(string pathDomainSid,
-                                                                                                           string pathSid,
-                                                                                                           string pathAccountSid = null,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchAuthCallsCredentialListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteAuthCallsCredentialListMappingOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/CredentialListMappings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a credential list mapping from the requested domain
-        /// </summary>
-        /// <param name="options"> Delete AuthCallsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
-        public static bool Delete(DeleteAuthCallsCredentialListMappingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a credential list mapping from the requested domain
-        /// </summary>
-        /// <param name="options"> Delete AuthCallsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAuthCallsCredentialListMappingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a credential list mapping from the requested domain
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
-        public static bool Delete(string pathDomainSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteAuthCallsCredentialListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a credential list mapping from the requested domain
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathDomainSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteAuthCallsCredentialListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AuthCallsCredentialListMappingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AuthCallsCredentialListMappingResource object represented by the provided JSON </returns>
-        public static AuthCallsCredentialListMappingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AuthCallsCredentialListMappingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-
-        private AuthCallsCredentialListMappingResource()
-        {
-
-        }
-    }
+{
+
+  public class AuthCallsCredentialListMappingResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateAuthCallsCredentialListMappingOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/CredentialListMappings.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new credential list mapping resource
+    /// </summary>
+    /// <param name="options"> Create AuthCallsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
+    public static AuthCallsCredentialListMappingResource Create(CreateAuthCallsCredentialListMappingOptions options,
+                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new credential list mapping resource
+    /// </summary>
+    /// <param name="options"> Create AuthCallsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<AuthCallsCredentialListMappingResource> CreateAsync(CreateAuthCallsCredentialListMappingOptions options,
+                                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new credential list mapping resource
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
+    /// <param name="credentialListSid"> The SID of the CredentialList resource to map to the SIP domain </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
+    public static AuthCallsCredentialListMappingResource Create(string pathDomainSid,
+                                                                string credentialListSid,
+                                                                string pathAccountSid = null,
+                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateAuthCallsCredentialListMappingOptions(pathDomainSid, credentialListSid) { PathAccountSid = pathAccountSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new credential list mapping resource
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
+    /// <param name="credentialListSid"> The SID of the CredentialList resource to map to the SIP domain </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<AuthCallsCredentialListMappingResource> CreateAsync(string pathDomainSid,
+                                                                                                        string credentialListSid,
+                                                                                                        string pathAccountSid = null,
+                                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateAuthCallsCredentialListMappingOptions(pathDomainSid, credentialListSid) { PathAccountSid = pathAccountSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAuthCallsCredentialListMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/CredentialListMappings.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of credential list mappings belonging to the domain used in the request
+    /// </summary>
+    /// <param name="options"> Read AuthCallsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
+    public static ResourceSet<AuthCallsCredentialListMappingResource> Read(ReadAuthCallsCredentialListMappingOptions options,
+                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AuthCallsCredentialListMappingResource>.FromJson("contents", response.Content);
+      return new ResourceSet<AuthCallsCredentialListMappingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of credential list mappings belonging to the domain used in the request
+    /// </summary>
+    /// <param name="options"> Read AuthCallsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AuthCallsCredentialListMappingResource>> ReadAsync(ReadAuthCallsCredentialListMappingOptions options,
+                                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AuthCallsCredentialListMappingResource>.FromJson("contents", response.Content);
+      return new ResourceSet<AuthCallsCredentialListMappingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of credential list mappings belonging to the domain used in the request
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
+    public static ResourceSet<AuthCallsCredentialListMappingResource> Read(string pathDomainSid,
+                                                                           string pathAccountSid = null,
+                                                                           int? pageSize = null,
+                                                                           long? limit = null,
+                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadAuthCallsCredentialListMappingOptions(pathDomainSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of credential list mappings belonging to the domain used in the request
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AuthCallsCredentialListMappingResource>> ReadAsync(string pathDomainSid,
+                                                                                                                   string pathAccountSid = null,
+                                                                                                                   int? pageSize = null,
+                                                                                                                   long? limit = null,
+                                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadAuthCallsCredentialListMappingOptions(pathDomainSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AuthCallsCredentialListMappingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AuthCallsCredentialListMappingResource>.FromJson("contents", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AuthCallsCredentialListMappingResource> NextPage(Page<AuthCallsCredentialListMappingResource> page,
+                                                                        ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AuthCallsCredentialListMappingResource>.FromJson("contents", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AuthCallsCredentialListMappingResource> PreviousPage(Page<AuthCallsCredentialListMappingResource> page,
+                                                                            ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AuthCallsCredentialListMappingResource>.FromJson("contents", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchAuthCallsCredentialListMappingOptions options,
+                                             ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/CredentialListMappings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific instance of a credential list mapping
+    /// </summary>
+    /// <param name="options"> Fetch AuthCallsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
+    public static AuthCallsCredentialListMappingResource Fetch(FetchAuthCallsCredentialListMappingOptions options,
+                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific instance of a credential list mapping
+    /// </summary>
+    /// <param name="options"> Fetch AuthCallsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<AuthCallsCredentialListMappingResource> FetchAsync(FetchAuthCallsCredentialListMappingOptions options,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific instance of a credential list mapping
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
+    public static AuthCallsCredentialListMappingResource Fetch(string pathDomainSid,
+                                                               string pathSid,
+                                                               string pathAccountSid = null,
+                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchAuthCallsCredentialListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific instance of a credential list mapping
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<AuthCallsCredentialListMappingResource> FetchAsync(string pathDomainSid,
+                                                                                                       string pathSid,
+                                                                                                       string pathAccountSid = null,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchAuthCallsCredentialListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteAuthCallsCredentialListMappingOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/CredentialListMappings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a credential list mapping from the requested domain
+    /// </summary>
+    /// <param name="options"> Delete AuthCallsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
+    public static bool Delete(DeleteAuthCallsCredentialListMappingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a credential list mapping from the requested domain
+    /// </summary>
+    /// <param name="options"> Delete AuthCallsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAuthCallsCredentialListMappingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a credential list mapping from the requested domain
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsCredentialListMapping </returns>
+    public static bool Delete(string pathDomainSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteAuthCallsCredentialListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a credential list mapping from the requested domain
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathDomainSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteAuthCallsCredentialListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AuthCallsCredentialListMappingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AuthCallsCredentialListMappingResource object represented by the provided JSON </returns>
+    public static AuthCallsCredentialListMappingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AuthCallsCredentialListMappingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+
+    private AuthCallsCredentialListMappingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsIpAccessControlListMappingOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsIpAccessControlListMappingOptions.cs
index f11d5c259..8011b8b38 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsIpAccessControlListMappingOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsIpAccessControlListMappingOptions.cs
@@ -9,166 +9,166 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.Domain.AuthTypes.AuthTypeCalls
-{
-
+{
+
+  /// <summary>
+  /// Create a new IP Access Control List mapping
+  /// </summary>
+  public class CreateAuthCallsIpAccessControlListMappingOptions : IOptions<AuthCallsIpAccessControlListMappingResource>
+  {
     /// <summary>
-    /// Create a new IP Access Control List mapping
-    /// </summary>
-    public class CreateAuthCallsIpAccessControlListMappingOptions : IOptions<AuthCallsIpAccessControlListMappingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the SIP domain that will contain the new resource
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// The SID of the IpAccessControlList resource to map to the SIP domain
-        /// </summary>
-        public string IpAccessControlListSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateAuthCallsIpAccessControlListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
-        /// <param name="ipAccessControlListSid"> The SID of the IpAccessControlList resource to map to the SIP domain </param>
-        public CreateAuthCallsIpAccessControlListMappingOptions(string pathDomainSid, string ipAccessControlListSid)
-        {
-            PathDomainSid = pathDomainSid;
-            IpAccessControlListSid = ipAccessControlListSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IpAccessControlListSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IpAccessControlListSid", IpAccessControlListSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Retrieve a list of IP Access Control List mappings belonging to the domain used in the request
-    /// </summary>
-    public class ReadAuthCallsIpAccessControlListMappingOptions : ReadOptions<AuthCallsIpAccessControlListMappingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the SIP domain that contains the resources to read
-        /// </summary>
-        public string PathDomainSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadAuthCallsIpAccessControlListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
-        public ReadAuthCallsIpAccessControlListMappingOptions(string pathDomainSid)
-        {
-            PathDomainSid = pathDomainSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the SIP domain that will contain the new resource
+    /// </summary>
+    public string PathDomainSid { get; }
     /// <summary>
-    /// Fetch a specific instance of an IP Access Control List mapping
-    /// </summary>
-    public class FetchAuthCallsIpAccessControlListMappingOptions : IOptions<AuthCallsIpAccessControlListMappingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the SIP domain that contains the resource to fetch
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAuthCallsIpAccessControlListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchAuthCallsIpAccessControlListMappingOptions(string pathDomainSid, string pathSid)
-        {
-            PathDomainSid = pathDomainSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the IpAccessControlList resource to map to the SIP domain
+    /// </summary>
+    public string IpAccessControlListSid { get; }
+
     /// <summary>
-    /// Delete an IP Access Control List mapping from the requested domain
-    /// </summary>
-    public class DeleteAuthCallsIpAccessControlListMappingOptions : IOptions<AuthCallsIpAccessControlListMappingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the SIP domain that contains the resources to delete
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteAuthCallsIpAccessControlListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteAuthCallsIpAccessControlListMappingOptions(string pathDomainSid, string pathSid)
-        {
-            PathDomainSid = pathDomainSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new CreateAuthCallsIpAccessControlListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
+    /// <param name="ipAccessControlListSid"> The SID of the IpAccessControlList resource to map to the SIP domain </param>
+    public CreateAuthCallsIpAccessControlListMappingOptions(string pathDomainSid, string ipAccessControlListSid)
+    {
+      PathDomainSid = pathDomainSid;
+      IpAccessControlListSid = ipAccessControlListSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IpAccessControlListSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IpAccessControlListSid", IpAccessControlListSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of IP Access Control List mappings belonging to the domain used in the request
+  /// </summary>
+  public class ReadAuthCallsIpAccessControlListMappingOptions : ReadOptions<AuthCallsIpAccessControlListMappingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the SIP domain that contains the resources to read
+    /// </summary>
+    public string PathDomainSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadAuthCallsIpAccessControlListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
+    public ReadAuthCallsIpAccessControlListMappingOptions(string pathDomainSid)
+    {
+      PathDomainSid = pathDomainSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific instance of an IP Access Control List mapping
+  /// </summary>
+  public class FetchAuthCallsIpAccessControlListMappingOptions : IOptions<AuthCallsIpAccessControlListMappingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the SIP domain that contains the resource to fetch
+    /// </summary>
+    public string PathDomainSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchAuthCallsIpAccessControlListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchAuthCallsIpAccessControlListMappingOptions(string pathDomainSid, string pathSid)
+    {
+      PathDomainSid = pathDomainSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete an IP Access Control List mapping from the requested domain
+  /// </summary>
+  public class DeleteAuthCallsIpAccessControlListMappingOptions : IOptions<AuthCallsIpAccessControlListMappingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the SIP domain that contains the resources to delete
+    /// </summary>
+    public string PathDomainSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteAuthCallsIpAccessControlListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteAuthCallsIpAccessControlListMappingOptions(string pathDomainSid, string pathSid)
+    {
+      PathDomainSid = pathDomainSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsIpAccessControlListMappingResource.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsIpAccessControlListMappingResource.cs
index b54718e29..e8e5489dc 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsIpAccessControlListMappingResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeCalls/AuthCallsIpAccessControlListMappingResource.cs
@@ -16,432 +16,432 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.Domain.AuthTypes.AuthTypeCalls
-{
-
-    public class AuthCallsIpAccessControlListMappingResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateAuthCallsIpAccessControlListMappingOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/IpAccessControlListMappings.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new IP Access Control List mapping
-        /// </summary>
-        /// <param name="options"> Create AuthCallsIpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static AuthCallsIpAccessControlListMappingResource Create(CreateAuthCallsIpAccessControlListMappingOptions options,
-                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new IP Access Control List mapping
-        /// </summary>
-        /// <param name="options"> Create AuthCallsIpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<AuthCallsIpAccessControlListMappingResource> CreateAsync(CreateAuthCallsIpAccessControlListMappingOptions options,
-                                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new IP Access Control List mapping
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
-        /// <param name="ipAccessControlListSid"> The SID of the IpAccessControlList resource to map to the SIP domain </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static AuthCallsIpAccessControlListMappingResource Create(string pathDomainSid,
-                                                                         string ipAccessControlListSid,
-                                                                         string pathAccountSid = null,
-                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateAuthCallsIpAccessControlListMappingOptions(pathDomainSid, ipAccessControlListSid){PathAccountSid = pathAccountSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new IP Access Control List mapping
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
-        /// <param name="ipAccessControlListSid"> The SID of the IpAccessControlList resource to map to the SIP domain </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<AuthCallsIpAccessControlListMappingResource> CreateAsync(string pathDomainSid,
-                                                                                                                 string ipAccessControlListSid,
-                                                                                                                 string pathAccountSid = null,
-                                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateAuthCallsIpAccessControlListMappingOptions(pathDomainSid, ipAccessControlListSid){PathAccountSid = pathAccountSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAuthCallsIpAccessControlListMappingOptions options,
-                                                ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/IpAccessControlListMappings.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of IP Access Control List mappings belonging to the domain used in the request
-        /// </summary>
-        /// <param name="options"> Read AuthCallsIpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static ResourceSet<AuthCallsIpAccessControlListMappingResource> Read(ReadAuthCallsIpAccessControlListMappingOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AuthCallsIpAccessControlListMappingResource>.FromJson("contents", response.Content);
-            return new ResourceSet<AuthCallsIpAccessControlListMappingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of IP Access Control List mappings belonging to the domain used in the request
-        /// </summary>
-        /// <param name="options"> Read AuthCallsIpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AuthCallsIpAccessControlListMappingResource>> ReadAsync(ReadAuthCallsIpAccessControlListMappingOptions options,
-                                                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AuthCallsIpAccessControlListMappingResource>.FromJson("contents", response.Content);
-            return new ResourceSet<AuthCallsIpAccessControlListMappingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of IP Access Control List mappings belonging to the domain used in the request
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static ResourceSet<AuthCallsIpAccessControlListMappingResource> Read(string pathDomainSid,
-                                                                                    string pathAccountSid = null,
-                                                                                    int? pageSize = null,
-                                                                                    long? limit = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadAuthCallsIpAccessControlListMappingOptions(pathDomainSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of IP Access Control List mappings belonging to the domain used in the request
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AuthCallsIpAccessControlListMappingResource>> ReadAsync(string pathDomainSid,
-                                                                                                                            string pathAccountSid = null,
-                                                                                                                            int? pageSize = null,
-                                                                                                                            long? limit = null,
-                                                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadAuthCallsIpAccessControlListMappingOptions(pathDomainSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AuthCallsIpAccessControlListMappingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AuthCallsIpAccessControlListMappingResource>.FromJson("contents", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AuthCallsIpAccessControlListMappingResource> NextPage(Page<AuthCallsIpAccessControlListMappingResource> page,
-                                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AuthCallsIpAccessControlListMappingResource>.FromJson("contents", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AuthCallsIpAccessControlListMappingResource> PreviousPage(Page<AuthCallsIpAccessControlListMappingResource> page,
-                                                                                     ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AuthCallsIpAccessControlListMappingResource>.FromJson("contents", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchAuthCallsIpAccessControlListMappingOptions options,
-                                                 ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/IpAccessControlListMappings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific instance of an IP Access Control List mapping
-        /// </summary>
-        /// <param name="options"> Fetch AuthCallsIpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static AuthCallsIpAccessControlListMappingResource Fetch(FetchAuthCallsIpAccessControlListMappingOptions options,
-                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific instance of an IP Access Control List mapping
-        /// </summary>
-        /// <param name="options"> Fetch AuthCallsIpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<AuthCallsIpAccessControlListMappingResource> FetchAsync(FetchAuthCallsIpAccessControlListMappingOptions options,
-                                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific instance of an IP Access Control List mapping
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static AuthCallsIpAccessControlListMappingResource Fetch(string pathDomainSid,
-                                                                        string pathSid,
-                                                                        string pathAccountSid = null,
-                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchAuthCallsIpAccessControlListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific instance of an IP Access Control List mapping
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<AuthCallsIpAccessControlListMappingResource> FetchAsync(string pathDomainSid,
-                                                                                                                string pathSid,
-                                                                                                                string pathAccountSid = null,
-                                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchAuthCallsIpAccessControlListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteAuthCallsIpAccessControlListMappingOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/IpAccessControlListMappings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete an IP Access Control List mapping from the requested domain
-        /// </summary>
-        /// <param name="options"> Delete AuthCallsIpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static bool Delete(DeleteAuthCallsIpAccessControlListMappingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an IP Access Control List mapping from the requested domain
-        /// </summary>
-        /// <param name="options"> Delete AuthCallsIpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAuthCallsIpAccessControlListMappingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete an IP Access Control List mapping from the requested domain
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static bool Delete(string pathDomainSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteAuthCallsIpAccessControlListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an IP Access Control List mapping from the requested domain
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathDomainSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteAuthCallsIpAccessControlListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AuthCallsIpAccessControlListMappingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AuthCallsIpAccessControlListMappingResource object represented by the provided JSON </returns>
-        public static AuthCallsIpAccessControlListMappingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AuthCallsIpAccessControlListMappingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-
-        private AuthCallsIpAccessControlListMappingResource()
-        {
-
-        }
-    }
+{
+
+  public class AuthCallsIpAccessControlListMappingResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateAuthCallsIpAccessControlListMappingOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/IpAccessControlListMappings.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new IP Access Control List mapping
+    /// </summary>
+    /// <param name="options"> Create AuthCallsIpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static AuthCallsIpAccessControlListMappingResource Create(CreateAuthCallsIpAccessControlListMappingOptions options,
+                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new IP Access Control List mapping
+    /// </summary>
+    /// <param name="options"> Create AuthCallsIpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<AuthCallsIpAccessControlListMappingResource> CreateAsync(CreateAuthCallsIpAccessControlListMappingOptions options,
+                                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new IP Access Control List mapping
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
+    /// <param name="ipAccessControlListSid"> The SID of the IpAccessControlList resource to map to the SIP domain </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static AuthCallsIpAccessControlListMappingResource Create(string pathDomainSid,
+                                                                     string ipAccessControlListSid,
+                                                                     string pathAccountSid = null,
+                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateAuthCallsIpAccessControlListMappingOptions(pathDomainSid, ipAccessControlListSid) { PathAccountSid = pathAccountSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new IP Access Control List mapping
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
+    /// <param name="ipAccessControlListSid"> The SID of the IpAccessControlList resource to map to the SIP domain </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<AuthCallsIpAccessControlListMappingResource> CreateAsync(string pathDomainSid,
+                                                                                                             string ipAccessControlListSid,
+                                                                                                             string pathAccountSid = null,
+                                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateAuthCallsIpAccessControlListMappingOptions(pathDomainSid, ipAccessControlListSid) { PathAccountSid = pathAccountSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAuthCallsIpAccessControlListMappingOptions options,
+                                            ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/IpAccessControlListMappings.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of IP Access Control List mappings belonging to the domain used in the request
+    /// </summary>
+    /// <param name="options"> Read AuthCallsIpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static ResourceSet<AuthCallsIpAccessControlListMappingResource> Read(ReadAuthCallsIpAccessControlListMappingOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AuthCallsIpAccessControlListMappingResource>.FromJson("contents", response.Content);
+      return new ResourceSet<AuthCallsIpAccessControlListMappingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of IP Access Control List mappings belonging to the domain used in the request
+    /// </summary>
+    /// <param name="options"> Read AuthCallsIpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AuthCallsIpAccessControlListMappingResource>> ReadAsync(ReadAuthCallsIpAccessControlListMappingOptions options,
+                                                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AuthCallsIpAccessControlListMappingResource>.FromJson("contents", response.Content);
+      return new ResourceSet<AuthCallsIpAccessControlListMappingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of IP Access Control List mappings belonging to the domain used in the request
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static ResourceSet<AuthCallsIpAccessControlListMappingResource> Read(string pathDomainSid,
+                                                                                string pathAccountSid = null,
+                                                                                int? pageSize = null,
+                                                                                long? limit = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadAuthCallsIpAccessControlListMappingOptions(pathDomainSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of IP Access Control List mappings belonging to the domain used in the request
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AuthCallsIpAccessControlListMappingResource>> ReadAsync(string pathDomainSid,
+                                                                                                                        string pathAccountSid = null,
+                                                                                                                        int? pageSize = null,
+                                                                                                                        long? limit = null,
+                                                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadAuthCallsIpAccessControlListMappingOptions(pathDomainSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AuthCallsIpAccessControlListMappingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AuthCallsIpAccessControlListMappingResource>.FromJson("contents", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AuthCallsIpAccessControlListMappingResource> NextPage(Page<AuthCallsIpAccessControlListMappingResource> page,
+                                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AuthCallsIpAccessControlListMappingResource>.FromJson("contents", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AuthCallsIpAccessControlListMappingResource> PreviousPage(Page<AuthCallsIpAccessControlListMappingResource> page,
+                                                                                 ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AuthCallsIpAccessControlListMappingResource>.FromJson("contents", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchAuthCallsIpAccessControlListMappingOptions options,
+                                             ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/IpAccessControlListMappings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific instance of an IP Access Control List mapping
+    /// </summary>
+    /// <param name="options"> Fetch AuthCallsIpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static AuthCallsIpAccessControlListMappingResource Fetch(FetchAuthCallsIpAccessControlListMappingOptions options,
+                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific instance of an IP Access Control List mapping
+    /// </summary>
+    /// <param name="options"> Fetch AuthCallsIpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<AuthCallsIpAccessControlListMappingResource> FetchAsync(FetchAuthCallsIpAccessControlListMappingOptions options,
+                                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific instance of an IP Access Control List mapping
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static AuthCallsIpAccessControlListMappingResource Fetch(string pathDomainSid,
+                                                                    string pathSid,
+                                                                    string pathAccountSid = null,
+                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchAuthCallsIpAccessControlListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific instance of an IP Access Control List mapping
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<AuthCallsIpAccessControlListMappingResource> FetchAsync(string pathDomainSid,
+                                                                                                            string pathSid,
+                                                                                                            string pathAccountSid = null,
+                                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchAuthCallsIpAccessControlListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteAuthCallsIpAccessControlListMappingOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Calls/IpAccessControlListMappings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete an IP Access Control List mapping from the requested domain
+    /// </summary>
+    /// <param name="options"> Delete AuthCallsIpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static bool Delete(DeleteAuthCallsIpAccessControlListMappingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an IP Access Control List mapping from the requested domain
+    /// </summary>
+    /// <param name="options"> Delete AuthCallsIpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAuthCallsIpAccessControlListMappingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete an IP Access Control List mapping from the requested domain
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static bool Delete(string pathDomainSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteAuthCallsIpAccessControlListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an IP Access Control List mapping from the requested domain
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthCallsIpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathDomainSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteAuthCallsIpAccessControlListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AuthCallsIpAccessControlListMappingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AuthCallsIpAccessControlListMappingResource object represented by the provided JSON </returns>
+    public static AuthCallsIpAccessControlListMappingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AuthCallsIpAccessControlListMappingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+
+    private AuthCallsIpAccessControlListMappingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeRegistrations/AuthRegistrationsCredentialListMappingOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeRegistrations/AuthRegistrationsCredentialListMappingOptions.cs
index 5bc9e046b..4b371af32 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeRegistrations/AuthRegistrationsCredentialListMappingOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeRegistrations/AuthRegistrationsCredentialListMappingOptions.cs
@@ -9,166 +9,166 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.Domain.AuthTypes.AuthTypeRegistrations
-{
-
+{
+
+  /// <summary>
+  /// Create a new credential list mapping resource
+  /// </summary>
+  public class CreateAuthRegistrationsCredentialListMappingOptions : IOptions<AuthRegistrationsCredentialListMappingResource>
+  {
     /// <summary>
-    /// Create a new credential list mapping resource
-    /// </summary>
-    public class CreateAuthRegistrationsCredentialListMappingOptions : IOptions<AuthRegistrationsCredentialListMappingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the SIP domain that will contain the new resource
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// The SID of the CredentialList resource to map to the SIP domain
-        /// </summary>
-        public string CredentialListSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateAuthRegistrationsCredentialListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
-        /// <param name="credentialListSid"> The SID of the CredentialList resource to map to the SIP domain </param>
-        public CreateAuthRegistrationsCredentialListMappingOptions(string pathDomainSid, string credentialListSid)
-        {
-            PathDomainSid = pathDomainSid;
-            CredentialListSid = credentialListSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (CredentialListSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CredentialListSid", CredentialListSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Retrieve a list of credential list mappings belonging to the domain used in the request
-    /// </summary>
-    public class ReadAuthRegistrationsCredentialListMappingOptions : ReadOptions<AuthRegistrationsCredentialListMappingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the SIP domain that contains the resources to read
-        /// </summary>
-        public string PathDomainSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadAuthRegistrationsCredentialListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
-        public ReadAuthRegistrationsCredentialListMappingOptions(string pathDomainSid)
-        {
-            PathDomainSid = pathDomainSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the SIP domain that will contain the new resource
+    /// </summary>
+    public string PathDomainSid { get; }
     /// <summary>
-    /// Fetch a specific instance of a credential list mapping
-    /// </summary>
-    public class FetchAuthRegistrationsCredentialListMappingOptions : IOptions<AuthRegistrationsCredentialListMappingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the SIP domain that contains the resource to fetch
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAuthRegistrationsCredentialListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchAuthRegistrationsCredentialListMappingOptions(string pathDomainSid, string pathSid)
-        {
-            PathDomainSid = pathDomainSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the CredentialList resource to map to the SIP domain
+    /// </summary>
+    public string CredentialListSid { get; }
+
     /// <summary>
-    /// Delete a credential list mapping from the requested domain
-    /// </summary>
-    public class DeleteAuthRegistrationsCredentialListMappingOptions : IOptions<AuthRegistrationsCredentialListMappingResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The SID of the SIP domain that contains the resources to delete
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteAuthRegistrationsCredentialListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteAuthRegistrationsCredentialListMappingOptions(string pathDomainSid, string pathSid)
-        {
-            PathDomainSid = pathDomainSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new CreateAuthRegistrationsCredentialListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
+    /// <param name="credentialListSid"> The SID of the CredentialList resource to map to the SIP domain </param>
+    public CreateAuthRegistrationsCredentialListMappingOptions(string pathDomainSid, string credentialListSid)
+    {
+      PathDomainSid = pathDomainSid;
+      CredentialListSid = credentialListSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (CredentialListSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CredentialListSid", CredentialListSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of credential list mappings belonging to the domain used in the request
+  /// </summary>
+  public class ReadAuthRegistrationsCredentialListMappingOptions : ReadOptions<AuthRegistrationsCredentialListMappingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the SIP domain that contains the resources to read
+    /// </summary>
+    public string PathDomainSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadAuthRegistrationsCredentialListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
+    public ReadAuthRegistrationsCredentialListMappingOptions(string pathDomainSid)
+    {
+      PathDomainSid = pathDomainSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific instance of a credential list mapping
+  /// </summary>
+  public class FetchAuthRegistrationsCredentialListMappingOptions : IOptions<AuthRegistrationsCredentialListMappingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the SIP domain that contains the resource to fetch
+    /// </summary>
+    public string PathDomainSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchAuthRegistrationsCredentialListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchAuthRegistrationsCredentialListMappingOptions(string pathDomainSid, string pathSid)
+    {
+      PathDomainSid = pathDomainSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a credential list mapping from the requested domain
+  /// </summary>
+  public class DeleteAuthRegistrationsCredentialListMappingOptions : IOptions<AuthRegistrationsCredentialListMappingResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The SID of the SIP domain that contains the resources to delete
+    /// </summary>
+    public string PathDomainSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteAuthRegistrationsCredentialListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteAuthRegistrationsCredentialListMappingOptions(string pathDomainSid, string pathSid)
+    {
+      PathDomainSid = pathDomainSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeRegistrations/AuthRegistrationsCredentialListMappingResource.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeRegistrations/AuthRegistrationsCredentialListMappingResource.cs
index deca09641..01edc068c 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeRegistrations/AuthRegistrationsCredentialListMappingResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/AuthTypes/AuthTypeRegistrations/AuthRegistrationsCredentialListMappingResource.cs
@@ -16,434 +16,434 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.Domain.AuthTypes.AuthTypeRegistrations
-{
-
-    public class AuthRegistrationsCredentialListMappingResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateAuthRegistrationsCredentialListMappingOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Registrations/CredentialListMappings.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new credential list mapping resource
-        /// </summary>
-        /// <param name="options"> Create AuthRegistrationsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static AuthRegistrationsCredentialListMappingResource Create(CreateAuthRegistrationsCredentialListMappingOptions options,
-                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new credential list mapping resource
-        /// </summary>
-        /// <param name="options"> Create AuthRegistrationsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<AuthRegistrationsCredentialListMappingResource> CreateAsync(CreateAuthRegistrationsCredentialListMappingOptions options,
-                                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new credential list mapping resource
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
-        /// <param name="credentialListSid"> The SID of the CredentialList resource to map to the SIP domain </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static AuthRegistrationsCredentialListMappingResource Create(string pathDomainSid,
-                                                                            string credentialListSid,
-                                                                            string pathAccountSid = null,
-                                                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateAuthRegistrationsCredentialListMappingOptions(pathDomainSid, credentialListSid){PathAccountSid = pathAccountSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new credential list mapping resource
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
-        /// <param name="credentialListSid"> The SID of the CredentialList resource to map to the SIP domain </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<AuthRegistrationsCredentialListMappingResource> CreateAsync(string pathDomainSid,
-                                                                                                                    string credentialListSid,
-                                                                                                                    string pathAccountSid = null,
-                                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateAuthRegistrationsCredentialListMappingOptions(pathDomainSid, credentialListSid){PathAccountSid = pathAccountSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAuthRegistrationsCredentialListMappingOptions options,
-                                                ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Registrations/CredentialListMappings.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of credential list mappings belonging to the domain used in the request
-        /// </summary>
-        /// <param name="options"> Read AuthRegistrationsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static ResourceSet<AuthRegistrationsCredentialListMappingResource> Read(ReadAuthRegistrationsCredentialListMappingOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AuthRegistrationsCredentialListMappingResource>.FromJson("contents", response.Content);
-            return new ResourceSet<AuthRegistrationsCredentialListMappingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of credential list mappings belonging to the domain used in the request
-        /// </summary>
-        /// <param name="options"> Read AuthRegistrationsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AuthRegistrationsCredentialListMappingResource>> ReadAsync(ReadAuthRegistrationsCredentialListMappingOptions options,
-                                                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AuthRegistrationsCredentialListMappingResource>.FromJson("contents", response.Content);
-            return new ResourceSet<AuthRegistrationsCredentialListMappingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of credential list mappings belonging to the domain used in the request
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static ResourceSet<AuthRegistrationsCredentialListMappingResource> Read(string pathDomainSid,
-                                                                                       string pathAccountSid = null,
-                                                                                       int? pageSize = null,
-                                                                                       long? limit = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadAuthRegistrationsCredentialListMappingOptions(pathDomainSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of credential list mappings belonging to the domain used in the request
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AuthRegistrationsCredentialListMappingResource>> ReadAsync(string pathDomainSid,
-                                                                                                                               string pathAccountSid = null,
-                                                                                                                               int? pageSize = null,
-                                                                                                                               long? limit = null,
-                                                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadAuthRegistrationsCredentialListMappingOptions(pathDomainSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AuthRegistrationsCredentialListMappingResource> GetPage(string targetUrl,
-                                                                                   ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AuthRegistrationsCredentialListMappingResource>.FromJson("contents", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AuthRegistrationsCredentialListMappingResource> NextPage(Page<AuthRegistrationsCredentialListMappingResource> page,
-                                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AuthRegistrationsCredentialListMappingResource>.FromJson("contents", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AuthRegistrationsCredentialListMappingResource> PreviousPage(Page<AuthRegistrationsCredentialListMappingResource> page,
-                                                                                        ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AuthRegistrationsCredentialListMappingResource>.FromJson("contents", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchAuthRegistrationsCredentialListMappingOptions options,
-                                                 ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Registrations/CredentialListMappings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific instance of a credential list mapping
-        /// </summary>
-        /// <param name="options"> Fetch AuthRegistrationsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static AuthRegistrationsCredentialListMappingResource Fetch(FetchAuthRegistrationsCredentialListMappingOptions options,
-                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific instance of a credential list mapping
-        /// </summary>
-        /// <param name="options"> Fetch AuthRegistrationsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<AuthRegistrationsCredentialListMappingResource> FetchAsync(FetchAuthRegistrationsCredentialListMappingOptions options,
-                                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific instance of a credential list mapping
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static AuthRegistrationsCredentialListMappingResource Fetch(string pathDomainSid,
-                                                                           string pathSid,
-                                                                           string pathAccountSid = null,
-                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchAuthRegistrationsCredentialListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific instance of a credential list mapping
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<AuthRegistrationsCredentialListMappingResource> FetchAsync(string pathDomainSid,
-                                                                                                                   string pathSid,
-                                                                                                                   string pathAccountSid = null,
-                                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchAuthRegistrationsCredentialListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteAuthRegistrationsCredentialListMappingOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Registrations/CredentialListMappings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a credential list mapping from the requested domain
-        /// </summary>
-        /// <param name="options"> Delete AuthRegistrationsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static bool Delete(DeleteAuthRegistrationsCredentialListMappingOptions options,
-                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a credential list mapping from the requested domain
-        /// </summary>
-        /// <param name="options"> Delete AuthRegistrationsCredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAuthRegistrationsCredentialListMappingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a credential list mapping from the requested domain
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static bool Delete(string pathDomainSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteAuthRegistrationsCredentialListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a credential list mapping from the requested domain
-        /// </summary>
-        /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathDomainSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteAuthRegistrationsCredentialListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AuthRegistrationsCredentialListMappingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AuthRegistrationsCredentialListMappingResource object represented by the provided JSON </returns>
-        public static AuthRegistrationsCredentialListMappingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AuthRegistrationsCredentialListMappingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-
-        private AuthRegistrationsCredentialListMappingResource()
-        {
-
-        }
-    }
+{
+
+  public class AuthRegistrationsCredentialListMappingResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateAuthRegistrationsCredentialListMappingOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Registrations/CredentialListMappings.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new credential list mapping resource
+    /// </summary>
+    /// <param name="options"> Create AuthRegistrationsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static AuthRegistrationsCredentialListMappingResource Create(CreateAuthRegistrationsCredentialListMappingOptions options,
+                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new credential list mapping resource
+    /// </summary>
+    /// <param name="options"> Create AuthRegistrationsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<AuthRegistrationsCredentialListMappingResource> CreateAsync(CreateAuthRegistrationsCredentialListMappingOptions options,
+                                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new credential list mapping resource
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
+    /// <param name="credentialListSid"> The SID of the CredentialList resource to map to the SIP domain </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static AuthRegistrationsCredentialListMappingResource Create(string pathDomainSid,
+                                                                        string credentialListSid,
+                                                                        string pathAccountSid = null,
+                                                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateAuthRegistrationsCredentialListMappingOptions(pathDomainSid, credentialListSid) { PathAccountSid = pathAccountSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new credential list mapping resource
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that will contain the new resource </param>
+    /// <param name="credentialListSid"> The SID of the CredentialList resource to map to the SIP domain </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<AuthRegistrationsCredentialListMappingResource> CreateAsync(string pathDomainSid,
+                                                                                                                string credentialListSid,
+                                                                                                                string pathAccountSid = null,
+                                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateAuthRegistrationsCredentialListMappingOptions(pathDomainSid, credentialListSid) { PathAccountSid = pathAccountSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAuthRegistrationsCredentialListMappingOptions options,
+                                            ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Registrations/CredentialListMappings.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of credential list mappings belonging to the domain used in the request
+    /// </summary>
+    /// <param name="options"> Read AuthRegistrationsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static ResourceSet<AuthRegistrationsCredentialListMappingResource> Read(ReadAuthRegistrationsCredentialListMappingOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AuthRegistrationsCredentialListMappingResource>.FromJson("contents", response.Content);
+      return new ResourceSet<AuthRegistrationsCredentialListMappingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of credential list mappings belonging to the domain used in the request
+    /// </summary>
+    /// <param name="options"> Read AuthRegistrationsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AuthRegistrationsCredentialListMappingResource>> ReadAsync(ReadAuthRegistrationsCredentialListMappingOptions options,
+                                                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AuthRegistrationsCredentialListMappingResource>.FromJson("contents", response.Content);
+      return new ResourceSet<AuthRegistrationsCredentialListMappingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of credential list mappings belonging to the domain used in the request
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static ResourceSet<AuthRegistrationsCredentialListMappingResource> Read(string pathDomainSid,
+                                                                                   string pathAccountSid = null,
+                                                                                   int? pageSize = null,
+                                                                                   long? limit = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadAuthRegistrationsCredentialListMappingOptions(pathDomainSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of credential list mappings belonging to the domain used in the request
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to read </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AuthRegistrationsCredentialListMappingResource>> ReadAsync(string pathDomainSid,
+                                                                                                                           string pathAccountSid = null,
+                                                                                                                           int? pageSize = null,
+                                                                                                                           long? limit = null,
+                                                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadAuthRegistrationsCredentialListMappingOptions(pathDomainSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AuthRegistrationsCredentialListMappingResource> GetPage(string targetUrl,
+                                                                               ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AuthRegistrationsCredentialListMappingResource>.FromJson("contents", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AuthRegistrationsCredentialListMappingResource> NextPage(Page<AuthRegistrationsCredentialListMappingResource> page,
+                                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AuthRegistrationsCredentialListMappingResource>.FromJson("contents", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AuthRegistrationsCredentialListMappingResource> PreviousPage(Page<AuthRegistrationsCredentialListMappingResource> page,
+                                                                                    ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AuthRegistrationsCredentialListMappingResource>.FromJson("contents", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchAuthRegistrationsCredentialListMappingOptions options,
+                                             ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Registrations/CredentialListMappings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific instance of a credential list mapping
+    /// </summary>
+    /// <param name="options"> Fetch AuthRegistrationsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static AuthRegistrationsCredentialListMappingResource Fetch(FetchAuthRegistrationsCredentialListMappingOptions options,
+                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific instance of a credential list mapping
+    /// </summary>
+    /// <param name="options"> Fetch AuthRegistrationsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<AuthRegistrationsCredentialListMappingResource> FetchAsync(FetchAuthRegistrationsCredentialListMappingOptions options,
+                                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific instance of a credential list mapping
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static AuthRegistrationsCredentialListMappingResource Fetch(string pathDomainSid,
+                                                                       string pathSid,
+                                                                       string pathAccountSid = null,
+                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchAuthRegistrationsCredentialListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific instance of a credential list mapping
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<AuthRegistrationsCredentialListMappingResource> FetchAsync(string pathDomainSid,
+                                                                                                               string pathSid,
+                                                                                                               string pathAccountSid = null,
+                                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchAuthRegistrationsCredentialListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteAuthRegistrationsCredentialListMappingOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/Auth/Registrations/CredentialListMappings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a credential list mapping from the requested domain
+    /// </summary>
+    /// <param name="options"> Delete AuthRegistrationsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static bool Delete(DeleteAuthRegistrationsCredentialListMappingOptions options,
+                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a credential list mapping from the requested domain
+    /// </summary>
+    /// <param name="options"> Delete AuthRegistrationsCredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAuthRegistrationsCredentialListMappingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a credential list mapping from the requested domain
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static bool Delete(string pathDomainSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteAuthRegistrationsCredentialListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a credential list mapping from the requested domain
+    /// </summary>
+    /// <param name="pathDomainSid"> The SID of the SIP domain that contains the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthRegistrationsCredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathDomainSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteAuthRegistrationsCredentialListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AuthRegistrationsCredentialListMappingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AuthRegistrationsCredentialListMappingResource object represented by the provided JSON </returns>
+    public static AuthRegistrationsCredentialListMappingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AuthRegistrationsCredentialListMappingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+
+    private AuthRegistrationsCredentialListMappingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/CredentialListMappingOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/CredentialListMappingOptions.cs
index 980f0eac8..46aa71549 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/CredentialListMappingOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/CredentialListMappingOptions.cs
@@ -9,168 +9,168 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.Domain
-{
-
+{
+
+  /// <summary>
+  /// Create a CredentialListMapping resource for an account.
+  /// </summary>
+  public class CreateCredentialListMappingOptions : IOptions<CredentialListMappingResource>
+  {
     /// <summary>
-    /// Create a CredentialListMapping resource for an account.
-    /// </summary>
-    public class CreateCredentialListMappingOptions : IOptions<CredentialListMappingResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string that identifies the SIP Domain for which the CredentialList resource will be mapped
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// A string that identifies the CredentialList resource to map to the SIP domain
-        /// </summary>
-        public string CredentialListSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateCredentialListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that identifies the SIP Domain for which the CredentialList resource will be
-        ///                     mapped </param>
-        /// <param name="credentialListSid"> A string that identifies the CredentialList resource to map to the SIP domain
-        ///                         </param>
-        public CreateCredentialListMappingOptions(string pathDomainSid, string credentialListSid)
-        {
-            PathDomainSid = pathDomainSid;
-            CredentialListSid = credentialListSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (CredentialListSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CredentialListSid", CredentialListSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Read multiple CredentialListMapping resources from an account.
-    /// </summary>
-    public class ReadCredentialListMappingOptions : ReadOptions<CredentialListMappingResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string that identifies the SIP Domain that includes the resource to read
-        /// </summary>
-        public string PathDomainSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadCredentialListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to read </param>
-        public ReadCredentialListMappingOptions(string pathDomainSid)
-        {
-            PathDomainSid = pathDomainSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// A string that identifies the SIP Domain for which the CredentialList resource will be mapped
+    /// </summary>
+    public string PathDomainSid { get; }
     /// <summary>
-    /// Fetch a single CredentialListMapping resource from an account.
-    /// </summary>
-    public class FetchCredentialListMappingOptions : IOptions<CredentialListMappingResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string that identifies the SIP Domain that includes the resource to fetch
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// A string that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCredentialListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to fetch </param>
-        /// <param name="pathSid"> A string that identifies the resource to fetch </param>
-        public FetchCredentialListMappingOptions(string pathDomainSid, string pathSid)
-        {
-            PathDomainSid = pathDomainSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// A string that identifies the CredentialList resource to map to the SIP domain
+    /// </summary>
+    public string CredentialListSid { get; }
+
     /// <summary>
-    /// Delete a CredentialListMapping resource from an account.
-    /// </summary>
-    public class DeleteCredentialListMappingOptions : IOptions<CredentialListMappingResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string that identifies the SIP Domain that includes the resource to delete
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// A string that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCredentialListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to delete </param>
-        /// <param name="pathSid"> A string that identifies the resource to delete </param>
-        public DeleteCredentialListMappingOptions(string pathDomainSid, string pathSid)
-        {
-            PathDomainSid = pathDomainSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new CreateCredentialListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that identifies the SIP Domain for which the CredentialList resource will be
+    ///                     mapped </param>
+    /// <param name="credentialListSid"> A string that identifies the CredentialList resource to map to the SIP domain
+    ///                         </param>
+    public CreateCredentialListMappingOptions(string pathDomainSid, string credentialListSid)
+    {
+      PathDomainSid = pathDomainSid;
+      CredentialListSid = credentialListSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (CredentialListSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CredentialListSid", CredentialListSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Read multiple CredentialListMapping resources from an account.
+  /// </summary>
+  public class ReadCredentialListMappingOptions : ReadOptions<CredentialListMappingResource>
+  {
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string that identifies the SIP Domain that includes the resource to read
+    /// </summary>
+    public string PathDomainSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadCredentialListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to read </param>
+    public ReadCredentialListMappingOptions(string pathDomainSid)
+    {
+      PathDomainSid = pathDomainSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a single CredentialListMapping resource from an account.
+  /// </summary>
+  public class FetchCredentialListMappingOptions : IOptions<CredentialListMappingResource>
+  {
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string that identifies the SIP Domain that includes the resource to fetch
+    /// </summary>
+    public string PathDomainSid { get; }
+    /// <summary>
+    /// A string that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCredentialListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to fetch </param>
+    /// <param name="pathSid"> A string that identifies the resource to fetch </param>
+    public FetchCredentialListMappingOptions(string pathDomainSid, string pathSid)
+    {
+      PathDomainSid = pathDomainSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a CredentialListMapping resource from an account.
+  /// </summary>
+  public class DeleteCredentialListMappingOptions : IOptions<CredentialListMappingResource>
+  {
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string that identifies the SIP Domain that includes the resource to delete
+    /// </summary>
+    public string PathDomainSid { get; }
+    /// <summary>
+    /// A string that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCredentialListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to delete </param>
+    /// <param name="pathSid"> A string that identifies the resource to delete </param>
+    public DeleteCredentialListMappingOptions(string pathDomainSid, string pathSid)
+    {
+      PathDomainSid = pathDomainSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/CredentialListMappingResource.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/CredentialListMappingResource.cs
index f79fbb906..abde01748 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/CredentialListMappingResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/CredentialListMappingResource.cs
@@ -16,442 +16,442 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.Domain
-{
-
-    public class CredentialListMappingResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateCredentialListMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/CredentialListMappings.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a CredentialListMapping resource for an account.
-        /// </summary>
-        /// <param name="options"> Create CredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialListMapping </returns>
-        public static CredentialListMappingResource Create(CreateCredentialListMappingOptions options,
-                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a CredentialListMapping resource for an account.
-        /// </summary>
-        /// <param name="options"> Create CredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<CredentialListMappingResource> CreateAsync(CreateCredentialListMappingOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a CredentialListMapping resource for an account.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that identifies the SIP Domain for which the CredentialList resource will be
-        ///                     mapped </param>
-        /// <param name="credentialListSid"> A string that identifies the CredentialList resource to map to the SIP domain
-        ///                         </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialListMapping </returns>
-        public static CredentialListMappingResource Create(string pathDomainSid,
-                                                           string credentialListSid,
-                                                           string pathAccountSid = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialListMappingOptions(pathDomainSid, credentialListSid){PathAccountSid = pathAccountSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a CredentialListMapping resource for an account.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that identifies the SIP Domain for which the CredentialList resource will be
-        ///                     mapped </param>
-        /// <param name="credentialListSid"> A string that identifies the CredentialList resource to map to the SIP domain
-        ///                         </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<CredentialListMappingResource> CreateAsync(string pathDomainSid,
-                                                                                                   string credentialListSid,
-                                                                                                   string pathAccountSid = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialListMappingOptions(pathDomainSid, credentialListSid){PathAccountSid = pathAccountSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCredentialListMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/CredentialListMappings.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Read multiple CredentialListMapping resources from an account.
-        /// </summary>
-        /// <param name="options"> Read CredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialListMapping </returns>
-        public static ResourceSet<CredentialListMappingResource> Read(ReadCredentialListMappingOptions options,
-                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CredentialListMappingResource>.FromJson("credential_list_mappings", response.Content);
-            return new ResourceSet<CredentialListMappingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Read multiple CredentialListMapping resources from an account.
-        /// </summary>
-        /// <param name="options"> Read CredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialListMappingResource>> ReadAsync(ReadCredentialListMappingOptions options,
-                                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CredentialListMappingResource>.FromJson("credential_list_mappings", response.Content);
-            return new ResourceSet<CredentialListMappingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Read multiple CredentialListMapping resources from an account.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to read </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialListMapping </returns>
-        public static ResourceSet<CredentialListMappingResource> Read(string pathDomainSid,
-                                                                      string pathAccountSid = null,
-                                                                      int? pageSize = null,
-                                                                      long? limit = null,
-                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialListMappingOptions(pathDomainSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Read multiple CredentialListMapping resources from an account.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to read </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialListMappingResource>> ReadAsync(string pathDomainSid,
-                                                                                                              string pathAccountSid = null,
-                                                                                                              int? pageSize = null,
-                                                                                                              long? limit = null,
-                                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialListMappingOptions(pathDomainSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CredentialListMappingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialListMappingResource>.FromJson("credential_list_mappings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CredentialListMappingResource> NextPage(Page<CredentialListMappingResource> page,
-                                                                   ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialListMappingResource>.FromJson("credential_list_mappings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CredentialListMappingResource> PreviousPage(Page<CredentialListMappingResource> page,
-                                                                       ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialListMappingResource>.FromJson("credential_list_mappings", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchCredentialListMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/CredentialListMappings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a single CredentialListMapping resource from an account.
-        /// </summary>
-        /// <param name="options"> Fetch CredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialListMapping </returns>
-        public static CredentialListMappingResource Fetch(FetchCredentialListMappingOptions options,
-                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a single CredentialListMapping resource from an account.
-        /// </summary>
-        /// <param name="options"> Fetch CredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<CredentialListMappingResource> FetchAsync(FetchCredentialListMappingOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a single CredentialListMapping resource from an account.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to fetch </param>
-        /// <param name="pathSid"> A string that identifies the resource to fetch </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialListMapping </returns>
-        public static CredentialListMappingResource Fetch(string pathDomainSid,
-                                                          string pathSid,
-                                                          string pathAccountSid = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a single CredentialListMapping resource from an account.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to fetch </param>
-        /// <param name="pathSid"> A string that identifies the resource to fetch </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<CredentialListMappingResource> FetchAsync(string pathDomainSid,
-                                                                                                  string pathSid,
-                                                                                                  string pathAccountSid = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCredentialListMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/CredentialListMappings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a CredentialListMapping resource from an account.
-        /// </summary>
-        /// <param name="options"> Delete CredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialListMapping </returns>
-        public static bool Delete(DeleteCredentialListMappingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a CredentialListMapping resource from an account.
-        /// </summary>
-        /// <param name="options"> Delete CredentialListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialListMappingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a CredentialListMapping resource from an account.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to delete </param>
-        /// <param name="pathSid"> A string that identifies the resource to delete </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialListMapping </returns>
-        public static bool Delete(string pathDomainSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a CredentialListMapping resource from an account.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to delete </param>
-        /// <param name="pathSid"> A string that identifies the resource to delete </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathDomainSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CredentialListMappingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CredentialListMappingResource object represented by the provided JSON </returns>
-        public static CredentialListMappingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CredentialListMappingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created, given as GMT in RFC 2822 format.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated, given as GMT in RFC 2822 format.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the SipDomain resource.
-        /// </summary>
-        [JsonProperty("domain_sid")]
-        public string DomainSid { get; private set; }
-        /// <summary>
-        /// A human readable descriptive text for this resource, up to 64 characters long.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The URI for this resource, relative to https://api.twilio.com
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private CredentialListMappingResource()
-        {
-
-        }
-    }
+{
+
+  public class CredentialListMappingResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateCredentialListMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/CredentialListMappings.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a CredentialListMapping resource for an account.
+    /// </summary>
+    /// <param name="options"> Create CredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialListMapping </returns>
+    public static CredentialListMappingResource Create(CreateCredentialListMappingOptions options,
+                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a CredentialListMapping resource for an account.
+    /// </summary>
+    /// <param name="options"> Create CredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<CredentialListMappingResource> CreateAsync(CreateCredentialListMappingOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a CredentialListMapping resource for an account.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that identifies the SIP Domain for which the CredentialList resource will be
+    ///                     mapped </param>
+    /// <param name="credentialListSid"> A string that identifies the CredentialList resource to map to the SIP domain
+    ///                         </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialListMapping </returns>
+    public static CredentialListMappingResource Create(string pathDomainSid,
+                                                       string credentialListSid,
+                                                       string pathAccountSid = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialListMappingOptions(pathDomainSid, credentialListSid) { PathAccountSid = pathAccountSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a CredentialListMapping resource for an account.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that identifies the SIP Domain for which the CredentialList resource will be
+    ///                     mapped </param>
+    /// <param name="credentialListSid"> A string that identifies the CredentialList resource to map to the SIP domain
+    ///                         </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<CredentialListMappingResource> CreateAsync(string pathDomainSid,
+                                                                                               string credentialListSid,
+                                                                                               string pathAccountSid = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialListMappingOptions(pathDomainSid, credentialListSid) { PathAccountSid = pathAccountSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCredentialListMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/CredentialListMappings.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Read multiple CredentialListMapping resources from an account.
+    /// </summary>
+    /// <param name="options"> Read CredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialListMapping </returns>
+    public static ResourceSet<CredentialListMappingResource> Read(ReadCredentialListMappingOptions options,
+                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CredentialListMappingResource>.FromJson("credential_list_mappings", response.Content);
+      return new ResourceSet<CredentialListMappingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Read multiple CredentialListMapping resources from an account.
+    /// </summary>
+    /// <param name="options"> Read CredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialListMappingResource>> ReadAsync(ReadCredentialListMappingOptions options,
+                                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CredentialListMappingResource>.FromJson("credential_list_mappings", response.Content);
+      return new ResourceSet<CredentialListMappingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Read multiple CredentialListMapping resources from an account.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to read </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialListMapping </returns>
+    public static ResourceSet<CredentialListMappingResource> Read(string pathDomainSid,
+                                                                  string pathAccountSid = null,
+                                                                  int? pageSize = null,
+                                                                  long? limit = null,
+                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialListMappingOptions(pathDomainSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Read multiple CredentialListMapping resources from an account.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to read </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialListMappingResource>> ReadAsync(string pathDomainSid,
+                                                                                                          string pathAccountSid = null,
+                                                                                                          int? pageSize = null,
+                                                                                                          long? limit = null,
+                                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialListMappingOptions(pathDomainSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CredentialListMappingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialListMappingResource>.FromJson("credential_list_mappings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CredentialListMappingResource> NextPage(Page<CredentialListMappingResource> page,
+                                                               ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialListMappingResource>.FromJson("credential_list_mappings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CredentialListMappingResource> PreviousPage(Page<CredentialListMappingResource> page,
+                                                                   ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialListMappingResource>.FromJson("credential_list_mappings", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchCredentialListMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/CredentialListMappings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a single CredentialListMapping resource from an account.
+    /// </summary>
+    /// <param name="options"> Fetch CredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialListMapping </returns>
+    public static CredentialListMappingResource Fetch(FetchCredentialListMappingOptions options,
+                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a single CredentialListMapping resource from an account.
+    /// </summary>
+    /// <param name="options"> Fetch CredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<CredentialListMappingResource> FetchAsync(FetchCredentialListMappingOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a single CredentialListMapping resource from an account.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to fetch </param>
+    /// <param name="pathSid"> A string that identifies the resource to fetch </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialListMapping </returns>
+    public static CredentialListMappingResource Fetch(string pathDomainSid,
+                                                      string pathSid,
+                                                      string pathAccountSid = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a single CredentialListMapping resource from an account.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to fetch </param>
+    /// <param name="pathSid"> A string that identifies the resource to fetch </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<CredentialListMappingResource> FetchAsync(string pathDomainSid,
+                                                                                              string pathSid,
+                                                                                              string pathAccountSid = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCredentialListMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/CredentialListMappings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a CredentialListMapping resource from an account.
+    /// </summary>
+    /// <param name="options"> Delete CredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialListMapping </returns>
+    public static bool Delete(DeleteCredentialListMappingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a CredentialListMapping resource from an account.
+    /// </summary>
+    /// <param name="options"> Delete CredentialListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialListMappingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a CredentialListMapping resource from an account.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to delete </param>
+    /// <param name="pathSid"> A string that identifies the resource to delete </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialListMapping </returns>
+    public static bool Delete(string pathDomainSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a CredentialListMapping resource from an account.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that identifies the SIP Domain that includes the resource to delete </param>
+    /// <param name="pathSid"> A string that identifies the resource to delete </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialListMapping </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathDomainSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CredentialListMappingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CredentialListMappingResource object represented by the provided JSON </returns>
+    public static CredentialListMappingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CredentialListMappingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created, given as GMT in RFC 2822 format.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated, given as GMT in RFC 2822 format.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the SipDomain resource.
+    /// </summary>
+    [JsonProperty("domain_sid")]
+    public string DomainSid { get; private set; }
+    /// <summary>
+    /// A human readable descriptive text for this resource, up to 64 characters long.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The URI for this resource, relative to https://api.twilio.com
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private CredentialListMappingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/IpAccessControlListMappingOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/IpAccessControlListMappingOptions.cs
index 04b6c40ad..d350eec0b 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/IpAccessControlListMappingOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/IpAccessControlListMappingOptions.cs
@@ -9,166 +9,166 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.Domain
-{
-
+{
+
+  /// <summary>
+  /// Fetch an IpAccessControlListMapping resource.
+  /// </summary>
+  public class FetchIpAccessControlListMappingOptions : IOptions<IpAccessControlListMappingResource>
+  {
     /// <summary>
-    /// Fetch an IpAccessControlListMapping resource.
-    /// </summary>
-    public class FetchIpAccessControlListMappingOptions : IOptions<IpAccessControlListMappingResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string that uniquely identifies the SIP Domain
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies the resource to fetch.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchIpAccessControlListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies the resource to fetch. </param>
-        public FetchIpAccessControlListMappingOptions(string pathDomainSid, string pathSid)
-        {
-            PathDomainSid = pathDomainSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Create a new IpAccessControlListMapping resource.
-    /// </summary>
-    public class CreateIpAccessControlListMappingOptions : IOptions<IpAccessControlListMappingResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string that uniquely identifies the SIP Domain
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// The unique id of the IP access control list to map to the SIP domain
-        /// </summary>
-        public string IpAccessControlListSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateIpAccessControlListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
-        /// <param name="ipAccessControlListSid"> The unique id of the IP access control list to map to the SIP domain </param>
-        public CreateIpAccessControlListMappingOptions(string pathDomainSid, string ipAccessControlListSid)
-        {
-            PathDomainSid = pathDomainSid;
-            IpAccessControlListSid = ipAccessControlListSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IpAccessControlListSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IpAccessControlListSid", IpAccessControlListSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// A string that uniquely identifies the SIP Domain
+    /// </summary>
+    public string PathDomainSid { get; }
     /// <summary>
-    /// Retrieve a list of IpAccessControlListMapping resources.
-    /// </summary>
-    public class ReadIpAccessControlListMappingOptions : ReadOptions<IpAccessControlListMappingResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string that uniquely identifies the SIP Domain
-        /// </summary>
-        public string PathDomainSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadIpAccessControlListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
-        public ReadIpAccessControlListMappingOptions(string pathDomainSid)
-        {
-            PathDomainSid = pathDomainSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// A 34 character string that uniquely identifies the resource to fetch.
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// Delete an IpAccessControlListMapping resource.
-    /// </summary>
-    public class DeleteIpAccessControlListMappingOptions : IOptions<IpAccessControlListMappingResource>
-    {
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string that uniquely identifies the SIP Domain
-        /// </summary>
-        public string PathDomainSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies the resource to delete.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteIpAccessControlListMappingOptions
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies the resource to delete. </param>
-        public DeleteIpAccessControlListMappingOptions(string pathDomainSid, string pathSid)
-        {
-            PathDomainSid = pathDomainSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new FetchIpAccessControlListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies the resource to fetch. </param>
+    public FetchIpAccessControlListMappingOptions(string pathDomainSid, string pathSid)
+    {
+      PathDomainSid = pathDomainSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Create a new IpAccessControlListMapping resource.
+  /// </summary>
+  public class CreateIpAccessControlListMappingOptions : IOptions<IpAccessControlListMappingResource>
+  {
+    /// <summary>
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string that uniquely identifies the SIP Domain
+    /// </summary>
+    public string PathDomainSid { get; }
+    /// <summary>
+    /// The unique id of the IP access control list to map to the SIP domain
+    /// </summary>
+    public string IpAccessControlListSid { get; }
+
+    /// <summary>
+    /// Construct a new CreateIpAccessControlListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
+    /// <param name="ipAccessControlListSid"> The unique id of the IP access control list to map to the SIP domain </param>
+    public CreateIpAccessControlListMappingOptions(string pathDomainSid, string ipAccessControlListSid)
+    {
+      PathDomainSid = pathDomainSid;
+      IpAccessControlListSid = ipAccessControlListSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IpAccessControlListSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IpAccessControlListSid", IpAccessControlListSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of IpAccessControlListMapping resources.
+  /// </summary>
+  public class ReadIpAccessControlListMappingOptions : ReadOptions<IpAccessControlListMappingResource>
+  {
+    /// <summary>
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string that uniquely identifies the SIP Domain
+    /// </summary>
+    public string PathDomainSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadIpAccessControlListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
+    public ReadIpAccessControlListMappingOptions(string pathDomainSid)
+    {
+      PathDomainSid = pathDomainSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete an IpAccessControlListMapping resource.
+  /// </summary>
+  public class DeleteIpAccessControlListMappingOptions : IOptions<IpAccessControlListMappingResource>
+  {
+    /// <summary>
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string that uniquely identifies the SIP Domain
+    /// </summary>
+    public string PathDomainSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies the resource to delete.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteIpAccessControlListMappingOptions
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies the resource to delete. </param>
+    public DeleteIpAccessControlListMappingOptions(string pathDomainSid, string pathSid)
+    {
+      PathDomainSid = pathDomainSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/IpAccessControlListMappingResource.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/IpAccessControlListMappingResource.cs
index bbdddc887..7e07d2f08 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/IpAccessControlListMappingResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/Domain/IpAccessControlListMappingResource.cs
@@ -16,438 +16,438 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.Domain
-{
-
-    public class IpAccessControlListMappingResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchIpAccessControlListMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/IpAccessControlListMappings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an IpAccessControlListMapping resource.
-        /// </summary>
-        /// <param name="options"> Fetch IpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlListMapping </returns>
-        public static IpAccessControlListMappingResource Fetch(FetchIpAccessControlListMappingOptions options,
-                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an IpAccessControlListMapping resource.
-        /// </summary>
-        /// <param name="options"> Fetch IpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListMappingResource> FetchAsync(FetchIpAccessControlListMappingOptions options,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an IpAccessControlListMapping resource.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies the resource to fetch. </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlListMapping </returns>
-        public static IpAccessControlListMappingResource Fetch(string pathDomainSid,
-                                                               string pathSid,
-                                                               string pathAccountSid = null,
-                                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchIpAccessControlListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an IpAccessControlListMapping resource.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies the resource to fetch. </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListMappingResource> FetchAsync(string pathDomainSid,
-                                                                                                       string pathSid,
-                                                                                                       string pathAccountSid = null,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchIpAccessControlListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateIpAccessControlListMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/IpAccessControlListMappings.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new IpAccessControlListMapping resource.
-        /// </summary>
-        /// <param name="options"> Create IpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlListMapping </returns>
-        public static IpAccessControlListMappingResource Create(CreateIpAccessControlListMappingOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new IpAccessControlListMapping resource.
-        /// </summary>
-        /// <param name="options"> Create IpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListMappingResource> CreateAsync(CreateIpAccessControlListMappingOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new IpAccessControlListMapping resource.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
-        /// <param name="ipAccessControlListSid"> The unique id of the IP access control list to map to the SIP domain </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlListMapping </returns>
-        public static IpAccessControlListMappingResource Create(string pathDomainSid,
-                                                                string ipAccessControlListSid,
-                                                                string pathAccountSid = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateIpAccessControlListMappingOptions(pathDomainSid, ipAccessControlListSid){PathAccountSid = pathAccountSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new IpAccessControlListMapping resource.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
-        /// <param name="ipAccessControlListSid"> The unique id of the IP access control list to map to the SIP domain </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListMappingResource> CreateAsync(string pathDomainSid,
-                                                                                                        string ipAccessControlListSid,
-                                                                                                        string pathAccountSid = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateIpAccessControlListMappingOptions(pathDomainSid, ipAccessControlListSid){PathAccountSid = pathAccountSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadIpAccessControlListMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/IpAccessControlListMappings.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of IpAccessControlListMapping resources.
-        /// </summary>
-        /// <param name="options"> Read IpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlListMapping </returns>
-        public static ResourceSet<IpAccessControlListMappingResource> Read(ReadIpAccessControlListMappingOptions options,
-                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<IpAccessControlListMappingResource>.FromJson("ip_access_control_list_mappings", response.Content);
-            return new ResourceSet<IpAccessControlListMappingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of IpAccessControlListMapping resources.
-        /// </summary>
-        /// <param name="options"> Read IpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IpAccessControlListMappingResource>> ReadAsync(ReadIpAccessControlListMappingOptions options,
-                                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<IpAccessControlListMappingResource>.FromJson("ip_access_control_list_mappings", response.Content);
-            return new ResourceSet<IpAccessControlListMappingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of IpAccessControlListMapping resources.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlListMapping </returns>
-        public static ResourceSet<IpAccessControlListMappingResource> Read(string pathDomainSid,
-                                                                           string pathAccountSid = null,
-                                                                           int? pageSize = null,
-                                                                           long? limit = null,
-                                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadIpAccessControlListMappingOptions(pathDomainSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of IpAccessControlListMapping resources.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IpAccessControlListMappingResource>> ReadAsync(string pathDomainSid,
-                                                                                                                   string pathAccountSid = null,
-                                                                                                                   int? pageSize = null,
-                                                                                                                   long? limit = null,
-                                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadIpAccessControlListMappingOptions(pathDomainSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<IpAccessControlListMappingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<IpAccessControlListMappingResource>.FromJson("ip_access_control_list_mappings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<IpAccessControlListMappingResource> NextPage(Page<IpAccessControlListMappingResource> page,
-                                                                        ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<IpAccessControlListMappingResource>.FromJson("ip_access_control_list_mappings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<IpAccessControlListMappingResource> PreviousPage(Page<IpAccessControlListMappingResource> page,
-                                                                            ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<IpAccessControlListMappingResource>.FromJson("ip_access_control_list_mappings", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteIpAccessControlListMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/IpAccessControlListMappings/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete an IpAccessControlListMapping resource.
-        /// </summary>
-        /// <param name="options"> Delete IpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlListMapping </returns>
-        public static bool Delete(DeleteIpAccessControlListMappingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an IpAccessControlListMapping resource.
-        /// </summary>
-        /// <param name="options"> Delete IpAccessControlListMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteIpAccessControlListMappingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete an IpAccessControlListMapping resource.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies the resource to delete. </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlListMapping </returns>
-        public static bool Delete(string pathDomainSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteIpAccessControlListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an IpAccessControlListMapping resource.
-        /// </summary>
-        /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies the resource to delete. </param>
-        /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathDomainSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteIpAccessControlListMappingOptions(pathDomainSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a IpAccessControlListMappingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> IpAccessControlListMappingResource object represented by the provided JSON </returns>
-        public static IpAccessControlListMappingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<IpAccessControlListMappingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created, given as GMT in RFC 2822 format.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated, given as GMT in RFC 2822 format.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the SipDomain resource.
-        /// </summary>
-        [JsonProperty("domain_sid")]
-        public string DomainSid { get; private set; }
-        /// <summary>
-        /// A human readable descriptive text for this resource, up to 64 characters long.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The URI for this resource, relative to https://api.twilio.com
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private IpAccessControlListMappingResource()
-        {
-
-        }
-    }
+{
+
+  public class IpAccessControlListMappingResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchIpAccessControlListMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/IpAccessControlListMappings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an IpAccessControlListMapping resource.
+    /// </summary>
+    /// <param name="options"> Fetch IpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlListMapping </returns>
+    public static IpAccessControlListMappingResource Fetch(FetchIpAccessControlListMappingOptions options,
+                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an IpAccessControlListMapping resource.
+    /// </summary>
+    /// <param name="options"> Fetch IpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListMappingResource> FetchAsync(FetchIpAccessControlListMappingOptions options,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an IpAccessControlListMapping resource.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies the resource to fetch. </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlListMapping </returns>
+    public static IpAccessControlListMappingResource Fetch(string pathDomainSid,
+                                                           string pathSid,
+                                                           string pathAccountSid = null,
+                                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchIpAccessControlListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an IpAccessControlListMapping resource.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies the resource to fetch. </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListMappingResource> FetchAsync(string pathDomainSid,
+                                                                                                   string pathSid,
+                                                                                                   string pathAccountSid = null,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchIpAccessControlListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateIpAccessControlListMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/IpAccessControlListMappings.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new IpAccessControlListMapping resource.
+    /// </summary>
+    /// <param name="options"> Create IpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlListMapping </returns>
+    public static IpAccessControlListMappingResource Create(CreateIpAccessControlListMappingOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new IpAccessControlListMapping resource.
+    /// </summary>
+    /// <param name="options"> Create IpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListMappingResource> CreateAsync(CreateIpAccessControlListMappingOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new IpAccessControlListMapping resource.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
+    /// <param name="ipAccessControlListSid"> The unique id of the IP access control list to map to the SIP domain </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlListMapping </returns>
+    public static IpAccessControlListMappingResource Create(string pathDomainSid,
+                                                            string ipAccessControlListSid,
+                                                            string pathAccountSid = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateIpAccessControlListMappingOptions(pathDomainSid, ipAccessControlListSid) { PathAccountSid = pathAccountSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new IpAccessControlListMapping resource.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
+    /// <param name="ipAccessControlListSid"> The unique id of the IP access control list to map to the SIP domain </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListMappingResource> CreateAsync(string pathDomainSid,
+                                                                                                    string ipAccessControlListSid,
+                                                                                                    string pathAccountSid = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateIpAccessControlListMappingOptions(pathDomainSid, ipAccessControlListSid) { PathAccountSid = pathAccountSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadIpAccessControlListMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/IpAccessControlListMappings.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of IpAccessControlListMapping resources.
+    /// </summary>
+    /// <param name="options"> Read IpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlListMapping </returns>
+    public static ResourceSet<IpAccessControlListMappingResource> Read(ReadIpAccessControlListMappingOptions options,
+                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<IpAccessControlListMappingResource>.FromJson("ip_access_control_list_mappings", response.Content);
+      return new ResourceSet<IpAccessControlListMappingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of IpAccessControlListMapping resources.
+    /// </summary>
+    /// <param name="options"> Read IpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IpAccessControlListMappingResource>> ReadAsync(ReadIpAccessControlListMappingOptions options,
+                                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<IpAccessControlListMappingResource>.FromJson("ip_access_control_list_mappings", response.Content);
+      return new ResourceSet<IpAccessControlListMappingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of IpAccessControlListMapping resources.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlListMapping </returns>
+    public static ResourceSet<IpAccessControlListMappingResource> Read(string pathDomainSid,
+                                                                       string pathAccountSid = null,
+                                                                       int? pageSize = null,
+                                                                       long? limit = null,
+                                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadIpAccessControlListMappingOptions(pathDomainSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of IpAccessControlListMapping resources.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IpAccessControlListMappingResource>> ReadAsync(string pathDomainSid,
+                                                                                                               string pathAccountSid = null,
+                                                                                                               int? pageSize = null,
+                                                                                                               long? limit = null,
+                                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadIpAccessControlListMappingOptions(pathDomainSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<IpAccessControlListMappingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<IpAccessControlListMappingResource>.FromJson("ip_access_control_list_mappings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<IpAccessControlListMappingResource> NextPage(Page<IpAccessControlListMappingResource> page,
+                                                                    ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<IpAccessControlListMappingResource>.FromJson("ip_access_control_list_mappings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<IpAccessControlListMappingResource> PreviousPage(Page<IpAccessControlListMappingResource> page,
+                                                                        ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<IpAccessControlListMappingResource>.FromJson("ip_access_control_list_mappings", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteIpAccessControlListMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathDomainSid + "/IpAccessControlListMappings/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete an IpAccessControlListMapping resource.
+    /// </summary>
+    /// <param name="options"> Delete IpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlListMapping </returns>
+    public static bool Delete(DeleteIpAccessControlListMappingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an IpAccessControlListMapping resource.
+    /// </summary>
+    /// <param name="options"> Delete IpAccessControlListMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteIpAccessControlListMappingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete an IpAccessControlListMapping resource.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies the resource to delete. </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlListMapping </returns>
+    public static bool Delete(string pathDomainSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteIpAccessControlListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an IpAccessControlListMapping resource.
+    /// </summary>
+    /// <param name="pathDomainSid"> A string that uniquely identifies the SIP Domain </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies the resource to delete. </param>
+    /// <param name="pathAccountSid"> The unique id of the Account that is responsible for this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlListMapping </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathDomainSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteIpAccessControlListMappingOptions(pathDomainSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a IpAccessControlListMappingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> IpAccessControlListMappingResource object represented by the provided JSON </returns>
+    public static IpAccessControlListMappingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<IpAccessControlListMappingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created, given as GMT in RFC 2822 format.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated, given as GMT in RFC 2822 format.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the SipDomain resource.
+    /// </summary>
+    [JsonProperty("domain_sid")]
+    public string DomainSid { get; private set; }
+    /// <summary>
+    /// A human readable descriptive text for this resource, up to 64 characters long.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The URI for this resource, relative to https://api.twilio.com
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private IpAccessControlListMappingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/DomainOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/DomainOptions.cs
index 929e8d40d..09b6aed6e 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/DomainOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/DomainOptions.cs
@@ -9,393 +9,393 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of domains belonging to the account used to make the request
+  /// </summary>
+  public class ReadDomainOptions : ReadOptions<DomainResource>
+  {
     /// <summary>
-    /// Retrieve a list of domains belonging to the account used to make the request
+    /// The SID of the Account that created the resources to read
     /// </summary>
-    public class ReadDomainOptions : ReadOptions<DomainResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
+
     /// <summary>
-    /// Create a new Domain
-    /// </summary>
-    public class CreateDomainOptions : IOptions<DomainResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique address on Twilio to route SIP traffic
-        /// </summary>
-        public string DomainName { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The URL we should call when receiving a call
-        /// </summary>
-        public Uri VoiceUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with voice_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when an error occurs in executing TwiML
-        /// </summary>
-        public Uri VoiceFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with voice_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL that we should call to pass status updates
-        /// </summary>
-        public Uri VoiceStatusCallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call `voice_status_callback_url`
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Whether SIP registration is allowed
-        /// </summary>
-        public bool? SipRegistration { get; set; }
-        /// <summary>
-        /// Whether emergency calling is enabled for the domain.
-        /// </summary>
-        public bool? EmergencyCallingEnabled { get; set; }
-        /// <summary>
-        /// Whether secure SIP is enabled for the domain
-        /// </summary>
-        public bool? Secure { get; set; }
-        /// <summary>
-        /// The SID of the BYOC Trunk resource.
-        /// </summary>
-        public string ByocTrunkSid { get; set; }
-        /// <summary>
-        /// Whether an emergency caller sid is configured for the domain.
-        /// </summary>
-        public string EmergencyCallerSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateDomainOptions
-        /// </summary>
-        /// <param name="domainName"> The unique address on Twilio to route SIP traffic </param>
-        public CreateDomainOptions(string domainName)
-        {
-            DomainName = domainName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DomainName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DomainName", DomainName));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (VoiceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
-            }
-
-            if (VoiceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
-            }
-
-            if (VoiceFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
-            }
-
-            if (VoiceFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
-            }
-
-            if (VoiceStatusCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceStatusCallbackUrl", Serializers.Url(VoiceStatusCallbackUrl)));
-            }
-
-            if (VoiceStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceStatusCallbackMethod", VoiceStatusCallbackMethod.ToString()));
-            }
-
-            if (SipRegistration != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipRegistration", SipRegistration.Value.ToString().ToLower()));
-            }
-
-            if (EmergencyCallingEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyCallingEnabled", EmergencyCallingEnabled.Value.ToString().ToLower()));
-            }
-
-            if (Secure != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secure", Secure.Value.ToString().ToLower()));
-            }
-
-            if (ByocTrunkSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ByocTrunkSid", ByocTrunkSid.ToString()));
-            }
-
-            if (EmergencyCallerSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyCallerSid", EmergencyCallerSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Create a new Domain
+  /// </summary>
+  public class CreateDomainOptions : IOptions<DomainResource>
+  {
     /// <summary>
-    /// Fetch an instance of a Domain
-    /// </summary>
-    public class FetchDomainOptions : IOptions<DomainResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchDomainOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchDomainOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Update the attributes of a domain
-    /// </summary>
-    public class UpdateDomainOptions : IOptions<DomainResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when an error occurs in executing TwiML
-        /// </summary>
-        public Uri VoiceFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use with voice_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceMethod { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call voice_status_callback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The URL that we should call to pass status updates
-        /// </summary>
-        public Uri VoiceStatusCallbackUrl { get; set; }
-        /// <summary>
-        /// The URL we should call when receiving a call
-        /// </summary>
-        public Uri VoiceUrl { get; set; }
-        /// <summary>
-        /// Whether SIP registration is allowed
-        /// </summary>
-        public bool? SipRegistration { get; set; }
-        /// <summary>
-        /// The unique address on Twilio to route SIP traffic
-        /// </summary>
-        public string DomainName { get; set; }
-        /// <summary>
-        /// Whether emergency calling is enabled for the domain.
-        /// </summary>
-        public bool? EmergencyCallingEnabled { get; set; }
-        /// <summary>
-        /// Whether secure SIP is enabled for the domain
-        /// </summary>
-        public bool? Secure { get; set; }
-        /// <summary>
-        /// The SID of the BYOC Trunk resource.
-        /// </summary>
-        public string ByocTrunkSid { get; set; }
-        /// <summary>
-        /// Whether an emergency caller sid is configured for the domain.
-        /// </summary>
-        public string EmergencyCallerSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateDomainOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateDomainOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (VoiceFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
-            }
-
-            if (VoiceFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
-            }
-
-            if (VoiceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
-            }
-
-            if (VoiceStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceStatusCallbackMethod", VoiceStatusCallbackMethod.ToString()));
-            }
-
-            if (VoiceStatusCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceStatusCallbackUrl", Serializers.Url(VoiceStatusCallbackUrl)));
-            }
-
-            if (VoiceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
-            }
-
-            if (SipRegistration != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipRegistration", SipRegistration.Value.ToString().ToLower()));
-            }
-
-            if (DomainName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DomainName", DomainName));
-            }
-
-            if (EmergencyCallingEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyCallingEnabled", EmergencyCallingEnabled.Value.ToString().ToLower()));
-            }
-
-            if (Secure != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secure", Secure.Value.ToString().ToLower()));
-            }
-
-            if (ByocTrunkSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ByocTrunkSid", ByocTrunkSid.ToString()));
-            }
-
-            if (EmergencyCallerSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmergencyCallerSid", EmergencyCallerSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique address on Twilio to route SIP traffic
+    /// </summary>
+    public string DomainName { get; }
     /// <summary>
-    /// Delete an instance of a Domain
-    /// </summary>
-    public class DeleteDomainOptions : IOptions<DomainResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteDomainOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteDomainOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The URL we should call when receiving a call
+    /// </summary>
+    public Uri VoiceUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with voice_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when an error occurs in executing TwiML
+    /// </summary>
+    public Uri VoiceFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use with voice_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL that we should call to pass status updates
+    /// </summary>
+    public Uri VoiceStatusCallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call `voice_status_callback_url`
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Whether SIP registration is allowed
+    /// </summary>
+    public bool? SipRegistration { get; set; }
+    /// <summary>
+    /// Whether emergency calling is enabled for the domain.
+    /// </summary>
+    public bool? EmergencyCallingEnabled { get; set; }
+    /// <summary>
+    /// Whether secure SIP is enabled for the domain
+    /// </summary>
+    public bool? Secure { get; set; }
+    /// <summary>
+    /// The SID of the BYOC Trunk resource.
+    /// </summary>
+    public string ByocTrunkSid { get; set; }
+    /// <summary>
+    /// Whether an emergency caller sid is configured for the domain.
+    /// </summary>
+    public string EmergencyCallerSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateDomainOptions
+    /// </summary>
+    /// <param name="domainName"> The unique address on Twilio to route SIP traffic </param>
+    public CreateDomainOptions(string domainName)
+    {
+      DomainName = domainName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DomainName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DomainName", DomainName));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (VoiceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
+      }
+
+      if (VoiceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
+      }
+
+      if (VoiceFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
+      }
+
+      if (VoiceFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
+      }
+
+      if (VoiceStatusCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceStatusCallbackUrl", Serializers.Url(VoiceStatusCallbackUrl)));
+      }
+
+      if (VoiceStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceStatusCallbackMethod", VoiceStatusCallbackMethod.ToString()));
+      }
+
+      if (SipRegistration != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipRegistration", SipRegistration.Value.ToString().ToLower()));
+      }
+
+      if (EmergencyCallingEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyCallingEnabled", EmergencyCallingEnabled.Value.ToString().ToLower()));
+      }
+
+      if (Secure != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secure", Secure.Value.ToString().ToLower()));
+      }
+
+      if (ByocTrunkSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ByocTrunkSid", ByocTrunkSid.ToString()));
+      }
+
+      if (EmergencyCallerSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyCallerSid", EmergencyCallerSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch an instance of a Domain
+  /// </summary>
+  public class FetchDomainOptions : IOptions<DomainResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource to fetch
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchDomainOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchDomainOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update the attributes of a domain
+  /// </summary>
+  public class UpdateDomainOptions : IOptions<DomainResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resource to update
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when an error occurs in executing TwiML
+    /// </summary>
+    public Uri VoiceFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use with voice_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceMethod { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call voice_status_callback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The URL that we should call to pass status updates
+    /// </summary>
+    public Uri VoiceStatusCallbackUrl { get; set; }
+    /// <summary>
+    /// The URL we should call when receiving a call
+    /// </summary>
+    public Uri VoiceUrl { get; set; }
+    /// <summary>
+    /// Whether SIP registration is allowed
+    /// </summary>
+    public bool? SipRegistration { get; set; }
+    /// <summary>
+    /// The unique address on Twilio to route SIP traffic
+    /// </summary>
+    public string DomainName { get; set; }
+    /// <summary>
+    /// Whether emergency calling is enabled for the domain.
+    /// </summary>
+    public bool? EmergencyCallingEnabled { get; set; }
+    /// <summary>
+    /// Whether secure SIP is enabled for the domain
+    /// </summary>
+    public bool? Secure { get; set; }
+    /// <summary>
+    /// The SID of the BYOC Trunk resource.
+    /// </summary>
+    public string ByocTrunkSid { get; set; }
+    /// <summary>
+    /// Whether an emergency caller sid is configured for the domain.
+    /// </summary>
+    public string EmergencyCallerSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateDomainOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateDomainOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (VoiceFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
+      }
+
+      if (VoiceFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
+      }
+
+      if (VoiceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
+      }
+
+      if (VoiceStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceStatusCallbackMethod", VoiceStatusCallbackMethod.ToString()));
+      }
+
+      if (VoiceStatusCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceStatusCallbackUrl", Serializers.Url(VoiceStatusCallbackUrl)));
+      }
+
+      if (VoiceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
+      }
+
+      if (SipRegistration != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipRegistration", SipRegistration.Value.ToString().ToLower()));
+      }
+
+      if (DomainName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DomainName", DomainName));
+      }
+
+      if (EmergencyCallingEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyCallingEnabled", EmergencyCallingEnabled.Value.ToString().ToLower()));
+      }
+
+      if (Secure != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secure", Secure.Value.ToString().ToLower()));
+      }
+
+      if (ByocTrunkSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ByocTrunkSid", ByocTrunkSid.ToString()));
+      }
+
+      if (EmergencyCallerSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmergencyCallerSid", EmergencyCallerSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete an instance of a Domain
+  /// </summary>
+  public class DeleteDomainOptions : IOptions<DomainResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteDomainOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteDomainOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/DomainResource.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/DomainResource.cs
index a21831f7d..1db334b72 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/DomainResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/DomainResource.cs
@@ -16,658 +16,658 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip
-{
-
-    public class DomainResource : Resource
-    {
-        private static Request BuildReadRequest(ReadDomainOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of domains belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Domain parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Domain </returns>
-        public static ResourceSet<DomainResource> Read(ReadDomainOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DomainResource>.FromJson("domains", response.Content);
-            return new ResourceSet<DomainResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of domains belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Domain parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Domain </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DomainResource>> ReadAsync(ReadDomainOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DomainResource>.FromJson("domains", response.Content);
-            return new ResourceSet<DomainResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of domains belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Domain </returns>
-        public static ResourceSet<DomainResource> Read(string pathAccountSid = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadDomainOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of domains belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Domain </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DomainResource>> ReadAsync(string pathAccountSid = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadDomainOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DomainResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DomainResource>.FromJson("domains", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DomainResource> NextPage(Page<DomainResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<DomainResource>.FromJson("domains", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DomainResource> PreviousPage(Page<DomainResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<DomainResource>.FromJson("domains", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateDomainOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Domain
-        /// </summary>
-        /// <param name="options"> Create Domain parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Domain </returns>
-        public static DomainResource Create(CreateDomainOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Domain
-        /// </summary>
-        /// <param name="options"> Create Domain parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Domain </returns>
-        public static async System.Threading.Tasks.Task<DomainResource> CreateAsync(CreateDomainOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Domain
-        /// </summary>
-        /// <param name="domainName"> The unique address on Twilio to route SIP traffic </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
-        /// <param name="voiceMethod"> The HTTP method to use with voice_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
-        /// <param name="voiceStatusCallbackUrl"> The URL that we should call to pass status updates </param>
-        /// <param name="voiceStatusCallbackMethod"> The HTTP method we should use to call `voice_status_callback_url` </param>
-        /// <param name="sipRegistration"> Whether SIP registration is allowed </param>
-        /// <param name="emergencyCallingEnabled"> Whether emergency calling is enabled for the domain. </param>
-        /// <param name="secure"> Whether secure SIP is enabled for the domain </param>
-        /// <param name="byocTrunkSid"> The SID of the BYOC Trunk resource. </param>
-        /// <param name="emergencyCallerSid"> Whether an emergency caller sid is configured for the domain. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Domain </returns>
-        public static DomainResource Create(string domainName,
-                                            string pathAccountSid = null,
-                                            string friendlyName = null,
-                                            Uri voiceUrl = null,
-                                            Twilio.Http.HttpMethod voiceMethod = null,
-                                            Uri voiceFallbackUrl = null,
-                                            Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                            Uri voiceStatusCallbackUrl = null,
-                                            Twilio.Http.HttpMethod voiceStatusCallbackMethod = null,
-                                            bool? sipRegistration = null,
-                                            bool? emergencyCallingEnabled = null,
-                                            bool? secure = null,
-                                            string byocTrunkSid = null,
-                                            string emergencyCallerSid = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateDomainOptions(domainName){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, VoiceStatusCallbackUrl = voiceStatusCallbackUrl, VoiceStatusCallbackMethod = voiceStatusCallbackMethod, SipRegistration = sipRegistration, EmergencyCallingEnabled = emergencyCallingEnabled, Secure = secure, ByocTrunkSid = byocTrunkSid, EmergencyCallerSid = emergencyCallerSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Domain
-        /// </summary>
-        /// <param name="domainName"> The unique address on Twilio to route SIP traffic </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
-        /// <param name="voiceMethod"> The HTTP method to use with voice_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
-        /// <param name="voiceStatusCallbackUrl"> The URL that we should call to pass status updates </param>
-        /// <param name="voiceStatusCallbackMethod"> The HTTP method we should use to call `voice_status_callback_url` </param>
-        /// <param name="sipRegistration"> Whether SIP registration is allowed </param>
-        /// <param name="emergencyCallingEnabled"> Whether emergency calling is enabled for the domain. </param>
-        /// <param name="secure"> Whether secure SIP is enabled for the domain </param>
-        /// <param name="byocTrunkSid"> The SID of the BYOC Trunk resource. </param>
-        /// <param name="emergencyCallerSid"> Whether an emergency caller sid is configured for the domain. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Domain </returns>
-        public static async System.Threading.Tasks.Task<DomainResource> CreateAsync(string domainName,
-                                                                                    string pathAccountSid = null,
-                                                                                    string friendlyName = null,
-                                                                                    Uri voiceUrl = null,
-                                                                                    Twilio.Http.HttpMethod voiceMethod = null,
-                                                                                    Uri voiceFallbackUrl = null,
-                                                                                    Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                                                    Uri voiceStatusCallbackUrl = null,
-                                                                                    Twilio.Http.HttpMethod voiceStatusCallbackMethod = null,
-                                                                                    bool? sipRegistration = null,
-                                                                                    bool? emergencyCallingEnabled = null,
-                                                                                    bool? secure = null,
-                                                                                    string byocTrunkSid = null,
-                                                                                    string emergencyCallerSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateDomainOptions(domainName){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, VoiceStatusCallbackUrl = voiceStatusCallbackUrl, VoiceStatusCallbackMethod = voiceStatusCallbackMethod, SipRegistration = sipRegistration, EmergencyCallingEnabled = emergencyCallingEnabled, Secure = secure, ByocTrunkSid = byocTrunkSid, EmergencyCallerSid = emergencyCallerSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchDomainOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of a Domain
-        /// </summary>
-        /// <param name="options"> Fetch Domain parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Domain </returns>
-        public static DomainResource Fetch(FetchDomainOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a Domain
-        /// </summary>
-        /// <param name="options"> Fetch Domain parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Domain </returns>
-        public static async System.Threading.Tasks.Task<DomainResource> FetchAsync(FetchDomainOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of a Domain
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Domain </returns>
-        public static DomainResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchDomainOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a Domain
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Domain </returns>
-        public static async System.Threading.Tasks.Task<DomainResource> FetchAsync(string pathSid,
-                                                                                   string pathAccountSid = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchDomainOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateDomainOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update the attributes of a domain
-        /// </summary>
-        /// <param name="options"> Update Domain parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Domain </returns>
-        public static DomainResource Update(UpdateDomainOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the attributes of a domain
-        /// </summary>
-        /// <param name="options"> Update Domain parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Domain </returns>
-        public static async System.Threading.Tasks.Task<DomainResource> UpdateAsync(UpdateDomainOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update the attributes of a domain
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
-        /// <param name="voiceMethod"> The HTTP method we should use with voice_url </param>
-        /// <param name="voiceStatusCallbackMethod"> The HTTP method we should use to call voice_status_callback_url </param>
-        /// <param name="voiceStatusCallbackUrl"> The URL that we should call to pass status updates </param>
-        /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
-        /// <param name="sipRegistration"> Whether SIP registration is allowed </param>
-        /// <param name="domainName"> The unique address on Twilio to route SIP traffic </param>
-        /// <param name="emergencyCallingEnabled"> Whether emergency calling is enabled for the domain. </param>
-        /// <param name="secure"> Whether secure SIP is enabled for the domain </param>
-        /// <param name="byocTrunkSid"> The SID of the BYOC Trunk resource. </param>
-        /// <param name="emergencyCallerSid"> Whether an emergency caller sid is configured for the domain. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Domain </returns>
-        public static DomainResource Update(string pathSid,
-                                            string pathAccountSid = null,
-                                            string friendlyName = null,
-                                            Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                            Uri voiceFallbackUrl = null,
-                                            Twilio.Http.HttpMethod voiceMethod = null,
-                                            Twilio.Http.HttpMethod voiceStatusCallbackMethod = null,
-                                            Uri voiceStatusCallbackUrl = null,
-                                            Uri voiceUrl = null,
-                                            bool? sipRegistration = null,
-                                            string domainName = null,
-                                            bool? emergencyCallingEnabled = null,
-                                            bool? secure = null,
-                                            string byocTrunkSid = null,
-                                            string emergencyCallerSid = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateDomainOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceStatusCallbackMethod = voiceStatusCallbackMethod, VoiceStatusCallbackUrl = voiceStatusCallbackUrl, VoiceUrl = voiceUrl, SipRegistration = sipRegistration, DomainName = domainName, EmergencyCallingEnabled = emergencyCallingEnabled, Secure = secure, ByocTrunkSid = byocTrunkSid, EmergencyCallerSid = emergencyCallerSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the attributes of a domain
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
-        /// <param name="voiceMethod"> The HTTP method we should use with voice_url </param>
-        /// <param name="voiceStatusCallbackMethod"> The HTTP method we should use to call voice_status_callback_url </param>
-        /// <param name="voiceStatusCallbackUrl"> The URL that we should call to pass status updates </param>
-        /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
-        /// <param name="sipRegistration"> Whether SIP registration is allowed </param>
-        /// <param name="domainName"> The unique address on Twilio to route SIP traffic </param>
-        /// <param name="emergencyCallingEnabled"> Whether emergency calling is enabled for the domain. </param>
-        /// <param name="secure"> Whether secure SIP is enabled for the domain </param>
-        /// <param name="byocTrunkSid"> The SID of the BYOC Trunk resource. </param>
-        /// <param name="emergencyCallerSid"> Whether an emergency caller sid is configured for the domain. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Domain </returns>
-        public static async System.Threading.Tasks.Task<DomainResource> UpdateAsync(string pathSid,
-                                                                                    string pathAccountSid = null,
-                                                                                    string friendlyName = null,
-                                                                                    Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                                                    Uri voiceFallbackUrl = null,
-                                                                                    Twilio.Http.HttpMethod voiceMethod = null,
-                                                                                    Twilio.Http.HttpMethod voiceStatusCallbackMethod = null,
-                                                                                    Uri voiceStatusCallbackUrl = null,
-                                                                                    Uri voiceUrl = null,
-                                                                                    bool? sipRegistration = null,
-                                                                                    string domainName = null,
-                                                                                    bool? emergencyCallingEnabled = null,
-                                                                                    bool? secure = null,
-                                                                                    string byocTrunkSid = null,
-                                                                                    string emergencyCallerSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateDomainOptions(pathSid){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceStatusCallbackMethod = voiceStatusCallbackMethod, VoiceStatusCallbackUrl = voiceStatusCallbackUrl, VoiceUrl = voiceUrl, SipRegistration = sipRegistration, DomainName = domainName, EmergencyCallingEnabled = emergencyCallingEnabled, Secure = secure, ByocTrunkSid = byocTrunkSid, EmergencyCallerSid = emergencyCallerSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteDomainOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete an instance of a Domain
-        /// </summary>
-        /// <param name="options"> Delete Domain parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Domain </returns>
-        public static bool Delete(DeleteDomainOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an instance of a Domain
-        /// </summary>
-        /// <param name="options"> Delete Domain parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Domain </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDomainOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete an instance of a Domain
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Domain </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteDomainOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an instance of a Domain
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Domain </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteDomainOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a DomainResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DomainResource object represented by the provided JSON </returns>
-        public static DomainResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DomainResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to process the call
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The types of authentication mapped to the domain
-        /// </summary>
-        [JsonProperty("auth_type")]
-        public string AuthType { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The unique address on Twilio to route SIP traffic
-        /// </summary>
-        [JsonProperty("domain_name")]
-        public string DomainName { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        [JsonProperty("voice_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when an error occurs while executing TwiML
-        /// </summary>
-        [JsonProperty("voice_fallback_url")]
-        public Uri VoiceFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method to use with voice_url
-        /// </summary>
-        [JsonProperty("voice_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call voice_status_callback_url
-        /// </summary>
-        [JsonProperty("voice_status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceStatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL that we call with status updates
-        /// </summary>
-        [JsonProperty("voice_status_callback_url")]
-        public Uri VoiceStatusCallbackUrl { get; private set; }
-        /// <summary>
-        /// The URL we call when receiving a call
-        /// </summary>
-        [JsonProperty("voice_url")]
-        public Uri VoiceUrl { get; private set; }
-        /// <summary>
-        /// A list mapping resources associated with the SIP Domain resource
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// Whether SIP registration is allowed
-        /// </summary>
-        [JsonProperty("sip_registration")]
-        public bool? SipRegistration { get; private set; }
-        /// <summary>
-        /// Whether emergency calling is enabled for the domain.
-        /// </summary>
-        [JsonProperty("emergency_calling_enabled")]
-        public bool? EmergencyCallingEnabled { get; private set; }
-        /// <summary>
-        /// Whether secure SIP is enabled for the domain
-        /// </summary>
-        [JsonProperty("secure")]
-        public bool? Secure { get; private set; }
-        /// <summary>
-        /// The SID of the BYOC Trunk resource.
-        /// </summary>
-        [JsonProperty("byoc_trunk_sid")]
-        public string ByocTrunkSid { get; private set; }
-        /// <summary>
-        /// Whether an emergency caller sid is configured for the domain.
-        /// </summary>
-        [JsonProperty("emergency_caller_sid")]
-        public string EmergencyCallerSid { get; private set; }
-
-        private DomainResource()
-        {
-
-        }
-    }
+{
+
+  public class DomainResource : Resource
+  {
+    private static Request BuildReadRequest(ReadDomainOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of domains belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Domain parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Domain </returns>
+    public static ResourceSet<DomainResource> Read(ReadDomainOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DomainResource>.FromJson("domains", response.Content);
+      return new ResourceSet<DomainResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of domains belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Domain parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Domain </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DomainResource>> ReadAsync(ReadDomainOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DomainResource>.FromJson("domains", response.Content);
+      return new ResourceSet<DomainResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of domains belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Domain </returns>
+    public static ResourceSet<DomainResource> Read(string pathAccountSid = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadDomainOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of domains belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Domain </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DomainResource>> ReadAsync(string pathAccountSid = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadDomainOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DomainResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DomainResource>.FromJson("domains", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DomainResource> NextPage(Page<DomainResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<DomainResource>.FromJson("domains", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DomainResource> PreviousPage(Page<DomainResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<DomainResource>.FromJson("domains", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateDomainOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Domain
+    /// </summary>
+    /// <param name="options"> Create Domain parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Domain </returns>
+    public static DomainResource Create(CreateDomainOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Domain
+    /// </summary>
+    /// <param name="options"> Create Domain parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Domain </returns>
+    public static async System.Threading.Tasks.Task<DomainResource> CreateAsync(CreateDomainOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Domain
+    /// </summary>
+    /// <param name="domainName"> The unique address on Twilio to route SIP traffic </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
+    /// <param name="voiceMethod"> The HTTP method to use with voice_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
+    /// <param name="voiceStatusCallbackUrl"> The URL that we should call to pass status updates </param>
+    /// <param name="voiceStatusCallbackMethod"> The HTTP method we should use to call `voice_status_callback_url` </param>
+    /// <param name="sipRegistration"> Whether SIP registration is allowed </param>
+    /// <param name="emergencyCallingEnabled"> Whether emergency calling is enabled for the domain. </param>
+    /// <param name="secure"> Whether secure SIP is enabled for the domain </param>
+    /// <param name="byocTrunkSid"> The SID of the BYOC Trunk resource. </param>
+    /// <param name="emergencyCallerSid"> Whether an emergency caller sid is configured for the domain. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Domain </returns>
+    public static DomainResource Create(string domainName,
+                                        string pathAccountSid = null,
+                                        string friendlyName = null,
+                                        Uri voiceUrl = null,
+                                        Twilio.Http.HttpMethod voiceMethod = null,
+                                        Uri voiceFallbackUrl = null,
+                                        Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                        Uri voiceStatusCallbackUrl = null,
+                                        Twilio.Http.HttpMethod voiceStatusCallbackMethod = null,
+                                        bool? sipRegistration = null,
+                                        bool? emergencyCallingEnabled = null,
+                                        bool? secure = null,
+                                        string byocTrunkSid = null,
+                                        string emergencyCallerSid = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateDomainOptions(domainName) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, VoiceStatusCallbackUrl = voiceStatusCallbackUrl, VoiceStatusCallbackMethod = voiceStatusCallbackMethod, SipRegistration = sipRegistration, EmergencyCallingEnabled = emergencyCallingEnabled, Secure = secure, ByocTrunkSid = byocTrunkSid, EmergencyCallerSid = emergencyCallerSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Domain
+    /// </summary>
+    /// <param name="domainName"> The unique address on Twilio to route SIP traffic </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
+    /// <param name="voiceMethod"> The HTTP method to use with voice_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
+    /// <param name="voiceStatusCallbackUrl"> The URL that we should call to pass status updates </param>
+    /// <param name="voiceStatusCallbackMethod"> The HTTP method we should use to call `voice_status_callback_url` </param>
+    /// <param name="sipRegistration"> Whether SIP registration is allowed </param>
+    /// <param name="emergencyCallingEnabled"> Whether emergency calling is enabled for the domain. </param>
+    /// <param name="secure"> Whether secure SIP is enabled for the domain </param>
+    /// <param name="byocTrunkSid"> The SID of the BYOC Trunk resource. </param>
+    /// <param name="emergencyCallerSid"> Whether an emergency caller sid is configured for the domain. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Domain </returns>
+    public static async System.Threading.Tasks.Task<DomainResource> CreateAsync(string domainName,
+                                                                                string pathAccountSid = null,
+                                                                                string friendlyName = null,
+                                                                                Uri voiceUrl = null,
+                                                                                Twilio.Http.HttpMethod voiceMethod = null,
+                                                                                Uri voiceFallbackUrl = null,
+                                                                                Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                                                Uri voiceStatusCallbackUrl = null,
+                                                                                Twilio.Http.HttpMethod voiceStatusCallbackMethod = null,
+                                                                                bool? sipRegistration = null,
+                                                                                bool? emergencyCallingEnabled = null,
+                                                                                bool? secure = null,
+                                                                                string byocTrunkSid = null,
+                                                                                string emergencyCallerSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateDomainOptions(domainName) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, VoiceStatusCallbackUrl = voiceStatusCallbackUrl, VoiceStatusCallbackMethod = voiceStatusCallbackMethod, SipRegistration = sipRegistration, EmergencyCallingEnabled = emergencyCallingEnabled, Secure = secure, ByocTrunkSid = byocTrunkSid, EmergencyCallerSid = emergencyCallerSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchDomainOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of a Domain
+    /// </summary>
+    /// <param name="options"> Fetch Domain parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Domain </returns>
+    public static DomainResource Fetch(FetchDomainOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a Domain
+    /// </summary>
+    /// <param name="options"> Fetch Domain parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Domain </returns>
+    public static async System.Threading.Tasks.Task<DomainResource> FetchAsync(FetchDomainOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of a Domain
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Domain </returns>
+    public static DomainResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchDomainOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a Domain
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Domain </returns>
+    public static async System.Threading.Tasks.Task<DomainResource> FetchAsync(string pathSid,
+                                                                               string pathAccountSid = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchDomainOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateDomainOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update the attributes of a domain
+    /// </summary>
+    /// <param name="options"> Update Domain parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Domain </returns>
+    public static DomainResource Update(UpdateDomainOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the attributes of a domain
+    /// </summary>
+    /// <param name="options"> Update Domain parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Domain </returns>
+    public static async System.Threading.Tasks.Task<DomainResource> UpdateAsync(UpdateDomainOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update the attributes of a domain
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
+    /// <param name="voiceMethod"> The HTTP method we should use with voice_url </param>
+    /// <param name="voiceStatusCallbackMethod"> The HTTP method we should use to call voice_status_callback_url </param>
+    /// <param name="voiceStatusCallbackUrl"> The URL that we should call to pass status updates </param>
+    /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
+    /// <param name="sipRegistration"> Whether SIP registration is allowed </param>
+    /// <param name="domainName"> The unique address on Twilio to route SIP traffic </param>
+    /// <param name="emergencyCallingEnabled"> Whether emergency calling is enabled for the domain. </param>
+    /// <param name="secure"> Whether secure SIP is enabled for the domain </param>
+    /// <param name="byocTrunkSid"> The SID of the BYOC Trunk resource. </param>
+    /// <param name="emergencyCallerSid"> Whether an emergency caller sid is configured for the domain. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Domain </returns>
+    public static DomainResource Update(string pathSid,
+                                        string pathAccountSid = null,
+                                        string friendlyName = null,
+                                        Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                        Uri voiceFallbackUrl = null,
+                                        Twilio.Http.HttpMethod voiceMethod = null,
+                                        Twilio.Http.HttpMethod voiceStatusCallbackMethod = null,
+                                        Uri voiceStatusCallbackUrl = null,
+                                        Uri voiceUrl = null,
+                                        bool? sipRegistration = null,
+                                        string domainName = null,
+                                        bool? emergencyCallingEnabled = null,
+                                        bool? secure = null,
+                                        string byocTrunkSid = null,
+                                        string emergencyCallerSid = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateDomainOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceStatusCallbackMethod = voiceStatusCallbackMethod, VoiceStatusCallbackUrl = voiceStatusCallbackUrl, VoiceUrl = voiceUrl, SipRegistration = sipRegistration, DomainName = domainName, EmergencyCallingEnabled = emergencyCallingEnabled, Secure = secure, ByocTrunkSid = byocTrunkSid, EmergencyCallerSid = emergencyCallerSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the attributes of a domain
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
+    /// <param name="voiceMethod"> The HTTP method we should use with voice_url </param>
+    /// <param name="voiceStatusCallbackMethod"> The HTTP method we should use to call voice_status_callback_url </param>
+    /// <param name="voiceStatusCallbackUrl"> The URL that we should call to pass status updates </param>
+    /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
+    /// <param name="sipRegistration"> Whether SIP registration is allowed </param>
+    /// <param name="domainName"> The unique address on Twilio to route SIP traffic </param>
+    /// <param name="emergencyCallingEnabled"> Whether emergency calling is enabled for the domain. </param>
+    /// <param name="secure"> Whether secure SIP is enabled for the domain </param>
+    /// <param name="byocTrunkSid"> The SID of the BYOC Trunk resource. </param>
+    /// <param name="emergencyCallerSid"> Whether an emergency caller sid is configured for the domain. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Domain </returns>
+    public static async System.Threading.Tasks.Task<DomainResource> UpdateAsync(string pathSid,
+                                                                                string pathAccountSid = null,
+                                                                                string friendlyName = null,
+                                                                                Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                                                Uri voiceFallbackUrl = null,
+                                                                                Twilio.Http.HttpMethod voiceMethod = null,
+                                                                                Twilio.Http.HttpMethod voiceStatusCallbackMethod = null,
+                                                                                Uri voiceStatusCallbackUrl = null,
+                                                                                Uri voiceUrl = null,
+                                                                                bool? sipRegistration = null,
+                                                                                string domainName = null,
+                                                                                bool? emergencyCallingEnabled = null,
+                                                                                bool? secure = null,
+                                                                                string byocTrunkSid = null,
+                                                                                string emergencyCallerSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateDomainOptions(pathSid) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceStatusCallbackMethod = voiceStatusCallbackMethod, VoiceStatusCallbackUrl = voiceStatusCallbackUrl, VoiceUrl = voiceUrl, SipRegistration = sipRegistration, DomainName = domainName, EmergencyCallingEnabled = emergencyCallingEnabled, Secure = secure, ByocTrunkSid = byocTrunkSid, EmergencyCallerSid = emergencyCallerSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteDomainOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/Domains/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete an instance of a Domain
+    /// </summary>
+    /// <param name="options"> Delete Domain parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Domain </returns>
+    public static bool Delete(DeleteDomainOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an instance of a Domain
+    /// </summary>
+    /// <param name="options"> Delete Domain parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Domain </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDomainOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete an instance of a Domain
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Domain </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteDomainOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an instance of a Domain
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Domain </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteDomainOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a DomainResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DomainResource object represented by the provided JSON </returns>
+    public static DomainResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DomainResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to process the call
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The types of authentication mapped to the domain
+    /// </summary>
+    [JsonProperty("auth_type")]
+    public string AuthType { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The unique address on Twilio to route SIP traffic
+    /// </summary>
+    [JsonProperty("domain_name")]
+    public string DomainName { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    [JsonProperty("voice_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when an error occurs while executing TwiML
+    /// </summary>
+    [JsonProperty("voice_fallback_url")]
+    public Uri VoiceFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method to use with voice_url
+    /// </summary>
+    [JsonProperty("voice_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call voice_status_callback_url
+    /// </summary>
+    [JsonProperty("voice_status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceStatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL that we call with status updates
+    /// </summary>
+    [JsonProperty("voice_status_callback_url")]
+    public Uri VoiceStatusCallbackUrl { get; private set; }
+    /// <summary>
+    /// The URL we call when receiving a call
+    /// </summary>
+    [JsonProperty("voice_url")]
+    public Uri VoiceUrl { get; private set; }
+    /// <summary>
+    /// A list mapping resources associated with the SIP Domain resource
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// Whether SIP registration is allowed
+    /// </summary>
+    [JsonProperty("sip_registration")]
+    public bool? SipRegistration { get; private set; }
+    /// <summary>
+    /// Whether emergency calling is enabled for the domain.
+    /// </summary>
+    [JsonProperty("emergency_calling_enabled")]
+    public bool? EmergencyCallingEnabled { get; private set; }
+    /// <summary>
+    /// Whether secure SIP is enabled for the domain
+    /// </summary>
+    [JsonProperty("secure")]
+    public bool? Secure { get; private set; }
+    /// <summary>
+    /// The SID of the BYOC Trunk resource.
+    /// </summary>
+    [JsonProperty("byoc_trunk_sid")]
+    public string ByocTrunkSid { get; private set; }
+    /// <summary>
+    /// Whether an emergency caller sid is configured for the domain.
+    /// </summary>
+    [JsonProperty("emergency_caller_sid")]
+    public string EmergencyCallerSid { get; private set; }
+
+    private DomainResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlList/IpAddressOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlList/IpAddressOptions.cs
index 5645b3f72..862306ade 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlList/IpAddressOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlList/IpAddressOptions.cs
@@ -9,258 +9,258 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.IpAccessControlList
-{
-
+{
+
+  /// <summary>
+  /// Read multiple IpAddress resources.
+  /// </summary>
+  public class ReadIpAddressOptions : ReadOptions<IpAddressResource>
+  {
     /// <summary>
-    /// Read multiple IpAddress resources.
+    /// The unique sid that identifies this account
     /// </summary>
-    public class ReadIpAddressOptions : ReadOptions<IpAddressResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The IpAccessControlList Sid that identifies the IpAddress resources to read
-        /// </summary>
-        public string PathIpAccessControlListSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadIpAddressOptions
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
-        ///                                  read </param>
-        public ReadIpAddressOptions(string pathIpAccessControlListSid)
-        {
-            PathIpAccessControlListSid = pathIpAccessControlListSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Create a new IpAddress resource.
+    /// The IpAccessControlList Sid that identifies the IpAddress resources to read
     /// </summary>
-    public class CreateIpAddressOptions : IOptions<IpAddressResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The IpAccessControlList Sid with which to associate the created IpAddress resource
-        /// </summary>
-        public string PathIpAccessControlListSid { get; }
-        /// <summary>
-        /// A human readable descriptive text for this resource, up to 64 characters long.
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// An IP address in dotted decimal notation from which you want to accept traffic. Any SIP requests from this IP address will be allowed by Twilio. IPv4 only supported today.
-        /// </summary>
-        public string IpAddress { get; }
-        /// <summary>
-        /// An integer representing the length of the CIDR prefix to use with this IP address when accepting traffic. By default the entire IP address is used.
-        /// </summary>
-        public int? CidrPrefixLength { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateIpAddressOptions
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid with which to associate the created IpAddress
-        ///                                  resource </param>
-        /// <param name="friendlyName"> A human readable descriptive text for this resource, up to 64 characters long. </param>
-        /// <param name="ipAddress"> An IP address in dotted decimal notation from which you want to accept traffic. Any SIP
-        ///                 requests from this IP address will be allowed by Twilio. IPv4 only supported today. </param>
-        public CreateIpAddressOptions(string pathIpAccessControlListSid, string friendlyName, string ipAddress)
-        {
-            PathIpAccessControlListSid = pathIpAccessControlListSid;
-            FriendlyName = friendlyName;
-            IpAddress = ipAddress;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (IpAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IpAddress", IpAddress));
-            }
-
-            if (CidrPrefixLength != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CidrPrefixLength", CidrPrefixLength.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathIpAccessControlListSid { get; }
+
     /// <summary>
-    /// Read one IpAddress resource.
+    /// Construct a new ReadIpAddressOptions
     /// </summary>
-    public class FetchIpAddressOptions : IOptions<IpAddressResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The IpAccessControlList Sid that identifies the IpAddress resources to fetch
-        /// </summary>
-        public string PathIpAccessControlListSid { get; }
-        /// <summary>
-        /// A string that identifies the IpAddress resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchIpAddressOptions
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
-        ///                                  fetch </param>
-        /// <param name="pathSid"> A string that identifies the IpAddress resource to fetch </param>
-        public FetchIpAddressOptions(string pathIpAccessControlListSid, string pathSid)
-        {
-            PathIpAccessControlListSid = pathIpAccessControlListSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
+    ///                                  read </param>
+    public ReadIpAddressOptions(string pathIpAccessControlListSid)
+    {
+      PathIpAccessControlListSid = pathIpAccessControlListSid;
+    }
+
     /// <summary>
-    /// Update an IpAddress resource.
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateIpAddressOptions : IOptions<IpAddressResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The IpAccessControlList Sid that identifies the IpAddress resources to update
-        /// </summary>
-        public string PathIpAccessControlListSid { get; }
-        /// <summary>
-        /// A string that identifies the IpAddress resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// An IP address in dotted decimal notation from which you want to accept traffic. Any SIP requests from this IP address will be allowed by Twilio. IPv4 only supported today.
-        /// </summary>
-        public string IpAddress { get; set; }
-        /// <summary>
-        /// A human readable descriptive text for this resource, up to 64 characters long.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// An integer representing the length of the CIDR prefix to use with this IP address when accepting traffic. By default the entire IP address is used.
-        /// </summary>
-        public int? CidrPrefixLength { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateIpAddressOptions
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
-        ///                                  update </param>
-        /// <param name="pathSid"> A string that identifies the IpAddress resource to update </param>
-        public UpdateIpAddressOptions(string pathIpAccessControlListSid, string pathSid)
-        {
-            PathIpAccessControlListSid = pathIpAccessControlListSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IpAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IpAddress", IpAddress));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (CidrPrefixLength != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CidrPrefixLength", CidrPrefixLength.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Create a new IpAddress resource.
+  /// </summary>
+  public class CreateIpAddressOptions : IOptions<IpAddressResource>
+  {
     /// <summary>
-    /// Delete an IpAddress resource.
+    /// The unique sid that identifies this account
     /// </summary>
-    public class DeleteIpAddressOptions : IOptions<IpAddressResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The IpAccessControlList Sid that identifies the IpAddress resources to delete
-        /// </summary>
-        public string PathIpAccessControlListSid { get; }
-        /// <summary>
-        /// A string that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteIpAddressOptions
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
-        ///                                  delete </param>
-        /// <param name="pathSid"> A string that identifies the resource to delete </param>
-        public DeleteIpAddressOptions(string pathIpAccessControlListSid, string pathSid)
-        {
-            PathIpAccessControlListSid = pathIpAccessControlListSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The IpAccessControlList Sid with which to associate the created IpAddress resource
+    /// </summary>
+    public string PathIpAccessControlListSid { get; }
+    /// <summary>
+    /// A human readable descriptive text for this resource, up to 64 characters long.
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// An IP address in dotted decimal notation from which you want to accept traffic. Any SIP requests from this IP address will be allowed by Twilio. IPv4 only supported today.
+    /// </summary>
+    public string IpAddress { get; }
+    /// <summary>
+    /// An integer representing the length of the CIDR prefix to use with this IP address when accepting traffic. By default the entire IP address is used.
+    /// </summary>
+    public int? CidrPrefixLength { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateIpAddressOptions
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid with which to associate the created IpAddress
+    ///                                  resource </param>
+    /// <param name="friendlyName"> A human readable descriptive text for this resource, up to 64 characters long. </param>
+    /// <param name="ipAddress"> An IP address in dotted decimal notation from which you want to accept traffic. Any SIP
+    ///                 requests from this IP address will be allowed by Twilio. IPv4 only supported today. </param>
+    public CreateIpAddressOptions(string pathIpAccessControlListSid, string friendlyName, string ipAddress)
+    {
+      PathIpAccessControlListSid = pathIpAccessControlListSid;
+      FriendlyName = friendlyName;
+      IpAddress = ipAddress;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (IpAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IpAddress", IpAddress));
+      }
+
+      if (CidrPrefixLength != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CidrPrefixLength", CidrPrefixLength.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Read one IpAddress resource.
+  /// </summary>
+  public class FetchIpAddressOptions : IOptions<IpAddressResource>
+  {
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The IpAccessControlList Sid that identifies the IpAddress resources to fetch
+    /// </summary>
+    public string PathIpAccessControlListSid { get; }
+    /// <summary>
+    /// A string that identifies the IpAddress resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchIpAddressOptions
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
+    ///                                  fetch </param>
+    /// <param name="pathSid"> A string that identifies the IpAddress resource to fetch </param>
+    public FetchIpAddressOptions(string pathIpAccessControlListSid, string pathSid)
+    {
+      PathIpAccessControlListSid = pathIpAccessControlListSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an IpAddress resource.
+  /// </summary>
+  public class UpdateIpAddressOptions : IOptions<IpAddressResource>
+  {
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The IpAccessControlList Sid that identifies the IpAddress resources to update
+    /// </summary>
+    public string PathIpAccessControlListSid { get; }
+    /// <summary>
+    /// A string that identifies the IpAddress resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// An IP address in dotted decimal notation from which you want to accept traffic. Any SIP requests from this IP address will be allowed by Twilio. IPv4 only supported today.
+    /// </summary>
+    public string IpAddress { get; set; }
+    /// <summary>
+    /// A human readable descriptive text for this resource, up to 64 characters long.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// An integer representing the length of the CIDR prefix to use with this IP address when accepting traffic. By default the entire IP address is used.
+    /// </summary>
+    public int? CidrPrefixLength { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateIpAddressOptions
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
+    ///                                  update </param>
+    /// <param name="pathSid"> A string that identifies the IpAddress resource to update </param>
+    public UpdateIpAddressOptions(string pathIpAccessControlListSid, string pathSid)
+    {
+      PathIpAccessControlListSid = pathIpAccessControlListSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IpAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IpAddress", IpAddress));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (CidrPrefixLength != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CidrPrefixLength", CidrPrefixLength.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete an IpAddress resource.
+  /// </summary>
+  public class DeleteIpAddressOptions : IOptions<IpAddressResource>
+  {
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The IpAccessControlList Sid that identifies the IpAddress resources to delete
+    /// </summary>
+    public string PathIpAccessControlListSid { get; }
+    /// <summary>
+    /// A string that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteIpAddressOptions
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
+    ///                                  delete </param>
+    /// <param name="pathSid"> A string that identifies the resource to delete </param>
+    public DeleteIpAddressOptions(string pathIpAccessControlListSid, string pathSid)
+    {
+      PathIpAccessControlListSid = pathIpAccessControlListSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlList/IpAddressResource.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlList/IpAddressResource.cs
index e0a8ef08a..cec391ae1 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlList/IpAddressResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlList/IpAddressResource.cs
@@ -16,557 +16,557 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip.IpAccessControlList
-{
-
-    public class IpAddressResource : Resource
-    {
-        private static Request BuildReadRequest(ReadIpAddressOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathIpAccessControlListSid + "/IpAddresses.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Read multiple IpAddress resources.
-        /// </summary>
-        /// <param name="options"> Read IpAddress parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAddress </returns>
-        public static ResourceSet<IpAddressResource> Read(ReadIpAddressOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<IpAddressResource>.FromJson("ip_addresses", response.Content);
-            return new ResourceSet<IpAddressResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Read multiple IpAddress resources.
-        /// </summary>
-        /// <param name="options"> Read IpAddress parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAddress </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IpAddressResource>> ReadAsync(ReadIpAddressOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<IpAddressResource>.FromJson("ip_addresses", response.Content);
-            return new ResourceSet<IpAddressResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Read multiple IpAddress resources.
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
-        ///                                  read </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAddress </returns>
-        public static ResourceSet<IpAddressResource> Read(string pathIpAccessControlListSid,
-                                                          string pathAccountSid = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadIpAddressOptions(pathIpAccessControlListSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Read multiple IpAddress resources.
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
-        ///                                  read </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAddress </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IpAddressResource>> ReadAsync(string pathIpAccessControlListSid,
-                                                                                                  string pathAccountSid = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadIpAddressOptions(pathIpAccessControlListSid){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<IpAddressResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<IpAddressResource>.FromJson("ip_addresses", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<IpAddressResource> NextPage(Page<IpAddressResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<IpAddressResource>.FromJson("ip_addresses", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<IpAddressResource> PreviousPage(Page<IpAddressResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<IpAddressResource>.FromJson("ip_addresses", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateIpAddressOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathIpAccessControlListSid + "/IpAddresses.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new IpAddress resource.
-        /// </summary>
-        /// <param name="options"> Create IpAddress parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAddress </returns>
-        public static IpAddressResource Create(CreateIpAddressOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new IpAddress resource.
-        /// </summary>
-        /// <param name="options"> Create IpAddress parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAddress </returns>
-        public static async System.Threading.Tasks.Task<IpAddressResource> CreateAsync(CreateIpAddressOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new IpAddress resource.
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid with which to associate the created IpAddress
-        ///                                  resource </param>
-        /// <param name="friendlyName"> A human readable descriptive text for this resource, up to 64 characters long. </param>
-        /// <param name="ipAddress"> An IP address in dotted decimal notation from which you want to accept traffic. Any SIP
-        ///                 requests from this IP address will be allowed by Twilio. IPv4 only supported today. </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="cidrPrefixLength"> An integer representing the length of the CIDR prefix to use with this IP address
-        ///                        when accepting traffic. By default the entire IP address is used. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAddress </returns>
-        public static IpAddressResource Create(string pathIpAccessControlListSid,
-                                               string friendlyName,
-                                               string ipAddress,
-                                               string pathAccountSid = null,
-                                               int? cidrPrefixLength = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateIpAddressOptions(pathIpAccessControlListSid, friendlyName, ipAddress){PathAccountSid = pathAccountSid, CidrPrefixLength = cidrPrefixLength};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new IpAddress resource.
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid with which to associate the created IpAddress
-        ///                                  resource </param>
-        /// <param name="friendlyName"> A human readable descriptive text for this resource, up to 64 characters long. </param>
-        /// <param name="ipAddress"> An IP address in dotted decimal notation from which you want to accept traffic. Any SIP
-        ///                 requests from this IP address will be allowed by Twilio. IPv4 only supported today. </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="cidrPrefixLength"> An integer representing the length of the CIDR prefix to use with this IP address
-        ///                        when accepting traffic. By default the entire IP address is used. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAddress </returns>
-        public static async System.Threading.Tasks.Task<IpAddressResource> CreateAsync(string pathIpAccessControlListSid,
-                                                                                       string friendlyName,
-                                                                                       string ipAddress,
-                                                                                       string pathAccountSid = null,
-                                                                                       int? cidrPrefixLength = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateIpAddressOptions(pathIpAccessControlListSid, friendlyName, ipAddress){PathAccountSid = pathAccountSid, CidrPrefixLength = cidrPrefixLength};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchIpAddressOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathIpAccessControlListSid + "/IpAddresses/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Read one IpAddress resource.
-        /// </summary>
-        /// <param name="options"> Fetch IpAddress parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAddress </returns>
-        public static IpAddressResource Fetch(FetchIpAddressOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Read one IpAddress resource.
-        /// </summary>
-        /// <param name="options"> Fetch IpAddress parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAddress </returns>
-        public static async System.Threading.Tasks.Task<IpAddressResource> FetchAsync(FetchIpAddressOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Read one IpAddress resource.
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
-        ///                                  fetch </param>
-        /// <param name="pathSid"> A string that identifies the IpAddress resource to fetch </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAddress </returns>
-        public static IpAddressResource Fetch(string pathIpAccessControlListSid,
-                                              string pathSid,
-                                              string pathAccountSid = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchIpAddressOptions(pathIpAccessControlListSid, pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Read one IpAddress resource.
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
-        ///                                  fetch </param>
-        /// <param name="pathSid"> A string that identifies the IpAddress resource to fetch </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAddress </returns>
-        public static async System.Threading.Tasks.Task<IpAddressResource> FetchAsync(string pathIpAccessControlListSid,
-                                                                                      string pathSid,
-                                                                                      string pathAccountSid = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchIpAddressOptions(pathIpAccessControlListSid, pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateIpAddressOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathIpAccessControlListSid + "/IpAddresses/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an IpAddress resource.
-        /// </summary>
-        /// <param name="options"> Update IpAddress parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAddress </returns>
-        public static IpAddressResource Update(UpdateIpAddressOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an IpAddress resource.
-        /// </summary>
-        /// <param name="options"> Update IpAddress parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAddress </returns>
-        public static async System.Threading.Tasks.Task<IpAddressResource> UpdateAsync(UpdateIpAddressOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an IpAddress resource.
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
-        ///                                  update </param>
-        /// <param name="pathSid"> A string that identifies the IpAddress resource to update </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="ipAddress"> An IP address in dotted decimal notation from which you want to accept traffic. Any SIP
-        ///                 requests from this IP address will be allowed by Twilio. IPv4 only supported today. </param>
-        /// <param name="friendlyName"> A human readable descriptive text for this resource, up to 64 characters long. </param>
-        /// <param name="cidrPrefixLength"> An integer representing the length of the CIDR prefix to use with this IP address
-        ///                        when accepting traffic. By default the entire IP address is used. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAddress </returns>
-        public static IpAddressResource Update(string pathIpAccessControlListSid,
-                                               string pathSid,
-                                               string pathAccountSid = null,
-                                               string ipAddress = null,
-                                               string friendlyName = null,
-                                               int? cidrPrefixLength = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateIpAddressOptions(pathIpAccessControlListSid, pathSid){PathAccountSid = pathAccountSid, IpAddress = ipAddress, FriendlyName = friendlyName, CidrPrefixLength = cidrPrefixLength};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an IpAddress resource.
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
-        ///                                  update </param>
-        /// <param name="pathSid"> A string that identifies the IpAddress resource to update </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="ipAddress"> An IP address in dotted decimal notation from which you want to accept traffic. Any SIP
-        ///                 requests from this IP address will be allowed by Twilio. IPv4 only supported today. </param>
-        /// <param name="friendlyName"> A human readable descriptive text for this resource, up to 64 characters long. </param>
-        /// <param name="cidrPrefixLength"> An integer representing the length of the CIDR prefix to use with this IP address
-        ///                        when accepting traffic. By default the entire IP address is used. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAddress </returns>
-        public static async System.Threading.Tasks.Task<IpAddressResource> UpdateAsync(string pathIpAccessControlListSid,
-                                                                                       string pathSid,
-                                                                                       string pathAccountSid = null,
-                                                                                       string ipAddress = null,
-                                                                                       string friendlyName = null,
-                                                                                       int? cidrPrefixLength = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateIpAddressOptions(pathIpAccessControlListSid, pathSid){PathAccountSid = pathAccountSid, IpAddress = ipAddress, FriendlyName = friendlyName, CidrPrefixLength = cidrPrefixLength};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteIpAddressOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathIpAccessControlListSid + "/IpAddresses/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete an IpAddress resource.
-        /// </summary>
-        /// <param name="options"> Delete IpAddress parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAddress </returns>
-        public static bool Delete(DeleteIpAddressOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an IpAddress resource.
-        /// </summary>
-        /// <param name="options"> Delete IpAddress parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAddress </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteIpAddressOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete an IpAddress resource.
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
-        ///                                  delete </param>
-        /// <param name="pathSid"> A string that identifies the resource to delete </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAddress </returns>
-        public static bool Delete(string pathIpAccessControlListSid,
-                                  string pathSid,
-                                  string pathAccountSid = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteIpAddressOptions(pathIpAccessControlListSid, pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an IpAddress resource.
-        /// </summary>
-        /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
-        ///                                  delete </param>
-        /// <param name="pathSid"> A string that identifies the resource to delete </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAddress </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathIpAccessControlListSid,
-                                                                          string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteIpAddressOptions(pathIpAccessControlListSid, pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a IpAddressResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> IpAddressResource object represented by the provided JSON </returns>
-        public static IpAddressResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<IpAddressResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique id of the Account that is responsible for this resource.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// A human readable descriptive text for this resource, up to 64 characters long.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// An IP address in dotted decimal notation from which you want to accept traffic. Any SIP requests from this IP address will be allowed by Twilio. IPv4 only supported today.
-        /// </summary>
-        [JsonProperty("ip_address")]
-        public string IpAddress { get; private set; }
-        /// <summary>
-        /// An integer representing the length of the CIDR prefix to use with this IP address when accepting traffic. By default the entire IP address is used.
-        /// </summary>
-        [JsonProperty("cidr_prefix_length")]
-        public int? CidrPrefixLength { get; private set; }
-        /// <summary>
-        /// The unique id of the IpAccessControlList resource that includes this resource.
-        /// </summary>
-        [JsonProperty("ip_access_control_list_sid")]
-        public string IpAccessControlListSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created, given as GMT in RFC 2822 format.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated, given as GMT in RFC 2822 format.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URI for this resource, relative to https://api.twilio.com
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private IpAddressResource()
-        {
-
-        }
-    }
+{
+
+  public class IpAddressResource : Resource
+  {
+    private static Request BuildReadRequest(ReadIpAddressOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathIpAccessControlListSid + "/IpAddresses.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Read multiple IpAddress resources.
+    /// </summary>
+    /// <param name="options"> Read IpAddress parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAddress </returns>
+    public static ResourceSet<IpAddressResource> Read(ReadIpAddressOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<IpAddressResource>.FromJson("ip_addresses", response.Content);
+      return new ResourceSet<IpAddressResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Read multiple IpAddress resources.
+    /// </summary>
+    /// <param name="options"> Read IpAddress parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAddress </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IpAddressResource>> ReadAsync(ReadIpAddressOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<IpAddressResource>.FromJson("ip_addresses", response.Content);
+      return new ResourceSet<IpAddressResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Read multiple IpAddress resources.
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
+    ///                                  read </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAddress </returns>
+    public static ResourceSet<IpAddressResource> Read(string pathIpAccessControlListSid,
+                                                      string pathAccountSid = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadIpAddressOptions(pathIpAccessControlListSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Read multiple IpAddress resources.
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
+    ///                                  read </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAddress </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IpAddressResource>> ReadAsync(string pathIpAccessControlListSid,
+                                                                                              string pathAccountSid = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadIpAddressOptions(pathIpAccessControlListSid) { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<IpAddressResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<IpAddressResource>.FromJson("ip_addresses", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<IpAddressResource> NextPage(Page<IpAddressResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<IpAddressResource>.FromJson("ip_addresses", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<IpAddressResource> PreviousPage(Page<IpAddressResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<IpAddressResource>.FromJson("ip_addresses", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateIpAddressOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathIpAccessControlListSid + "/IpAddresses.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new IpAddress resource.
+    /// </summary>
+    /// <param name="options"> Create IpAddress parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAddress </returns>
+    public static IpAddressResource Create(CreateIpAddressOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new IpAddress resource.
+    /// </summary>
+    /// <param name="options"> Create IpAddress parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAddress </returns>
+    public static async System.Threading.Tasks.Task<IpAddressResource> CreateAsync(CreateIpAddressOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new IpAddress resource.
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid with which to associate the created IpAddress
+    ///                                  resource </param>
+    /// <param name="friendlyName"> A human readable descriptive text for this resource, up to 64 characters long. </param>
+    /// <param name="ipAddress"> An IP address in dotted decimal notation from which you want to accept traffic. Any SIP
+    ///                 requests from this IP address will be allowed by Twilio. IPv4 only supported today. </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="cidrPrefixLength"> An integer representing the length of the CIDR prefix to use with this IP address
+    ///                        when accepting traffic. By default the entire IP address is used. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAddress </returns>
+    public static IpAddressResource Create(string pathIpAccessControlListSid,
+                                           string friendlyName,
+                                           string ipAddress,
+                                           string pathAccountSid = null,
+                                           int? cidrPrefixLength = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateIpAddressOptions(pathIpAccessControlListSid, friendlyName, ipAddress) { PathAccountSid = pathAccountSid, CidrPrefixLength = cidrPrefixLength };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new IpAddress resource.
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid with which to associate the created IpAddress
+    ///                                  resource </param>
+    /// <param name="friendlyName"> A human readable descriptive text for this resource, up to 64 characters long. </param>
+    /// <param name="ipAddress"> An IP address in dotted decimal notation from which you want to accept traffic. Any SIP
+    ///                 requests from this IP address will be allowed by Twilio. IPv4 only supported today. </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="cidrPrefixLength"> An integer representing the length of the CIDR prefix to use with this IP address
+    ///                        when accepting traffic. By default the entire IP address is used. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAddress </returns>
+    public static async System.Threading.Tasks.Task<IpAddressResource> CreateAsync(string pathIpAccessControlListSid,
+                                                                                   string friendlyName,
+                                                                                   string ipAddress,
+                                                                                   string pathAccountSid = null,
+                                                                                   int? cidrPrefixLength = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateIpAddressOptions(pathIpAccessControlListSid, friendlyName, ipAddress) { PathAccountSid = pathAccountSid, CidrPrefixLength = cidrPrefixLength };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchIpAddressOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathIpAccessControlListSid + "/IpAddresses/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Read one IpAddress resource.
+    /// </summary>
+    /// <param name="options"> Fetch IpAddress parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAddress </returns>
+    public static IpAddressResource Fetch(FetchIpAddressOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Read one IpAddress resource.
+    /// </summary>
+    /// <param name="options"> Fetch IpAddress parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAddress </returns>
+    public static async System.Threading.Tasks.Task<IpAddressResource> FetchAsync(FetchIpAddressOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Read one IpAddress resource.
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
+    ///                                  fetch </param>
+    /// <param name="pathSid"> A string that identifies the IpAddress resource to fetch </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAddress </returns>
+    public static IpAddressResource Fetch(string pathIpAccessControlListSid,
+                                          string pathSid,
+                                          string pathAccountSid = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchIpAddressOptions(pathIpAccessControlListSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Read one IpAddress resource.
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
+    ///                                  fetch </param>
+    /// <param name="pathSid"> A string that identifies the IpAddress resource to fetch </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAddress </returns>
+    public static async System.Threading.Tasks.Task<IpAddressResource> FetchAsync(string pathIpAccessControlListSid,
+                                                                                  string pathSid,
+                                                                                  string pathAccountSid = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchIpAddressOptions(pathIpAccessControlListSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateIpAddressOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathIpAccessControlListSid + "/IpAddresses/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an IpAddress resource.
+    /// </summary>
+    /// <param name="options"> Update IpAddress parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAddress </returns>
+    public static IpAddressResource Update(UpdateIpAddressOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an IpAddress resource.
+    /// </summary>
+    /// <param name="options"> Update IpAddress parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAddress </returns>
+    public static async System.Threading.Tasks.Task<IpAddressResource> UpdateAsync(UpdateIpAddressOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an IpAddress resource.
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
+    ///                                  update </param>
+    /// <param name="pathSid"> A string that identifies the IpAddress resource to update </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="ipAddress"> An IP address in dotted decimal notation from which you want to accept traffic. Any SIP
+    ///                 requests from this IP address will be allowed by Twilio. IPv4 only supported today. </param>
+    /// <param name="friendlyName"> A human readable descriptive text for this resource, up to 64 characters long. </param>
+    /// <param name="cidrPrefixLength"> An integer representing the length of the CIDR prefix to use with this IP address
+    ///                        when accepting traffic. By default the entire IP address is used. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAddress </returns>
+    public static IpAddressResource Update(string pathIpAccessControlListSid,
+                                           string pathSid,
+                                           string pathAccountSid = null,
+                                           string ipAddress = null,
+                                           string friendlyName = null,
+                                           int? cidrPrefixLength = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateIpAddressOptions(pathIpAccessControlListSid, pathSid) { PathAccountSid = pathAccountSid, IpAddress = ipAddress, FriendlyName = friendlyName, CidrPrefixLength = cidrPrefixLength };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an IpAddress resource.
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
+    ///                                  update </param>
+    /// <param name="pathSid"> A string that identifies the IpAddress resource to update </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="ipAddress"> An IP address in dotted decimal notation from which you want to accept traffic. Any SIP
+    ///                 requests from this IP address will be allowed by Twilio. IPv4 only supported today. </param>
+    /// <param name="friendlyName"> A human readable descriptive text for this resource, up to 64 characters long. </param>
+    /// <param name="cidrPrefixLength"> An integer representing the length of the CIDR prefix to use with this IP address
+    ///                        when accepting traffic. By default the entire IP address is used. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAddress </returns>
+    public static async System.Threading.Tasks.Task<IpAddressResource> UpdateAsync(string pathIpAccessControlListSid,
+                                                                                   string pathSid,
+                                                                                   string pathAccountSid = null,
+                                                                                   string ipAddress = null,
+                                                                                   string friendlyName = null,
+                                                                                   int? cidrPrefixLength = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateIpAddressOptions(pathIpAccessControlListSid, pathSid) { PathAccountSid = pathAccountSid, IpAddress = ipAddress, FriendlyName = friendlyName, CidrPrefixLength = cidrPrefixLength };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteIpAddressOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathIpAccessControlListSid + "/IpAddresses/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete an IpAddress resource.
+    /// </summary>
+    /// <param name="options"> Delete IpAddress parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAddress </returns>
+    public static bool Delete(DeleteIpAddressOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an IpAddress resource.
+    /// </summary>
+    /// <param name="options"> Delete IpAddress parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAddress </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteIpAddressOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete an IpAddress resource.
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
+    ///                                  delete </param>
+    /// <param name="pathSid"> A string that identifies the resource to delete </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAddress </returns>
+    public static bool Delete(string pathIpAccessControlListSid,
+                              string pathSid,
+                              string pathAccountSid = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteIpAddressOptions(pathIpAccessControlListSid, pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an IpAddress resource.
+    /// </summary>
+    /// <param name="pathIpAccessControlListSid"> The IpAccessControlList Sid that identifies the IpAddress resources to
+    ///                                  delete </param>
+    /// <param name="pathSid"> A string that identifies the resource to delete </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAddress </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathIpAccessControlListSid,
+                                                                      string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteIpAddressOptions(pathIpAccessControlListSid, pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a IpAddressResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> IpAddressResource object represented by the provided JSON </returns>
+    public static IpAddressResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<IpAddressResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique id of the Account that is responsible for this resource.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// A human readable descriptive text for this resource, up to 64 characters long.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// An IP address in dotted decimal notation from which you want to accept traffic. Any SIP requests from this IP address will be allowed by Twilio. IPv4 only supported today.
+    /// </summary>
+    [JsonProperty("ip_address")]
+    public string IpAddress { get; private set; }
+    /// <summary>
+    /// An integer representing the length of the CIDR prefix to use with this IP address when accepting traffic. By default the entire IP address is used.
+    /// </summary>
+    [JsonProperty("cidr_prefix_length")]
+    public int? CidrPrefixLength { get; private set; }
+    /// <summary>
+    /// The unique id of the IpAccessControlList resource that includes this resource.
+    /// </summary>
+    [JsonProperty("ip_access_control_list_sid")]
+    public string IpAccessControlListSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created, given as GMT in RFC 2822 format.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated, given as GMT in RFC 2822 format.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URI for this resource, relative to https://api.twilio.com
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private IpAddressResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlListOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlListOptions.cs
index 255fff9eb..8fe944d6e 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlListOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlListOptions.cs
@@ -9,179 +9,179 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of IpAccessControlLists that belong to the account used to make the request
+  /// </summary>
+  public class ReadIpAccessControlListOptions : ReadOptions<IpAccessControlListResource>
+  {
     /// <summary>
-    /// Retrieve a list of IpAccessControlLists that belong to the account used to make the request
+    /// The unique sid that identifies this account
     /// </summary>
-    public class ReadIpAccessControlListOptions : ReadOptions<IpAccessControlListResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
+
     /// <summary>
-    /// Create a new IpAccessControlList resource
-    /// </summary>
-    public class CreateIpAccessControlListOptions : IOptions<IpAccessControlListResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A human readable description of this resource
-        /// </summary>
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Construct a new CreateIpAccessControlListOptions
-        /// </summary>
-        /// <param name="friendlyName"> A human readable description of this resource </param>
-        public CreateIpAccessControlListOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Create a new IpAccessControlList resource
+  /// </summary>
+  public class CreateIpAccessControlListOptions : IOptions<IpAccessControlListResource>
+  {
     /// <summary>
-    /// Fetch a specific instance of an IpAccessControlList
-    /// </summary>
-    public class FetchIpAccessControlListOptions : IOptions<IpAccessControlListResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchIpAccessControlListOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that identifies the resource to fetch </param>
-        public FetchIpAccessControlListOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Rename an IpAccessControlList
-    /// </summary>
-    public class UpdateIpAccessControlListOptions : IOptions<IpAccessControlListResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A human readable description of this resource
-        /// </summary>
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Construct a new UpdateIpAccessControlListOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that identifies the resource to update </param>
-        /// <param name="friendlyName"> A human readable description of this resource </param>
-        public UpdateIpAccessControlListOptions(string pathSid, string friendlyName)
-        {
-            PathSid = pathSid;
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// A human readable description of this resource
+    /// </summary>
+    public string FriendlyName { get; }
+
     /// <summary>
-    /// Delete an IpAccessControlList from the requested account
-    /// </summary>
-    public class DeleteIpAccessControlListOptions : IOptions<IpAccessControlListResource>
-    {
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// A string that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteIpAccessControlListOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that identifies the resource to delete </param>
-        public DeleteIpAccessControlListOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new CreateIpAccessControlListOptions
+    /// </summary>
+    /// <param name="friendlyName"> A human readable description of this resource </param>
+    public CreateIpAccessControlListOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific instance of an IpAccessControlList
+  /// </summary>
+  public class FetchIpAccessControlListOptions : IOptions<IpAccessControlListResource>
+  {
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchIpAccessControlListOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that identifies the resource to fetch </param>
+    public FetchIpAccessControlListOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Rename an IpAccessControlList
+  /// </summary>
+  public class UpdateIpAccessControlListOptions : IOptions<IpAccessControlListResource>
+  {
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A human readable description of this resource
+    /// </summary>
+    public string FriendlyName { get; }
+
+    /// <summary>
+    /// Construct a new UpdateIpAccessControlListOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that identifies the resource to update </param>
+    /// <param name="friendlyName"> A human readable description of this resource </param>
+    public UpdateIpAccessControlListOptions(string pathSid, string friendlyName)
+    {
+      PathSid = pathSid;
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete an IpAccessControlList from the requested account
+  /// </summary>
+  public class DeleteIpAccessControlListOptions : IOptions<IpAccessControlListResource>
+  {
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// A string that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteIpAccessControlListOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that identifies the resource to delete </param>
+    public DeleteIpAccessControlListOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlListResource.cs b/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlListResource.cs
index 48414c10b..fb6bfd90f 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlListResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Sip/IpAccessControlListResource.cs
@@ -16,497 +16,497 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account.Sip
-{
-
-    public class IpAccessControlListResource : Resource
-    {
-        private static Request BuildReadRequest(ReadIpAccessControlListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of IpAccessControlLists that belong to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static ResourceSet<IpAccessControlListResource> Read(ReadIpAccessControlListOptions options,
-                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
-            return new ResourceSet<IpAccessControlListResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of IpAccessControlLists that belong to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IpAccessControlListResource>> ReadAsync(ReadIpAccessControlListOptions options,
-                                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
-            return new ResourceSet<IpAccessControlListResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of IpAccessControlLists that belong to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static ResourceSet<IpAccessControlListResource> Read(string pathAccountSid = null,
-                                                                    int? pageSize = null,
-                                                                    long? limit = null,
-                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadIpAccessControlListOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of IpAccessControlLists that belong to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IpAccessControlListResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                            int? pageSize = null,
-                                                                                                            long? limit = null,
-                                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadIpAccessControlListOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<IpAccessControlListResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<IpAccessControlListResource> NextPage(Page<IpAccessControlListResource> page,
-                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<IpAccessControlListResource> PreviousPage(Page<IpAccessControlListResource> page,
-                                                                     ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateIpAccessControlListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new IpAccessControlList resource
-        /// </summary>
-        /// <param name="options"> Create IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static IpAccessControlListResource Create(CreateIpAccessControlListOptions options,
-                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new IpAccessControlList resource
-        /// </summary>
-        /// <param name="options"> Create IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListResource> CreateAsync(CreateIpAccessControlListOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new IpAccessControlList resource
-        /// </summary>
-        /// <param name="friendlyName"> A human readable description of this resource </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static IpAccessControlListResource Create(string friendlyName,
-                                                         string pathAccountSid = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateIpAccessControlListOptions(friendlyName){PathAccountSid = pathAccountSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new IpAccessControlList resource
-        /// </summary>
-        /// <param name="friendlyName"> A human readable description of this resource </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListResource> CreateAsync(string friendlyName,
-                                                                                                 string pathAccountSid = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateIpAccessControlListOptions(friendlyName){PathAccountSid = pathAccountSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchIpAccessControlListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific instance of an IpAccessControlList
-        /// </summary>
-        /// <param name="options"> Fetch IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static IpAccessControlListResource Fetch(FetchIpAccessControlListOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific instance of an IpAccessControlList
-        /// </summary>
-        /// <param name="options"> Fetch IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListResource> FetchAsync(FetchIpAccessControlListOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific instance of an IpAccessControlList
-        /// </summary>
-        /// <param name="pathSid"> A string that identifies the resource to fetch </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static IpAccessControlListResource Fetch(string pathSid,
-                                                        string pathAccountSid = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchIpAccessControlListOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific instance of an IpAccessControlList
-        /// </summary>
-        /// <param name="pathSid"> A string that identifies the resource to fetch </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListResource> FetchAsync(string pathSid,
-                                                                                                string pathAccountSid = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchIpAccessControlListOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateIpAccessControlListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Rename an IpAccessControlList
-        /// </summary>
-        /// <param name="options"> Update IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static IpAccessControlListResource Update(UpdateIpAccessControlListOptions options,
-                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Rename an IpAccessControlList
-        /// </summary>
-        /// <param name="options"> Update IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListResource> UpdateAsync(UpdateIpAccessControlListOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Rename an IpAccessControlList
-        /// </summary>
-        /// <param name="pathSid"> A string that identifies the resource to update </param>
-        /// <param name="friendlyName"> A human readable description of this resource </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static IpAccessControlListResource Update(string pathSid,
-                                                         string friendlyName,
-                                                         string pathAccountSid = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateIpAccessControlListOptions(pathSid, friendlyName){PathAccountSid = pathAccountSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Rename an IpAccessControlList
-        /// </summary>
-        /// <param name="pathSid"> A string that identifies the resource to update </param>
-        /// <param name="friendlyName"> A human readable description of this resource </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListResource> UpdateAsync(string pathSid,
-                                                                                                 string friendlyName,
-                                                                                                 string pathAccountSid = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateIpAccessControlListOptions(pathSid, friendlyName){PathAccountSid = pathAccountSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteIpAccessControlListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete an IpAccessControlList from the requested account
-        /// </summary>
-        /// <param name="options"> Delete IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static bool Delete(DeleteIpAccessControlListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an IpAccessControlList from the requested account
-        /// </summary>
-        /// <param name="options"> Delete IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteIpAccessControlListOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete an IpAccessControlList from the requested account
-        /// </summary>
-        /// <param name="pathSid"> A string that identifies the resource to delete </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteIpAccessControlListOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an IpAccessControlList from the requested account
-        /// </summary>
-        /// <param name="pathSid"> A string that identifies the resource to delete </param>
-        /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteIpAccessControlListOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a IpAccessControlListResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> IpAccessControlListResource object represented by the provided JSON </returns>
-        public static IpAccessControlListResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<IpAccessControlListResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique sid that identifies this account
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// A human readable description of this resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The date this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The IP addresses associated with this resource.
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// The URI for this resource
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private IpAccessControlListResource()
-        {
-
-        }
-    }
+{
+
+  public class IpAccessControlListResource : Resource
+  {
+    private static Request BuildReadRequest(ReadIpAccessControlListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of IpAccessControlLists that belong to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static ResourceSet<IpAccessControlListResource> Read(ReadIpAccessControlListOptions options,
+                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
+      return new ResourceSet<IpAccessControlListResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of IpAccessControlLists that belong to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IpAccessControlListResource>> ReadAsync(ReadIpAccessControlListOptions options,
+                                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
+      return new ResourceSet<IpAccessControlListResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of IpAccessControlLists that belong to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static ResourceSet<IpAccessControlListResource> Read(string pathAccountSid = null,
+                                                                int? pageSize = null,
+                                                                long? limit = null,
+                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadIpAccessControlListOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of IpAccessControlLists that belong to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IpAccessControlListResource>> ReadAsync(string pathAccountSid = null,
+                                                                                                        int? pageSize = null,
+                                                                                                        long? limit = null,
+                                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadIpAccessControlListOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<IpAccessControlListResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<IpAccessControlListResource> NextPage(Page<IpAccessControlListResource> page,
+                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<IpAccessControlListResource> PreviousPage(Page<IpAccessControlListResource> page,
+                                                                 ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateIpAccessControlListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new IpAccessControlList resource
+    /// </summary>
+    /// <param name="options"> Create IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static IpAccessControlListResource Create(CreateIpAccessControlListOptions options,
+                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new IpAccessControlList resource
+    /// </summary>
+    /// <param name="options"> Create IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListResource> CreateAsync(CreateIpAccessControlListOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new IpAccessControlList resource
+    /// </summary>
+    /// <param name="friendlyName"> A human readable description of this resource </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static IpAccessControlListResource Create(string friendlyName,
+                                                     string pathAccountSid = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateIpAccessControlListOptions(friendlyName) { PathAccountSid = pathAccountSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new IpAccessControlList resource
+    /// </summary>
+    /// <param name="friendlyName"> A human readable description of this resource </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListResource> CreateAsync(string friendlyName,
+                                                                                             string pathAccountSid = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateIpAccessControlListOptions(friendlyName) { PathAccountSid = pathAccountSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchIpAccessControlListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific instance of an IpAccessControlList
+    /// </summary>
+    /// <param name="options"> Fetch IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static IpAccessControlListResource Fetch(FetchIpAccessControlListOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific instance of an IpAccessControlList
+    /// </summary>
+    /// <param name="options"> Fetch IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListResource> FetchAsync(FetchIpAccessControlListOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific instance of an IpAccessControlList
+    /// </summary>
+    /// <param name="pathSid"> A string that identifies the resource to fetch </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static IpAccessControlListResource Fetch(string pathSid,
+                                                    string pathAccountSid = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchIpAccessControlListOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific instance of an IpAccessControlList
+    /// </summary>
+    /// <param name="pathSid"> A string that identifies the resource to fetch </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListResource> FetchAsync(string pathSid,
+                                                                                            string pathAccountSid = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchIpAccessControlListOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateIpAccessControlListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Rename an IpAccessControlList
+    /// </summary>
+    /// <param name="options"> Update IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static IpAccessControlListResource Update(UpdateIpAccessControlListOptions options,
+                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Rename an IpAccessControlList
+    /// </summary>
+    /// <param name="options"> Update IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListResource> UpdateAsync(UpdateIpAccessControlListOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Rename an IpAccessControlList
+    /// </summary>
+    /// <param name="pathSid"> A string that identifies the resource to update </param>
+    /// <param name="friendlyName"> A human readable description of this resource </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static IpAccessControlListResource Update(string pathSid,
+                                                     string friendlyName,
+                                                     string pathAccountSid = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateIpAccessControlListOptions(pathSid, friendlyName) { PathAccountSid = pathAccountSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Rename an IpAccessControlList
+    /// </summary>
+    /// <param name="pathSid"> A string that identifies the resource to update </param>
+    /// <param name="friendlyName"> A human readable description of this resource </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListResource> UpdateAsync(string pathSid,
+                                                                                             string friendlyName,
+                                                                                             string pathAccountSid = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateIpAccessControlListOptions(pathSid, friendlyName) { PathAccountSid = pathAccountSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteIpAccessControlListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/SIP/IpAccessControlLists/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete an IpAccessControlList from the requested account
+    /// </summary>
+    /// <param name="options"> Delete IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static bool Delete(DeleteIpAccessControlListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an IpAccessControlList from the requested account
+    /// </summary>
+    /// <param name="options"> Delete IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteIpAccessControlListOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete an IpAccessControlList from the requested account
+    /// </summary>
+    /// <param name="pathSid"> A string that identifies the resource to delete </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteIpAccessControlListOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an IpAccessControlList from the requested account
+    /// </summary>
+    /// <param name="pathSid"> A string that identifies the resource to delete </param>
+    /// <param name="pathAccountSid"> The unique sid that identifies this account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteIpAccessControlListOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a IpAccessControlListResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> IpAccessControlListResource object represented by the provided JSON </returns>
+    public static IpAccessControlListResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<IpAccessControlListResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique sid that identifies this account
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// A human readable description of this resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The date this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The IP addresses associated with this resource.
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// The URI for this resource
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private IpAccessControlListResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/TokenOptions.cs b/src/Twilio/Rest/Api/V2010/Account/TokenOptions.cs
index 892291085..dc1dc3be6 100644
--- a/src/Twilio/Rest/Api/V2010/Account/TokenOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/TokenOptions.cs
@@ -9,35 +9,35 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Create a new token for ICE servers
+  /// </summary>
+  public class CreateTokenOptions : IOptions<TokenResource>
+  {
     /// <summary>
-    /// Create a new token for ICE servers
+    /// The SID of the Account that will create the resource
     /// </summary>
-    public class CreateTokenOptions : IOptions<TokenResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The duration in seconds the credentials are valid
-        /// </summary>
-        public int? Ttl { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The duration in seconds the credentials are valid
+    /// </summary>
+    public int? Ttl { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/TokenResource.cs b/src/Twilio/Rest/Api/V2010/Account/TokenResource.cs
index 28cf66dfe..c7c1e90eb 100644
--- a/src/Twilio/Rest/Api/V2010/Account/TokenResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/TokenResource.cs
@@ -17,138 +17,138 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class TokenResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateTokenOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Tokens.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new token for ICE servers
-        /// </summary>
-        /// <param name="options"> Create Token parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Token </returns>
-        public static TokenResource Create(CreateTokenOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new token for ICE servers
-        /// </summary>
-        /// <param name="options"> Create Token parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Token </returns>
-        public static async System.Threading.Tasks.Task<TokenResource> CreateAsync(CreateTokenOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new token for ICE servers
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="ttl"> The duration in seconds the credentials are valid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Token </returns>
-        public static TokenResource Create(string pathAccountSid = null, int? ttl = null, ITwilioRestClient client = null)
-        {
-            var options = new CreateTokenOptions(){PathAccountSid = pathAccountSid, Ttl = ttl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new token for ICE servers
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="ttl"> The duration in seconds the credentials are valid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Token </returns>
-        public static async System.Threading.Tasks.Task<TokenResource> CreateAsync(string pathAccountSid = null,
-                                                                                   int? ttl = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateTokenOptions(){PathAccountSid = pathAccountSid, Ttl = ttl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TokenResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TokenResource object represented by the provided JSON </returns>
-        public static TokenResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TokenResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An array representing the ephemeral credentials
-        /// </summary>
-        [JsonProperty("ice_servers")]
-        public List<IceServer> IceServers { get; private set; }
-        /// <summary>
-        /// The temporary password used for authenticating
-        /// </summary>
-        [JsonProperty("password")]
-        public string Password { get; private set; }
-        /// <summary>
-        /// The duration in seconds the credentials are valid
-        /// </summary>
-        [JsonProperty("ttl")]
-        public string Ttl { get; private set; }
-        /// <summary>
-        /// The temporary username that uniquely identifies a Token
-        /// </summary>
-        [JsonProperty("username")]
-        public string Username { get; private set; }
-
-        private TokenResource()
-        {
-
-        }
-    }
+{
+
+  public class TokenResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateTokenOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Tokens.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new token for ICE servers
+    /// </summary>
+    /// <param name="options"> Create Token parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Token </returns>
+    public static TokenResource Create(CreateTokenOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new token for ICE servers
+    /// </summary>
+    /// <param name="options"> Create Token parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Token </returns>
+    public static async System.Threading.Tasks.Task<TokenResource> CreateAsync(CreateTokenOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new token for ICE servers
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="ttl"> The duration in seconds the credentials are valid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Token </returns>
+    public static TokenResource Create(string pathAccountSid = null, int? ttl = null, ITwilioRestClient client = null)
+    {
+      var options = new CreateTokenOptions() { PathAccountSid = pathAccountSid, Ttl = ttl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new token for ICE servers
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="ttl"> The duration in seconds the credentials are valid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Token </returns>
+    public static async System.Threading.Tasks.Task<TokenResource> CreateAsync(string pathAccountSid = null,
+                                                                               int? ttl = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateTokenOptions() { PathAccountSid = pathAccountSid, Ttl = ttl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TokenResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TokenResource object represented by the provided JSON </returns>
+    public static TokenResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TokenResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An array representing the ephemeral credentials
+    /// </summary>
+    [JsonProperty("ice_servers")]
+    public List<IceServer> IceServers { get; private set; }
+    /// <summary>
+    /// The temporary password used for authenticating
+    /// </summary>
+    [JsonProperty("password")]
+    public string Password { get; private set; }
+    /// <summary>
+    /// The duration in seconds the credentials are valid
+    /// </summary>
+    [JsonProperty("ttl")]
+    public string Ttl { get; private set; }
+    /// <summary>
+    /// The temporary username that uniquely identifies a Token
+    /// </summary>
+    [JsonProperty("username")]
+    public string Username { get; private set; }
+
+    private TokenResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/TranscriptionOptions.cs b/src/Twilio/Rest/Api/V2010/Account/TranscriptionOptions.cs
index 0770365b0..e2bb650f7 100644
--- a/src/Twilio/Rest/Api/V2010/Account/TranscriptionOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/TranscriptionOptions.cs
@@ -9,97 +9,97 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// Fetch an instance of a Transcription
+  /// </summary>
+  public class FetchTranscriptionOptions : IOptions<TranscriptionResource>
+  {
     /// <summary>
-    /// Fetch an instance of a Transcription
+    /// The SID of the Account that created the resource to fetch
     /// </summary>
-    public class FetchTranscriptionOptions : IOptions<TranscriptionResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTranscriptionOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchTranscriptionOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Delete a transcription from the account used to make the request
+    /// The unique string that identifies the resource
     /// </summary>
-    public class DeleteTranscriptionOptions : IOptions<TranscriptionResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteTranscriptionOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteTranscriptionOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// Retrieve a list of transcriptions belonging to the account used to make the request
+    /// Construct a new FetchTranscriptionOptions
     /// </summary>
-    public class ReadTranscriptionOptions : ReadOptions<TranscriptionResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchTranscriptionOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a transcription from the account used to make the request
+  /// </summary>
+  public class DeleteTranscriptionOptions : IOptions<TranscriptionResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteTranscriptionOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteTranscriptionOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of transcriptions belonging to the account used to make the request
+  /// </summary>
+  public class ReadTranscriptionOptions : ReadOptions<TranscriptionResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/TranscriptionResource.cs b/src/Twilio/Rest/Api/V2010/Account/TranscriptionResource.cs
index f1d8d0a4f..84be033fa 100644
--- a/src/Twilio/Rest/Api/V2010/Account/TranscriptionResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/TranscriptionResource.cs
@@ -17,389 +17,389 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class TranscriptionResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        private static Request BuildFetchRequest(FetchTranscriptionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Transcriptions/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of a Transcription
-        /// </summary>
-        /// <param name="options"> Fetch Transcription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Transcription </returns>
-        public static TranscriptionResource Fetch(FetchTranscriptionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a Transcription
-        /// </summary>
-        /// <param name="options"> Fetch Transcription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Transcription </returns>
-        public static async System.Threading.Tasks.Task<TranscriptionResource> FetchAsync(FetchTranscriptionOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of a Transcription
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Transcription </returns>
-        public static TranscriptionResource Fetch(string pathSid,
-                                                  string pathAccountSid = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchTranscriptionOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of a Transcription
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Transcription </returns>
-        public static async System.Threading.Tasks.Task<TranscriptionResource> FetchAsync(string pathSid,
-                                                                                          string pathAccountSid = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchTranscriptionOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteTranscriptionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Transcriptions/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a transcription from the account used to make the request
-        /// </summary>
-        /// <param name="options"> Delete Transcription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Transcription </returns>
-        public static bool Delete(DeleteTranscriptionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a transcription from the account used to make the request
-        /// </summary>
-        /// <param name="options"> Delete Transcription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Transcription </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTranscriptionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a transcription from the account used to make the request
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Transcription </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteTranscriptionOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a transcription from the account used to make the request
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Transcription </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteTranscriptionOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadTranscriptionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Transcriptions.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of transcriptions belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Transcription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Transcription </returns>
-        public static ResourceSet<TranscriptionResource> Read(ReadTranscriptionOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
-            return new ResourceSet<TranscriptionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of transcriptions belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Transcription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Transcription </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TranscriptionResource>> ReadAsync(ReadTranscriptionOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
-            return new ResourceSet<TranscriptionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of transcriptions belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Transcription </returns>
-        public static ResourceSet<TranscriptionResource> Read(string pathAccountSid = null,
-                                                              int? pageSize = null,
-                                                              long? limit = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadTranscriptionOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of transcriptions belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Transcription </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TranscriptionResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                      int? pageSize = null,
-                                                                                                      long? limit = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadTranscriptionOptions(){PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TranscriptionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TranscriptionResource> NextPage(Page<TranscriptionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TranscriptionResource> PreviousPage(Page<TranscriptionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a TranscriptionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TranscriptionResource object represented by the provided JSON </returns>
-        public static TranscriptionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TranscriptionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the transcription
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The duration of the transcribed audio in seconds.
-        /// </summary>
-        [JsonProperty("duration")]
-        public string Duration { get; private set; }
-        /// <summary>
-        /// The charge for the transcription
-        /// </summary>
-        [JsonProperty("price")]
-        public decimal? Price { get; private set; }
-        /// <summary>
-        /// The currency in which price is measured
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The SID that identifies the transcription's recording
-        /// </summary>
-        [JsonProperty("recording_sid")]
-        public string RecordingSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The status of the transcription
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TranscriptionResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The text content of the transcription.
-        /// </summary>
-        [JsonProperty("transcription_text")]
-        public string TranscriptionText { get; private set; }
-        /// <summary>
-        /// The transcription type
-        /// </summary>
-        [JsonProperty("type")]
-        public string Type { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private TranscriptionResource()
-        {
-
-        }
-    }
+{
+
+  public class TranscriptionResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    private static Request BuildFetchRequest(FetchTranscriptionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Transcriptions/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of a Transcription
+    /// </summary>
+    /// <param name="options"> Fetch Transcription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Transcription </returns>
+    public static TranscriptionResource Fetch(FetchTranscriptionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a Transcription
+    /// </summary>
+    /// <param name="options"> Fetch Transcription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Transcription </returns>
+    public static async System.Threading.Tasks.Task<TranscriptionResource> FetchAsync(FetchTranscriptionOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of a Transcription
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Transcription </returns>
+    public static TranscriptionResource Fetch(string pathSid,
+                                              string pathAccountSid = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchTranscriptionOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of a Transcription
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Transcription </returns>
+    public static async System.Threading.Tasks.Task<TranscriptionResource> FetchAsync(string pathSid,
+                                                                                      string pathAccountSid = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchTranscriptionOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteTranscriptionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Transcriptions/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a transcription from the account used to make the request
+    /// </summary>
+    /// <param name="options"> Delete Transcription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Transcription </returns>
+    public static bool Delete(DeleteTranscriptionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a transcription from the account used to make the request
+    /// </summary>
+    /// <param name="options"> Delete Transcription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Transcription </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTranscriptionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a transcription from the account used to make the request
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Transcription </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteTranscriptionOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a transcription from the account used to make the request
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Transcription </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteTranscriptionOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadTranscriptionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Transcriptions.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of transcriptions belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Transcription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Transcription </returns>
+    public static ResourceSet<TranscriptionResource> Read(ReadTranscriptionOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
+      return new ResourceSet<TranscriptionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of transcriptions belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Transcription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Transcription </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TranscriptionResource>> ReadAsync(ReadTranscriptionOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
+      return new ResourceSet<TranscriptionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of transcriptions belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Transcription </returns>
+    public static ResourceSet<TranscriptionResource> Read(string pathAccountSid = null,
+                                                          int? pageSize = null,
+                                                          long? limit = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadTranscriptionOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of transcriptions belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Transcription </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TranscriptionResource>> ReadAsync(string pathAccountSid = null,
+                                                                                                  int? pageSize = null,
+                                                                                                  long? limit = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadTranscriptionOptions() { PathAccountSid = pathAccountSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TranscriptionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TranscriptionResource> NextPage(Page<TranscriptionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TranscriptionResource> PreviousPage(Page<TranscriptionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<TranscriptionResource>.FromJson("transcriptions", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a TranscriptionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TranscriptionResource object represented by the provided JSON </returns>
+    public static TranscriptionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TranscriptionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the transcription
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The duration of the transcribed audio in seconds.
+    /// </summary>
+    [JsonProperty("duration")]
+    public string Duration { get; private set; }
+    /// <summary>
+    /// The charge for the transcription
+    /// </summary>
+    [JsonProperty("price")]
+    public decimal? Price { get; private set; }
+    /// <summary>
+    /// The currency in which price is measured
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The SID that identifies the transcription's recording
+    /// </summary>
+    [JsonProperty("recording_sid")]
+    public string RecordingSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The status of the transcription
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TranscriptionResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The text content of the transcription.
+    /// </summary>
+    [JsonProperty("transcription_text")]
+    public string TranscriptionText { get; private set; }
+    /// <summary>
+    /// The transcription type
+    /// </summary>
+    [JsonProperty("type")]
+    public string Type { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private TranscriptionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/AllTimeOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/AllTimeOptions.cs
index 1d90802db..7b958772e 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/AllTimeOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/AllTimeOptions.cs
@@ -9,67 +9,67 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
+{
+
+  /// <summary>
+  /// ReadAllTimeOptions
+  /// </summary>
+  public class ReadAllTimeOptions : ReadOptions<AllTimeResource>
+  {
     /// <summary>
-    /// ReadAllTimeOptions
+    /// The SID of the Account that created the resources to read
     /// </summary>
-    public class ReadAllTimeOptions : ReadOptions<AllTimeResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The usage category of the UsageRecord resources to read
-        /// </summary>
-        public AllTimeResource.CategoryEnum Category { get; set; }
-        /// <summary>
-        /// Only include usage that has occurred on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Whether to include usage from the master account and all its subaccounts
-        /// </summary>
-        public bool? IncludeSubaccounts { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Category != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (IncludeSubaccounts != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The usage category of the UsageRecord resources to read
+    /// </summary>
+    public AllTimeResource.CategoryEnum Category { get; set; }
+    /// <summary>
+    /// Only include usage that has occurred on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Whether to include usage from the master account and all its subaccounts
+    /// </summary>
+    public bool? IncludeSubaccounts { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Category != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (IncludeSubaccounts != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/AllTimeResource.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/AllTimeResource.cs
index ef29d3f4e..be4829156 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/AllTimeResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/AllTimeResource.cs
@@ -17,509 +17,509 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
-    public class AllTimeResource : Resource
-    {
-        public sealed class CategoryEnum : StringEnum
-        {
-            private CategoryEnum(string value) : base(value) {}
-            public CategoryEnum() {}
-            public static implicit operator CategoryEnum(string value)
-            {
-                return new CategoryEnum(value);
-            }
-
-            public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
-            public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
-            public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
-            public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
-            public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
-            public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
-            public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
-            public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
-            public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
-            public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
-            public static readonly CategoryEnum Calls = new CategoryEnum("calls");
-            public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
-            public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
-            public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
-            public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
-            public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
-            public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
-            public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
-            public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
-            public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
-            public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
-            public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
-            public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
-            public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
-            public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
-            public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
-            public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
-            public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
-            public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
-            public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
-            public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
-            public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
-            public static readonly CategoryEnum Cps = new CategoryEnum("cps");
-            public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
-            public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
-            public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
-            public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
-            public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
-            public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
-            public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
-            public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
-            public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
-            public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
-            public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
-            public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
-            public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
-            public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
-            public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
-            public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
-            public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
-            public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
-            public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
-            public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
-            public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
-            public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
-            public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
-            public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
-            public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
-            public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
-            public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
-            public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
-            public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
-            public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
-            public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
-            public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
-            public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
-            public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
-            public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
-            public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
-            public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
-            public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
-            public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
-            public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
-            public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
-            public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
-            public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
-            public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
-            public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
-            public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
-            public static readonly CategoryEnum Mms = new CategoryEnum("mms");
-            public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
-            public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
-            public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
-            public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
-            public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
-            public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
-            public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
-            public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
-            public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
-            public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
-            public static readonly CategoryEnum Notify = new CategoryEnum("notify");
-            public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
-            public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
-            public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
-            public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
-            public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
-            public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
-            public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
-            public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
-            public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
-            public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
-            public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
-            public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
-            public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
-            public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
-            public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
-            public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
-            public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
-            public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
-            public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
-            public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
-            public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
-            public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
-            public static readonly CategoryEnum Pv = new CategoryEnum("pv");
-            public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
-            public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
-            public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
-            public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
-            public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
-            public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
-            public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
-            public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
-            public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
-            public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
-            public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
-            public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
-            public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
-            public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
-            public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
-            public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
-            public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
-            public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
-            public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
-            public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
-            public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
-            public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
-            public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
-            public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
-            public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
-            public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
-            public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
-            public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
-            public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
-            public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
-            public static readonly CategoryEnum Sms = new CategoryEnum("sms");
-            public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
-            public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
-            public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
-            public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
-            public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
-            public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
-            public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
-            public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
-            public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
-            public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
-            public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
-            public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
-            public static readonly CategoryEnum Sync = new CategoryEnum("sync");
-            public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
-            public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
-            public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
-            public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
-            public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
-            public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
-            public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
-            public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
-            public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
-            public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
-            public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
-            public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
-            public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
-            public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
-            public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
-            public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
-            public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
-            public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
-            public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
-            public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
-            public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
-            public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
-            public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
-            public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
-            public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
-            public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
-            public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
-            public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
-            public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
-            public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
-            public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
-            public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
-            public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
-            public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
-            public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
-            public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
-            public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
-            public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
-            public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
-            public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
-            public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
-            public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
-            public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
-            public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
-            public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
-            public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
-            public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
-            public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
-            public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
-            public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
-            public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
-            public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
-            public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
-            public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
-            public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
-            public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
-            public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
-            public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
-            public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
-            public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
-            public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
-            public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
-            public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
-            public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
-            public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
-        }
-
-        private static Request BuildReadRequest(ReadAllTimeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/AllTime.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read AllTime parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AllTime </returns>
-        public static ResourceSet<AllTimeResource> Read(ReadAllTimeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AllTimeResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<AllTimeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read AllTime parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AllTime </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AllTimeResource>> ReadAsync(ReadAllTimeOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AllTimeResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<AllTimeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AllTime </returns>
-        public static ResourceSet<AllTimeResource> Read(string pathAccountSid = null,
-                                                        AllTimeResource.CategoryEnum category = null,
-                                                        DateTime? startDate = null,
-                                                        DateTime? endDate = null,
-                                                        bool? includeSubaccounts = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadAllTimeOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AllTime </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AllTimeResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                AllTimeResource.CategoryEnum category = null,
-                                                                                                DateTime? startDate = null,
-                                                                                                DateTime? endDate = null,
-                                                                                                bool? includeSubaccounts = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadAllTimeOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AllTimeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AllTimeResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AllTimeResource> NextPage(Page<AllTimeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AllTimeResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AllTimeResource> PreviousPage(Page<AllTimeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AllTimeResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a AllTimeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AllTimeResource object represented by the provided JSON </returns>
-        public static AllTimeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AllTimeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account accrued the usage
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the resource
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Usage records up to date as of this timestamp
-        /// </summary>
-        [JsonProperty("as_of")]
-        public string AsOf { get; private set; }
-        /// <summary>
-        /// The category of usage
-        /// </summary>
-        [JsonProperty("category")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public AllTimeResource.CategoryEnum Category { get; private set; }
-        /// <summary>
-        /// The number of usage events
-        /// </summary>
-        [JsonProperty("count")]
-        public string Count { get; private set; }
-        /// <summary>
-        /// The units in which count is measured
-        /// </summary>
-        [JsonProperty("count_unit")]
-        public string CountUnit { get; private set; }
-        /// <summary>
-        /// A plain-language description of the usage category
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// The last date for which usage is included in the UsageRecord
-        /// </summary>
-        [JsonProperty("end_date")]
-        public DateTime? EndDate { get; private set; }
-        /// <summary>
-        /// The total price of the usage
-        /// </summary>
-        [JsonProperty("price")]
-        public decimal? Price { get; private set; }
-        /// <summary>
-        /// The currency in which `price` is measured
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The first date for which usage is included in this UsageRecord
-        /// </summary>
-        [JsonProperty("start_date")]
-        public DateTime? StartDate { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The amount of usage
-        /// </summary>
-        [JsonProperty("usage")]
-        public string Usage { get; private set; }
-        /// <summary>
-        /// The units in which usage is measured
-        /// </summary>
-        [JsonProperty("usage_unit")]
-        public string UsageUnit { get; private set; }
-
-        private AllTimeResource()
-        {
-
-        }
-    }
+{
+
+  public class AllTimeResource : Resource
+  {
+    public sealed class CategoryEnum : StringEnum
+    {
+      private CategoryEnum(string value) : base(value) { }
+      public CategoryEnum() { }
+      public static implicit operator CategoryEnum(string value)
+      {
+        return new CategoryEnum(value);
+      }
+
+      public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
+      public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
+      public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
+      public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
+      public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
+      public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
+      public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
+      public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
+      public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
+      public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
+      public static readonly CategoryEnum Calls = new CategoryEnum("calls");
+      public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
+      public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
+      public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
+      public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
+      public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
+      public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
+      public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
+      public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
+      public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
+      public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
+      public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
+      public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
+      public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
+      public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
+      public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
+      public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
+      public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
+      public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
+      public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
+      public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
+      public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
+      public static readonly CategoryEnum Cps = new CategoryEnum("cps");
+      public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
+      public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
+      public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
+      public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
+      public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
+      public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
+      public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
+      public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
+      public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
+      public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
+      public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
+      public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
+      public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
+      public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
+      public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
+      public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
+      public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
+      public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
+      public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
+      public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
+      public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
+      public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
+      public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
+      public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
+      public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
+      public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
+      public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
+      public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
+      public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
+      public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
+      public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
+      public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
+      public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
+      public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
+      public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
+      public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
+      public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
+      public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
+      public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
+      public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
+      public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
+      public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
+      public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
+      public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
+      public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
+      public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
+      public static readonly CategoryEnum Mms = new CategoryEnum("mms");
+      public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
+      public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
+      public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
+      public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
+      public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
+      public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
+      public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
+      public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
+      public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
+      public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
+      public static readonly CategoryEnum Notify = new CategoryEnum("notify");
+      public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
+      public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
+      public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
+      public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
+      public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
+      public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
+      public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
+      public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
+      public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
+      public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
+      public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
+      public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
+      public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
+      public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
+      public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
+      public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
+      public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
+      public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
+      public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
+      public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
+      public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
+      public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
+      public static readonly CategoryEnum Pv = new CategoryEnum("pv");
+      public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
+      public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
+      public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
+      public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
+      public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
+      public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
+      public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
+      public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
+      public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
+      public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
+      public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
+      public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
+      public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
+      public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
+      public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
+      public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
+      public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
+      public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
+      public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
+      public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
+      public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
+      public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
+      public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
+      public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
+      public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
+      public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
+      public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
+      public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
+      public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
+      public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
+      public static readonly CategoryEnum Sms = new CategoryEnum("sms");
+      public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
+      public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
+      public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
+      public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
+      public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
+      public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
+      public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
+      public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
+      public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
+      public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
+      public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
+      public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
+      public static readonly CategoryEnum Sync = new CategoryEnum("sync");
+      public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
+      public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
+      public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
+      public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
+      public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
+      public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
+      public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
+      public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
+      public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
+      public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
+      public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
+      public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
+      public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
+      public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
+      public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
+      public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
+      public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
+      public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
+      public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
+      public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
+      public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
+      public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
+      public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
+      public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
+      public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
+      public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
+      public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
+      public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
+      public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
+      public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
+      public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
+      public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
+      public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
+      public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
+      public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
+      public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
+      public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
+      public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
+      public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
+      public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
+      public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
+      public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
+      public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
+      public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
+      public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
+      public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
+      public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
+      public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
+      public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
+      public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
+      public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
+      public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
+      public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
+      public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
+      public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
+      public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
+      public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
+      public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
+      public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
+      public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
+      public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
+      public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
+      public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
+      public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
+      public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
+    }
+
+    private static Request BuildReadRequest(ReadAllTimeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/AllTime.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read AllTime parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AllTime </returns>
+    public static ResourceSet<AllTimeResource> Read(ReadAllTimeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AllTimeResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<AllTimeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read AllTime parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AllTime </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AllTimeResource>> ReadAsync(ReadAllTimeOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AllTimeResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<AllTimeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AllTime </returns>
+    public static ResourceSet<AllTimeResource> Read(string pathAccountSid = null,
+                                                    AllTimeResource.CategoryEnum category = null,
+                                                    DateTime? startDate = null,
+                                                    DateTime? endDate = null,
+                                                    bool? includeSubaccounts = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadAllTimeOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AllTime </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AllTimeResource>> ReadAsync(string pathAccountSid = null,
+                                                                                            AllTimeResource.CategoryEnum category = null,
+                                                                                            DateTime? startDate = null,
+                                                                                            DateTime? endDate = null,
+                                                                                            bool? includeSubaccounts = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadAllTimeOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AllTimeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AllTimeResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AllTimeResource> NextPage(Page<AllTimeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AllTimeResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AllTimeResource> PreviousPage(Page<AllTimeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AllTimeResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a AllTimeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AllTimeResource object represented by the provided JSON </returns>
+    public static AllTimeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AllTimeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account accrued the usage
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the resource
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Usage records up to date as of this timestamp
+    /// </summary>
+    [JsonProperty("as_of")]
+    public string AsOf { get; private set; }
+    /// <summary>
+    /// The category of usage
+    /// </summary>
+    [JsonProperty("category")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public AllTimeResource.CategoryEnum Category { get; private set; }
+    /// <summary>
+    /// The number of usage events
+    /// </summary>
+    [JsonProperty("count")]
+    public string Count { get; private set; }
+    /// <summary>
+    /// The units in which count is measured
+    /// </summary>
+    [JsonProperty("count_unit")]
+    public string CountUnit { get; private set; }
+    /// <summary>
+    /// A plain-language description of the usage category
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// The last date for which usage is included in the UsageRecord
+    /// </summary>
+    [JsonProperty("end_date")]
+    public DateTime? EndDate { get; private set; }
+    /// <summary>
+    /// The total price of the usage
+    /// </summary>
+    [JsonProperty("price")]
+    public decimal? Price { get; private set; }
+    /// <summary>
+    /// The currency in which `price` is measured
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The first date for which usage is included in this UsageRecord
+    /// </summary>
+    [JsonProperty("start_date")]
+    public DateTime? StartDate { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The amount of usage
+    /// </summary>
+    [JsonProperty("usage")]
+    public string Usage { get; private set; }
+    /// <summary>
+    /// The units in which usage is measured
+    /// </summary>
+    [JsonProperty("usage_unit")]
+    public string UsageUnit { get; private set; }
+
+    private AllTimeResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/DailyOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/DailyOptions.cs
index 0bbbdc3ec..7bebfd8c0 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/DailyOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/DailyOptions.cs
@@ -9,67 +9,67 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
+{
+
+  /// <summary>
+  /// ReadDailyOptions
+  /// </summary>
+  public class ReadDailyOptions : ReadOptions<DailyResource>
+  {
     /// <summary>
-    /// ReadDailyOptions
+    /// The SID of the Account that created the resources to read
     /// </summary>
-    public class ReadDailyOptions : ReadOptions<DailyResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The usage category of the UsageRecord resources to read
-        /// </summary>
-        public DailyResource.CategoryEnum Category { get; set; }
-        /// <summary>
-        /// Only include usage that has occurred on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Whether to include usage from the master account and all its subaccounts
-        /// </summary>
-        public bool? IncludeSubaccounts { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Category != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (IncludeSubaccounts != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The usage category of the UsageRecord resources to read
+    /// </summary>
+    public DailyResource.CategoryEnum Category { get; set; }
+    /// <summary>
+    /// Only include usage that has occurred on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Whether to include usage from the master account and all its subaccounts
+    /// </summary>
+    public bool? IncludeSubaccounts { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Category != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (IncludeSubaccounts != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/DailyResource.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/DailyResource.cs
index f73376cad..e1e9395dc 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/DailyResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/DailyResource.cs
@@ -17,509 +17,509 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
-    public class DailyResource : Resource
-    {
-        public sealed class CategoryEnum : StringEnum
-        {
-            private CategoryEnum(string value) : base(value) {}
-            public CategoryEnum() {}
-            public static implicit operator CategoryEnum(string value)
-            {
-                return new CategoryEnum(value);
-            }
-
-            public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
-            public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
-            public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
-            public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
-            public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
-            public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
-            public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
-            public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
-            public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
-            public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
-            public static readonly CategoryEnum Calls = new CategoryEnum("calls");
-            public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
-            public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
-            public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
-            public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
-            public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
-            public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
-            public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
-            public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
-            public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
-            public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
-            public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
-            public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
-            public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
-            public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
-            public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
-            public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
-            public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
-            public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
-            public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
-            public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
-            public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
-            public static readonly CategoryEnum Cps = new CategoryEnum("cps");
-            public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
-            public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
-            public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
-            public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
-            public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
-            public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
-            public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
-            public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
-            public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
-            public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
-            public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
-            public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
-            public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
-            public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
-            public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
-            public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
-            public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
-            public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
-            public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
-            public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
-            public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
-            public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
-            public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
-            public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
-            public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
-            public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
-            public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
-            public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
-            public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
-            public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
-            public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
-            public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
-            public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
-            public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
-            public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
-            public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
-            public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
-            public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
-            public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
-            public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
-            public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
-            public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
-            public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
-            public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
-            public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
-            public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
-            public static readonly CategoryEnum Mms = new CategoryEnum("mms");
-            public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
-            public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
-            public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
-            public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
-            public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
-            public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
-            public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
-            public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
-            public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
-            public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
-            public static readonly CategoryEnum Notify = new CategoryEnum("notify");
-            public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
-            public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
-            public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
-            public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
-            public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
-            public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
-            public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
-            public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
-            public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
-            public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
-            public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
-            public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
-            public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
-            public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
-            public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
-            public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
-            public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
-            public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
-            public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
-            public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
-            public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
-            public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
-            public static readonly CategoryEnum Pv = new CategoryEnum("pv");
-            public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
-            public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
-            public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
-            public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
-            public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
-            public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
-            public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
-            public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
-            public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
-            public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
-            public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
-            public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
-            public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
-            public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
-            public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
-            public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
-            public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
-            public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
-            public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
-            public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
-            public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
-            public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
-            public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
-            public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
-            public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
-            public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
-            public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
-            public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
-            public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
-            public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
-            public static readonly CategoryEnum Sms = new CategoryEnum("sms");
-            public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
-            public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
-            public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
-            public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
-            public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
-            public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
-            public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
-            public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
-            public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
-            public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
-            public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
-            public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
-            public static readonly CategoryEnum Sync = new CategoryEnum("sync");
-            public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
-            public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
-            public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
-            public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
-            public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
-            public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
-            public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
-            public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
-            public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
-            public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
-            public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
-            public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
-            public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
-            public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
-            public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
-            public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
-            public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
-            public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
-            public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
-            public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
-            public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
-            public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
-            public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
-            public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
-            public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
-            public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
-            public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
-            public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
-            public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
-            public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
-            public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
-            public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
-            public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
-            public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
-            public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
-            public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
-            public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
-            public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
-            public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
-            public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
-            public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
-            public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
-            public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
-            public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
-            public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
-            public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
-            public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
-            public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
-            public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
-            public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
-            public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
-            public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
-            public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
-            public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
-            public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
-            public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
-            public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
-            public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
-            public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
-            public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
-            public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
-            public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
-            public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
-            public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
-            public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
-        }
-
-        private static Request BuildReadRequest(ReadDailyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/Daily.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Daily parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Daily </returns>
-        public static ResourceSet<DailyResource> Read(ReadDailyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DailyResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<DailyResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Daily parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Daily </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DailyResource>> ReadAsync(ReadDailyOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DailyResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<DailyResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Daily </returns>
-        public static ResourceSet<DailyResource> Read(string pathAccountSid = null,
-                                                      DailyResource.CategoryEnum category = null,
-                                                      DateTime? startDate = null,
-                                                      DateTime? endDate = null,
-                                                      bool? includeSubaccounts = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadDailyOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Daily </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DailyResource>> ReadAsync(string pathAccountSid = null,
-                                                                                              DailyResource.CategoryEnum category = null,
-                                                                                              DateTime? startDate = null,
-                                                                                              DateTime? endDate = null,
-                                                                                              bool? includeSubaccounts = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadDailyOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DailyResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DailyResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DailyResource> NextPage(Page<DailyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<DailyResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DailyResource> PreviousPage(Page<DailyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<DailyResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a DailyResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DailyResource object represented by the provided JSON </returns>
-        public static DailyResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DailyResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account accrued the usage
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the resource
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Usage records up to date as of this timestamp
-        /// </summary>
-        [JsonProperty("as_of")]
-        public string AsOf { get; private set; }
-        /// <summary>
-        /// The category of usage
-        /// </summary>
-        [JsonProperty("category")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public DailyResource.CategoryEnum Category { get; private set; }
-        /// <summary>
-        /// The number of usage events
-        /// </summary>
-        [JsonProperty("count")]
-        public string Count { get; private set; }
-        /// <summary>
-        /// The units in which count is measured
-        /// </summary>
-        [JsonProperty("count_unit")]
-        public string CountUnit { get; private set; }
-        /// <summary>
-        /// A plain-language description of the usage category
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// The last date for which usage is included in the UsageRecord
-        /// </summary>
-        [JsonProperty("end_date")]
-        public DateTime? EndDate { get; private set; }
-        /// <summary>
-        /// The total price of the usage
-        /// </summary>
-        [JsonProperty("price")]
-        public decimal? Price { get; private set; }
-        /// <summary>
-        /// The currency in which `price` is measured
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The first date for which usage is included in this UsageRecord
-        /// </summary>
-        [JsonProperty("start_date")]
-        public DateTime? StartDate { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The amount of usage
-        /// </summary>
-        [JsonProperty("usage")]
-        public string Usage { get; private set; }
-        /// <summary>
-        /// The units in which usage is measured
-        /// </summary>
-        [JsonProperty("usage_unit")]
-        public string UsageUnit { get; private set; }
-
-        private DailyResource()
-        {
-
-        }
-    }
+{
+
+  public class DailyResource : Resource
+  {
+    public sealed class CategoryEnum : StringEnum
+    {
+      private CategoryEnum(string value) : base(value) { }
+      public CategoryEnum() { }
+      public static implicit operator CategoryEnum(string value)
+      {
+        return new CategoryEnum(value);
+      }
+
+      public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
+      public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
+      public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
+      public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
+      public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
+      public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
+      public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
+      public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
+      public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
+      public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
+      public static readonly CategoryEnum Calls = new CategoryEnum("calls");
+      public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
+      public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
+      public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
+      public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
+      public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
+      public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
+      public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
+      public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
+      public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
+      public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
+      public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
+      public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
+      public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
+      public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
+      public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
+      public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
+      public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
+      public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
+      public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
+      public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
+      public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
+      public static readonly CategoryEnum Cps = new CategoryEnum("cps");
+      public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
+      public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
+      public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
+      public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
+      public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
+      public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
+      public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
+      public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
+      public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
+      public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
+      public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
+      public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
+      public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
+      public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
+      public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
+      public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
+      public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
+      public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
+      public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
+      public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
+      public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
+      public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
+      public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
+      public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
+      public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
+      public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
+      public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
+      public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
+      public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
+      public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
+      public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
+      public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
+      public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
+      public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
+      public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
+      public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
+      public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
+      public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
+      public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
+      public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
+      public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
+      public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
+      public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
+      public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
+      public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
+      public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
+      public static readonly CategoryEnum Mms = new CategoryEnum("mms");
+      public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
+      public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
+      public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
+      public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
+      public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
+      public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
+      public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
+      public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
+      public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
+      public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
+      public static readonly CategoryEnum Notify = new CategoryEnum("notify");
+      public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
+      public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
+      public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
+      public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
+      public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
+      public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
+      public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
+      public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
+      public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
+      public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
+      public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
+      public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
+      public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
+      public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
+      public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
+      public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
+      public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
+      public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
+      public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
+      public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
+      public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
+      public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
+      public static readonly CategoryEnum Pv = new CategoryEnum("pv");
+      public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
+      public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
+      public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
+      public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
+      public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
+      public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
+      public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
+      public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
+      public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
+      public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
+      public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
+      public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
+      public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
+      public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
+      public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
+      public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
+      public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
+      public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
+      public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
+      public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
+      public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
+      public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
+      public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
+      public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
+      public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
+      public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
+      public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
+      public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
+      public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
+      public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
+      public static readonly CategoryEnum Sms = new CategoryEnum("sms");
+      public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
+      public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
+      public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
+      public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
+      public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
+      public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
+      public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
+      public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
+      public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
+      public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
+      public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
+      public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
+      public static readonly CategoryEnum Sync = new CategoryEnum("sync");
+      public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
+      public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
+      public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
+      public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
+      public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
+      public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
+      public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
+      public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
+      public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
+      public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
+      public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
+      public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
+      public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
+      public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
+      public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
+      public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
+      public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
+      public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
+      public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
+      public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
+      public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
+      public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
+      public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
+      public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
+      public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
+      public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
+      public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
+      public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
+      public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
+      public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
+      public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
+      public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
+      public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
+      public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
+      public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
+      public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
+      public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
+      public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
+      public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
+      public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
+      public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
+      public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
+      public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
+      public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
+      public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
+      public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
+      public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
+      public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
+      public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
+      public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
+      public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
+      public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
+      public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
+      public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
+      public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
+      public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
+      public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
+      public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
+      public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
+      public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
+      public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
+      public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
+      public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
+      public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
+      public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
+    }
+
+    private static Request BuildReadRequest(ReadDailyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/Daily.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Daily parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Daily </returns>
+    public static ResourceSet<DailyResource> Read(ReadDailyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DailyResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<DailyResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Daily parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Daily </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DailyResource>> ReadAsync(ReadDailyOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DailyResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<DailyResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Daily </returns>
+    public static ResourceSet<DailyResource> Read(string pathAccountSid = null,
+                                                  DailyResource.CategoryEnum category = null,
+                                                  DateTime? startDate = null,
+                                                  DateTime? endDate = null,
+                                                  bool? includeSubaccounts = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadDailyOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Daily </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DailyResource>> ReadAsync(string pathAccountSid = null,
+                                                                                          DailyResource.CategoryEnum category = null,
+                                                                                          DateTime? startDate = null,
+                                                                                          DateTime? endDate = null,
+                                                                                          bool? includeSubaccounts = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadDailyOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DailyResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DailyResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DailyResource> NextPage(Page<DailyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<DailyResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DailyResource> PreviousPage(Page<DailyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<DailyResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a DailyResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DailyResource object represented by the provided JSON </returns>
+    public static DailyResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DailyResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account accrued the usage
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the resource
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Usage records up to date as of this timestamp
+    /// </summary>
+    [JsonProperty("as_of")]
+    public string AsOf { get; private set; }
+    /// <summary>
+    /// The category of usage
+    /// </summary>
+    [JsonProperty("category")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public DailyResource.CategoryEnum Category { get; private set; }
+    /// <summary>
+    /// The number of usage events
+    /// </summary>
+    [JsonProperty("count")]
+    public string Count { get; private set; }
+    /// <summary>
+    /// The units in which count is measured
+    /// </summary>
+    [JsonProperty("count_unit")]
+    public string CountUnit { get; private set; }
+    /// <summary>
+    /// A plain-language description of the usage category
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// The last date for which usage is included in the UsageRecord
+    /// </summary>
+    [JsonProperty("end_date")]
+    public DateTime? EndDate { get; private set; }
+    /// <summary>
+    /// The total price of the usage
+    /// </summary>
+    [JsonProperty("price")]
+    public decimal? Price { get; private set; }
+    /// <summary>
+    /// The currency in which `price` is measured
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The first date for which usage is included in this UsageRecord
+    /// </summary>
+    [JsonProperty("start_date")]
+    public DateTime? StartDate { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The amount of usage
+    /// </summary>
+    [JsonProperty("usage")]
+    public string Usage { get; private set; }
+    /// <summary>
+    /// The units in which usage is measured
+    /// </summary>
+    [JsonProperty("usage_unit")]
+    public string UsageUnit { get; private set; }
+
+    private DailyResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/LastMonthOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/LastMonthOptions.cs
index acdf15e7a..112169f86 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/LastMonthOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/LastMonthOptions.cs
@@ -9,67 +9,67 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
+{
+
+  /// <summary>
+  /// ReadLastMonthOptions
+  /// </summary>
+  public class ReadLastMonthOptions : ReadOptions<LastMonthResource>
+  {
     /// <summary>
-    /// ReadLastMonthOptions
+    /// The SID of the Account that created the resources to read
     /// </summary>
-    public class ReadLastMonthOptions : ReadOptions<LastMonthResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The usage category of the UsageRecord resources to read
-        /// </summary>
-        public LastMonthResource.CategoryEnum Category { get; set; }
-        /// <summary>
-        /// Only include usage that has occurred on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Whether to include usage from the master account and all its subaccounts
-        /// </summary>
-        public bool? IncludeSubaccounts { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Category != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (IncludeSubaccounts != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The usage category of the UsageRecord resources to read
+    /// </summary>
+    public LastMonthResource.CategoryEnum Category { get; set; }
+    /// <summary>
+    /// Only include usage that has occurred on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Whether to include usage from the master account and all its subaccounts
+    /// </summary>
+    public bool? IncludeSubaccounts { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Category != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (IncludeSubaccounts != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/LastMonthResource.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/LastMonthResource.cs
index e1723a3fb..c54ca22d3 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/LastMonthResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/LastMonthResource.cs
@@ -17,509 +17,509 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
-    public class LastMonthResource : Resource
-    {
-        public sealed class CategoryEnum : StringEnum
-        {
-            private CategoryEnum(string value) : base(value) {}
-            public CategoryEnum() {}
-            public static implicit operator CategoryEnum(string value)
-            {
-                return new CategoryEnum(value);
-            }
-
-            public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
-            public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
-            public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
-            public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
-            public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
-            public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
-            public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
-            public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
-            public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
-            public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
-            public static readonly CategoryEnum Calls = new CategoryEnum("calls");
-            public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
-            public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
-            public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
-            public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
-            public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
-            public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
-            public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
-            public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
-            public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
-            public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
-            public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
-            public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
-            public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
-            public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
-            public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
-            public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
-            public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
-            public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
-            public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
-            public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
-            public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
-            public static readonly CategoryEnum Cps = new CategoryEnum("cps");
-            public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
-            public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
-            public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
-            public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
-            public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
-            public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
-            public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
-            public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
-            public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
-            public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
-            public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
-            public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
-            public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
-            public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
-            public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
-            public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
-            public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
-            public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
-            public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
-            public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
-            public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
-            public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
-            public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
-            public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
-            public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
-            public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
-            public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
-            public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
-            public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
-            public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
-            public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
-            public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
-            public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
-            public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
-            public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
-            public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
-            public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
-            public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
-            public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
-            public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
-            public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
-            public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
-            public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
-            public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
-            public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
-            public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
-            public static readonly CategoryEnum Mms = new CategoryEnum("mms");
-            public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
-            public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
-            public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
-            public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
-            public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
-            public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
-            public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
-            public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
-            public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
-            public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
-            public static readonly CategoryEnum Notify = new CategoryEnum("notify");
-            public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
-            public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
-            public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
-            public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
-            public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
-            public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
-            public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
-            public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
-            public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
-            public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
-            public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
-            public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
-            public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
-            public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
-            public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
-            public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
-            public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
-            public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
-            public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
-            public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
-            public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
-            public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
-            public static readonly CategoryEnum Pv = new CategoryEnum("pv");
-            public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
-            public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
-            public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
-            public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
-            public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
-            public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
-            public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
-            public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
-            public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
-            public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
-            public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
-            public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
-            public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
-            public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
-            public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
-            public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
-            public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
-            public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
-            public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
-            public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
-            public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
-            public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
-            public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
-            public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
-            public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
-            public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
-            public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
-            public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
-            public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
-            public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
-            public static readonly CategoryEnum Sms = new CategoryEnum("sms");
-            public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
-            public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
-            public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
-            public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
-            public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
-            public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
-            public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
-            public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
-            public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
-            public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
-            public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
-            public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
-            public static readonly CategoryEnum Sync = new CategoryEnum("sync");
-            public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
-            public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
-            public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
-            public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
-            public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
-            public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
-            public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
-            public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
-            public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
-            public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
-            public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
-            public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
-            public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
-            public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
-            public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
-            public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
-            public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
-            public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
-            public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
-            public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
-            public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
-            public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
-            public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
-            public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
-            public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
-            public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
-            public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
-            public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
-            public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
-            public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
-            public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
-            public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
-            public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
-            public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
-            public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
-            public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
-            public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
-            public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
-            public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
-            public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
-            public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
-            public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
-            public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
-            public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
-            public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
-            public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
-            public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
-            public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
-            public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
-            public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
-            public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
-            public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
-            public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
-            public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
-            public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
-            public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
-            public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
-            public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
-            public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
-            public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
-            public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
-            public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
-            public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
-            public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
-            public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
-        }
-
-        private static Request BuildReadRequest(ReadLastMonthOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/LastMonth.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read LastMonth parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of LastMonth </returns>
-        public static ResourceSet<LastMonthResource> Read(ReadLastMonthOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<LastMonthResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<LastMonthResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read LastMonth parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of LastMonth </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<LastMonthResource>> ReadAsync(ReadLastMonthOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<LastMonthResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<LastMonthResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of LastMonth </returns>
-        public static ResourceSet<LastMonthResource> Read(string pathAccountSid = null,
-                                                          LastMonthResource.CategoryEnum category = null,
-                                                          DateTime? startDate = null,
-                                                          DateTime? endDate = null,
-                                                          bool? includeSubaccounts = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadLastMonthOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of LastMonth </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<LastMonthResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                  LastMonthResource.CategoryEnum category = null,
-                                                                                                  DateTime? startDate = null,
-                                                                                                  DateTime? endDate = null,
-                                                                                                  bool? includeSubaccounts = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadLastMonthOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<LastMonthResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<LastMonthResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<LastMonthResource> NextPage(Page<LastMonthResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<LastMonthResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<LastMonthResource> PreviousPage(Page<LastMonthResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<LastMonthResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a LastMonthResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> LastMonthResource object represented by the provided JSON </returns>
-        public static LastMonthResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<LastMonthResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account accrued the usage
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the resource
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Usage records up to date as of this timestamp
-        /// </summary>
-        [JsonProperty("as_of")]
-        public string AsOf { get; private set; }
-        /// <summary>
-        /// The category of usage
-        /// </summary>
-        [JsonProperty("category")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public LastMonthResource.CategoryEnum Category { get; private set; }
-        /// <summary>
-        /// The number of usage events
-        /// </summary>
-        [JsonProperty("count")]
-        public string Count { get; private set; }
-        /// <summary>
-        /// The units in which count is measured
-        /// </summary>
-        [JsonProperty("count_unit")]
-        public string CountUnit { get; private set; }
-        /// <summary>
-        /// A plain-language description of the usage category
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// The last date for which usage is included in the UsageRecord
-        /// </summary>
-        [JsonProperty("end_date")]
-        public DateTime? EndDate { get; private set; }
-        /// <summary>
-        /// The total price of the usage
-        /// </summary>
-        [JsonProperty("price")]
-        public decimal? Price { get; private set; }
-        /// <summary>
-        /// The currency in which `price` is measured
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The first date for which usage is included in this UsageRecord
-        /// </summary>
-        [JsonProperty("start_date")]
-        public DateTime? StartDate { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The amount of usage
-        /// </summary>
-        [JsonProperty("usage")]
-        public string Usage { get; private set; }
-        /// <summary>
-        /// The units in which usage is measured
-        /// </summary>
-        [JsonProperty("usage_unit")]
-        public string UsageUnit { get; private set; }
-
-        private LastMonthResource()
-        {
-
-        }
-    }
+{
+
+  public class LastMonthResource : Resource
+  {
+    public sealed class CategoryEnum : StringEnum
+    {
+      private CategoryEnum(string value) : base(value) { }
+      public CategoryEnum() { }
+      public static implicit operator CategoryEnum(string value)
+      {
+        return new CategoryEnum(value);
+      }
+
+      public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
+      public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
+      public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
+      public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
+      public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
+      public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
+      public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
+      public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
+      public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
+      public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
+      public static readonly CategoryEnum Calls = new CategoryEnum("calls");
+      public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
+      public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
+      public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
+      public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
+      public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
+      public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
+      public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
+      public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
+      public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
+      public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
+      public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
+      public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
+      public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
+      public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
+      public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
+      public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
+      public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
+      public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
+      public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
+      public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
+      public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
+      public static readonly CategoryEnum Cps = new CategoryEnum("cps");
+      public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
+      public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
+      public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
+      public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
+      public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
+      public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
+      public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
+      public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
+      public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
+      public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
+      public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
+      public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
+      public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
+      public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
+      public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
+      public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
+      public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
+      public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
+      public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
+      public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
+      public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
+      public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
+      public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
+      public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
+      public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
+      public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
+      public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
+      public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
+      public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
+      public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
+      public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
+      public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
+      public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
+      public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
+      public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
+      public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
+      public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
+      public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
+      public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
+      public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
+      public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
+      public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
+      public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
+      public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
+      public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
+      public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
+      public static readonly CategoryEnum Mms = new CategoryEnum("mms");
+      public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
+      public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
+      public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
+      public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
+      public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
+      public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
+      public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
+      public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
+      public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
+      public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
+      public static readonly CategoryEnum Notify = new CategoryEnum("notify");
+      public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
+      public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
+      public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
+      public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
+      public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
+      public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
+      public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
+      public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
+      public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
+      public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
+      public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
+      public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
+      public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
+      public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
+      public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
+      public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
+      public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
+      public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
+      public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
+      public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
+      public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
+      public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
+      public static readonly CategoryEnum Pv = new CategoryEnum("pv");
+      public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
+      public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
+      public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
+      public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
+      public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
+      public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
+      public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
+      public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
+      public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
+      public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
+      public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
+      public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
+      public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
+      public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
+      public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
+      public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
+      public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
+      public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
+      public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
+      public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
+      public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
+      public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
+      public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
+      public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
+      public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
+      public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
+      public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
+      public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
+      public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
+      public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
+      public static readonly CategoryEnum Sms = new CategoryEnum("sms");
+      public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
+      public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
+      public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
+      public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
+      public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
+      public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
+      public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
+      public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
+      public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
+      public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
+      public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
+      public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
+      public static readonly CategoryEnum Sync = new CategoryEnum("sync");
+      public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
+      public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
+      public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
+      public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
+      public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
+      public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
+      public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
+      public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
+      public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
+      public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
+      public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
+      public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
+      public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
+      public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
+      public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
+      public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
+      public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
+      public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
+      public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
+      public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
+      public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
+      public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
+      public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
+      public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
+      public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
+      public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
+      public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
+      public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
+      public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
+      public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
+      public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
+      public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
+      public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
+      public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
+      public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
+      public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
+      public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
+      public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
+      public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
+      public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
+      public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
+      public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
+      public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
+      public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
+      public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
+      public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
+      public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
+      public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
+      public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
+      public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
+      public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
+      public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
+      public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
+      public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
+      public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
+      public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
+      public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
+      public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
+      public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
+      public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
+      public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
+      public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
+      public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
+      public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
+      public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
+    }
+
+    private static Request BuildReadRequest(ReadLastMonthOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/LastMonth.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read LastMonth parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of LastMonth </returns>
+    public static ResourceSet<LastMonthResource> Read(ReadLastMonthOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<LastMonthResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<LastMonthResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read LastMonth parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of LastMonth </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<LastMonthResource>> ReadAsync(ReadLastMonthOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<LastMonthResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<LastMonthResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of LastMonth </returns>
+    public static ResourceSet<LastMonthResource> Read(string pathAccountSid = null,
+                                                      LastMonthResource.CategoryEnum category = null,
+                                                      DateTime? startDate = null,
+                                                      DateTime? endDate = null,
+                                                      bool? includeSubaccounts = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadLastMonthOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of LastMonth </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<LastMonthResource>> ReadAsync(string pathAccountSid = null,
+                                                                                              LastMonthResource.CategoryEnum category = null,
+                                                                                              DateTime? startDate = null,
+                                                                                              DateTime? endDate = null,
+                                                                                              bool? includeSubaccounts = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadLastMonthOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<LastMonthResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<LastMonthResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<LastMonthResource> NextPage(Page<LastMonthResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<LastMonthResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<LastMonthResource> PreviousPage(Page<LastMonthResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<LastMonthResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a LastMonthResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> LastMonthResource object represented by the provided JSON </returns>
+    public static LastMonthResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<LastMonthResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account accrued the usage
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the resource
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Usage records up to date as of this timestamp
+    /// </summary>
+    [JsonProperty("as_of")]
+    public string AsOf { get; private set; }
+    /// <summary>
+    /// The category of usage
+    /// </summary>
+    [JsonProperty("category")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public LastMonthResource.CategoryEnum Category { get; private set; }
+    /// <summary>
+    /// The number of usage events
+    /// </summary>
+    [JsonProperty("count")]
+    public string Count { get; private set; }
+    /// <summary>
+    /// The units in which count is measured
+    /// </summary>
+    [JsonProperty("count_unit")]
+    public string CountUnit { get; private set; }
+    /// <summary>
+    /// A plain-language description of the usage category
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// The last date for which usage is included in the UsageRecord
+    /// </summary>
+    [JsonProperty("end_date")]
+    public DateTime? EndDate { get; private set; }
+    /// <summary>
+    /// The total price of the usage
+    /// </summary>
+    [JsonProperty("price")]
+    public decimal? Price { get; private set; }
+    /// <summary>
+    /// The currency in which `price` is measured
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The first date for which usage is included in this UsageRecord
+    /// </summary>
+    [JsonProperty("start_date")]
+    public DateTime? StartDate { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The amount of usage
+    /// </summary>
+    [JsonProperty("usage")]
+    public string Usage { get; private set; }
+    /// <summary>
+    /// The units in which usage is measured
+    /// </summary>
+    [JsonProperty("usage_unit")]
+    public string UsageUnit { get; private set; }
+
+    private LastMonthResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/MonthlyOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/MonthlyOptions.cs
index d4f798a59..a09c2d825 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/MonthlyOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/MonthlyOptions.cs
@@ -9,67 +9,67 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
+{
+
+  /// <summary>
+  /// ReadMonthlyOptions
+  /// </summary>
+  public class ReadMonthlyOptions : ReadOptions<MonthlyResource>
+  {
     /// <summary>
-    /// ReadMonthlyOptions
+    /// The SID of the Account that created the resources to read
     /// </summary>
-    public class ReadMonthlyOptions : ReadOptions<MonthlyResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The usage category of the UsageRecord resources to read
-        /// </summary>
-        public MonthlyResource.CategoryEnum Category { get; set; }
-        /// <summary>
-        /// Only include usage that has occurred on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Whether to include usage from the master account and all its subaccounts
-        /// </summary>
-        public bool? IncludeSubaccounts { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Category != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (IncludeSubaccounts != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The usage category of the UsageRecord resources to read
+    /// </summary>
+    public MonthlyResource.CategoryEnum Category { get; set; }
+    /// <summary>
+    /// Only include usage that has occurred on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Whether to include usage from the master account and all its subaccounts
+    /// </summary>
+    public bool? IncludeSubaccounts { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Category != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (IncludeSubaccounts != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/MonthlyResource.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/MonthlyResource.cs
index 97a49f4e7..1202881f9 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/MonthlyResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/MonthlyResource.cs
@@ -17,509 +17,509 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
-    public class MonthlyResource : Resource
-    {
-        public sealed class CategoryEnum : StringEnum
-        {
-            private CategoryEnum(string value) : base(value) {}
-            public CategoryEnum() {}
-            public static implicit operator CategoryEnum(string value)
-            {
-                return new CategoryEnum(value);
-            }
-
-            public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
-            public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
-            public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
-            public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
-            public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
-            public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
-            public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
-            public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
-            public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
-            public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
-            public static readonly CategoryEnum Calls = new CategoryEnum("calls");
-            public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
-            public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
-            public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
-            public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
-            public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
-            public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
-            public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
-            public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
-            public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
-            public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
-            public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
-            public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
-            public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
-            public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
-            public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
-            public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
-            public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
-            public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
-            public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
-            public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
-            public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
-            public static readonly CategoryEnum Cps = new CategoryEnum("cps");
-            public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
-            public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
-            public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
-            public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
-            public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
-            public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
-            public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
-            public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
-            public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
-            public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
-            public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
-            public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
-            public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
-            public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
-            public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
-            public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
-            public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
-            public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
-            public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
-            public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
-            public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
-            public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
-            public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
-            public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
-            public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
-            public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
-            public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
-            public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
-            public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
-            public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
-            public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
-            public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
-            public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
-            public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
-            public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
-            public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
-            public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
-            public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
-            public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
-            public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
-            public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
-            public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
-            public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
-            public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
-            public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
-            public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
-            public static readonly CategoryEnum Mms = new CategoryEnum("mms");
-            public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
-            public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
-            public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
-            public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
-            public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
-            public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
-            public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
-            public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
-            public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
-            public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
-            public static readonly CategoryEnum Notify = new CategoryEnum("notify");
-            public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
-            public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
-            public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
-            public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
-            public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
-            public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
-            public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
-            public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
-            public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
-            public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
-            public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
-            public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
-            public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
-            public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
-            public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
-            public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
-            public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
-            public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
-            public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
-            public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
-            public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
-            public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
-            public static readonly CategoryEnum Pv = new CategoryEnum("pv");
-            public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
-            public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
-            public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
-            public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
-            public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
-            public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
-            public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
-            public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
-            public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
-            public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
-            public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
-            public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
-            public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
-            public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
-            public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
-            public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
-            public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
-            public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
-            public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
-            public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
-            public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
-            public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
-            public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
-            public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
-            public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
-            public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
-            public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
-            public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
-            public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
-            public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
-            public static readonly CategoryEnum Sms = new CategoryEnum("sms");
-            public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
-            public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
-            public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
-            public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
-            public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
-            public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
-            public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
-            public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
-            public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
-            public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
-            public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
-            public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
-            public static readonly CategoryEnum Sync = new CategoryEnum("sync");
-            public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
-            public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
-            public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
-            public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
-            public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
-            public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
-            public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
-            public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
-            public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
-            public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
-            public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
-            public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
-            public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
-            public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
-            public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
-            public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
-            public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
-            public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
-            public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
-            public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
-            public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
-            public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
-            public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
-            public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
-            public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
-            public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
-            public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
-            public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
-            public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
-            public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
-            public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
-            public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
-            public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
-            public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
-            public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
-            public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
-            public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
-            public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
-            public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
-            public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
-            public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
-            public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
-            public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
-            public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
-            public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
-            public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
-            public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
-            public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
-            public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
-            public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
-            public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
-            public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
-            public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
-            public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
-            public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
-            public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
-            public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
-            public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
-            public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
-            public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
-            public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
-            public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
-            public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
-            public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
-            public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
-        }
-
-        private static Request BuildReadRequest(ReadMonthlyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/Monthly.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Monthly parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Monthly </returns>
-        public static ResourceSet<MonthlyResource> Read(ReadMonthlyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MonthlyResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<MonthlyResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Monthly parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Monthly </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MonthlyResource>> ReadAsync(ReadMonthlyOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MonthlyResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<MonthlyResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Monthly </returns>
-        public static ResourceSet<MonthlyResource> Read(string pathAccountSid = null,
-                                                        MonthlyResource.CategoryEnum category = null,
-                                                        DateTime? startDate = null,
-                                                        DateTime? endDate = null,
-                                                        bool? includeSubaccounts = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadMonthlyOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Monthly </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MonthlyResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                MonthlyResource.CategoryEnum category = null,
-                                                                                                DateTime? startDate = null,
-                                                                                                DateTime? endDate = null,
-                                                                                                bool? includeSubaccounts = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadMonthlyOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MonthlyResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MonthlyResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MonthlyResource> NextPage(Page<MonthlyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MonthlyResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MonthlyResource> PreviousPage(Page<MonthlyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<MonthlyResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a MonthlyResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MonthlyResource object represented by the provided JSON </returns>
-        public static MonthlyResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MonthlyResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account accrued the usage
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the resource
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Usage records up to date as of this timestamp
-        /// </summary>
-        [JsonProperty("as_of")]
-        public string AsOf { get; private set; }
-        /// <summary>
-        /// The category of usage
-        /// </summary>
-        [JsonProperty("category")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public MonthlyResource.CategoryEnum Category { get; private set; }
-        /// <summary>
-        /// The number of usage events
-        /// </summary>
-        [JsonProperty("count")]
-        public string Count { get; private set; }
-        /// <summary>
-        /// The units in which count is measured
-        /// </summary>
-        [JsonProperty("count_unit")]
-        public string CountUnit { get; private set; }
-        /// <summary>
-        /// A plain-language description of the usage category
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// The last date for which usage is included in the UsageRecord
-        /// </summary>
-        [JsonProperty("end_date")]
-        public DateTime? EndDate { get; private set; }
-        /// <summary>
-        /// The total price of the usage
-        /// </summary>
-        [JsonProperty("price")]
-        public decimal? Price { get; private set; }
-        /// <summary>
-        /// The currency in which `price` is measured
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The first date for which usage is included in this UsageRecord
-        /// </summary>
-        [JsonProperty("start_date")]
-        public DateTime? StartDate { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The amount of usage
-        /// </summary>
-        [JsonProperty("usage")]
-        public string Usage { get; private set; }
-        /// <summary>
-        /// The units in which usage is measured
-        /// </summary>
-        [JsonProperty("usage_unit")]
-        public string UsageUnit { get; private set; }
-
-        private MonthlyResource()
-        {
-
-        }
-    }
+{
+
+  public class MonthlyResource : Resource
+  {
+    public sealed class CategoryEnum : StringEnum
+    {
+      private CategoryEnum(string value) : base(value) { }
+      public CategoryEnum() { }
+      public static implicit operator CategoryEnum(string value)
+      {
+        return new CategoryEnum(value);
+      }
+
+      public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
+      public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
+      public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
+      public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
+      public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
+      public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
+      public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
+      public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
+      public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
+      public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
+      public static readonly CategoryEnum Calls = new CategoryEnum("calls");
+      public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
+      public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
+      public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
+      public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
+      public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
+      public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
+      public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
+      public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
+      public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
+      public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
+      public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
+      public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
+      public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
+      public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
+      public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
+      public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
+      public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
+      public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
+      public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
+      public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
+      public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
+      public static readonly CategoryEnum Cps = new CategoryEnum("cps");
+      public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
+      public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
+      public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
+      public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
+      public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
+      public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
+      public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
+      public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
+      public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
+      public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
+      public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
+      public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
+      public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
+      public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
+      public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
+      public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
+      public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
+      public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
+      public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
+      public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
+      public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
+      public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
+      public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
+      public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
+      public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
+      public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
+      public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
+      public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
+      public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
+      public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
+      public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
+      public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
+      public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
+      public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
+      public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
+      public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
+      public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
+      public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
+      public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
+      public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
+      public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
+      public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
+      public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
+      public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
+      public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
+      public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
+      public static readonly CategoryEnum Mms = new CategoryEnum("mms");
+      public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
+      public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
+      public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
+      public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
+      public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
+      public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
+      public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
+      public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
+      public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
+      public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
+      public static readonly CategoryEnum Notify = new CategoryEnum("notify");
+      public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
+      public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
+      public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
+      public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
+      public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
+      public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
+      public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
+      public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
+      public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
+      public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
+      public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
+      public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
+      public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
+      public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
+      public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
+      public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
+      public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
+      public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
+      public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
+      public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
+      public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
+      public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
+      public static readonly CategoryEnum Pv = new CategoryEnum("pv");
+      public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
+      public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
+      public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
+      public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
+      public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
+      public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
+      public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
+      public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
+      public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
+      public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
+      public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
+      public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
+      public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
+      public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
+      public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
+      public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
+      public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
+      public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
+      public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
+      public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
+      public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
+      public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
+      public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
+      public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
+      public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
+      public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
+      public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
+      public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
+      public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
+      public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
+      public static readonly CategoryEnum Sms = new CategoryEnum("sms");
+      public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
+      public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
+      public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
+      public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
+      public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
+      public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
+      public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
+      public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
+      public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
+      public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
+      public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
+      public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
+      public static readonly CategoryEnum Sync = new CategoryEnum("sync");
+      public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
+      public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
+      public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
+      public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
+      public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
+      public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
+      public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
+      public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
+      public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
+      public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
+      public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
+      public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
+      public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
+      public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
+      public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
+      public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
+      public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
+      public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
+      public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
+      public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
+      public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
+      public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
+      public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
+      public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
+      public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
+      public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
+      public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
+      public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
+      public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
+      public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
+      public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
+      public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
+      public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
+      public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
+      public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
+      public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
+      public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
+      public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
+      public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
+      public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
+      public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
+      public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
+      public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
+      public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
+      public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
+      public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
+      public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
+      public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
+      public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
+      public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
+      public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
+      public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
+      public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
+      public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
+      public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
+      public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
+      public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
+      public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
+      public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
+      public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
+      public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
+      public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
+      public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
+      public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
+      public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
+    }
+
+    private static Request BuildReadRequest(ReadMonthlyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/Monthly.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Monthly parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Monthly </returns>
+    public static ResourceSet<MonthlyResource> Read(ReadMonthlyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MonthlyResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<MonthlyResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Monthly parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Monthly </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MonthlyResource>> ReadAsync(ReadMonthlyOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MonthlyResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<MonthlyResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Monthly </returns>
+    public static ResourceSet<MonthlyResource> Read(string pathAccountSid = null,
+                                                    MonthlyResource.CategoryEnum category = null,
+                                                    DateTime? startDate = null,
+                                                    DateTime? endDate = null,
+                                                    bool? includeSubaccounts = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadMonthlyOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Monthly </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MonthlyResource>> ReadAsync(string pathAccountSid = null,
+                                                                                            MonthlyResource.CategoryEnum category = null,
+                                                                                            DateTime? startDate = null,
+                                                                                            DateTime? endDate = null,
+                                                                                            bool? includeSubaccounts = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadMonthlyOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MonthlyResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MonthlyResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MonthlyResource> NextPage(Page<MonthlyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MonthlyResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MonthlyResource> PreviousPage(Page<MonthlyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<MonthlyResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a MonthlyResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MonthlyResource object represented by the provided JSON </returns>
+    public static MonthlyResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MonthlyResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account accrued the usage
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the resource
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Usage records up to date as of this timestamp
+    /// </summary>
+    [JsonProperty("as_of")]
+    public string AsOf { get; private set; }
+    /// <summary>
+    /// The category of usage
+    /// </summary>
+    [JsonProperty("category")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public MonthlyResource.CategoryEnum Category { get; private set; }
+    /// <summary>
+    /// The number of usage events
+    /// </summary>
+    [JsonProperty("count")]
+    public string Count { get; private set; }
+    /// <summary>
+    /// The units in which count is measured
+    /// </summary>
+    [JsonProperty("count_unit")]
+    public string CountUnit { get; private set; }
+    /// <summary>
+    /// A plain-language description of the usage category
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// The last date for which usage is included in the UsageRecord
+    /// </summary>
+    [JsonProperty("end_date")]
+    public DateTime? EndDate { get; private set; }
+    /// <summary>
+    /// The total price of the usage
+    /// </summary>
+    [JsonProperty("price")]
+    public decimal? Price { get; private set; }
+    /// <summary>
+    /// The currency in which `price` is measured
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The first date for which usage is included in this UsageRecord
+    /// </summary>
+    [JsonProperty("start_date")]
+    public DateTime? StartDate { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The amount of usage
+    /// </summary>
+    [JsonProperty("usage")]
+    public string Usage { get; private set; }
+    /// <summary>
+    /// The units in which usage is measured
+    /// </summary>
+    [JsonProperty("usage_unit")]
+    public string UsageUnit { get; private set; }
+
+    private MonthlyResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/ThisMonthOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/ThisMonthOptions.cs
index ce847686f..b39e99c4b 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/ThisMonthOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/ThisMonthOptions.cs
@@ -9,67 +9,67 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
+{
+
+  /// <summary>
+  /// ReadThisMonthOptions
+  /// </summary>
+  public class ReadThisMonthOptions : ReadOptions<ThisMonthResource>
+  {
     /// <summary>
-    /// ReadThisMonthOptions
+    /// The SID of the Account that created the resources to read
     /// </summary>
-    public class ReadThisMonthOptions : ReadOptions<ThisMonthResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The usage category of the UsageRecord resources to read
-        /// </summary>
-        public ThisMonthResource.CategoryEnum Category { get; set; }
-        /// <summary>
-        /// Only include usage that has occurred on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Whether to include usage from the master account and all its subaccounts
-        /// </summary>
-        public bool? IncludeSubaccounts { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Category != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (IncludeSubaccounts != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The usage category of the UsageRecord resources to read
+    /// </summary>
+    public ThisMonthResource.CategoryEnum Category { get; set; }
+    /// <summary>
+    /// Only include usage that has occurred on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Whether to include usage from the master account and all its subaccounts
+    /// </summary>
+    public bool? IncludeSubaccounts { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Category != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (IncludeSubaccounts != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/ThisMonthResource.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/ThisMonthResource.cs
index 1b8d6e2ad..ba7eca793 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/ThisMonthResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/ThisMonthResource.cs
@@ -17,509 +17,509 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
-    public class ThisMonthResource : Resource
-    {
-        public sealed class CategoryEnum : StringEnum
-        {
-            private CategoryEnum(string value) : base(value) {}
-            public CategoryEnum() {}
-            public static implicit operator CategoryEnum(string value)
-            {
-                return new CategoryEnum(value);
-            }
-
-            public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
-            public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
-            public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
-            public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
-            public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
-            public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
-            public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
-            public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
-            public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
-            public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
-            public static readonly CategoryEnum Calls = new CategoryEnum("calls");
-            public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
-            public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
-            public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
-            public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
-            public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
-            public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
-            public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
-            public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
-            public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
-            public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
-            public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
-            public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
-            public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
-            public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
-            public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
-            public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
-            public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
-            public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
-            public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
-            public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
-            public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
-            public static readonly CategoryEnum Cps = new CategoryEnum("cps");
-            public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
-            public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
-            public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
-            public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
-            public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
-            public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
-            public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
-            public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
-            public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
-            public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
-            public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
-            public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
-            public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
-            public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
-            public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
-            public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
-            public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
-            public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
-            public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
-            public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
-            public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
-            public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
-            public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
-            public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
-            public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
-            public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
-            public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
-            public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
-            public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
-            public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
-            public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
-            public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
-            public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
-            public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
-            public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
-            public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
-            public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
-            public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
-            public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
-            public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
-            public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
-            public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
-            public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
-            public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
-            public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
-            public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
-            public static readonly CategoryEnum Mms = new CategoryEnum("mms");
-            public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
-            public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
-            public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
-            public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
-            public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
-            public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
-            public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
-            public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
-            public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
-            public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
-            public static readonly CategoryEnum Notify = new CategoryEnum("notify");
-            public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
-            public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
-            public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
-            public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
-            public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
-            public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
-            public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
-            public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
-            public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
-            public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
-            public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
-            public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
-            public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
-            public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
-            public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
-            public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
-            public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
-            public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
-            public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
-            public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
-            public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
-            public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
-            public static readonly CategoryEnum Pv = new CategoryEnum("pv");
-            public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
-            public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
-            public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
-            public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
-            public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
-            public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
-            public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
-            public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
-            public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
-            public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
-            public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
-            public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
-            public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
-            public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
-            public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
-            public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
-            public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
-            public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
-            public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
-            public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
-            public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
-            public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
-            public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
-            public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
-            public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
-            public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
-            public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
-            public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
-            public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
-            public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
-            public static readonly CategoryEnum Sms = new CategoryEnum("sms");
-            public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
-            public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
-            public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
-            public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
-            public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
-            public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
-            public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
-            public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
-            public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
-            public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
-            public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
-            public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
-            public static readonly CategoryEnum Sync = new CategoryEnum("sync");
-            public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
-            public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
-            public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
-            public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
-            public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
-            public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
-            public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
-            public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
-            public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
-            public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
-            public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
-            public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
-            public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
-            public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
-            public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
-            public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
-            public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
-            public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
-            public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
-            public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
-            public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
-            public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
-            public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
-            public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
-            public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
-            public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
-            public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
-            public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
-            public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
-            public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
-            public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
-            public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
-            public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
-            public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
-            public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
-            public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
-            public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
-            public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
-            public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
-            public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
-            public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
-            public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
-            public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
-            public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
-            public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
-            public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
-            public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
-            public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
-            public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
-            public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
-            public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
-            public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
-            public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
-            public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
-            public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
-            public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
-            public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
-            public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
-            public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
-            public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
-            public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
-            public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
-            public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
-            public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
-            public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
-        }
-
-        private static Request BuildReadRequest(ReadThisMonthOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/ThisMonth.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ThisMonth parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ThisMonth </returns>
-        public static ResourceSet<ThisMonthResource> Read(ReadThisMonthOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ThisMonthResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<ThisMonthResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ThisMonth parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ThisMonth </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ThisMonthResource>> ReadAsync(ReadThisMonthOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ThisMonthResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<ThisMonthResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ThisMonth </returns>
-        public static ResourceSet<ThisMonthResource> Read(string pathAccountSid = null,
-                                                          ThisMonthResource.CategoryEnum category = null,
-                                                          DateTime? startDate = null,
-                                                          DateTime? endDate = null,
-                                                          bool? includeSubaccounts = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadThisMonthOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ThisMonth </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ThisMonthResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                  ThisMonthResource.CategoryEnum category = null,
-                                                                                                  DateTime? startDate = null,
-                                                                                                  DateTime? endDate = null,
-                                                                                                  bool? includeSubaccounts = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadThisMonthOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ThisMonthResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ThisMonthResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ThisMonthResource> NextPage(Page<ThisMonthResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<ThisMonthResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ThisMonthResource> PreviousPage(Page<ThisMonthResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<ThisMonthResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a ThisMonthResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ThisMonthResource object represented by the provided JSON </returns>
-        public static ThisMonthResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ThisMonthResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account accrued the usage
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the resource
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Usage records up to date as of this timestamp
-        /// </summary>
-        [JsonProperty("as_of")]
-        public string AsOf { get; private set; }
-        /// <summary>
-        /// The category of usage
-        /// </summary>
-        [JsonProperty("category")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ThisMonthResource.CategoryEnum Category { get; private set; }
-        /// <summary>
-        /// The number of usage events
-        /// </summary>
-        [JsonProperty("count")]
-        public string Count { get; private set; }
-        /// <summary>
-        /// The units in which count is measured
-        /// </summary>
-        [JsonProperty("count_unit")]
-        public string CountUnit { get; private set; }
-        /// <summary>
-        /// A plain-language description of the usage category
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// The last date for which usage is included in the UsageRecord
-        /// </summary>
-        [JsonProperty("end_date")]
-        public DateTime? EndDate { get; private set; }
-        /// <summary>
-        /// The total price of the usage
-        /// </summary>
-        [JsonProperty("price")]
-        public decimal? Price { get; private set; }
-        /// <summary>
-        /// The currency in which `price` is measured
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The first date for which usage is included in this UsageRecord
-        /// </summary>
-        [JsonProperty("start_date")]
-        public DateTime? StartDate { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The amount of usage
-        /// </summary>
-        [JsonProperty("usage")]
-        public string Usage { get; private set; }
-        /// <summary>
-        /// The units in which usage is measured
-        /// </summary>
-        [JsonProperty("usage_unit")]
-        public string UsageUnit { get; private set; }
-
-        private ThisMonthResource()
-        {
-
-        }
-    }
+{
+
+  public class ThisMonthResource : Resource
+  {
+    public sealed class CategoryEnum : StringEnum
+    {
+      private CategoryEnum(string value) : base(value) { }
+      public CategoryEnum() { }
+      public static implicit operator CategoryEnum(string value)
+      {
+        return new CategoryEnum(value);
+      }
+
+      public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
+      public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
+      public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
+      public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
+      public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
+      public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
+      public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
+      public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
+      public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
+      public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
+      public static readonly CategoryEnum Calls = new CategoryEnum("calls");
+      public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
+      public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
+      public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
+      public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
+      public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
+      public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
+      public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
+      public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
+      public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
+      public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
+      public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
+      public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
+      public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
+      public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
+      public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
+      public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
+      public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
+      public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
+      public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
+      public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
+      public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
+      public static readonly CategoryEnum Cps = new CategoryEnum("cps");
+      public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
+      public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
+      public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
+      public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
+      public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
+      public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
+      public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
+      public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
+      public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
+      public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
+      public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
+      public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
+      public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
+      public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
+      public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
+      public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
+      public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
+      public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
+      public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
+      public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
+      public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
+      public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
+      public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
+      public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
+      public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
+      public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
+      public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
+      public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
+      public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
+      public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
+      public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
+      public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
+      public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
+      public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
+      public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
+      public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
+      public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
+      public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
+      public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
+      public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
+      public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
+      public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
+      public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
+      public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
+      public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
+      public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
+      public static readonly CategoryEnum Mms = new CategoryEnum("mms");
+      public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
+      public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
+      public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
+      public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
+      public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
+      public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
+      public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
+      public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
+      public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
+      public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
+      public static readonly CategoryEnum Notify = new CategoryEnum("notify");
+      public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
+      public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
+      public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
+      public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
+      public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
+      public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
+      public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
+      public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
+      public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
+      public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
+      public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
+      public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
+      public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
+      public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
+      public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
+      public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
+      public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
+      public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
+      public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
+      public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
+      public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
+      public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
+      public static readonly CategoryEnum Pv = new CategoryEnum("pv");
+      public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
+      public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
+      public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
+      public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
+      public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
+      public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
+      public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
+      public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
+      public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
+      public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
+      public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
+      public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
+      public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
+      public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
+      public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
+      public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
+      public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
+      public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
+      public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
+      public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
+      public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
+      public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
+      public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
+      public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
+      public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
+      public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
+      public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
+      public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
+      public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
+      public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
+      public static readonly CategoryEnum Sms = new CategoryEnum("sms");
+      public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
+      public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
+      public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
+      public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
+      public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
+      public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
+      public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
+      public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
+      public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
+      public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
+      public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
+      public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
+      public static readonly CategoryEnum Sync = new CategoryEnum("sync");
+      public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
+      public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
+      public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
+      public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
+      public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
+      public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
+      public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
+      public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
+      public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
+      public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
+      public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
+      public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
+      public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
+      public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
+      public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
+      public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
+      public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
+      public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
+      public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
+      public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
+      public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
+      public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
+      public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
+      public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
+      public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
+      public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
+      public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
+      public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
+      public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
+      public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
+      public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
+      public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
+      public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
+      public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
+      public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
+      public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
+      public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
+      public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
+      public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
+      public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
+      public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
+      public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
+      public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
+      public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
+      public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
+      public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
+      public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
+      public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
+      public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
+      public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
+      public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
+      public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
+      public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
+      public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
+      public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
+      public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
+      public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
+      public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
+      public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
+      public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
+      public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
+      public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
+      public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
+      public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
+      public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
+    }
+
+    private static Request BuildReadRequest(ReadThisMonthOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/ThisMonth.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ThisMonth parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ThisMonth </returns>
+    public static ResourceSet<ThisMonthResource> Read(ReadThisMonthOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ThisMonthResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<ThisMonthResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ThisMonth parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ThisMonth </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ThisMonthResource>> ReadAsync(ReadThisMonthOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ThisMonthResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<ThisMonthResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ThisMonth </returns>
+    public static ResourceSet<ThisMonthResource> Read(string pathAccountSid = null,
+                                                      ThisMonthResource.CategoryEnum category = null,
+                                                      DateTime? startDate = null,
+                                                      DateTime? endDate = null,
+                                                      bool? includeSubaccounts = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadThisMonthOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ThisMonth </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ThisMonthResource>> ReadAsync(string pathAccountSid = null,
+                                                                                              ThisMonthResource.CategoryEnum category = null,
+                                                                                              DateTime? startDate = null,
+                                                                                              DateTime? endDate = null,
+                                                                                              bool? includeSubaccounts = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadThisMonthOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ThisMonthResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ThisMonthResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ThisMonthResource> NextPage(Page<ThisMonthResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<ThisMonthResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ThisMonthResource> PreviousPage(Page<ThisMonthResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<ThisMonthResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a ThisMonthResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ThisMonthResource object represented by the provided JSON </returns>
+    public static ThisMonthResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ThisMonthResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account accrued the usage
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the resource
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Usage records up to date as of this timestamp
+    /// </summary>
+    [JsonProperty("as_of")]
+    public string AsOf { get; private set; }
+    /// <summary>
+    /// The category of usage
+    /// </summary>
+    [JsonProperty("category")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ThisMonthResource.CategoryEnum Category { get; private set; }
+    /// <summary>
+    /// The number of usage events
+    /// </summary>
+    [JsonProperty("count")]
+    public string Count { get; private set; }
+    /// <summary>
+    /// The units in which count is measured
+    /// </summary>
+    [JsonProperty("count_unit")]
+    public string CountUnit { get; private set; }
+    /// <summary>
+    /// A plain-language description of the usage category
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// The last date for which usage is included in the UsageRecord
+    /// </summary>
+    [JsonProperty("end_date")]
+    public DateTime? EndDate { get; private set; }
+    /// <summary>
+    /// The total price of the usage
+    /// </summary>
+    [JsonProperty("price")]
+    public decimal? Price { get; private set; }
+    /// <summary>
+    /// The currency in which `price` is measured
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The first date for which usage is included in this UsageRecord
+    /// </summary>
+    [JsonProperty("start_date")]
+    public DateTime? StartDate { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The amount of usage
+    /// </summary>
+    [JsonProperty("usage")]
+    public string Usage { get; private set; }
+    /// <summary>
+    /// The units in which usage is measured
+    /// </summary>
+    [JsonProperty("usage_unit")]
+    public string UsageUnit { get; private set; }
+
+    private ThisMonthResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/TodayOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/TodayOptions.cs
index c4b880ea7..ec2b575aa 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/TodayOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/TodayOptions.cs
@@ -9,67 +9,67 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
+{
+
+  /// <summary>
+  /// ReadTodayOptions
+  /// </summary>
+  public class ReadTodayOptions : ReadOptions<TodayResource>
+  {
     /// <summary>
-    /// ReadTodayOptions
+    /// The SID of the Account that created the resources to read
     /// </summary>
-    public class ReadTodayOptions : ReadOptions<TodayResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The usage category of the UsageRecord resources to read
-        /// </summary>
-        public TodayResource.CategoryEnum Category { get; set; }
-        /// <summary>
-        /// Only include usage that has occurred on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Whether to include usage from the master account and all its subaccounts
-        /// </summary>
-        public bool? IncludeSubaccounts { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Category != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (IncludeSubaccounts != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The usage category of the UsageRecord resources to read
+    /// </summary>
+    public TodayResource.CategoryEnum Category { get; set; }
+    /// <summary>
+    /// Only include usage that has occurred on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Whether to include usage from the master account and all its subaccounts
+    /// </summary>
+    public bool? IncludeSubaccounts { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Category != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (IncludeSubaccounts != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/TodayResource.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/TodayResource.cs
index f37b79eb4..a6e64ebf8 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/TodayResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/TodayResource.cs
@@ -17,509 +17,509 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
-    public class TodayResource : Resource
-    {
-        public sealed class CategoryEnum : StringEnum
-        {
-            private CategoryEnum(string value) : base(value) {}
-            public CategoryEnum() {}
-            public static implicit operator CategoryEnum(string value)
-            {
-                return new CategoryEnum(value);
-            }
-
-            public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
-            public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
-            public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
-            public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
-            public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
-            public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
-            public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
-            public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
-            public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
-            public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
-            public static readonly CategoryEnum Calls = new CategoryEnum("calls");
-            public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
-            public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
-            public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
-            public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
-            public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
-            public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
-            public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
-            public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
-            public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
-            public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
-            public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
-            public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
-            public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
-            public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
-            public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
-            public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
-            public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
-            public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
-            public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
-            public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
-            public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
-            public static readonly CategoryEnum Cps = new CategoryEnum("cps");
-            public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
-            public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
-            public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
-            public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
-            public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
-            public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
-            public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
-            public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
-            public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
-            public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
-            public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
-            public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
-            public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
-            public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
-            public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
-            public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
-            public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
-            public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
-            public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
-            public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
-            public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
-            public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
-            public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
-            public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
-            public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
-            public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
-            public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
-            public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
-            public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
-            public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
-            public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
-            public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
-            public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
-            public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
-            public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
-            public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
-            public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
-            public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
-            public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
-            public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
-            public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
-            public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
-            public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
-            public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
-            public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
-            public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
-            public static readonly CategoryEnum Mms = new CategoryEnum("mms");
-            public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
-            public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
-            public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
-            public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
-            public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
-            public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
-            public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
-            public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
-            public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
-            public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
-            public static readonly CategoryEnum Notify = new CategoryEnum("notify");
-            public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
-            public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
-            public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
-            public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
-            public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
-            public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
-            public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
-            public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
-            public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
-            public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
-            public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
-            public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
-            public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
-            public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
-            public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
-            public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
-            public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
-            public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
-            public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
-            public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
-            public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
-            public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
-            public static readonly CategoryEnum Pv = new CategoryEnum("pv");
-            public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
-            public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
-            public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
-            public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
-            public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
-            public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
-            public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
-            public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
-            public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
-            public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
-            public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
-            public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
-            public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
-            public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
-            public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
-            public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
-            public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
-            public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
-            public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
-            public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
-            public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
-            public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
-            public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
-            public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
-            public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
-            public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
-            public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
-            public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
-            public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
-            public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
-            public static readonly CategoryEnum Sms = new CategoryEnum("sms");
-            public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
-            public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
-            public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
-            public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
-            public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
-            public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
-            public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
-            public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
-            public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
-            public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
-            public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
-            public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
-            public static readonly CategoryEnum Sync = new CategoryEnum("sync");
-            public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
-            public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
-            public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
-            public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
-            public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
-            public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
-            public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
-            public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
-            public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
-            public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
-            public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
-            public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
-            public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
-            public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
-            public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
-            public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
-            public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
-            public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
-            public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
-            public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
-            public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
-            public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
-            public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
-            public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
-            public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
-            public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
-            public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
-            public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
-            public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
-            public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
-            public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
-            public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
-            public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
-            public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
-            public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
-            public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
-            public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
-            public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
-            public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
-            public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
-            public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
-            public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
-            public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
-            public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
-            public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
-            public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
-            public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
-            public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
-            public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
-            public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
-            public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
-            public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
-            public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
-            public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
-            public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
-            public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
-            public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
-            public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
-            public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
-            public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
-            public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
-            public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
-            public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
-            public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
-            public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
-        }
-
-        private static Request BuildReadRequest(ReadTodayOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/Today.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Today parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Today </returns>
-        public static ResourceSet<TodayResource> Read(ReadTodayOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TodayResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<TodayResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Today parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Today </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TodayResource>> ReadAsync(ReadTodayOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TodayResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<TodayResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Today </returns>
-        public static ResourceSet<TodayResource> Read(string pathAccountSid = null,
-                                                      TodayResource.CategoryEnum category = null,
-                                                      DateTime? startDate = null,
-                                                      DateTime? endDate = null,
-                                                      bool? includeSubaccounts = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadTodayOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Today </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TodayResource>> ReadAsync(string pathAccountSid = null,
-                                                                                              TodayResource.CategoryEnum category = null,
-                                                                                              DateTime? startDate = null,
-                                                                                              DateTime? endDate = null,
-                                                                                              bool? includeSubaccounts = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadTodayOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TodayResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TodayResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TodayResource> NextPage(Page<TodayResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<TodayResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TodayResource> PreviousPage(Page<TodayResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<TodayResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a TodayResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TodayResource object represented by the provided JSON </returns>
-        public static TodayResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TodayResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account accrued the usage
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the resource
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Usage records up to date as of this timestamp
-        /// </summary>
-        [JsonProperty("as_of")]
-        public string AsOf { get; private set; }
-        /// <summary>
-        /// The category of usage
-        /// </summary>
-        [JsonProperty("category")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TodayResource.CategoryEnum Category { get; private set; }
-        /// <summary>
-        /// The number of usage events
-        /// </summary>
-        [JsonProperty("count")]
-        public string Count { get; private set; }
-        /// <summary>
-        /// The units in which count is measured
-        /// </summary>
-        [JsonProperty("count_unit")]
-        public string CountUnit { get; private set; }
-        /// <summary>
-        /// A plain-language description of the usage category
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// The last date for which usage is included in the UsageRecord
-        /// </summary>
-        [JsonProperty("end_date")]
-        public DateTime? EndDate { get; private set; }
-        /// <summary>
-        /// The total price of the usage
-        /// </summary>
-        [JsonProperty("price")]
-        public decimal? Price { get; private set; }
-        /// <summary>
-        /// The currency in which `price` is measured
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The first date for which usage is included in this UsageRecord
-        /// </summary>
-        [JsonProperty("start_date")]
-        public DateTime? StartDate { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The amount of usage
-        /// </summary>
-        [JsonProperty("usage")]
-        public string Usage { get; private set; }
-        /// <summary>
-        /// The units in which usage is measured
-        /// </summary>
-        [JsonProperty("usage_unit")]
-        public string UsageUnit { get; private set; }
-
-        private TodayResource()
-        {
-
-        }
-    }
+{
+
+  public class TodayResource : Resource
+  {
+    public sealed class CategoryEnum : StringEnum
+    {
+      private CategoryEnum(string value) : base(value) { }
+      public CategoryEnum() { }
+      public static implicit operator CategoryEnum(string value)
+      {
+        return new CategoryEnum(value);
+      }
+
+      public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
+      public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
+      public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
+      public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
+      public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
+      public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
+      public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
+      public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
+      public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
+      public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
+      public static readonly CategoryEnum Calls = new CategoryEnum("calls");
+      public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
+      public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
+      public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
+      public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
+      public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
+      public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
+      public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
+      public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
+      public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
+      public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
+      public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
+      public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
+      public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
+      public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
+      public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
+      public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
+      public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
+      public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
+      public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
+      public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
+      public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
+      public static readonly CategoryEnum Cps = new CategoryEnum("cps");
+      public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
+      public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
+      public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
+      public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
+      public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
+      public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
+      public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
+      public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
+      public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
+      public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
+      public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
+      public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
+      public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
+      public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
+      public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
+      public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
+      public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
+      public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
+      public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
+      public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
+      public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
+      public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
+      public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
+      public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
+      public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
+      public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
+      public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
+      public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
+      public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
+      public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
+      public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
+      public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
+      public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
+      public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
+      public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
+      public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
+      public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
+      public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
+      public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
+      public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
+      public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
+      public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
+      public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
+      public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
+      public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
+      public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
+      public static readonly CategoryEnum Mms = new CategoryEnum("mms");
+      public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
+      public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
+      public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
+      public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
+      public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
+      public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
+      public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
+      public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
+      public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
+      public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
+      public static readonly CategoryEnum Notify = new CategoryEnum("notify");
+      public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
+      public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
+      public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
+      public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
+      public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
+      public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
+      public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
+      public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
+      public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
+      public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
+      public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
+      public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
+      public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
+      public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
+      public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
+      public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
+      public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
+      public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
+      public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
+      public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
+      public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
+      public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
+      public static readonly CategoryEnum Pv = new CategoryEnum("pv");
+      public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
+      public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
+      public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
+      public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
+      public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
+      public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
+      public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
+      public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
+      public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
+      public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
+      public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
+      public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
+      public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
+      public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
+      public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
+      public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
+      public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
+      public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
+      public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
+      public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
+      public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
+      public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
+      public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
+      public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
+      public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
+      public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
+      public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
+      public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
+      public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
+      public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
+      public static readonly CategoryEnum Sms = new CategoryEnum("sms");
+      public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
+      public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
+      public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
+      public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
+      public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
+      public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
+      public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
+      public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
+      public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
+      public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
+      public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
+      public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
+      public static readonly CategoryEnum Sync = new CategoryEnum("sync");
+      public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
+      public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
+      public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
+      public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
+      public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
+      public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
+      public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
+      public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
+      public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
+      public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
+      public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
+      public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
+      public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
+      public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
+      public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
+      public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
+      public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
+      public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
+      public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
+      public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
+      public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
+      public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
+      public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
+      public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
+      public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
+      public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
+      public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
+      public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
+      public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
+      public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
+      public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
+      public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
+      public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
+      public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
+      public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
+      public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
+      public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
+      public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
+      public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
+      public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
+      public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
+      public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
+      public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
+      public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
+      public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
+      public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
+      public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
+      public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
+      public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
+      public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
+      public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
+      public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
+      public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
+      public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
+      public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
+      public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
+      public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
+      public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
+      public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
+      public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
+      public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
+      public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
+      public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
+      public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
+      public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
+    }
+
+    private static Request BuildReadRequest(ReadTodayOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/Today.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Today parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Today </returns>
+    public static ResourceSet<TodayResource> Read(ReadTodayOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TodayResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<TodayResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Today parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Today </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TodayResource>> ReadAsync(ReadTodayOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TodayResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<TodayResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Today </returns>
+    public static ResourceSet<TodayResource> Read(string pathAccountSid = null,
+                                                  TodayResource.CategoryEnum category = null,
+                                                  DateTime? startDate = null,
+                                                  DateTime? endDate = null,
+                                                  bool? includeSubaccounts = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadTodayOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Today </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TodayResource>> ReadAsync(string pathAccountSid = null,
+                                                                                          TodayResource.CategoryEnum category = null,
+                                                                                          DateTime? startDate = null,
+                                                                                          DateTime? endDate = null,
+                                                                                          bool? includeSubaccounts = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadTodayOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TodayResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TodayResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TodayResource> NextPage(Page<TodayResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<TodayResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TodayResource> PreviousPage(Page<TodayResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<TodayResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a TodayResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TodayResource object represented by the provided JSON </returns>
+    public static TodayResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TodayResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account accrued the usage
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the resource
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Usage records up to date as of this timestamp
+    /// </summary>
+    [JsonProperty("as_of")]
+    public string AsOf { get; private set; }
+    /// <summary>
+    /// The category of usage
+    /// </summary>
+    [JsonProperty("category")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TodayResource.CategoryEnum Category { get; private set; }
+    /// <summary>
+    /// The number of usage events
+    /// </summary>
+    [JsonProperty("count")]
+    public string Count { get; private set; }
+    /// <summary>
+    /// The units in which count is measured
+    /// </summary>
+    [JsonProperty("count_unit")]
+    public string CountUnit { get; private set; }
+    /// <summary>
+    /// A plain-language description of the usage category
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// The last date for which usage is included in the UsageRecord
+    /// </summary>
+    [JsonProperty("end_date")]
+    public DateTime? EndDate { get; private set; }
+    /// <summary>
+    /// The total price of the usage
+    /// </summary>
+    [JsonProperty("price")]
+    public decimal? Price { get; private set; }
+    /// <summary>
+    /// The currency in which `price` is measured
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The first date for which usage is included in this UsageRecord
+    /// </summary>
+    [JsonProperty("start_date")]
+    public DateTime? StartDate { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The amount of usage
+    /// </summary>
+    [JsonProperty("usage")]
+    public string Usage { get; private set; }
+    /// <summary>
+    /// The units in which usage is measured
+    /// </summary>
+    [JsonProperty("usage_unit")]
+    public string UsageUnit { get; private set; }
+
+    private TodayResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YearlyOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YearlyOptions.cs
index 431d2b63d..a3d0c6036 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YearlyOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YearlyOptions.cs
@@ -9,67 +9,67 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
+{
+
+  /// <summary>
+  /// ReadYearlyOptions
+  /// </summary>
+  public class ReadYearlyOptions : ReadOptions<YearlyResource>
+  {
     /// <summary>
-    /// ReadYearlyOptions
+    /// The SID of the Account that created the resources to read
     /// </summary>
-    public class ReadYearlyOptions : ReadOptions<YearlyResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The usage category of the UsageRecord resources to read
-        /// </summary>
-        public YearlyResource.CategoryEnum Category { get; set; }
-        /// <summary>
-        /// Only include usage that has occurred on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Whether to include usage from the master account and all its subaccounts
-        /// </summary>
-        public bool? IncludeSubaccounts { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Category != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (IncludeSubaccounts != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The usage category of the UsageRecord resources to read
+    /// </summary>
+    public YearlyResource.CategoryEnum Category { get; set; }
+    /// <summary>
+    /// Only include usage that has occurred on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Whether to include usage from the master account and all its subaccounts
+    /// </summary>
+    public bool? IncludeSubaccounts { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Category != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (IncludeSubaccounts != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YearlyResource.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YearlyResource.cs
index f0a72ccf0..39b35362e 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YearlyResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YearlyResource.cs
@@ -17,509 +17,509 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
-    public class YearlyResource : Resource
-    {
-        public sealed class CategoryEnum : StringEnum
-        {
-            private CategoryEnum(string value) : base(value) {}
-            public CategoryEnum() {}
-            public static implicit operator CategoryEnum(string value)
-            {
-                return new CategoryEnum(value);
-            }
-
-            public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
-            public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
-            public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
-            public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
-            public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
-            public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
-            public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
-            public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
-            public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
-            public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
-            public static readonly CategoryEnum Calls = new CategoryEnum("calls");
-            public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
-            public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
-            public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
-            public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
-            public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
-            public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
-            public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
-            public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
-            public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
-            public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
-            public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
-            public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
-            public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
-            public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
-            public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
-            public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
-            public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
-            public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
-            public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
-            public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
-            public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
-            public static readonly CategoryEnum Cps = new CategoryEnum("cps");
-            public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
-            public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
-            public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
-            public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
-            public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
-            public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
-            public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
-            public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
-            public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
-            public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
-            public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
-            public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
-            public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
-            public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
-            public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
-            public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
-            public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
-            public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
-            public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
-            public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
-            public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
-            public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
-            public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
-            public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
-            public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
-            public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
-            public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
-            public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
-            public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
-            public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
-            public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
-            public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
-            public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
-            public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
-            public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
-            public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
-            public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
-            public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
-            public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
-            public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
-            public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
-            public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
-            public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
-            public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
-            public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
-            public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
-            public static readonly CategoryEnum Mms = new CategoryEnum("mms");
-            public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
-            public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
-            public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
-            public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
-            public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
-            public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
-            public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
-            public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
-            public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
-            public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
-            public static readonly CategoryEnum Notify = new CategoryEnum("notify");
-            public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
-            public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
-            public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
-            public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
-            public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
-            public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
-            public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
-            public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
-            public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
-            public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
-            public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
-            public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
-            public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
-            public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
-            public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
-            public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
-            public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
-            public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
-            public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
-            public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
-            public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
-            public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
-            public static readonly CategoryEnum Pv = new CategoryEnum("pv");
-            public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
-            public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
-            public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
-            public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
-            public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
-            public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
-            public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
-            public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
-            public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
-            public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
-            public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
-            public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
-            public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
-            public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
-            public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
-            public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
-            public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
-            public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
-            public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
-            public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
-            public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
-            public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
-            public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
-            public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
-            public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
-            public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
-            public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
-            public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
-            public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
-            public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
-            public static readonly CategoryEnum Sms = new CategoryEnum("sms");
-            public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
-            public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
-            public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
-            public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
-            public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
-            public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
-            public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
-            public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
-            public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
-            public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
-            public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
-            public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
-            public static readonly CategoryEnum Sync = new CategoryEnum("sync");
-            public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
-            public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
-            public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
-            public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
-            public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
-            public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
-            public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
-            public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
-            public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
-            public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
-            public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
-            public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
-            public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
-            public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
-            public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
-            public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
-            public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
-            public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
-            public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
-            public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
-            public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
-            public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
-            public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
-            public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
-            public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
-            public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
-            public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
-            public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
-            public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
-            public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
-            public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
-            public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
-            public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
-            public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
-            public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
-            public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
-            public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
-            public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
-            public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
-            public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
-            public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
-            public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
-            public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
-            public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
-            public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
-            public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
-            public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
-            public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
-            public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
-            public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
-            public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
-            public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
-            public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
-            public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
-            public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
-            public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
-            public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
-            public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
-            public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
-            public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
-            public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
-            public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
-            public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
-            public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
-            public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
-        }
-
-        private static Request BuildReadRequest(ReadYearlyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/Yearly.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Yearly parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Yearly </returns>
-        public static ResourceSet<YearlyResource> Read(ReadYearlyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<YearlyResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<YearlyResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Yearly parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Yearly </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<YearlyResource>> ReadAsync(ReadYearlyOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<YearlyResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<YearlyResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Yearly </returns>
-        public static ResourceSet<YearlyResource> Read(string pathAccountSid = null,
-                                                       YearlyResource.CategoryEnum category = null,
-                                                       DateTime? startDate = null,
-                                                       DateTime? endDate = null,
-                                                       bool? includeSubaccounts = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadYearlyOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Yearly </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<YearlyResource>> ReadAsync(string pathAccountSid = null,
-                                                                                               YearlyResource.CategoryEnum category = null,
-                                                                                               DateTime? startDate = null,
-                                                                                               DateTime? endDate = null,
-                                                                                               bool? includeSubaccounts = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadYearlyOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<YearlyResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<YearlyResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<YearlyResource> NextPage(Page<YearlyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<YearlyResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<YearlyResource> PreviousPage(Page<YearlyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<YearlyResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a YearlyResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> YearlyResource object represented by the provided JSON </returns>
-        public static YearlyResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<YearlyResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account accrued the usage
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the resource
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Usage records up to date as of this timestamp
-        /// </summary>
-        [JsonProperty("as_of")]
-        public string AsOf { get; private set; }
-        /// <summary>
-        /// The category of usage
-        /// </summary>
-        [JsonProperty("category")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public YearlyResource.CategoryEnum Category { get; private set; }
-        /// <summary>
-        /// The number of usage events
-        /// </summary>
-        [JsonProperty("count")]
-        public string Count { get; private set; }
-        /// <summary>
-        /// The units in which count is measured
-        /// </summary>
-        [JsonProperty("count_unit")]
-        public string CountUnit { get; private set; }
-        /// <summary>
-        /// A plain-language description of the usage category
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// The last date for which usage is included in the UsageRecord
-        /// </summary>
-        [JsonProperty("end_date")]
-        public DateTime? EndDate { get; private set; }
-        /// <summary>
-        /// The total price of the usage
-        /// </summary>
-        [JsonProperty("price")]
-        public decimal? Price { get; private set; }
-        /// <summary>
-        /// The currency in which `price` is measured
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The first date for which usage is included in this UsageRecord
-        /// </summary>
-        [JsonProperty("start_date")]
-        public DateTime? StartDate { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The amount of usage
-        /// </summary>
-        [JsonProperty("usage")]
-        public string Usage { get; private set; }
-        /// <summary>
-        /// The units in which usage is measured
-        /// </summary>
-        [JsonProperty("usage_unit")]
-        public string UsageUnit { get; private set; }
-
-        private YearlyResource()
-        {
-
-        }
-    }
+{
+
+  public class YearlyResource : Resource
+  {
+    public sealed class CategoryEnum : StringEnum
+    {
+      private CategoryEnum(string value) : base(value) { }
+      public CategoryEnum() { }
+      public static implicit operator CategoryEnum(string value)
+      {
+        return new CategoryEnum(value);
+      }
+
+      public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
+      public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
+      public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
+      public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
+      public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
+      public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
+      public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
+      public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
+      public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
+      public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
+      public static readonly CategoryEnum Calls = new CategoryEnum("calls");
+      public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
+      public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
+      public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
+      public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
+      public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
+      public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
+      public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
+      public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
+      public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
+      public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
+      public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
+      public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
+      public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
+      public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
+      public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
+      public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
+      public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
+      public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
+      public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
+      public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
+      public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
+      public static readonly CategoryEnum Cps = new CategoryEnum("cps");
+      public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
+      public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
+      public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
+      public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
+      public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
+      public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
+      public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
+      public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
+      public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
+      public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
+      public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
+      public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
+      public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
+      public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
+      public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
+      public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
+      public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
+      public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
+      public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
+      public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
+      public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
+      public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
+      public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
+      public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
+      public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
+      public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
+      public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
+      public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
+      public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
+      public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
+      public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
+      public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
+      public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
+      public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
+      public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
+      public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
+      public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
+      public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
+      public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
+      public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
+      public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
+      public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
+      public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
+      public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
+      public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
+      public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
+      public static readonly CategoryEnum Mms = new CategoryEnum("mms");
+      public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
+      public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
+      public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
+      public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
+      public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
+      public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
+      public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
+      public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
+      public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
+      public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
+      public static readonly CategoryEnum Notify = new CategoryEnum("notify");
+      public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
+      public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
+      public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
+      public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
+      public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
+      public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
+      public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
+      public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
+      public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
+      public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
+      public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
+      public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
+      public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
+      public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
+      public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
+      public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
+      public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
+      public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
+      public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
+      public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
+      public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
+      public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
+      public static readonly CategoryEnum Pv = new CategoryEnum("pv");
+      public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
+      public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
+      public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
+      public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
+      public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
+      public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
+      public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
+      public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
+      public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
+      public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
+      public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
+      public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
+      public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
+      public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
+      public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
+      public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
+      public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
+      public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
+      public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
+      public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
+      public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
+      public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
+      public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
+      public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
+      public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
+      public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
+      public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
+      public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
+      public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
+      public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
+      public static readonly CategoryEnum Sms = new CategoryEnum("sms");
+      public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
+      public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
+      public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
+      public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
+      public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
+      public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
+      public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
+      public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
+      public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
+      public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
+      public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
+      public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
+      public static readonly CategoryEnum Sync = new CategoryEnum("sync");
+      public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
+      public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
+      public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
+      public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
+      public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
+      public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
+      public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
+      public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
+      public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
+      public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
+      public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
+      public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
+      public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
+      public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
+      public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
+      public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
+      public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
+      public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
+      public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
+      public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
+      public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
+      public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
+      public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
+      public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
+      public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
+      public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
+      public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
+      public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
+      public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
+      public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
+      public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
+      public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
+      public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
+      public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
+      public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
+      public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
+      public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
+      public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
+      public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
+      public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
+      public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
+      public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
+      public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
+      public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
+      public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
+      public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
+      public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
+      public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
+      public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
+      public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
+      public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
+      public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
+      public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
+      public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
+      public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
+      public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
+      public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
+      public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
+      public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
+      public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
+      public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
+      public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
+      public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
+      public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
+      public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
+    }
+
+    private static Request BuildReadRequest(ReadYearlyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/Yearly.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Yearly parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Yearly </returns>
+    public static ResourceSet<YearlyResource> Read(ReadYearlyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<YearlyResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<YearlyResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Yearly parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Yearly </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<YearlyResource>> ReadAsync(ReadYearlyOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<YearlyResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<YearlyResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Yearly </returns>
+    public static ResourceSet<YearlyResource> Read(string pathAccountSid = null,
+                                                   YearlyResource.CategoryEnum category = null,
+                                                   DateTime? startDate = null,
+                                                   DateTime? endDate = null,
+                                                   bool? includeSubaccounts = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadYearlyOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Yearly </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<YearlyResource>> ReadAsync(string pathAccountSid = null,
+                                                                                           YearlyResource.CategoryEnum category = null,
+                                                                                           DateTime? startDate = null,
+                                                                                           DateTime? endDate = null,
+                                                                                           bool? includeSubaccounts = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadYearlyOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<YearlyResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<YearlyResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<YearlyResource> NextPage(Page<YearlyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<YearlyResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<YearlyResource> PreviousPage(Page<YearlyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<YearlyResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a YearlyResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> YearlyResource object represented by the provided JSON </returns>
+    public static YearlyResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<YearlyResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account accrued the usage
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the resource
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Usage records up to date as of this timestamp
+    /// </summary>
+    [JsonProperty("as_of")]
+    public string AsOf { get; private set; }
+    /// <summary>
+    /// The category of usage
+    /// </summary>
+    [JsonProperty("category")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public YearlyResource.CategoryEnum Category { get; private set; }
+    /// <summary>
+    /// The number of usage events
+    /// </summary>
+    [JsonProperty("count")]
+    public string Count { get; private set; }
+    /// <summary>
+    /// The units in which count is measured
+    /// </summary>
+    [JsonProperty("count_unit")]
+    public string CountUnit { get; private set; }
+    /// <summary>
+    /// A plain-language description of the usage category
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// The last date for which usage is included in the UsageRecord
+    /// </summary>
+    [JsonProperty("end_date")]
+    public DateTime? EndDate { get; private set; }
+    /// <summary>
+    /// The total price of the usage
+    /// </summary>
+    [JsonProperty("price")]
+    public decimal? Price { get; private set; }
+    /// <summary>
+    /// The currency in which `price` is measured
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The first date for which usage is included in this UsageRecord
+    /// </summary>
+    [JsonProperty("start_date")]
+    public DateTime? StartDate { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The amount of usage
+    /// </summary>
+    [JsonProperty("usage")]
+    public string Usage { get; private set; }
+    /// <summary>
+    /// The units in which usage is measured
+    /// </summary>
+    [JsonProperty("usage_unit")]
+    public string UsageUnit { get; private set; }
+
+    private YearlyResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YesterdayOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YesterdayOptions.cs
index 8b06d87a6..fafa518f3 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YesterdayOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YesterdayOptions.cs
@@ -9,67 +9,67 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
+{
+
+  /// <summary>
+  /// ReadYesterdayOptions
+  /// </summary>
+  public class ReadYesterdayOptions : ReadOptions<YesterdayResource>
+  {
     /// <summary>
-    /// ReadYesterdayOptions
+    /// The SID of the Account that created the resources to read
     /// </summary>
-    public class ReadYesterdayOptions : ReadOptions<YesterdayResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The usage category of the UsageRecord resources to read
-        /// </summary>
-        public YesterdayResource.CategoryEnum Category { get; set; }
-        /// <summary>
-        /// Only include usage that has occurred on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Whether to include usage from the master account and all its subaccounts
-        /// </summary>
-        public bool? IncludeSubaccounts { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Category != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (IncludeSubaccounts != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The usage category of the UsageRecord resources to read
+    /// </summary>
+    public YesterdayResource.CategoryEnum Category { get; set; }
+    /// <summary>
+    /// Only include usage that has occurred on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Whether to include usage from the master account and all its subaccounts
+    /// </summary>
+    public bool? IncludeSubaccounts { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Category != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (IncludeSubaccounts != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YesterdayResource.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YesterdayResource.cs
index 1d6a20e45..be5456bc6 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YesterdayResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/Record/YesterdayResource.cs
@@ -17,509 +17,509 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage.Record
-{
-
-    public class YesterdayResource : Resource
-    {
-        public sealed class CategoryEnum : StringEnum
-        {
-            private CategoryEnum(string value) : base(value) {}
-            public CategoryEnum() {}
-            public static implicit operator CategoryEnum(string value)
-            {
-                return new CategoryEnum(value);
-            }
-
-            public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
-            public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
-            public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
-            public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
-            public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
-            public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
-            public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
-            public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
-            public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
-            public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
-            public static readonly CategoryEnum Calls = new CategoryEnum("calls");
-            public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
-            public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
-            public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
-            public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
-            public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
-            public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
-            public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
-            public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
-            public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
-            public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
-            public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
-            public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
-            public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
-            public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
-            public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
-            public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
-            public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
-            public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
-            public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
-            public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
-            public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
-            public static readonly CategoryEnum Cps = new CategoryEnum("cps");
-            public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
-            public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
-            public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
-            public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
-            public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
-            public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
-            public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
-            public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
-            public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
-            public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
-            public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
-            public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
-            public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
-            public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
-            public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
-            public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
-            public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
-            public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
-            public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
-            public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
-            public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
-            public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
-            public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
-            public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
-            public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
-            public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
-            public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
-            public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
-            public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
-            public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
-            public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
-            public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
-            public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
-            public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
-            public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
-            public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
-            public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
-            public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
-            public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
-            public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
-            public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
-            public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
-            public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
-            public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
-            public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
-            public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
-            public static readonly CategoryEnum Mms = new CategoryEnum("mms");
-            public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
-            public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
-            public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
-            public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
-            public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
-            public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
-            public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
-            public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
-            public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
-            public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
-            public static readonly CategoryEnum Notify = new CategoryEnum("notify");
-            public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
-            public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
-            public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
-            public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
-            public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
-            public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
-            public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
-            public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
-            public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
-            public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
-            public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
-            public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
-            public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
-            public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
-            public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
-            public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
-            public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
-            public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
-            public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
-            public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
-            public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
-            public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
-            public static readonly CategoryEnum Pv = new CategoryEnum("pv");
-            public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
-            public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
-            public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
-            public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
-            public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
-            public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
-            public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
-            public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
-            public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
-            public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
-            public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
-            public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
-            public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
-            public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
-            public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
-            public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
-            public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
-            public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
-            public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
-            public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
-            public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
-            public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
-            public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
-            public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
-            public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
-            public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
-            public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
-            public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
-            public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
-            public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
-            public static readonly CategoryEnum Sms = new CategoryEnum("sms");
-            public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
-            public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
-            public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
-            public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
-            public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
-            public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
-            public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
-            public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
-            public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
-            public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
-            public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
-            public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
-            public static readonly CategoryEnum Sync = new CategoryEnum("sync");
-            public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
-            public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
-            public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
-            public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
-            public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
-            public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
-            public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
-            public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
-            public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
-            public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
-            public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
-            public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
-            public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
-            public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
-            public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
-            public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
-            public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
-            public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
-            public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
-            public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
-            public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
-            public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
-            public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
-            public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
-            public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
-            public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
-            public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
-            public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
-            public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
-            public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
-            public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
-            public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
-            public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
-            public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
-            public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
-            public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
-            public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
-            public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
-            public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
-            public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
-            public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
-            public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
-            public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
-            public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
-            public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
-            public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
-            public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
-            public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
-            public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
-            public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
-            public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
-            public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
-            public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
-            public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
-            public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
-            public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
-            public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
-            public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
-            public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
-            public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
-            public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
-            public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
-            public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
-            public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
-            public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
-        }
-
-        private static Request BuildReadRequest(ReadYesterdayOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/Yesterday.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Yesterday parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Yesterday </returns>
-        public static ResourceSet<YesterdayResource> Read(ReadYesterdayOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<YesterdayResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<YesterdayResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Yesterday parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Yesterday </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<YesterdayResource>> ReadAsync(ReadYesterdayOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<YesterdayResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<YesterdayResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Yesterday </returns>
-        public static ResourceSet<YesterdayResource> Read(string pathAccountSid = null,
-                                                          YesterdayResource.CategoryEnum category = null,
-                                                          DateTime? startDate = null,
-                                                          DateTime? endDate = null,
-                                                          bool? includeSubaccounts = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadYesterdayOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Yesterday </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<YesterdayResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                  YesterdayResource.CategoryEnum category = null,
-                                                                                                  DateTime? startDate = null,
-                                                                                                  DateTime? endDate = null,
-                                                                                                  bool? includeSubaccounts = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadYesterdayOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<YesterdayResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<YesterdayResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<YesterdayResource> NextPage(Page<YesterdayResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<YesterdayResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<YesterdayResource> PreviousPage(Page<YesterdayResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<YesterdayResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a YesterdayResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> YesterdayResource object represented by the provided JSON </returns>
-        public static YesterdayResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<YesterdayResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account accrued the usage
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the resource
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Usage records up to date as of this timestamp
-        /// </summary>
-        [JsonProperty("as_of")]
-        public string AsOf { get; private set; }
-        /// <summary>
-        /// The category of usage
-        /// </summary>
-        [JsonProperty("category")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public YesterdayResource.CategoryEnum Category { get; private set; }
-        /// <summary>
-        /// The number of usage events
-        /// </summary>
-        [JsonProperty("count")]
-        public string Count { get; private set; }
-        /// <summary>
-        /// The units in which count is measured
-        /// </summary>
-        [JsonProperty("count_unit")]
-        public string CountUnit { get; private set; }
-        /// <summary>
-        /// A plain-language description of the usage category
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// The last date for which usage is included in the UsageRecord
-        /// </summary>
-        [JsonProperty("end_date")]
-        public DateTime? EndDate { get; private set; }
-        /// <summary>
-        /// The total price of the usage
-        /// </summary>
-        [JsonProperty("price")]
-        public decimal? Price { get; private set; }
-        /// <summary>
-        /// The currency in which `price` is measured
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The first date for which usage is included in this UsageRecord
-        /// </summary>
-        [JsonProperty("start_date")]
-        public DateTime? StartDate { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The amount of usage
-        /// </summary>
-        [JsonProperty("usage")]
-        public string Usage { get; private set; }
-        /// <summary>
-        /// The units in which usage is measured
-        /// </summary>
-        [JsonProperty("usage_unit")]
-        public string UsageUnit { get; private set; }
-
-        private YesterdayResource()
-        {
-
-        }
-    }
+{
+
+  public class YesterdayResource : Resource
+  {
+    public sealed class CategoryEnum : StringEnum
+    {
+      private CategoryEnum(string value) : base(value) { }
+      public CategoryEnum() { }
+      public static implicit operator CategoryEnum(string value)
+      {
+        return new CategoryEnum(value);
+      }
+
+      public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
+      public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
+      public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
+      public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
+      public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
+      public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
+      public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
+      public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
+      public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
+      public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
+      public static readonly CategoryEnum Calls = new CategoryEnum("calls");
+      public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
+      public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
+      public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
+      public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
+      public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
+      public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
+      public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
+      public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
+      public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
+      public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
+      public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
+      public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
+      public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
+      public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
+      public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
+      public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
+      public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
+      public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
+      public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
+      public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
+      public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
+      public static readonly CategoryEnum Cps = new CategoryEnum("cps");
+      public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
+      public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
+      public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
+      public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
+      public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
+      public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
+      public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
+      public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
+      public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
+      public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
+      public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
+      public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
+      public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
+      public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
+      public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
+      public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
+      public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
+      public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
+      public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
+      public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
+      public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
+      public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
+      public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
+      public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
+      public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
+      public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
+      public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
+      public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
+      public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
+      public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
+      public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
+      public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
+      public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
+      public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
+      public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
+      public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
+      public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
+      public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
+      public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
+      public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
+      public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
+      public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
+      public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
+      public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
+      public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
+      public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
+      public static readonly CategoryEnum Mms = new CategoryEnum("mms");
+      public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
+      public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
+      public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
+      public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
+      public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
+      public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
+      public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
+      public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
+      public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
+      public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
+      public static readonly CategoryEnum Notify = new CategoryEnum("notify");
+      public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
+      public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
+      public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
+      public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
+      public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
+      public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
+      public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
+      public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
+      public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
+      public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
+      public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
+      public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
+      public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
+      public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
+      public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
+      public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
+      public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
+      public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
+      public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
+      public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
+      public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
+      public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
+      public static readonly CategoryEnum Pv = new CategoryEnum("pv");
+      public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
+      public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
+      public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
+      public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
+      public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
+      public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
+      public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
+      public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
+      public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
+      public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
+      public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
+      public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
+      public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
+      public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
+      public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
+      public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
+      public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
+      public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
+      public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
+      public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
+      public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
+      public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
+      public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
+      public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
+      public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
+      public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
+      public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
+      public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
+      public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
+      public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
+      public static readonly CategoryEnum Sms = new CategoryEnum("sms");
+      public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
+      public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
+      public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
+      public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
+      public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
+      public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
+      public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
+      public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
+      public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
+      public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
+      public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
+      public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
+      public static readonly CategoryEnum Sync = new CategoryEnum("sync");
+      public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
+      public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
+      public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
+      public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
+      public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
+      public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
+      public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
+      public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
+      public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
+      public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
+      public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
+      public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
+      public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
+      public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
+      public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
+      public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
+      public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
+      public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
+      public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
+      public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
+      public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
+      public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
+      public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
+      public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
+      public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
+      public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
+      public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
+      public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
+      public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
+      public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
+      public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
+      public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
+      public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
+      public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
+      public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
+      public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
+      public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
+      public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
+      public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
+      public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
+      public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
+      public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
+      public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
+      public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
+      public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
+      public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
+      public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
+      public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
+      public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
+      public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
+      public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
+      public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
+      public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
+      public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
+      public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
+      public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
+      public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
+      public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
+      public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
+      public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
+      public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
+      public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
+      public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
+      public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
+      public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
+    }
+
+    private static Request BuildReadRequest(ReadYesterdayOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records/Yesterday.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Yesterday parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Yesterday </returns>
+    public static ResourceSet<YesterdayResource> Read(ReadYesterdayOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<YesterdayResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<YesterdayResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Yesterday parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Yesterday </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<YesterdayResource>> ReadAsync(ReadYesterdayOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<YesterdayResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<YesterdayResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Yesterday </returns>
+    public static ResourceSet<YesterdayResource> Read(string pathAccountSid = null,
+                                                      YesterdayResource.CategoryEnum category = null,
+                                                      DateTime? startDate = null,
+                                                      DateTime? endDate = null,
+                                                      bool? includeSubaccounts = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadYesterdayOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Yesterday </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<YesterdayResource>> ReadAsync(string pathAccountSid = null,
+                                                                                              YesterdayResource.CategoryEnum category = null,
+                                                                                              DateTime? startDate = null,
+                                                                                              DateTime? endDate = null,
+                                                                                              bool? includeSubaccounts = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadYesterdayOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<YesterdayResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<YesterdayResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<YesterdayResource> NextPage(Page<YesterdayResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<YesterdayResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<YesterdayResource> PreviousPage(Page<YesterdayResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<YesterdayResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a YesterdayResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> YesterdayResource object represented by the provided JSON </returns>
+    public static YesterdayResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<YesterdayResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account accrued the usage
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the resource
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Usage records up to date as of this timestamp
+    /// </summary>
+    [JsonProperty("as_of")]
+    public string AsOf { get; private set; }
+    /// <summary>
+    /// The category of usage
+    /// </summary>
+    [JsonProperty("category")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public YesterdayResource.CategoryEnum Category { get; private set; }
+    /// <summary>
+    /// The number of usage events
+    /// </summary>
+    [JsonProperty("count")]
+    public string Count { get; private set; }
+    /// <summary>
+    /// The units in which count is measured
+    /// </summary>
+    [JsonProperty("count_unit")]
+    public string CountUnit { get; private set; }
+    /// <summary>
+    /// A plain-language description of the usage category
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// The last date for which usage is included in the UsageRecord
+    /// </summary>
+    [JsonProperty("end_date")]
+    public DateTime? EndDate { get; private set; }
+    /// <summary>
+    /// The total price of the usage
+    /// </summary>
+    [JsonProperty("price")]
+    public decimal? Price { get; private set; }
+    /// <summary>
+    /// The currency in which `price` is measured
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The first date for which usage is included in this UsageRecord
+    /// </summary>
+    [JsonProperty("start_date")]
+    public DateTime? StartDate { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The amount of usage
+    /// </summary>
+    [JsonProperty("usage")]
+    public string Usage { get; private set; }
+    /// <summary>
+    /// The units in which usage is measured
+    /// </summary>
+    [JsonProperty("usage_unit")]
+    public string UsageUnit { get; private set; }
+
+    private YesterdayResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/RecordOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/RecordOptions.cs
index 8ef24a971..fdc05cb1b 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/RecordOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/RecordOptions.cs
@@ -9,67 +9,67 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of usage-records belonging to the account used to make the request
+  /// </summary>
+  public class ReadRecordOptions : ReadOptions<RecordResource>
+  {
     /// <summary>
-    /// Retrieve a list of usage-records belonging to the account used to make the request
+    /// The SID of the Account that created the resources to read
     /// </summary>
-    public class ReadRecordOptions : ReadOptions<RecordResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The usage category of the UsageRecord resources to read
-        /// </summary>
-        public RecordResource.CategoryEnum Category { get; set; }
-        /// <summary>
-        /// Only include usage that has occurred on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Whether to include usage from the master account and all its subaccounts
-        /// </summary>
-        public bool? IncludeSubaccounts { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Category != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (IncludeSubaccounts != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The usage category of the UsageRecord resources to read
+    /// </summary>
+    public RecordResource.CategoryEnum Category { get; set; }
+    /// <summary>
+    /// Only include usage that has occurred on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Whether to include usage from the master account and all its subaccounts
+    /// </summary>
+    public bool? IncludeSubaccounts { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Category != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Category", Category.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (IncludeSubaccounts != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeSubaccounts", IncludeSubaccounts.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/RecordResource.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/RecordResource.cs
index 9a3a7b4ad..30e90dde9 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/RecordResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/RecordResource.cs
@@ -17,509 +17,509 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage
-{
-
-    public class RecordResource : Resource
-    {
-        public sealed class CategoryEnum : StringEnum
-        {
-            private CategoryEnum(string value) : base(value) {}
-            public CategoryEnum() {}
-            public static implicit operator CategoryEnum(string value)
-            {
-                return new CategoryEnum(value);
-            }
-
-            public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
-            public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
-            public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
-            public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
-            public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
-            public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
-            public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
-            public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
-            public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
-            public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
-            public static readonly CategoryEnum Calls = new CategoryEnum("calls");
-            public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
-            public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
-            public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
-            public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
-            public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
-            public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
-            public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
-            public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
-            public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
-            public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
-            public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
-            public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
-            public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
-            public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
-            public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
-            public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
-            public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
-            public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
-            public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
-            public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
-            public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
-            public static readonly CategoryEnum Cps = new CategoryEnum("cps");
-            public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
-            public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
-            public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
-            public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
-            public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
-            public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
-            public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
-            public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
-            public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
-            public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
-            public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
-            public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
-            public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
-            public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
-            public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
-            public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
-            public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
-            public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
-            public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
-            public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
-            public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
-            public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
-            public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
-            public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
-            public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
-            public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
-            public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
-            public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
-            public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
-            public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
-            public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
-            public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
-            public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
-            public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
-            public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
-            public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
-            public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
-            public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
-            public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
-            public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
-            public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
-            public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
-            public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
-            public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
-            public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
-            public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
-            public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
-            public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
-            public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
-            public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
-            public static readonly CategoryEnum Mms = new CategoryEnum("mms");
-            public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
-            public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
-            public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
-            public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
-            public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
-            public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
-            public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
-            public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
-            public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
-            public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
-            public static readonly CategoryEnum Notify = new CategoryEnum("notify");
-            public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
-            public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
-            public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
-            public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
-            public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
-            public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
-            public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
-            public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
-            public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
-            public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
-            public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
-            public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
-            public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
-            public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
-            public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
-            public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
-            public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
-            public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
-            public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
-            public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
-            public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
-            public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
-            public static readonly CategoryEnum Pv = new CategoryEnum("pv");
-            public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
-            public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
-            public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
-            public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
-            public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
-            public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
-            public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
-            public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
-            public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
-            public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
-            public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
-            public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
-            public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
-            public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
-            public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
-            public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
-            public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
-            public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
-            public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
-            public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
-            public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
-            public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
-            public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
-            public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
-            public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
-            public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
-            public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
-            public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
-            public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
-            public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
-            public static readonly CategoryEnum Sms = new CategoryEnum("sms");
-            public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
-            public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
-            public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
-            public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
-            public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
-            public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
-            public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
-            public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
-            public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
-            public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
-            public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
-            public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
-            public static readonly CategoryEnum Sync = new CategoryEnum("sync");
-            public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
-            public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
-            public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
-            public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
-            public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
-            public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
-            public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
-            public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
-            public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
-            public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
-            public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
-            public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
-            public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
-            public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
-            public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
-            public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
-            public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
-            public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
-            public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
-            public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
-            public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
-            public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
-            public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
-            public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
-            public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
-            public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
-            public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
-            public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
-            public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
-            public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
-            public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
-            public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
-            public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
-            public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
-            public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
-            public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
-            public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
-            public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
-            public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
-            public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
-            public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
-            public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
-            public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
-            public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
-            public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
-            public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
-            public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
-            public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
-            public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
-            public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
-            public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
-            public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
-            public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
-            public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
-            public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
-            public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
-            public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
-            public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
-            public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
-            public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
-            public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
-            public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
-            public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
-            public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
-            public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
-            public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
-            public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
-            public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
-            public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
-        }
-
-        private static Request BuildReadRequest(ReadRecordOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of usage-records belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Record parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Record </returns>
-        public static ResourceSet<RecordResource> Read(ReadRecordOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RecordResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<RecordResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of usage-records belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Record parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Record </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RecordResource>> ReadAsync(ReadRecordOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RecordResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<RecordResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of usage-records belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Record </returns>
-        public static ResourceSet<RecordResource> Read(string pathAccountSid = null,
-                                                       RecordResource.CategoryEnum category = null,
-                                                       DateTime? startDate = null,
-                                                       DateTime? endDate = null,
-                                                       bool? includeSubaccounts = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadRecordOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of usage-records belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="category"> The usage category of the UsageRecord resources to read </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Record </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RecordResource>> ReadAsync(string pathAccountSid = null,
-                                                                                               RecordResource.CategoryEnum category = null,
-                                                                                               DateTime? startDate = null,
-                                                                                               DateTime? endDate = null,
-                                                                                               bool? includeSubaccounts = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadRecordOptions(){PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RecordResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RecordResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RecordResource> NextPage(Page<RecordResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<RecordResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RecordResource> PreviousPage(Page<RecordResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<RecordResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a RecordResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RecordResource object represented by the provided JSON </returns>
-        public static RecordResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RecordResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account accrued the usage
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the resource
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Usage records up to date as of this timestamp
-        /// </summary>
-        [JsonProperty("as_of")]
-        public string AsOf { get; private set; }
-        /// <summary>
-        /// The category of usage
-        /// </summary>
-        [JsonProperty("category")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RecordResource.CategoryEnum Category { get; private set; }
-        /// <summary>
-        /// The number of usage events
-        /// </summary>
-        [JsonProperty("count")]
-        public string Count { get; private set; }
-        /// <summary>
-        /// The units in which count is measured
-        /// </summary>
-        [JsonProperty("count_unit")]
-        public string CountUnit { get; private set; }
-        /// <summary>
-        /// A plain-language description of the usage category
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// The last date for which usage is included in the UsageRecord
-        /// </summary>
-        [JsonProperty("end_date")]
-        public DateTime? EndDate { get; private set; }
-        /// <summary>
-        /// The total price of the usage
-        /// </summary>
-        [JsonProperty("price")]
-        public decimal? Price { get; private set; }
-        /// <summary>
-        /// The currency in which `price` is measured
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The first date for which usage is included in this UsageRecord
-        /// </summary>
-        [JsonProperty("start_date")]
-        public DateTime? StartDate { get; private set; }
-        /// <summary>
-        /// A list of related resources identified by their relative URIs
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The amount of usage
-        /// </summary>
-        [JsonProperty("usage")]
-        public string Usage { get; private set; }
-        /// <summary>
-        /// The units in which usage is measured
-        /// </summary>
-        [JsonProperty("usage_unit")]
-        public string UsageUnit { get; private set; }
-
-        private RecordResource()
-        {
-
-        }
-    }
+{
+
+  public class RecordResource : Resource
+  {
+    public sealed class CategoryEnum : StringEnum
+    {
+      private CategoryEnum(string value) : base(value) { }
+      public CategoryEnum() { }
+      public static implicit operator CategoryEnum(string value)
+      {
+        return new CategoryEnum(value);
+      }
+
+      public static readonly CategoryEnum AgentConference = new CategoryEnum("agent-conference");
+      public static readonly CategoryEnum AnsweringMachineDetection = new CategoryEnum("answering-machine-detection");
+      public static readonly CategoryEnum AuthyAuthentications = new CategoryEnum("authy-authentications");
+      public static readonly CategoryEnum AuthyCallsOutbound = new CategoryEnum("authy-calls-outbound");
+      public static readonly CategoryEnum AuthyMonthlyFees = new CategoryEnum("authy-monthly-fees");
+      public static readonly CategoryEnum AuthyPhoneIntelligence = new CategoryEnum("authy-phone-intelligence");
+      public static readonly CategoryEnum AuthyPhoneVerifications = new CategoryEnum("authy-phone-verifications");
+      public static readonly CategoryEnum AuthySmsOutbound = new CategoryEnum("authy-sms-outbound");
+      public static readonly CategoryEnum CallProgessEvents = new CategoryEnum("call-progess-events");
+      public static readonly CategoryEnum Calleridlookups = new CategoryEnum("calleridlookups");
+      public static readonly CategoryEnum Calls = new CategoryEnum("calls");
+      public static readonly CategoryEnum CallsClient = new CategoryEnum("calls-client");
+      public static readonly CategoryEnum CallsGlobalconference = new CategoryEnum("calls-globalconference");
+      public static readonly CategoryEnum CallsInbound = new CategoryEnum("calls-inbound");
+      public static readonly CategoryEnum CallsInboundLocal = new CategoryEnum("calls-inbound-local");
+      public static readonly CategoryEnum CallsInboundMobile = new CategoryEnum("calls-inbound-mobile");
+      public static readonly CategoryEnum CallsInboundTollfree = new CategoryEnum("calls-inbound-tollfree");
+      public static readonly CategoryEnum CallsOutbound = new CategoryEnum("calls-outbound");
+      public static readonly CategoryEnum CallsPayVerbTransactions = new CategoryEnum("calls-pay-verb-transactions");
+      public static readonly CategoryEnum CallsRecordings = new CategoryEnum("calls-recordings");
+      public static readonly CategoryEnum CallsSip = new CategoryEnum("calls-sip");
+      public static readonly CategoryEnum CallsSipInbound = new CategoryEnum("calls-sip-inbound");
+      public static readonly CategoryEnum CallsSipOutbound = new CategoryEnum("calls-sip-outbound");
+      public static readonly CategoryEnum CallsTransfers = new CategoryEnum("calls-transfers");
+      public static readonly CategoryEnum CarrierLookups = new CategoryEnum("carrier-lookups");
+      public static readonly CategoryEnum Conversations = new CategoryEnum("conversations");
+      public static readonly CategoryEnum ConversationsApiRequests = new CategoryEnum("conversations-api-requests");
+      public static readonly CategoryEnum ConversationsConversationEvents = new CategoryEnum("conversations-conversation-events");
+      public static readonly CategoryEnum ConversationsEndpointConnectivity = new CategoryEnum("conversations-endpoint-connectivity");
+      public static readonly CategoryEnum ConversationsEvents = new CategoryEnum("conversations-events");
+      public static readonly CategoryEnum ConversationsParticipantEvents = new CategoryEnum("conversations-participant-events");
+      public static readonly CategoryEnum ConversationsParticipants = new CategoryEnum("conversations-participants");
+      public static readonly CategoryEnum Cps = new CategoryEnum("cps");
+      public static readonly CategoryEnum FlexUsage = new CategoryEnum("flex-usage");
+      public static readonly CategoryEnum FraudLookups = new CategoryEnum("fraud-lookups");
+      public static readonly CategoryEnum GroupRooms = new CategoryEnum("group-rooms");
+      public static readonly CategoryEnum GroupRoomsDataTrack = new CategoryEnum("group-rooms-data-track");
+      public static readonly CategoryEnum GroupRoomsEncryptedMediaRecorded = new CategoryEnum("group-rooms-encrypted-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaDownloaded = new CategoryEnum("group-rooms-media-downloaded");
+      public static readonly CategoryEnum GroupRoomsMediaRecorded = new CategoryEnum("group-rooms-media-recorded");
+      public static readonly CategoryEnum GroupRoomsMediaRouted = new CategoryEnum("group-rooms-media-routed");
+      public static readonly CategoryEnum GroupRoomsMediaStored = new CategoryEnum("group-rooms-media-stored");
+      public static readonly CategoryEnum GroupRoomsParticipantMinutes = new CategoryEnum("group-rooms-participant-minutes");
+      public static readonly CategoryEnum GroupRoomsRecordedMinutes = new CategoryEnum("group-rooms-recorded-minutes");
+      public static readonly CategoryEnum ImpV1Usage = new CategoryEnum("imp-v1-usage");
+      public static readonly CategoryEnum Lookups = new CategoryEnum("lookups");
+      public static readonly CategoryEnum Marketplace = new CategoryEnum("marketplace");
+      public static readonly CategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new CategoryEnum("marketplace-algorithmia-named-entity-recognition");
+      public static readonly CategoryEnum MarketplaceCadenceTranscription = new CategoryEnum("marketplace-cadence-transcription");
+      public static readonly CategoryEnum MarketplaceCadenceTranslation = new CategoryEnum("marketplace-cadence-translation");
+      public static readonly CategoryEnum MarketplaceCapioSpeechToText = new CategoryEnum("marketplace-capio-speech-to-text");
+      public static readonly CategoryEnum MarketplaceConvrizaAbaba = new CategoryEnum("marketplace-convriza-ababa");
+      public static readonly CategoryEnum MarketplaceDeepgramPhraseDetector = new CategoryEnum("marketplace-deepgram-phrase-detector");
+      public static readonly CategoryEnum MarketplaceDigitalSegmentBusinessInfo = new CategoryEnum("marketplace-digital-segment-business-info");
+      public static readonly CategoryEnum MarketplaceFacebookOfflineConversions = new CategoryEnum("marketplace-facebook-offline-conversions");
+      public static readonly CategoryEnum MarketplaceGoogleSpeechToText = new CategoryEnum("marketplace-google-speech-to-text");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageInsights = new CategoryEnum("marketplace-ibm-watson-message-insights");
+      public static readonly CategoryEnum MarketplaceIbmWatsonMessageSentiment = new CategoryEnum("marketplace-ibm-watson-message-sentiment");
+      public static readonly CategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new CategoryEnum("marketplace-ibm-watson-recording-analysis");
+      public static readonly CategoryEnum MarketplaceIbmWatsonToneAnalyzer = new CategoryEnum("marketplace-ibm-watson-tone-analyzer");
+      public static readonly CategoryEnum MarketplaceIcehookSystemsScout = new CategoryEnum("marketplace-icehook-systems-scout");
+      public static readonly CategoryEnum MarketplaceInfogroupDataaxleBizinfo = new CategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
+      public static readonly CategoryEnum MarketplaceKeenIoContactCenterAnalytics = new CategoryEnum("marketplace-keen-io-contact-center-analytics");
+      public static readonly CategoryEnum MarketplaceMarchexCleancall = new CategoryEnum("marketplace-marchex-cleancall");
+      public static readonly CategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new CategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
+      public static readonly CategoryEnum MarketplaceMarketplaceNextcallerSocialId = new CategoryEnum("marketplace-marketplace-nextcaller-social-id");
+      public static readonly CategoryEnum MarketplaceMobileCommonsOptOutClassifier = new CategoryEnum("marketplace-mobile-commons-opt-out-classifier");
+      public static readonly CategoryEnum MarketplaceNexiwaveVoicemailToText = new CategoryEnum("marketplace-nexiwave-voicemail-to-text");
+      public static readonly CategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new CategoryEnum("marketplace-nextcaller-advanced-caller-identification");
+      public static readonly CategoryEnum MarketplaceNomoroboSpamScore = new CategoryEnum("marketplace-nomorobo-spam-score");
+      public static readonly CategoryEnum MarketplacePayfoneTcpaCompliance = new CategoryEnum("marketplace-payfone-tcpa-compliance");
+      public static readonly CategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new CategoryEnum("marketplace-remeeting-automatic-speech-recognition");
+      public static readonly CategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new CategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
+      public static readonly CategoryEnum MarketplaceTeloOpencnam = new CategoryEnum("marketplace-telo-opencnam");
+      public static readonly CategoryEnum MarketplaceTruecnamTrueSpam = new CategoryEnum("marketplace-truecnam-true-spam");
+      public static readonly CategoryEnum MarketplaceTwilioCallerNameLookupUs = new CategoryEnum("marketplace-twilio-caller-name-lookup-us");
+      public static readonly CategoryEnum MarketplaceTwilioCarrierInformationLookup = new CategoryEnum("marketplace-twilio-carrier-information-lookup");
+      public static readonly CategoryEnum MarketplaceVoicebasePci = new CategoryEnum("marketplace-voicebase-pci");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscription = new CategoryEnum("marketplace-voicebase-transcription");
+      public static readonly CategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new CategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
+      public static readonly CategoryEnum MarketplaceWhitepagesProCallerIdentification = new CategoryEnum("marketplace-whitepages-pro-caller-identification");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new CategoryEnum("marketplace-whitepages-pro-phone-intelligence");
+      public static readonly CategoryEnum MarketplaceWhitepagesProPhoneReputation = new CategoryEnum("marketplace-whitepages-pro-phone-reputation");
+      public static readonly CategoryEnum MarketplaceWolfarmSpokenResults = new CategoryEnum("marketplace-wolfarm-spoken-results");
+      public static readonly CategoryEnum MarketplaceWolframShortAnswer = new CategoryEnum("marketplace-wolfram-short-answer");
+      public static readonly CategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new CategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
+      public static readonly CategoryEnum Mediastorage = new CategoryEnum("mediastorage");
+      public static readonly CategoryEnum Mms = new CategoryEnum("mms");
+      public static readonly CategoryEnum MmsInbound = new CategoryEnum("mms-inbound");
+      public static readonly CategoryEnum MmsInboundLongcode = new CategoryEnum("mms-inbound-longcode");
+      public static readonly CategoryEnum MmsInboundShortcode = new CategoryEnum("mms-inbound-shortcode");
+      public static readonly CategoryEnum MmsMessagesCarrierfees = new CategoryEnum("mms-messages-carrierfees");
+      public static readonly CategoryEnum MmsOutbound = new CategoryEnum("mms-outbound");
+      public static readonly CategoryEnum MmsOutboundLongcode = new CategoryEnum("mms-outbound-longcode");
+      public static readonly CategoryEnum MmsOutboundShortcode = new CategoryEnum("mms-outbound-shortcode");
+      public static readonly CategoryEnum MonitorReads = new CategoryEnum("monitor-reads");
+      public static readonly CategoryEnum MonitorStorage = new CategoryEnum("monitor-storage");
+      public static readonly CategoryEnum MonitorWrites = new CategoryEnum("monitor-writes");
+      public static readonly CategoryEnum Notify = new CategoryEnum("notify");
+      public static readonly CategoryEnum NotifyActionsAttempts = new CategoryEnum("notify-actions-attempts");
+      public static readonly CategoryEnum NotifyChannels = new CategoryEnum("notify-channels");
+      public static readonly CategoryEnum NumberFormatLookups = new CategoryEnum("number-format-lookups");
+      public static readonly CategoryEnum Pchat = new CategoryEnum("pchat");
+      public static readonly CategoryEnum PchatUsers = new CategoryEnum("pchat-users");
+      public static readonly CategoryEnum PeerToPeerRoomsParticipantMinutes = new CategoryEnum("peer-to-peer-rooms-participant-minutes");
+      public static readonly CategoryEnum Pfax = new CategoryEnum("pfax");
+      public static readonly CategoryEnum PfaxMinutes = new CategoryEnum("pfax-minutes");
+      public static readonly CategoryEnum PfaxMinutesInbound = new CategoryEnum("pfax-minutes-inbound");
+      public static readonly CategoryEnum PfaxMinutesOutbound = new CategoryEnum("pfax-minutes-outbound");
+      public static readonly CategoryEnum PfaxPages = new CategoryEnum("pfax-pages");
+      public static readonly CategoryEnum Phonenumbers = new CategoryEnum("phonenumbers");
+      public static readonly CategoryEnum PhonenumbersCps = new CategoryEnum("phonenumbers-cps");
+      public static readonly CategoryEnum PhonenumbersEmergency = new CategoryEnum("phonenumbers-emergency");
+      public static readonly CategoryEnum PhonenumbersLocal = new CategoryEnum("phonenumbers-local");
+      public static readonly CategoryEnum PhonenumbersMobile = new CategoryEnum("phonenumbers-mobile");
+      public static readonly CategoryEnum PhonenumbersSetups = new CategoryEnum("phonenumbers-setups");
+      public static readonly CategoryEnum PhonenumbersTollfree = new CategoryEnum("phonenumbers-tollfree");
+      public static readonly CategoryEnum Premiumsupport = new CategoryEnum("premiumsupport");
+      public static readonly CategoryEnum Proxy = new CategoryEnum("proxy");
+      public static readonly CategoryEnum ProxyActiveSessions = new CategoryEnum("proxy-active-sessions");
+      public static readonly CategoryEnum Pstnconnectivity = new CategoryEnum("pstnconnectivity");
+      public static readonly CategoryEnum Pv = new CategoryEnum("pv");
+      public static readonly CategoryEnum PvCompositionMediaDownloaded = new CategoryEnum("pv-composition-media-downloaded");
+      public static readonly CategoryEnum PvCompositionMediaEncrypted = new CategoryEnum("pv-composition-media-encrypted");
+      public static readonly CategoryEnum PvCompositionMediaStored = new CategoryEnum("pv-composition-media-stored");
+      public static readonly CategoryEnum PvCompositionMinutes = new CategoryEnum("pv-composition-minutes");
+      public static readonly CategoryEnum PvRecordingCompositions = new CategoryEnum("pv-recording-compositions");
+      public static readonly CategoryEnum PvRoomParticipants = new CategoryEnum("pv-room-participants");
+      public static readonly CategoryEnum PvRoomParticipantsAu1 = new CategoryEnum("pv-room-participants-au1");
+      public static readonly CategoryEnum PvRoomParticipantsBr1 = new CategoryEnum("pv-room-participants-br1");
+      public static readonly CategoryEnum PvRoomParticipantsIe1 = new CategoryEnum("pv-room-participants-ie1");
+      public static readonly CategoryEnum PvRoomParticipantsJp1 = new CategoryEnum("pv-room-participants-jp1");
+      public static readonly CategoryEnum PvRoomParticipantsSg1 = new CategoryEnum("pv-room-participants-sg1");
+      public static readonly CategoryEnum PvRoomParticipantsUs1 = new CategoryEnum("pv-room-participants-us1");
+      public static readonly CategoryEnum PvRoomParticipantsUs2 = new CategoryEnum("pv-room-participants-us2");
+      public static readonly CategoryEnum PvRooms = new CategoryEnum("pv-rooms");
+      public static readonly CategoryEnum PvSipEndpointRegistrations = new CategoryEnum("pv-sip-endpoint-registrations");
+      public static readonly CategoryEnum Recordings = new CategoryEnum("recordings");
+      public static readonly CategoryEnum Recordingstorage = new CategoryEnum("recordingstorage");
+      public static readonly CategoryEnum RoomsGroupBandwidth = new CategoryEnum("rooms-group-bandwidth");
+      public static readonly CategoryEnum RoomsGroupMinutes = new CategoryEnum("rooms-group-minutes");
+      public static readonly CategoryEnum RoomsPeerToPeerMinutes = new CategoryEnum("rooms-peer-to-peer-minutes");
+      public static readonly CategoryEnum Shortcodes = new CategoryEnum("shortcodes");
+      public static readonly CategoryEnum ShortcodesCustomerowned = new CategoryEnum("shortcodes-customerowned");
+      public static readonly CategoryEnum ShortcodesMmsEnablement = new CategoryEnum("shortcodes-mms-enablement");
+      public static readonly CategoryEnum ShortcodesMps = new CategoryEnum("shortcodes-mps");
+      public static readonly CategoryEnum ShortcodesRandom = new CategoryEnum("shortcodes-random");
+      public static readonly CategoryEnum ShortcodesUk = new CategoryEnum("shortcodes-uk");
+      public static readonly CategoryEnum ShortcodesVanity = new CategoryEnum("shortcodes-vanity");
+      public static readonly CategoryEnum SmallGroupRooms = new CategoryEnum("small-group-rooms");
+      public static readonly CategoryEnum SmallGroupRoomsDataTrack = new CategoryEnum("small-group-rooms-data-track");
+      public static readonly CategoryEnum SmallGroupRoomsParticipantMinutes = new CategoryEnum("small-group-rooms-participant-minutes");
+      public static readonly CategoryEnum Sms = new CategoryEnum("sms");
+      public static readonly CategoryEnum SmsInbound = new CategoryEnum("sms-inbound");
+      public static readonly CategoryEnum SmsInboundLongcode = new CategoryEnum("sms-inbound-longcode");
+      public static readonly CategoryEnum SmsInboundShortcode = new CategoryEnum("sms-inbound-shortcode");
+      public static readonly CategoryEnum SmsMessagesCarrierfees = new CategoryEnum("sms-messages-carrierfees");
+      public static readonly CategoryEnum SmsMessagesFeatures = new CategoryEnum("sms-messages-features");
+      public static readonly CategoryEnum SmsMessagesFeaturesSenderid = new CategoryEnum("sms-messages-features-senderid");
+      public static readonly CategoryEnum SmsOutbound = new CategoryEnum("sms-outbound");
+      public static readonly CategoryEnum SmsOutboundContentInspection = new CategoryEnum("sms-outbound-content-inspection");
+      public static readonly CategoryEnum SmsOutboundLongcode = new CategoryEnum("sms-outbound-longcode");
+      public static readonly CategoryEnum SmsOutboundShortcode = new CategoryEnum("sms-outbound-shortcode");
+      public static readonly CategoryEnum SpeechRecognition = new CategoryEnum("speech-recognition");
+      public static readonly CategoryEnum StudioEngagements = new CategoryEnum("studio-engagements");
+      public static readonly CategoryEnum Sync = new CategoryEnum("sync");
+      public static readonly CategoryEnum SyncActions = new CategoryEnum("sync-actions");
+      public static readonly CategoryEnum SyncEndpointHours = new CategoryEnum("sync-endpoint-hours");
+      public static readonly CategoryEnum SyncEndpointHoursAboveDailyCap = new CategoryEnum("sync-endpoint-hours-above-daily-cap");
+      public static readonly CategoryEnum TaskrouterTasks = new CategoryEnum("taskrouter-tasks");
+      public static readonly CategoryEnum Totalprice = new CategoryEnum("totalprice");
+      public static readonly CategoryEnum Transcriptions = new CategoryEnum("transcriptions");
+      public static readonly CategoryEnum TrunkingCps = new CategoryEnum("trunking-cps");
+      public static readonly CategoryEnum TrunkingEmergencyCalls = new CategoryEnum("trunking-emergency-calls");
+      public static readonly CategoryEnum TrunkingOrigination = new CategoryEnum("trunking-origination");
+      public static readonly CategoryEnum TrunkingOriginationLocal = new CategoryEnum("trunking-origination-local");
+      public static readonly CategoryEnum TrunkingOriginationMobile = new CategoryEnum("trunking-origination-mobile");
+      public static readonly CategoryEnum TrunkingOriginationTollfree = new CategoryEnum("trunking-origination-tollfree");
+      public static readonly CategoryEnum TrunkingRecordings = new CategoryEnum("trunking-recordings");
+      public static readonly CategoryEnum TrunkingSecure = new CategoryEnum("trunking-secure");
+      public static readonly CategoryEnum TrunkingTermination = new CategoryEnum("trunking-termination");
+      public static readonly CategoryEnum Turnmegabytes = new CategoryEnum("turnmegabytes");
+      public static readonly CategoryEnum TurnmegabytesAustralia = new CategoryEnum("turnmegabytes-australia");
+      public static readonly CategoryEnum TurnmegabytesBrasil = new CategoryEnum("turnmegabytes-brasil");
+      public static readonly CategoryEnum TurnmegabytesGermany = new CategoryEnum("turnmegabytes-germany");
+      public static readonly CategoryEnum TurnmegabytesIndia = new CategoryEnum("turnmegabytes-india");
+      public static readonly CategoryEnum TurnmegabytesIreland = new CategoryEnum("turnmegabytes-ireland");
+      public static readonly CategoryEnum TurnmegabytesJapan = new CategoryEnum("turnmegabytes-japan");
+      public static readonly CategoryEnum TurnmegabytesSingapore = new CategoryEnum("turnmegabytes-singapore");
+      public static readonly CategoryEnum TurnmegabytesUseast = new CategoryEnum("turnmegabytes-useast");
+      public static readonly CategoryEnum TurnmegabytesUswest = new CategoryEnum("turnmegabytes-uswest");
+      public static readonly CategoryEnum TwilioInterconnect = new CategoryEnum("twilio-interconnect");
+      public static readonly CategoryEnum VerifyPush = new CategoryEnum("verify-push");
+      public static readonly CategoryEnum VideoRecordings = new CategoryEnum("video-recordings");
+      public static readonly CategoryEnum VoiceInsights = new CategoryEnum("voice-insights");
+      public static readonly CategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new CategoryEnum("voice-insights-client-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new CategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
+      public static readonly CategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new CategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
+      public static readonly CategoryEnum Wireless = new CategoryEnum("wireless");
+      public static readonly CategoryEnum WirelessOrders = new CategoryEnum("wireless-orders");
+      public static readonly CategoryEnum WirelessOrdersArtwork = new CategoryEnum("wireless-orders-artwork");
+      public static readonly CategoryEnum WirelessOrdersBulk = new CategoryEnum("wireless-orders-bulk");
+      public static readonly CategoryEnum WirelessOrdersEsim = new CategoryEnum("wireless-orders-esim");
+      public static readonly CategoryEnum WirelessOrdersStarter = new CategoryEnum("wireless-orders-starter");
+      public static readonly CategoryEnum WirelessUsage = new CategoryEnum("wireless-usage");
+      public static readonly CategoryEnum WirelessUsageCommands = new CategoryEnum("wireless-usage-commands");
+      public static readonly CategoryEnum WirelessUsageCommandsAfrica = new CategoryEnum("wireless-usage-commands-africa");
+      public static readonly CategoryEnum WirelessUsageCommandsAsia = new CategoryEnum("wireless-usage-commands-asia");
+      public static readonly CategoryEnum WirelessUsageCommandsCentralandsouthamerica = new CategoryEnum("wireless-usage-commands-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsEurope = new CategoryEnum("wireless-usage-commands-europe");
+      public static readonly CategoryEnum WirelessUsageCommandsHome = new CategoryEnum("wireless-usage-commands-home");
+      public static readonly CategoryEnum WirelessUsageCommandsNorthamerica = new CategoryEnum("wireless-usage-commands-northamerica");
+      public static readonly CategoryEnum WirelessUsageCommandsOceania = new CategoryEnum("wireless-usage-commands-oceania");
+      public static readonly CategoryEnum WirelessUsageCommandsRoaming = new CategoryEnum("wireless-usage-commands-roaming");
+      public static readonly CategoryEnum WirelessUsageData = new CategoryEnum("wireless-usage-data");
+      public static readonly CategoryEnum WirelessUsageDataAfrica = new CategoryEnum("wireless-usage-data-africa");
+      public static readonly CategoryEnum WirelessUsageDataAsia = new CategoryEnum("wireless-usage-data-asia");
+      public static readonly CategoryEnum WirelessUsageDataCentralandsouthamerica = new CategoryEnum("wireless-usage-data-centralandsouthamerica");
+      public static readonly CategoryEnum WirelessUsageDataCustomAdditionalmb = new CategoryEnum("wireless-usage-data-custom-additionalmb");
+      public static readonly CategoryEnum WirelessUsageDataCustomFirst5Mb = new CategoryEnum("wireless-usage-data-custom-first5mb");
+      public static readonly CategoryEnum WirelessUsageDataDomesticRoaming = new CategoryEnum("wireless-usage-data-domestic-roaming");
+      public static readonly CategoryEnum WirelessUsageDataEurope = new CategoryEnum("wireless-usage-data-europe");
+      public static readonly CategoryEnum WirelessUsageDataIndividualAdditionalgb = new CategoryEnum("wireless-usage-data-individual-additionalgb");
+      public static readonly CategoryEnum WirelessUsageDataIndividualFirstgb = new CategoryEnum("wireless-usage-data-individual-firstgb");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingCanada = new CategoryEnum("wireless-usage-data-international-roaming-canada");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingIndia = new CategoryEnum("wireless-usage-data-international-roaming-india");
+      public static readonly CategoryEnum WirelessUsageDataInternationalRoamingMexico = new CategoryEnum("wireless-usage-data-international-roaming-mexico");
+      public static readonly CategoryEnum WirelessUsageDataNorthamerica = new CategoryEnum("wireless-usage-data-northamerica");
+      public static readonly CategoryEnum WirelessUsageDataOceania = new CategoryEnum("wireless-usage-data-oceania");
+      public static readonly CategoryEnum WirelessUsageDataPooled = new CategoryEnum("wireless-usage-data-pooled");
+      public static readonly CategoryEnum WirelessUsageDataPooledDownlink = new CategoryEnum("wireless-usage-data-pooled-downlink");
+      public static readonly CategoryEnum WirelessUsageDataPooledUplink = new CategoryEnum("wireless-usage-data-pooled-uplink");
+      public static readonly CategoryEnum WirelessUsageMrc = new CategoryEnum("wireless-usage-mrc");
+      public static readonly CategoryEnum WirelessUsageMrcCustom = new CategoryEnum("wireless-usage-mrc-custom");
+      public static readonly CategoryEnum WirelessUsageMrcIndividual = new CategoryEnum("wireless-usage-mrc-individual");
+      public static readonly CategoryEnum WirelessUsageMrcPooled = new CategoryEnum("wireless-usage-mrc-pooled");
+      public static readonly CategoryEnum WirelessUsageMrcSuspended = new CategoryEnum("wireless-usage-mrc-suspended");
+      public static readonly CategoryEnum WirelessUsageSms = new CategoryEnum("wireless-usage-sms");
+      public static readonly CategoryEnum WirelessUsageVoice = new CategoryEnum("wireless-usage-voice");
+    }
+
+    private static Request BuildReadRequest(ReadRecordOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Records.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of usage-records belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Record parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Record </returns>
+    public static ResourceSet<RecordResource> Read(ReadRecordOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RecordResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<RecordResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of usage-records belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Record parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Record </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RecordResource>> ReadAsync(ReadRecordOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RecordResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<RecordResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of usage-records belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Record </returns>
+    public static ResourceSet<RecordResource> Read(string pathAccountSid = null,
+                                                   RecordResource.CategoryEnum category = null,
+                                                   DateTime? startDate = null,
+                                                   DateTime? endDate = null,
+                                                   bool? includeSubaccounts = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadRecordOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of usage-records belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="category"> The usage category of the UsageRecord resources to read </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="includeSubaccounts"> Whether to include usage from the master account and all its subaccounts </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Record </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RecordResource>> ReadAsync(string pathAccountSid = null,
+                                                                                           RecordResource.CategoryEnum category = null,
+                                                                                           DateTime? startDate = null,
+                                                                                           DateTime? endDate = null,
+                                                                                           bool? includeSubaccounts = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadRecordOptions() { PathAccountSid = pathAccountSid, Category = category, StartDate = startDate, EndDate = endDate, IncludeSubaccounts = includeSubaccounts, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RecordResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RecordResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RecordResource> NextPage(Page<RecordResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<RecordResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RecordResource> PreviousPage(Page<RecordResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<RecordResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a RecordResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RecordResource object represented by the provided JSON </returns>
+    public static RecordResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RecordResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account accrued the usage
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the resource
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Usage records up to date as of this timestamp
+    /// </summary>
+    [JsonProperty("as_of")]
+    public string AsOf { get; private set; }
+    /// <summary>
+    /// The category of usage
+    /// </summary>
+    [JsonProperty("category")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RecordResource.CategoryEnum Category { get; private set; }
+    /// <summary>
+    /// The number of usage events
+    /// </summary>
+    [JsonProperty("count")]
+    public string Count { get; private set; }
+    /// <summary>
+    /// The units in which count is measured
+    /// </summary>
+    [JsonProperty("count_unit")]
+    public string CountUnit { get; private set; }
+    /// <summary>
+    /// A plain-language description of the usage category
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// The last date for which usage is included in the UsageRecord
+    /// </summary>
+    [JsonProperty("end_date")]
+    public DateTime? EndDate { get; private set; }
+    /// <summary>
+    /// The total price of the usage
+    /// </summary>
+    [JsonProperty("price")]
+    public decimal? Price { get; private set; }
+    /// <summary>
+    /// The currency in which `price` is measured
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The first date for which usage is included in this UsageRecord
+    /// </summary>
+    [JsonProperty("start_date")]
+    public DateTime? StartDate { get; private set; }
+    /// <summary>
+    /// A list of related resources identified by their relative URIs
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The amount of usage
+    /// </summary>
+    [JsonProperty("usage")]
+    public string Usage { get; private set; }
+    /// <summary>
+    /// The units in which usage is measured
+    /// </summary>
+    [JsonProperty("usage_unit")]
+    public string UsageUnit { get; private set; }
+
+    private RecordResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/TriggerOptions.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/TriggerOptions.cs
index d4de729ce..53653c7dd 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/TriggerOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/TriggerOptions.cs
@@ -9,280 +9,280 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage
-{
-
+{
+
+  /// <summary>
+  /// Fetch and instance of a usage-trigger
+  /// </summary>
+  public class FetchTriggerOptions : IOptions<TriggerResource>
+  {
     /// <summary>
-    /// Fetch and instance of a usage-trigger
+    /// The SID of the Account that created the resource to fetch
     /// </summary>
-    public class FetchTriggerOptions : IOptions<TriggerResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resource to fetch
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTriggerOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchTriggerOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAccountSid { get; set; }
     /// <summary>
-    /// Update an instance of a usage trigger
+    /// The unique string that identifies the resource
     /// </summary>
-    public class UpdateTriggerOptions : IOptions<TriggerResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to update
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The HTTP method to use to call callback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod CallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we call when the trigger fires
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateTriggerOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateTriggerOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (CallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteTriggerOptions
+    /// Construct a new FetchTriggerOptions
     /// </summary>
-    public class DeleteTriggerOptions : IOptions<TriggerResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to delete
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteTriggerOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteTriggerOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchTriggerOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// Create a new UsageTrigger
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateTriggerOptions : IOptions<TriggerResource>
-    {
-        /// <summary>
-        /// The SID of the Account that will create the resource
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The URL we call when the trigger fires
-        /// </summary>
-        public Uri CallbackUrl { get; }
-        /// <summary>
-        /// The usage value at which the trigger should fire
-        /// </summary>
-        public string TriggerValue { get; }
-        /// <summary>
-        /// The usage category the trigger watches
-        /// </summary>
-        public TriggerResource.UsageCategoryEnum UsageCategory { get; }
-        /// <summary>
-        /// The HTTP method to use to call callback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod CallbackMethod { get; set; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The frequency of a recurring UsageTrigger
-        /// </summary>
-        public TriggerResource.RecurringEnum Recurring { get; set; }
-        /// <summary>
-        /// The field in the UsageRecord resource that fires the trigger
-        /// </summary>
-        public TriggerResource.TriggerFieldEnum TriggerBy { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateTriggerOptions
-        /// </summary>
-        /// <param name="callbackUrl"> The URL we call when the trigger fires </param>
-        /// <param name="triggerValue"> The usage value at which the trigger should fire </param>
-        /// <param name="usageCategory"> The usage category the trigger watches </param>
-        public CreateTriggerOptions(Uri callbackUrl, string triggerValue, TriggerResource.UsageCategoryEnum usageCategory)
-        {
-            CallbackUrl = callbackUrl;
-            TriggerValue = triggerValue;
-            UsageCategory = usageCategory;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (TriggerValue != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TriggerValue", TriggerValue));
-            }
-
-            if (UsageCategory != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UsageCategory", UsageCategory.ToString()));
-            }
-
-            if (CallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Recurring != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Recurring", Recurring.ToString()));
-            }
-
-            if (TriggerBy != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TriggerBy", TriggerBy.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an instance of a usage trigger
+  /// </summary>
+  public class UpdateTriggerOptions : IOptions<TriggerResource>
+  {
     /// <summary>
-    /// Retrieve a list of usage-triggers belonging to the account used to make the request
+    /// The SID of the Account that created the resources to update
     /// </summary>
-    public class ReadTriggerOptions : ReadOptions<TriggerResource>
-    {
-        /// <summary>
-        /// The SID of the Account that created the resources to read
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The frequency of recurring UsageTriggers to read
-        /// </summary>
-        public TriggerResource.RecurringEnum Recurring { get; set; }
-        /// <summary>
-        /// The trigger field of the UsageTriggers to read
-        /// </summary>
-        public TriggerResource.TriggerFieldEnum TriggerBy { get; set; }
-        /// <summary>
-        /// The usage category of the UsageTriggers to read
-        /// </summary>
-        public TriggerResource.UsageCategoryEnum UsageCategory { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Recurring != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Recurring", Recurring.ToString()));
-            }
-
-            if (TriggerBy != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TriggerBy", TriggerBy.ToString()));
-            }
-
-            if (UsageCategory != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UsageCategory", UsageCategory.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The HTTP method to use to call callback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod CallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we call when the trigger fires
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateTriggerOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateTriggerOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (CallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteTriggerOptions
+  /// </summary>
+  public class DeleteTriggerOptions : IOptions<TriggerResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to delete
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteTriggerOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteTriggerOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Create a new UsageTrigger
+  /// </summary>
+  public class CreateTriggerOptions : IOptions<TriggerResource>
+  {
+    /// <summary>
+    /// The SID of the Account that will create the resource
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The URL we call when the trigger fires
+    /// </summary>
+    public Uri CallbackUrl { get; }
+    /// <summary>
+    /// The usage value at which the trigger should fire
+    /// </summary>
+    public string TriggerValue { get; }
+    /// <summary>
+    /// The usage category the trigger watches
+    /// </summary>
+    public TriggerResource.UsageCategoryEnum UsageCategory { get; }
+    /// <summary>
+    /// The HTTP method to use to call callback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod CallbackMethod { get; set; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The frequency of a recurring UsageTrigger
+    /// </summary>
+    public TriggerResource.RecurringEnum Recurring { get; set; }
+    /// <summary>
+    /// The field in the UsageRecord resource that fires the trigger
+    /// </summary>
+    public TriggerResource.TriggerFieldEnum TriggerBy { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateTriggerOptions
+    /// </summary>
+    /// <param name="callbackUrl"> The URL we call when the trigger fires </param>
+    /// <param name="triggerValue"> The usage value at which the trigger should fire </param>
+    /// <param name="usageCategory"> The usage category the trigger watches </param>
+    public CreateTriggerOptions(Uri callbackUrl, string triggerValue, TriggerResource.UsageCategoryEnum usageCategory)
+    {
+      CallbackUrl = callbackUrl;
+      TriggerValue = triggerValue;
+      UsageCategory = usageCategory;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (TriggerValue != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TriggerValue", TriggerValue));
+      }
+
+      if (UsageCategory != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UsageCategory", UsageCategory.ToString()));
+      }
+
+      if (CallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Recurring != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Recurring", Recurring.ToString()));
+      }
+
+      if (TriggerBy != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TriggerBy", TriggerBy.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of usage-triggers belonging to the account used to make the request
+  /// </summary>
+  public class ReadTriggerOptions : ReadOptions<TriggerResource>
+  {
+    /// <summary>
+    /// The SID of the Account that created the resources to read
+    /// </summary>
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The frequency of recurring UsageTriggers to read
+    /// </summary>
+    public TriggerResource.RecurringEnum Recurring { get; set; }
+    /// <summary>
+    /// The trigger field of the UsageTriggers to read
+    /// </summary>
+    public TriggerResource.TriggerFieldEnum TriggerBy { get; set; }
+    /// <summary>
+    /// The usage category of the UsageTriggers to read
+    /// </summary>
+    public TriggerResource.UsageCategoryEnum UsageCategory { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Recurring != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Recurring", Recurring.ToString()));
+      }
+
+      if (TriggerBy != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TriggerBy", TriggerBy.ToString()));
+      }
+
+      if (UsageCategory != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UsageCategory", UsageCategory.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/Usage/TriggerResource.cs b/src/Twilio/Rest/Api/V2010/Account/Usage/TriggerResource.cs
index 728e5d096..678379fb0 100644
--- a/src/Twilio/Rest/Api/V2010/Account/Usage/TriggerResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/Usage/TriggerResource.cs
@@ -17,862 +17,862 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010.Account.Usage
-{
-
-    public class TriggerResource : Resource
-    {
-        public sealed class UsageCategoryEnum : StringEnum
-        {
-            private UsageCategoryEnum(string value) : base(value) {}
-            public UsageCategoryEnum() {}
-            public static implicit operator UsageCategoryEnum(string value)
-            {
-                return new UsageCategoryEnum(value);
-            }
-
-            public static readonly UsageCategoryEnum AgentConference = new UsageCategoryEnum("agent-conference");
-            public static readonly UsageCategoryEnum AnsweringMachineDetection = new UsageCategoryEnum("answering-machine-detection");
-            public static readonly UsageCategoryEnum AuthyAuthentications = new UsageCategoryEnum("authy-authentications");
-            public static readonly UsageCategoryEnum AuthyCallsOutbound = new UsageCategoryEnum("authy-calls-outbound");
-            public static readonly UsageCategoryEnum AuthyMonthlyFees = new UsageCategoryEnum("authy-monthly-fees");
-            public static readonly UsageCategoryEnum AuthyPhoneIntelligence = new UsageCategoryEnum("authy-phone-intelligence");
-            public static readonly UsageCategoryEnum AuthyPhoneVerifications = new UsageCategoryEnum("authy-phone-verifications");
-            public static readonly UsageCategoryEnum AuthySmsOutbound = new UsageCategoryEnum("authy-sms-outbound");
-            public static readonly UsageCategoryEnum CallProgessEvents = new UsageCategoryEnum("call-progess-events");
-            public static readonly UsageCategoryEnum Calleridlookups = new UsageCategoryEnum("calleridlookups");
-            public static readonly UsageCategoryEnum Calls = new UsageCategoryEnum("calls");
-            public static readonly UsageCategoryEnum CallsClient = new UsageCategoryEnum("calls-client");
-            public static readonly UsageCategoryEnum CallsGlobalconference = new UsageCategoryEnum("calls-globalconference");
-            public static readonly UsageCategoryEnum CallsInbound = new UsageCategoryEnum("calls-inbound");
-            public static readonly UsageCategoryEnum CallsInboundLocal = new UsageCategoryEnum("calls-inbound-local");
-            public static readonly UsageCategoryEnum CallsInboundMobile = new UsageCategoryEnum("calls-inbound-mobile");
-            public static readonly UsageCategoryEnum CallsInboundTollfree = new UsageCategoryEnum("calls-inbound-tollfree");
-            public static readonly UsageCategoryEnum CallsOutbound = new UsageCategoryEnum("calls-outbound");
-            public static readonly UsageCategoryEnum CallsPayVerbTransactions = new UsageCategoryEnum("calls-pay-verb-transactions");
-            public static readonly UsageCategoryEnum CallsRecordings = new UsageCategoryEnum("calls-recordings");
-            public static readonly UsageCategoryEnum CallsSip = new UsageCategoryEnum("calls-sip");
-            public static readonly UsageCategoryEnum CallsSipInbound = new UsageCategoryEnum("calls-sip-inbound");
-            public static readonly UsageCategoryEnum CallsSipOutbound = new UsageCategoryEnum("calls-sip-outbound");
-            public static readonly UsageCategoryEnum CallsTransfers = new UsageCategoryEnum("calls-transfers");
-            public static readonly UsageCategoryEnum CarrierLookups = new UsageCategoryEnum("carrier-lookups");
-            public static readonly UsageCategoryEnum Conversations = new UsageCategoryEnum("conversations");
-            public static readonly UsageCategoryEnum ConversationsApiRequests = new UsageCategoryEnum("conversations-api-requests");
-            public static readonly UsageCategoryEnum ConversationsConversationEvents = new UsageCategoryEnum("conversations-conversation-events");
-            public static readonly UsageCategoryEnum ConversationsEndpointConnectivity = new UsageCategoryEnum("conversations-endpoint-connectivity");
-            public static readonly UsageCategoryEnum ConversationsEvents = new UsageCategoryEnum("conversations-events");
-            public static readonly UsageCategoryEnum ConversationsParticipantEvents = new UsageCategoryEnum("conversations-participant-events");
-            public static readonly UsageCategoryEnum ConversationsParticipants = new UsageCategoryEnum("conversations-participants");
-            public static readonly UsageCategoryEnum Cps = new UsageCategoryEnum("cps");
-            public static readonly UsageCategoryEnum FlexUsage = new UsageCategoryEnum("flex-usage");
-            public static readonly UsageCategoryEnum FraudLookups = new UsageCategoryEnum("fraud-lookups");
-            public static readonly UsageCategoryEnum GroupRooms = new UsageCategoryEnum("group-rooms");
-            public static readonly UsageCategoryEnum GroupRoomsDataTrack = new UsageCategoryEnum("group-rooms-data-track");
-            public static readonly UsageCategoryEnum GroupRoomsEncryptedMediaRecorded = new UsageCategoryEnum("group-rooms-encrypted-media-recorded");
-            public static readonly UsageCategoryEnum GroupRoomsMediaDownloaded = new UsageCategoryEnum("group-rooms-media-downloaded");
-            public static readonly UsageCategoryEnum GroupRoomsMediaRecorded = new UsageCategoryEnum("group-rooms-media-recorded");
-            public static readonly UsageCategoryEnum GroupRoomsMediaRouted = new UsageCategoryEnum("group-rooms-media-routed");
-            public static readonly UsageCategoryEnum GroupRoomsMediaStored = new UsageCategoryEnum("group-rooms-media-stored");
-            public static readonly UsageCategoryEnum GroupRoomsParticipantMinutes = new UsageCategoryEnum("group-rooms-participant-minutes");
-            public static readonly UsageCategoryEnum GroupRoomsRecordedMinutes = new UsageCategoryEnum("group-rooms-recorded-minutes");
-            public static readonly UsageCategoryEnum ImpV1Usage = new UsageCategoryEnum("imp-v1-usage");
-            public static readonly UsageCategoryEnum Lookups = new UsageCategoryEnum("lookups");
-            public static readonly UsageCategoryEnum Marketplace = new UsageCategoryEnum("marketplace");
-            public static readonly UsageCategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new UsageCategoryEnum("marketplace-algorithmia-named-entity-recognition");
-            public static readonly UsageCategoryEnum MarketplaceCadenceTranscription = new UsageCategoryEnum("marketplace-cadence-transcription");
-            public static readonly UsageCategoryEnum MarketplaceCadenceTranslation = new UsageCategoryEnum("marketplace-cadence-translation");
-            public static readonly UsageCategoryEnum MarketplaceCapioSpeechToText = new UsageCategoryEnum("marketplace-capio-speech-to-text");
-            public static readonly UsageCategoryEnum MarketplaceConvrizaAbaba = new UsageCategoryEnum("marketplace-convriza-ababa");
-            public static readonly UsageCategoryEnum MarketplaceDeepgramPhraseDetector = new UsageCategoryEnum("marketplace-deepgram-phrase-detector");
-            public static readonly UsageCategoryEnum MarketplaceDigitalSegmentBusinessInfo = new UsageCategoryEnum("marketplace-digital-segment-business-info");
-            public static readonly UsageCategoryEnum MarketplaceFacebookOfflineConversions = new UsageCategoryEnum("marketplace-facebook-offline-conversions");
-            public static readonly UsageCategoryEnum MarketplaceGoogleSpeechToText = new UsageCategoryEnum("marketplace-google-speech-to-text");
-            public static readonly UsageCategoryEnum MarketplaceIbmWatsonMessageInsights = new UsageCategoryEnum("marketplace-ibm-watson-message-insights");
-            public static readonly UsageCategoryEnum MarketplaceIbmWatsonMessageSentiment = new UsageCategoryEnum("marketplace-ibm-watson-message-sentiment");
-            public static readonly UsageCategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new UsageCategoryEnum("marketplace-ibm-watson-recording-analysis");
-            public static readonly UsageCategoryEnum MarketplaceIbmWatsonToneAnalyzer = new UsageCategoryEnum("marketplace-ibm-watson-tone-analyzer");
-            public static readonly UsageCategoryEnum MarketplaceIcehookSystemsScout = new UsageCategoryEnum("marketplace-icehook-systems-scout");
-            public static readonly UsageCategoryEnum MarketplaceInfogroupDataaxleBizinfo = new UsageCategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
-            public static readonly UsageCategoryEnum MarketplaceKeenIoContactCenterAnalytics = new UsageCategoryEnum("marketplace-keen-io-contact-center-analytics");
-            public static readonly UsageCategoryEnum MarketplaceMarchexCleancall = new UsageCategoryEnum("marketplace-marchex-cleancall");
-            public static readonly UsageCategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new UsageCategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
-            public static readonly UsageCategoryEnum MarketplaceMarketplaceNextcallerSocialId = new UsageCategoryEnum("marketplace-marketplace-nextcaller-social-id");
-            public static readonly UsageCategoryEnum MarketplaceMobileCommonsOptOutClassifier = new UsageCategoryEnum("marketplace-mobile-commons-opt-out-classifier");
-            public static readonly UsageCategoryEnum MarketplaceNexiwaveVoicemailToText = new UsageCategoryEnum("marketplace-nexiwave-voicemail-to-text");
-            public static readonly UsageCategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new UsageCategoryEnum("marketplace-nextcaller-advanced-caller-identification");
-            public static readonly UsageCategoryEnum MarketplaceNomoroboSpamScore = new UsageCategoryEnum("marketplace-nomorobo-spam-score");
-            public static readonly UsageCategoryEnum MarketplacePayfoneTcpaCompliance = new UsageCategoryEnum("marketplace-payfone-tcpa-compliance");
-            public static readonly UsageCategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new UsageCategoryEnum("marketplace-remeeting-automatic-speech-recognition");
-            public static readonly UsageCategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new UsageCategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
-            public static readonly UsageCategoryEnum MarketplaceTeloOpencnam = new UsageCategoryEnum("marketplace-telo-opencnam");
-            public static readonly UsageCategoryEnum MarketplaceTruecnamTrueSpam = new UsageCategoryEnum("marketplace-truecnam-true-spam");
-            public static readonly UsageCategoryEnum MarketplaceTwilioCallerNameLookupUs = new UsageCategoryEnum("marketplace-twilio-caller-name-lookup-us");
-            public static readonly UsageCategoryEnum MarketplaceTwilioCarrierInformationLookup = new UsageCategoryEnum("marketplace-twilio-carrier-information-lookup");
-            public static readonly UsageCategoryEnum MarketplaceVoicebasePci = new UsageCategoryEnum("marketplace-voicebase-pci");
-            public static readonly UsageCategoryEnum MarketplaceVoicebaseTranscription = new UsageCategoryEnum("marketplace-voicebase-transcription");
-            public static readonly UsageCategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new UsageCategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
-            public static readonly UsageCategoryEnum MarketplaceWhitepagesProCallerIdentification = new UsageCategoryEnum("marketplace-whitepages-pro-caller-identification");
-            public static readonly UsageCategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new UsageCategoryEnum("marketplace-whitepages-pro-phone-intelligence");
-            public static readonly UsageCategoryEnum MarketplaceWhitepagesProPhoneReputation = new UsageCategoryEnum("marketplace-whitepages-pro-phone-reputation");
-            public static readonly UsageCategoryEnum MarketplaceWolfarmSpokenResults = new UsageCategoryEnum("marketplace-wolfarm-spoken-results");
-            public static readonly UsageCategoryEnum MarketplaceWolframShortAnswer = new UsageCategoryEnum("marketplace-wolfram-short-answer");
-            public static readonly UsageCategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new UsageCategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
-            public static readonly UsageCategoryEnum Mediastorage = new UsageCategoryEnum("mediastorage");
-            public static readonly UsageCategoryEnum Mms = new UsageCategoryEnum("mms");
-            public static readonly UsageCategoryEnum MmsInbound = new UsageCategoryEnum("mms-inbound");
-            public static readonly UsageCategoryEnum MmsInboundLongcode = new UsageCategoryEnum("mms-inbound-longcode");
-            public static readonly UsageCategoryEnum MmsInboundShortcode = new UsageCategoryEnum("mms-inbound-shortcode");
-            public static readonly UsageCategoryEnum MmsMessagesCarrierfees = new UsageCategoryEnum("mms-messages-carrierfees");
-            public static readonly UsageCategoryEnum MmsOutbound = new UsageCategoryEnum("mms-outbound");
-            public static readonly UsageCategoryEnum MmsOutboundLongcode = new UsageCategoryEnum("mms-outbound-longcode");
-            public static readonly UsageCategoryEnum MmsOutboundShortcode = new UsageCategoryEnum("mms-outbound-shortcode");
-            public static readonly UsageCategoryEnum MonitorReads = new UsageCategoryEnum("monitor-reads");
-            public static readonly UsageCategoryEnum MonitorStorage = new UsageCategoryEnum("monitor-storage");
-            public static readonly UsageCategoryEnum MonitorWrites = new UsageCategoryEnum("monitor-writes");
-            public static readonly UsageCategoryEnum Notify = new UsageCategoryEnum("notify");
-            public static readonly UsageCategoryEnum NotifyActionsAttempts = new UsageCategoryEnum("notify-actions-attempts");
-            public static readonly UsageCategoryEnum NotifyChannels = new UsageCategoryEnum("notify-channels");
-            public static readonly UsageCategoryEnum NumberFormatLookups = new UsageCategoryEnum("number-format-lookups");
-            public static readonly UsageCategoryEnum Pchat = new UsageCategoryEnum("pchat");
-            public static readonly UsageCategoryEnum PchatUsers = new UsageCategoryEnum("pchat-users");
-            public static readonly UsageCategoryEnum PeerToPeerRoomsParticipantMinutes = new UsageCategoryEnum("peer-to-peer-rooms-participant-minutes");
-            public static readonly UsageCategoryEnum Pfax = new UsageCategoryEnum("pfax");
-            public static readonly UsageCategoryEnum PfaxMinutes = new UsageCategoryEnum("pfax-minutes");
-            public static readonly UsageCategoryEnum PfaxMinutesInbound = new UsageCategoryEnum("pfax-minutes-inbound");
-            public static readonly UsageCategoryEnum PfaxMinutesOutbound = new UsageCategoryEnum("pfax-minutes-outbound");
-            public static readonly UsageCategoryEnum PfaxPages = new UsageCategoryEnum("pfax-pages");
-            public static readonly UsageCategoryEnum Phonenumbers = new UsageCategoryEnum("phonenumbers");
-            public static readonly UsageCategoryEnum PhonenumbersCps = new UsageCategoryEnum("phonenumbers-cps");
-            public static readonly UsageCategoryEnum PhonenumbersEmergency = new UsageCategoryEnum("phonenumbers-emergency");
-            public static readonly UsageCategoryEnum PhonenumbersLocal = new UsageCategoryEnum("phonenumbers-local");
-            public static readonly UsageCategoryEnum PhonenumbersMobile = new UsageCategoryEnum("phonenumbers-mobile");
-            public static readonly UsageCategoryEnum PhonenumbersSetups = new UsageCategoryEnum("phonenumbers-setups");
-            public static readonly UsageCategoryEnum PhonenumbersTollfree = new UsageCategoryEnum("phonenumbers-tollfree");
-            public static readonly UsageCategoryEnum Premiumsupport = new UsageCategoryEnum("premiumsupport");
-            public static readonly UsageCategoryEnum Proxy = new UsageCategoryEnum("proxy");
-            public static readonly UsageCategoryEnum ProxyActiveSessions = new UsageCategoryEnum("proxy-active-sessions");
-            public static readonly UsageCategoryEnum Pstnconnectivity = new UsageCategoryEnum("pstnconnectivity");
-            public static readonly UsageCategoryEnum Pv = new UsageCategoryEnum("pv");
-            public static readonly UsageCategoryEnum PvCompositionMediaDownloaded = new UsageCategoryEnum("pv-composition-media-downloaded");
-            public static readonly UsageCategoryEnum PvCompositionMediaEncrypted = new UsageCategoryEnum("pv-composition-media-encrypted");
-            public static readonly UsageCategoryEnum PvCompositionMediaStored = new UsageCategoryEnum("pv-composition-media-stored");
-            public static readonly UsageCategoryEnum PvCompositionMinutes = new UsageCategoryEnum("pv-composition-minutes");
-            public static readonly UsageCategoryEnum PvRecordingCompositions = new UsageCategoryEnum("pv-recording-compositions");
-            public static readonly UsageCategoryEnum PvRoomParticipants = new UsageCategoryEnum("pv-room-participants");
-            public static readonly UsageCategoryEnum PvRoomParticipantsAu1 = new UsageCategoryEnum("pv-room-participants-au1");
-            public static readonly UsageCategoryEnum PvRoomParticipantsBr1 = new UsageCategoryEnum("pv-room-participants-br1");
-            public static readonly UsageCategoryEnum PvRoomParticipantsIe1 = new UsageCategoryEnum("pv-room-participants-ie1");
-            public static readonly UsageCategoryEnum PvRoomParticipantsJp1 = new UsageCategoryEnum("pv-room-participants-jp1");
-            public static readonly UsageCategoryEnum PvRoomParticipantsSg1 = new UsageCategoryEnum("pv-room-participants-sg1");
-            public static readonly UsageCategoryEnum PvRoomParticipantsUs1 = new UsageCategoryEnum("pv-room-participants-us1");
-            public static readonly UsageCategoryEnum PvRoomParticipantsUs2 = new UsageCategoryEnum("pv-room-participants-us2");
-            public static readonly UsageCategoryEnum PvRooms = new UsageCategoryEnum("pv-rooms");
-            public static readonly UsageCategoryEnum PvSipEndpointRegistrations = new UsageCategoryEnum("pv-sip-endpoint-registrations");
-            public static readonly UsageCategoryEnum Recordings = new UsageCategoryEnum("recordings");
-            public static readonly UsageCategoryEnum Recordingstorage = new UsageCategoryEnum("recordingstorage");
-            public static readonly UsageCategoryEnum RoomsGroupBandwidth = new UsageCategoryEnum("rooms-group-bandwidth");
-            public static readonly UsageCategoryEnum RoomsGroupMinutes = new UsageCategoryEnum("rooms-group-minutes");
-            public static readonly UsageCategoryEnum RoomsPeerToPeerMinutes = new UsageCategoryEnum("rooms-peer-to-peer-minutes");
-            public static readonly UsageCategoryEnum Shortcodes = new UsageCategoryEnum("shortcodes");
-            public static readonly UsageCategoryEnum ShortcodesCustomerowned = new UsageCategoryEnum("shortcodes-customerowned");
-            public static readonly UsageCategoryEnum ShortcodesMmsEnablement = new UsageCategoryEnum("shortcodes-mms-enablement");
-            public static readonly UsageCategoryEnum ShortcodesMps = new UsageCategoryEnum("shortcodes-mps");
-            public static readonly UsageCategoryEnum ShortcodesRandom = new UsageCategoryEnum("shortcodes-random");
-            public static readonly UsageCategoryEnum ShortcodesUk = new UsageCategoryEnum("shortcodes-uk");
-            public static readonly UsageCategoryEnum ShortcodesVanity = new UsageCategoryEnum("shortcodes-vanity");
-            public static readonly UsageCategoryEnum SmallGroupRooms = new UsageCategoryEnum("small-group-rooms");
-            public static readonly UsageCategoryEnum SmallGroupRoomsDataTrack = new UsageCategoryEnum("small-group-rooms-data-track");
-            public static readonly UsageCategoryEnum SmallGroupRoomsParticipantMinutes = new UsageCategoryEnum("small-group-rooms-participant-minutes");
-            public static readonly UsageCategoryEnum Sms = new UsageCategoryEnum("sms");
-            public static readonly UsageCategoryEnum SmsInbound = new UsageCategoryEnum("sms-inbound");
-            public static readonly UsageCategoryEnum SmsInboundLongcode = new UsageCategoryEnum("sms-inbound-longcode");
-            public static readonly UsageCategoryEnum SmsInboundShortcode = new UsageCategoryEnum("sms-inbound-shortcode");
-            public static readonly UsageCategoryEnum SmsMessagesCarrierfees = new UsageCategoryEnum("sms-messages-carrierfees");
-            public static readonly UsageCategoryEnum SmsMessagesFeatures = new UsageCategoryEnum("sms-messages-features");
-            public static readonly UsageCategoryEnum SmsMessagesFeaturesSenderid = new UsageCategoryEnum("sms-messages-features-senderid");
-            public static readonly UsageCategoryEnum SmsOutbound = new UsageCategoryEnum("sms-outbound");
-            public static readonly UsageCategoryEnum SmsOutboundContentInspection = new UsageCategoryEnum("sms-outbound-content-inspection");
-            public static readonly UsageCategoryEnum SmsOutboundLongcode = new UsageCategoryEnum("sms-outbound-longcode");
-            public static readonly UsageCategoryEnum SmsOutboundShortcode = new UsageCategoryEnum("sms-outbound-shortcode");
-            public static readonly UsageCategoryEnum SpeechRecognition = new UsageCategoryEnum("speech-recognition");
-            public static readonly UsageCategoryEnum StudioEngagements = new UsageCategoryEnum("studio-engagements");
-            public static readonly UsageCategoryEnum Sync = new UsageCategoryEnum("sync");
-            public static readonly UsageCategoryEnum SyncActions = new UsageCategoryEnum("sync-actions");
-            public static readonly UsageCategoryEnum SyncEndpointHours = new UsageCategoryEnum("sync-endpoint-hours");
-            public static readonly UsageCategoryEnum SyncEndpointHoursAboveDailyCap = new UsageCategoryEnum("sync-endpoint-hours-above-daily-cap");
-            public static readonly UsageCategoryEnum TaskrouterTasks = new UsageCategoryEnum("taskrouter-tasks");
-            public static readonly UsageCategoryEnum Totalprice = new UsageCategoryEnum("totalprice");
-            public static readonly UsageCategoryEnum Transcriptions = new UsageCategoryEnum("transcriptions");
-            public static readonly UsageCategoryEnum TrunkingCps = new UsageCategoryEnum("trunking-cps");
-            public static readonly UsageCategoryEnum TrunkingEmergencyCalls = new UsageCategoryEnum("trunking-emergency-calls");
-            public static readonly UsageCategoryEnum TrunkingOrigination = new UsageCategoryEnum("trunking-origination");
-            public static readonly UsageCategoryEnum TrunkingOriginationLocal = new UsageCategoryEnum("trunking-origination-local");
-            public static readonly UsageCategoryEnum TrunkingOriginationMobile = new UsageCategoryEnum("trunking-origination-mobile");
-            public static readonly UsageCategoryEnum TrunkingOriginationTollfree = new UsageCategoryEnum("trunking-origination-tollfree");
-            public static readonly UsageCategoryEnum TrunkingRecordings = new UsageCategoryEnum("trunking-recordings");
-            public static readonly UsageCategoryEnum TrunkingSecure = new UsageCategoryEnum("trunking-secure");
-            public static readonly UsageCategoryEnum TrunkingTermination = new UsageCategoryEnum("trunking-termination");
-            public static readonly UsageCategoryEnum Turnmegabytes = new UsageCategoryEnum("turnmegabytes");
-            public static readonly UsageCategoryEnum TurnmegabytesAustralia = new UsageCategoryEnum("turnmegabytes-australia");
-            public static readonly UsageCategoryEnum TurnmegabytesBrasil = new UsageCategoryEnum("turnmegabytes-brasil");
-            public static readonly UsageCategoryEnum TurnmegabytesGermany = new UsageCategoryEnum("turnmegabytes-germany");
-            public static readonly UsageCategoryEnum TurnmegabytesIndia = new UsageCategoryEnum("turnmegabytes-india");
-            public static readonly UsageCategoryEnum TurnmegabytesIreland = new UsageCategoryEnum("turnmegabytes-ireland");
-            public static readonly UsageCategoryEnum TurnmegabytesJapan = new UsageCategoryEnum("turnmegabytes-japan");
-            public static readonly UsageCategoryEnum TurnmegabytesSingapore = new UsageCategoryEnum("turnmegabytes-singapore");
-            public static readonly UsageCategoryEnum TurnmegabytesUseast = new UsageCategoryEnum("turnmegabytes-useast");
-            public static readonly UsageCategoryEnum TurnmegabytesUswest = new UsageCategoryEnum("turnmegabytes-uswest");
-            public static readonly UsageCategoryEnum TwilioInterconnect = new UsageCategoryEnum("twilio-interconnect");
-            public static readonly UsageCategoryEnum VerifyPush = new UsageCategoryEnum("verify-push");
-            public static readonly UsageCategoryEnum VideoRecordings = new UsageCategoryEnum("video-recordings");
-            public static readonly UsageCategoryEnum VoiceInsights = new UsageCategoryEnum("voice-insights");
-            public static readonly UsageCategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new UsageCategoryEnum("voice-insights-client-insights-on-demand-minute");
-            public static readonly UsageCategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new UsageCategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
-            public static readonly UsageCategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new UsageCategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
-            public static readonly UsageCategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new UsageCategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
-            public static readonly UsageCategoryEnum Wireless = new UsageCategoryEnum("wireless");
-            public static readonly UsageCategoryEnum WirelessOrders = new UsageCategoryEnum("wireless-orders");
-            public static readonly UsageCategoryEnum WirelessOrdersArtwork = new UsageCategoryEnum("wireless-orders-artwork");
-            public static readonly UsageCategoryEnum WirelessOrdersBulk = new UsageCategoryEnum("wireless-orders-bulk");
-            public static readonly UsageCategoryEnum WirelessOrdersEsim = new UsageCategoryEnum("wireless-orders-esim");
-            public static readonly UsageCategoryEnum WirelessOrdersStarter = new UsageCategoryEnum("wireless-orders-starter");
-            public static readonly UsageCategoryEnum WirelessUsage = new UsageCategoryEnum("wireless-usage");
-            public static readonly UsageCategoryEnum WirelessUsageCommands = new UsageCategoryEnum("wireless-usage-commands");
-            public static readonly UsageCategoryEnum WirelessUsageCommandsAfrica = new UsageCategoryEnum("wireless-usage-commands-africa");
-            public static readonly UsageCategoryEnum WirelessUsageCommandsAsia = new UsageCategoryEnum("wireless-usage-commands-asia");
-            public static readonly UsageCategoryEnum WirelessUsageCommandsCentralandsouthamerica = new UsageCategoryEnum("wireless-usage-commands-centralandsouthamerica");
-            public static readonly UsageCategoryEnum WirelessUsageCommandsEurope = new UsageCategoryEnum("wireless-usage-commands-europe");
-            public static readonly UsageCategoryEnum WirelessUsageCommandsHome = new UsageCategoryEnum("wireless-usage-commands-home");
-            public static readonly UsageCategoryEnum WirelessUsageCommandsNorthamerica = new UsageCategoryEnum("wireless-usage-commands-northamerica");
-            public static readonly UsageCategoryEnum WirelessUsageCommandsOceania = new UsageCategoryEnum("wireless-usage-commands-oceania");
-            public static readonly UsageCategoryEnum WirelessUsageCommandsRoaming = new UsageCategoryEnum("wireless-usage-commands-roaming");
-            public static readonly UsageCategoryEnum WirelessUsageData = new UsageCategoryEnum("wireless-usage-data");
-            public static readonly UsageCategoryEnum WirelessUsageDataAfrica = new UsageCategoryEnum("wireless-usage-data-africa");
-            public static readonly UsageCategoryEnum WirelessUsageDataAsia = new UsageCategoryEnum("wireless-usage-data-asia");
-            public static readonly UsageCategoryEnum WirelessUsageDataCentralandsouthamerica = new UsageCategoryEnum("wireless-usage-data-centralandsouthamerica");
-            public static readonly UsageCategoryEnum WirelessUsageDataCustomAdditionalmb = new UsageCategoryEnum("wireless-usage-data-custom-additionalmb");
-            public static readonly UsageCategoryEnum WirelessUsageDataCustomFirst5Mb = new UsageCategoryEnum("wireless-usage-data-custom-first5mb");
-            public static readonly UsageCategoryEnum WirelessUsageDataDomesticRoaming = new UsageCategoryEnum("wireless-usage-data-domestic-roaming");
-            public static readonly UsageCategoryEnum WirelessUsageDataEurope = new UsageCategoryEnum("wireless-usage-data-europe");
-            public static readonly UsageCategoryEnum WirelessUsageDataIndividualAdditionalgb = new UsageCategoryEnum("wireless-usage-data-individual-additionalgb");
-            public static readonly UsageCategoryEnum WirelessUsageDataIndividualFirstgb = new UsageCategoryEnum("wireless-usage-data-individual-firstgb");
-            public static readonly UsageCategoryEnum WirelessUsageDataInternationalRoamingCanada = new UsageCategoryEnum("wireless-usage-data-international-roaming-canada");
-            public static readonly UsageCategoryEnum WirelessUsageDataInternationalRoamingIndia = new UsageCategoryEnum("wireless-usage-data-international-roaming-india");
-            public static readonly UsageCategoryEnum WirelessUsageDataInternationalRoamingMexico = new UsageCategoryEnum("wireless-usage-data-international-roaming-mexico");
-            public static readonly UsageCategoryEnum WirelessUsageDataNorthamerica = new UsageCategoryEnum("wireless-usage-data-northamerica");
-            public static readonly UsageCategoryEnum WirelessUsageDataOceania = new UsageCategoryEnum("wireless-usage-data-oceania");
-            public static readonly UsageCategoryEnum WirelessUsageDataPooled = new UsageCategoryEnum("wireless-usage-data-pooled");
-            public static readonly UsageCategoryEnum WirelessUsageDataPooledDownlink = new UsageCategoryEnum("wireless-usage-data-pooled-downlink");
-            public static readonly UsageCategoryEnum WirelessUsageDataPooledUplink = new UsageCategoryEnum("wireless-usage-data-pooled-uplink");
-            public static readonly UsageCategoryEnum WirelessUsageMrc = new UsageCategoryEnum("wireless-usage-mrc");
-            public static readonly UsageCategoryEnum WirelessUsageMrcCustom = new UsageCategoryEnum("wireless-usage-mrc-custom");
-            public static readonly UsageCategoryEnum WirelessUsageMrcIndividual = new UsageCategoryEnum("wireless-usage-mrc-individual");
-            public static readonly UsageCategoryEnum WirelessUsageMrcPooled = new UsageCategoryEnum("wireless-usage-mrc-pooled");
-            public static readonly UsageCategoryEnum WirelessUsageMrcSuspended = new UsageCategoryEnum("wireless-usage-mrc-suspended");
-            public static readonly UsageCategoryEnum WirelessUsageSms = new UsageCategoryEnum("wireless-usage-sms");
-            public static readonly UsageCategoryEnum WirelessUsageVoice = new UsageCategoryEnum("wireless-usage-voice");
-        }
-
-        public sealed class RecurringEnum : StringEnum
-        {
-            private RecurringEnum(string value) : base(value) {}
-            public RecurringEnum() {}
-            public static implicit operator RecurringEnum(string value)
-            {
-                return new RecurringEnum(value);
-            }
-
-            public static readonly RecurringEnum Daily = new RecurringEnum("daily");
-            public static readonly RecurringEnum Monthly = new RecurringEnum("monthly");
-            public static readonly RecurringEnum Yearly = new RecurringEnum("yearly");
-            public static readonly RecurringEnum Alltime = new RecurringEnum("alltime");
-        }
-
-        public sealed class TriggerFieldEnum : StringEnum
-        {
-            private TriggerFieldEnum(string value) : base(value) {}
-            public TriggerFieldEnum() {}
-            public static implicit operator TriggerFieldEnum(string value)
-            {
-                return new TriggerFieldEnum(value);
-            }
-
-            public static readonly TriggerFieldEnum Count = new TriggerFieldEnum("count");
-            public static readonly TriggerFieldEnum Usage = new TriggerFieldEnum("usage");
-            public static readonly TriggerFieldEnum Price = new TriggerFieldEnum("price");
-        }
-
-        private static Request BuildFetchRequest(FetchTriggerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Triggers/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch and instance of a usage-trigger
-        /// </summary>
-        /// <param name="options"> Fetch Trigger parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trigger </returns>
-        public static TriggerResource Fetch(FetchTriggerOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch and instance of a usage-trigger
-        /// </summary>
-        /// <param name="options"> Fetch Trigger parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trigger </returns>
-        public static async System.Threading.Tasks.Task<TriggerResource> FetchAsync(FetchTriggerOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch and instance of a usage-trigger
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trigger </returns>
-        public static TriggerResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchTriggerOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch and instance of a usage-trigger
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trigger </returns>
-        public static async System.Threading.Tasks.Task<TriggerResource> FetchAsync(string pathSid,
-                                                                                    string pathAccountSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchTriggerOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateTriggerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Triggers/" + options.PathSid + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an instance of a usage trigger
-        /// </summary>
-        /// <param name="options"> Update Trigger parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trigger </returns>
-        public static TriggerResource Update(UpdateTriggerOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an instance of a usage trigger
-        /// </summary>
-        /// <param name="options"> Update Trigger parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trigger </returns>
-        public static async System.Threading.Tasks.Task<TriggerResource> UpdateAsync(UpdateTriggerOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an instance of a usage trigger
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
-        /// <param name="callbackMethod"> The HTTP method to use to call callback_url </param>
-        /// <param name="callbackUrl"> The URL we call when the trigger fires </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trigger </returns>
-        public static TriggerResource Update(string pathSid,
-                                             string pathAccountSid = null,
-                                             Twilio.Http.HttpMethod callbackMethod = null,
-                                             Uri callbackUrl = null,
-                                             string friendlyName = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateTriggerOptions(pathSid){PathAccountSid = pathAccountSid, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, FriendlyName = friendlyName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an instance of a usage trigger
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
-        /// <param name="callbackMethod"> The HTTP method to use to call callback_url </param>
-        /// <param name="callbackUrl"> The URL we call when the trigger fires </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trigger </returns>
-        public static async System.Threading.Tasks.Task<TriggerResource> UpdateAsync(string pathSid,
-                                                                                     string pathAccountSid = null,
-                                                                                     Twilio.Http.HttpMethod callbackMethod = null,
-                                                                                     Uri callbackUrl = null,
-                                                                                     string friendlyName = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateTriggerOptions(pathSid){PathAccountSid = pathAccountSid, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, FriendlyName = friendlyName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteTriggerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Triggers/" + options.PathSid + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Trigger parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trigger </returns>
-        public static bool Delete(DeleteTriggerOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Trigger parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trigger </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTriggerOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trigger </returns>
-        public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new DeleteTriggerOptions(pathSid){PathAccountSid = pathAccountSid};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trigger </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          string pathAccountSid = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteTriggerOptions(pathSid){PathAccountSid = pathAccountSid};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateTriggerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Triggers.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new UsageTrigger
-        /// </summary>
-        /// <param name="options"> Create Trigger parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trigger </returns>
-        public static TriggerResource Create(CreateTriggerOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new UsageTrigger
-        /// </summary>
-        /// <param name="options"> Create Trigger parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trigger </returns>
-        public static async System.Threading.Tasks.Task<TriggerResource> CreateAsync(CreateTriggerOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new UsageTrigger
-        /// </summary>
-        /// <param name="callbackUrl"> The URL we call when the trigger fires </param>
-        /// <param name="triggerValue"> The usage value at which the trigger should fire </param>
-        /// <param name="usageCategory"> The usage category the trigger watches </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="callbackMethod"> The HTTP method to use to call callback_url </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="recurring"> The frequency of a recurring UsageTrigger </param>
-        /// <param name="triggerBy"> The field in the UsageRecord resource that fires the trigger </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trigger </returns>
-        public static TriggerResource Create(Uri callbackUrl,
-                                             string triggerValue,
-                                             TriggerResource.UsageCategoryEnum usageCategory,
-                                             string pathAccountSid = null,
-                                             Twilio.Http.HttpMethod callbackMethod = null,
-                                             string friendlyName = null,
-                                             TriggerResource.RecurringEnum recurring = null,
-                                             TriggerResource.TriggerFieldEnum triggerBy = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateTriggerOptions(callbackUrl, triggerValue, usageCategory){PathAccountSid = pathAccountSid, CallbackMethod = callbackMethod, FriendlyName = friendlyName, Recurring = recurring, TriggerBy = triggerBy};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new UsageTrigger
-        /// </summary>
-        /// <param name="callbackUrl"> The URL we call when the trigger fires </param>
-        /// <param name="triggerValue"> The usage value at which the trigger should fire </param>
-        /// <param name="usageCategory"> The usage category the trigger watches </param>
-        /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
-        /// <param name="callbackMethod"> The HTTP method to use to call callback_url </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="recurring"> The frequency of a recurring UsageTrigger </param>
-        /// <param name="triggerBy"> The field in the UsageRecord resource that fires the trigger </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trigger </returns>
-        public static async System.Threading.Tasks.Task<TriggerResource> CreateAsync(Uri callbackUrl,
-                                                                                     string triggerValue,
-                                                                                     TriggerResource.UsageCategoryEnum usageCategory,
-                                                                                     string pathAccountSid = null,
-                                                                                     Twilio.Http.HttpMethod callbackMethod = null,
-                                                                                     string friendlyName = null,
-                                                                                     TriggerResource.RecurringEnum recurring = null,
-                                                                                     TriggerResource.TriggerFieldEnum triggerBy = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateTriggerOptions(callbackUrl, triggerValue, usageCategory){PathAccountSid = pathAccountSid, CallbackMethod = callbackMethod, FriendlyName = friendlyName, Recurring = recurring, TriggerBy = triggerBy};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadTriggerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Triggers.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of usage-triggers belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Trigger parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trigger </returns>
-        public static ResourceSet<TriggerResource> Read(ReadTriggerOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TriggerResource>.FromJson("usage_triggers", response.Content);
-            return new ResourceSet<TriggerResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of usage-triggers belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Trigger parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trigger </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TriggerResource>> ReadAsync(ReadTriggerOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TriggerResource>.FromJson("usage_triggers", response.Content);
-            return new ResourceSet<TriggerResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of usage-triggers belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="recurring"> The frequency of recurring UsageTriggers to read </param>
-        /// <param name="triggerBy"> The trigger field of the UsageTriggers to read </param>
-        /// <param name="usageCategory"> The usage category of the UsageTriggers to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trigger </returns>
-        public static ResourceSet<TriggerResource> Read(string pathAccountSid = null,
-                                                        TriggerResource.RecurringEnum recurring = null,
-                                                        TriggerResource.TriggerFieldEnum triggerBy = null,
-                                                        TriggerResource.UsageCategoryEnum usageCategory = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadTriggerOptions(){PathAccountSid = pathAccountSid, Recurring = recurring, TriggerBy = triggerBy, UsageCategory = usageCategory, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of usage-triggers belonging to the account used to make the request
-        /// </summary>
-        /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
-        /// <param name="recurring"> The frequency of recurring UsageTriggers to read </param>
-        /// <param name="triggerBy"> The trigger field of the UsageTriggers to read </param>
-        /// <param name="usageCategory"> The usage category of the UsageTriggers to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trigger </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TriggerResource>> ReadAsync(string pathAccountSid = null,
-                                                                                                TriggerResource.RecurringEnum recurring = null,
-                                                                                                TriggerResource.TriggerFieldEnum triggerBy = null,
-                                                                                                TriggerResource.UsageCategoryEnum usageCategory = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadTriggerOptions(){PathAccountSid = pathAccountSid, Recurring = recurring, TriggerBy = triggerBy, UsageCategory = usageCategory, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TriggerResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TriggerResource>.FromJson("usage_triggers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TriggerResource> NextPage(Page<TriggerResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<TriggerResource>.FromJson("usage_triggers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TriggerResource> PreviousPage(Page<TriggerResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<TriggerResource>.FromJson("usage_triggers", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a TriggerResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TriggerResource object represented by the provided JSON </returns>
-        public static TriggerResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TriggerResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that this trigger monitors
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The API version used to create the resource
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call callback_url
-        /// </summary>
-        [JsonProperty("callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod CallbackMethod { get; private set; }
-        /// <summary>
-        /// he URL we call when the trigger fires
-        /// </summary>
-        [JsonProperty("callback_url")]
-        public Uri CallbackUrl { get; private set; }
-        /// <summary>
-        /// The current value of the field the trigger is watching
-        /// </summary>
-        [JsonProperty("current_value")]
-        public string CurrentValue { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the trigger was last fired
-        /// </summary>
-        [JsonProperty("date_fired")]
-        public DateTime? DateFired { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the trigger
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The frequency of a recurring UsageTrigger
-        /// </summary>
-        [JsonProperty("recurring")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TriggerResource.RecurringEnum Recurring { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The field in the UsageRecord resource that fires the trigger
-        /// </summary>
-        [JsonProperty("trigger_by")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TriggerResource.TriggerFieldEnum TriggerBy { get; private set; }
-        /// <summary>
-        /// The value at which the trigger will fire
-        /// </summary>
-        [JsonProperty("trigger_value")]
-        public string TriggerValue { get; private set; }
-        /// <summary>
-        /// The URI of the resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-        /// <summary>
-        /// The usage category the trigger watches
-        /// </summary>
-        [JsonProperty("usage_category")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TriggerResource.UsageCategoryEnum UsageCategory { get; private set; }
-        /// <summary>
-        /// The URI of the UsageRecord resource this trigger watches
-        /// </summary>
-        [JsonProperty("usage_record_uri")]
-        public string UsageRecordUri { get; private set; }
-
-        private TriggerResource()
-        {
-
-        }
-    }
+{
+
+  public class TriggerResource : Resource
+  {
+    public sealed class UsageCategoryEnum : StringEnum
+    {
+      private UsageCategoryEnum(string value) : base(value) { }
+      public UsageCategoryEnum() { }
+      public static implicit operator UsageCategoryEnum(string value)
+      {
+        return new UsageCategoryEnum(value);
+      }
+
+      public static readonly UsageCategoryEnum AgentConference = new UsageCategoryEnum("agent-conference");
+      public static readonly UsageCategoryEnum AnsweringMachineDetection = new UsageCategoryEnum("answering-machine-detection");
+      public static readonly UsageCategoryEnum AuthyAuthentications = new UsageCategoryEnum("authy-authentications");
+      public static readonly UsageCategoryEnum AuthyCallsOutbound = new UsageCategoryEnum("authy-calls-outbound");
+      public static readonly UsageCategoryEnum AuthyMonthlyFees = new UsageCategoryEnum("authy-monthly-fees");
+      public static readonly UsageCategoryEnum AuthyPhoneIntelligence = new UsageCategoryEnum("authy-phone-intelligence");
+      public static readonly UsageCategoryEnum AuthyPhoneVerifications = new UsageCategoryEnum("authy-phone-verifications");
+      public static readonly UsageCategoryEnum AuthySmsOutbound = new UsageCategoryEnum("authy-sms-outbound");
+      public static readonly UsageCategoryEnum CallProgessEvents = new UsageCategoryEnum("call-progess-events");
+      public static readonly UsageCategoryEnum Calleridlookups = new UsageCategoryEnum("calleridlookups");
+      public static readonly UsageCategoryEnum Calls = new UsageCategoryEnum("calls");
+      public static readonly UsageCategoryEnum CallsClient = new UsageCategoryEnum("calls-client");
+      public static readonly UsageCategoryEnum CallsGlobalconference = new UsageCategoryEnum("calls-globalconference");
+      public static readonly UsageCategoryEnum CallsInbound = new UsageCategoryEnum("calls-inbound");
+      public static readonly UsageCategoryEnum CallsInboundLocal = new UsageCategoryEnum("calls-inbound-local");
+      public static readonly UsageCategoryEnum CallsInboundMobile = new UsageCategoryEnum("calls-inbound-mobile");
+      public static readonly UsageCategoryEnum CallsInboundTollfree = new UsageCategoryEnum("calls-inbound-tollfree");
+      public static readonly UsageCategoryEnum CallsOutbound = new UsageCategoryEnum("calls-outbound");
+      public static readonly UsageCategoryEnum CallsPayVerbTransactions = new UsageCategoryEnum("calls-pay-verb-transactions");
+      public static readonly UsageCategoryEnum CallsRecordings = new UsageCategoryEnum("calls-recordings");
+      public static readonly UsageCategoryEnum CallsSip = new UsageCategoryEnum("calls-sip");
+      public static readonly UsageCategoryEnum CallsSipInbound = new UsageCategoryEnum("calls-sip-inbound");
+      public static readonly UsageCategoryEnum CallsSipOutbound = new UsageCategoryEnum("calls-sip-outbound");
+      public static readonly UsageCategoryEnum CallsTransfers = new UsageCategoryEnum("calls-transfers");
+      public static readonly UsageCategoryEnum CarrierLookups = new UsageCategoryEnum("carrier-lookups");
+      public static readonly UsageCategoryEnum Conversations = new UsageCategoryEnum("conversations");
+      public static readonly UsageCategoryEnum ConversationsApiRequests = new UsageCategoryEnum("conversations-api-requests");
+      public static readonly UsageCategoryEnum ConversationsConversationEvents = new UsageCategoryEnum("conversations-conversation-events");
+      public static readonly UsageCategoryEnum ConversationsEndpointConnectivity = new UsageCategoryEnum("conversations-endpoint-connectivity");
+      public static readonly UsageCategoryEnum ConversationsEvents = new UsageCategoryEnum("conversations-events");
+      public static readonly UsageCategoryEnum ConversationsParticipantEvents = new UsageCategoryEnum("conversations-participant-events");
+      public static readonly UsageCategoryEnum ConversationsParticipants = new UsageCategoryEnum("conversations-participants");
+      public static readonly UsageCategoryEnum Cps = new UsageCategoryEnum("cps");
+      public static readonly UsageCategoryEnum FlexUsage = new UsageCategoryEnum("flex-usage");
+      public static readonly UsageCategoryEnum FraudLookups = new UsageCategoryEnum("fraud-lookups");
+      public static readonly UsageCategoryEnum GroupRooms = new UsageCategoryEnum("group-rooms");
+      public static readonly UsageCategoryEnum GroupRoomsDataTrack = new UsageCategoryEnum("group-rooms-data-track");
+      public static readonly UsageCategoryEnum GroupRoomsEncryptedMediaRecorded = new UsageCategoryEnum("group-rooms-encrypted-media-recorded");
+      public static readonly UsageCategoryEnum GroupRoomsMediaDownloaded = new UsageCategoryEnum("group-rooms-media-downloaded");
+      public static readonly UsageCategoryEnum GroupRoomsMediaRecorded = new UsageCategoryEnum("group-rooms-media-recorded");
+      public static readonly UsageCategoryEnum GroupRoomsMediaRouted = new UsageCategoryEnum("group-rooms-media-routed");
+      public static readonly UsageCategoryEnum GroupRoomsMediaStored = new UsageCategoryEnum("group-rooms-media-stored");
+      public static readonly UsageCategoryEnum GroupRoomsParticipantMinutes = new UsageCategoryEnum("group-rooms-participant-minutes");
+      public static readonly UsageCategoryEnum GroupRoomsRecordedMinutes = new UsageCategoryEnum("group-rooms-recorded-minutes");
+      public static readonly UsageCategoryEnum ImpV1Usage = new UsageCategoryEnum("imp-v1-usage");
+      public static readonly UsageCategoryEnum Lookups = new UsageCategoryEnum("lookups");
+      public static readonly UsageCategoryEnum Marketplace = new UsageCategoryEnum("marketplace");
+      public static readonly UsageCategoryEnum MarketplaceAlgorithmiaNamedEntityRecognition = new UsageCategoryEnum("marketplace-algorithmia-named-entity-recognition");
+      public static readonly UsageCategoryEnum MarketplaceCadenceTranscription = new UsageCategoryEnum("marketplace-cadence-transcription");
+      public static readonly UsageCategoryEnum MarketplaceCadenceTranslation = new UsageCategoryEnum("marketplace-cadence-translation");
+      public static readonly UsageCategoryEnum MarketplaceCapioSpeechToText = new UsageCategoryEnum("marketplace-capio-speech-to-text");
+      public static readonly UsageCategoryEnum MarketplaceConvrizaAbaba = new UsageCategoryEnum("marketplace-convriza-ababa");
+      public static readonly UsageCategoryEnum MarketplaceDeepgramPhraseDetector = new UsageCategoryEnum("marketplace-deepgram-phrase-detector");
+      public static readonly UsageCategoryEnum MarketplaceDigitalSegmentBusinessInfo = new UsageCategoryEnum("marketplace-digital-segment-business-info");
+      public static readonly UsageCategoryEnum MarketplaceFacebookOfflineConversions = new UsageCategoryEnum("marketplace-facebook-offline-conversions");
+      public static readonly UsageCategoryEnum MarketplaceGoogleSpeechToText = new UsageCategoryEnum("marketplace-google-speech-to-text");
+      public static readonly UsageCategoryEnum MarketplaceIbmWatsonMessageInsights = new UsageCategoryEnum("marketplace-ibm-watson-message-insights");
+      public static readonly UsageCategoryEnum MarketplaceIbmWatsonMessageSentiment = new UsageCategoryEnum("marketplace-ibm-watson-message-sentiment");
+      public static readonly UsageCategoryEnum MarketplaceIbmWatsonRecordingAnalysis = new UsageCategoryEnum("marketplace-ibm-watson-recording-analysis");
+      public static readonly UsageCategoryEnum MarketplaceIbmWatsonToneAnalyzer = new UsageCategoryEnum("marketplace-ibm-watson-tone-analyzer");
+      public static readonly UsageCategoryEnum MarketplaceIcehookSystemsScout = new UsageCategoryEnum("marketplace-icehook-systems-scout");
+      public static readonly UsageCategoryEnum MarketplaceInfogroupDataaxleBizinfo = new UsageCategoryEnum("marketplace-infogroup-dataaxle-bizinfo");
+      public static readonly UsageCategoryEnum MarketplaceKeenIoContactCenterAnalytics = new UsageCategoryEnum("marketplace-keen-io-contact-center-analytics");
+      public static readonly UsageCategoryEnum MarketplaceMarchexCleancall = new UsageCategoryEnum("marketplace-marchex-cleancall");
+      public static readonly UsageCategoryEnum MarketplaceMarchexSentimentAnalysisForSms = new UsageCategoryEnum("marketplace-marchex-sentiment-analysis-for-sms");
+      public static readonly UsageCategoryEnum MarketplaceMarketplaceNextcallerSocialId = new UsageCategoryEnum("marketplace-marketplace-nextcaller-social-id");
+      public static readonly UsageCategoryEnum MarketplaceMobileCommonsOptOutClassifier = new UsageCategoryEnum("marketplace-mobile-commons-opt-out-classifier");
+      public static readonly UsageCategoryEnum MarketplaceNexiwaveVoicemailToText = new UsageCategoryEnum("marketplace-nexiwave-voicemail-to-text");
+      public static readonly UsageCategoryEnum MarketplaceNextcallerAdvancedCallerIdentification = new UsageCategoryEnum("marketplace-nextcaller-advanced-caller-identification");
+      public static readonly UsageCategoryEnum MarketplaceNomoroboSpamScore = new UsageCategoryEnum("marketplace-nomorobo-spam-score");
+      public static readonly UsageCategoryEnum MarketplacePayfoneTcpaCompliance = new UsageCategoryEnum("marketplace-payfone-tcpa-compliance");
+      public static readonly UsageCategoryEnum MarketplaceRemeetingAutomaticSpeechRecognition = new UsageCategoryEnum("marketplace-remeeting-automatic-speech-recognition");
+      public static readonly UsageCategoryEnum MarketplaceTcpaDefenseSolutionsBlacklistFeed = new UsageCategoryEnum("marketplace-tcpa-defense-solutions-blacklist-feed");
+      public static readonly UsageCategoryEnum MarketplaceTeloOpencnam = new UsageCategoryEnum("marketplace-telo-opencnam");
+      public static readonly UsageCategoryEnum MarketplaceTruecnamTrueSpam = new UsageCategoryEnum("marketplace-truecnam-true-spam");
+      public static readonly UsageCategoryEnum MarketplaceTwilioCallerNameLookupUs = new UsageCategoryEnum("marketplace-twilio-caller-name-lookup-us");
+      public static readonly UsageCategoryEnum MarketplaceTwilioCarrierInformationLookup = new UsageCategoryEnum("marketplace-twilio-carrier-information-lookup");
+      public static readonly UsageCategoryEnum MarketplaceVoicebasePci = new UsageCategoryEnum("marketplace-voicebase-pci");
+      public static readonly UsageCategoryEnum MarketplaceVoicebaseTranscription = new UsageCategoryEnum("marketplace-voicebase-transcription");
+      public static readonly UsageCategoryEnum MarketplaceVoicebaseTranscriptionCustomVocabulary = new UsageCategoryEnum("marketplace-voicebase-transcription-custom-vocabulary");
+      public static readonly UsageCategoryEnum MarketplaceWhitepagesProCallerIdentification = new UsageCategoryEnum("marketplace-whitepages-pro-caller-identification");
+      public static readonly UsageCategoryEnum MarketplaceWhitepagesProPhoneIntelligence = new UsageCategoryEnum("marketplace-whitepages-pro-phone-intelligence");
+      public static readonly UsageCategoryEnum MarketplaceWhitepagesProPhoneReputation = new UsageCategoryEnum("marketplace-whitepages-pro-phone-reputation");
+      public static readonly UsageCategoryEnum MarketplaceWolfarmSpokenResults = new UsageCategoryEnum("marketplace-wolfarm-spoken-results");
+      public static readonly UsageCategoryEnum MarketplaceWolframShortAnswer = new UsageCategoryEnum("marketplace-wolfram-short-answer");
+      public static readonly UsageCategoryEnum MarketplaceYticaContactCenterReportingAnalytics = new UsageCategoryEnum("marketplace-ytica-contact-center-reporting-analytics");
+      public static readonly UsageCategoryEnum Mediastorage = new UsageCategoryEnum("mediastorage");
+      public static readonly UsageCategoryEnum Mms = new UsageCategoryEnum("mms");
+      public static readonly UsageCategoryEnum MmsInbound = new UsageCategoryEnum("mms-inbound");
+      public static readonly UsageCategoryEnum MmsInboundLongcode = new UsageCategoryEnum("mms-inbound-longcode");
+      public static readonly UsageCategoryEnum MmsInboundShortcode = new UsageCategoryEnum("mms-inbound-shortcode");
+      public static readonly UsageCategoryEnum MmsMessagesCarrierfees = new UsageCategoryEnum("mms-messages-carrierfees");
+      public static readonly UsageCategoryEnum MmsOutbound = new UsageCategoryEnum("mms-outbound");
+      public static readonly UsageCategoryEnum MmsOutboundLongcode = new UsageCategoryEnum("mms-outbound-longcode");
+      public static readonly UsageCategoryEnum MmsOutboundShortcode = new UsageCategoryEnum("mms-outbound-shortcode");
+      public static readonly UsageCategoryEnum MonitorReads = new UsageCategoryEnum("monitor-reads");
+      public static readonly UsageCategoryEnum MonitorStorage = new UsageCategoryEnum("monitor-storage");
+      public static readonly UsageCategoryEnum MonitorWrites = new UsageCategoryEnum("monitor-writes");
+      public static readonly UsageCategoryEnum Notify = new UsageCategoryEnum("notify");
+      public static readonly UsageCategoryEnum NotifyActionsAttempts = new UsageCategoryEnum("notify-actions-attempts");
+      public static readonly UsageCategoryEnum NotifyChannels = new UsageCategoryEnum("notify-channels");
+      public static readonly UsageCategoryEnum NumberFormatLookups = new UsageCategoryEnum("number-format-lookups");
+      public static readonly UsageCategoryEnum Pchat = new UsageCategoryEnum("pchat");
+      public static readonly UsageCategoryEnum PchatUsers = new UsageCategoryEnum("pchat-users");
+      public static readonly UsageCategoryEnum PeerToPeerRoomsParticipantMinutes = new UsageCategoryEnum("peer-to-peer-rooms-participant-minutes");
+      public static readonly UsageCategoryEnum Pfax = new UsageCategoryEnum("pfax");
+      public static readonly UsageCategoryEnum PfaxMinutes = new UsageCategoryEnum("pfax-minutes");
+      public static readonly UsageCategoryEnum PfaxMinutesInbound = new UsageCategoryEnum("pfax-minutes-inbound");
+      public static readonly UsageCategoryEnum PfaxMinutesOutbound = new UsageCategoryEnum("pfax-minutes-outbound");
+      public static readonly UsageCategoryEnum PfaxPages = new UsageCategoryEnum("pfax-pages");
+      public static readonly UsageCategoryEnum Phonenumbers = new UsageCategoryEnum("phonenumbers");
+      public static readonly UsageCategoryEnum PhonenumbersCps = new UsageCategoryEnum("phonenumbers-cps");
+      public static readonly UsageCategoryEnum PhonenumbersEmergency = new UsageCategoryEnum("phonenumbers-emergency");
+      public static readonly UsageCategoryEnum PhonenumbersLocal = new UsageCategoryEnum("phonenumbers-local");
+      public static readonly UsageCategoryEnum PhonenumbersMobile = new UsageCategoryEnum("phonenumbers-mobile");
+      public static readonly UsageCategoryEnum PhonenumbersSetups = new UsageCategoryEnum("phonenumbers-setups");
+      public static readonly UsageCategoryEnum PhonenumbersTollfree = new UsageCategoryEnum("phonenumbers-tollfree");
+      public static readonly UsageCategoryEnum Premiumsupport = new UsageCategoryEnum("premiumsupport");
+      public static readonly UsageCategoryEnum Proxy = new UsageCategoryEnum("proxy");
+      public static readonly UsageCategoryEnum ProxyActiveSessions = new UsageCategoryEnum("proxy-active-sessions");
+      public static readonly UsageCategoryEnum Pstnconnectivity = new UsageCategoryEnum("pstnconnectivity");
+      public static readonly UsageCategoryEnum Pv = new UsageCategoryEnum("pv");
+      public static readonly UsageCategoryEnum PvCompositionMediaDownloaded = new UsageCategoryEnum("pv-composition-media-downloaded");
+      public static readonly UsageCategoryEnum PvCompositionMediaEncrypted = new UsageCategoryEnum("pv-composition-media-encrypted");
+      public static readonly UsageCategoryEnum PvCompositionMediaStored = new UsageCategoryEnum("pv-composition-media-stored");
+      public static readonly UsageCategoryEnum PvCompositionMinutes = new UsageCategoryEnum("pv-composition-minutes");
+      public static readonly UsageCategoryEnum PvRecordingCompositions = new UsageCategoryEnum("pv-recording-compositions");
+      public static readonly UsageCategoryEnum PvRoomParticipants = new UsageCategoryEnum("pv-room-participants");
+      public static readonly UsageCategoryEnum PvRoomParticipantsAu1 = new UsageCategoryEnum("pv-room-participants-au1");
+      public static readonly UsageCategoryEnum PvRoomParticipantsBr1 = new UsageCategoryEnum("pv-room-participants-br1");
+      public static readonly UsageCategoryEnum PvRoomParticipantsIe1 = new UsageCategoryEnum("pv-room-participants-ie1");
+      public static readonly UsageCategoryEnum PvRoomParticipantsJp1 = new UsageCategoryEnum("pv-room-participants-jp1");
+      public static readonly UsageCategoryEnum PvRoomParticipantsSg1 = new UsageCategoryEnum("pv-room-participants-sg1");
+      public static readonly UsageCategoryEnum PvRoomParticipantsUs1 = new UsageCategoryEnum("pv-room-participants-us1");
+      public static readonly UsageCategoryEnum PvRoomParticipantsUs2 = new UsageCategoryEnum("pv-room-participants-us2");
+      public static readonly UsageCategoryEnum PvRooms = new UsageCategoryEnum("pv-rooms");
+      public static readonly UsageCategoryEnum PvSipEndpointRegistrations = new UsageCategoryEnum("pv-sip-endpoint-registrations");
+      public static readonly UsageCategoryEnum Recordings = new UsageCategoryEnum("recordings");
+      public static readonly UsageCategoryEnum Recordingstorage = new UsageCategoryEnum("recordingstorage");
+      public static readonly UsageCategoryEnum RoomsGroupBandwidth = new UsageCategoryEnum("rooms-group-bandwidth");
+      public static readonly UsageCategoryEnum RoomsGroupMinutes = new UsageCategoryEnum("rooms-group-minutes");
+      public static readonly UsageCategoryEnum RoomsPeerToPeerMinutes = new UsageCategoryEnum("rooms-peer-to-peer-minutes");
+      public static readonly UsageCategoryEnum Shortcodes = new UsageCategoryEnum("shortcodes");
+      public static readonly UsageCategoryEnum ShortcodesCustomerowned = new UsageCategoryEnum("shortcodes-customerowned");
+      public static readonly UsageCategoryEnum ShortcodesMmsEnablement = new UsageCategoryEnum("shortcodes-mms-enablement");
+      public static readonly UsageCategoryEnum ShortcodesMps = new UsageCategoryEnum("shortcodes-mps");
+      public static readonly UsageCategoryEnum ShortcodesRandom = new UsageCategoryEnum("shortcodes-random");
+      public static readonly UsageCategoryEnum ShortcodesUk = new UsageCategoryEnum("shortcodes-uk");
+      public static readonly UsageCategoryEnum ShortcodesVanity = new UsageCategoryEnum("shortcodes-vanity");
+      public static readonly UsageCategoryEnum SmallGroupRooms = new UsageCategoryEnum("small-group-rooms");
+      public static readonly UsageCategoryEnum SmallGroupRoomsDataTrack = new UsageCategoryEnum("small-group-rooms-data-track");
+      public static readonly UsageCategoryEnum SmallGroupRoomsParticipantMinutes = new UsageCategoryEnum("small-group-rooms-participant-minutes");
+      public static readonly UsageCategoryEnum Sms = new UsageCategoryEnum("sms");
+      public static readonly UsageCategoryEnum SmsInbound = new UsageCategoryEnum("sms-inbound");
+      public static readonly UsageCategoryEnum SmsInboundLongcode = new UsageCategoryEnum("sms-inbound-longcode");
+      public static readonly UsageCategoryEnum SmsInboundShortcode = new UsageCategoryEnum("sms-inbound-shortcode");
+      public static readonly UsageCategoryEnum SmsMessagesCarrierfees = new UsageCategoryEnum("sms-messages-carrierfees");
+      public static readonly UsageCategoryEnum SmsMessagesFeatures = new UsageCategoryEnum("sms-messages-features");
+      public static readonly UsageCategoryEnum SmsMessagesFeaturesSenderid = new UsageCategoryEnum("sms-messages-features-senderid");
+      public static readonly UsageCategoryEnum SmsOutbound = new UsageCategoryEnum("sms-outbound");
+      public static readonly UsageCategoryEnum SmsOutboundContentInspection = new UsageCategoryEnum("sms-outbound-content-inspection");
+      public static readonly UsageCategoryEnum SmsOutboundLongcode = new UsageCategoryEnum("sms-outbound-longcode");
+      public static readonly UsageCategoryEnum SmsOutboundShortcode = new UsageCategoryEnum("sms-outbound-shortcode");
+      public static readonly UsageCategoryEnum SpeechRecognition = new UsageCategoryEnum("speech-recognition");
+      public static readonly UsageCategoryEnum StudioEngagements = new UsageCategoryEnum("studio-engagements");
+      public static readonly UsageCategoryEnum Sync = new UsageCategoryEnum("sync");
+      public static readonly UsageCategoryEnum SyncActions = new UsageCategoryEnum("sync-actions");
+      public static readonly UsageCategoryEnum SyncEndpointHours = new UsageCategoryEnum("sync-endpoint-hours");
+      public static readonly UsageCategoryEnum SyncEndpointHoursAboveDailyCap = new UsageCategoryEnum("sync-endpoint-hours-above-daily-cap");
+      public static readonly UsageCategoryEnum TaskrouterTasks = new UsageCategoryEnum("taskrouter-tasks");
+      public static readonly UsageCategoryEnum Totalprice = new UsageCategoryEnum("totalprice");
+      public static readonly UsageCategoryEnum Transcriptions = new UsageCategoryEnum("transcriptions");
+      public static readonly UsageCategoryEnum TrunkingCps = new UsageCategoryEnum("trunking-cps");
+      public static readonly UsageCategoryEnum TrunkingEmergencyCalls = new UsageCategoryEnum("trunking-emergency-calls");
+      public static readonly UsageCategoryEnum TrunkingOrigination = new UsageCategoryEnum("trunking-origination");
+      public static readonly UsageCategoryEnum TrunkingOriginationLocal = new UsageCategoryEnum("trunking-origination-local");
+      public static readonly UsageCategoryEnum TrunkingOriginationMobile = new UsageCategoryEnum("trunking-origination-mobile");
+      public static readonly UsageCategoryEnum TrunkingOriginationTollfree = new UsageCategoryEnum("trunking-origination-tollfree");
+      public static readonly UsageCategoryEnum TrunkingRecordings = new UsageCategoryEnum("trunking-recordings");
+      public static readonly UsageCategoryEnum TrunkingSecure = new UsageCategoryEnum("trunking-secure");
+      public static readonly UsageCategoryEnum TrunkingTermination = new UsageCategoryEnum("trunking-termination");
+      public static readonly UsageCategoryEnum Turnmegabytes = new UsageCategoryEnum("turnmegabytes");
+      public static readonly UsageCategoryEnum TurnmegabytesAustralia = new UsageCategoryEnum("turnmegabytes-australia");
+      public static readonly UsageCategoryEnum TurnmegabytesBrasil = new UsageCategoryEnum("turnmegabytes-brasil");
+      public static readonly UsageCategoryEnum TurnmegabytesGermany = new UsageCategoryEnum("turnmegabytes-germany");
+      public static readonly UsageCategoryEnum TurnmegabytesIndia = new UsageCategoryEnum("turnmegabytes-india");
+      public static readonly UsageCategoryEnum TurnmegabytesIreland = new UsageCategoryEnum("turnmegabytes-ireland");
+      public static readonly UsageCategoryEnum TurnmegabytesJapan = new UsageCategoryEnum("turnmegabytes-japan");
+      public static readonly UsageCategoryEnum TurnmegabytesSingapore = new UsageCategoryEnum("turnmegabytes-singapore");
+      public static readonly UsageCategoryEnum TurnmegabytesUseast = new UsageCategoryEnum("turnmegabytes-useast");
+      public static readonly UsageCategoryEnum TurnmegabytesUswest = new UsageCategoryEnum("turnmegabytes-uswest");
+      public static readonly UsageCategoryEnum TwilioInterconnect = new UsageCategoryEnum("twilio-interconnect");
+      public static readonly UsageCategoryEnum VerifyPush = new UsageCategoryEnum("verify-push");
+      public static readonly UsageCategoryEnum VideoRecordings = new UsageCategoryEnum("video-recordings");
+      public static readonly UsageCategoryEnum VoiceInsights = new UsageCategoryEnum("voice-insights");
+      public static readonly UsageCategoryEnum VoiceInsightsClientInsightsOnDemandMinute = new UsageCategoryEnum("voice-insights-client-insights-on-demand-minute");
+      public static readonly UsageCategoryEnum VoiceInsightsPtsnInsightsOnDemandMinute = new UsageCategoryEnum("voice-insights-ptsn-insights-on-demand-minute");
+      public static readonly UsageCategoryEnum VoiceInsightsSipInterfaceInsightsOnDemandMinute = new UsageCategoryEnum("voice-insights-sip-interface-insights-on-demand-minute");
+      public static readonly UsageCategoryEnum VoiceInsightsSipTrunkingInsightsOnDemandMinute = new UsageCategoryEnum("voice-insights-sip-trunking-insights-on-demand-minute");
+      public static readonly UsageCategoryEnum Wireless = new UsageCategoryEnum("wireless");
+      public static readonly UsageCategoryEnum WirelessOrders = new UsageCategoryEnum("wireless-orders");
+      public static readonly UsageCategoryEnum WirelessOrdersArtwork = new UsageCategoryEnum("wireless-orders-artwork");
+      public static readonly UsageCategoryEnum WirelessOrdersBulk = new UsageCategoryEnum("wireless-orders-bulk");
+      public static readonly UsageCategoryEnum WirelessOrdersEsim = new UsageCategoryEnum("wireless-orders-esim");
+      public static readonly UsageCategoryEnum WirelessOrdersStarter = new UsageCategoryEnum("wireless-orders-starter");
+      public static readonly UsageCategoryEnum WirelessUsage = new UsageCategoryEnum("wireless-usage");
+      public static readonly UsageCategoryEnum WirelessUsageCommands = new UsageCategoryEnum("wireless-usage-commands");
+      public static readonly UsageCategoryEnum WirelessUsageCommandsAfrica = new UsageCategoryEnum("wireless-usage-commands-africa");
+      public static readonly UsageCategoryEnum WirelessUsageCommandsAsia = new UsageCategoryEnum("wireless-usage-commands-asia");
+      public static readonly UsageCategoryEnum WirelessUsageCommandsCentralandsouthamerica = new UsageCategoryEnum("wireless-usage-commands-centralandsouthamerica");
+      public static readonly UsageCategoryEnum WirelessUsageCommandsEurope = new UsageCategoryEnum("wireless-usage-commands-europe");
+      public static readonly UsageCategoryEnum WirelessUsageCommandsHome = new UsageCategoryEnum("wireless-usage-commands-home");
+      public static readonly UsageCategoryEnum WirelessUsageCommandsNorthamerica = new UsageCategoryEnum("wireless-usage-commands-northamerica");
+      public static readonly UsageCategoryEnum WirelessUsageCommandsOceania = new UsageCategoryEnum("wireless-usage-commands-oceania");
+      public static readonly UsageCategoryEnum WirelessUsageCommandsRoaming = new UsageCategoryEnum("wireless-usage-commands-roaming");
+      public static readonly UsageCategoryEnum WirelessUsageData = new UsageCategoryEnum("wireless-usage-data");
+      public static readonly UsageCategoryEnum WirelessUsageDataAfrica = new UsageCategoryEnum("wireless-usage-data-africa");
+      public static readonly UsageCategoryEnum WirelessUsageDataAsia = new UsageCategoryEnum("wireless-usage-data-asia");
+      public static readonly UsageCategoryEnum WirelessUsageDataCentralandsouthamerica = new UsageCategoryEnum("wireless-usage-data-centralandsouthamerica");
+      public static readonly UsageCategoryEnum WirelessUsageDataCustomAdditionalmb = new UsageCategoryEnum("wireless-usage-data-custom-additionalmb");
+      public static readonly UsageCategoryEnum WirelessUsageDataCustomFirst5Mb = new UsageCategoryEnum("wireless-usage-data-custom-first5mb");
+      public static readonly UsageCategoryEnum WirelessUsageDataDomesticRoaming = new UsageCategoryEnum("wireless-usage-data-domestic-roaming");
+      public static readonly UsageCategoryEnum WirelessUsageDataEurope = new UsageCategoryEnum("wireless-usage-data-europe");
+      public static readonly UsageCategoryEnum WirelessUsageDataIndividualAdditionalgb = new UsageCategoryEnum("wireless-usage-data-individual-additionalgb");
+      public static readonly UsageCategoryEnum WirelessUsageDataIndividualFirstgb = new UsageCategoryEnum("wireless-usage-data-individual-firstgb");
+      public static readonly UsageCategoryEnum WirelessUsageDataInternationalRoamingCanada = new UsageCategoryEnum("wireless-usage-data-international-roaming-canada");
+      public static readonly UsageCategoryEnum WirelessUsageDataInternationalRoamingIndia = new UsageCategoryEnum("wireless-usage-data-international-roaming-india");
+      public static readonly UsageCategoryEnum WirelessUsageDataInternationalRoamingMexico = new UsageCategoryEnum("wireless-usage-data-international-roaming-mexico");
+      public static readonly UsageCategoryEnum WirelessUsageDataNorthamerica = new UsageCategoryEnum("wireless-usage-data-northamerica");
+      public static readonly UsageCategoryEnum WirelessUsageDataOceania = new UsageCategoryEnum("wireless-usage-data-oceania");
+      public static readonly UsageCategoryEnum WirelessUsageDataPooled = new UsageCategoryEnum("wireless-usage-data-pooled");
+      public static readonly UsageCategoryEnum WirelessUsageDataPooledDownlink = new UsageCategoryEnum("wireless-usage-data-pooled-downlink");
+      public static readonly UsageCategoryEnum WirelessUsageDataPooledUplink = new UsageCategoryEnum("wireless-usage-data-pooled-uplink");
+      public static readonly UsageCategoryEnum WirelessUsageMrc = new UsageCategoryEnum("wireless-usage-mrc");
+      public static readonly UsageCategoryEnum WirelessUsageMrcCustom = new UsageCategoryEnum("wireless-usage-mrc-custom");
+      public static readonly UsageCategoryEnum WirelessUsageMrcIndividual = new UsageCategoryEnum("wireless-usage-mrc-individual");
+      public static readonly UsageCategoryEnum WirelessUsageMrcPooled = new UsageCategoryEnum("wireless-usage-mrc-pooled");
+      public static readonly UsageCategoryEnum WirelessUsageMrcSuspended = new UsageCategoryEnum("wireless-usage-mrc-suspended");
+      public static readonly UsageCategoryEnum WirelessUsageSms = new UsageCategoryEnum("wireless-usage-sms");
+      public static readonly UsageCategoryEnum WirelessUsageVoice = new UsageCategoryEnum("wireless-usage-voice");
+    }
+
+    public sealed class RecurringEnum : StringEnum
+    {
+      private RecurringEnum(string value) : base(value) { }
+      public RecurringEnum() { }
+      public static implicit operator RecurringEnum(string value)
+      {
+        return new RecurringEnum(value);
+      }
+
+      public static readonly RecurringEnum Daily = new RecurringEnum("daily");
+      public static readonly RecurringEnum Monthly = new RecurringEnum("monthly");
+      public static readonly RecurringEnum Yearly = new RecurringEnum("yearly");
+      public static readonly RecurringEnum Alltime = new RecurringEnum("alltime");
+    }
+
+    public sealed class TriggerFieldEnum : StringEnum
+    {
+      private TriggerFieldEnum(string value) : base(value) { }
+      public TriggerFieldEnum() { }
+      public static implicit operator TriggerFieldEnum(string value)
+      {
+        return new TriggerFieldEnum(value);
+      }
+
+      public static readonly TriggerFieldEnum Count = new TriggerFieldEnum("count");
+      public static readonly TriggerFieldEnum Usage = new TriggerFieldEnum("usage");
+      public static readonly TriggerFieldEnum Price = new TriggerFieldEnum("price");
+    }
+
+    private static Request BuildFetchRequest(FetchTriggerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Triggers/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch and instance of a usage-trigger
+    /// </summary>
+    /// <param name="options"> Fetch Trigger parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trigger </returns>
+    public static TriggerResource Fetch(FetchTriggerOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch and instance of a usage-trigger
+    /// </summary>
+    /// <param name="options"> Fetch Trigger parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trigger </returns>
+    public static async System.Threading.Tasks.Task<TriggerResource> FetchAsync(FetchTriggerOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch and instance of a usage-trigger
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trigger </returns>
+    public static TriggerResource Fetch(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchTriggerOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch and instance of a usage-trigger
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trigger </returns>
+    public static async System.Threading.Tasks.Task<TriggerResource> FetchAsync(string pathSid,
+                                                                                string pathAccountSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchTriggerOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateTriggerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Triggers/" + options.PathSid + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an instance of a usage trigger
+    /// </summary>
+    /// <param name="options"> Update Trigger parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trigger </returns>
+    public static TriggerResource Update(UpdateTriggerOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an instance of a usage trigger
+    /// </summary>
+    /// <param name="options"> Update Trigger parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trigger </returns>
+    public static async System.Threading.Tasks.Task<TriggerResource> UpdateAsync(UpdateTriggerOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an instance of a usage trigger
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
+    /// <param name="callbackMethod"> The HTTP method to use to call callback_url </param>
+    /// <param name="callbackUrl"> The URL we call when the trigger fires </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trigger </returns>
+    public static TriggerResource Update(string pathSid,
+                                         string pathAccountSid = null,
+                                         Twilio.Http.HttpMethod callbackMethod = null,
+                                         Uri callbackUrl = null,
+                                         string friendlyName = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateTriggerOptions(pathSid) { PathAccountSid = pathAccountSid, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, FriendlyName = friendlyName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an instance of a usage trigger
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to update </param>
+    /// <param name="callbackMethod"> The HTTP method to use to call callback_url </param>
+    /// <param name="callbackUrl"> The URL we call when the trigger fires </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trigger </returns>
+    public static async System.Threading.Tasks.Task<TriggerResource> UpdateAsync(string pathSid,
+                                                                                 string pathAccountSid = null,
+                                                                                 Twilio.Http.HttpMethod callbackMethod = null,
+                                                                                 Uri callbackUrl = null,
+                                                                                 string friendlyName = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateTriggerOptions(pathSid) { PathAccountSid = pathAccountSid, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, FriendlyName = friendlyName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteTriggerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Triggers/" + options.PathSid + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Trigger parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trigger </returns>
+    public static bool Delete(DeleteTriggerOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Trigger parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trigger </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTriggerOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trigger </returns>
+    public static bool Delete(string pathSid, string pathAccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new DeleteTriggerOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trigger </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      string pathAccountSid = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteTriggerOptions(pathSid) { PathAccountSid = pathAccountSid };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateTriggerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Triggers.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new UsageTrigger
+    /// </summary>
+    /// <param name="options"> Create Trigger parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trigger </returns>
+    public static TriggerResource Create(CreateTriggerOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new UsageTrigger
+    /// </summary>
+    /// <param name="options"> Create Trigger parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trigger </returns>
+    public static async System.Threading.Tasks.Task<TriggerResource> CreateAsync(CreateTriggerOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new UsageTrigger
+    /// </summary>
+    /// <param name="callbackUrl"> The URL we call when the trigger fires </param>
+    /// <param name="triggerValue"> The usage value at which the trigger should fire </param>
+    /// <param name="usageCategory"> The usage category the trigger watches </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="callbackMethod"> The HTTP method to use to call callback_url </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="recurring"> The frequency of a recurring UsageTrigger </param>
+    /// <param name="triggerBy"> The field in the UsageRecord resource that fires the trigger </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trigger </returns>
+    public static TriggerResource Create(Uri callbackUrl,
+                                         string triggerValue,
+                                         TriggerResource.UsageCategoryEnum usageCategory,
+                                         string pathAccountSid = null,
+                                         Twilio.Http.HttpMethod callbackMethod = null,
+                                         string friendlyName = null,
+                                         TriggerResource.RecurringEnum recurring = null,
+                                         TriggerResource.TriggerFieldEnum triggerBy = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateTriggerOptions(callbackUrl, triggerValue, usageCategory) { PathAccountSid = pathAccountSid, CallbackMethod = callbackMethod, FriendlyName = friendlyName, Recurring = recurring, TriggerBy = triggerBy };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new UsageTrigger
+    /// </summary>
+    /// <param name="callbackUrl"> The URL we call when the trigger fires </param>
+    /// <param name="triggerValue"> The usage value at which the trigger should fire </param>
+    /// <param name="usageCategory"> The usage category the trigger watches </param>
+    /// <param name="pathAccountSid"> The SID of the Account that will create the resource </param>
+    /// <param name="callbackMethod"> The HTTP method to use to call callback_url </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="recurring"> The frequency of a recurring UsageTrigger </param>
+    /// <param name="triggerBy"> The field in the UsageRecord resource that fires the trigger </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trigger </returns>
+    public static async System.Threading.Tasks.Task<TriggerResource> CreateAsync(Uri callbackUrl,
+                                                                                 string triggerValue,
+                                                                                 TriggerResource.UsageCategoryEnum usageCategory,
+                                                                                 string pathAccountSid = null,
+                                                                                 Twilio.Http.HttpMethod callbackMethod = null,
+                                                                                 string friendlyName = null,
+                                                                                 TriggerResource.RecurringEnum recurring = null,
+                                                                                 TriggerResource.TriggerFieldEnum triggerBy = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateTriggerOptions(callbackUrl, triggerValue, usageCategory) { PathAccountSid = pathAccountSid, CallbackMethod = callbackMethod, FriendlyName = friendlyName, Recurring = recurring, TriggerBy = triggerBy };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadTriggerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/Usage/Triggers.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of usage-triggers belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Trigger parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trigger </returns>
+    public static ResourceSet<TriggerResource> Read(ReadTriggerOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TriggerResource>.FromJson("usage_triggers", response.Content);
+      return new ResourceSet<TriggerResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of usage-triggers belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Trigger parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trigger </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TriggerResource>> ReadAsync(ReadTriggerOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TriggerResource>.FromJson("usage_triggers", response.Content);
+      return new ResourceSet<TriggerResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of usage-triggers belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="recurring"> The frequency of recurring UsageTriggers to read </param>
+    /// <param name="triggerBy"> The trigger field of the UsageTriggers to read </param>
+    /// <param name="usageCategory"> The usage category of the UsageTriggers to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trigger </returns>
+    public static ResourceSet<TriggerResource> Read(string pathAccountSid = null,
+                                                    TriggerResource.RecurringEnum recurring = null,
+                                                    TriggerResource.TriggerFieldEnum triggerBy = null,
+                                                    TriggerResource.UsageCategoryEnum usageCategory = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadTriggerOptions() { PathAccountSid = pathAccountSid, Recurring = recurring, TriggerBy = triggerBy, UsageCategory = usageCategory, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of usage-triggers belonging to the account used to make the request
+    /// </summary>
+    /// <param name="pathAccountSid"> The SID of the Account that created the resources to read </param>
+    /// <param name="recurring"> The frequency of recurring UsageTriggers to read </param>
+    /// <param name="triggerBy"> The trigger field of the UsageTriggers to read </param>
+    /// <param name="usageCategory"> The usage category of the UsageTriggers to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trigger </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TriggerResource>> ReadAsync(string pathAccountSid = null,
+                                                                                            TriggerResource.RecurringEnum recurring = null,
+                                                                                            TriggerResource.TriggerFieldEnum triggerBy = null,
+                                                                                            TriggerResource.UsageCategoryEnum usageCategory = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadTriggerOptions() { PathAccountSid = pathAccountSid, Recurring = recurring, TriggerBy = triggerBy, UsageCategory = usageCategory, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TriggerResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TriggerResource>.FromJson("usage_triggers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TriggerResource> NextPage(Page<TriggerResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<TriggerResource>.FromJson("usage_triggers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TriggerResource> PreviousPage(Page<TriggerResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<TriggerResource>.FromJson("usage_triggers", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a TriggerResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TriggerResource object represented by the provided JSON </returns>
+    public static TriggerResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TriggerResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that this trigger monitors
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The API version used to create the resource
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call callback_url
+    /// </summary>
+    [JsonProperty("callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod CallbackMethod { get; private set; }
+    /// <summary>
+    /// he URL we call when the trigger fires
+    /// </summary>
+    [JsonProperty("callback_url")]
+    public Uri CallbackUrl { get; private set; }
+    /// <summary>
+    /// The current value of the field the trigger is watching
+    /// </summary>
+    [JsonProperty("current_value")]
+    public string CurrentValue { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the trigger was last fired
+    /// </summary>
+    [JsonProperty("date_fired")]
+    public DateTime? DateFired { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the trigger
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The frequency of a recurring UsageTrigger
+    /// </summary>
+    [JsonProperty("recurring")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TriggerResource.RecurringEnum Recurring { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The field in the UsageRecord resource that fires the trigger
+    /// </summary>
+    [JsonProperty("trigger_by")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TriggerResource.TriggerFieldEnum TriggerBy { get; private set; }
+    /// <summary>
+    /// The value at which the trigger will fire
+    /// </summary>
+    [JsonProperty("trigger_value")]
+    public string TriggerValue { get; private set; }
+    /// <summary>
+    /// The URI of the resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+    /// <summary>
+    /// The usage category the trigger watches
+    /// </summary>
+    [JsonProperty("usage_category")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TriggerResource.UsageCategoryEnum UsageCategory { get; private set; }
+    /// <summary>
+    /// The URI of the UsageRecord resource this trigger watches
+    /// </summary>
+    [JsonProperty("usage_record_uri")]
+    public string UsageRecordUri { get; private set; }
+
+    private TriggerResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/ValidationRequestOptions.cs b/src/Twilio/Rest/Api/V2010/Account/ValidationRequestOptions.cs
index c5d9661d2..0ed86048b 100644
--- a/src/Twilio/Rest/Api/V2010/Account/ValidationRequestOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/ValidationRequestOptions.cs
@@ -9,89 +9,89 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
+{
+
+  /// <summary>
+  /// CreateValidationRequestOptions
+  /// </summary>
+  public class CreateValidationRequestOptions : IOptions<ValidationRequestResource>
+  {
     /// <summary>
-    /// CreateValidationRequestOptions
+    /// The SID of the Account responsible for the new Caller ID
     /// </summary>
-    public class CreateValidationRequestOptions : IOptions<ValidationRequestResource>
-    {
-        /// <summary>
-        /// The SID of the Account responsible for the new Caller ID
-        /// </summary>
-        public string PathAccountSid { get; set; }
-        /// <summary>
-        /// The phone number to verify in E.164 format
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The number of seconds to delay before initiating the verification call
-        /// </summary>
-        public int? CallDelay { get; set; }
-        /// <summary>
-        /// The digits to dial after connecting the verification call
-        /// </summary>
-        public string Extension { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateValidationRequestOptions
-        /// </summary>
-        /// <param name="phoneNumber"> The phone number to verify in E.164 format </param>
-        public CreateValidationRequestOptions(Types.PhoneNumber phoneNumber)
-        {
-            PhoneNumber = phoneNumber;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (CallDelay != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallDelay", CallDelay.ToString()));
-            }
-
-            if (Extension != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Extension", Extension));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathAccountSid { get; set; }
+    /// <summary>
+    /// The phone number to verify in E.164 format
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The number of seconds to delay before initiating the verification call
+    /// </summary>
+    public int? CallDelay { get; set; }
+    /// <summary>
+    /// The digits to dial after connecting the verification call
+    /// </summary>
+    public string Extension { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateValidationRequestOptions
+    /// </summary>
+    /// <param name="phoneNumber"> The phone number to verify in E.164 format </param>
+    public CreateValidationRequestOptions(Types.PhoneNumber phoneNumber)
+    {
+      PhoneNumber = phoneNumber;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (CallDelay != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallDelay", CallDelay.ToString()));
+      }
+
+      if (Extension != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Extension", Extension));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/Account/ValidationRequestResource.cs b/src/Twilio/Rest/Api/V2010/Account/ValidationRequestResource.cs
index 8e1738282..62c0529b7 100644
--- a/src/Twilio/Rest/Api/V2010/Account/ValidationRequestResource.cs
+++ b/src/Twilio/Rest/Api/V2010/Account/ValidationRequestResource.cs
@@ -16,152 +16,152 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Api.V2010.Account
-{
-
-    public class ValidationRequestResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateValidationRequestOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/OutgoingCallerIds.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ValidationRequest parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ValidationRequest </returns>
-        public static ValidationRequestResource Create(CreateValidationRequestOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ValidationRequest parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ValidationRequest </returns>
-        public static async System.Threading.Tasks.Task<ValidationRequestResource> CreateAsync(CreateValidationRequestOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="phoneNumber"> The phone number to verify in E.164 format </param>
-        /// <param name="pathAccountSid"> The SID of the Account responsible for the new Caller ID </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="callDelay"> The number of seconds to delay before initiating the verification call </param>
-        /// <param name="extension"> The digits to dial after connecting the verification call </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ValidationRequest </returns>
-        public static ValidationRequestResource Create(Types.PhoneNumber phoneNumber,
-                                                       string pathAccountSid = null,
-                                                       string friendlyName = null,
-                                                       int? callDelay = null,
-                                                       string extension = null,
-                                                       Uri statusCallback = null,
-                                                       Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateValidationRequestOptions(phoneNumber){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, CallDelay = callDelay, Extension = extension, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="phoneNumber"> The phone number to verify in E.164 format </param>
-        /// <param name="pathAccountSid"> The SID of the Account responsible for the new Caller ID </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="callDelay"> The number of seconds to delay before initiating the verification call </param>
-        /// <param name="extension"> The digits to dial after connecting the verification call </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ValidationRequest </returns>
-        public static async System.Threading.Tasks.Task<ValidationRequestResource> CreateAsync(Types.PhoneNumber phoneNumber,
-                                                                                               string pathAccountSid = null,
-                                                                                               string friendlyName = null,
-                                                                                               int? callDelay = null,
-                                                                                               string extension = null,
-                                                                                               Uri statusCallback = null,
-                                                                                               Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateValidationRequestOptions(phoneNumber){PathAccountSid = pathAccountSid, FriendlyName = friendlyName, CallDelay = callDelay, Extension = extension, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ValidationRequestResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ValidationRequestResource object represented by the provided JSON </returns>
-        public static ValidationRequestResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ValidationRequestResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Call the resource is associated with
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The phone number to verify in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The 6 digit validation code that someone must enter to validate the Caller ID  when `phone_number` is called
-        /// </summary>
-        [JsonProperty("validation_code")]
-        public string ValidationCode { get; private set; }
-
-        private ValidationRequestResource()
-        {
-
-        }
-    }
+{
+
+  public class ValidationRequestResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateValidationRequestOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathAccountSid ?? client.AccountSid) + "/OutgoingCallerIds.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ValidationRequest parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ValidationRequest </returns>
+    public static ValidationRequestResource Create(CreateValidationRequestOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ValidationRequest parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ValidationRequest </returns>
+    public static async System.Threading.Tasks.Task<ValidationRequestResource> CreateAsync(CreateValidationRequestOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="phoneNumber"> The phone number to verify in E.164 format </param>
+    /// <param name="pathAccountSid"> The SID of the Account responsible for the new Caller ID </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="callDelay"> The number of seconds to delay before initiating the verification call </param>
+    /// <param name="extension"> The digits to dial after connecting the verification call </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ValidationRequest </returns>
+    public static ValidationRequestResource Create(Types.PhoneNumber phoneNumber,
+                                                   string pathAccountSid = null,
+                                                   string friendlyName = null,
+                                                   int? callDelay = null,
+                                                   string extension = null,
+                                                   Uri statusCallback = null,
+                                                   Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateValidationRequestOptions(phoneNumber) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, CallDelay = callDelay, Extension = extension, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="phoneNumber"> The phone number to verify in E.164 format </param>
+    /// <param name="pathAccountSid"> The SID of the Account responsible for the new Caller ID </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="callDelay"> The number of seconds to delay before initiating the verification call </param>
+    /// <param name="extension"> The digits to dial after connecting the verification call </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ValidationRequest </returns>
+    public static async System.Threading.Tasks.Task<ValidationRequestResource> CreateAsync(Types.PhoneNumber phoneNumber,
+                                                                                           string pathAccountSid = null,
+                                                                                           string friendlyName = null,
+                                                                                           int? callDelay = null,
+                                                                                           string extension = null,
+                                                                                           Uri statusCallback = null,
+                                                                                           Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateValidationRequestOptions(phoneNumber) { PathAccountSid = pathAccountSid, FriendlyName = friendlyName, CallDelay = callDelay, Extension = extension, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ValidationRequestResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ValidationRequestResource object represented by the provided JSON </returns>
+    public static ValidationRequestResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ValidationRequestResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Call the resource is associated with
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The phone number to verify in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The 6 digit validation code that someone must enter to validate the Caller ID  when `phone_number` is called
+    /// </summary>
+    [JsonProperty("validation_code")]
+    public string ValidationCode { get; private set; }
+
+    private ValidationRequestResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/AccountOptions.cs b/src/Twilio/Rest/Api/V2010/AccountOptions.cs
index 02d70abb7..db8bc7400 100644
--- a/src/Twilio/Rest/Api/V2010/AccountOptions.cs
+++ b/src/Twilio/Rest/Api/V2010/AccountOptions.cs
@@ -9,128 +9,128 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Api.V2010
-{
-
+{
+
+  /// <summary>
+  /// Create a new Twilio Subaccount from the account making the request
+  /// </summary>
+  public class CreateAccountOptions : IOptions<AccountResource>
+  {
     /// <summary>
-    /// Create a new Twilio Subaccount from the account making the request
+    /// A human readable description of the account
     /// </summary>
-    public class CreateAccountOptions : IOptions<AccountResource>
-    {
-        /// <summary>
-        /// A human readable description of the account
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
+
     /// <summary>
-    /// Fetch the account specified by the provided Account Sid
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchAccountOptions : IOptions<AccountResource>
-    {
-        /// <summary>
-        /// Fetch by unique Account Sid
-        /// </summary>
-        public string PathSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch the account specified by the provided Account Sid
+  /// </summary>
+  public class FetchAccountOptions : IOptions<AccountResource>
+  {
     /// <summary>
-    /// Retrieves a collection of Accounts belonging to the account used to make the request
+    /// Fetch by unique Account Sid
     /// </summary>
-    public class ReadAccountOptions : ReadOptions<AccountResource>
-    {
-        /// <summary>
-        /// FriendlyName to filter on
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Status to filter on
-        /// </summary>
-        public AccountResource.StatusEnum Status { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; set; }
+
     /// <summary>
-    /// Modify the properties of a given Account
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateAccountOptions : IOptions<AccountResource>
-    {
-        /// <summary>
-        /// Update by unique Account Sid
-        /// </summary>
-        public string PathSid { get; set; }
-        /// <summary>
-        /// FriendlyName to update
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Status to update the Account with
-        /// </summary>
-        public AccountResource.StatusEnum Status { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieves a collection of Accounts belonging to the account used to make the request
+  /// </summary>
+  public class ReadAccountOptions : ReadOptions<AccountResource>
+  {
+    /// <summary>
+    /// FriendlyName to filter on
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Status to filter on
+    /// </summary>
+    public AccountResource.StatusEnum Status { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Modify the properties of a given Account
+  /// </summary>
+  public class UpdateAccountOptions : IOptions<AccountResource>
+  {
+    /// <summary>
+    /// Update by unique Account Sid
+    /// </summary>
+    public string PathSid { get; set; }
+    /// <summary>
+    /// FriendlyName to update
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Status to update the Account with
+    /// </summary>
+    public AccountResource.StatusEnum Status { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Api/V2010/AccountResource.cs b/src/Twilio/Rest/Api/V2010/AccountResource.cs
index 647865d65..7db18d79d 100644
--- a/src/Twilio/Rest/Api/V2010/AccountResource.cs
+++ b/src/Twilio/Rest/Api/V2010/AccountResource.cs
@@ -17,459 +17,459 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Api.V2010
-{
-
-    public class AccountResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Active = new StatusEnum("active");
-            public static readonly StatusEnum Suspended = new StatusEnum("suspended");
-            public static readonly StatusEnum Closed = new StatusEnum("closed");
-        }
-
-        public sealed class TypeEnum : StringEnum
-        {
-            private TypeEnum(string value) : base(value) {}
-            public TypeEnum() {}
-            public static implicit operator TypeEnum(string value)
-            {
-                return new TypeEnum(value);
-            }
-
-            public static readonly TypeEnum Trial = new TypeEnum("Trial");
-            public static readonly TypeEnum Full = new TypeEnum("Full");
-        }
-
-        private static Request BuildCreateRequest(CreateAccountOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts.json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Twilio Subaccount from the account making the request
-        /// </summary>
-        /// <param name="options"> Create Account parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Account </returns>
-        public static AccountResource Create(CreateAccountOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Twilio Subaccount from the account making the request
-        /// </summary>
-        /// <param name="options"> Create Account parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Account </returns>
-        public static async System.Threading.Tasks.Task<AccountResource> CreateAsync(CreateAccountOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Twilio Subaccount from the account making the request
-        /// </summary>
-        /// <param name="friendlyName"> A human readable description of the account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Account </returns>
-        public static AccountResource Create(string friendlyName = null, ITwilioRestClient client = null)
-        {
-            var options = new CreateAccountOptions(){FriendlyName = friendlyName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Twilio Subaccount from the account making the request
-        /// </summary>
-        /// <param name="friendlyName"> A human readable description of the account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Account </returns>
-        public static async System.Threading.Tasks.Task<AccountResource> CreateAsync(string friendlyName = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateAccountOptions(){FriendlyName = friendlyName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchAccountOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathSid ?? client.AccountSid) + ".json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the account specified by the provided Account Sid
-        /// </summary>
-        /// <param name="options"> Fetch Account parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Account </returns>
-        public static AccountResource Fetch(FetchAccountOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the account specified by the provided Account Sid
-        /// </summary>
-        /// <param name="options"> Fetch Account parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Account </returns>
-        public static async System.Threading.Tasks.Task<AccountResource> FetchAsync(FetchAccountOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the account specified by the provided Account Sid
-        /// </summary>
-        /// <param name="pathSid"> Fetch by unique Account Sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Account </returns>
-        public static AccountResource Fetch(string pathSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchAccountOptions(){PathSid = pathSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the account specified by the provided Account Sid
-        /// </summary>
-        /// <param name="pathSid"> Fetch by unique Account Sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Account </returns>
-        public static async System.Threading.Tasks.Task<AccountResource> FetchAsync(string pathSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchAccountOptions(){PathSid = pathSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAccountOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts.json",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieves a collection of Accounts belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Account parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Account </returns>
-        public static ResourceSet<AccountResource> Read(ReadAccountOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AccountResource>.FromJson("accounts", response.Content);
-            return new ResourceSet<AccountResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieves a collection of Accounts belonging to the account used to make the request
-        /// </summary>
-        /// <param name="options"> Read Account parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Account </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AccountResource>> ReadAsync(ReadAccountOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AccountResource>.FromJson("accounts", response.Content);
-            return new ResourceSet<AccountResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieves a collection of Accounts belonging to the account used to make the request
-        /// </summary>
-        /// <param name="friendlyName"> FriendlyName to filter on </param>
-        /// <param name="status"> Status to filter on </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Account </returns>
-        public static ResourceSet<AccountResource> Read(string friendlyName = null,
-                                                        AccountResource.StatusEnum status = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadAccountOptions(){FriendlyName = friendlyName, Status = status, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieves a collection of Accounts belonging to the account used to make the request
-        /// </summary>
-        /// <param name="friendlyName"> FriendlyName to filter on </param>
-        /// <param name="status"> Status to filter on </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Account </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AccountResource>> ReadAsync(string friendlyName = null,
-                                                                                                AccountResource.StatusEnum status = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadAccountOptions(){FriendlyName = friendlyName, Status = status, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AccountResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AccountResource>.FromJson("accounts", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AccountResource> NextPage(Page<AccountResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AccountResource>.FromJson("accounts", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AccountResource> PreviousPage(Page<AccountResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Api)
-            );
-
-            var response = client.Request(request);
-            return Page<AccountResource>.FromJson("accounts", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateAccountOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Api,
-                "/2010-04-01/Accounts/" + (options.PathSid ?? client.AccountSid) + ".json",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Modify the properties of a given Account
-        /// </summary>
-        /// <param name="options"> Update Account parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Account </returns>
-        public static AccountResource Update(UpdateAccountOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Modify the properties of a given Account
-        /// </summary>
-        /// <param name="options"> Update Account parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Account </returns>
-        public static async System.Threading.Tasks.Task<AccountResource> UpdateAsync(UpdateAccountOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Modify the properties of a given Account
-        /// </summary>
-        /// <param name="pathSid"> Update by unique Account Sid </param>
-        /// <param name="friendlyName"> FriendlyName to update </param>
-        /// <param name="status"> Status to update the Account with </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Account </returns>
-        public static AccountResource Update(string pathSid = null,
-                                             string friendlyName = null,
-                                             AccountResource.StatusEnum status = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateAccountOptions(){PathSid = pathSid, FriendlyName = friendlyName, Status = status};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Modify the properties of a given Account
-        /// </summary>
-        /// <param name="pathSid"> Update by unique Account Sid </param>
-        /// <param name="friendlyName"> FriendlyName to update </param>
-        /// <param name="status"> Status to update the Account with </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Account </returns>
-        public static async System.Threading.Tasks.Task<AccountResource> UpdateAsync(string pathSid = null,
-                                                                                     string friendlyName = null,
-                                                                                     AccountResource.StatusEnum status = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateAccountOptions(){PathSid = pathSid, FriendlyName = friendlyName, Status = status};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AccountResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AccountResource object represented by the provided JSON </returns>
-        public static AccountResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AccountResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The authorization token for this account
-        /// </summary>
-        [JsonProperty("auth_token")]
-        public string AuthToken { get; private set; }
-        /// <summary>
-        /// The date this account was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this account was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// A human readable description of this account
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique 34 character id representing the parent of this account
-        /// </summary>
-        [JsonProperty("owner_account_sid")]
-        public string OwnerAccountSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The status of this account
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public AccountResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// Account Instance Subresources
-        /// </summary>
-        [JsonProperty("subresource_uris")]
-        public Dictionary<string, string> SubresourceUris { get; private set; }
-        /// <summary>
-        /// The type of this account
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public AccountResource.TypeEnum Type { get; private set; }
-        /// <summary>
-        /// The URI for this resource, relative to `https://api.twilio.com`
-        /// </summary>
-        [JsonProperty("uri")]
-        public string Uri { get; private set; }
-
-        private AccountResource()
-        {
-
-        }
-    }
+{
+
+  public class AccountResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Active = new StatusEnum("active");
+      public static readonly StatusEnum Suspended = new StatusEnum("suspended");
+      public static readonly StatusEnum Closed = new StatusEnum("closed");
+    }
+
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+      public TypeEnum() { }
+      public static implicit operator TypeEnum(string value)
+      {
+        return new TypeEnum(value);
+      }
+
+      public static readonly TypeEnum Trial = new TypeEnum("Trial");
+      public static readonly TypeEnum Full = new TypeEnum("Full");
+    }
+
+    private static Request BuildCreateRequest(CreateAccountOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts.json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Twilio Subaccount from the account making the request
+    /// </summary>
+    /// <param name="options"> Create Account parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Account </returns>
+    public static AccountResource Create(CreateAccountOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Twilio Subaccount from the account making the request
+    /// </summary>
+    /// <param name="options"> Create Account parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Account </returns>
+    public static async System.Threading.Tasks.Task<AccountResource> CreateAsync(CreateAccountOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Twilio Subaccount from the account making the request
+    /// </summary>
+    /// <param name="friendlyName"> A human readable description of the account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Account </returns>
+    public static AccountResource Create(string friendlyName = null, ITwilioRestClient client = null)
+    {
+      var options = new CreateAccountOptions() { FriendlyName = friendlyName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Twilio Subaccount from the account making the request
+    /// </summary>
+    /// <param name="friendlyName"> A human readable description of the account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Account </returns>
+    public static async System.Threading.Tasks.Task<AccountResource> CreateAsync(string friendlyName = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateAccountOptions() { FriendlyName = friendlyName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchAccountOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathSid ?? client.AccountSid) + ".json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the account specified by the provided Account Sid
+    /// </summary>
+    /// <param name="options"> Fetch Account parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Account </returns>
+    public static AccountResource Fetch(FetchAccountOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the account specified by the provided Account Sid
+    /// </summary>
+    /// <param name="options"> Fetch Account parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Account </returns>
+    public static async System.Threading.Tasks.Task<AccountResource> FetchAsync(FetchAccountOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the account specified by the provided Account Sid
+    /// </summary>
+    /// <param name="pathSid"> Fetch by unique Account Sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Account </returns>
+    public static AccountResource Fetch(string pathSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchAccountOptions() { PathSid = pathSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the account specified by the provided Account Sid
+    /// </summary>
+    /// <param name="pathSid"> Fetch by unique Account Sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Account </returns>
+    public static async System.Threading.Tasks.Task<AccountResource> FetchAsync(string pathSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchAccountOptions() { PathSid = pathSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAccountOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts.json",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieves a collection of Accounts belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Account parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Account </returns>
+    public static ResourceSet<AccountResource> Read(ReadAccountOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AccountResource>.FromJson("accounts", response.Content);
+      return new ResourceSet<AccountResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieves a collection of Accounts belonging to the account used to make the request
+    /// </summary>
+    /// <param name="options"> Read Account parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Account </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AccountResource>> ReadAsync(ReadAccountOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AccountResource>.FromJson("accounts", response.Content);
+      return new ResourceSet<AccountResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieves a collection of Accounts belonging to the account used to make the request
+    /// </summary>
+    /// <param name="friendlyName"> FriendlyName to filter on </param>
+    /// <param name="status"> Status to filter on </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Account </returns>
+    public static ResourceSet<AccountResource> Read(string friendlyName = null,
+                                                    AccountResource.StatusEnum status = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadAccountOptions() { FriendlyName = friendlyName, Status = status, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieves a collection of Accounts belonging to the account used to make the request
+    /// </summary>
+    /// <param name="friendlyName"> FriendlyName to filter on </param>
+    /// <param name="status"> Status to filter on </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Account </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AccountResource>> ReadAsync(string friendlyName = null,
+                                                                                            AccountResource.StatusEnum status = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadAccountOptions() { FriendlyName = friendlyName, Status = status, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AccountResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AccountResource>.FromJson("accounts", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AccountResource> NextPage(Page<AccountResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AccountResource>.FromJson("accounts", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AccountResource> PreviousPage(Page<AccountResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Api)
+      );
+
+      var response = client.Request(request);
+      return Page<AccountResource>.FromJson("accounts", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateAccountOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Api,
+          "/2010-04-01/Accounts/" + (options.PathSid ?? client.AccountSid) + ".json",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Modify the properties of a given Account
+    /// </summary>
+    /// <param name="options"> Update Account parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Account </returns>
+    public static AccountResource Update(UpdateAccountOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Modify the properties of a given Account
+    /// </summary>
+    /// <param name="options"> Update Account parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Account </returns>
+    public static async System.Threading.Tasks.Task<AccountResource> UpdateAsync(UpdateAccountOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Modify the properties of a given Account
+    /// </summary>
+    /// <param name="pathSid"> Update by unique Account Sid </param>
+    /// <param name="friendlyName"> FriendlyName to update </param>
+    /// <param name="status"> Status to update the Account with </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Account </returns>
+    public static AccountResource Update(string pathSid = null,
+                                         string friendlyName = null,
+                                         AccountResource.StatusEnum status = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateAccountOptions() { PathSid = pathSid, FriendlyName = friendlyName, Status = status };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Modify the properties of a given Account
+    /// </summary>
+    /// <param name="pathSid"> Update by unique Account Sid </param>
+    /// <param name="friendlyName"> FriendlyName to update </param>
+    /// <param name="status"> Status to update the Account with </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Account </returns>
+    public static async System.Threading.Tasks.Task<AccountResource> UpdateAsync(string pathSid = null,
+                                                                                 string friendlyName = null,
+                                                                                 AccountResource.StatusEnum status = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateAccountOptions() { PathSid = pathSid, FriendlyName = friendlyName, Status = status };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AccountResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AccountResource object represented by the provided JSON </returns>
+    public static AccountResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AccountResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The authorization token for this account
+    /// </summary>
+    [JsonProperty("auth_token")]
+    public string AuthToken { get; private set; }
+    /// <summary>
+    /// The date this account was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this account was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// A human readable description of this account
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique 34 character id representing the parent of this account
+    /// </summary>
+    [JsonProperty("owner_account_sid")]
+    public string OwnerAccountSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The status of this account
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public AccountResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// Account Instance Subresources
+    /// </summary>
+    [JsonProperty("subresource_uris")]
+    public Dictionary<string, string> SubresourceUris { get; private set; }
+    /// <summary>
+    /// The type of this account
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public AccountResource.TypeEnum Type { get; private set; }
+    /// <summary>
+    /// The URI for this resource, relative to `https://api.twilio.com`
+    /// </summary>
+    [JsonProperty("uri")]
+    public string Uri { get; private set; }
+
+    private AccountResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/DefaultsOptions.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/DefaultsOptions.cs
index b352ba3ac..7fee9a2c2 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/DefaultsOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/DefaultsOptions.cs
@@ -9,79 +9,79 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchDefaultsOptions
+  /// </summary>
+  public class FetchDefaultsOptions : IOptions<DefaultsResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchDefaultsOptions
+    /// The SID of the Assistant that is the parent of the resource to fetch
     /// </summary>
-    public class FetchDefaultsOptions : IOptions<DefaultsResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource to fetch
-        /// </summary>
-        public string PathAssistantSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchDefaultsOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        public FetchDefaultsOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateDefaultsOptions
+    /// Construct a new FetchDefaultsOptions
     /// </summary>
-    public class UpdateDefaultsOptions : IOptions<DefaultsResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource to update
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// A JSON string that describes the default task links.
-        /// </summary>
-        public object Defaults { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateDefaultsOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        public UpdateDefaultsOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Defaults != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Defaults", Serializers.JsonObject(Defaults)));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    public FetchDefaultsOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateDefaultsOptions
+  /// </summary>
+  public class UpdateDefaultsOptions : IOptions<DefaultsResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resource to update
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// A JSON string that describes the default task links.
+    /// </summary>
+    public object Defaults { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateDefaultsOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    public UpdateDefaultsOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Defaults != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Defaults", Serializers.JsonObject(Defaults)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/DefaultsResource.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/DefaultsResource.cs
index 74d411111..3a7428acc 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/DefaultsResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/DefaultsResource.cs
@@ -19,192 +19,192 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
-    public class DefaultsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchDefaultsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Defaults",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Defaults parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Defaults </returns>
-        public static DefaultsResource Fetch(FetchDefaultsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Defaults parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Defaults </returns>
-        public static async System.Threading.Tasks.Task<DefaultsResource> FetchAsync(FetchDefaultsOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Defaults </returns>
-        public static DefaultsResource Fetch(string pathAssistantSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchDefaultsOptions(pathAssistantSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Defaults </returns>
-        public static async System.Threading.Tasks.Task<DefaultsResource> FetchAsync(string pathAssistantSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchDefaultsOptions(pathAssistantSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateDefaultsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Defaults",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Defaults parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Defaults </returns>
-        public static DefaultsResource Update(UpdateDefaultsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Defaults parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Defaults </returns>
-        public static async System.Threading.Tasks.Task<DefaultsResource> UpdateAsync(UpdateDefaultsOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="defaults"> A JSON string that describes the default task links. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Defaults </returns>
-        public static DefaultsResource Update(string pathAssistantSid,
-                                              object defaults = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateDefaultsOptions(pathAssistantSid){Defaults = defaults};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="defaults"> A JSON string that describes the default task links. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Defaults </returns>
-        public static async System.Threading.Tasks.Task<DefaultsResource> UpdateAsync(string pathAssistantSid,
-                                                                                      object defaults = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateDefaultsOptions(pathAssistantSid){Defaults = defaults};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a DefaultsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DefaultsResource object represented by the provided JSON </returns>
-        public static DefaultsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DefaultsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Defaults resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The JSON string that describes the default task links
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-
-        private DefaultsResource()
-        {
-
-        }
-    }
+{
+
+  public class DefaultsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchDefaultsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Defaults",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Defaults parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Defaults </returns>
+    public static DefaultsResource Fetch(FetchDefaultsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Defaults parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Defaults </returns>
+    public static async System.Threading.Tasks.Task<DefaultsResource> FetchAsync(FetchDefaultsOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Defaults </returns>
+    public static DefaultsResource Fetch(string pathAssistantSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchDefaultsOptions(pathAssistantSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Defaults </returns>
+    public static async System.Threading.Tasks.Task<DefaultsResource> FetchAsync(string pathAssistantSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchDefaultsOptions(pathAssistantSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateDefaultsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Defaults",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Defaults parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Defaults </returns>
+    public static DefaultsResource Update(UpdateDefaultsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Defaults parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Defaults </returns>
+    public static async System.Threading.Tasks.Task<DefaultsResource> UpdateAsync(UpdateDefaultsOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="defaults"> A JSON string that describes the default task links. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Defaults </returns>
+    public static DefaultsResource Update(string pathAssistantSid,
+                                          object defaults = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateDefaultsOptions(pathAssistantSid) { Defaults = defaults };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="defaults"> A JSON string that describes the default task links. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Defaults </returns>
+    public static async System.Threading.Tasks.Task<DefaultsResource> UpdateAsync(string pathAssistantSid,
+                                                                                  object defaults = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateDefaultsOptions(pathAssistantSid) { Defaults = defaults };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a DefaultsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DefaultsResource object represented by the provided JSON </returns>
+    public static DefaultsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DefaultsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resource
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Defaults resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The JSON string that describes the default task links
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+
+    private DefaultsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/DialogueOptions.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/DialogueOptions.cs
index 8e36f4b58..5039f4349 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/DialogueOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/DialogueOptions.cs
@@ -9,44 +9,44 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchDialogueOptions
+  /// </summary>
+  public class FetchDialogueOptions : IOptions<DialogueResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchDialogueOptions
+    /// The SID of the Assistant that is the parent of the resource to fetch
     /// </summary>
-    public class FetchDialogueOptions : IOptions<DialogueResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource to fetch
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchDialogueOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchDialogueOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchDialogueOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchDialogueOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/DialogueResource.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/DialogueResource.cs
index 7d8055752..3b93c0cab 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/DialogueResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/DialogueResource.cs
@@ -19,128 +19,128 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
-    public class DialogueResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchDialogueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Dialogues/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Dialogue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Dialogue </returns>
-        public static DialogueResource Fetch(FetchDialogueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Dialogue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Dialogue </returns>
-        public static async System.Threading.Tasks.Task<DialogueResource> FetchAsync(FetchDialogueOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Dialogue </returns>
-        public static DialogueResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchDialogueOptions(pathAssistantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Dialogue </returns>
-        public static async System.Threading.Tasks.Task<DialogueResource> FetchAsync(string pathAssistantSid,
-                                                                                     string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchDialogueOptions(pathAssistantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a DialogueResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DialogueResource object represented by the provided JSON </returns>
-        public static DialogueResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DialogueResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The JSON string that describes the dialogue session object
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Dialogue resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private DialogueResource()
-        {
-
-        }
-    }
+{
+
+  public class DialogueResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchDialogueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Dialogues/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Dialogue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Dialogue </returns>
+    public static DialogueResource Fetch(FetchDialogueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Dialogue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Dialogue </returns>
+    public static async System.Threading.Tasks.Task<DialogueResource> FetchAsync(FetchDialogueOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Dialogue </returns>
+    public static DialogueResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchDialogueOptions(pathAssistantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Dialogue </returns>
+    public static async System.Threading.Tasks.Task<DialogueResource> FetchAsync(string pathAssistantSid,
+                                                                                 string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchDialogueOptions(pathAssistantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a DialogueResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DialogueResource object represented by the provided JSON </returns>
+    public static DialogueResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DialogueResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resource
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The JSON string that describes the dialogue session object
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Dialogue resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private DialogueResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/FieldType/FieldValueOptions.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/FieldType/FieldValueOptions.cs
index 597e227c6..63f37695b 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/FieldType/FieldValueOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/FieldType/FieldValueOptions.cs
@@ -9,219 +9,219 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant.FieldType
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchFieldValueOptions
+  /// </summary>
+  public class FetchFieldValueOptions : IOptions<FieldValueResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchFieldValueOptions
-    /// </summary>
-    public class FetchFieldValueOptions : IOptions<FieldValueResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the FieldType associated with the resource to fetch
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the Field Type associated with  the Field Value to fetch
-        /// </summary>
-        public string PathFieldTypeSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFieldValueOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
-        ///                        resource to fetch </param>
-        /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with  the Field Value to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathFieldTypeSid = pathFieldTypeSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Assistant that is the parent of the FieldType associated with the resource to fetch
+    /// </summary>
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadFieldValueOptions
-    /// </summary>
-    public class ReadFieldValueOptions : ReadOptions<FieldValueResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the FieldType associated with the resources to read
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the Field Type associated with the Field Value to read
-        /// </summary>
-        public string PathFieldTypeSid { get; }
-        /// <summary>
-        /// The ISO language-country tag that identifies the language of the value
-        /// </summary>
-        public string Language { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadFieldValueOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
-        ///                        resources to read </param>
-        /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value to read </param>
-        public ReadFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathFieldTypeSid = pathFieldTypeSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Field Type associated with  the Field Value to fetch
+    /// </summary>
+    public string PathFieldTypeSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateFieldValueOptions
-    /// </summary>
-    public class CreateFieldValueOptions : IOptions<FieldValueResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the FieldType associated with the new resource
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the Field Type associated with the Field Value
-        /// </summary>
-        public string PathFieldTypeSid { get; }
-        /// <summary>
-        /// The ISO language-country tag that identifies the language of the value
-        /// </summary>
-        public string Language { get; }
-        /// <summary>
-        /// The Field Value data
-        /// </summary>
-        public string Value { get; }
-        /// <summary>
-        /// The string value that indicates which word the field value is a synonym of
-        /// </summary>
-        public string SynonymOf { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateFieldValueOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
-        ///                        new resource </param>
-        /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value </param>
-        /// <param name="language"> The ISO language-country tag that identifies the language of the value </param>
-        /// <param name="value"> The Field Value data </param>
-        public CreateFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid, string language, string value)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathFieldTypeSid = pathFieldTypeSid;
-            Language = language;
-            Value = value;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Value", Value));
-            }
-
-            if (SynonymOf != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SynonymOf", SynonymOf.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteFieldValueOptions
-    /// </summary>
-    public class DeleteFieldValueOptions : IOptions<FieldValueResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the FieldType associated with the resources to delete
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the Field Type associated with the Field Value to delete
-        /// </summary>
-        public string PathFieldTypeSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFieldValueOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
-        ///                        resources to delete </param>
-        /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathFieldTypeSid = pathFieldTypeSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new FetchFieldValueOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
+    ///                        resource to fetch </param>
+    /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with  the Field Value to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathFieldTypeSid = pathFieldTypeSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadFieldValueOptions
+  /// </summary>
+  public class ReadFieldValueOptions : ReadOptions<FieldValueResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the FieldType associated with the resources to read
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The SID of the Field Type associated with the Field Value to read
+    /// </summary>
+    public string PathFieldTypeSid { get; }
+    /// <summary>
+    /// The ISO language-country tag that identifies the language of the value
+    /// </summary>
+    public string Language { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadFieldValueOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
+    ///                        resources to read </param>
+    /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value to read </param>
+    public ReadFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathFieldTypeSid = pathFieldTypeSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateFieldValueOptions
+  /// </summary>
+  public class CreateFieldValueOptions : IOptions<FieldValueResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the FieldType associated with the new resource
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The SID of the Field Type associated with the Field Value
+    /// </summary>
+    public string PathFieldTypeSid { get; }
+    /// <summary>
+    /// The ISO language-country tag that identifies the language of the value
+    /// </summary>
+    public string Language { get; }
+    /// <summary>
+    /// The Field Value data
+    /// </summary>
+    public string Value { get; }
+    /// <summary>
+    /// The string value that indicates which word the field value is a synonym of
+    /// </summary>
+    public string SynonymOf { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateFieldValueOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
+    ///                        new resource </param>
+    /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value </param>
+    /// <param name="language"> The ISO language-country tag that identifies the language of the value </param>
+    /// <param name="value"> The Field Value data </param>
+    public CreateFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid, string language, string value)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathFieldTypeSid = pathFieldTypeSid;
+      Language = language;
+      Value = value;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Value", Value));
+      }
+
+      if (SynonymOf != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SynonymOf", SynonymOf.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteFieldValueOptions
+  /// </summary>
+  public class DeleteFieldValueOptions : IOptions<FieldValueResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the FieldType associated with the resources to delete
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The SID of the Field Type associated with the Field Value to delete
+    /// </summary>
+    public string PathFieldTypeSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteFieldValueOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
+    ///                        resources to delete </param>
+    /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathFieldTypeSid = pathFieldTypeSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/FieldType/FieldValueResource.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/FieldType/FieldValueResource.cs
index 92d3c0873..9d376d33a 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/FieldType/FieldValueResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/FieldType/FieldValueResource.cs
@@ -19,468 +19,468 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant.FieldType
-{
-
-    public class FieldValueResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchFieldValueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static FieldValueResource Fetch(FetchFieldValueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<FieldValueResource> FetchAsync(FetchFieldValueOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
-        ///                        resource to fetch </param>
-        /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with  the Field Value to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static FieldValueResource Fetch(string pathAssistantSid,
-                                               string pathFieldTypeSid,
-                                               string pathSid,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
-        ///                        resource to fetch </param>
-        /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with  the Field Value to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<FieldValueResource> FetchAsync(string pathAssistantSid,
-                                                                                       string pathFieldTypeSid,
-                                                                                       string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadFieldValueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static ResourceSet<FieldValueResource> Read(ReadFieldValueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FieldValueResource>.FromJson("field_values", response.Content);
-            return new ResourceSet<FieldValueResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FieldValueResource>> ReadAsync(ReadFieldValueOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FieldValueResource>.FromJson("field_values", response.Content);
-            return new ResourceSet<FieldValueResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
-        ///                        resources to read </param>
-        /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value to read </param>
-        /// <param name="language"> The ISO language-country tag that identifies the language of the value </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static ResourceSet<FieldValueResource> Read(string pathAssistantSid,
-                                                           string pathFieldTypeSid,
-                                                           string language = null,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadFieldValueOptions(pathAssistantSid, pathFieldTypeSid){Language = language, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
-        ///                        resources to read </param>
-        /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value to read </param>
-        /// <param name="language"> The ISO language-country tag that identifies the language of the value </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FieldValueResource>> ReadAsync(string pathAssistantSid,
-                                                                                                   string pathFieldTypeSid,
-                                                                                                   string language = null,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadFieldValueOptions(pathAssistantSid, pathFieldTypeSid){Language = language, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FieldValueResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FieldValueResource>.FromJson("field_values", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FieldValueResource> NextPage(Page<FieldValueResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<FieldValueResource>.FromJson("field_values", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FieldValueResource> PreviousPage(Page<FieldValueResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<FieldValueResource>.FromJson("field_values", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateFieldValueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static FieldValueResource Create(CreateFieldValueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<FieldValueResource> CreateAsync(CreateFieldValueOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
-        ///                        new resource </param>
-        /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value </param>
-        /// <param name="language"> The ISO language-country tag that identifies the language of the value </param>
-        /// <param name="value"> The Field Value data </param>
-        /// <param name="synonymOf"> The string value that indicates which word the field value is a synonym of </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static FieldValueResource Create(string pathAssistantSid,
-                                                string pathFieldTypeSid,
-                                                string language,
-                                                string value,
-                                                string synonymOf = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateFieldValueOptions(pathAssistantSid, pathFieldTypeSid, language, value){SynonymOf = synonymOf};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
-        ///                        new resource </param>
-        /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value </param>
-        /// <param name="language"> The ISO language-country tag that identifies the language of the value </param>
-        /// <param name="value"> The Field Value data </param>
-        /// <param name="synonymOf"> The string value that indicates which word the field value is a synonym of </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<FieldValueResource> CreateAsync(string pathAssistantSid,
-                                                                                        string pathFieldTypeSid,
-                                                                                        string language,
-                                                                                        string value,
-                                                                                        string synonymOf = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateFieldValueOptions(pathAssistantSid, pathFieldTypeSid, language, value){SynonymOf = synonymOf};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteFieldValueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static bool Delete(DeleteFieldValueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFieldValueOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
-        ///                        resources to delete </param>
-        /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static bool Delete(string pathAssistantSid,
-                                  string pathFieldTypeSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
-        ///                        resources to delete </param>
-        /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathFieldTypeSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FieldValueResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FieldValueResource object represented by the provided JSON </returns>
-        public static FieldValueResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FieldValueResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The SID of the Field Type associated with the Field Value
-        /// </summary>
-        [JsonProperty("field_type_sid")]
-        public string FieldTypeSid { get; private set; }
-        /// <summary>
-        /// The ISO language-country tag that identifies the language of the value
-        /// </summary>
-        [JsonProperty("language")]
-        public string Language { get; private set; }
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the FieldType associated with the resource
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The Field Value data
-        /// </summary>
-        [JsonProperty("value")]
-        public string Value { get; private set; }
-        /// <summary>
-        /// The absolute URL of the FieldValue resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The word for which the field value is a synonym of
-        /// </summary>
-        [JsonProperty("synonym_of")]
-        public string SynonymOf { get; private set; }
-
-        private FieldValueResource()
-        {
-
-        }
-    }
+{
+
+  public class FieldValueResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchFieldValueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static FieldValueResource Fetch(FetchFieldValueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<FieldValueResource> FetchAsync(FetchFieldValueOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
+    ///                        resource to fetch </param>
+    /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with  the Field Value to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static FieldValueResource Fetch(string pathAssistantSid,
+                                           string pathFieldTypeSid,
+                                           string pathSid,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
+    ///                        resource to fetch </param>
+    /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with  the Field Value to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<FieldValueResource> FetchAsync(string pathAssistantSid,
+                                                                                   string pathFieldTypeSid,
+                                                                                   string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadFieldValueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static ResourceSet<FieldValueResource> Read(ReadFieldValueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FieldValueResource>.FromJson("field_values", response.Content);
+      return new ResourceSet<FieldValueResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FieldValueResource>> ReadAsync(ReadFieldValueOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FieldValueResource>.FromJson("field_values", response.Content);
+      return new ResourceSet<FieldValueResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
+    ///                        resources to read </param>
+    /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value to read </param>
+    /// <param name="language"> The ISO language-country tag that identifies the language of the value </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static ResourceSet<FieldValueResource> Read(string pathAssistantSid,
+                                                       string pathFieldTypeSid,
+                                                       string language = null,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadFieldValueOptions(pathAssistantSid, pathFieldTypeSid) { Language = language, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
+    ///                        resources to read </param>
+    /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value to read </param>
+    /// <param name="language"> The ISO language-country tag that identifies the language of the value </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FieldValueResource>> ReadAsync(string pathAssistantSid,
+                                                                                               string pathFieldTypeSid,
+                                                                                               string language = null,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadFieldValueOptions(pathAssistantSid, pathFieldTypeSid) { Language = language, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FieldValueResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FieldValueResource>.FromJson("field_values", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FieldValueResource> NextPage(Page<FieldValueResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<FieldValueResource>.FromJson("field_values", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FieldValueResource> PreviousPage(Page<FieldValueResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<FieldValueResource>.FromJson("field_values", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateFieldValueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static FieldValueResource Create(CreateFieldValueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<FieldValueResource> CreateAsync(CreateFieldValueOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
+    ///                        new resource </param>
+    /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value </param>
+    /// <param name="language"> The ISO language-country tag that identifies the language of the value </param>
+    /// <param name="value"> The Field Value data </param>
+    /// <param name="synonymOf"> The string value that indicates which word the field value is a synonym of </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static FieldValueResource Create(string pathAssistantSid,
+                                            string pathFieldTypeSid,
+                                            string language,
+                                            string value,
+                                            string synonymOf = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateFieldValueOptions(pathAssistantSid, pathFieldTypeSid, language, value) { SynonymOf = synonymOf };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
+    ///                        new resource </param>
+    /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value </param>
+    /// <param name="language"> The ISO language-country tag that identifies the language of the value </param>
+    /// <param name="value"> The Field Value data </param>
+    /// <param name="synonymOf"> The string value that indicates which word the field value is a synonym of </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<FieldValueResource> CreateAsync(string pathAssistantSid,
+                                                                                    string pathFieldTypeSid,
+                                                                                    string language,
+                                                                                    string value,
+                                                                                    string synonymOf = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateFieldValueOptions(pathAssistantSid, pathFieldTypeSid, language, value) { SynonymOf = synonymOf };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteFieldValueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static bool Delete(DeleteFieldValueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFieldValueOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
+    ///                        resources to delete </param>
+    /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static bool Delete(string pathAssistantSid,
+                              string pathFieldTypeSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the FieldType associated with the
+    ///                        resources to delete </param>
+    /// <param name="pathFieldTypeSid"> The SID of the Field Type associated with the Field Value to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathFieldTypeSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FieldValueResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FieldValueResource object represented by the provided JSON </returns>
+    public static FieldValueResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FieldValueResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The SID of the Field Type associated with the Field Value
+    /// </summary>
+    [JsonProperty("field_type_sid")]
+    public string FieldTypeSid { get; private set; }
+    /// <summary>
+    /// The ISO language-country tag that identifies the language of the value
+    /// </summary>
+    [JsonProperty("language")]
+    public string Language { get; private set; }
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the FieldType associated with the resource
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The Field Value data
+    /// </summary>
+    [JsonProperty("value")]
+    public string Value { get; private set; }
+    /// <summary>
+    /// The absolute URL of the FieldValue resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The word for which the field value is a synonym of
+    /// </summary>
+    [JsonProperty("synonym_of")]
+    public string SynonymOf { get; private set; }
+
+    private FieldValueResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/FieldTypeOptions.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/FieldTypeOptions.cs
index 98bf67e68..1c7b7aec0 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/FieldTypeOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/FieldTypeOptions.cs
@@ -9,227 +9,227 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchFieldTypeOptions
+  /// </summary>
+  public class FetchFieldTypeOptions : IOptions<FieldTypeResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchFieldTypeOptions
-    /// </summary>
-    public class FetchFieldTypeOptions : IOptions<FieldTypeResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource to fetch
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFieldTypeOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchFieldTypeOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Assistant that is the parent of the resource to fetch
+    /// </summary>
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadFieldTypeOptions
-    /// </summary>
-    public class ReadFieldTypeOptions : ReadOptions<FieldTypeResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant with the FieldType resources to read
-        /// </summary>
-        public string PathAssistantSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadFieldTypeOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resources to read </param>
-        public ReadFieldTypeOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateFieldTypeOptions
-    /// </summary>
-    public class CreateFieldTypeOptions : IOptions<FieldTypeResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the new resource
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the new resource
-        /// </summary>
-        public string UniqueName { get; }
-        /// <summary>
-        /// A string to describe the new resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateFieldTypeOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
-        public CreateFieldTypeOptions(string pathAssistantSid, string uniqueName)
-        {
-            PathAssistantSid = pathAssistantSid;
-            UniqueName = uniqueName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchFieldTypeOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchFieldTypeOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateFieldTypeOptions
-    /// </summary>
-    public class UpdateFieldTypeOptions : IOptions<FieldTypeResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant with the FieldType resource to update
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateFieldTypeOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateFieldTypeOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadFieldTypeOptions
+  /// </summary>
+  public class ReadFieldTypeOptions : ReadOptions<FieldTypeResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteFieldTypeOptions
-    /// </summary>
-    public class DeleteFieldTypeOptions : IOptions<FieldTypeResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant with the FieldType resources to delete
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFieldTypeOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteFieldTypeOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// The SID of the Assistant with the FieldType resources to read
+    /// </summary>
+    public string PathAssistantSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadFieldTypeOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resources to read </param>
+    public ReadFieldTypeOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateFieldTypeOptions
+  /// </summary>
+  public class CreateFieldTypeOptions : IOptions<FieldTypeResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the new resource
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the new resource
+    /// </summary>
+    public string UniqueName { get; }
+    /// <summary>
+    /// A string to describe the new resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateFieldTypeOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
+    public CreateFieldTypeOptions(string pathAssistantSid, string uniqueName)
+    {
+      PathAssistantSid = pathAssistantSid;
+      UniqueName = uniqueName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateFieldTypeOptions
+  /// </summary>
+  public class UpdateFieldTypeOptions : IOptions<FieldTypeResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant with the FieldType resource to update
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateFieldTypeOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateFieldTypeOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteFieldTypeOptions
+  /// </summary>
+  public class DeleteFieldTypeOptions : IOptions<FieldTypeResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant with the FieldType resources to delete
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteFieldTypeOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteFieldTypeOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/FieldTypeResource.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/FieldTypeResource.cs
index 6e1bc57a7..70e4d92c2 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/FieldTypeResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/FieldTypeResource.cs
@@ -19,507 +19,507 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
-    public class FieldTypeResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchFieldTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static FieldTypeResource Fetch(FetchFieldTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<FieldTypeResource> FetchAsync(FetchFieldTypeOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static FieldTypeResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchFieldTypeOptions(pathAssistantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<FieldTypeResource> FetchAsync(string pathAssistantSid,
-                                                                                      string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchFieldTypeOptions(pathAssistantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadFieldTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static ResourceSet<FieldTypeResource> Read(ReadFieldTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FieldTypeResource>.FromJson("field_types", response.Content);
-            return new ResourceSet<FieldTypeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FieldTypeResource>> ReadAsync(ReadFieldTypeOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FieldTypeResource>.FromJson("field_types", response.Content);
-            return new ResourceSet<FieldTypeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static ResourceSet<FieldTypeResource> Read(string pathAssistantSid,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadFieldTypeOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FieldTypeResource>> ReadAsync(string pathAssistantSid,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadFieldTypeOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FieldTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FieldTypeResource>.FromJson("field_types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FieldTypeResource> NextPage(Page<FieldTypeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<FieldTypeResource>.FromJson("field_types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FieldTypeResource> PreviousPage(Page<FieldTypeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<FieldTypeResource>.FromJson("field_types", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateFieldTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static FieldTypeResource Create(CreateFieldTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<FieldTypeResource> CreateAsync(CreateFieldTypeOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static FieldTypeResource Create(string pathAssistantSid,
-                                               string uniqueName,
-                                               string friendlyName = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateFieldTypeOptions(pathAssistantSid, uniqueName){FriendlyName = friendlyName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<FieldTypeResource> CreateAsync(string pathAssistantSid,
-                                                                                       string uniqueName,
-                                                                                       string friendlyName = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateFieldTypeOptions(pathAssistantSid, uniqueName){FriendlyName = friendlyName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateFieldTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static FieldTypeResource Update(UpdateFieldTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<FieldTypeResource> UpdateAsync(UpdateFieldTypeOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static FieldTypeResource Update(string pathAssistantSid,
-                                               string pathSid,
-                                               string friendlyName = null,
-                                               string uniqueName = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateFieldTypeOptions(pathAssistantSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<FieldTypeResource> UpdateAsync(string pathAssistantSid,
-                                                                                       string pathSid,
-                                                                                       string friendlyName = null,
-                                                                                       string uniqueName = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateFieldTypeOptions(pathAssistantSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteFieldTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static bool Delete(DeleteFieldTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFieldTypeOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFieldTypeOptions(pathAssistantSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteFieldTypeOptions(pathAssistantSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FieldTypeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FieldTypeResource object represented by the provided JSON </returns>
-        public static FieldTypeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FieldTypeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A list of the URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The absolute URL of the FieldType resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private FieldTypeResource()
-        {
-
-        }
-    }
+{
+
+  public class FieldTypeResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchFieldTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static FieldTypeResource Fetch(FetchFieldTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<FieldTypeResource> FetchAsync(FetchFieldTypeOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static FieldTypeResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchFieldTypeOptions(pathAssistantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<FieldTypeResource> FetchAsync(string pathAssistantSid,
+                                                                                  string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchFieldTypeOptions(pathAssistantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadFieldTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static ResourceSet<FieldTypeResource> Read(ReadFieldTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FieldTypeResource>.FromJson("field_types", response.Content);
+      return new ResourceSet<FieldTypeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FieldTypeResource>> ReadAsync(ReadFieldTypeOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FieldTypeResource>.FromJson("field_types", response.Content);
+      return new ResourceSet<FieldTypeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static ResourceSet<FieldTypeResource> Read(string pathAssistantSid,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadFieldTypeOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FieldTypeResource>> ReadAsync(string pathAssistantSid,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadFieldTypeOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FieldTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FieldTypeResource>.FromJson("field_types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FieldTypeResource> NextPage(Page<FieldTypeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<FieldTypeResource>.FromJson("field_types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FieldTypeResource> PreviousPage(Page<FieldTypeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<FieldTypeResource>.FromJson("field_types", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateFieldTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static FieldTypeResource Create(CreateFieldTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<FieldTypeResource> CreateAsync(CreateFieldTypeOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static FieldTypeResource Create(string pathAssistantSid,
+                                           string uniqueName,
+                                           string friendlyName = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateFieldTypeOptions(pathAssistantSid, uniqueName) { FriendlyName = friendlyName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<FieldTypeResource> CreateAsync(string pathAssistantSid,
+                                                                                   string uniqueName,
+                                                                                   string friendlyName = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateFieldTypeOptions(pathAssistantSid, uniqueName) { FriendlyName = friendlyName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateFieldTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static FieldTypeResource Update(UpdateFieldTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<FieldTypeResource> UpdateAsync(UpdateFieldTypeOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static FieldTypeResource Update(string pathAssistantSid,
+                                           string pathSid,
+                                           string friendlyName = null,
+                                           string uniqueName = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateFieldTypeOptions(pathAssistantSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<FieldTypeResource> UpdateAsync(string pathAssistantSid,
+                                                                                   string pathSid,
+                                                                                   string friendlyName = null,
+                                                                                   string uniqueName = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateFieldTypeOptions(pathAssistantSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteFieldTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static bool Delete(DeleteFieldTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFieldTypeOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFieldTypeOptions(pathAssistantSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the FieldType resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteFieldTypeOptions(pathAssistantSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FieldTypeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FieldTypeResource object represented by the provided JSON </returns>
+    public static FieldTypeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FieldTypeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A list of the URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resource
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The absolute URL of the FieldType resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private FieldTypeResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/ModelBuildOptions.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/ModelBuildOptions.cs
index 93083a37e..e3f4dc3d7 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/ModelBuildOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/ModelBuildOptions.cs
@@ -9,216 +9,216 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchModelBuildOptions
+  /// </summary>
+  public class FetchModelBuildOptions : IOptions<ModelBuildResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchModelBuildOptions
-    /// </summary>
-    public class FetchModelBuildOptions : IOptions<ModelBuildResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource to fetch
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchModelBuildOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchModelBuildOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Assistant that is the parent of the resource to fetch
+    /// </summary>
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadModelBuildOptions
-    /// </summary>
-    public class ReadModelBuildOptions : ReadOptions<ModelBuildResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resources to read
-        /// </summary>
-        public string PathAssistantSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadModelBuildOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
-        public ReadModelBuildOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateModelBuildOptions
-    /// </summary>
-    public class CreateModelBuildOptions : IOptions<ModelBuildResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the new resource
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The URL we should call using a POST method to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the new resource
-        /// </summary>
-        public string UniqueName { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateModelBuildOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        public CreateModelBuildOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchModelBuildOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchModelBuildOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateModelBuildOptions
-    /// </summary>
-    public class UpdateModelBuildOptions : IOptions<ModelBuildResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource to update
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateModelBuildOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to update </param>
-        public UpdateModelBuildOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadModelBuildOptions
+  /// </summary>
+  public class ReadModelBuildOptions : ReadOptions<ModelBuildResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteModelBuildOptions
-    /// </summary>
-    public class DeleteModelBuildOptions : IOptions<ModelBuildResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resources to delete
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteModelBuildOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteModelBuildOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// The SID of the Assistant that is the parent of the resources to read
+    /// </summary>
+    public string PathAssistantSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadModelBuildOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
+    public ReadModelBuildOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateModelBuildOptions
+  /// </summary>
+  public class CreateModelBuildOptions : IOptions<ModelBuildResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the new resource
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The URL we should call using a POST method to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the new resource
+    /// </summary>
+    public string UniqueName { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateModelBuildOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    public CreateModelBuildOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateModelBuildOptions
+  /// </summary>
+  public class UpdateModelBuildOptions : IOptions<ModelBuildResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resource to update
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateModelBuildOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to update </param>
+    public UpdateModelBuildOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteModelBuildOptions
+  /// </summary>
+  public class DeleteModelBuildOptions : IOptions<ModelBuildResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resources to delete
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteModelBuildOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteModelBuildOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/ModelBuildResource.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/ModelBuildResource.cs
index 5bf66d442..8b174625c 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/ModelBuildResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/ModelBuildResource.cs
@@ -20,527 +20,527 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
-    public class ModelBuildResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Enqueued = new StatusEnum("enqueued");
-            public static readonly StatusEnum Building = new StatusEnum("building");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-            public static readonly StatusEnum Canceled = new StatusEnum("canceled");
-        }
-
-        private static Request BuildFetchRequest(FetchModelBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/ModelBuilds/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ModelBuildResource Fetch(FetchModelBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ModelBuildResource> FetchAsync(FetchModelBuildOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ModelBuildResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchModelBuildOptions(pathAssistantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ModelBuildResource> FetchAsync(string pathAssistantSid,
-                                                                                       string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchModelBuildOptions(pathAssistantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadModelBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/ModelBuilds",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ResourceSet<ModelBuildResource> Read(ReadModelBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ModelBuildResource>.FromJson("model_builds", response.Content);
-            return new ResourceSet<ModelBuildResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ModelBuildResource>> ReadAsync(ReadModelBuildOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ModelBuildResource>.FromJson("model_builds", response.Content);
-            return new ResourceSet<ModelBuildResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ResourceSet<ModelBuildResource> Read(string pathAssistantSid,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadModelBuildOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ModelBuildResource>> ReadAsync(string pathAssistantSid,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadModelBuildOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ModelBuildResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ModelBuildResource>.FromJson("model_builds", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ModelBuildResource> NextPage(Page<ModelBuildResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<ModelBuildResource>.FromJson("model_builds", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ModelBuildResource> PreviousPage(Page<ModelBuildResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<ModelBuildResource>.FromJson("model_builds", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateModelBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/ModelBuilds",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ModelBuildResource Create(CreateModelBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ModelBuildResource> CreateAsync(CreateModelBuildOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="statusCallback"> The URL we should call using a POST method to send status information to your
-        ///                      application </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ModelBuildResource Create(string pathAssistantSid,
-                                                Uri statusCallback = null,
-                                                string uniqueName = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateModelBuildOptions(pathAssistantSid){StatusCallback = statusCallback, UniqueName = uniqueName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="statusCallback"> The URL we should call using a POST method to send status information to your
-        ///                      application </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ModelBuildResource> CreateAsync(string pathAssistantSid,
-                                                                                        Uri statusCallback = null,
-                                                                                        string uniqueName = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateModelBuildOptions(pathAssistantSid){StatusCallback = statusCallback, UniqueName = uniqueName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateModelBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/ModelBuilds/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ModelBuildResource Update(UpdateModelBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ModelBuildResource> UpdateAsync(UpdateModelBuildOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to update </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ModelBuildResource Update(string pathAssistantSid,
-                                                string pathSid,
-                                                string uniqueName = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateModelBuildOptions(pathAssistantSid, pathSid){UniqueName = uniqueName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to update </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ModelBuildResource> UpdateAsync(string pathAssistantSid,
-                                                                                        string pathSid,
-                                                                                        string uniqueName = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateModelBuildOptions(pathAssistantSid, pathSid){UniqueName = uniqueName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteModelBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/ModelBuilds/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static bool Delete(DeleteModelBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteModelBuildOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteModelBuildOptions(pathAssistantSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteModelBuildOptions(pathAssistantSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ModelBuildResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ModelBuildResource object represented by the provided JSON </returns>
-        public static ModelBuildResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ModelBuildResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The status of the model build process
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ModelBuildResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The absolute URL of the ModelBuild resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The time in seconds it took to build the model
-        /// </summary>
-        [JsonProperty("build_duration")]
-        public int? BuildDuration { get; private set; }
-        /// <summary>
-        /// More information about why the model build failed, if `status` is `failed`
-        /// </summary>
-        [JsonProperty("error_code")]
-        public int? ErrorCode { get; private set; }
-
-        private ModelBuildResource()
-        {
-
-        }
-    }
+{
+
+  public class ModelBuildResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Enqueued = new StatusEnum("enqueued");
+      public static readonly StatusEnum Building = new StatusEnum("building");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+      public static readonly StatusEnum Canceled = new StatusEnum("canceled");
+    }
+
+    private static Request BuildFetchRequest(FetchModelBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/ModelBuilds/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ModelBuildResource Fetch(FetchModelBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ModelBuildResource> FetchAsync(FetchModelBuildOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ModelBuildResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchModelBuildOptions(pathAssistantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ModelBuildResource> FetchAsync(string pathAssistantSid,
+                                                                                   string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchModelBuildOptions(pathAssistantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadModelBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/ModelBuilds",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ResourceSet<ModelBuildResource> Read(ReadModelBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ModelBuildResource>.FromJson("model_builds", response.Content);
+      return new ResourceSet<ModelBuildResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ModelBuildResource>> ReadAsync(ReadModelBuildOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ModelBuildResource>.FromJson("model_builds", response.Content);
+      return new ResourceSet<ModelBuildResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ResourceSet<ModelBuildResource> Read(string pathAssistantSid,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadModelBuildOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ModelBuildResource>> ReadAsync(string pathAssistantSid,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadModelBuildOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ModelBuildResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ModelBuildResource>.FromJson("model_builds", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ModelBuildResource> NextPage(Page<ModelBuildResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<ModelBuildResource>.FromJson("model_builds", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ModelBuildResource> PreviousPage(Page<ModelBuildResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<ModelBuildResource>.FromJson("model_builds", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateModelBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/ModelBuilds",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ModelBuildResource Create(CreateModelBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ModelBuildResource> CreateAsync(CreateModelBuildOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="statusCallback"> The URL we should call using a POST method to send status information to your
+    ///                      application </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ModelBuildResource Create(string pathAssistantSid,
+                                            Uri statusCallback = null,
+                                            string uniqueName = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateModelBuildOptions(pathAssistantSid) { StatusCallback = statusCallback, UniqueName = uniqueName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="statusCallback"> The URL we should call using a POST method to send status information to your
+    ///                      application </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ModelBuildResource> CreateAsync(string pathAssistantSid,
+                                                                                    Uri statusCallback = null,
+                                                                                    string uniqueName = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateModelBuildOptions(pathAssistantSid) { StatusCallback = statusCallback, UniqueName = uniqueName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateModelBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/ModelBuilds/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ModelBuildResource Update(UpdateModelBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ModelBuildResource> UpdateAsync(UpdateModelBuildOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to update </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ModelBuildResource Update(string pathAssistantSid,
+                                            string pathSid,
+                                            string uniqueName = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateModelBuildOptions(pathAssistantSid, pathSid) { UniqueName = uniqueName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to update </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ModelBuildResource> UpdateAsync(string pathAssistantSid,
+                                                                                    string pathSid,
+                                                                                    string uniqueName = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateModelBuildOptions(pathAssistantSid, pathSid) { UniqueName = uniqueName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteModelBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/ModelBuilds/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static bool Delete(DeleteModelBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteModelBuildOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteModelBuildOptions(pathAssistantSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteModelBuildOptions(pathAssistantSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ModelBuildResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ModelBuildResource object represented by the provided JSON </returns>
+    public static ModelBuildResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ModelBuildResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resource
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The status of the model build process
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ModelBuildResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The absolute URL of the ModelBuild resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The time in seconds it took to build the model
+    /// </summary>
+    [JsonProperty("build_duration")]
+    public int? BuildDuration { get; private set; }
+    /// <summary>
+    /// More information about why the model build failed, if `status` is `failed`
+    /// </summary>
+    [JsonProperty("error_code")]
+    public int? ErrorCode { get; private set; }
+
+    private ModelBuildResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/QueryOptions.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/QueryOptions.cs
index ab1438045..3a9a8320a 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/QueryOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/QueryOptions.cs
@@ -9,283 +9,283 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchQueryOptions
+  /// </summary>
+  public class FetchQueryOptions : IOptions<QueryResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchQueryOptions
+    /// The SID of the Assistant that is the parent of the resource to fetch
     /// </summary>
-    public class FetchQueryOptions : IOptions<QueryResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource to fetch
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchQueryOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchQueryOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadQueryOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class ReadQueryOptions : ReadOptions<QueryResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resources to read
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The ISO language-country string that specifies the language used by the Query resources to read
-        /// </summary>
-        public string Language { get; set; }
-        /// <summary>
-        /// The SID or unique name of the Model Build to be queried
-        /// </summary>
-        public string ModelBuild { get; set; }
-        /// <summary>
-        /// The status of the resources to read
-        /// </summary>
-        public string Status { get; set; }
-        /// <summary>
-        /// The SID of the [Dialogue](https://www.twilio.com/docs/autopilot/api/dialogue).
-        /// </summary>
-        public string DialogueSid { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadQueryOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
-        public ReadQueryOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (ModelBuild != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ModelBuild", ModelBuild.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status));
-            }
-
-            if (DialogueSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DialogueSid", DialogueSid.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateQueryOptions
+    /// Construct a new FetchQueryOptions
     /// </summary>
-    public class CreateQueryOptions : IOptions<QueryResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the new resource
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The ISO language-country string that specifies the language used for the new query
-        /// </summary>
-        public string Language { get; }
-        /// <summary>
-        /// The end-user's natural language input
-        /// </summary>
-        public string Query { get; }
-        /// <summary>
-        /// The list of tasks to limit the new query to
-        /// </summary>
-        public string Tasks { get; set; }
-        /// <summary>
-        /// The SID or unique name of the Model Build to be queried
-        /// </summary>
-        public string ModelBuild { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateQueryOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="language"> The ISO language-country string that specifies the language used for the new query </param>
-        /// <param name="query"> The end-user's natural language input </param>
-        public CreateQueryOptions(string pathAssistantSid, string language, string query)
-        {
-            PathAssistantSid = pathAssistantSid;
-            Language = language;
-            Query = query;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (Query != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Query", Query));
-            }
-
-            if (Tasks != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Tasks", Tasks));
-            }
-
-            if (ModelBuild != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ModelBuild", ModelBuild.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchQueryOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateQueryOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateQueryOptions : IOptions<QueryResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource to update
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The SID of an optional reference to the Sample created from the query
-        /// </summary>
-        public string SampleSid { get; set; }
-        /// <summary>
-        /// The new status of the resource
-        /// </summary>
-        public string Status { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateQueryOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to update </param>
-        public UpdateQueryOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (SampleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SampleSid", SampleSid.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadQueryOptions
+  /// </summary>
+  public class ReadQueryOptions : ReadOptions<QueryResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteQueryOptions
+    /// The SID of the Assistant that is the parent of the resources to read
     /// </summary>
-    public class DeleteQueryOptions : IOptions<QueryResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resources to delete
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteQueryOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteQueryOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The ISO language-country string that specifies the language used by the Query resources to read
+    /// </summary>
+    public string Language { get; set; }
+    /// <summary>
+    /// The SID or unique name of the Model Build to be queried
+    /// </summary>
+    public string ModelBuild { get; set; }
+    /// <summary>
+    /// The status of the resources to read
+    /// </summary>
+    public string Status { get; set; }
+    /// <summary>
+    /// The SID of the [Dialogue](https://www.twilio.com/docs/autopilot/api/dialogue).
+    /// </summary>
+    public string DialogueSid { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadQueryOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
+    public ReadQueryOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (ModelBuild != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ModelBuild", ModelBuild.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status));
+      }
+
+      if (DialogueSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DialogueSid", DialogueSid.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateQueryOptions
+  /// </summary>
+  public class CreateQueryOptions : IOptions<QueryResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the new resource
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The ISO language-country string that specifies the language used for the new query
+    /// </summary>
+    public string Language { get; }
+    /// <summary>
+    /// The end-user's natural language input
+    /// </summary>
+    public string Query { get; }
+    /// <summary>
+    /// The list of tasks to limit the new query to
+    /// </summary>
+    public string Tasks { get; set; }
+    /// <summary>
+    /// The SID or unique name of the Model Build to be queried
+    /// </summary>
+    public string ModelBuild { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateQueryOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="language"> The ISO language-country string that specifies the language used for the new query </param>
+    /// <param name="query"> The end-user's natural language input </param>
+    public CreateQueryOptions(string pathAssistantSid, string language, string query)
+    {
+      PathAssistantSid = pathAssistantSid;
+      Language = language;
+      Query = query;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (Query != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Query", Query));
+      }
+
+      if (Tasks != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Tasks", Tasks));
+      }
+
+      if (ModelBuild != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ModelBuild", ModelBuild.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateQueryOptions
+  /// </summary>
+  public class UpdateQueryOptions : IOptions<QueryResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resource to update
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The SID of an optional reference to the Sample created from the query
+    /// </summary>
+    public string SampleSid { get; set; }
+    /// <summary>
+    /// The new status of the resource
+    /// </summary>
+    public string Status { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateQueryOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to update </param>
+    public UpdateQueryOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (SampleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SampleSid", SampleSid.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteQueryOptions
+  /// </summary>
+  public class DeleteQueryOptions : IOptions<QueryResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resources to delete
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteQueryOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteQueryOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/QueryResource.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/QueryResource.cs
index 8150de73f..b7f1dc293 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/QueryResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/QueryResource.cs
@@ -19,558 +19,558 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
-    public class QueryResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchQueryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Queries/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static QueryResource Fetch(FetchQueryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<QueryResource> FetchAsync(FetchQueryOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static QueryResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchQueryOptions(pathAssistantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<QueryResource> FetchAsync(string pathAssistantSid,
-                                                                                  string pathSid,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchQueryOptions(pathAssistantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadQueryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Queries",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static ResourceSet<QueryResource> Read(ReadQueryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<QueryResource>.FromJson("queries", response.Content);
-            return new ResourceSet<QueryResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<QueryResource>> ReadAsync(ReadQueryOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<QueryResource>.FromJson("queries", response.Content);
-            return new ResourceSet<QueryResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
-        /// <param name="language"> The ISO language-country string that specifies the language used by the Query resources to
-        ///                read </param>
-        /// <param name="modelBuild"> The SID or unique name of the Model Build to be queried </param>
-        /// <param name="status"> The status of the resources to read </param>
-        /// <param name="dialogueSid"> The SID of the [Dialogue](https://www.twilio.com/docs/autopilot/api/dialogue). </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static ResourceSet<QueryResource> Read(string pathAssistantSid,
-                                                      string language = null,
-                                                      string modelBuild = null,
-                                                      string status = null,
-                                                      string dialogueSid = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadQueryOptions(pathAssistantSid){Language = language, ModelBuild = modelBuild, Status = status, DialogueSid = dialogueSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
-        /// <param name="language"> The ISO language-country string that specifies the language used by the Query resources to
-        ///                read </param>
-        /// <param name="modelBuild"> The SID or unique name of the Model Build to be queried </param>
-        /// <param name="status"> The status of the resources to read </param>
-        /// <param name="dialogueSid"> The SID of the [Dialogue](https://www.twilio.com/docs/autopilot/api/dialogue). </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<QueryResource>> ReadAsync(string pathAssistantSid,
-                                                                                              string language = null,
-                                                                                              string modelBuild = null,
-                                                                                              string status = null,
-                                                                                              string dialogueSid = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadQueryOptions(pathAssistantSid){Language = language, ModelBuild = modelBuild, Status = status, DialogueSid = dialogueSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<QueryResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<QueryResource>.FromJson("queries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<QueryResource> NextPage(Page<QueryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<QueryResource>.FromJson("queries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<QueryResource> PreviousPage(Page<QueryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<QueryResource>.FromJson("queries", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateQueryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Queries",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static QueryResource Create(CreateQueryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<QueryResource> CreateAsync(CreateQueryOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="language"> The ISO language-country string that specifies the language used for the new query </param>
-        /// <param name="query"> The end-user's natural language input </param>
-        /// <param name="tasks"> The list of tasks to limit the new query to </param>
-        /// <param name="modelBuild"> The SID or unique name of the Model Build to be queried </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static QueryResource Create(string pathAssistantSid,
-                                           string language,
-                                           string query,
-                                           string tasks = null,
-                                           string modelBuild = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateQueryOptions(pathAssistantSid, language, query){Tasks = tasks, ModelBuild = modelBuild};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="language"> The ISO language-country string that specifies the language used for the new query </param>
-        /// <param name="query"> The end-user's natural language input </param>
-        /// <param name="tasks"> The list of tasks to limit the new query to </param>
-        /// <param name="modelBuild"> The SID or unique name of the Model Build to be queried </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<QueryResource> CreateAsync(string pathAssistantSid,
-                                                                                   string language,
-                                                                                   string query,
-                                                                                   string tasks = null,
-                                                                                   string modelBuild = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateQueryOptions(pathAssistantSid, language, query){Tasks = tasks, ModelBuild = modelBuild};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateQueryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Queries/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static QueryResource Update(UpdateQueryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<QueryResource> UpdateAsync(UpdateQueryOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to update </param>
-        /// <param name="sampleSid"> The SID of an optional reference to the Sample created from the query </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static QueryResource Update(string pathAssistantSid,
-                                           string pathSid,
-                                           string sampleSid = null,
-                                           string status = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new UpdateQueryOptions(pathAssistantSid, pathSid){SampleSid = sampleSid, Status = status};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to update </param>
-        /// <param name="sampleSid"> The SID of an optional reference to the Sample created from the query </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<QueryResource> UpdateAsync(string pathAssistantSid,
-                                                                                   string pathSid,
-                                                                                   string sampleSid = null,
-                                                                                   string status = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new UpdateQueryOptions(pathAssistantSid, pathSid){SampleSid = sampleSid, Status = status};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteQueryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Queries/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static bool Delete(DeleteQueryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteQueryOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteQueryOptions(pathAssistantSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteQueryOptions(pathAssistantSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a QueryResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> QueryResource object represented by the provided JSON </returns>
-        public static QueryResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<QueryResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The natural language analysis results that include the Task recognized and a list of identified Fields
-        /// </summary>
-        [JsonProperty("results")]
-        public object Results { get; private set; }
-        /// <summary>
-        /// The ISO language-country string that specifies the language used by the Query
-        /// </summary>
-        [JsonProperty("language")]
-        public string Language { get; private set; }
-        /// <summary>
-        /// The SID of the [Model Build](https://www.twilio.com/docs/autopilot/api/model-build) queried
-        /// </summary>
-        [JsonProperty("model_build_sid")]
-        public string ModelBuildSid { get; private set; }
-        /// <summary>
-        /// The end-user's natural language input
-        /// </summary>
-        [JsonProperty("query")]
-        public string Query { get; private set; }
-        /// <summary>
-        /// The SID of an optional reference to the Sample created from the query
-        /// </summary>
-        [JsonProperty("sample_sid")]
-        public string SampleSid { get; private set; }
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The status of the Query
-        /// </summary>
-        [JsonProperty("status")]
-        public string Status { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Query resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The communication channel from where the end-user input came
-        /// </summary>
-        [JsonProperty("source_channel")]
-        public string SourceChannel { get; private set; }
-        /// <summary>
-        /// The SID of the [Dialogue](https://www.twilio.com/docs/autopilot/api/dialogue).
-        /// </summary>
-        [JsonProperty("dialogue_sid")]
-        public string DialogueSid { get; private set; }
-
-        private QueryResource()
-        {
-
-        }
-    }
+{
+
+  public class QueryResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchQueryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Queries/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static QueryResource Fetch(FetchQueryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<QueryResource> FetchAsync(FetchQueryOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static QueryResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchQueryOptions(pathAssistantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<QueryResource> FetchAsync(string pathAssistantSid,
+                                                                              string pathSid,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchQueryOptions(pathAssistantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadQueryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Queries",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static ResourceSet<QueryResource> Read(ReadQueryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<QueryResource>.FromJson("queries", response.Content);
+      return new ResourceSet<QueryResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<QueryResource>> ReadAsync(ReadQueryOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<QueryResource>.FromJson("queries", response.Content);
+      return new ResourceSet<QueryResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
+    /// <param name="language"> The ISO language-country string that specifies the language used by the Query resources to
+    ///                read </param>
+    /// <param name="modelBuild"> The SID or unique name of the Model Build to be queried </param>
+    /// <param name="status"> The status of the resources to read </param>
+    /// <param name="dialogueSid"> The SID of the [Dialogue](https://www.twilio.com/docs/autopilot/api/dialogue). </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static ResourceSet<QueryResource> Read(string pathAssistantSid,
+                                                  string language = null,
+                                                  string modelBuild = null,
+                                                  string status = null,
+                                                  string dialogueSid = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadQueryOptions(pathAssistantSid) { Language = language, ModelBuild = modelBuild, Status = status, DialogueSid = dialogueSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
+    /// <param name="language"> The ISO language-country string that specifies the language used by the Query resources to
+    ///                read </param>
+    /// <param name="modelBuild"> The SID or unique name of the Model Build to be queried </param>
+    /// <param name="status"> The status of the resources to read </param>
+    /// <param name="dialogueSid"> The SID of the [Dialogue](https://www.twilio.com/docs/autopilot/api/dialogue). </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<QueryResource>> ReadAsync(string pathAssistantSid,
+                                                                                          string language = null,
+                                                                                          string modelBuild = null,
+                                                                                          string status = null,
+                                                                                          string dialogueSid = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadQueryOptions(pathAssistantSid) { Language = language, ModelBuild = modelBuild, Status = status, DialogueSid = dialogueSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<QueryResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<QueryResource>.FromJson("queries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<QueryResource> NextPage(Page<QueryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<QueryResource>.FromJson("queries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<QueryResource> PreviousPage(Page<QueryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<QueryResource>.FromJson("queries", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateQueryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Queries",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static QueryResource Create(CreateQueryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<QueryResource> CreateAsync(CreateQueryOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="language"> The ISO language-country string that specifies the language used for the new query </param>
+    /// <param name="query"> The end-user's natural language input </param>
+    /// <param name="tasks"> The list of tasks to limit the new query to </param>
+    /// <param name="modelBuild"> The SID or unique name of the Model Build to be queried </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static QueryResource Create(string pathAssistantSid,
+                                       string language,
+                                       string query,
+                                       string tasks = null,
+                                       string modelBuild = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateQueryOptions(pathAssistantSid, language, query) { Tasks = tasks, ModelBuild = modelBuild };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="language"> The ISO language-country string that specifies the language used for the new query </param>
+    /// <param name="query"> The end-user's natural language input </param>
+    /// <param name="tasks"> The list of tasks to limit the new query to </param>
+    /// <param name="modelBuild"> The SID or unique name of the Model Build to be queried </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<QueryResource> CreateAsync(string pathAssistantSid,
+                                                                               string language,
+                                                                               string query,
+                                                                               string tasks = null,
+                                                                               string modelBuild = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateQueryOptions(pathAssistantSid, language, query) { Tasks = tasks, ModelBuild = modelBuild };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateQueryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Queries/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static QueryResource Update(UpdateQueryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<QueryResource> UpdateAsync(UpdateQueryOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to update </param>
+    /// <param name="sampleSid"> The SID of an optional reference to the Sample created from the query </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static QueryResource Update(string pathAssistantSid,
+                                       string pathSid,
+                                       string sampleSid = null,
+                                       string status = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new UpdateQueryOptions(pathAssistantSid, pathSid) { SampleSid = sampleSid, Status = status };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to update </param>
+    /// <param name="sampleSid"> The SID of an optional reference to the Sample created from the query </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<QueryResource> UpdateAsync(string pathAssistantSid,
+                                                                               string pathSid,
+                                                                               string sampleSid = null,
+                                                                               string status = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new UpdateQueryOptions(pathAssistantSid, pathSid) { SampleSid = sampleSid, Status = status };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteQueryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Queries/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static bool Delete(DeleteQueryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteQueryOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteQueryOptions(pathAssistantSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteQueryOptions(pathAssistantSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a QueryResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> QueryResource object represented by the provided JSON </returns>
+    public static QueryResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<QueryResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The natural language analysis results that include the Task recognized and a list of identified Fields
+    /// </summary>
+    [JsonProperty("results")]
+    public object Results { get; private set; }
+    /// <summary>
+    /// The ISO language-country string that specifies the language used by the Query
+    /// </summary>
+    [JsonProperty("language")]
+    public string Language { get; private set; }
+    /// <summary>
+    /// The SID of the [Model Build](https://www.twilio.com/docs/autopilot/api/model-build) queried
+    /// </summary>
+    [JsonProperty("model_build_sid")]
+    public string ModelBuildSid { get; private set; }
+    /// <summary>
+    /// The end-user's natural language input
+    /// </summary>
+    [JsonProperty("query")]
+    public string Query { get; private set; }
+    /// <summary>
+    /// The SID of an optional reference to the Sample created from the query
+    /// </summary>
+    [JsonProperty("sample_sid")]
+    public string SampleSid { get; private set; }
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resource
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The status of the Query
+    /// </summary>
+    [JsonProperty("status")]
+    public string Status { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Query resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The communication channel from where the end-user input came
+    /// </summary>
+    [JsonProperty("source_channel")]
+    public string SourceChannel { get; private set; }
+    /// <summary>
+    /// The SID of the [Dialogue](https://www.twilio.com/docs/autopilot/api/dialogue).
+    /// </summary>
+    [JsonProperty("dialogue_sid")]
+    public string DialogueSid { get; private set; }
+
+    private QueryResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/StyleSheetOptions.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/StyleSheetOptions.cs
index 80a5fa59a..cda0f364b 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/StyleSheetOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/StyleSheetOptions.cs
@@ -9,79 +9,79 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Returns Style sheet JSON object for the Assistant
+  /// </summary>
+  public class FetchStyleSheetOptions : IOptions<StyleSheetResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Returns Style sheet JSON object for the Assistant
+    /// The SID of the Assistant with the StyleSheet resource to fetch
     /// </summary>
-    public class FetchStyleSheetOptions : IOptions<StyleSheetResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant with the StyleSheet resource to fetch
-        /// </summary>
-        public string PathAssistantSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchStyleSheetOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the StyleSheet resource to fetch </param>
-        public FetchStyleSheetOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Updates the style sheet for an Assistant identified by `assistant_sid`.
+    /// Construct a new FetchStyleSheetOptions
     /// </summary>
-    public class UpdateStyleSheetOptions : IOptions<StyleSheetResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant with the StyleSheet resource to update
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The JSON string that describes the style sheet object
-        /// </summary>
-        public object StyleSheet { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateStyleSheetOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the StyleSheet resource to update </param>
-        public UpdateStyleSheetOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (StyleSheet != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StyleSheet", Serializers.JsonObject(StyleSheet)));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the StyleSheet resource to fetch </param>
+    public FetchStyleSheetOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Updates the style sheet for an Assistant identified by `assistant_sid`.
+  /// </summary>
+  public class UpdateStyleSheetOptions : IOptions<StyleSheetResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant with the StyleSheet resource to update
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The JSON string that describes the style sheet object
+    /// </summary>
+    public object StyleSheet { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateStyleSheetOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the StyleSheet resource to update </param>
+    public UpdateStyleSheetOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (StyleSheet != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StyleSheet", Serializers.JsonObject(StyleSheet)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/StyleSheetResource.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/StyleSheetResource.cs
index 83b37526e..841075e57 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/StyleSheetResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/StyleSheetResource.cs
@@ -19,192 +19,192 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
-    public class StyleSheetResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchStyleSheetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/StyleSheet",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns Style sheet JSON object for the Assistant
-        /// </summary>
-        /// <param name="options"> Fetch StyleSheet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of StyleSheet </returns>
-        public static StyleSheetResource Fetch(FetchStyleSheetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns Style sheet JSON object for the Assistant
-        /// </summary>
-        /// <param name="options"> Fetch StyleSheet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of StyleSheet </returns>
-        public static async System.Threading.Tasks.Task<StyleSheetResource> FetchAsync(FetchStyleSheetOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns Style sheet JSON object for the Assistant
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the StyleSheet resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of StyleSheet </returns>
-        public static StyleSheetResource Fetch(string pathAssistantSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchStyleSheetOptions(pathAssistantSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns Style sheet JSON object for the Assistant
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the StyleSheet resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of StyleSheet </returns>
-        public static async System.Threading.Tasks.Task<StyleSheetResource> FetchAsync(string pathAssistantSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchStyleSheetOptions(pathAssistantSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateStyleSheetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/StyleSheet",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates the style sheet for an Assistant identified by `assistant_sid`.
-        /// </summary>
-        /// <param name="options"> Update StyleSheet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of StyleSheet </returns>
-        public static StyleSheetResource Update(UpdateStyleSheetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the style sheet for an Assistant identified by `assistant_sid`.
-        /// </summary>
-        /// <param name="options"> Update StyleSheet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of StyleSheet </returns>
-        public static async System.Threading.Tasks.Task<StyleSheetResource> UpdateAsync(UpdateStyleSheetOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates the style sheet for an Assistant identified by `assistant_sid`.
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the StyleSheet resource to update </param>
-        /// <param name="styleSheet"> The JSON string that describes the style sheet object </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of StyleSheet </returns>
-        public static StyleSheetResource Update(string pathAssistantSid,
-                                                object styleSheet = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateStyleSheetOptions(pathAssistantSid){StyleSheet = styleSheet};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the style sheet for an Assistant identified by `assistant_sid`.
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant with the StyleSheet resource to update </param>
-        /// <param name="styleSheet"> The JSON string that describes the style sheet object </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of StyleSheet </returns>
-        public static async System.Threading.Tasks.Task<StyleSheetResource> UpdateAsync(string pathAssistantSid,
-                                                                                        object styleSheet = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateStyleSheetOptions(pathAssistantSid){StyleSheet = styleSheet};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a StyleSheetResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> StyleSheetResource object represented by the provided JSON </returns>
-        public static StyleSheetResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<StyleSheetResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the StyleSheet resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The JSON string that describes the style sheet object
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-
-        private StyleSheetResource()
-        {
-
-        }
-    }
+{
+
+  public class StyleSheetResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchStyleSheetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/StyleSheet",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns Style sheet JSON object for the Assistant
+    /// </summary>
+    /// <param name="options"> Fetch StyleSheet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of StyleSheet </returns>
+    public static StyleSheetResource Fetch(FetchStyleSheetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns Style sheet JSON object for the Assistant
+    /// </summary>
+    /// <param name="options"> Fetch StyleSheet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of StyleSheet </returns>
+    public static async System.Threading.Tasks.Task<StyleSheetResource> FetchAsync(FetchStyleSheetOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Returns Style sheet JSON object for the Assistant
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the StyleSheet resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of StyleSheet </returns>
+    public static StyleSheetResource Fetch(string pathAssistantSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchStyleSheetOptions(pathAssistantSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns Style sheet JSON object for the Assistant
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the StyleSheet resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of StyleSheet </returns>
+    public static async System.Threading.Tasks.Task<StyleSheetResource> FetchAsync(string pathAssistantSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchStyleSheetOptions(pathAssistantSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateStyleSheetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/StyleSheet",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates the style sheet for an Assistant identified by `assistant_sid`.
+    /// </summary>
+    /// <param name="options"> Update StyleSheet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of StyleSheet </returns>
+    public static StyleSheetResource Update(UpdateStyleSheetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the style sheet for an Assistant identified by `assistant_sid`.
+    /// </summary>
+    /// <param name="options"> Update StyleSheet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of StyleSheet </returns>
+    public static async System.Threading.Tasks.Task<StyleSheetResource> UpdateAsync(UpdateStyleSheetOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates the style sheet for an Assistant identified by `assistant_sid`.
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the StyleSheet resource to update </param>
+    /// <param name="styleSheet"> The JSON string that describes the style sheet object </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of StyleSheet </returns>
+    public static StyleSheetResource Update(string pathAssistantSid,
+                                            object styleSheet = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateStyleSheetOptions(pathAssistantSid) { StyleSheet = styleSheet };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the style sheet for an Assistant identified by `assistant_sid`.
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant with the StyleSheet resource to update </param>
+    /// <param name="styleSheet"> The JSON string that describes the style sheet object </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of StyleSheet </returns>
+    public static async System.Threading.Tasks.Task<StyleSheetResource> UpdateAsync(string pathAssistantSid,
+                                                                                    object styleSheet = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateStyleSheetOptions(pathAssistantSid) { StyleSheet = styleSheet };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a StyleSheetResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> StyleSheetResource object represented by the provided JSON </returns>
+    public static StyleSheetResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<StyleSheetResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resource
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the StyleSheet resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The JSON string that describes the style sheet object
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+
+    private StyleSheetResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/FieldOptions.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/FieldOptions.cs
index 2e8425a60..079f7e184 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/FieldOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/FieldOptions.cs
@@ -9,205 +9,205 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant.Task
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchFieldOptions
+  /// </summary>
+  public class FetchFieldOptions : IOptions<FieldResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchFieldOptions
-    /// </summary>
-    public class FetchFieldOptions : IOptions<FieldResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task associated with the resource to fetch
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource associated with the Field resource to fetch
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFieldOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resource to fetch </param>
-        /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
-        ///                   associated with the Field resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchFieldOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Assistant that is the parent of the Task associated with the resource to fetch
+    /// </summary>
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadFieldOptions
-    /// </summary>
-    public class ReadFieldOptions : ReadOptions<FieldResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task associated with the resources to read.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource associated with the Field resources to read
-        /// </summary>
-        public string PathTaskSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadFieldOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resources to read. </param>
-        /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
-        ///                   associated with the Field resources to read </param>
-        public ReadFieldOptions(string pathAssistantSid, string pathTaskSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource associated with the Field resource to fetch
+    /// </summary>
+    public string PathTaskSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateFieldOptions
-    /// </summary>
-    public class CreateFieldOptions : IOptions<FieldResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task associated with the new resource
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource associated with the new Field resource
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// The Field Type of this field
-        /// </summary>
-        public string FieldType { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the new resource
-        /// </summary>
-        public string UniqueName { get; }
-
-        /// <summary>
-        /// Construct a new CreateFieldOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the new
-        ///                        resource </param>
-        /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
-        ///                   associated with the new Field resource </param>
-        /// <param name="fieldType"> The Field Type of this field </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
-        public CreateFieldOptions(string pathAssistantSid, string pathTaskSid, string fieldType, string uniqueName)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            FieldType = fieldType;
-            UniqueName = uniqueName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FieldType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FieldType", FieldType));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteFieldOptions
-    /// </summary>
-    public class DeleteFieldOptions : IOptions<FieldResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task associated with the resources to delete
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource associated with the Field resource to delete
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFieldOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resources to delete </param>
-        /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
-        ///                   associated with the Field resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteFieldOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new FetchFieldOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resource to fetch </param>
+    /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
+    ///                   associated with the Field resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchFieldOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadFieldOptions
+  /// </summary>
+  public class ReadFieldOptions : ReadOptions<FieldResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the Task associated with the resources to read.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource associated with the Field resources to read
+    /// </summary>
+    public string PathTaskSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadFieldOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resources to read. </param>
+    /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
+    ///                   associated with the Field resources to read </param>
+    public ReadFieldOptions(string pathAssistantSid, string pathTaskSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateFieldOptions
+  /// </summary>
+  public class CreateFieldOptions : IOptions<FieldResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the Task associated with the new resource
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource associated with the new Field resource
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// The Field Type of this field
+    /// </summary>
+    public string FieldType { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the new resource
+    /// </summary>
+    public string UniqueName { get; }
+
+    /// <summary>
+    /// Construct a new CreateFieldOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the new
+    ///                        resource </param>
+    /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
+    ///                   associated with the new Field resource </param>
+    /// <param name="fieldType"> The Field Type of this field </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
+    public CreateFieldOptions(string pathAssistantSid, string pathTaskSid, string fieldType, string uniqueName)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      FieldType = fieldType;
+      UniqueName = uniqueName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FieldType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FieldType", FieldType));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteFieldOptions
+  /// </summary>
+  public class DeleteFieldOptions : IOptions<FieldResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the Task associated with the resources to delete
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource associated with the Field resource to delete
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteFieldOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resources to delete </param>
+    /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
+    ///                   associated with the Field resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteFieldOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/FieldResource.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/FieldResource.cs
index 026c26aa9..f0dd34a2b 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/FieldResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/FieldResource.cs
@@ -19,463 +19,463 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant.Task
-{
-
-    public class FieldResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchFieldOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static FieldResource Fetch(FetchFieldOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<FieldResource> FetchAsync(FetchFieldOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resource to fetch </param>
-        /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
-        ///                   associated with the Field resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static FieldResource Fetch(string pathAssistantSid,
-                                          string pathTaskSid,
-                                          string pathSid,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resource to fetch </param>
-        /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
-        ///                   associated with the Field resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<FieldResource> FetchAsync(string pathAssistantSid,
-                                                                                  string pathTaskSid,
-                                                                                  string pathSid,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadFieldOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static ResourceSet<FieldResource> Read(ReadFieldOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FieldResource>.FromJson("fields", response.Content);
-            return new ResourceSet<FieldResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FieldResource>> ReadAsync(ReadFieldOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FieldResource>.FromJson("fields", response.Content);
-            return new ResourceSet<FieldResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resources to read. </param>
-        /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
-        ///                   associated with the Field resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static ResourceSet<FieldResource> Read(string pathAssistantSid,
-                                                      string pathTaskSid,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadFieldOptions(pathAssistantSid, pathTaskSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resources to read. </param>
-        /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
-        ///                   associated with the Field resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FieldResource>> ReadAsync(string pathAssistantSid,
-                                                                                              string pathTaskSid,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadFieldOptions(pathAssistantSid, pathTaskSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FieldResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FieldResource>.FromJson("fields", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FieldResource> NextPage(Page<FieldResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<FieldResource>.FromJson("fields", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FieldResource> PreviousPage(Page<FieldResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<FieldResource>.FromJson("fields", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateFieldOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static FieldResource Create(CreateFieldOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<FieldResource> CreateAsync(CreateFieldOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the new
-        ///                        resource </param>
-        /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
-        ///                   associated with the new Field resource </param>
-        /// <param name="fieldType"> The Field Type of this field </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static FieldResource Create(string pathAssistantSid,
-                                           string pathTaskSid,
-                                           string fieldType,
-                                           string uniqueName,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateFieldOptions(pathAssistantSid, pathTaskSid, fieldType, uniqueName);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the new
-        ///                        resource </param>
-        /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
-        ///                   associated with the new Field resource </param>
-        /// <param name="fieldType"> The Field Type of this field </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<FieldResource> CreateAsync(string pathAssistantSid,
-                                                                                   string pathTaskSid,
-                                                                                   string fieldType,
-                                                                                   string uniqueName,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateFieldOptions(pathAssistantSid, pathTaskSid, fieldType, uniqueName);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteFieldOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static bool Delete(DeleteFieldOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFieldOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resources to delete </param>
-        /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
-        ///                   associated with the Field resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static bool Delete(string pathAssistantSid,
-                                  string pathTaskSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resources to delete </param>
-        /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
-        ///                   associated with the Field resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathTaskSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FieldResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FieldResource object represented by the provided JSON </returns>
-        public static FieldResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FieldResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The Field Type of the field
-        /// </summary>
-        [JsonProperty("field_type")]
-        public string FieldType { get; private set; }
-        /// <summary>
-        /// The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource associated with this Field
-        /// </summary>
-        [JsonProperty("task_sid")]
-        public string TaskSid { get; private set; }
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task associated with the resource
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Field resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private FieldResource()
-        {
-
-        }
-    }
+{
+
+  public class FieldResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchFieldOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static FieldResource Fetch(FetchFieldOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<FieldResource> FetchAsync(FetchFieldOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resource to fetch </param>
+    /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
+    ///                   associated with the Field resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static FieldResource Fetch(string pathAssistantSid,
+                                      string pathTaskSid,
+                                      string pathSid,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resource to fetch </param>
+    /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
+    ///                   associated with the Field resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<FieldResource> FetchAsync(string pathAssistantSid,
+                                                                              string pathTaskSid,
+                                                                              string pathSid,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadFieldOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static ResourceSet<FieldResource> Read(ReadFieldOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FieldResource>.FromJson("fields", response.Content);
+      return new ResourceSet<FieldResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FieldResource>> ReadAsync(ReadFieldOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FieldResource>.FromJson("fields", response.Content);
+      return new ResourceSet<FieldResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resources to read. </param>
+    /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
+    ///                   associated with the Field resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static ResourceSet<FieldResource> Read(string pathAssistantSid,
+                                                  string pathTaskSid,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadFieldOptions(pathAssistantSid, pathTaskSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resources to read. </param>
+    /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
+    ///                   associated with the Field resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FieldResource>> ReadAsync(string pathAssistantSid,
+                                                                                          string pathTaskSid,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadFieldOptions(pathAssistantSid, pathTaskSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FieldResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FieldResource>.FromJson("fields", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FieldResource> NextPage(Page<FieldResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<FieldResource>.FromJson("fields", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FieldResource> PreviousPage(Page<FieldResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<FieldResource>.FromJson("fields", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateFieldOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static FieldResource Create(CreateFieldOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<FieldResource> CreateAsync(CreateFieldOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the new
+    ///                        resource </param>
+    /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
+    ///                   associated with the new Field resource </param>
+    /// <param name="fieldType"> The Field Type of this field </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static FieldResource Create(string pathAssistantSid,
+                                       string pathTaskSid,
+                                       string fieldType,
+                                       string uniqueName,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateFieldOptions(pathAssistantSid, pathTaskSid, fieldType, uniqueName);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the new
+    ///                        resource </param>
+    /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
+    ///                   associated with the new Field resource </param>
+    /// <param name="fieldType"> The Field Type of this field </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<FieldResource> CreateAsync(string pathAssistantSid,
+                                                                               string pathTaskSid,
+                                                                               string fieldType,
+                                                                               string uniqueName,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateFieldOptions(pathAssistantSid, pathTaskSid, fieldType, uniqueName);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteFieldOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static bool Delete(DeleteFieldOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFieldOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resources to delete </param>
+    /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
+    ///                   associated with the Field resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static bool Delete(string pathAssistantSid,
+                              string pathTaskSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resources to delete </param>
+    /// <param name="pathTaskSid"> The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource
+    ///                   associated with the Field resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathTaskSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FieldResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FieldResource object represented by the provided JSON </returns>
+    public static FieldResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FieldResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The Field Type of the field
+    /// </summary>
+    [JsonProperty("field_type")]
+    public string FieldType { get; private set; }
+    /// <summary>
+    /// The SID of the [Task](https://www.twilio.com/docs/autopilot/api/task) resource associated with this Field
+    /// </summary>
+    [JsonProperty("task_sid")]
+    public string TaskSid { get; private set; }
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the Task associated with the resource
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Field resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private FieldResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/SampleOptions.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/SampleOptions.cs
index 1536bf012..8a64e4373 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/SampleOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/SampleOptions.cs
@@ -9,291 +9,291 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant.Task
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchSampleOptions
+  /// </summary>
+  public class FetchSampleOptions : IOptions<SampleResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchSampleOptions
+    /// The SID of the Assistant that is the parent of the Task associated with the resource to fetch
     /// </summary>
-    public class FetchSampleOptions : IOptions<SampleResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task associated with the resource to fetch
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the Task associated with the Sample resource to create
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSampleOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resource to fetch </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to create </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchSampleOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadSampleOptions
+    /// The SID of the Task associated with the Sample resource to create
     /// </summary>
-    public class ReadSampleOptions : ReadOptions<SampleResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task associated with the resources to read
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the Task associated with the Sample resources to read
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// The ISO language-country string that specifies the language used for the sample
-        /// </summary>
-        public string Language { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadSampleOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resources to read </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resources to read </param>
-        public ReadSampleOptions(string pathAssistantSid, string pathTaskSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathTaskSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateSampleOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class CreateSampleOptions : IOptions<SampleResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task associated with the new resource
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the Task associated with the Sample resource to create
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// The ISO language-country string that specifies the language used for the new sample
-        /// </summary>
-        public string Language { get; }
-        /// <summary>
-        /// The text example of how end users might express the task
-        /// </summary>
-        public string TaggedText { get; }
-        /// <summary>
-        /// The communication channel from which the new sample was captured
-        /// </summary>
-        public string SourceChannel { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSampleOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the new
-        ///                        resource </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to create </param>
-        /// <param name="language"> The ISO language-country string that specifies the language used for the new sample </param>
-        /// <param name="taggedText"> The text example of how end users might express the task </param>
-        public CreateSampleOptions(string pathAssistantSid, string pathTaskSid, string language, string taggedText)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            Language = language;
-            TaggedText = taggedText;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (TaggedText != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaggedText", TaggedText));
-            }
-
-            if (SourceChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SourceChannel", SourceChannel));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateSampleOptions
+    /// Construct a new FetchSampleOptions
     /// </summary>
-    public class UpdateSampleOptions : IOptions<SampleResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task associated with the resource to update
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the Task associated with the Sample resource to update
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The ISO language-country string that specifies the language used for the sample
-        /// </summary>
-        public string Language { get; set; }
-        /// <summary>
-        /// The text example of how end users might express the task
-        /// </summary>
-        public string TaggedText { get; set; }
-        /// <summary>
-        /// The communication channel from which the sample was captured
-        /// </summary>
-        public string SourceChannel { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSampleOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resource to update </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateSampleOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (TaggedText != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaggedText", TaggedText));
-            }
-
-            if (SourceChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SourceChannel", SourceChannel));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resource to fetch </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to create </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchSampleOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteSampleOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteSampleOptions : IOptions<SampleResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task associated with the resources to delete
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the Task associated with the Sample resource to delete
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSampleOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resources to delete </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteSampleOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadSampleOptions
+  /// </summary>
+  public class ReadSampleOptions : ReadOptions<SampleResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the Task associated with the resources to read
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The SID of the Task associated with the Sample resources to read
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// The ISO language-country string that specifies the language used for the sample
+    /// </summary>
+    public string Language { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadSampleOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resources to read </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resources to read </param>
+    public ReadSampleOptions(string pathAssistantSid, string pathTaskSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateSampleOptions
+  /// </summary>
+  public class CreateSampleOptions : IOptions<SampleResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the Task associated with the new resource
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The SID of the Task associated with the Sample resource to create
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// The ISO language-country string that specifies the language used for the new sample
+    /// </summary>
+    public string Language { get; }
+    /// <summary>
+    /// The text example of how end users might express the task
+    /// </summary>
+    public string TaggedText { get; }
+    /// <summary>
+    /// The communication channel from which the new sample was captured
+    /// </summary>
+    public string SourceChannel { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateSampleOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the new
+    ///                        resource </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to create </param>
+    /// <param name="language"> The ISO language-country string that specifies the language used for the new sample </param>
+    /// <param name="taggedText"> The text example of how end users might express the task </param>
+    public CreateSampleOptions(string pathAssistantSid, string pathTaskSid, string language, string taggedText)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      Language = language;
+      TaggedText = taggedText;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (TaggedText != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaggedText", TaggedText));
+      }
+
+      if (SourceChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SourceChannel", SourceChannel));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateSampleOptions
+  /// </summary>
+  public class UpdateSampleOptions : IOptions<SampleResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the Task associated with the resource to update
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The SID of the Task associated with the Sample resource to update
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The ISO language-country string that specifies the language used for the sample
+    /// </summary>
+    public string Language { get; set; }
+    /// <summary>
+    /// The text example of how end users might express the task
+    /// </summary>
+    public string TaggedText { get; set; }
+    /// <summary>
+    /// The communication channel from which the sample was captured
+    /// </summary>
+    public string SourceChannel { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSampleOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resource to update </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateSampleOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (TaggedText != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaggedText", TaggedText));
+      }
+
+      if (SourceChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SourceChannel", SourceChannel));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteSampleOptions
+  /// </summary>
+  public class DeleteSampleOptions : IOptions<SampleResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the Task associated with the resources to delete
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The SID of the Task associated with the Sample resource to delete
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSampleOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resources to delete </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteSampleOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/SampleResource.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/SampleResource.cs
index 9781055cf..bd7679693 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/SampleResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/SampleResource.cs
@@ -19,558 +19,558 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant.Task
-{
-
-    public class SampleResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSampleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static SampleResource Fetch(FetchSampleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<SampleResource> FetchAsync(FetchSampleOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resource to fetch </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to create </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static SampleResource Fetch(string pathAssistantSid,
-                                           string pathTaskSid,
-                                           string pathSid,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resource to fetch </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to create </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<SampleResource> FetchAsync(string pathAssistantSid,
-                                                                                   string pathTaskSid,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSampleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static ResourceSet<SampleResource> Read(ReadSampleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SampleResource>.FromJson("samples", response.Content);
-            return new ResourceSet<SampleResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SampleResource>> ReadAsync(ReadSampleOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SampleResource>.FromJson("samples", response.Content);
-            return new ResourceSet<SampleResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resources to read </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resources to read </param>
-        /// <param name="language"> The ISO language-country string that specifies the language used for the sample </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static ResourceSet<SampleResource> Read(string pathAssistantSid,
-                                                       string pathTaskSid,
-                                                       string language = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadSampleOptions(pathAssistantSid, pathTaskSid){Language = language, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resources to read </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resources to read </param>
-        /// <param name="language"> The ISO language-country string that specifies the language used for the sample </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SampleResource>> ReadAsync(string pathAssistantSid,
-                                                                                               string pathTaskSid,
-                                                                                               string language = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadSampleOptions(pathAssistantSid, pathTaskSid){Language = language, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SampleResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SampleResource>.FromJson("samples", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SampleResource> NextPage(Page<SampleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<SampleResource>.FromJson("samples", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SampleResource> PreviousPage(Page<SampleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<SampleResource>.FromJson("samples", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateSampleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static SampleResource Create(CreateSampleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<SampleResource> CreateAsync(CreateSampleOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the new
-        ///                        resource </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to create </param>
-        /// <param name="language"> The ISO language-country string that specifies the language used for the new sample </param>
-        /// <param name="taggedText"> The text example of how end users might express the task </param>
-        /// <param name="sourceChannel"> The communication channel from which the new sample was captured </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static SampleResource Create(string pathAssistantSid,
-                                            string pathTaskSid,
-                                            string language,
-                                            string taggedText,
-                                            string sourceChannel = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateSampleOptions(pathAssistantSid, pathTaskSid, language, taggedText){SourceChannel = sourceChannel};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the new
-        ///                        resource </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to create </param>
-        /// <param name="language"> The ISO language-country string that specifies the language used for the new sample </param>
-        /// <param name="taggedText"> The text example of how end users might express the task </param>
-        /// <param name="sourceChannel"> The communication channel from which the new sample was captured </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<SampleResource> CreateAsync(string pathAssistantSid,
-                                                                                    string pathTaskSid,
-                                                                                    string language,
-                                                                                    string taggedText,
-                                                                                    string sourceChannel = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateSampleOptions(pathAssistantSid, pathTaskSid, language, taggedText){SourceChannel = sourceChannel};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSampleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static SampleResource Update(UpdateSampleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<SampleResource> UpdateAsync(UpdateSampleOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resource to update </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="language"> The ISO language-country string that specifies the language used for the sample </param>
-        /// <param name="taggedText"> The text example of how end users might express the task </param>
-        /// <param name="sourceChannel"> The communication channel from which the sample was captured </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static SampleResource Update(string pathAssistantSid,
-                                            string pathTaskSid,
-                                            string pathSid,
-                                            string language = null,
-                                            string taggedText = null,
-                                            string sourceChannel = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateSampleOptions(pathAssistantSid, pathTaskSid, pathSid){Language = language, TaggedText = taggedText, SourceChannel = sourceChannel};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resource to update </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="language"> The ISO language-country string that specifies the language used for the sample </param>
-        /// <param name="taggedText"> The text example of how end users might express the task </param>
-        /// <param name="sourceChannel"> The communication channel from which the sample was captured </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<SampleResource> UpdateAsync(string pathAssistantSid,
-                                                                                    string pathTaskSid,
-                                                                                    string pathSid,
-                                                                                    string language = null,
-                                                                                    string taggedText = null,
-                                                                                    string sourceChannel = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateSampleOptions(pathAssistantSid, pathTaskSid, pathSid){Language = language, TaggedText = taggedText, SourceChannel = sourceChannel};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSampleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static bool Delete(DeleteSampleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSampleOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resources to delete </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static bool Delete(string pathAssistantSid,
-                                  string pathTaskSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
-        ///                        resources to delete </param>
-        /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathTaskSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SampleResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SampleResource object represented by the provided JSON </returns>
-        public static SampleResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SampleResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The SID of the Task associated with the resource
-        /// </summary>
-        [JsonProperty("task_sid")]
-        public string TaskSid { get; private set; }
-        /// <summary>
-        /// An ISO language-country string that specifies the language used for the sample
-        /// </summary>
-        [JsonProperty("language")]
-        public string Language { get; private set; }
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task associated with the resource
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The text example of how end users might express the task
-        /// </summary>
-        [JsonProperty("tagged_text")]
-        public string TaggedText { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Sample resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The communication channel from which the sample was captured
-        /// </summary>
-        [JsonProperty("source_channel")]
-        public string SourceChannel { get; private set; }
-
-        private SampleResource()
-        {
-
-        }
-    }
+{
+
+  public class SampleResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSampleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static SampleResource Fetch(FetchSampleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<SampleResource> FetchAsync(FetchSampleOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resource to fetch </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to create </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static SampleResource Fetch(string pathAssistantSid,
+                                       string pathTaskSid,
+                                       string pathSid,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resource to fetch </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to create </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<SampleResource> FetchAsync(string pathAssistantSid,
+                                                                               string pathTaskSid,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSampleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static ResourceSet<SampleResource> Read(ReadSampleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SampleResource>.FromJson("samples", response.Content);
+      return new ResourceSet<SampleResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SampleResource>> ReadAsync(ReadSampleOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SampleResource>.FromJson("samples", response.Content);
+      return new ResourceSet<SampleResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resources to read </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resources to read </param>
+    /// <param name="language"> The ISO language-country string that specifies the language used for the sample </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static ResourceSet<SampleResource> Read(string pathAssistantSid,
+                                                   string pathTaskSid,
+                                                   string language = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadSampleOptions(pathAssistantSid, pathTaskSid) { Language = language, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resources to read </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resources to read </param>
+    /// <param name="language"> The ISO language-country string that specifies the language used for the sample </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SampleResource>> ReadAsync(string pathAssistantSid,
+                                                                                           string pathTaskSid,
+                                                                                           string language = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadSampleOptions(pathAssistantSid, pathTaskSid) { Language = language, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SampleResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SampleResource>.FromJson("samples", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SampleResource> NextPage(Page<SampleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<SampleResource>.FromJson("samples", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SampleResource> PreviousPage(Page<SampleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<SampleResource>.FromJson("samples", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateSampleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static SampleResource Create(CreateSampleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<SampleResource> CreateAsync(CreateSampleOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the new
+    ///                        resource </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to create </param>
+    /// <param name="language"> The ISO language-country string that specifies the language used for the new sample </param>
+    /// <param name="taggedText"> The text example of how end users might express the task </param>
+    /// <param name="sourceChannel"> The communication channel from which the new sample was captured </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static SampleResource Create(string pathAssistantSid,
+                                        string pathTaskSid,
+                                        string language,
+                                        string taggedText,
+                                        string sourceChannel = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateSampleOptions(pathAssistantSid, pathTaskSid, language, taggedText) { SourceChannel = sourceChannel };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the new
+    ///                        resource </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to create </param>
+    /// <param name="language"> The ISO language-country string that specifies the language used for the new sample </param>
+    /// <param name="taggedText"> The text example of how end users might express the task </param>
+    /// <param name="sourceChannel"> The communication channel from which the new sample was captured </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<SampleResource> CreateAsync(string pathAssistantSid,
+                                                                                string pathTaskSid,
+                                                                                string language,
+                                                                                string taggedText,
+                                                                                string sourceChannel = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateSampleOptions(pathAssistantSid, pathTaskSid, language, taggedText) { SourceChannel = sourceChannel };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSampleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static SampleResource Update(UpdateSampleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<SampleResource> UpdateAsync(UpdateSampleOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resource to update </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="language"> The ISO language-country string that specifies the language used for the sample </param>
+    /// <param name="taggedText"> The text example of how end users might express the task </param>
+    /// <param name="sourceChannel"> The communication channel from which the sample was captured </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static SampleResource Update(string pathAssistantSid,
+                                        string pathTaskSid,
+                                        string pathSid,
+                                        string language = null,
+                                        string taggedText = null,
+                                        string sourceChannel = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateSampleOptions(pathAssistantSid, pathTaskSid, pathSid) { Language = language, TaggedText = taggedText, SourceChannel = sourceChannel };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resource to update </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="language"> The ISO language-country string that specifies the language used for the sample </param>
+    /// <param name="taggedText"> The text example of how end users might express the task </param>
+    /// <param name="sourceChannel"> The communication channel from which the sample was captured </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<SampleResource> UpdateAsync(string pathAssistantSid,
+                                                                                string pathTaskSid,
+                                                                                string pathSid,
+                                                                                string language = null,
+                                                                                string taggedText = null,
+                                                                                string sourceChannel = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateSampleOptions(pathAssistantSid, pathTaskSid, pathSid) { Language = language, TaggedText = taggedText, SourceChannel = sourceChannel };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSampleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static bool Delete(DeleteSampleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSampleOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resources to delete </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static bool Delete(string pathAssistantSid,
+                              string pathTaskSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task associated with the
+    ///                        resources to delete </param>
+    /// <param name="pathTaskSid"> The SID of the Task associated with the Sample resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathTaskSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SampleResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SampleResource object represented by the provided JSON </returns>
+    public static SampleResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SampleResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The SID of the Task associated with the resource
+    /// </summary>
+    [JsonProperty("task_sid")]
+    public string TaskSid { get; private set; }
+    /// <summary>
+    /// An ISO language-country string that specifies the language used for the sample
+    /// </summary>
+    [JsonProperty("language")]
+    public string Language { get; private set; }
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the Task associated with the resource
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The text example of how end users might express the task
+    /// </summary>
+    [JsonProperty("tagged_text")]
+    public string TaggedText { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Sample resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The communication channel from which the sample was captured
+    /// </summary>
+    [JsonProperty("source_channel")]
+    public string SourceChannel { get; private set; }
+
+    private SampleResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskActionsOptions.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskActionsOptions.cs
index d274f97ea..ad2b52b9f 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskActionsOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskActionsOptions.cs
@@ -9,93 +9,93 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant.Task
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Returns JSON actions for the Task.
+  /// </summary>
+  public class FetchTaskActionsOptions : IOptions<TaskActionsResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Returns JSON actions for the Task.
+    /// The SID of the Assistant that is the parent of the Task for which the task actions to fetch were defined
     /// </summary>
-    public class FetchTaskActionsOptions : IOptions<TaskActionsResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task for which the task actions to fetch were defined
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the Task for which the task actions to fetch were defined
-        /// </summary>
-        public string PathTaskSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTaskActionsOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task for which the task actions
-        ///                        to fetch were defined </param>
-        /// <param name="pathTaskSid"> The SID of the Task for which the task actions to fetch were defined </param>
-        public FetchTaskActionsOptions(string pathAssistantSid, string pathTaskSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
+    /// The SID of the Task for which the task actions to fetch were defined
     /// </summary>
-    public class UpdateTaskActionsOptions : IOptions<TaskActionsResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task for which the task actions to update were defined
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the Task for which the task actions to update were defined
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// The JSON string that specifies the actions that instruct the Assistant on how to perform the task
-        /// </summary>
-        public object Actions { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateTaskActionsOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task for which the task actions
-        ///                        to update were defined </param>
-        /// <param name="pathTaskSid"> The SID of the Task for which the task actions to update were defined </param>
-        public UpdateTaskActionsOptions(string pathAssistantSid, string pathTaskSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Actions != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Actions", Serializers.JsonObject(Actions)));
-            }
-
-            return p;
-        }
-    }
+    public string PathTaskSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchTaskActionsOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task for which the task actions
+    ///                        to fetch were defined </param>
+    /// <param name="pathTaskSid"> The SID of the Task for which the task actions to fetch were defined </param>
+    public FetchTaskActionsOptions(string pathAssistantSid, string pathTaskSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
+  /// </summary>
+  public class UpdateTaskActionsOptions : IOptions<TaskActionsResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the Task for which the task actions to update were defined
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The SID of the Task for which the task actions to update were defined
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// The JSON string that specifies the actions that instruct the Assistant on how to perform the task
+    /// </summary>
+    public object Actions { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateTaskActionsOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task for which the task actions
+    ///                        to update were defined </param>
+    /// <param name="pathTaskSid"> The SID of the Task for which the task actions to update were defined </param>
+    public UpdateTaskActionsOptions(string pathAssistantSid, string pathTaskSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Actions != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Actions", Serializers.JsonObject(Actions)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskActionsResource.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskActionsResource.cs
index 9ce5a598d..98d1e97dc 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskActionsResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskActionsResource.cs
@@ -19,210 +19,210 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant.Task
-{
-
-    public class TaskActionsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchTaskActionsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Actions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns JSON actions for the Task.
-        /// </summary>
-        /// <param name="options"> Fetch TaskActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskActions </returns>
-        public static TaskActionsResource Fetch(FetchTaskActionsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns JSON actions for the Task.
-        /// </summary>
-        /// <param name="options"> Fetch TaskActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskActions </returns>
-        public static async System.Threading.Tasks.Task<TaskActionsResource> FetchAsync(FetchTaskActionsOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns JSON actions for the Task.
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task for which the task actions
-        ///                        to fetch were defined </param>
-        /// <param name="pathTaskSid"> The SID of the Task for which the task actions to fetch were defined </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskActions </returns>
-        public static TaskActionsResource Fetch(string pathAssistantSid, string pathTaskSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskActionsOptions(pathAssistantSid, pathTaskSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns JSON actions for the Task.
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task for which the task actions
-        ///                        to fetch were defined </param>
-        /// <param name="pathTaskSid"> The SID of the Task for which the task actions to fetch were defined </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskActions </returns>
-        public static async System.Threading.Tasks.Task<TaskActionsResource> FetchAsync(string pathAssistantSid,
-                                                                                        string pathTaskSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskActionsOptions(pathAssistantSid, pathTaskSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateTaskActionsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Actions",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
-        /// </summary>
-        /// <param name="options"> Update TaskActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskActions </returns>
-        public static TaskActionsResource Update(UpdateTaskActionsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
-        /// </summary>
-        /// <param name="options"> Update TaskActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskActions </returns>
-        public static async System.Threading.Tasks.Task<TaskActionsResource> UpdateAsync(UpdateTaskActionsOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task for which the task actions
-        ///                        to update were defined </param>
-        /// <param name="pathTaskSid"> The SID of the Task for which the task actions to update were defined </param>
-        /// <param name="actions"> The JSON string that specifies the actions that instruct the Assistant on how to perform the
-        ///               task </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskActions </returns>
-        public static TaskActionsResource Update(string pathAssistantSid,
-                                                 string pathTaskSid,
-                                                 object actions = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskActionsOptions(pathAssistantSid, pathTaskSid){Actions = actions};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task for which the task actions
-        ///                        to update were defined </param>
-        /// <param name="pathTaskSid"> The SID of the Task for which the task actions to update were defined </param>
-        /// <param name="actions"> The JSON string that specifies the actions that instruct the Assistant on how to perform the
-        ///               task </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskActions </returns>
-        public static async System.Threading.Tasks.Task<TaskActionsResource> UpdateAsync(string pathAssistantSid,
-                                                                                         string pathTaskSid,
-                                                                                         object actions = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskActionsOptions(pathAssistantSid, pathTaskSid){Actions = actions};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TaskActionsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TaskActionsResource object represented by the provided JSON </returns>
-        public static TaskActionsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TaskActionsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task associated with the resource
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The SID of the Task associated with the resource
-        /// </summary>
-        [JsonProperty("task_sid")]
-        public string TaskSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the TaskActions resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The JSON string that specifies the actions that instruct the Assistant on how to perform the task
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-
-        private TaskActionsResource()
-        {
-
-        }
-    }
+{
+
+  public class TaskActionsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchTaskActionsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Actions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns JSON actions for the Task.
+    /// </summary>
+    /// <param name="options"> Fetch TaskActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskActions </returns>
+    public static TaskActionsResource Fetch(FetchTaskActionsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns JSON actions for the Task.
+    /// </summary>
+    /// <param name="options"> Fetch TaskActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskActions </returns>
+    public static async System.Threading.Tasks.Task<TaskActionsResource> FetchAsync(FetchTaskActionsOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Returns JSON actions for the Task.
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task for which the task actions
+    ///                        to fetch were defined </param>
+    /// <param name="pathTaskSid"> The SID of the Task for which the task actions to fetch were defined </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskActions </returns>
+    public static TaskActionsResource Fetch(string pathAssistantSid, string pathTaskSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskActionsOptions(pathAssistantSid, pathTaskSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns JSON actions for the Task.
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task for which the task actions
+    ///                        to fetch were defined </param>
+    /// <param name="pathTaskSid"> The SID of the Task for which the task actions to fetch were defined </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskActions </returns>
+    public static async System.Threading.Tasks.Task<TaskActionsResource> FetchAsync(string pathAssistantSid,
+                                                                                    string pathTaskSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskActionsOptions(pathAssistantSid, pathTaskSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateTaskActionsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Actions",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
+    /// </summary>
+    /// <param name="options"> Update TaskActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskActions </returns>
+    public static TaskActionsResource Update(UpdateTaskActionsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
+    /// </summary>
+    /// <param name="options"> Update TaskActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskActions </returns>
+    public static async System.Threading.Tasks.Task<TaskActionsResource> UpdateAsync(UpdateTaskActionsOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task for which the task actions
+    ///                        to update were defined </param>
+    /// <param name="pathTaskSid"> The SID of the Task for which the task actions to update were defined </param>
+    /// <param name="actions"> The JSON string that specifies the actions that instruct the Assistant on how to perform the
+    ///               task </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskActions </returns>
+    public static TaskActionsResource Update(string pathAssistantSid,
+                                             string pathTaskSid,
+                                             object actions = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskActionsOptions(pathAssistantSid, pathTaskSid) { Actions = actions };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the Task for which the task actions
+    ///                        to update were defined </param>
+    /// <param name="pathTaskSid"> The SID of the Task for which the task actions to update were defined </param>
+    /// <param name="actions"> The JSON string that specifies the actions that instruct the Assistant on how to perform the
+    ///               task </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskActions </returns>
+    public static async System.Threading.Tasks.Task<TaskActionsResource> UpdateAsync(string pathAssistantSid,
+                                                                                     string pathTaskSid,
+                                                                                     object actions = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskActionsOptions(pathAssistantSid, pathTaskSid) { Actions = actions };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TaskActionsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TaskActionsResource object represented by the provided JSON </returns>
+    public static TaskActionsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TaskActionsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the Task associated with the resource
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The SID of the Task associated with the resource
+    /// </summary>
+    [JsonProperty("task_sid")]
+    public string TaskSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the TaskActions resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The JSON string that specifies the actions that instruct the Assistant on how to perform the task
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+
+    private TaskActionsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskStatisticsOptions.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskStatisticsOptions.cs
index 73e90c82f..457702a64 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskStatisticsOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskStatisticsOptions.cs
@@ -9,44 +9,44 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant.Task
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchTaskStatisticsOptions
+  /// </summary>
+  public class FetchTaskStatisticsOptions : IOptions<TaskStatisticsResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchTaskStatisticsOptions
+    /// The SID of the Assistant that is the parent of the resource to fetch
     /// </summary>
-    public class FetchTaskStatisticsOptions : IOptions<TaskStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource to fetch
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The SID of the Task that is associated with the resource to fetch
-        /// </summary>
-        public string PathTaskSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTaskStatisticsOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathTaskSid"> The SID of the Task that is associated with the resource to fetch </param>
-        public FetchTaskStatisticsOptions(string pathAssistantSid, string pathTaskSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The SID of the Task that is associated with the resource to fetch
+    /// </summary>
+    public string PathTaskSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchTaskStatisticsOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathTaskSid"> The SID of the Task that is associated with the resource to fetch </param>
+    public FetchTaskStatisticsOptions(string pathAssistantSid, string pathTaskSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskStatisticsResource.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskStatisticsResource.cs
index bb911f98e..11d3adb54 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskStatisticsResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/Task/TaskStatisticsResource.cs
@@ -19,135 +19,135 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant.Task
-{
-
-    public class TaskStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchTaskStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Statistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskStatistics </returns>
-        public static TaskStatisticsResource Fetch(FetchTaskStatisticsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskStatistics </returns>
-        public static async System.Threading.Tasks.Task<TaskStatisticsResource> FetchAsync(FetchTaskStatisticsOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathTaskSid"> The SID of the Task that is associated with the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskStatistics </returns>
-        public static TaskStatisticsResource Fetch(string pathAssistantSid,
-                                                   string pathTaskSid,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskStatisticsOptions(pathAssistantSid, pathTaskSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathTaskSid"> The SID of the Task that is associated with the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskStatistics </returns>
-        public static async System.Threading.Tasks.Task<TaskStatisticsResource> FetchAsync(string pathAssistantSid,
-                                                                                           string pathTaskSid,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskStatisticsOptions(pathAssistantSid, pathTaskSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TaskStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TaskStatisticsResource object represented by the provided JSON </returns>
-        public static TaskStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TaskStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the Task associated with the resource
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The SID of the Task for which the statistics were collected
-        /// </summary>
-        [JsonProperty("task_sid")]
-        public string TaskSid { get; private set; }
-        /// <summary>
-        /// The total number of Samples associated with the Task
-        /// </summary>
-        [JsonProperty("samples_count")]
-        public int? SamplesCount { get; private set; }
-        /// <summary>
-        /// The total number of Fields associated with the Task
-        /// </summary>
-        [JsonProperty("fields_count")]
-        public int? FieldsCount { get; private set; }
-        /// <summary>
-        /// The absolute URL of the TaskStatistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private TaskStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class TaskStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchTaskStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Statistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskStatistics </returns>
+    public static TaskStatisticsResource Fetch(FetchTaskStatisticsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskStatistics </returns>
+    public static async System.Threading.Tasks.Task<TaskStatisticsResource> FetchAsync(FetchTaskStatisticsOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathTaskSid"> The SID of the Task that is associated with the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskStatistics </returns>
+    public static TaskStatisticsResource Fetch(string pathAssistantSid,
+                                               string pathTaskSid,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskStatisticsOptions(pathAssistantSid, pathTaskSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathTaskSid"> The SID of the Task that is associated with the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskStatistics </returns>
+    public static async System.Threading.Tasks.Task<TaskStatisticsResource> FetchAsync(string pathAssistantSid,
+                                                                                       string pathTaskSid,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskStatisticsOptions(pathAssistantSid, pathTaskSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TaskStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TaskStatisticsResource object represented by the provided JSON </returns>
+    public static TaskStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TaskStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the Task associated with the resource
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The SID of the Task for which the statistics were collected
+    /// </summary>
+    [JsonProperty("task_sid")]
+    public string TaskSid { get; private set; }
+    /// <summary>
+    /// The total number of Samples associated with the Task
+    /// </summary>
+    [JsonProperty("samples_count")]
+    public int? SamplesCount { get; private set; }
+    /// <summary>
+    /// The total number of Fields associated with the Task
+    /// </summary>
+    [JsonProperty("fields_count")]
+    public int? FieldsCount { get; private set; }
+    /// <summary>
+    /// The absolute URL of the TaskStatistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private TaskStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/TaskOptions.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/TaskOptions.cs
index 814b1ff2e..d3431e6a5 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/TaskOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/TaskOptions.cs
@@ -9,263 +9,263 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchTaskOptions
+  /// </summary>
+  public class FetchTaskOptions : IOptions<TaskResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchTaskOptions
+    /// The SID of the Assistant that is the parent of the resource to fetch
     /// </summary>
-    public class FetchTaskOptions : IOptions<TaskResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource to fetch
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTaskOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        public FetchTaskOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadTaskOptions
+    /// The unique string that identifies the resource to fetch
     /// </summary>
-    public class ReadTaskOptions : ReadOptions<TaskResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resources to read
-        /// </summary>
-        public string PathAssistantSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadTaskOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
-        public ReadTaskOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateTaskOptions
+    /// Construct a new FetchTaskOptions
     /// </summary>
-    public class CreateTaskOptions : IOptions<TaskResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the new resource
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; }
-        /// <summary>
-        ///  descriptive string that you create to describe the new resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The JSON string that specifies the actions that instruct the Assistant on how to perform the task
-        /// </summary>
-        public object Actions { get; set; }
-        /// <summary>
-        /// The URL from which the Assistant can fetch actions
-        /// </summary>
-        public Uri ActionsUrl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateTaskOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        public CreateTaskOptions(string pathAssistantSid, string uniqueName)
-        {
-            PathAssistantSid = pathAssistantSid;
-            UniqueName = uniqueName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Actions != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Actions", Serializers.JsonObject(Actions)));
-            }
-
-            if (ActionsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ActionsUrl", Serializers.Url(ActionsUrl)));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    public FetchTaskOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateTaskOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateTaskOptions : IOptions<TaskResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource to update
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The JSON string that specifies the actions that instruct the Assistant on how to perform the task
-        /// </summary>
-        public object Actions { get; set; }
-        /// <summary>
-        /// The URL from which the Assistant can fetch actions
-        /// </summary>
-        public Uri ActionsUrl { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateTaskOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateTaskOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Actions != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Actions", Serializers.JsonObject(Actions)));
-            }
-
-            if (ActionsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ActionsUrl", Serializers.Url(ActionsUrl)));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadTaskOptions
+  /// </summary>
+  public class ReadTaskOptions : ReadOptions<TaskResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteTaskOptions
+    /// The SID of the Assistant that is the parent of the resources to read
     /// </summary>
-    public class DeleteTaskOptions : IOptions<TaskResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resources to delete
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteTaskOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
-        public DeleteTaskOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathAssistantSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadTaskOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
+    public ReadTaskOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateTaskOptions
+  /// </summary>
+  public class CreateTaskOptions : IOptions<TaskResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the new resource
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; }
+    /// <summary>
+    ///  descriptive string that you create to describe the new resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The JSON string that specifies the actions that instruct the Assistant on how to perform the task
+    /// </summary>
+    public object Actions { get; set; }
+    /// <summary>
+    /// The URL from which the Assistant can fetch actions
+    /// </summary>
+    public Uri ActionsUrl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateTaskOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    public CreateTaskOptions(string pathAssistantSid, string uniqueName)
+    {
+      PathAssistantSid = pathAssistantSid;
+      UniqueName = uniqueName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Actions != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Actions", Serializers.JsonObject(Actions)));
+      }
+
+      if (ActionsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ActionsUrl", Serializers.Url(ActionsUrl)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateTaskOptions
+  /// </summary>
+  public class UpdateTaskOptions : IOptions<TaskResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resource to update
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The JSON string that specifies the actions that instruct the Assistant on how to perform the task
+    /// </summary>
+    public object Actions { get; set; }
+    /// <summary>
+    /// The URL from which the Assistant can fetch actions
+    /// </summary>
+    public Uri ActionsUrl { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateTaskOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateTaskOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Actions != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Actions", Serializers.JsonObject(Actions)));
+      }
+
+      if (ActionsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ActionsUrl", Serializers.Url(ActionsUrl)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteTaskOptions
+  /// </summary>
+  public class DeleteTaskOptions : IOptions<TaskResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resources to delete
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteTaskOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
+    public DeleteTaskOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/TaskResource.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/TaskResource.cs
index db16c9ee1..3aead6e52 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/TaskResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/TaskResource.cs
@@ -19,532 +19,532 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
-    public class TaskResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Fetch(FetchTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> FetchAsync(FetchTaskOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskOptions(pathAssistantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> FetchAsync(string pathAssistantSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskOptions(pathAssistantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static ResourceSet<TaskResource> Read(ReadTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TaskResource>.FromJson("tasks", response.Content);
-            return new ResourceSet<TaskResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TaskResource>> ReadAsync(ReadTaskOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TaskResource>.FromJson("tasks", response.Content);
-            return new ResourceSet<TaskResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static ResourceSet<TaskResource> Read(string pathAssistantSid,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadTaskOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TaskResource>> ReadAsync(string pathAssistantSid,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadTaskOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TaskResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TaskResource>.FromJson("tasks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TaskResource> NextPage(Page<TaskResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<TaskResource>.FromJson("tasks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TaskResource> PreviousPage(Page<TaskResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<TaskResource>.FromJson("tasks", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Create(CreateTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> CreateAsync(CreateTaskOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="friendlyName">  descriptive string that you create to describe the new resource </param>
-        /// <param name="actions"> The JSON string that specifies the actions that instruct the Assistant on how to perform the
-        ///               task </param>
-        /// <param name="actionsUrl"> The URL from which the Assistant can fetch actions </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Create(string pathAssistantSid,
-                                          string uniqueName,
-                                          string friendlyName = null,
-                                          object actions = null,
-                                          Uri actionsUrl = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateTaskOptions(pathAssistantSid, uniqueName){FriendlyName = friendlyName, Actions = actions, ActionsUrl = actionsUrl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="friendlyName">  descriptive string that you create to describe the new resource </param>
-        /// <param name="actions"> The JSON string that specifies the actions that instruct the Assistant on how to perform the
-        ///               task </param>
-        /// <param name="actionsUrl"> The URL from which the Assistant can fetch actions </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> CreateAsync(string pathAssistantSid,
-                                                                                  string uniqueName,
-                                                                                  string friendlyName = null,
-                                                                                  object actions = null,
-                                                                                  Uri actionsUrl = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateTaskOptions(pathAssistantSid, uniqueName){FriendlyName = friendlyName, Actions = actions, ActionsUrl = actionsUrl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Update(UpdateTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> UpdateAsync(UpdateTaskOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="actions"> The JSON string that specifies the actions that instruct the Assistant on how to perform the
-        ///               task </param>
-        /// <param name="actionsUrl"> The URL from which the Assistant can fetch actions </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Update(string pathAssistantSid,
-                                          string pathSid,
-                                          string friendlyName = null,
-                                          string uniqueName = null,
-                                          object actions = null,
-                                          Uri actionsUrl = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskOptions(pathAssistantSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Actions = actions, ActionsUrl = actionsUrl};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="actions"> The JSON string that specifies the actions that instruct the Assistant on how to perform the
-        ///               task </param>
-        /// <param name="actionsUrl"> The URL from which the Assistant can fetch actions </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> UpdateAsync(string pathAssistantSid,
-                                                                                  string pathSid,
-                                                                                  string friendlyName = null,
-                                                                                  string uniqueName = null,
-                                                                                  object actions = null,
-                                                                                  Uri actionsUrl = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskOptions(pathAssistantSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Actions = actions, ActionsUrl = actionsUrl};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static bool Delete(DeleteTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTaskOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteTaskOptions(pathAssistantSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteTaskOptions(pathAssistantSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TaskResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TaskResource object represented by the provided JSON </returns>
-        public static TaskResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TaskResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A list of the URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The URL from which the Assistant can fetch actions
-        /// </summary>
-        [JsonProperty("actions_url")]
-        public Uri ActionsUrl { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Task resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private TaskResource()
-        {
-
-        }
-    }
+{
+
+  public class TaskResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Fetch(FetchTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> FetchAsync(FetchTaskOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskOptions(pathAssistantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> FetchAsync(string pathAssistantSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskOptions(pathAssistantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static ResourceSet<TaskResource> Read(ReadTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TaskResource>.FromJson("tasks", response.Content);
+      return new ResourceSet<TaskResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TaskResource>> ReadAsync(ReadTaskOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TaskResource>.FromJson("tasks", response.Content);
+      return new ResourceSet<TaskResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static ResourceSet<TaskResource> Read(string pathAssistantSid,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadTaskOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TaskResource>> ReadAsync(string pathAssistantSid,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadTaskOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TaskResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TaskResource>.FromJson("tasks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TaskResource> NextPage(Page<TaskResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<TaskResource>.FromJson("tasks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TaskResource> PreviousPage(Page<TaskResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<TaskResource>.FromJson("tasks", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Create(CreateTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> CreateAsync(CreateTaskOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="friendlyName">  descriptive string that you create to describe the new resource </param>
+    /// <param name="actions"> The JSON string that specifies the actions that instruct the Assistant on how to perform the
+    ///               task </param>
+    /// <param name="actionsUrl"> The URL from which the Assistant can fetch actions </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Create(string pathAssistantSid,
+                                      string uniqueName,
+                                      string friendlyName = null,
+                                      object actions = null,
+                                      Uri actionsUrl = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateTaskOptions(pathAssistantSid, uniqueName) { FriendlyName = friendlyName, Actions = actions, ActionsUrl = actionsUrl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="friendlyName">  descriptive string that you create to describe the new resource </param>
+    /// <param name="actions"> The JSON string that specifies the actions that instruct the Assistant on how to perform the
+    ///               task </param>
+    /// <param name="actionsUrl"> The URL from which the Assistant can fetch actions </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> CreateAsync(string pathAssistantSid,
+                                                                              string uniqueName,
+                                                                              string friendlyName = null,
+                                                                              object actions = null,
+                                                                              Uri actionsUrl = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateTaskOptions(pathAssistantSid, uniqueName) { FriendlyName = friendlyName, Actions = actions, ActionsUrl = actionsUrl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Update(UpdateTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> UpdateAsync(UpdateTaskOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="actions"> The JSON string that specifies the actions that instruct the Assistant on how to perform the
+    ///               task </param>
+    /// <param name="actionsUrl"> The URL from which the Assistant can fetch actions </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Update(string pathAssistantSid,
+                                      string pathSid,
+                                      string friendlyName = null,
+                                      string uniqueName = null,
+                                      object actions = null,
+                                      Uri actionsUrl = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskOptions(pathAssistantSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Actions = actions, ActionsUrl = actionsUrl };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="actions"> The JSON string that specifies the actions that instruct the Assistant on how to perform the
+    ///               task </param>
+    /// <param name="actionsUrl"> The URL from which the Assistant can fetch actions </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> UpdateAsync(string pathAssistantSid,
+                                                                              string pathSid,
+                                                                              string friendlyName = null,
+                                                                              string uniqueName = null,
+                                                                              object actions = null,
+                                                                              Uri actionsUrl = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskOptions(pathAssistantSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Actions = actions, ActionsUrl = actionsUrl };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static bool Delete(DeleteTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTaskOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteTaskOptions(pathAssistantSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteTaskOptions(pathAssistantSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TaskResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TaskResource object represented by the provided JSON </returns>
+    public static TaskResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TaskResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A list of the URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resource
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The URL from which the Assistant can fetch actions
+    /// </summary>
+    [JsonProperty("actions_url")]
+    public Uri ActionsUrl { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Task resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private TaskResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/WebhookOptions.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/WebhookOptions.cs
index 7809f806b..9bdc1176d 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/WebhookOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/WebhookOptions.cs
@@ -9,267 +9,267 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchWebhookOptions
+  /// </summary>
+  public class FetchWebhookOptions : IOptions<WebhookResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchWebhookOptions
+    /// The SID of the Assistant that is the parent of the resource to fetch
     /// </summary>
-    public class FetchWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource to fetch
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchWebhookOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        public FetchWebhookOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadWebhookOptions
+    /// The unique string that identifies the resource to fetch
     /// </summary>
-    public class ReadWebhookOptions : ReadOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resources to read
-        /// </summary>
-        public string PathAssistantSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadWebhookOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
-        public ReadWebhookOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateWebhookOptions
+    /// Construct a new FetchWebhookOptions
     /// </summary>
-    public class CreateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the new resource
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; }
-        /// <summary>
-        /// The list of space-separated events that this Webhook will subscribe to.
-        /// </summary>
-        public string Events { get; }
-        /// <summary>
-        /// The URL associated with this Webhook.
-        /// </summary>
-        public Uri WebhookUrl { get; }
-        /// <summary>
-        /// The method to be used when calling the webhook's URL.
-        /// </summary>
-        public string WebhookMethod { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateWebhookOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="events"> The list of space-separated events that this Webhook will subscribe to. </param>
-        /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
-        public CreateWebhookOptions(string pathAssistantSid, string uniqueName, string events, Uri webhookUrl)
-        {
-            PathAssistantSid = pathAssistantSid;
-            UniqueName = uniqueName;
-            Events = events;
-            WebhookUrl = webhookUrl;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Events != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Events", Events));
-            }
-
-            if (WebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
-            }
-
-            if (WebhookMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    public FetchWebhookOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateWebhookOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource to update
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The list of space-separated events that this Webhook will subscribe to.
-        /// </summary>
-        public string Events { get; set; }
-        /// <summary>
-        /// The URL associated with this Webhook.
-        /// </summary>
-        public Uri WebhookUrl { get; set; }
-        /// <summary>
-        /// The method to be used when calling the webhook's URL.
-        /// </summary>
-        public string WebhookMethod { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateWebhookOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateWebhookOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Events != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Events", Events));
-            }
-
-            if (WebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
-            }
-
-            if (WebhookMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadWebhookOptions
+  /// </summary>
+  public class ReadWebhookOptions : ReadOptions<WebhookResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteWebhookOptions
+    /// The SID of the Assistant that is the parent of the resources to read
     /// </summary>
-    public class DeleteWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resources to delete
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteWebhookOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
-        public DeleteWebhookOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathAssistantSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadWebhookOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
+    public ReadWebhookOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateWebhookOptions
+  /// </summary>
+  public class CreateWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the new resource
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; }
+    /// <summary>
+    /// The list of space-separated events that this Webhook will subscribe to.
+    /// </summary>
+    public string Events { get; }
+    /// <summary>
+    /// The URL associated with this Webhook.
+    /// </summary>
+    public Uri WebhookUrl { get; }
+    /// <summary>
+    /// The method to be used when calling the webhook's URL.
+    /// </summary>
+    public string WebhookMethod { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateWebhookOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="events"> The list of space-separated events that this Webhook will subscribe to. </param>
+    /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
+    public CreateWebhookOptions(string pathAssistantSid, string uniqueName, string events, Uri webhookUrl)
+    {
+      PathAssistantSid = pathAssistantSid;
+      UniqueName = uniqueName;
+      Events = events;
+      WebhookUrl = webhookUrl;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Events != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Events", Events));
+      }
+
+      if (WebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
+      }
+
+      if (WebhookMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateWebhookOptions
+  /// </summary>
+  public class UpdateWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resource to update
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The list of space-separated events that this Webhook will subscribe to.
+    /// </summary>
+    public string Events { get; set; }
+    /// <summary>
+    /// The URL associated with this Webhook.
+    /// </summary>
+    public Uri WebhookUrl { get; set; }
+    /// <summary>
+    /// The method to be used when calling the webhook's URL.
+    /// </summary>
+    public string WebhookMethod { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateWebhookOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateWebhookOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Events != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Events", Events));
+      }
+
+      if (WebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
+      }
+
+      if (WebhookMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteWebhookOptions
+  /// </summary>
+  public class DeleteWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resources to delete
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteWebhookOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
+    public DeleteWebhookOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/Assistant/WebhookResource.cs b/src/Twilio/Rest/Autopilot/V1/Assistant/WebhookResource.cs
index 02815fd2a..7f12c44ac 100644
--- a/src/Twilio/Rest/Autopilot/V1/Assistant/WebhookResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/Assistant/WebhookResource.cs
@@ -19,528 +19,528 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1.Assistant
-{
-
-    public class WebhookResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Webhooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathAssistantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathAssistantSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathAssistantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Webhooks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static ResourceSet<WebhookResource> Read(ReadWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
-            return new ResourceSet<WebhookResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(ReadWebhookOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
-            return new ResourceSet<WebhookResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static ResourceSet<WebhookResource> Read(string pathAssistantSid,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadWebhookOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(string pathAssistantSid,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadWebhookOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<WebhookResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<WebhookResource> NextPage(Page<WebhookResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<WebhookResource> PreviousPage(Page<WebhookResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Webhooks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Create(CreateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(CreateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="events"> The list of space-separated events that this Webhook will subscribe to. </param>
-        /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
-        /// <param name="webhookMethod"> The method to be used when calling the webhook's URL. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Create(string pathAssistantSid,
-                                             string uniqueName,
-                                             string events,
-                                             Uri webhookUrl,
-                                             string webhookMethod = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateWebhookOptions(pathAssistantSid, uniqueName, events, webhookUrl){WebhookMethod = webhookMethod};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="events"> The list of space-separated events that this Webhook will subscribe to. </param>
-        /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
-        /// <param name="webhookMethod"> The method to be used when calling the webhook's URL. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(string pathAssistantSid,
-                                                                                     string uniqueName,
-                                                                                     string events,
-                                                                                     Uri webhookUrl,
-                                                                                     string webhookMethod = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateWebhookOptions(pathAssistantSid, uniqueName, events, webhookUrl){WebhookMethod = webhookMethod};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Webhooks/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="events"> The list of space-separated events that this Webhook will subscribe to. </param>
-        /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
-        /// <param name="webhookMethod"> The method to be used when calling the webhook's URL. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(string pathAssistantSid,
-                                             string pathSid,
-                                             string uniqueName = null,
-                                             string events = null,
-                                             Uri webhookUrl = null,
-                                             string webhookMethod = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathAssistantSid, pathSid){UniqueName = uniqueName, Events = events, WebhookUrl = webhookUrl, WebhookMethod = webhookMethod};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="events"> The list of space-separated events that this Webhook will subscribe to. </param>
-        /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
-        /// <param name="webhookMethod"> The method to be used when calling the webhook's URL. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathAssistantSid,
-                                                                                     string pathSid,
-                                                                                     string uniqueName = null,
-                                                                                     string events = null,
-                                                                                     Uri webhookUrl = null,
-                                                                                     string webhookMethod = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathAssistantSid, pathSid){UniqueName = uniqueName, Events = events, WebhookUrl = webhookUrl, WebhookMethod = webhookMethod};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathAssistantSid + "/Webhooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static bool Delete(DeleteWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebhookOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebhookOptions(pathAssistantSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebhookOptions(pathAssistantSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WebhookResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WebhookResource object represented by the provided JSON </returns>
-        public static WebhookResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WebhookResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The absolute URL of the Webhook resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The SID of the Assistant that is the parent of the resource
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The list of space-separated events that this Webhook is subscribed to.
-        /// </summary>
-        [JsonProperty("events")]
-        public string Events { get; private set; }
-        /// <summary>
-        /// The URL associated with this Webhook.
-        /// </summary>
-        [JsonProperty("webhook_url")]
-        public Uri WebhookUrl { get; private set; }
-        /// <summary>
-        /// The method used when calling the webhook's URL.
-        /// </summary>
-        [JsonProperty("webhook_method")]
-        public string WebhookMethod { get; private set; }
-
-        private WebhookResource()
-        {
-
-        }
-    }
+{
+
+  public class WebhookResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Webhooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathAssistantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathAssistantSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathAssistantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Webhooks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static ResourceSet<WebhookResource> Read(ReadWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
+      return new ResourceSet<WebhookResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(ReadWebhookOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
+      return new ResourceSet<WebhookResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static ResourceSet<WebhookResource> Read(string pathAssistantSid,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadWebhookOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(string pathAssistantSid,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadWebhookOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<WebhookResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<WebhookResource> NextPage(Page<WebhookResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<WebhookResource> PreviousPage(Page<WebhookResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Webhooks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Create(CreateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(CreateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="events"> The list of space-separated events that this Webhook will subscribe to. </param>
+    /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
+    /// <param name="webhookMethod"> The method to be used when calling the webhook's URL. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Create(string pathAssistantSid,
+                                         string uniqueName,
+                                         string events,
+                                         Uri webhookUrl,
+                                         string webhookMethod = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateWebhookOptions(pathAssistantSid, uniqueName, events, webhookUrl) { WebhookMethod = webhookMethod };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the new resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="events"> The list of space-separated events that this Webhook will subscribe to. </param>
+    /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
+    /// <param name="webhookMethod"> The method to be used when calling the webhook's URL. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(string pathAssistantSid,
+                                                                                 string uniqueName,
+                                                                                 string events,
+                                                                                 Uri webhookUrl,
+                                                                                 string webhookMethod = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateWebhookOptions(pathAssistantSid, uniqueName, events, webhookUrl) { WebhookMethod = webhookMethod };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Webhooks/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="events"> The list of space-separated events that this Webhook will subscribe to. </param>
+    /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
+    /// <param name="webhookMethod"> The method to be used when calling the webhook's URL. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(string pathAssistantSid,
+                                         string pathSid,
+                                         string uniqueName = null,
+                                         string events = null,
+                                         Uri webhookUrl = null,
+                                         string webhookMethod = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathAssistantSid, pathSid) { UniqueName = uniqueName, Events = events, WebhookUrl = webhookUrl, WebhookMethod = webhookMethod };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="events"> The list of space-separated events that this Webhook will subscribe to. </param>
+    /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
+    /// <param name="webhookMethod"> The method to be used when calling the webhook's URL. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathAssistantSid,
+                                                                                 string pathSid,
+                                                                                 string uniqueName = null,
+                                                                                 string events = null,
+                                                                                 Uri webhookUrl = null,
+                                                                                 string webhookMethod = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathAssistantSid, pathSid) { UniqueName = uniqueName, Events = events, WebhookUrl = webhookUrl, WebhookMethod = webhookMethod };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathAssistantSid + "/Webhooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static bool Delete(DeleteWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebhookOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebhookOptions(pathAssistantSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The SID of the Assistant that is the parent of the resources to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebhookOptions(pathAssistantSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WebhookResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WebhookResource object represented by the provided JSON </returns>
+    public static WebhookResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WebhookResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The absolute URL of the Webhook resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The SID of the Assistant that is the parent of the resource
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The list of space-separated events that this Webhook is subscribed to.
+    /// </summary>
+    [JsonProperty("events")]
+    public string Events { get; private set; }
+    /// <summary>
+    /// The URL associated with this Webhook.
+    /// </summary>
+    [JsonProperty("webhook_url")]
+    public Uri WebhookUrl { get; private set; }
+    /// <summary>
+    /// The method used when calling the webhook's URL.
+    /// </summary>
+    [JsonProperty("webhook_method")]
+    public string WebhookMethod { get; private set; }
+
+    private WebhookResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/AssistantOptions.cs b/src/Twilio/Rest/Autopilot/V1/AssistantOptions.cs
index 77b5bcfc0..709dae5af 100644
--- a/src/Twilio/Rest/Autopilot/V1/AssistantOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/AssistantOptions.cs
@@ -9,279 +9,279 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchAssistantOptions
+  /// </summary>
+  public class FetchAssistantOptions : IOptions<AssistantResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchAssistantOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class FetchAssistantOptions : IOptions<AssistantResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAssistantOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchAssistantOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadAssistantOptions
+    /// Construct a new FetchAssistantOptions
     /// </summary>
-    public class ReadAssistantOptions : ReadOptions<AssistantResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchAssistantOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateAssistantOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateAssistantOptions : IOptions<AssistantResource>
-    {
-        /// <summary>
-        /// A string to describe the new resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Whether queries should be logged and kept after training
-        /// </summary>
-        public bool? LogQueries { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the new resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        public string CallbackEvents { get; set; }
-        /// <summary>
-        /// A JSON string that defines the Assistant's style sheet
-        /// </summary>
-        public object StyleSheet { get; set; }
-        /// <summary>
-        /// A JSON object that defines the Assistant's default tasks for various scenarios
-        /// </summary>
-        public object Defaults { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (LogQueries != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LogQueries", LogQueries.Value.ToString().ToLower()));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (CallbackEvents != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackEvents", CallbackEvents));
-            }
-
-            if (StyleSheet != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StyleSheet", Serializers.JsonObject(StyleSheet)));
-            }
-
-            if (Defaults != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Defaults", Serializers.JsonObject(Defaults)));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadAssistantOptions
+  /// </summary>
+  public class ReadAssistantOptions : ReadOptions<AssistantResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateAssistantOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateAssistantOptions : IOptions<AssistantResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Whether queries should be logged and kept after training
-        /// </summary>
-        public bool? LogQueries { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        public string CallbackEvents { get; set; }
-        /// <summary>
-        /// A JSON string that defines the Assistant's style sheet
-        /// </summary>
-        public object StyleSheet { get; set; }
-        /// <summary>
-        /// A JSON object that defines the Assistant's [default tasks](https://www.twilio.com/docs/autopilot/api/assistant/defaults) for various scenarios
-        /// </summary>
-        public object Defaults { get; set; }
-        /// <summary>
-        /// A string describing the state of the assistant.
-        /// </summary>
-        public string DevelopmentStage { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateAssistantOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateAssistantOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (LogQueries != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LogQueries", LogQueries.Value.ToString().ToLower()));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (CallbackEvents != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackEvents", CallbackEvents));
-            }
-
-            if (StyleSheet != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StyleSheet", Serializers.JsonObject(StyleSheet)));
-            }
-
-            if (Defaults != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Defaults", Serializers.JsonObject(Defaults)));
-            }
-
-            if (DevelopmentStage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DevelopmentStage", DevelopmentStage));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateAssistantOptions
+  /// </summary>
+  public class CreateAssistantOptions : IOptions<AssistantResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteAssistantOptions
+    /// A string to describe the new resource
     /// </summary>
-    public class DeleteAssistantOptions : IOptions<AssistantResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteAssistantOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteAssistantOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Whether queries should be logged and kept after training
+    /// </summary>
+    public bool? LogQueries { get; set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the new resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    public string CallbackEvents { get; set; }
+    /// <summary>
+    /// A JSON string that defines the Assistant's style sheet
+    /// </summary>
+    public object StyleSheet { get; set; }
+    /// <summary>
+    /// A JSON object that defines the Assistant's default tasks for various scenarios
+    /// </summary>
+    public object Defaults { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (LogQueries != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LogQueries", LogQueries.Value.ToString().ToLower()));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (CallbackEvents != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackEvents", CallbackEvents));
+      }
+
+      if (StyleSheet != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StyleSheet", Serializers.JsonObject(StyleSheet)));
+      }
+
+      if (Defaults != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Defaults", Serializers.JsonObject(Defaults)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateAssistantOptions
+  /// </summary>
+  public class UpdateAssistantOptions : IOptions<AssistantResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Whether queries should be logged and kept after training
+    /// </summary>
+    public bool? LogQueries { get; set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    public string CallbackEvents { get; set; }
+    /// <summary>
+    /// A JSON string that defines the Assistant's style sheet
+    /// </summary>
+    public object StyleSheet { get; set; }
+    /// <summary>
+    /// A JSON object that defines the Assistant's [default tasks](https://www.twilio.com/docs/autopilot/api/assistant/defaults) for various scenarios
+    /// </summary>
+    public object Defaults { get; set; }
+    /// <summary>
+    /// A string describing the state of the assistant.
+    /// </summary>
+    public string DevelopmentStage { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateAssistantOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateAssistantOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (LogQueries != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LogQueries", LogQueries.Value.ToString().ToLower()));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (CallbackEvents != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackEvents", CallbackEvents));
+      }
+
+      if (StyleSheet != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StyleSheet", Serializers.JsonObject(StyleSheet)));
+      }
+
+      if (Defaults != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Defaults", Serializers.JsonObject(Defaults)));
+      }
+
+      if (DevelopmentStage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DevelopmentStage", DevelopmentStage));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteAssistantOptions
+  /// </summary>
+  public class DeleteAssistantOptions : IOptions<AssistantResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteAssistantOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteAssistantOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/AssistantResource.cs b/src/Twilio/Rest/Autopilot/V1/AssistantResource.cs
index c1f01c945..2ce8a23cc 100644
--- a/src/Twilio/Rest/Autopilot/V1/AssistantResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/AssistantResource.cs
@@ -19,559 +19,559 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1
-{
-
-    public class AssistantResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchAssistantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static AssistantResource Fetch(FetchAssistantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<AssistantResource> FetchAsync(FetchAssistantOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static AssistantResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchAssistantOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<AssistantResource> FetchAsync(string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchAssistantOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAssistantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static ResourceSet<AssistantResource> Read(ReadAssistantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AssistantResource>.FromJson("assistants", response.Content);
-            return new ResourceSet<AssistantResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AssistantResource>> ReadAsync(ReadAssistantOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AssistantResource>.FromJson("assistants", response.Content);
-            return new ResourceSet<AssistantResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static ResourceSet<AssistantResource> Read(int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadAssistantOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AssistantResource>> ReadAsync(int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadAssistantOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AssistantResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AssistantResource>.FromJson("assistants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AssistantResource> NextPage(Page<AssistantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<AssistantResource>.FromJson("assistants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AssistantResource> PreviousPage(Page<AssistantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Autopilot)
-            );
-
-            var response = client.Request(request);
-            return Page<AssistantResource>.FromJson("assistants", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateAssistantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static AssistantResource Create(CreateAssistantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<AssistantResource> CreateAsync(CreateAssistantOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="logQueries"> Whether queries should be logged and kept after training </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
-        /// <param name="callbackUrl"> Reserved </param>
-        /// <param name="callbackEvents"> Reserved </param>
-        /// <param name="styleSheet"> A JSON string that defines the Assistant's style sheet </param>
-        /// <param name="defaults"> A JSON object that defines the Assistant's default tasks for various scenarios </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static AssistantResource Create(string friendlyName = null,
-                                               bool? logQueries = null,
-                                               string uniqueName = null,
-                                               Uri callbackUrl = null,
-                                               string callbackEvents = null,
-                                               object styleSheet = null,
-                                               object defaults = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateAssistantOptions(){FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, StyleSheet = styleSheet, Defaults = defaults};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="logQueries"> Whether queries should be logged and kept after training </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
-        /// <param name="callbackUrl"> Reserved </param>
-        /// <param name="callbackEvents"> Reserved </param>
-        /// <param name="styleSheet"> A JSON string that defines the Assistant's style sheet </param>
-        /// <param name="defaults"> A JSON object that defines the Assistant's default tasks for various scenarios </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<AssistantResource> CreateAsync(string friendlyName = null,
-                                                                                       bool? logQueries = null,
-                                                                                       string uniqueName = null,
-                                                                                       Uri callbackUrl = null,
-                                                                                       string callbackEvents = null,
-                                                                                       object styleSheet = null,
-                                                                                       object defaults = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateAssistantOptions(){FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, StyleSheet = styleSheet, Defaults = defaults};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateAssistantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static AssistantResource Update(UpdateAssistantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<AssistantResource> UpdateAsync(UpdateAssistantOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="logQueries"> Whether queries should be logged and kept after training </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="callbackUrl"> Reserved </param>
-        /// <param name="callbackEvents"> Reserved </param>
-        /// <param name="styleSheet"> A JSON string that defines the Assistant's style sheet </param>
-        /// <param name="defaults"> A JSON object that defines the Assistant's [default
-        ///                tasks](https://www.twilio.com/docs/autopilot/api/assistant/defaults) for various scenarios </param>
-        /// <param name="developmentStage"> A string describing the state of the assistant. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static AssistantResource Update(string pathSid,
-                                               string friendlyName = null,
-                                               bool? logQueries = null,
-                                               string uniqueName = null,
-                                               Uri callbackUrl = null,
-                                               string callbackEvents = null,
-                                               object styleSheet = null,
-                                               object defaults = null,
-                                               string developmentStage = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateAssistantOptions(pathSid){FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, StyleSheet = styleSheet, Defaults = defaults, DevelopmentStage = developmentStage};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="logQueries"> Whether queries should be logged and kept after training </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="callbackUrl"> Reserved </param>
-        /// <param name="callbackEvents"> Reserved </param>
-        /// <param name="styleSheet"> A JSON string that defines the Assistant's style sheet </param>
-        /// <param name="defaults"> A JSON object that defines the Assistant's [default
-        ///                tasks](https://www.twilio.com/docs/autopilot/api/assistant/defaults) for various scenarios </param>
-        /// <param name="developmentStage"> A string describing the state of the assistant. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<AssistantResource> UpdateAsync(string pathSid,
-                                                                                       string friendlyName = null,
-                                                                                       bool? logQueries = null,
-                                                                                       string uniqueName = null,
-                                                                                       Uri callbackUrl = null,
-                                                                                       string callbackEvents = null,
-                                                                                       object styleSheet = null,
-                                                                                       object defaults = null,
-                                                                                       string developmentStage = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateAssistantOptions(pathSid){FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, StyleSheet = styleSheet, Defaults = defaults, DevelopmentStage = developmentStage};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteAssistantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static bool Delete(DeleteAssistantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAssistantOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteAssistantOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteAssistantOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AssistantResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AssistantResource object represented by the provided JSON </returns>
-        public static AssistantResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AssistantResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        [JsonProperty("latest_model_build_sid")]
-        public string LatestModelBuildSid { get; private set; }
-        /// <summary>
-        /// A list of the URLs of the Assistant's related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// Whether queries should be logged and kept after training
-        /// </summary>
-        [JsonProperty("log_queries")]
-        public bool? LogQueries { get; private set; }
-        /// <summary>
-        /// A string describing the state of the assistant.
-        /// </summary>
-        [JsonProperty("development_stage")]
-        public string DevelopmentStage { get; private set; }
-        /// <summary>
-        /// Whether model needs to be rebuilt
-        /// </summary>
-        [JsonProperty("needs_model_build")]
-        public bool? NeedsModelBuild { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Assistant resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        [JsonProperty("callback_url")]
-        public Uri CallbackUrl { get; private set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        [JsonProperty("callback_events")]
-        public string CallbackEvents { get; private set; }
-
-        private AssistantResource()
-        {
-
-        }
-    }
+{
+
+  public class AssistantResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchAssistantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static AssistantResource Fetch(FetchAssistantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<AssistantResource> FetchAsync(FetchAssistantOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static AssistantResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchAssistantOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<AssistantResource> FetchAsync(string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchAssistantOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAssistantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static ResourceSet<AssistantResource> Read(ReadAssistantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AssistantResource>.FromJson("assistants", response.Content);
+      return new ResourceSet<AssistantResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AssistantResource>> ReadAsync(ReadAssistantOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AssistantResource>.FromJson("assistants", response.Content);
+      return new ResourceSet<AssistantResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static ResourceSet<AssistantResource> Read(int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadAssistantOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AssistantResource>> ReadAsync(int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadAssistantOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AssistantResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AssistantResource>.FromJson("assistants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AssistantResource> NextPage(Page<AssistantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<AssistantResource>.FromJson("assistants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AssistantResource> PreviousPage(Page<AssistantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Autopilot)
+      );
+
+      var response = client.Request(request);
+      return Page<AssistantResource>.FromJson("assistants", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateAssistantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static AssistantResource Create(CreateAssistantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<AssistantResource> CreateAsync(CreateAssistantOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="logQueries"> Whether queries should be logged and kept after training </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
+    /// <param name="callbackUrl"> Reserved </param>
+    /// <param name="callbackEvents"> Reserved </param>
+    /// <param name="styleSheet"> A JSON string that defines the Assistant's style sheet </param>
+    /// <param name="defaults"> A JSON object that defines the Assistant's default tasks for various scenarios </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static AssistantResource Create(string friendlyName = null,
+                                           bool? logQueries = null,
+                                           string uniqueName = null,
+                                           Uri callbackUrl = null,
+                                           string callbackEvents = null,
+                                           object styleSheet = null,
+                                           object defaults = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateAssistantOptions() { FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, StyleSheet = styleSheet, Defaults = defaults };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="logQueries"> Whether queries should be logged and kept after training </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the new resource </param>
+    /// <param name="callbackUrl"> Reserved </param>
+    /// <param name="callbackEvents"> Reserved </param>
+    /// <param name="styleSheet"> A JSON string that defines the Assistant's style sheet </param>
+    /// <param name="defaults"> A JSON object that defines the Assistant's default tasks for various scenarios </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<AssistantResource> CreateAsync(string friendlyName = null,
+                                                                                   bool? logQueries = null,
+                                                                                   string uniqueName = null,
+                                                                                   Uri callbackUrl = null,
+                                                                                   string callbackEvents = null,
+                                                                                   object styleSheet = null,
+                                                                                   object defaults = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateAssistantOptions() { FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, StyleSheet = styleSheet, Defaults = defaults };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateAssistantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static AssistantResource Update(UpdateAssistantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<AssistantResource> UpdateAsync(UpdateAssistantOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="logQueries"> Whether queries should be logged and kept after training </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="callbackUrl"> Reserved </param>
+    /// <param name="callbackEvents"> Reserved </param>
+    /// <param name="styleSheet"> A JSON string that defines the Assistant's style sheet </param>
+    /// <param name="defaults"> A JSON object that defines the Assistant's [default
+    ///                tasks](https://www.twilio.com/docs/autopilot/api/assistant/defaults) for various scenarios </param>
+    /// <param name="developmentStage"> A string describing the state of the assistant. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static AssistantResource Update(string pathSid,
+                                           string friendlyName = null,
+                                           bool? logQueries = null,
+                                           string uniqueName = null,
+                                           Uri callbackUrl = null,
+                                           string callbackEvents = null,
+                                           object styleSheet = null,
+                                           object defaults = null,
+                                           string developmentStage = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateAssistantOptions(pathSid) { FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, StyleSheet = styleSheet, Defaults = defaults, DevelopmentStage = developmentStage };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="logQueries"> Whether queries should be logged and kept after training </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="callbackUrl"> Reserved </param>
+    /// <param name="callbackEvents"> Reserved </param>
+    /// <param name="styleSheet"> A JSON string that defines the Assistant's style sheet </param>
+    /// <param name="defaults"> A JSON object that defines the Assistant's [default
+    ///                tasks](https://www.twilio.com/docs/autopilot/api/assistant/defaults) for various scenarios </param>
+    /// <param name="developmentStage"> A string describing the state of the assistant. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<AssistantResource> UpdateAsync(string pathSid,
+                                                                                   string friendlyName = null,
+                                                                                   bool? logQueries = null,
+                                                                                   string uniqueName = null,
+                                                                                   Uri callbackUrl = null,
+                                                                                   string callbackEvents = null,
+                                                                                   object styleSheet = null,
+                                                                                   object defaults = null,
+                                                                                   string developmentStage = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateAssistantOptions(pathSid) { FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, StyleSheet = styleSheet, Defaults = defaults, DevelopmentStage = developmentStage };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteAssistantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static bool Delete(DeleteAssistantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAssistantOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteAssistantOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteAssistantOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AssistantResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AssistantResource object represented by the provided JSON </returns>
+    public static AssistantResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AssistantResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    [JsonProperty("latest_model_build_sid")]
+    public string LatestModelBuildSid { get; private set; }
+    /// <summary>
+    /// A list of the URLs of the Assistant's related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// Whether queries should be logged and kept after training
+    /// </summary>
+    [JsonProperty("log_queries")]
+    public bool? LogQueries { get; private set; }
+    /// <summary>
+    /// A string describing the state of the assistant.
+    /// </summary>
+    [JsonProperty("development_stage")]
+    public string DevelopmentStage { get; private set; }
+    /// <summary>
+    /// Whether model needs to be rebuilt
+    /// </summary>
+    [JsonProperty("needs_model_build")]
+    public bool? NeedsModelBuild { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Assistant resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    [JsonProperty("callback_url")]
+    public Uri CallbackUrl { get; private set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    [JsonProperty("callback_events")]
+    public string CallbackEvents { get; private set; }
+
+    private AssistantResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/RestoreAssistantOptions.cs b/src/Twilio/Rest/Autopilot/V1/RestoreAssistantOptions.cs
index 99b6ec970..b40f78254 100644
--- a/src/Twilio/Rest/Autopilot/V1/RestoreAssistantOptions.cs
+++ b/src/Twilio/Rest/Autopilot/V1/RestoreAssistantOptions.cs
@@ -9,43 +9,43 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Autopilot.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateRestoreAssistantOptions
+  /// </summary>
+  public class UpdateRestoreAssistantOptions : IOptions<RestoreAssistantResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateRestoreAssistantOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class UpdateRestoreAssistantOptions : IOptions<RestoreAssistantResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string Assistant { get; }
-
-        /// <summary>
-        /// Construct a new UpdateRestoreAssistantOptions
-        /// </summary>
-        /// <param name="assistant"> The unique string that identifies the resource </param>
-        public UpdateRestoreAssistantOptions(string assistant)
-        {
-            Assistant = assistant;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Assistant != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Assistant", Assistant.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string Assistant { get; }
+
+    /// <summary>
+    /// Construct a new UpdateRestoreAssistantOptions
+    /// </summary>
+    /// <param name="assistant"> The unique string that identifies the resource </param>
+    public UpdateRestoreAssistantOptions(string assistant)
+    {
+      Assistant = assistant;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Assistant != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Assistant", Assistant.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Autopilot/V1/RestoreAssistantResource.cs b/src/Twilio/Rest/Autopilot/V1/RestoreAssistantResource.cs
index 731345f82..a4addfa28 100644
--- a/src/Twilio/Rest/Autopilot/V1/RestoreAssistantResource.cs
+++ b/src/Twilio/Rest/Autopilot/V1/RestoreAssistantResource.cs
@@ -19,160 +19,160 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Autopilot.V1
-{
-
-    public class RestoreAssistantResource : Resource
-    {
-        private static Request BuildUpdateRequest(UpdateRestoreAssistantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Autopilot,
-                "/v1/Assistants/Restore",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update RestoreAssistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RestoreAssistant </returns>
-        public static RestoreAssistantResource Update(UpdateRestoreAssistantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update RestoreAssistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RestoreAssistant </returns>
-        public static async System.Threading.Tasks.Task<RestoreAssistantResource> UpdateAsync(UpdateRestoreAssistantOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="assistant"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RestoreAssistant </returns>
-        public static RestoreAssistantResource Update(string assistant, ITwilioRestClient client = null)
-        {
-            var options = new UpdateRestoreAssistantOptions(assistant);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="assistant"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RestoreAssistant </returns>
-        public static async System.Threading.Tasks.Task<RestoreAssistantResource> UpdateAsync(string assistant,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateRestoreAssistantOptions(assistant);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RestoreAssistantResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RestoreAssistantResource object represented by the provided JSON </returns>
-        public static RestoreAssistantResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RestoreAssistantResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// Whether model needs to be rebuilt
-        /// </summary>
-        [JsonProperty("needs_model_build")]
-        public bool? NeedsModelBuild { get; private set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        [JsonProperty("latest_model_build_sid")]
-        public string LatestModelBuildSid { get; private set; }
-        /// <summary>
-        /// Whether queries should be logged and kept after training
-        /// </summary>
-        [JsonProperty("log_queries")]
-        public bool? LogQueries { get; private set; }
-        /// <summary>
-        /// A string describing the state of the assistant.
-        /// </summary>
-        [JsonProperty("development_stage")]
-        public string DevelopmentStage { get; private set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        [JsonProperty("callback_url")]
-        public Uri CallbackUrl { get; private set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        [JsonProperty("callback_events")]
-        public string CallbackEvents { get; private set; }
-
-        private RestoreAssistantResource()
-        {
-
-        }
-    }
+{
+
+  public class RestoreAssistantResource : Resource
+  {
+    private static Request BuildUpdateRequest(UpdateRestoreAssistantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Autopilot,
+          "/v1/Assistants/Restore",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update RestoreAssistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RestoreAssistant </returns>
+    public static RestoreAssistantResource Update(UpdateRestoreAssistantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update RestoreAssistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RestoreAssistant </returns>
+    public static async System.Threading.Tasks.Task<RestoreAssistantResource> UpdateAsync(UpdateRestoreAssistantOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="assistant"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RestoreAssistant </returns>
+    public static RestoreAssistantResource Update(string assistant, ITwilioRestClient client = null)
+    {
+      var options = new UpdateRestoreAssistantOptions(assistant);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="assistant"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RestoreAssistant </returns>
+    public static async System.Threading.Tasks.Task<RestoreAssistantResource> UpdateAsync(string assistant,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateRestoreAssistantOptions(assistant);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RestoreAssistantResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RestoreAssistantResource object represented by the provided JSON </returns>
+    public static RestoreAssistantResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RestoreAssistantResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// Whether model needs to be rebuilt
+    /// </summary>
+    [JsonProperty("needs_model_build")]
+    public bool? NeedsModelBuild { get; private set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    [JsonProperty("latest_model_build_sid")]
+    public string LatestModelBuildSid { get; private set; }
+    /// <summary>
+    /// Whether queries should be logged and kept after training
+    /// </summary>
+    [JsonProperty("log_queries")]
+    public bool? LogQueries { get; private set; }
+    /// <summary>
+    /// A string describing the state of the assistant.
+    /// </summary>
+    [JsonProperty("development_stage")]
+    public string DevelopmentStage { get; private set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    [JsonProperty("callback_url")]
+    public Uri CallbackUrl { get; private set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    [JsonProperty("callback_events")]
+    public string CallbackEvents { get; private set; }
+
+    private RestoreAssistantResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Bulkexports/V1/Export/DayOptions.cs b/src/Twilio/Rest/Bulkexports/V1/Export/DayOptions.cs
index e01c83880..5e169935d 100644
--- a/src/Twilio/Rest/Bulkexports/V1/Export/DayOptions.cs
+++ b/src/Twilio/Rest/Bulkexports/V1/Export/DayOptions.cs
@@ -9,75 +9,75 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Bulkexports.V1.Export
-{
-
+{
+
+  /// <summary>
+  /// Fetch a specific Day.
+  /// </summary>
+  public class FetchDayOptions : IOptions<DayResource>
+  {
     /// <summary>
-    /// Fetch a specific Day.
+    /// The type of communication – Messages, Calls, Conferences, and Participants
     /// </summary>
-    public class FetchDayOptions : IOptions<DayResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-        /// <summary>
-        /// The date of the data in the file
-        /// </summary>
-        public string PathDay { get; }
-
-        /// <summary>
-        /// Construct a new FetchDayOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pathDay"> The date of the data in the file </param>
-        public FetchDayOptions(string pathResourceType, string pathDay)
-        {
-            PathResourceType = pathResourceType;
-            PathDay = pathDay;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathResourceType { get; }
     /// <summary>
-    /// Retrieve a list of all Days for a resource.
+    /// The date of the data in the file
     /// </summary>
-    public class ReadDayOptions : ReadOptions<DayResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-
-        /// <summary>
-        /// Construct a new ReadDayOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        public ReadDayOptions(string pathResourceType)
-        {
-            PathResourceType = pathResourceType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathDay { get; }
+
+    /// <summary>
+    /// Construct a new FetchDayOptions
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pathDay"> The date of the data in the file </param>
+    public FetchDayOptions(string pathResourceType, string pathDay)
+    {
+      PathResourceType = pathResourceType;
+      PathDay = pathDay;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Days for a resource.
+  /// </summary>
+  public class ReadDayOptions : ReadOptions<DayResource>
+  {
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    public string PathResourceType { get; }
+
+    /// <summary>
+    /// Construct a new ReadDayOptions
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    public ReadDayOptions(string pathResourceType)
+    {
+      PathResourceType = pathResourceType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Bulkexports/V1/Export/DayResource.cs b/src/Twilio/Rest/Bulkexports/V1/Export/DayResource.cs
index f67ef1328..a5c7354f1 100644
--- a/src/Twilio/Rest/Bulkexports/V1/Export/DayResource.cs
+++ b/src/Twilio/Rest/Bulkexports/V1/Export/DayResource.cs
@@ -16,266 +16,266 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Bulkexports.V1.Export
-{
-
-    public class DayResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchDayOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Bulkexports,
-                "/v1/Exports/" + options.PathResourceType + "/Days/" + options.PathDay + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Day.
-        /// </summary>
-        /// <param name="options"> Fetch Day parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Day </returns>
-        public static DayResource Fetch(FetchDayOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Day.
-        /// </summary>
-        /// <param name="options"> Fetch Day parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Day </returns>
-        public static async System.Threading.Tasks.Task<DayResource> FetchAsync(FetchDayOptions options,
-                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Day.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pathDay"> The date of the data in the file </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Day </returns>
-        public static DayResource Fetch(string pathResourceType, string pathDay, ITwilioRestClient client = null)
-        {
-            var options = new FetchDayOptions(pathResourceType, pathDay);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Day.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pathDay"> The date of the data in the file </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Day </returns>
-        public static async System.Threading.Tasks.Task<DayResource> FetchAsync(string pathResourceType,
-                                                                                string pathDay,
-                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchDayOptions(pathResourceType, pathDay);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadDayOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Bulkexports,
-                "/v1/Exports/" + options.PathResourceType + "/Days",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Days for a resource.
-        /// </summary>
-        /// <param name="options"> Read Day parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Day </returns>
-        public static ResourceSet<DayResource> Read(ReadDayOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DayResource>.FromJson("days", response.Content);
-            return new ResourceSet<DayResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Days for a resource.
-        /// </summary>
-        /// <param name="options"> Read Day parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Day </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DayResource>> ReadAsync(ReadDayOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DayResource>.FromJson("days", response.Content);
-            return new ResourceSet<DayResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Days for a resource.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Day </returns>
-        public static ResourceSet<DayResource> Read(string pathResourceType,
-                                                    int? pageSize = null,
-                                                    long? limit = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadDayOptions(pathResourceType){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Days for a resource.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Day </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DayResource>> ReadAsync(string pathResourceType,
-                                                                                            int? pageSize = null,
-                                                                                            long? limit = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadDayOptions(pathResourceType){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DayResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DayResource>.FromJson("days", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DayResource> NextPage(Page<DayResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Bulkexports)
-            );
-
-            var response = client.Request(request);
-            return Page<DayResource>.FromJson("days", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DayResource> PreviousPage(Page<DayResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Bulkexports)
-            );
-
-            var response = client.Request(request);
-            return Page<DayResource>.FromJson("days", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a DayResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DayResource object represented by the provided JSON </returns>
-        public static DayResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DayResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The redirect_to
-        /// </summary>
-        [JsonProperty("redirect_to")]
-        public Uri RedirectTo { get; private set; }
-        /// <summary>
-        /// The date of the data in the file
-        /// </summary>
-        [JsonProperty("day")]
-        public string Day { get; private set; }
-        /// <summary>
-        /// Size of the file in bytes
-        /// </summary>
-        [JsonProperty("size")]
-        public int? Size { get; private set; }
-        /// <summary>
-        /// The date when resource is created
-        /// </summary>
-        [JsonProperty("create_date")]
-        public string CreateDate { get; private set; }
-        /// <summary>
-        /// The friendly name specified when creating the job
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        [JsonProperty("resource_type")]
-        public string ResourceType { get; private set; }
-
-        private DayResource()
-        {
-
-        }
-    }
+{
+
+  public class DayResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchDayOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Bulkexports,
+          "/v1/Exports/" + options.PathResourceType + "/Days/" + options.PathDay + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Day.
+    /// </summary>
+    /// <param name="options"> Fetch Day parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Day </returns>
+    public static DayResource Fetch(FetchDayOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Day.
+    /// </summary>
+    /// <param name="options"> Fetch Day parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Day </returns>
+    public static async System.Threading.Tasks.Task<DayResource> FetchAsync(FetchDayOptions options,
+                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Day.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pathDay"> The date of the data in the file </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Day </returns>
+    public static DayResource Fetch(string pathResourceType, string pathDay, ITwilioRestClient client = null)
+    {
+      var options = new FetchDayOptions(pathResourceType, pathDay);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Day.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pathDay"> The date of the data in the file </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Day </returns>
+    public static async System.Threading.Tasks.Task<DayResource> FetchAsync(string pathResourceType,
+                                                                            string pathDay,
+                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchDayOptions(pathResourceType, pathDay);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadDayOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Bulkexports,
+          "/v1/Exports/" + options.PathResourceType + "/Days",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Days for a resource.
+    /// </summary>
+    /// <param name="options"> Read Day parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Day </returns>
+    public static ResourceSet<DayResource> Read(ReadDayOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DayResource>.FromJson("days", response.Content);
+      return new ResourceSet<DayResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Days for a resource.
+    /// </summary>
+    /// <param name="options"> Read Day parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Day </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DayResource>> ReadAsync(ReadDayOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DayResource>.FromJson("days", response.Content);
+      return new ResourceSet<DayResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Days for a resource.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Day </returns>
+    public static ResourceSet<DayResource> Read(string pathResourceType,
+                                                int? pageSize = null,
+                                                long? limit = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadDayOptions(pathResourceType) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Days for a resource.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Day </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DayResource>> ReadAsync(string pathResourceType,
+                                                                                        int? pageSize = null,
+                                                                                        long? limit = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadDayOptions(pathResourceType) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DayResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DayResource>.FromJson("days", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DayResource> NextPage(Page<DayResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Bulkexports)
+      );
+
+      var response = client.Request(request);
+      return Page<DayResource>.FromJson("days", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DayResource> PreviousPage(Page<DayResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Bulkexports)
+      );
+
+      var response = client.Request(request);
+      return Page<DayResource>.FromJson("days", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a DayResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DayResource object represented by the provided JSON </returns>
+    public static DayResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DayResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The redirect_to
+    /// </summary>
+    [JsonProperty("redirect_to")]
+    public Uri RedirectTo { get; private set; }
+    /// <summary>
+    /// The date of the data in the file
+    /// </summary>
+    [JsonProperty("day")]
+    public string Day { get; private set; }
+    /// <summary>
+    /// Size of the file in bytes
+    /// </summary>
+    [JsonProperty("size")]
+    public int? Size { get; private set; }
+    /// <summary>
+    /// The date when resource is created
+    /// </summary>
+    [JsonProperty("create_date")]
+    public string CreateDate { get; private set; }
+    /// <summary>
+    /// The friendly name specified when creating the job
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    [JsonProperty("resource_type")]
+    public string ResourceType { get; private set; }
+
+    private DayResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Bulkexports/V1/Export/ExportCustomJobOptions.cs b/src/Twilio/Rest/Bulkexports/V1/Export/ExportCustomJobOptions.cs
index b167c877d..db09b23d2 100644
--- a/src/Twilio/Rest/Bulkexports/V1/Export/ExportCustomJobOptions.cs
+++ b/src/Twilio/Rest/Bulkexports/V1/Export/ExportCustomJobOptions.cs
@@ -9,132 +9,132 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Bulkexports.V1.Export
-{
-
+{
+
+  /// <summary>
+  /// ReadExportCustomJobOptions
+  /// </summary>
+  public class ReadExportCustomJobOptions : ReadOptions<ExportCustomJobResource>
+  {
     /// <summary>
-    /// ReadExportCustomJobOptions
+    /// The type of communication – Messages, Calls, Conferences, and Participants
     /// </summary>
-    public class ReadExportCustomJobOptions : ReadOptions<ExportCustomJobResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-
-        /// <summary>
-        /// Construct a new ReadExportCustomJobOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        public ReadExportCustomJobOptions(string pathResourceType)
-        {
-            PathResourceType = pathResourceType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathResourceType { get; }
+
     /// <summary>
-    /// CreateExportCustomJobOptions
+    /// Construct a new ReadExportCustomJobOptions
     /// </summary>
-    public class CreateExportCustomJobOptions : IOptions<ExportCustomJobResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages or Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-        /// <summary>
-        /// The start day for the custom export specified as a string in the format of yyyy-mm-dd
-        /// </summary>
-        public string StartDay { get; }
-        /// <summary>
-        /// The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day is inclusive and must be 2 days earlier than the current UTC day.
-        /// </summary>
-        public string EndDay { get; }
-        /// <summary>
-        /// The friendly name specified when creating the job
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The optional webhook url called on completion of the job. If this is supplied, `WebhookMethod` must also be supplied.
-        /// </summary>
-        public string WebhookUrl { get; set; }
-        /// <summary>
-        /// This is the method used to call the webhook on completion of the job. If this is supplied, `WebhookUrl` must also be supplied.
-        /// </summary>
-        public string WebhookMethod { get; set; }
-        /// <summary>
-        /// The optional email to send the completion notification to
-        /// </summary>
-        public string Email { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateExportCustomJobOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages or Calls, Conferences, and Participants
-        ///                        </param>
-        /// <param name="startDay"> The start day for the custom export specified as a string in the format of yyyy-mm-dd
-        ///                </param>
-        /// <param name="endDay"> The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day
-        ///              is inclusive and must be 2 days earlier than the current UTC day. </param>
-        /// <param name="friendlyName"> The friendly name specified when creating the job </param>
-        public CreateExportCustomJobOptions(string pathResourceType, string startDay, string endDay, string friendlyName)
-        {
-            PathResourceType = pathResourceType;
-            StartDay = startDay;
-            EndDay = endDay;
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (StartDay != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDay", StartDay));
-            }
-
-            if (EndDay != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDay", EndDay));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (WebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookUrl", WebhookUrl));
-            }
-
-            if (WebhookMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod));
-            }
-
-            if (Email != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Email", Email));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    public ReadExportCustomJobOptions(string pathResourceType)
+    {
+      PathResourceType = pathResourceType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateExportCustomJobOptions
+  /// </summary>
+  public class CreateExportCustomJobOptions : IOptions<ExportCustomJobResource>
+  {
+    /// <summary>
+    /// The type of communication – Messages or Calls, Conferences, and Participants
+    /// </summary>
+    public string PathResourceType { get; }
+    /// <summary>
+    /// The start day for the custom export specified as a string in the format of yyyy-mm-dd
+    /// </summary>
+    public string StartDay { get; }
+    /// <summary>
+    /// The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day is inclusive and must be 2 days earlier than the current UTC day.
+    /// </summary>
+    public string EndDay { get; }
+    /// <summary>
+    /// The friendly name specified when creating the job
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The optional webhook url called on completion of the job. If this is supplied, `WebhookMethod` must also be supplied.
+    /// </summary>
+    public string WebhookUrl { get; set; }
+    /// <summary>
+    /// This is the method used to call the webhook on completion of the job. If this is supplied, `WebhookUrl` must also be supplied.
+    /// </summary>
+    public string WebhookMethod { get; set; }
+    /// <summary>
+    /// The optional email to send the completion notification to
+    /// </summary>
+    public string Email { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateExportCustomJobOptions
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages or Calls, Conferences, and Participants
+    ///                        </param>
+    /// <param name="startDay"> The start day for the custom export specified as a string in the format of yyyy-mm-dd
+    ///                </param>
+    /// <param name="endDay"> The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day
+    ///              is inclusive and must be 2 days earlier than the current UTC day. </param>
+    /// <param name="friendlyName"> The friendly name specified when creating the job </param>
+    public CreateExportCustomJobOptions(string pathResourceType, string startDay, string endDay, string friendlyName)
+    {
+      PathResourceType = pathResourceType;
+      StartDay = startDay;
+      EndDay = endDay;
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (StartDay != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDay", StartDay));
+      }
+
+      if (EndDay != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDay", EndDay));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (WebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookUrl", WebhookUrl));
+      }
+
+      if (WebhookMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod));
+      }
+
+      if (Email != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Email", Email));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Bulkexports/V1/Export/ExportCustomJobResource.cs b/src/Twilio/Rest/Bulkexports/V1/Export/ExportCustomJobResource.cs
index 580c7256b..4b16c406d 100644
--- a/src/Twilio/Rest/Bulkexports/V1/Export/ExportCustomJobResource.cs
+++ b/src/Twilio/Rest/Bulkexports/V1/Export/ExportCustomJobResource.cs
@@ -17,344 +17,344 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Bulkexports.V1.Export
-{
-
-    public class ExportCustomJobResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Errorduringrun = new StatusEnum("ErrorDuringRun");
-            public static readonly StatusEnum Submitted = new StatusEnum("Submitted");
-            public static readonly StatusEnum Running = new StatusEnum("Running");
-            public static readonly StatusEnum Completedemptyrecords = new StatusEnum("CompletedEmptyRecords");
-            public static readonly StatusEnum Completed = new StatusEnum("Completed");
-            public static readonly StatusEnum Failed = new StatusEnum("Failed");
-            public static readonly StatusEnum Runningtobedeleted = new StatusEnum("RunningToBeDeleted");
-            public static readonly StatusEnum Deletedbyuserrequest = new StatusEnum("DeletedByUserRequest");
-        }
-
-        private static Request BuildReadRequest(ReadExportCustomJobOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Bulkexports,
-                "/v1/Exports/" + options.PathResourceType + "/Jobs",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ExportCustomJob parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportCustomJob </returns>
-        public static ResourceSet<ExportCustomJobResource> Read(ReadExportCustomJobOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
-            return new ResourceSet<ExportCustomJobResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ExportCustomJob parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ExportCustomJobResource>> ReadAsync(ReadExportCustomJobOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
-            return new ResourceSet<ExportCustomJobResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportCustomJob </returns>
-        public static ResourceSet<ExportCustomJobResource> Read(string pathResourceType,
-                                                                int? pageSize = null,
-                                                                long? limit = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadExportCustomJobOptions(pathResourceType){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ExportCustomJobResource>> ReadAsync(string pathResourceType,
-                                                                                                        int? pageSize = null,
-                                                                                                        long? limit = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadExportCustomJobOptions(pathResourceType){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ExportCustomJobResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ExportCustomJobResource> NextPage(Page<ExportCustomJobResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Bulkexports)
-            );
-
-            var response = client.Request(request);
-            return Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ExportCustomJobResource> PreviousPage(Page<ExportCustomJobResource> page,
-                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Bulkexports)
-            );
-
-            var response = client.Request(request);
-            return Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateExportCustomJobOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Bulkexports,
-                "/v1/Exports/" + options.PathResourceType + "/Jobs",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ExportCustomJob parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportCustomJob </returns>
-        public static ExportCustomJobResource Create(CreateExportCustomJobOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ExportCustomJob parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
-        public static async System.Threading.Tasks.Task<ExportCustomJobResource> CreateAsync(CreateExportCustomJobOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages or Calls, Conferences, and Participants
-        ///                        </param>
-        /// <param name="startDay"> The start day for the custom export specified as a string in the format of yyyy-mm-dd
-        ///                </param>
-        /// <param name="endDay"> The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day
-        ///              is inclusive and must be 2 days earlier than the current UTC day. </param>
-        /// <param name="friendlyName"> The friendly name specified when creating the job </param>
-        /// <param name="webhookUrl"> The optional webhook url called on completion of the job. If this is supplied,
-        ///                  `WebhookMethod` must also be supplied. </param>
-        /// <param name="webhookMethod"> This is the method used to call the webhook on completion of the job. If this is
-        ///                     supplied, `WebhookUrl` must also be supplied. </param>
-        /// <param name="email"> The optional email to send the completion notification to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportCustomJob </returns>
-        public static ExportCustomJobResource Create(string pathResourceType,
-                                                     string startDay,
-                                                     string endDay,
-                                                     string friendlyName,
-                                                     string webhookUrl = null,
-                                                     string webhookMethod = null,
-                                                     string email = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateExportCustomJobOptions(pathResourceType, startDay, endDay, friendlyName){WebhookUrl = webhookUrl, WebhookMethod = webhookMethod, Email = email};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages or Calls, Conferences, and Participants
-        ///                        </param>
-        /// <param name="startDay"> The start day for the custom export specified as a string in the format of yyyy-mm-dd
-        ///                </param>
-        /// <param name="endDay"> The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day
-        ///              is inclusive and must be 2 days earlier than the current UTC day. </param>
-        /// <param name="friendlyName"> The friendly name specified when creating the job </param>
-        /// <param name="webhookUrl"> The optional webhook url called on completion of the job. If this is supplied,
-        ///                  `WebhookMethod` must also be supplied. </param>
-        /// <param name="webhookMethod"> This is the method used to call the webhook on completion of the job. If this is
-        ///                     supplied, `WebhookUrl` must also be supplied. </param>
-        /// <param name="email"> The optional email to send the completion notification to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
-        public static async System.Threading.Tasks.Task<ExportCustomJobResource> CreateAsync(string pathResourceType,
-                                                                                             string startDay,
-                                                                                             string endDay,
-                                                                                             string friendlyName,
-                                                                                             string webhookUrl = null,
-                                                                                             string webhookMethod = null,
-                                                                                             string email = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateExportCustomJobOptions(pathResourceType, startDay, endDay, friendlyName){WebhookUrl = webhookUrl, WebhookMethod = webhookMethod, Email = email};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExportCustomJobResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExportCustomJobResource object represented by the provided JSON </returns>
-        public static ExportCustomJobResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExportCustomJobResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The friendly name specified when creating the job
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        [JsonProperty("resource_type")]
-        public string ResourceType { get; private set; }
-        /// <summary>
-        /// The start day for the custom export specified as a string in the format of yyyy-MM-dd
-        /// </summary>
-        [JsonProperty("start_day")]
-        public string StartDay { get; private set; }
-        /// <summary>
-        /// The end day for the custom export specified as a string in the format of yyyy-MM-dd. This will be the last day exported. For instance, to export a single day, choose the same day for start and end day. To export the first 4 days of July, you would set the start date to 2020-07-01 and the end date to 2020-07-04. The end date must be the UTC day before yesterday.
-        /// </summary>
-        [JsonProperty("end_day")]
-        public string EndDay { get; private set; }
-        /// <summary>
-        /// The optional webhook url called on completion
-        /// </summary>
-        [JsonProperty("webhook_url")]
-        public string WebhookUrl { get; private set; }
-        /// <summary>
-        /// This is the method used to call the webhook
-        /// </summary>
-        [JsonProperty("webhook_method")]
-        public string WebhookMethod { get; private set; }
-        /// <summary>
-        /// The optional email to send the completion notification to
-        /// </summary>
-        [JsonProperty("email")]
-        public string Email { get; private set; }
-        /// <summary>
-        /// The unique job_sid returned when the custom export was created. This can be used to look up the status of the job.
-        /// </summary>
-        [JsonProperty("job_sid")]
-        public string JobSid { get; private set; }
-        /// <summary>
-        /// The details of a job state which is an object that contains a `status` string, a day count integer, and list of days in the job
-        /// </summary>
-        [JsonProperty("details")]
-        public object Details { get; private set; }
-        /// <summary>
-        /// This is the job position from the 1st in line. Your queue position will never increase. As jobs ahead of yours in the queue are processed, the queue position number will decrease
-        /// </summary>
-        [JsonProperty("job_queue_position")]
-        public string JobQueuePosition { get; private set; }
-        /// <summary>
-        /// this is the time estimated until your job is complete. This is calculated each time you request the job list. The time is calculated based on the current rate of job completion (which may vary) and your job queue position
-        /// </summary>
-        [JsonProperty("estimated_completion_time")]
-        public string EstimatedCompletionTime { get; private set; }
-
-        private ExportCustomJobResource()
-        {
-
-        }
-    }
+{
+
+  public class ExportCustomJobResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Errorduringrun = new StatusEnum("ErrorDuringRun");
+      public static readonly StatusEnum Submitted = new StatusEnum("Submitted");
+      public static readonly StatusEnum Running = new StatusEnum("Running");
+      public static readonly StatusEnum Completedemptyrecords = new StatusEnum("CompletedEmptyRecords");
+      public static readonly StatusEnum Completed = new StatusEnum("Completed");
+      public static readonly StatusEnum Failed = new StatusEnum("Failed");
+      public static readonly StatusEnum Runningtobedeleted = new StatusEnum("RunningToBeDeleted");
+      public static readonly StatusEnum Deletedbyuserrequest = new StatusEnum("DeletedByUserRequest");
+    }
+
+    private static Request BuildReadRequest(ReadExportCustomJobOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Bulkexports,
+          "/v1/Exports/" + options.PathResourceType + "/Jobs",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ExportCustomJob parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportCustomJob </returns>
+    public static ResourceSet<ExportCustomJobResource> Read(ReadExportCustomJobOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
+      return new ResourceSet<ExportCustomJobResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ExportCustomJob parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ExportCustomJobResource>> ReadAsync(ReadExportCustomJobOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
+      return new ResourceSet<ExportCustomJobResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportCustomJob </returns>
+    public static ResourceSet<ExportCustomJobResource> Read(string pathResourceType,
+                                                            int? pageSize = null,
+                                                            long? limit = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadExportCustomJobOptions(pathResourceType) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ExportCustomJobResource>> ReadAsync(string pathResourceType,
+                                                                                                    int? pageSize = null,
+                                                                                                    long? limit = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadExportCustomJobOptions(pathResourceType) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ExportCustomJobResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ExportCustomJobResource> NextPage(Page<ExportCustomJobResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Bulkexports)
+      );
+
+      var response = client.Request(request);
+      return Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ExportCustomJobResource> PreviousPage(Page<ExportCustomJobResource> page,
+                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Bulkexports)
+      );
+
+      var response = client.Request(request);
+      return Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateExportCustomJobOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Bulkexports,
+          "/v1/Exports/" + options.PathResourceType + "/Jobs",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ExportCustomJob parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportCustomJob </returns>
+    public static ExportCustomJobResource Create(CreateExportCustomJobOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ExportCustomJob parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
+    public static async System.Threading.Tasks.Task<ExportCustomJobResource> CreateAsync(CreateExportCustomJobOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages or Calls, Conferences, and Participants
+    ///                        </param>
+    /// <param name="startDay"> The start day for the custom export specified as a string in the format of yyyy-mm-dd
+    ///                </param>
+    /// <param name="endDay"> The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day
+    ///              is inclusive and must be 2 days earlier than the current UTC day. </param>
+    /// <param name="friendlyName"> The friendly name specified when creating the job </param>
+    /// <param name="webhookUrl"> The optional webhook url called on completion of the job. If this is supplied,
+    ///                  `WebhookMethod` must also be supplied. </param>
+    /// <param name="webhookMethod"> This is the method used to call the webhook on completion of the job. If this is
+    ///                     supplied, `WebhookUrl` must also be supplied. </param>
+    /// <param name="email"> The optional email to send the completion notification to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportCustomJob </returns>
+    public static ExportCustomJobResource Create(string pathResourceType,
+                                                 string startDay,
+                                                 string endDay,
+                                                 string friendlyName,
+                                                 string webhookUrl = null,
+                                                 string webhookMethod = null,
+                                                 string email = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateExportCustomJobOptions(pathResourceType, startDay, endDay, friendlyName) { WebhookUrl = webhookUrl, WebhookMethod = webhookMethod, Email = email };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages or Calls, Conferences, and Participants
+    ///                        </param>
+    /// <param name="startDay"> The start day for the custom export specified as a string in the format of yyyy-mm-dd
+    ///                </param>
+    /// <param name="endDay"> The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day
+    ///              is inclusive and must be 2 days earlier than the current UTC day. </param>
+    /// <param name="friendlyName"> The friendly name specified when creating the job </param>
+    /// <param name="webhookUrl"> The optional webhook url called on completion of the job. If this is supplied,
+    ///                  `WebhookMethod` must also be supplied. </param>
+    /// <param name="webhookMethod"> This is the method used to call the webhook on completion of the job. If this is
+    ///                     supplied, `WebhookUrl` must also be supplied. </param>
+    /// <param name="email"> The optional email to send the completion notification to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
+    public static async System.Threading.Tasks.Task<ExportCustomJobResource> CreateAsync(string pathResourceType,
+                                                                                         string startDay,
+                                                                                         string endDay,
+                                                                                         string friendlyName,
+                                                                                         string webhookUrl = null,
+                                                                                         string webhookMethod = null,
+                                                                                         string email = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateExportCustomJobOptions(pathResourceType, startDay, endDay, friendlyName) { WebhookUrl = webhookUrl, WebhookMethod = webhookMethod, Email = email };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExportCustomJobResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExportCustomJobResource object represented by the provided JSON </returns>
+    public static ExportCustomJobResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExportCustomJobResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The friendly name specified when creating the job
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    [JsonProperty("resource_type")]
+    public string ResourceType { get; private set; }
+    /// <summary>
+    /// The start day for the custom export specified as a string in the format of yyyy-MM-dd
+    /// </summary>
+    [JsonProperty("start_day")]
+    public string StartDay { get; private set; }
+    /// <summary>
+    /// The end day for the custom export specified as a string in the format of yyyy-MM-dd. This will be the last day exported. For instance, to export a single day, choose the same day for start and end day. To export the first 4 days of July, you would set the start date to 2020-07-01 and the end date to 2020-07-04. The end date must be the UTC day before yesterday.
+    /// </summary>
+    [JsonProperty("end_day")]
+    public string EndDay { get; private set; }
+    /// <summary>
+    /// The optional webhook url called on completion
+    /// </summary>
+    [JsonProperty("webhook_url")]
+    public string WebhookUrl { get; private set; }
+    /// <summary>
+    /// This is the method used to call the webhook
+    /// </summary>
+    [JsonProperty("webhook_method")]
+    public string WebhookMethod { get; private set; }
+    /// <summary>
+    /// The optional email to send the completion notification to
+    /// </summary>
+    [JsonProperty("email")]
+    public string Email { get; private set; }
+    /// <summary>
+    /// The unique job_sid returned when the custom export was created. This can be used to look up the status of the job.
+    /// </summary>
+    [JsonProperty("job_sid")]
+    public string JobSid { get; private set; }
+    /// <summary>
+    /// The details of a job state which is an object that contains a `status` string, a day count integer, and list of days in the job
+    /// </summary>
+    [JsonProperty("details")]
+    public object Details { get; private set; }
+    /// <summary>
+    /// This is the job position from the 1st in line. Your queue position will never increase. As jobs ahead of yours in the queue are processed, the queue position number will decrease
+    /// </summary>
+    [JsonProperty("job_queue_position")]
+    public string JobQueuePosition { get; private set; }
+    /// <summary>
+    /// this is the time estimated until your job is complete. This is calculated each time you request the job list. The time is calculated based on the current rate of job completion (which may vary) and your job queue position
+    /// </summary>
+    [JsonProperty("estimated_completion_time")]
+    public string EstimatedCompletionTime { get; private set; }
+
+    private ExportCustomJobResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Bulkexports/V1/Export/JobOptions.cs b/src/Twilio/Rest/Bulkexports/V1/Export/JobOptions.cs
index 101607929..5e0ee1b69 100644
--- a/src/Twilio/Rest/Bulkexports/V1/Export/JobOptions.cs
+++ b/src/Twilio/Rest/Bulkexports/V1/Export/JobOptions.cs
@@ -9,64 +9,64 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Bulkexports.V1.Export
-{
-
+{
+
+  /// <summary>
+  /// FetchJobOptions
+  /// </summary>
+  public class FetchJobOptions : IOptions<JobResource>
+  {
     /// <summary>
-    /// FetchJobOptions
+    /// The unique string that that we created to identify the Bulk Export job
     /// </summary>
-    public class FetchJobOptions : IOptions<JobResource>
-    {
-        /// <summary>
-        /// The unique string that that we created to identify the Bulk Export job
-        /// </summary>
-        public string PathJobSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchJobOptions
-        /// </summary>
-        /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
-        public FetchJobOptions(string pathJobSid)
-        {
-            PathJobSid = pathJobSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathJobSid { get; }
+
     /// <summary>
-    /// DeleteJobOptions
+    /// Construct a new FetchJobOptions
     /// </summary>
-    public class DeleteJobOptions : IOptions<JobResource>
-    {
-        /// <summary>
-        /// The unique string that that we created to identify the Bulk Export job
-        /// </summary>
-        public string PathJobSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteJobOptions
-        /// </summary>
-        /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
-        public DeleteJobOptions(string pathJobSid)
-        {
-            PathJobSid = pathJobSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
+    public FetchJobOptions(string pathJobSid)
+    {
+      PathJobSid = pathJobSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteJobOptions
+  /// </summary>
+  public class DeleteJobOptions : IOptions<JobResource>
+  {
+    /// <summary>
+    /// The unique string that that we created to identify the Bulk Export job
+    /// </summary>
+    public string PathJobSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteJobOptions
+    /// </summary>
+    /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
+    public DeleteJobOptions(string pathJobSid)
+    {
+      PathJobSid = pathJobSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Bulkexports/V1/Export/JobResource.cs b/src/Twilio/Rest/Bulkexports/V1/Export/JobResource.cs
index 9de8518ee..caa404c1d 100644
--- a/src/Twilio/Rest/Bulkexports/V1/Export/JobResource.cs
+++ b/src/Twilio/Rest/Bulkexports/V1/Export/JobResource.cs
@@ -17,245 +17,245 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Bulkexports.V1.Export
-{
-
-    public class JobResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Errorduringrun = new StatusEnum("ErrorDuringRun");
-            public static readonly StatusEnum Submitted = new StatusEnum("Submitted");
-            public static readonly StatusEnum Running = new StatusEnum("Running");
-            public static readonly StatusEnum Completedemptyrecords = new StatusEnum("CompletedEmptyRecords");
-            public static readonly StatusEnum Completed = new StatusEnum("Completed");
-            public static readonly StatusEnum Failed = new StatusEnum("Failed");
-            public static readonly StatusEnum Runningtobedeleted = new StatusEnum("RunningToBeDeleted");
-            public static readonly StatusEnum Deletedbyuserrequest = new StatusEnum("DeletedByUserRequest");
-        }
-
-        private static Request BuildFetchRequest(FetchJobOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Bulkexports,
-                "/v1/Exports/Jobs/" + options.PathJobSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Job parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Job </returns>
-        public static JobResource Fetch(FetchJobOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Job parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Job </returns>
-        public static async System.Threading.Tasks.Task<JobResource> FetchAsync(FetchJobOptions options,
-                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Job </returns>
-        public static JobResource Fetch(string pathJobSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchJobOptions(pathJobSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Job </returns>
-        public static async System.Threading.Tasks.Task<JobResource> FetchAsync(string pathJobSid,
-                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchJobOptions(pathJobSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteJobOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Bulkexports,
-                "/v1/Exports/Jobs/" + options.PathJobSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Job parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Job </returns>
-        public static bool Delete(DeleteJobOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Job parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Job </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteJobOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Job </returns>
-        public static bool Delete(string pathJobSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteJobOptions(pathJobSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Job </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathJobSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteJobOptions(pathJobSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a JobResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> JobResource object represented by the provided JSON </returns>
-        public static JobResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<JobResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        [JsonProperty("resource_type")]
-        public string ResourceType { get; private set; }
-        /// <summary>
-        /// The friendly name specified when creating the job
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The details of a job state which is an object that contains a `status` string, a day count integer, and list of days in the job
-        /// </summary>
-        [JsonProperty("details")]
-        public object Details { get; private set; }
-        /// <summary>
-        /// The start time for the export specified when creating the job
-        /// </summary>
-        [JsonProperty("start_day")]
-        public string StartDay { get; private set; }
-        /// <summary>
-        /// The end time for the export specified when creating the job
-        /// </summary>
-        [JsonProperty("end_day")]
-        public string EndDay { get; private set; }
-        /// <summary>
-        /// The job_sid returned when the export was created
-        /// </summary>
-        [JsonProperty("job_sid")]
-        public string JobSid { get; private set; }
-        /// <summary>
-        /// The optional webhook url called on completion
-        /// </summary>
-        [JsonProperty("webhook_url")]
-        public string WebhookUrl { get; private set; }
-        /// <summary>
-        /// This is the method used to call the webhook
-        /// </summary>
-        [JsonProperty("webhook_method")]
-        public string WebhookMethod { get; private set; }
-        /// <summary>
-        /// The optional email to send the completion notification to
-        /// </summary>
-        [JsonProperty("email")]
-        public string Email { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// This is the job position from the 1st in line. Your queue position will never increase. As jobs ahead of yours in the queue are processed, the queue position number will decrease
-        /// </summary>
-        [JsonProperty("job_queue_position")]
-        public string JobQueuePosition { get; private set; }
-        /// <summary>
-        /// this is the time estimated until your job is complete. This is calculated each time you request the job list. The time is calculated based on the current rate of job completion (which may vary) and your job queue position
-        /// </summary>
-        [JsonProperty("estimated_completion_time")]
-        public string EstimatedCompletionTime { get; private set; }
-
-        private JobResource()
-        {
-
-        }
-    }
+{
+
+  public class JobResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Errorduringrun = new StatusEnum("ErrorDuringRun");
+      public static readonly StatusEnum Submitted = new StatusEnum("Submitted");
+      public static readonly StatusEnum Running = new StatusEnum("Running");
+      public static readonly StatusEnum Completedemptyrecords = new StatusEnum("CompletedEmptyRecords");
+      public static readonly StatusEnum Completed = new StatusEnum("Completed");
+      public static readonly StatusEnum Failed = new StatusEnum("Failed");
+      public static readonly StatusEnum Runningtobedeleted = new StatusEnum("RunningToBeDeleted");
+      public static readonly StatusEnum Deletedbyuserrequest = new StatusEnum("DeletedByUserRequest");
+    }
+
+    private static Request BuildFetchRequest(FetchJobOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Bulkexports,
+          "/v1/Exports/Jobs/" + options.PathJobSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Job parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Job </returns>
+    public static JobResource Fetch(FetchJobOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Job parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Job </returns>
+    public static async System.Threading.Tasks.Task<JobResource> FetchAsync(FetchJobOptions options,
+                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Job </returns>
+    public static JobResource Fetch(string pathJobSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchJobOptions(pathJobSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Job </returns>
+    public static async System.Threading.Tasks.Task<JobResource> FetchAsync(string pathJobSid,
+                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchJobOptions(pathJobSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteJobOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Bulkexports,
+          "/v1/Exports/Jobs/" + options.PathJobSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Job parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Job </returns>
+    public static bool Delete(DeleteJobOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Job parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Job </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteJobOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Job </returns>
+    public static bool Delete(string pathJobSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteJobOptions(pathJobSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Job </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathJobSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteJobOptions(pathJobSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a JobResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> JobResource object represented by the provided JSON </returns>
+    public static JobResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<JobResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    [JsonProperty("resource_type")]
+    public string ResourceType { get; private set; }
+    /// <summary>
+    /// The friendly name specified when creating the job
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The details of a job state which is an object that contains a `status` string, a day count integer, and list of days in the job
+    /// </summary>
+    [JsonProperty("details")]
+    public object Details { get; private set; }
+    /// <summary>
+    /// The start time for the export specified when creating the job
+    /// </summary>
+    [JsonProperty("start_day")]
+    public string StartDay { get; private set; }
+    /// <summary>
+    /// The end time for the export specified when creating the job
+    /// </summary>
+    [JsonProperty("end_day")]
+    public string EndDay { get; private set; }
+    /// <summary>
+    /// The job_sid returned when the export was created
+    /// </summary>
+    [JsonProperty("job_sid")]
+    public string JobSid { get; private set; }
+    /// <summary>
+    /// The optional webhook url called on completion
+    /// </summary>
+    [JsonProperty("webhook_url")]
+    public string WebhookUrl { get; private set; }
+    /// <summary>
+    /// This is the method used to call the webhook
+    /// </summary>
+    [JsonProperty("webhook_method")]
+    public string WebhookMethod { get; private set; }
+    /// <summary>
+    /// The optional email to send the completion notification to
+    /// </summary>
+    [JsonProperty("email")]
+    public string Email { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// This is the job position from the 1st in line. Your queue position will never increase. As jobs ahead of yours in the queue are processed, the queue position number will decrease
+    /// </summary>
+    [JsonProperty("job_queue_position")]
+    public string JobQueuePosition { get; private set; }
+    /// <summary>
+    /// this is the time estimated until your job is complete. This is calculated each time you request the job list. The time is calculated based on the current rate of job completion (which may vary) and your job queue position
+    /// </summary>
+    [JsonProperty("estimated_completion_time")]
+    public string EstimatedCompletionTime { get; private set; }
+
+    private JobResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Bulkexports/V1/ExportConfigurationOptions.cs b/src/Twilio/Rest/Bulkexports/V1/ExportConfigurationOptions.cs
index 427b6a877..49e2774c9 100644
--- a/src/Twilio/Rest/Bulkexports/V1/ExportConfigurationOptions.cs
+++ b/src/Twilio/Rest/Bulkexports/V1/ExportConfigurationOptions.cs
@@ -9,91 +9,91 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Bulkexports.V1
-{
-
+{
+
+  /// <summary>
+  /// Fetch a specific Export Configuration.
+  /// </summary>
+  public class FetchExportConfigurationOptions : IOptions<ExportConfigurationResource>
+  {
     /// <summary>
-    /// Fetch a specific Export Configuration.
+    /// The type of communication – Messages, Calls, Conferences, and Participants
     /// </summary>
-    public class FetchExportConfigurationOptions : IOptions<ExportConfigurationResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-
-        /// <summary>
-        /// Construct a new FetchExportConfigurationOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        public FetchExportConfigurationOptions(string pathResourceType)
-        {
-            PathResourceType = pathResourceType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathResourceType { get; }
+
     /// <summary>
-    /// Update a specific Export Configuration.
+    /// Construct a new FetchExportConfigurationOptions
     /// </summary>
-    public class UpdateExportConfigurationOptions : IOptions<ExportConfigurationResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-        /// <summary>
-        /// Whether files are automatically generated
-        /// </summary>
-        public bool? Enabled { get; set; }
-        /// <summary>
-        /// URL targeted at export
-        /// </summary>
-        public Uri WebhookUrl { get; set; }
-        /// <summary>
-        /// Whether to GET or POST to the webhook url
-        /// </summary>
-        public string WebhookMethod { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateExportConfigurationOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        public UpdateExportConfigurationOptions(string pathResourceType)
-        {
-            PathResourceType = pathResourceType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            if (WebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
-            }
-
-            if (WebhookMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    public FetchExportConfigurationOptions(string pathResourceType)
+    {
+      PathResourceType = pathResourceType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update a specific Export Configuration.
+  /// </summary>
+  public class UpdateExportConfigurationOptions : IOptions<ExportConfigurationResource>
+  {
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    public string PathResourceType { get; }
+    /// <summary>
+    /// Whether files are automatically generated
+    /// </summary>
+    public bool? Enabled { get; set; }
+    /// <summary>
+    /// URL targeted at export
+    /// </summary>
+    public Uri WebhookUrl { get; set; }
+    /// <summary>
+    /// Whether to GET or POST to the webhook url
+    /// </summary>
+    public string WebhookMethod { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateExportConfigurationOptions
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    public UpdateExportConfigurationOptions(string pathResourceType)
+    {
+      PathResourceType = pathResourceType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      if (WebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
+      }
+
+      if (WebhookMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Bulkexports/V1/ExportConfigurationResource.cs b/src/Twilio/Rest/Bulkexports/V1/ExportConfigurationResource.cs
index b23476db2..92239642a 100644
--- a/src/Twilio/Rest/Bulkexports/V1/ExportConfigurationResource.cs
+++ b/src/Twilio/Rest/Bulkexports/V1/ExportConfigurationResource.cs
@@ -16,207 +16,207 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Bulkexports.V1
-{
-
-    public class ExportConfigurationResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchExportConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Bulkexports,
-                "/v1/Exports/" + options.PathResourceType + "/Configuration",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Export Configuration.
-        /// </summary>
-        /// <param name="options"> Fetch ExportConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportConfiguration </returns>
-        public static ExportConfigurationResource Fetch(FetchExportConfigurationOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Export Configuration.
-        /// </summary>
-        /// <param name="options"> Fetch ExportConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
-        public static async System.Threading.Tasks.Task<ExportConfigurationResource> FetchAsync(FetchExportConfigurationOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Export Configuration.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportConfiguration </returns>
-        public static ExportConfigurationResource Fetch(string pathResourceType, ITwilioRestClient client = null)
-        {
-            var options = new FetchExportConfigurationOptions(pathResourceType);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Export Configuration.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
-        public static async System.Threading.Tasks.Task<ExportConfigurationResource> FetchAsync(string pathResourceType,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchExportConfigurationOptions(pathResourceType);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateExportConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Bulkexports,
-                "/v1/Exports/" + options.PathResourceType + "/Configuration",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Export Configuration.
-        /// </summary>
-        /// <param name="options"> Update ExportConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportConfiguration </returns>
-        public static ExportConfigurationResource Update(UpdateExportConfigurationOptions options,
-                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Export Configuration.
-        /// </summary>
-        /// <param name="options"> Update ExportConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
-        public static async System.Threading.Tasks.Task<ExportConfigurationResource> UpdateAsync(UpdateExportConfigurationOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Export Configuration.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="enabled"> Whether files are automatically generated </param>
-        /// <param name="webhookUrl"> URL targeted at export </param>
-        /// <param name="webhookMethod"> Whether to GET or POST to the webhook url </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportConfiguration </returns>
-        public static ExportConfigurationResource Update(string pathResourceType,
-                                                         bool? enabled = null,
-                                                         Uri webhookUrl = null,
-                                                         string webhookMethod = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateExportConfigurationOptions(pathResourceType){Enabled = enabled, WebhookUrl = webhookUrl, WebhookMethod = webhookMethod};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Export Configuration.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="enabled"> Whether files are automatically generated </param>
-        /// <param name="webhookUrl"> URL targeted at export </param>
-        /// <param name="webhookMethod"> Whether to GET or POST to the webhook url </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
-        public static async System.Threading.Tasks.Task<ExportConfigurationResource> UpdateAsync(string pathResourceType,
-                                                                                                 bool? enabled = null,
-                                                                                                 Uri webhookUrl = null,
-                                                                                                 string webhookMethod = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateExportConfigurationOptions(pathResourceType){Enabled = enabled, WebhookUrl = webhookUrl, WebhookMethod = webhookMethod};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExportConfigurationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExportConfigurationResource object represented by the provided JSON </returns>
-        public static ExportConfigurationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExportConfigurationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Whether files are automatically generated
-        /// </summary>
-        [JsonProperty("enabled")]
-        public bool? Enabled { get; private set; }
-        /// <summary>
-        /// URL targeted at export
-        /// </summary>
-        [JsonProperty("webhook_url")]
-        public Uri WebhookUrl { get; private set; }
-        /// <summary>
-        /// Whether to GET or POST to the webhook url
-        /// </summary>
-        [JsonProperty("webhook_method")]
-        public string WebhookMethod { get; private set; }
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        [JsonProperty("resource_type")]
-        public string ResourceType { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private ExportConfigurationResource()
-        {
-
-        }
-    }
+{
+
+  public class ExportConfigurationResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchExportConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Bulkexports,
+          "/v1/Exports/" + options.PathResourceType + "/Configuration",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Export Configuration.
+    /// </summary>
+    /// <param name="options"> Fetch ExportConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportConfiguration </returns>
+    public static ExportConfigurationResource Fetch(FetchExportConfigurationOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Export Configuration.
+    /// </summary>
+    /// <param name="options"> Fetch ExportConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
+    public static async System.Threading.Tasks.Task<ExportConfigurationResource> FetchAsync(FetchExportConfigurationOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Export Configuration.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportConfiguration </returns>
+    public static ExportConfigurationResource Fetch(string pathResourceType, ITwilioRestClient client = null)
+    {
+      var options = new FetchExportConfigurationOptions(pathResourceType);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Export Configuration.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
+    public static async System.Threading.Tasks.Task<ExportConfigurationResource> FetchAsync(string pathResourceType,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchExportConfigurationOptions(pathResourceType);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateExportConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Bulkexports,
+          "/v1/Exports/" + options.PathResourceType + "/Configuration",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Export Configuration.
+    /// </summary>
+    /// <param name="options"> Update ExportConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportConfiguration </returns>
+    public static ExportConfigurationResource Update(UpdateExportConfigurationOptions options,
+                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Export Configuration.
+    /// </summary>
+    /// <param name="options"> Update ExportConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
+    public static async System.Threading.Tasks.Task<ExportConfigurationResource> UpdateAsync(UpdateExportConfigurationOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Export Configuration.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="enabled"> Whether files are automatically generated </param>
+    /// <param name="webhookUrl"> URL targeted at export </param>
+    /// <param name="webhookMethod"> Whether to GET or POST to the webhook url </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportConfiguration </returns>
+    public static ExportConfigurationResource Update(string pathResourceType,
+                                                     bool? enabled = null,
+                                                     Uri webhookUrl = null,
+                                                     string webhookMethod = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateExportConfigurationOptions(pathResourceType) { Enabled = enabled, WebhookUrl = webhookUrl, WebhookMethod = webhookMethod };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Export Configuration.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="enabled"> Whether files are automatically generated </param>
+    /// <param name="webhookUrl"> URL targeted at export </param>
+    /// <param name="webhookMethod"> Whether to GET or POST to the webhook url </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
+    public static async System.Threading.Tasks.Task<ExportConfigurationResource> UpdateAsync(string pathResourceType,
+                                                                                             bool? enabled = null,
+                                                                                             Uri webhookUrl = null,
+                                                                                             string webhookMethod = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateExportConfigurationOptions(pathResourceType) { Enabled = enabled, WebhookUrl = webhookUrl, WebhookMethod = webhookMethod };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExportConfigurationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExportConfigurationResource object represented by the provided JSON </returns>
+    public static ExportConfigurationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExportConfigurationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Whether files are automatically generated
+    /// </summary>
+    [JsonProperty("enabled")]
+    public bool? Enabled { get; private set; }
+    /// <summary>
+    /// URL targeted at export
+    /// </summary>
+    [JsonProperty("webhook_url")]
+    public Uri WebhookUrl { get; private set; }
+    /// <summary>
+    /// Whether to GET or POST to the webhook url
+    /// </summary>
+    [JsonProperty("webhook_method")]
+    public string WebhookMethod { get; private set; }
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    [JsonProperty("resource_type")]
+    public string ResourceType { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private ExportConfigurationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Bulkexports/V1/ExportOptions.cs b/src/Twilio/Rest/Bulkexports/V1/ExportOptions.cs
index 278948b81..130c5c0c2 100644
--- a/src/Twilio/Rest/Bulkexports/V1/ExportOptions.cs
+++ b/src/Twilio/Rest/Bulkexports/V1/ExportOptions.cs
@@ -9,35 +9,35 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Bulkexports.V1
-{
-
+{
+
+  /// <summary>
+  /// Fetch a specific Export.
+  /// </summary>
+  public class FetchExportOptions : IOptions<ExportResource>
+  {
     /// <summary>
-    /// Fetch a specific Export.
+    /// The type of communication – Messages, Calls, Conferences, and Participants
     /// </summary>
-    public class FetchExportOptions : IOptions<ExportResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-
-        /// <summary>
-        /// Construct a new FetchExportOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        public FetchExportOptions(string pathResourceType)
-        {
-            PathResourceType = pathResourceType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathResourceType { get; }
+
+    /// <summary>
+    /// Construct a new FetchExportOptions
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    public FetchExportOptions(string pathResourceType)
+    {
+      PathResourceType = pathResourceType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Bulkexports/V1/ExportResource.cs b/src/Twilio/Rest/Bulkexports/V1/ExportResource.cs
index 00a78b3ee..807b9e40c 100644
--- a/src/Twilio/Rest/Bulkexports/V1/ExportResource.cs
+++ b/src/Twilio/Rest/Bulkexports/V1/ExportResource.cs
@@ -16,115 +16,115 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Bulkexports.V1
-{
-
-    public class ExportResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchExportOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Bulkexports,
-                "/v1/Exports/" + options.PathResourceType + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Export.
-        /// </summary>
-        /// <param name="options"> Fetch Export parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Export </returns>
-        public static ExportResource Fetch(FetchExportOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Export.
-        /// </summary>
-        /// <param name="options"> Fetch Export parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Export </returns>
-        public static async System.Threading.Tasks.Task<ExportResource> FetchAsync(FetchExportOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Export.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Export </returns>
-        public static ExportResource Fetch(string pathResourceType, ITwilioRestClient client = null)
-        {
-            var options = new FetchExportOptions(pathResourceType);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Export.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Export </returns>
-        public static async System.Threading.Tasks.Task<ExportResource> FetchAsync(string pathResourceType,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchExportOptions(pathResourceType);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExportResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExportResource object represented by the provided JSON </returns>
-        public static ExportResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExportResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        [JsonProperty("resource_type")]
-        public string ResourceType { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Nested resource URLs.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ExportResource()
-        {
-
-        }
-    }
+{
+
+  public class ExportResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchExportOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Bulkexports,
+          "/v1/Exports/" + options.PathResourceType + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Export.
+    /// </summary>
+    /// <param name="options"> Fetch Export parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Export </returns>
+    public static ExportResource Fetch(FetchExportOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Export.
+    /// </summary>
+    /// <param name="options"> Fetch Export parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Export </returns>
+    public static async System.Threading.Tasks.Task<ExportResource> FetchAsync(FetchExportOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Export.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Export </returns>
+    public static ExportResource Fetch(string pathResourceType, ITwilioRestClient client = null)
+    {
+      var options = new FetchExportOptions(pathResourceType);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Export.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Export </returns>
+    public static async System.Threading.Tasks.Task<ExportResource> FetchAsync(string pathResourceType,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchExportOptions(pathResourceType);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExportResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExportResource object represented by the provided JSON </returns>
+    public static ExportResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExportResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    [JsonProperty("resource_type")]
+    public string ResourceType { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Nested resource URLs.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ExportResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/CredentialOptions.cs b/src/Twilio/Rest/Chat/V1/CredentialOptions.cs
index 18740807d..90ed4518d 100644
--- a/src/Twilio/Rest/Chat/V1/CredentialOptions.cs
+++ b/src/Twilio/Rest/Chat/V1/CredentialOptions.cs
@@ -9,255 +9,255 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V1
-{
-
+{
+
+  /// <summary>
+  /// ReadCredentialOptions
+  /// </summary>
+  public class ReadCredentialOptions : ReadOptions<CredentialResource>
+  {
     /// <summary>
-    /// ReadCredentialOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadCredentialOptions : ReadOptions<CredentialResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateCredentialOptions
+  /// </summary>
+  public class CreateCredentialOptions : IOptions<CredentialResource>
+  {
     /// <summary>
-    /// CreateCredentialOptions
+    /// The type of push-notification service the credential is for
     /// </summary>
-    public class CreateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The type of push-notification service the credential is for
-        /// </summary>
-        public CredentialResource.PushServiceEnum Type { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// [APN only] The URL encoded representation of the certificate
-        /// </summary>
-        public string Certificate { get; set; }
-        /// <summary>
-        /// [APN only] The URL encoded representation of the private key
-        /// </summary>
-        public string PrivateKey { get; set; }
-        /// <summary>
-        /// [APN only] Whether to send the credential to sandbox APNs
-        /// </summary>
-        public bool? Sandbox { get; set; }
-        /// <summary>
-        /// [GCM only] The API key for the project that was obtained from the Google Developer console for your GCM Service application credential
-        /// </summary>
-        public string ApiKey { get; set; }
-        /// <summary>
-        /// [FCM only] The Server key of your project from Firebase console
-        /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCredentialOptions
-        /// </summary>
-        /// <param name="type"> The type of push-notification service the credential is for </param>
-        public CreateCredentialOptions(CredentialResource.PushServiceEnum type)
-        {
-            Type = type;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Certificate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
-            }
-
-            if (PrivateKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
-            }
-
-            if (Sandbox != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
-            }
-
-            if (ApiKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
-            }
-
-            if (Secret != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secret", Secret));
-            }
-
-            return p;
-        }
-    }
-
+    public CredentialResource.PushServiceEnum Type { get; }
     /// <summary>
-    /// FetchCredentialOptions
+    /// A string to describe the resource
     /// </summary>
-    public class FetchCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// UpdateCredentialOptions
+    /// [APN only] The URL encoded representation of the certificate
     /// </summary>
-    public class UpdateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// [APN only] The URL encoded representation of the certificate
-        /// </summary>
-        public string Certificate { get; set; }
-        /// <summary>
-        /// [APN only] The URL encoded representation of the private key
-        /// </summary>
-        public string PrivateKey { get; set; }
-        /// <summary>
-        /// [APN only] Whether to send the credential to sandbox APNs
-        /// </summary>
-        public bool? Sandbox { get; set; }
-        /// <summary>
-        /// [GCM only] The API key for the project that was obtained from the Google Developer console for your GCM Service application credential
-        /// </summary>
-        public string ApiKey { get; set; }
-        /// <summary>
-        /// [FCM only] The Server key of your project from Firebase console
-        /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Certificate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
-            }
-
-            if (PrivateKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
-            }
-
-            if (Sandbox != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
-            }
-
-            if (ApiKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
-            }
-
-            if (Secret != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secret", Secret));
-            }
-
-            return p;
-        }
-    }
-
+    public string Certificate { get; set; }
     /// <summary>
-    /// DeleteCredentialOptions
+    /// [APN only] The URL encoded representation of the private key
     /// </summary>
-    public class DeleteCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PrivateKey { get; set; }
+    /// <summary>
+    /// [APN only] Whether to send the credential to sandbox APNs
+    /// </summary>
+    public bool? Sandbox { get; set; }
+    /// <summary>
+    /// [GCM only] The API key for the project that was obtained from the Google Developer console for your GCM Service application credential
+    /// </summary>
+    public string ApiKey { get; set; }
+    /// <summary>
+    /// [FCM only] The Server key of your project from Firebase console
+    /// </summary>
+    public string Secret { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCredentialOptions
+    /// </summary>
+    /// <param name="type"> The type of push-notification service the credential is for </param>
+    public CreateCredentialOptions(CredentialResource.PushServiceEnum type)
+    {
+      Type = type;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Certificate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
+      }
+
+      if (PrivateKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
+      }
+
+      if (Sandbox != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
+      }
+
+      if (ApiKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
+      }
+
+      if (Secret != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secret", Secret));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchCredentialOptions
+  /// </summary>
+  public class FetchCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateCredentialOptions
+  /// </summary>
+  public class UpdateCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// [APN only] The URL encoded representation of the certificate
+    /// </summary>
+    public string Certificate { get; set; }
+    /// <summary>
+    /// [APN only] The URL encoded representation of the private key
+    /// </summary>
+    public string PrivateKey { get; set; }
+    /// <summary>
+    /// [APN only] Whether to send the credential to sandbox APNs
+    /// </summary>
+    public bool? Sandbox { get; set; }
+    /// <summary>
+    /// [GCM only] The API key for the project that was obtained from the Google Developer console for your GCM Service application credential
+    /// </summary>
+    public string ApiKey { get; set; }
+    /// <summary>
+    /// [FCM only] The Server key of your project from Firebase console
+    /// </summary>
+    public string Secret { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Certificate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
+      }
+
+      if (PrivateKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
+      }
+
+      if (Sandbox != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
+      }
+
+      if (ApiKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
+      }
+
+      if (Secret != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secret", Secret));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteCredentialOptions
+  /// </summary>
+  public class DeleteCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/CredentialResource.cs b/src/Twilio/Rest/Chat/V1/CredentialResource.cs
index 22182f6cd..4affbbf33 100644
--- a/src/Twilio/Rest/Chat/V1/CredentialResource.cs
+++ b/src/Twilio/Rest/Chat/V1/CredentialResource.cs
@@ -17,538 +17,538 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V1
-{
-
-    public class CredentialResource : Resource
-    {
-        public sealed class PushServiceEnum : StringEnum
-        {
-            private PushServiceEnum(string value) : base(value) {}
-            public PushServiceEnum() {}
-            public static implicit operator PushServiceEnum(string value)
-            {
-                return new PushServiceEnum(value);
-            }
-
-            public static readonly PushServiceEnum Gcm = new PushServiceEnum("gcm");
-            public static readonly PushServiceEnum Apn = new PushServiceEnum("apn");
-            public static readonly PushServiceEnum Fcm = new PushServiceEnum("fcm");
-        }
-
-        private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Credentials",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Credentials",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="type"> The type of push-notification service the credential is for </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
-        /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
-        /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
-        ///              for your GCM Service application credential </param>
-        /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(CredentialResource.PushServiceEnum type,
-                                                string friendlyName = null,
-                                                string certificate = null,
-                                                string privateKey = null,
-                                                bool? sandbox = null,
-                                                string apiKey = null,
-                                                string secret = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(type){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="type"> The type of push-notification service the credential is for </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
-        /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
-        /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
-        ///              for your GCM Service application credential </param>
-        /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CredentialResource.PushServiceEnum type,
-                                                                                        string friendlyName = null,
-                                                                                        string certificate = null,
-                                                                                        string privateKey = null,
-                                                                                        bool? sandbox = null,
-                                                                                        string apiKey = null,
-                                                                                        string secret = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(type){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Credentials/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Credentials/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
-        /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
-        /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
-        ///              for your GCM Service application credential </param>
-        /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(string pathSid,
-                                                string friendlyName = null,
-                                                string certificate = null,
-                                                string privateKey = null,
-                                                bool? sandbox = null,
-                                                string apiKey = null,
-                                                string secret = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathSid){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
-        /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
-        /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
-        ///              for your GCM Service application credential </param>
-        /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathSid,
-                                                                                        string friendlyName = null,
-                                                                                        string certificate = null,
-                                                                                        string privateKey = null,
-                                                                                        bool? sandbox = null,
-                                                                                        string apiKey = null,
-                                                                                        string secret = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathSid){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v1/Credentials/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CredentialResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CredentialResource object represented by the provided JSON </returns>
-        public static CredentialResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CredentialResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type of push-notification service the credential is for
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CredentialResource.PushServiceEnum Type { get; private set; }
-        /// <summary>
-        /// [APN only] Whether to send the credential to sandbox APNs
-        /// </summary>
-        [JsonProperty("sandbox")]
-        public string Sandbox { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Credential resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CredentialResource()
-        {
-
-        }
-    }
+{
+
+  public class CredentialResource : Resource
+  {
+    public sealed class PushServiceEnum : StringEnum
+    {
+      private PushServiceEnum(string value) : base(value) { }
+      public PushServiceEnum() { }
+      public static implicit operator PushServiceEnum(string value)
+      {
+        return new PushServiceEnum(value);
+      }
+
+      public static readonly PushServiceEnum Gcm = new PushServiceEnum("gcm");
+      public static readonly PushServiceEnum Apn = new PushServiceEnum("apn");
+      public static readonly PushServiceEnum Fcm = new PushServiceEnum("fcm");
+    }
+
+    private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Credentials",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Credentials",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="type"> The type of push-notification service the credential is for </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
+    /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
+    /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
+    ///              for your GCM Service application credential </param>
+    /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(CredentialResource.PushServiceEnum type,
+                                            string friendlyName = null,
+                                            string certificate = null,
+                                            string privateKey = null,
+                                            bool? sandbox = null,
+                                            string apiKey = null,
+                                            string secret = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(type) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="type"> The type of push-notification service the credential is for </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
+    /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
+    /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
+    ///              for your GCM Service application credential </param>
+    /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CredentialResource.PushServiceEnum type,
+                                                                                    string friendlyName = null,
+                                                                                    string certificate = null,
+                                                                                    string privateKey = null,
+                                                                                    bool? sandbox = null,
+                                                                                    string apiKey = null,
+                                                                                    string secret = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(type) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Credentials/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Credentials/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
+    /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
+    /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
+    ///              for your GCM Service application credential </param>
+    /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(string pathSid,
+                                            string friendlyName = null,
+                                            string certificate = null,
+                                            string privateKey = null,
+                                            bool? sandbox = null,
+                                            string apiKey = null,
+                                            string secret = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathSid) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
+    /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
+    /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
+    ///              for your GCM Service application credential </param>
+    /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathSid,
+                                                                                    string friendlyName = null,
+                                                                                    string certificate = null,
+                                                                                    string privateKey = null,
+                                                                                    bool? sandbox = null,
+                                                                                    string apiKey = null,
+                                                                                    string secret = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathSid) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v1/Credentials/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CredentialResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CredentialResource object represented by the provided JSON </returns>
+    public static CredentialResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CredentialResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type of push-notification service the credential is for
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CredentialResource.PushServiceEnum Type { get; private set; }
+    /// <summary>
+    /// [APN only] Whether to send the credential to sandbox APNs
+    /// </summary>
+    [JsonProperty("sandbox")]
+    public string Sandbox { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Credential resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CredentialResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/Channel/InviteOptions.cs b/src/Twilio/Rest/Chat/V1/Service/Channel/InviteOptions.cs
index 1ca126d43..f61762427 100644
--- a/src/Twilio/Rest/Chat/V1/Service/Channel/InviteOptions.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/Channel/InviteOptions.cs
@@ -10,193 +10,193 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V1.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// FetchInviteOptions
+  /// </summary>
+  public class FetchInviteOptions : IOptions<InviteResource>
+  {
     /// <summary>
-    /// FetchInviteOptions
-    /// </summary>
-    public class FetchInviteOptions : IOptions<InviteResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the resource to fetch belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// CreateInviteOptions
-    /// </summary>
-    public class CreateInviteOptions : IOptions<InviteResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the new resource belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The `identity` value that identifies the new resource's User
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The Role assigned to the new member
-        /// </summary>
-        public string RoleSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        public CreateInviteOptions(string pathServiceSid, string pathChannelSid, string identity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Channel the resource to fetch belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
     /// <summary>
-    /// ReadInviteOptions
-    /// </summary>
-    public class ReadInviteOptions : ReadOptions<InviteResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the resources to read belong to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The `identity` value of the resources to read
-        /// </summary>
-        public List<string> Identity { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
-        public ReadInviteOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteInviteOptions
-    /// </summary>
-    public class DeleteInviteOptions : IOptions<InviteResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the resource to delete belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to delete belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new FetchInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateInviteOptions
+  /// </summary>
+  public class CreateInviteOptions : IOptions<InviteResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel the new resource belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The `identity` value that identifies the new resource's User
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The Role assigned to the new member
+    /// </summary>
+    public string RoleSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    public CreateInviteOptions(string pathServiceSid, string pathChannelSid, string identity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadInviteOptions
+  /// </summary>
+  public class ReadInviteOptions : ReadOptions<InviteResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel the resources to read belong to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The `identity` value of the resources to read
+    /// </summary>
+    public List<string> Identity { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
+    public ReadInviteOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteInviteOptions
+  /// </summary>
+  public class DeleteInviteOptions : IOptions<InviteResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel the resource to delete belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to delete belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/Channel/InviteResource.cs b/src/Twilio/Rest/Chat/V1/Service/Channel/InviteResource.cs
index d1023f784..ed5d66430 100644
--- a/src/Twilio/Rest/Chat/V1/Service/Channel/InviteResource.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/Channel/InviteResource.cs
@@ -16,456 +16,456 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Chat.V1.Service.Channel
-{
-
-    public class InviteResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Fetch(FetchInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(FetchInviteOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Fetch(string pathServiceSid,
-                                           string pathChannelSid,
-                                           string pathSid,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(string pathServiceSid,
-                                                                                   string pathChannelSid,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Create(CreateInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(CreateInviteOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="roleSid"> The Role assigned to the new member </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Create(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string identity,
-                                            string roleSid = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="roleSid"> The Role assigned to the new member </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string identity,
-                                                                                    string roleSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static ResourceSet<InviteResource> Read(ReadInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<InviteResource>.FromJson("invites", response.Content);
-            return new ResourceSet<InviteResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(ReadInviteOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<InviteResource>.FromJson("invites", response.Content);
-            return new ResourceSet<InviteResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
-        /// <param name="identity"> The `identity` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static ResourceSet<InviteResource> Read(string pathServiceSid,
-                                                       string pathChannelSid,
-                                                       List<string> identity = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadInviteOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
-        /// <param name="identity"> The `identity` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(string pathServiceSid,
-                                                                                               string pathChannelSid,
-                                                                                               List<string> identity = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadInviteOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<InviteResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<InviteResource>.FromJson("invites", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<InviteResource> NextPage(Page<InviteResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<InviteResource>.FromJson("invites", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<InviteResource> PreviousPage(Page<InviteResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<InviteResource>.FromJson("invites", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static bool Delete(DeleteInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteInviteOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to delete belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to delete belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a InviteResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> InviteResource object represented by the provided JSON </returns>
-        public static InviteResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<InviteResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Channel the new resource belongs to
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The SID of the Role assigned to the member
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The identity of the User that created the invite
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Invite resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private InviteResource()
-        {
-
-        }
-    }
+{
+
+  public class InviteResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Fetch(FetchInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(FetchInviteOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Fetch(string pathServiceSid,
+                                       string pathChannelSid,
+                                       string pathSid,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(string pathServiceSid,
+                                                                               string pathChannelSid,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Create(CreateInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(CreateInviteOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="roleSid"> The Role assigned to the new member </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Create(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string identity,
+                                        string roleSid = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="roleSid"> The Role assigned to the new member </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string identity,
+                                                                                string roleSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static ResourceSet<InviteResource> Read(ReadInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<InviteResource>.FromJson("invites", response.Content);
+      return new ResourceSet<InviteResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(ReadInviteOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<InviteResource>.FromJson("invites", response.Content);
+      return new ResourceSet<InviteResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
+    /// <param name="identity"> The `identity` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static ResourceSet<InviteResource> Read(string pathServiceSid,
+                                                   string pathChannelSid,
+                                                   List<string> identity = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadInviteOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
+    /// <param name="identity"> The `identity` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(string pathServiceSid,
+                                                                                           string pathChannelSid,
+                                                                                           List<string> identity = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadInviteOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<InviteResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<InviteResource>.FromJson("invites", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<InviteResource> NextPage(Page<InviteResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<InviteResource>.FromJson("invites", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<InviteResource> PreviousPage(Page<InviteResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<InviteResource>.FromJson("invites", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static bool Delete(DeleteInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteInviteOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to delete belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to delete belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a InviteResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> InviteResource object represented by the provided JSON </returns>
+    public static InviteResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<InviteResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Channel the new resource belongs to
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The string that identifies the resource's User
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The SID of the Role assigned to the member
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The identity of the User that created the invite
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Invite resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private InviteResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/Channel/MemberOptions.cs b/src/Twilio/Rest/Chat/V1/Service/Channel/MemberOptions.cs
index 03cf3fd2e..4de89f4bc 100644
--- a/src/Twilio/Rest/Chat/V1/Service/Channel/MemberOptions.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/Channel/MemberOptions.cs
@@ -10,252 +10,252 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V1.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// FetchMemberOptions
+  /// </summary>
+  public class FetchMemberOptions : IOptions<MemberResource>
+  {
     /// <summary>
-    /// FetchMemberOptions
+    /// The SID of the Service to fetch the resource from
     /// </summary>
-    public class FetchMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the channel the member belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the member belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// CreateMemberOptions
+    /// The unique ID of the channel the member belongs to
     /// </summary>
-    public class CreateMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the channel the new member belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The `identity` value that identifies the new resource's User
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The SID of the Role to assign to the member
-        /// </summary>
-        public string RoleSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the new member belongs to </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        public CreateMemberOptions(string pathServiceSid, string pathChannelSid, string identity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathChannelSid { get; }
     /// <summary>
-    /// ReadMemberOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class ReadMemberOptions : ReadOptions<MemberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the channel the member belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The `identity` value of the resources to read
-        /// </summary>
-        public List<string> Identity { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the member belongs to </param>
-        public ReadMemberOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteMemberOptions
+    /// Construct a new FetchMemberOptions
     /// </summary>
-    public class DeleteMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the channel the message to delete belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the message to delete belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the member belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// UpdateMemberOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the channel the member to update belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The SID of the Role to assign to the member
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The index of the last consumed Message for the Channel for the Member
-        /// </summary>
-        public int? LastConsumedMessageIndex { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the member to update belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (LastConsumedMessageIndex != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateMemberOptions
+  /// </summary>
+  public class CreateMemberOptions : IOptions<MemberResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the channel the new member belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The `identity` value that identifies the new resource's User
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The SID of the Role to assign to the member
+    /// </summary>
+    public string RoleSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the new member belongs to </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    public CreateMemberOptions(string pathServiceSid, string pathChannelSid, string identity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadMemberOptions
+  /// </summary>
+  public class ReadMemberOptions : ReadOptions<MemberResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the channel the member belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The `identity` value of the resources to read
+    /// </summary>
+    public List<string> Identity { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the member belongs to </param>
+    public ReadMemberOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteMemberOptions
+  /// </summary>
+  public class DeleteMemberOptions : IOptions<MemberResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the channel the message to delete belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the message to delete belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateMemberOptions
+  /// </summary>
+  public class UpdateMemberOptions : IOptions<MemberResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the channel the member to update belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The SID of the Role to assign to the member
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The index of the last consumed Message for the Channel for the Member
+    /// </summary>
+    public int? LastConsumedMessageIndex { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the member to update belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (LastConsumedMessageIndex != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/Channel/MemberResource.cs b/src/Twilio/Rest/Chat/V1/Service/Channel/MemberResource.cs
index 9050b871f..1521cabdc 100644
--- a/src/Twilio/Rest/Chat/V1/Service/Channel/MemberResource.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/Channel/MemberResource.cs
@@ -16,547 +16,547 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Chat.V1.Service.Channel
-{
-
-    public class MemberResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Fetch(FetchMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(FetchMemberOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the member belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Fetch(string pathServiceSid,
-                                           string pathChannelSid,
-                                           string pathSid,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the member belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(string pathServiceSid,
-                                                                                   string pathChannelSid,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Create(CreateMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(CreateMemberOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the new member belongs to </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="roleSid"> The SID of the Role to assign to the member </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Create(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string identity,
-                                            string roleSid = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the new member belongs to </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="roleSid"> The SID of the Role to assign to the member </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string identity,
-                                                                                    string roleSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static ResourceSet<MemberResource> Read(ReadMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MemberResource>.FromJson("members", response.Content);
-            return new ResourceSet<MemberResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(ReadMemberOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MemberResource>.FromJson("members", response.Content);
-            return new ResourceSet<MemberResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the member belongs to </param>
-        /// <param name="identity"> The `identity` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static ResourceSet<MemberResource> Read(string pathServiceSid,
-                                                       string pathChannelSid,
-                                                       List<string> identity = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadMemberOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the member belongs to </param>
-        /// <param name="identity"> The `identity` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(string pathServiceSid,
-                                                                                               string pathChannelSid,
-                                                                                               List<string> identity = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadMemberOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MemberResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("members", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MemberResource> NextPage(Page<MemberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("members", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MemberResource> PreviousPage(Page<MemberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("members", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static bool Delete(DeleteMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMemberOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the message to delete belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the message to delete belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Update(UpdateMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(UpdateMemberOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the member to update belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="roleSid"> The SID of the Role to assign to the member </param>
-        /// <param name="lastConsumedMessageIndex"> The index of the last consumed Message for the Channel for the Member
-        ///                                </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Update(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string pathSid,
-                                            string roleSid = null,
-                                            int? lastConsumedMessageIndex = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid){RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the member to update belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="roleSid"> The SID of the Role to assign to the member </param>
-        /// <param name="lastConsumedMessageIndex"> The index of the last consumed Message for the Channel for the Member
-        ///                                </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string pathSid,
-                                                                                    string roleSid = null,
-                                                                                    int? lastConsumedMessageIndex = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid){RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a MemberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MemberResource object represented by the provided JSON </returns>
-        public static MemberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MemberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Channel for the member
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The SID of the Role assigned to the member
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The index of the last Message that the Member has read within the Channel
-        /// </summary>
-        [JsonProperty("last_consumed_message_index")]
-        public int? LastConsumedMessageIndex { get; private set; }
-        /// <summary>
-        /// The ISO 8601 based timestamp string that represents the date-time of the last Message read event for the Member within the Channel
-        /// </summary>
-        [JsonProperty("last_consumption_timestamp")]
-        public DateTime? LastConsumptionTimestamp { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Member resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private MemberResource()
-        {
-
-        }
-    }
+{
+
+  public class MemberResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Fetch(FetchMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(FetchMemberOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the member belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Fetch(string pathServiceSid,
+                                       string pathChannelSid,
+                                       string pathSid,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the member belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(string pathServiceSid,
+                                                                               string pathChannelSid,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Create(CreateMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(CreateMemberOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the new member belongs to </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="roleSid"> The SID of the Role to assign to the member </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Create(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string identity,
+                                        string roleSid = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the new member belongs to </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="roleSid"> The SID of the Role to assign to the member </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string identity,
+                                                                                string roleSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static ResourceSet<MemberResource> Read(ReadMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MemberResource>.FromJson("members", response.Content);
+      return new ResourceSet<MemberResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(ReadMemberOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MemberResource>.FromJson("members", response.Content);
+      return new ResourceSet<MemberResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the member belongs to </param>
+    /// <param name="identity"> The `identity` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static ResourceSet<MemberResource> Read(string pathServiceSid,
+                                                   string pathChannelSid,
+                                                   List<string> identity = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadMemberOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the member belongs to </param>
+    /// <param name="identity"> The `identity` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(string pathServiceSid,
+                                                                                           string pathChannelSid,
+                                                                                           List<string> identity = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadMemberOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MemberResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("members", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MemberResource> NextPage(Page<MemberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("members", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MemberResource> PreviousPage(Page<MemberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("members", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static bool Delete(DeleteMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMemberOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the message to delete belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the message to delete belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Update(UpdateMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(UpdateMemberOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the member to update belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="roleSid"> The SID of the Role to assign to the member </param>
+    /// <param name="lastConsumedMessageIndex"> The index of the last consumed Message for the Channel for the Member
+    ///                                </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Update(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string pathSid,
+                                        string roleSid = null,
+                                        int? lastConsumedMessageIndex = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid) { RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the member to update belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="roleSid"> The SID of the Role to assign to the member </param>
+    /// <param name="lastConsumedMessageIndex"> The index of the last consumed Message for the Channel for the Member
+    ///                                </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string pathSid,
+                                                                                string roleSid = null,
+                                                                                int? lastConsumedMessageIndex = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid) { RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a MemberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MemberResource object represented by the provided JSON </returns>
+    public static MemberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MemberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Channel for the member
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The string that identifies the resource's User
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The SID of the Role assigned to the member
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The index of the last Message that the Member has read within the Channel
+    /// </summary>
+    [JsonProperty("last_consumed_message_index")]
+    public int? LastConsumedMessageIndex { get; private set; }
+    /// <summary>
+    /// The ISO 8601 based timestamp string that represents the date-time of the last Message read event for the Member within the Channel
+    /// </summary>
+    [JsonProperty("last_consumption_timestamp")]
+    public DateTime? LastConsumptionTimestamp { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Member resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private MemberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/Channel/MessageOptions.cs b/src/Twilio/Rest/Chat/V1/Service/Channel/MessageOptions.cs
index c73f0bb4b..2c446ce02 100644
--- a/src/Twilio/Rest/Chat/V1/Service/Channel/MessageOptions.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/Channel/MessageOptions.cs
@@ -9,260 +9,260 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V1.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// FetchMessageOptions
+  /// </summary>
+  public class FetchMessageOptions : IOptions<MessageResource>
+  {
     /// <summary>
-    /// FetchMessageOptions
+    /// The SID of the Service to fetch the resource from
     /// </summary>
-    public class FetchMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Channel the message to fetch belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The unique ID of the Channel the message to fetch belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// CreateMessageOptions
+    /// The unique ID of the Channel the message to fetch belongs to
     /// </summary>
-    public class CreateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the channel the new resource belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The message to send to the channel
-        /// </summary>
-        public string Body { get; }
-        /// <summary>
-        /// The identity of the new message's author
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the new resource belongs to </param>
-        /// <param name="body"> The message to send to the channel </param>
-        public CreateMessageOptions(string pathServiceSid, string pathChannelSid, string body)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Body = body;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathChannelSid { get; }
     /// <summary>
-    /// ReadMessageOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class ReadMessageOptions : ReadOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Channel the message to read belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sort order of the returned messages
-        /// </summary>
-        public MessageResource.OrderTypeEnum Order { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The unique ID of the Channel the message to read belongs to </param>
-        public ReadMessageOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Order != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteMessageOptions
+    /// Construct a new FetchMessageOptions
     /// </summary>
-    public class DeleteMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the channel the message to delete belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the message to delete belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The unique ID of the Channel the message to fetch belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// UpdateMessageOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// he unique ID of the Channel the message belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The message to send to the channel
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathChannelSid"> he unique ID of the Channel the message belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateMessageOptions
+  /// </summary>
+  public class CreateMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the channel the new resource belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The message to send to the channel
+    /// </summary>
+    public string Body { get; }
+    /// <summary>
+    /// The identity of the new message's author
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the new resource belongs to </param>
+    /// <param name="body"> The message to send to the channel </param>
+    public CreateMessageOptions(string pathServiceSid, string pathChannelSid, string body)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Body = body;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadMessageOptions
+  /// </summary>
+  public class ReadMessageOptions : ReadOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Channel the message to read belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sort order of the returned messages
+    /// </summary>
+    public MessageResource.OrderTypeEnum Order { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The unique ID of the Channel the message to read belongs to </param>
+    public ReadMessageOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Order != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteMessageOptions
+  /// </summary>
+  public class DeleteMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the channel the message to delete belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the message to delete belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateMessageOptions
+  /// </summary>
+  public class UpdateMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// he unique ID of the Channel the message belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The message to send to the channel
+    /// </summary>
+    public string Body { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathChannelSid"> he unique ID of the Channel the message belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/Channel/MessageResource.cs b/src/Twilio/Rest/Chat/V1/Service/Channel/MessageResource.cs
index fb23d4955..19aea068e 100644
--- a/src/Twilio/Rest/Chat/V1/Service/Channel/MessageResource.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/Channel/MessageResource.cs
@@ -17,572 +17,572 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V1.Service.Channel
-{
-
-    public class MessageResource : Resource
-    {
-        public sealed class OrderTypeEnum : StringEnum
-        {
-            private OrderTypeEnum(string value) : base(value) {}
-            public OrderTypeEnum() {}
-            public static implicit operator OrderTypeEnum(string value)
-            {
-                return new OrderTypeEnum(value);
-            }
-
-            public static readonly OrderTypeEnum Asc = new OrderTypeEnum("asc");
-            public static readonly OrderTypeEnum Desc = new OrderTypeEnum("desc");
-        }
-
-        private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The unique ID of the Channel the message to fetch belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string pathSid,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The unique ID of the Channel the message to fetch belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the new resource belongs to </param>
-        /// <param name="body"> The message to send to the channel </param>
-        /// <param name="from"> The identity of the new message's author </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(string pathServiceSid,
-                                             string pathChannelSid,
-                                             string body,
-                                             string from = null,
-                                             string attributes = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(pathServiceSid, pathChannelSid, body){From = from, Attributes = attributes};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the new resource belongs to </param>
-        /// <param name="body"> The message to send to the channel </param>
-        /// <param name="from"> The identity of the new message's author </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(string pathServiceSid,
-                                                                                     string pathChannelSid,
-                                                                                     string body,
-                                                                                     string from = null,
-                                                                                     string attributes = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(pathServiceSid, pathChannelSid, body){From = from, Attributes = attributes};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The unique ID of the Channel the message to read belongs to </param>
-        /// <param name="order"> The sort order of the returned messages </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(string pathServiceSid,
-                                                        string pathChannelSid,
-                                                        MessageResource.OrderTypeEnum order = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(pathServiceSid, pathChannelSid){Order = order, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The unique ID of the Channel the message to read belongs to </param>
-        /// <param name="order"> The sort order of the returned messages </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathServiceSid,
-                                                                                                string pathChannelSid,
-                                                                                                MessageResource.OrderTypeEnum order = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(pathServiceSid, pathChannelSid){Order = order, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the message to delete belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The unique ID of the channel the message to delete belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathChannelSid"> he unique ID of the Channel the message belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="body"> The message to send to the channel </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(string pathServiceSid,
-                                             string pathChannelSid,
-                                             string pathSid,
-                                             string body = null,
-                                             string attributes = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid){Body = body, Attributes = attributes};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathChannelSid"> he unique ID of the Channel the message belongs to </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="body"> The message to send to the channel </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathServiceSid,
-                                                                                     string pathChannelSid,
-                                                                                     string pathSid,
-                                                                                     string body = null,
-                                                                                     string attributes = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid){Body = body, Attributes = attributes};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a MessageResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MessageResource object represented by the provided JSON </returns>
-        public static MessageResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MessageResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The JSON string that stores application-specific data
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Channel that the message was sent to
-        /// </summary>
-        [JsonProperty("to")]
-        public string To { get; private set; }
-        /// <summary>
-        /// The unique ID of the Channel the Message resource belongs to
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Whether the message has been edited since  it was created
-        /// </summary>
-        [JsonProperty("was_edited")]
-        public bool? WasEdited { get; private set; }
-        /// <summary>
-        /// The identity of the message's author
-        /// </summary>
-        [JsonProperty("from")]
-        public string From { get; private set; }
-        /// <summary>
-        /// The content of the message
-        /// </summary>
-        [JsonProperty("body")]
-        public string Body { get; private set; }
-        /// <summary>
-        /// The index of the message within the Channel
-        /// </summary>
-        [JsonProperty("index")]
-        public int? Index { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Message resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private MessageResource()
-        {
-
-        }
-    }
+{
+
+  public class MessageResource : Resource
+  {
+    public sealed class OrderTypeEnum : StringEnum
+    {
+      private OrderTypeEnum(string value) : base(value) { }
+      public OrderTypeEnum() { }
+      public static implicit operator OrderTypeEnum(string value)
+      {
+        return new OrderTypeEnum(value);
+      }
+
+      public static readonly OrderTypeEnum Asc = new OrderTypeEnum("asc");
+      public static readonly OrderTypeEnum Desc = new OrderTypeEnum("desc");
+    }
+
+    private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The unique ID of the Channel the message to fetch belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string pathSid,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The unique ID of the Channel the message to fetch belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the new resource belongs to </param>
+    /// <param name="body"> The message to send to the channel </param>
+    /// <param name="from"> The identity of the new message's author </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(string pathServiceSid,
+                                         string pathChannelSid,
+                                         string body,
+                                         string from = null,
+                                         string attributes = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(pathServiceSid, pathChannelSid, body) { From = from, Attributes = attributes };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the new resource belongs to </param>
+    /// <param name="body"> The message to send to the channel </param>
+    /// <param name="from"> The identity of the new message's author </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(string pathServiceSid,
+                                                                                 string pathChannelSid,
+                                                                                 string body,
+                                                                                 string from = null,
+                                                                                 string attributes = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(pathServiceSid, pathChannelSid, body) { From = from, Attributes = attributes };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The unique ID of the Channel the message to read belongs to </param>
+    /// <param name="order"> The sort order of the returned messages </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(string pathServiceSid,
+                                                    string pathChannelSid,
+                                                    MessageResource.OrderTypeEnum order = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions(pathServiceSid, pathChannelSid) { Order = order, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The unique ID of the Channel the message to read belongs to </param>
+    /// <param name="order"> The sort order of the returned messages </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathServiceSid,
+                                                                                            string pathChannelSid,
+                                                                                            MessageResource.OrderTypeEnum order = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions(pathServiceSid, pathChannelSid) { Order = order, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the message to delete belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The unique ID of the channel the message to delete belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathChannelSid"> he unique ID of the Channel the message belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="body"> The message to send to the channel </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(string pathServiceSid,
+                                         string pathChannelSid,
+                                         string pathSid,
+                                         string body = null,
+                                         string attributes = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid) { Body = body, Attributes = attributes };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathChannelSid"> he unique ID of the Channel the message belongs to </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="body"> The message to send to the channel </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathServiceSid,
+                                                                                 string pathChannelSid,
+                                                                                 string pathSid,
+                                                                                 string body = null,
+                                                                                 string attributes = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid) { Body = body, Attributes = attributes };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a MessageResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MessageResource object represented by the provided JSON </returns>
+    public static MessageResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MessageResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The JSON string that stores application-specific data
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Channel that the message was sent to
+    /// </summary>
+    [JsonProperty("to")]
+    public string To { get; private set; }
+    /// <summary>
+    /// The unique ID of the Channel the Message resource belongs to
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Whether the message has been edited since  it was created
+    /// </summary>
+    [JsonProperty("was_edited")]
+    public bool? WasEdited { get; private set; }
+    /// <summary>
+    /// The identity of the message's author
+    /// </summary>
+    [JsonProperty("from")]
+    public string From { get; private set; }
+    /// <summary>
+    /// The content of the message
+    /// </summary>
+    [JsonProperty("body")]
+    public string Body { get; private set; }
+    /// <summary>
+    /// The index of the message within the Channel
+    /// </summary>
+    [JsonProperty("index")]
+    public int? Index { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Message resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private MessageResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/ChannelOptions.cs b/src/Twilio/Rest/Chat/V1/Service/ChannelOptions.cs
index 53e3fca7c..72115deb8 100644
--- a/src/Twilio/Rest/Chat/V1/Service/ChannelOptions.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/ChannelOptions.cs
@@ -10,247 +10,247 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchChannelOptions
+  /// </summary>
+  public class FetchChannelOptions : IOptions<ChannelResource>
+  {
     /// <summary>
-    /// FetchChannelOptions
+    /// The SID of the Service to fetch the resource from
     /// </summary>
-    public class FetchChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchChannelOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteChannelOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class DeleteChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteChannelOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateChannelOptions
+    /// Construct a new FetchChannelOptions
     /// </summary>
-    public class CreateChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// A string to describe the new resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The visibility of the channel
-        /// </summary>
-        public ChannelResource.ChannelTypeEnum Type { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        public CreateChannelOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchChannelOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadChannelOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadChannelOptions : ReadOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The visibility of the channel to read
-        /// </summary>
-        public List<ChannelResource.ChannelTypeEnum> Type { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        public ReadChannelOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-            Type = new List<ChannelResource.ChannelTypeEnum>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.AddRange(Type.Select(prop => new KeyValuePair<string, string>("Type", prop.ToString())));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteChannelOptions
+  /// </summary>
+  public class DeleteChannelOptions : IOptions<ChannelResource>
+  {
     /// <summary>
-    /// UpdateChannelOptions
+    /// The SID of the Service to delete the resource from
     /// </summary>
-    public class UpdateChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateChannelOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteChannelOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateChannelOptions
+  /// </summary>
+  public class CreateChannelOptions : IOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// A string to describe the new resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The visibility of the channel
+    /// </summary>
+    public ChannelResource.ChannelTypeEnum Type { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    public CreateChannelOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadChannelOptions
+  /// </summary>
+  public class ReadChannelOptions : ReadOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The visibility of the channel to read
+    /// </summary>
+    public List<ChannelResource.ChannelTypeEnum> Type { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    public ReadChannelOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+      Type = new List<ChannelResource.ChannelTypeEnum>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.AddRange(Type.Select(prop => new KeyValuePair<string, string>("Type", prop.ToString())));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateChannelOptions
+  /// </summary>
+  public class UpdateChannelOptions : IOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateChannelOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/ChannelResource.cs b/src/Twilio/Rest/Chat/V1/Service/ChannelResource.cs
index 6b7ec2d22..1f1f23d77 100644
--- a/src/Twilio/Rest/Chat/V1/Service/ChannelResource.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/ChannelResource.cs
@@ -17,562 +17,562 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V1.Service
-{
-
-    public class ChannelResource : Resource
-    {
-        public sealed class ChannelTypeEnum : StringEnum
-        {
-            private ChannelTypeEnum(string value) : base(value) {}
-            public ChannelTypeEnum() {}
-            public static implicit operator ChannelTypeEnum(string value)
-            {
-                return new ChannelTypeEnum(value);
-            }
-
-            public static readonly ChannelTypeEnum Public = new ChannelTypeEnum("public");
-            public static readonly ChannelTypeEnum Private = new ChannelTypeEnum("private");
-        }
-
-        private static Request BuildFetchRequest(FetchChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Fetch(FetchChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(FetchChannelOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchChannelOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchChannelOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static bool Delete(DeleteChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteChannelOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteChannelOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteChannelOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Create(CreateChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(CreateChannelOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="type"> The visibility of the channel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Create(string pathServiceSid,
-                                             string friendlyName = null,
-                                             string uniqueName = null,
-                                             string attributes = null,
-                                             ChannelResource.ChannelTypeEnum type = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateChannelOptions(pathServiceSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="type"> The visibility of the channel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(string pathServiceSid,
-                                                                                     string friendlyName = null,
-                                                                                     string uniqueName = null,
-                                                                                     string attributes = null,
-                                                                                     ChannelResource.ChannelTypeEnum type = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateChannelOptions(pathServiceSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ResourceSet<ChannelResource> Read(ReadChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<ChannelResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(ReadChannelOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<ChannelResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="type"> The visibility of the channel to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ResourceSet<ChannelResource> Read(string pathServiceSid,
-                                                        List<ChannelResource.ChannelTypeEnum> type = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadChannelOptions(pathServiceSid){Type = type, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="type"> The visibility of the channel to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(string pathServiceSid,
-                                                                                                List<ChannelResource.ChannelTypeEnum> type = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadChannelOptions(pathServiceSid){Type = type, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ChannelResource> NextPage(Page<ChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ChannelResource> PreviousPage(Page<ChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("channels", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Update(UpdateChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(UpdateChannelOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Update(string pathServiceSid,
-                                             string pathSid,
-                                             string friendlyName = null,
-                                             string uniqueName = null,
-                                             string attributes = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateChannelOptions(pathServiceSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(string pathServiceSid,
-                                                                                     string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     string uniqueName = null,
-                                                                                     string attributes = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateChannelOptions(pathServiceSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ChannelResource object represented by the provided JSON </returns>
-        public static ChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The JSON string that stores application-specific data
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The visibility of the channel. Can be: `public` or `private`
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ChannelResource.ChannelTypeEnum Type { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The identity of the User that created the channel
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-        /// <summary>
-        /// The number of Members in the Channel
-        /// </summary>
-        [JsonProperty("members_count")]
-        public int? MembersCount { get; private set; }
-        /// <summary>
-        /// The number of Messages in the Channel
-        /// </summary>
-        [JsonProperty("messages_count")]
-        public int? MessagesCount { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Channel resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Absolute URLs to access the Members, Messages , Invites and, if it exists, the last Message for the Channel
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class ChannelResource : Resource
+  {
+    public sealed class ChannelTypeEnum : StringEnum
+    {
+      private ChannelTypeEnum(string value) : base(value) { }
+      public ChannelTypeEnum() { }
+      public static implicit operator ChannelTypeEnum(string value)
+      {
+        return new ChannelTypeEnum(value);
+      }
+
+      public static readonly ChannelTypeEnum Public = new ChannelTypeEnum("public");
+      public static readonly ChannelTypeEnum Private = new ChannelTypeEnum("private");
+    }
+
+    private static Request BuildFetchRequest(FetchChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Fetch(FetchChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(FetchChannelOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchChannelOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(string pathServiceSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchChannelOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static bool Delete(DeleteChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteChannelOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteChannelOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteChannelOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Create(CreateChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(CreateChannelOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="type"> The visibility of the channel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Create(string pathServiceSid,
+                                         string friendlyName = null,
+                                         string uniqueName = null,
+                                         string attributes = null,
+                                         ChannelResource.ChannelTypeEnum type = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateChannelOptions(pathServiceSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="type"> The visibility of the channel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(string pathServiceSid,
+                                                                                 string friendlyName = null,
+                                                                                 string uniqueName = null,
+                                                                                 string attributes = null,
+                                                                                 ChannelResource.ChannelTypeEnum type = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateChannelOptions(pathServiceSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ResourceSet<ChannelResource> Read(ReadChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<ChannelResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(ReadChannelOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<ChannelResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="type"> The visibility of the channel to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ResourceSet<ChannelResource> Read(string pathServiceSid,
+                                                    List<ChannelResource.ChannelTypeEnum> type = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadChannelOptions(pathServiceSid) { Type = type, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="type"> The visibility of the channel to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(string pathServiceSid,
+                                                                                            List<ChannelResource.ChannelTypeEnum> type = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadChannelOptions(pathServiceSid) { Type = type, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ChannelResource> NextPage(Page<ChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ChannelResource> PreviousPage(Page<ChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("channels", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Update(UpdateChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(UpdateChannelOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Update(string pathServiceSid,
+                                         string pathSid,
+                                         string friendlyName = null,
+                                         string uniqueName = null,
+                                         string attributes = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateChannelOptions(pathServiceSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(string pathServiceSid,
+                                                                                 string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 string uniqueName = null,
+                                                                                 string attributes = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateChannelOptions(pathServiceSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ChannelResource object represented by the provided JSON </returns>
+    public static ChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The JSON string that stores application-specific data
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The visibility of the channel. Can be: `public` or `private`
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ChannelResource.ChannelTypeEnum Type { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The identity of the User that created the channel
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+    /// <summary>
+    /// The number of Members in the Channel
+    /// </summary>
+    [JsonProperty("members_count")]
+    public int? MembersCount { get; private set; }
+    /// <summary>
+    /// The number of Messages in the Channel
+    /// </summary>
+    [JsonProperty("messages_count")]
+    public int? MessagesCount { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Channel resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Absolute URLs to access the Members, Messages , Invites and, if it exists, the last Message for the Channel
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/RoleOptions.cs b/src/Twilio/Rest/Chat/V1/Service/RoleOptions.cs
index 206da86ba..398770e03 100644
--- a/src/Twilio/Rest/Chat/V1/Service/RoleOptions.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/RoleOptions.cs
@@ -10,221 +10,221 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchRoleOptions
+  /// </summary>
+  public class FetchRoleOptions : IOptions<RoleResource>
+  {
     /// <summary>
-    /// FetchRoleOptions
-    /// </summary>
-    public class FetchRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchRoleOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteRoleOptions
-    /// </summary>
-    public class DeleteRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteRoleOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateRoleOptions
-    /// </summary>
-    public class CreateRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// A string to describe the new resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The type of role
-        /// </summary>
-        public RoleResource.RoleTypeEnum Type { get; }
-        /// <summary>
-        /// A permission the role should have
-        /// </summary>
-        public List<string> Permission { get; }
-
-        /// <summary>
-        /// Construct a new CreateRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="type"> The type of role </param>
-        /// <param name="permission"> A permission the role should have </param>
-        public CreateRoleOptions(string pathServiceSid,
-                                 string friendlyName,
-                                 RoleResource.RoleTypeEnum type,
-                                 List<string> permission)
-        {
-            PathServiceSid = pathServiceSid;
-            FriendlyName = friendlyName;
-            Type = type;
-            Permission = permission;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (Permission != null)
-            {
-                p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchRoleOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadRoleOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadRoleOptions : ReadOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        public ReadRoleOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteRoleOptions
+  /// </summary>
+  public class DeleteRoleOptions : IOptions<RoleResource>
+  {
     /// <summary>
-    /// UpdateRoleOptions
-    /// </summary>
-    public class UpdateRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A permission the role should have
-        /// </summary>
-        public List<string> Permission { get; }
-
-        /// <summary>
-        /// Construct a new UpdateRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="permission"> A permission the role should have </param>
-        public UpdateRoleOptions(string pathServiceSid, string pathSid, List<string> permission)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-            Permission = permission;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Permission != null)
-            {
-                p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteRoleOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateRoleOptions
+  /// </summary>
+  public class CreateRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// A string to describe the new resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The type of role
+    /// </summary>
+    public RoleResource.RoleTypeEnum Type { get; }
+    /// <summary>
+    /// A permission the role should have
+    /// </summary>
+    public List<string> Permission { get; }
+
+    /// <summary>
+    /// Construct a new CreateRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="type"> The type of role </param>
+    /// <param name="permission"> A permission the role should have </param>
+    public CreateRoleOptions(string pathServiceSid,
+                             string friendlyName,
+                             RoleResource.RoleTypeEnum type,
+                             List<string> permission)
+    {
+      PathServiceSid = pathServiceSid;
+      FriendlyName = friendlyName;
+      Type = type;
+      Permission = permission;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (Permission != null)
+      {
+        p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadRoleOptions
+  /// </summary>
+  public class ReadRoleOptions : ReadOptions<RoleResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    public ReadRoleOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateRoleOptions
+  /// </summary>
+  public class UpdateRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A permission the role should have
+    /// </summary>
+    public List<string> Permission { get; }
+
+    /// <summary>
+    /// Construct a new UpdateRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="permission"> A permission the role should have </param>
+    public UpdateRoleOptions(string pathServiceSid, string pathSid, List<string> permission)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+      Permission = permission;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Permission != null)
+      {
+        p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/RoleResource.cs b/src/Twilio/Rest/Chat/V1/Service/RoleResource.cs
index 1744cb3d9..459ce0aea 100644
--- a/src/Twilio/Rest/Chat/V1/Service/RoleResource.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/RoleResource.cs
@@ -17,521 +17,521 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V1.Service
-{
-
-    public class RoleResource : Resource
-    {
-        public sealed class RoleTypeEnum : StringEnum
-        {
-            private RoleTypeEnum(string value) : base(value) {}
-            public RoleTypeEnum() {}
-            public static implicit operator RoleTypeEnum(string value)
-            {
-                return new RoleTypeEnum(value);
-            }
-
-            public static readonly RoleTypeEnum Channel = new RoleTypeEnum("channel");
-            public static readonly RoleTypeEnum Deployment = new RoleTypeEnum("deployment");
-        }
-
-        private static Request BuildFetchRequest(FetchRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Fetch(FetchRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(FetchRoleOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRoleOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(string pathServiceSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchRoleOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static bool Delete(DeleteRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoleOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoleOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoleOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Roles",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Create(CreateRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(CreateRoleOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="type"> The type of role </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Create(string pathServiceSid,
-                                          string friendlyName,
-                                          RoleResource.RoleTypeEnum type,
-                                          List<string> permission,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="type"> The type of role </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(string pathServiceSid,
-                                                                                  string friendlyName,
-                                                                                  RoleResource.RoleTypeEnum type,
-                                                                                  List<string> permission,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Roles",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static ResourceSet<RoleResource> Read(ReadRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RoleResource>.FromJson("roles", response.Content);
-            return new ResourceSet<RoleResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(ReadRoleOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RoleResource>.FromJson("roles", response.Content);
-            return new ResourceSet<RoleResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static ResourceSet<RoleResource> Read(string pathServiceSid,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadRoleOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(string pathServiceSid,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadRoleOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RoleResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RoleResource> NextPage(Page<RoleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RoleResource> PreviousPage(Page<RoleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Update(UpdateRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(UpdateRoleOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Update(string pathServiceSid,
-                                          string pathSid,
-                                          List<string> permission,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(string pathServiceSid,
-                                                                                  string pathSid,
-                                                                                  List<string> permission,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RoleResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RoleResource object represented by the provided JSON </returns>
-        public static RoleResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RoleResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type of role
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoleResource.RoleTypeEnum Type { get; private set; }
-        /// <summary>
-        /// An array of the permissions the role has been granted
-        /// </summary>
-        [JsonProperty("permissions")]
-        public List<string> Permissions { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Role resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private RoleResource()
-        {
-
-        }
-    }
+{
+
+  public class RoleResource : Resource
+  {
+    public sealed class RoleTypeEnum : StringEnum
+    {
+      private RoleTypeEnum(string value) : base(value) { }
+      public RoleTypeEnum() { }
+      public static implicit operator RoleTypeEnum(string value)
+      {
+        return new RoleTypeEnum(value);
+      }
+
+      public static readonly RoleTypeEnum Channel = new RoleTypeEnum("channel");
+      public static readonly RoleTypeEnum Deployment = new RoleTypeEnum("deployment");
+    }
+
+    private static Request BuildFetchRequest(FetchRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Fetch(FetchRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(FetchRoleOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRoleOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(string pathServiceSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchRoleOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static bool Delete(DeleteRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoleOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoleOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoleOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Roles",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Create(CreateRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(CreateRoleOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="type"> The type of role </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Create(string pathServiceSid,
+                                      string friendlyName,
+                                      RoleResource.RoleTypeEnum type,
+                                      List<string> permission,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="type"> The type of role </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(string pathServiceSid,
+                                                                              string friendlyName,
+                                                                              RoleResource.RoleTypeEnum type,
+                                                                              List<string> permission,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Roles",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static ResourceSet<RoleResource> Read(ReadRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RoleResource>.FromJson("roles", response.Content);
+      return new ResourceSet<RoleResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(ReadRoleOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RoleResource>.FromJson("roles", response.Content);
+      return new ResourceSet<RoleResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static ResourceSet<RoleResource> Read(string pathServiceSid,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadRoleOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(string pathServiceSid,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadRoleOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RoleResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RoleResource> NextPage(Page<RoleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RoleResource> PreviousPage(Page<RoleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Update(UpdateRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(UpdateRoleOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Update(string pathServiceSid,
+                                      string pathSid,
+                                      List<string> permission,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(string pathServiceSid,
+                                                                              string pathSid,
+                                                                              List<string> permission,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RoleResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RoleResource object represented by the provided JSON </returns>
+    public static RoleResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RoleResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type of role
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoleResource.RoleTypeEnum Type { get; private set; }
+    /// <summary>
+    /// An array of the permissions the role has been granted
+    /// </summary>
+    [JsonProperty("permissions")]
+    public List<string> Permissions { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Role resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private RoleResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/User/UserChannelOptions.cs b/src/Twilio/Rest/Chat/V1/Service/User/UserChannelOptions.cs
index 1cd6fcde6..0a706c1f0 100644
--- a/src/Twilio/Rest/Chat/V1/Service/User/UserChannelOptions.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/User/UserChannelOptions.cs
@@ -9,46 +9,46 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V1.Service.User
-{
-
+{
+
+  /// <summary>
+  /// List all Channels for a given User.
+  /// </summary>
+  public class ReadUserChannelOptions : ReadOptions<UserChannelResource>
+  {
     /// <summary>
-    /// List all Channels for a given User.
+    /// The SID of the Service to read the resources from
     /// </summary>
-    public class ReadUserChannelOptions : ReadOptions<UserChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the User to fetch the User Channel resources from
-        /// </summary>
-        public string PathUserSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadUserChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
-        public ReadUserChannelOptions(string pathServiceSid, string pathUserSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the User to fetch the User Channel resources from
+    /// </summary>
+    public string PathUserSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadUserChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
+    public ReadUserChannelOptions(string pathServiceSid, string pathUserSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/User/UserChannelResource.cs b/src/Twilio/Rest/Chat/V1/Service/User/UserChannelResource.cs
index 3885a1609..58a55e16d 100644
--- a/src/Twilio/Rest/Chat/V1/Service/User/UserChannelResource.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/User/UserChannelResource.cs
@@ -17,225 +17,225 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V1.Service.User
-{
-
-    public class UserChannelResource : Resource
-    {
-        public sealed class ChannelStatusEnum : StringEnum
-        {
-            private ChannelStatusEnum(string value) : base(value) {}
-            public ChannelStatusEnum() {}
-            public static implicit operator ChannelStatusEnum(string value)
-            {
-                return new ChannelStatusEnum(value);
-            }
-
-            public static readonly ChannelStatusEnum Joined = new ChannelStatusEnum("joined");
-            public static readonly ChannelStatusEnum Invited = new ChannelStatusEnum("invited");
-            public static readonly ChannelStatusEnum NotParticipating = new ChannelStatusEnum("not_participating");
-        }
-
-        private static Request BuildReadRequest(ReadUserChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// List all Channels for a given User.
-        /// </summary>
-        /// <param name="options"> Read UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static ResourceSet<UserChannelResource> Read(ReadUserChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<UserChannelResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List all Channels for a given User.
-        /// </summary>
-        /// <param name="options"> Read UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(ReadUserChannelOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<UserChannelResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// List all Channels for a given User.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static ResourceSet<UserChannelResource> Read(string pathServiceSid,
-                                                            string pathUserSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List all Channels for a given User.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(string pathServiceSid,
-                                                                                                    string pathUserSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserChannelResource> NextPage(Page<UserChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<UserChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserChannelResource> PreviousPage(Page<UserChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<UserChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a UserChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserChannelResource object represented by the provided JSON </returns>
-        public static UserChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Channel the resource belongs to
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The SID of the User as a Member in the Channel
-        /// </summary>
-        [JsonProperty("member_sid")]
-        public string MemberSid { get; private set; }
-        /// <summary>
-        /// The status of the User on the Channel
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public UserChannelResource.ChannelStatusEnum Status { get; private set; }
-        /// <summary>
-        /// The index of the last Message in the Channel the Member has read
-        /// </summary>
-        [JsonProperty("last_consumed_message_index")]
-        public int? LastConsumedMessageIndex { get; private set; }
-        /// <summary>
-        /// The number of unread Messages in the Channel for the User
-        /// </summary>
-        [JsonProperty("unread_messages_count")]
-        public int? UnreadMessagesCount { get; private set; }
-        /// <summary>
-        /// Absolute URLs to access the Members, Messages , Invites and, if it exists, the last Message for the Channel
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private UserChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class UserChannelResource : Resource
+  {
+    public sealed class ChannelStatusEnum : StringEnum
+    {
+      private ChannelStatusEnum(string value) : base(value) { }
+      public ChannelStatusEnum() { }
+      public static implicit operator ChannelStatusEnum(string value)
+      {
+        return new ChannelStatusEnum(value);
+      }
+
+      public static readonly ChannelStatusEnum Joined = new ChannelStatusEnum("joined");
+      public static readonly ChannelStatusEnum Invited = new ChannelStatusEnum("invited");
+      public static readonly ChannelStatusEnum NotParticipating = new ChannelStatusEnum("not_participating");
+    }
+
+    private static Request BuildReadRequest(ReadUserChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// List all Channels for a given User.
+    /// </summary>
+    /// <param name="options"> Read UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static ResourceSet<UserChannelResource> Read(ReadUserChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<UserChannelResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List all Channels for a given User.
+    /// </summary>
+    /// <param name="options"> Read UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(ReadUserChannelOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<UserChannelResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// List all Channels for a given User.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static ResourceSet<UserChannelResource> Read(string pathServiceSid,
+                                                        string pathUserSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List all Channels for a given User.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(string pathServiceSid,
+                                                                                                string pathUserSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserChannelResource> NextPage(Page<UserChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<UserChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserChannelResource> PreviousPage(Page<UserChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<UserChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a UserChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserChannelResource object represented by the provided JSON </returns>
+    public static UserChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Channel the resource belongs to
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The SID of the User as a Member in the Channel
+    /// </summary>
+    [JsonProperty("member_sid")]
+    public string MemberSid { get; private set; }
+    /// <summary>
+    /// The status of the User on the Channel
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public UserChannelResource.ChannelStatusEnum Status { get; private set; }
+    /// <summary>
+    /// The index of the last Message in the Channel the Member has read
+    /// </summary>
+    [JsonProperty("last_consumed_message_index")]
+    public int? LastConsumedMessageIndex { get; private set; }
+    /// <summary>
+    /// The number of unread Messages in the Channel for the User
+    /// </summary>
+    [JsonProperty("unread_messages_count")]
+    public int? UnreadMessagesCount { get; private set; }
+    /// <summary>
+    /// Absolute URLs to access the Members, Messages , Invites and, if it exists, the last Message for the Channel
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private UserChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/UserOptions.cs b/src/Twilio/Rest/Chat/V1/Service/UserOptions.cs
index aa3bf1d11..472d14cd1 100644
--- a/src/Twilio/Rest/Chat/V1/Service/UserOptions.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/UserOptions.cs
@@ -9,239 +9,239 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchUserOptions
+  /// </summary>
+  public class FetchUserOptions : IOptions<UserResource>
+  {
     /// <summary>
-    /// FetchUserOptions
-    /// </summary>
-    public class FetchUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchUserOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteUserOptions
-    /// </summary>
-    public class DeleteUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteUserOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateUserOptions
-    /// </summary>
-    public class CreateUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the new resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The `identity` value that identifies the new resource's User
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The SID of the Role assigned to this user
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// A string to describe the new resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the new resource under </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        public CreateUserOptions(string pathServiceSid, string identity)
-        {
-            PathServiceSid = pathServiceSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchUserOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadUserOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadUserOptions : ReadOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        public ReadUserOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteUserOptions
+  /// </summary>
+  public class DeleteUserOptions : IOptions<UserResource>
+  {
     /// <summary>
-    /// UpdateUserOptions
-    /// </summary>
-    public class UpdateUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The SID id of the Role assigned to this user
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateUserOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteUserOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateUserOptions
+  /// </summary>
+  public class CreateUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the new resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The `identity` value that identifies the new resource's User
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The SID of the Role assigned to this user
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// A string to describe the new resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the new resource under </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    public CreateUserOptions(string pathServiceSid, string identity)
+    {
+      PathServiceSid = pathServiceSid;
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadUserOptions
+  /// </summary>
+  public class ReadUserOptions : ReadOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    public ReadUserOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateUserOptions
+  /// </summary>
+  public class UpdateUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The SID id of the Role assigned to this user
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateUserOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/Service/UserResource.cs b/src/Twilio/Rest/Chat/V1/Service/UserResource.cs
index 56294b012..5b52d36f1 100644
--- a/src/Twilio/Rest/Chat/V1/Service/UserResource.cs
+++ b/src/Twilio/Rest/Chat/V1/Service/UserResource.cs
@@ -16,544 +16,544 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Chat.V1.Service
-{
-
-    public class UserResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathServiceSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static bool Delete(DeleteUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Users",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Create(CreateUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> CreateAsync(CreateUserOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the new resource under </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="roleSid"> The SID of the Role assigned to this user </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Create(string pathServiceSid,
-                                          string identity,
-                                          string roleSid = null,
-                                          string attributes = null,
-                                          string friendlyName = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateUserOptions(pathServiceSid, identity){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the new resource under </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="roleSid"> The SID of the Role assigned to this user </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> CreateAsync(string pathServiceSid,
-                                                                                  string identity,
-                                                                                  string roleSid = null,
-                                                                                  string attributes = null,
-                                                                                  string friendlyName = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateUserOptions(pathServiceSid, identity){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Users",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static ResourceSet<UserResource> Read(ReadUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserResource>.FromJson("users", response.Content);
-            return new ResourceSet<UserResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(ReadUserOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserResource>.FromJson("users", response.Content);
-            return new ResourceSet<UserResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static ResourceSet<UserResource> Read(string pathServiceSid,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadUserOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(string pathServiceSid,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadUserOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserResource> NextPage(Page<UserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserResource> PreviousPage(Page<UserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="roleSid"> The SID id of the Role assigned to this user </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(string pathServiceSid,
-                                          string pathSid,
-                                          string roleSid = null,
-                                          string attributes = null,
-                                          string friendlyName = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathServiceSid, pathSid){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="roleSid"> The SID id of the Role assigned to this user </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathServiceSid,
-                                                                                  string pathSid,
-                                                                                  string roleSid = null,
-                                                                                  string attributes = null,
-                                                                                  string friendlyName = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathServiceSid, pathSid){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a UserResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserResource object represented by the provided JSON </returns>
-        public static UserResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The JSON string that stores application-specific data
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The SID of the assigned to the user
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// Whether the User is actively connected to the Service instance and online
-        /// </summary>
-        [JsonProperty("is_online")]
-        public bool? IsOnline { get; private set; }
-        /// <summary>
-        /// Whether the User has a potentially valid Push Notification registration for the Service instance
-        /// </summary>
-        [JsonProperty("is_notifiable")]
-        public bool? IsNotifiable { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The number of Channels this User is a Member of
-        /// </summary>
-        [JsonProperty("joined_channels_count")]
-        public int? JoinedChannelsCount { get; private set; }
-        /// <summary>
-        /// The absolute URLs of the Channel and Binding resources related to the user
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The absolute URL of the User resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private UserResource()
-        {
-
-        }
-    }
+{
+
+  public class UserResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathServiceSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static bool Delete(DeleteUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Users",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Create(CreateUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> CreateAsync(CreateUserOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the new resource under </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="roleSid"> The SID of the Role assigned to this user </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Create(string pathServiceSid,
+                                      string identity,
+                                      string roleSid = null,
+                                      string attributes = null,
+                                      string friendlyName = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateUserOptions(pathServiceSid, identity) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the new resource under </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="roleSid"> The SID of the Role assigned to this user </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> CreateAsync(string pathServiceSid,
+                                                                              string identity,
+                                                                              string roleSid = null,
+                                                                              string attributes = null,
+                                                                              string friendlyName = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateUserOptions(pathServiceSid, identity) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Users",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static ResourceSet<UserResource> Read(ReadUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserResource>.FromJson("users", response.Content);
+      return new ResourceSet<UserResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(ReadUserOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserResource>.FromJson("users", response.Content);
+      return new ResourceSet<UserResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static ResourceSet<UserResource> Read(string pathServiceSid,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadUserOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(string pathServiceSid,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadUserOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserResource> NextPage(Page<UserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserResource> PreviousPage(Page<UserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="roleSid"> The SID id of the Role assigned to this user </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(string pathServiceSid,
+                                      string pathSid,
+                                      string roleSid = null,
+                                      string attributes = null,
+                                      string friendlyName = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathServiceSid, pathSid) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="roleSid"> The SID id of the Role assigned to this user </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathServiceSid,
+                                                                              string pathSid,
+                                                                              string roleSid = null,
+                                                                              string attributes = null,
+                                                                              string friendlyName = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathServiceSid, pathSid) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a UserResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserResource object represented by the provided JSON </returns>
+    public static UserResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The JSON string that stores application-specific data
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The SID of the assigned to the user
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The string that identifies the resource's User
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// Whether the User is actively connected to the Service instance and online
+    /// </summary>
+    [JsonProperty("is_online")]
+    public bool? IsOnline { get; private set; }
+    /// <summary>
+    /// Whether the User has a potentially valid Push Notification registration for the Service instance
+    /// </summary>
+    [JsonProperty("is_notifiable")]
+    public bool? IsNotifiable { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The number of Channels this User is a Member of
+    /// </summary>
+    [JsonProperty("joined_channels_count")]
+    public int? JoinedChannelsCount { get; private set; }
+    /// <summary>
+    /// The absolute URLs of the Channel and Binding resources related to the user
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The absolute URL of the User resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private UserResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/ServiceOptions.cs b/src/Twilio/Rest/Chat/V1/ServiceOptions.cs
index 5642e7ae4..31e5d0d58 100644
--- a/src/Twilio/Rest/Chat/V1/ServiceOptions.cs
+++ b/src/Twilio/Rest/Chat/V1/ServiceOptions.cs
@@ -10,634 +10,634 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V1
-{
-
+{
+
+  /// <summary>
+  /// FetchServiceOptions
+  /// </summary>
+  public class FetchServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// FetchServiceOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class FetchServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteServiceOptions
+    /// Construct a new FetchServiceOptions
     /// </summary>
-    public class DeleteServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// CreateServiceOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Construct a new CreateServiceOptions
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        public CreateServiceOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteServiceOptions
+  /// </summary>
+  public class DeleteServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// ReadServiceOptions
-    /// </summary>
-    public class ReadServiceOptions : ReadOptions<ServiceResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// UpdateServiceOptions
-    /// </summary>
-    public class UpdateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The service role assigned to users when they are added to the service
-        /// </summary>
-        public string DefaultServiceRoleSid { get; set; }
-        /// <summary>
-        /// The channel role assigned to users when they are added to a channel
-        /// </summary>
-        public string DefaultChannelRoleSid { get; set; }
-        /// <summary>
-        /// The channel role assigned to a channel creator when they join a new channel
-        /// </summary>
-        public string DefaultChannelCreatorRoleSid { get; set; }
-        /// <summary>
-        /// Whether to enable the Message Consumption Horizon feature
-        /// </summary>
-        public bool? ReadStatusEnabled { get; set; }
-        /// <summary>
-        /// Whether to enable the Reachability Indicator feature for this Service instance
-        /// </summary>
-        public bool? ReachabilityEnabled { get; set; }
-        /// <summary>
-        /// How long in seconds to wait before assuming the user is no longer typing
-        /// </summary>
-        public int? TypingIndicatorTimeout { get; set; }
-        /// <summary>
-        /// DEPRECATED
-        /// </summary>
-        public int? ConsumptionReportInterval { get; set; }
-        /// <summary>
-        /// Whether to send a notification when a new message is added to a channel
-        /// </summary>
-        public bool? NotificationsNewMessageEnabled { get; set; }
-        /// <summary>
-        /// The template to use to create the notification text displayed when a new message is added to a channel
-        /// </summary>
-        public string NotificationsNewMessageTemplate { get; set; }
-        /// <summary>
-        /// Whether to send a notification when a member is added to a channel
-        /// </summary>
-        public bool? NotificationsAddedToChannelEnabled { get; set; }
-        /// <summary>
-        /// The template to use to create the notification text displayed when a member is added to a channel
-        /// </summary>
-        public string NotificationsAddedToChannelTemplate { get; set; }
-        /// <summary>
-        /// Whether to send a notification to a user when they are removed from a channel
-        /// </summary>
-        public bool? NotificationsRemovedFromChannelEnabled { get; set; }
-        /// <summary>
-        /// The template to use to create the notification text displayed to a user when they are removed
-        /// </summary>
-        public string NotificationsRemovedFromChannelTemplate { get; set; }
-        /// <summary>
-        /// Whether to send a notification when a user is invited to a channel
-        /// </summary>
-        public bool? NotificationsInvitedToChannelEnabled { get; set; }
-        /// <summary>
-        /// The template to use to create the notification text displayed when a user is invited to a channel
-        /// </summary>
-        public string NotificationsInvitedToChannelTemplate { get; set; }
-        /// <summary>
-        /// The webhook URL for pre-event webhooks
-        /// </summary>
-        public Uri PreWebhookUrl { get; set; }
-        /// <summary>
-        /// The URL for post-event webhooks
-        /// </summary>
-        public Uri PostWebhookUrl { get; set; }
-        /// <summary>
-        /// The HTTP method  to use for both PRE and POST webhooks
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhookMethod { get; set; }
-        /// <summary>
-        /// The list of WebHook events that are enabled for this Service instance
-        /// </summary>
-        public List<string> WebhookFilters { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_message_send event
-        /// </summary>
-        public Uri WebhooksOnMessageSendUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling the webhooks.on_message_send.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMessageSendMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_message_update event
-        /// </summary>
-        public Uri WebhooksOnMessageUpdateUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling the webhooks.on_message_update.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMessageUpdateMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_message_remove event
-        /// </summary>
-        public Uri WebhooksOnMessageRemoveUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling the webhooks.on_message_remove.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMessageRemoveMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_channel_add event
-        /// </summary>
-        public Uri WebhooksOnChannelAddUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling the webhooks.on_channel_add.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnChannelAddMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_channel_destroy event
-        /// </summary>
-        public Uri WebhooksOnChannelDestroyUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling the webhooks.on_channel_destroy.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnChannelDestroyMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_channel_update event
-        /// </summary>
-        public Uri WebhooksOnChannelUpdateUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling the webhooks.on_channel_update.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnChannelUpdateMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_member_add event
-        /// </summary>
-        public Uri WebhooksOnMemberAddUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling the webhooks.on_member_add.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMemberAddMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_member_remove event
-        /// </summary>
-        public Uri WebhooksOnMemberRemoveUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling the webhooks.on_member_remove.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMemberRemoveMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_message_sent event
-        /// </summary>
-        public Uri WebhooksOnMessageSentUrl { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_message_sent event
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMessageSentMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_message_updated event
-        /// </summary>
-        public Uri WebhooksOnMessageUpdatedUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling the webhooks.on_message_updated.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMessageUpdatedMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_message_removed event
-        /// </summary>
-        public Uri WebhooksOnMessageRemovedUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling the webhooks.on_message_removed.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMessageRemovedMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_channel_added event
-        /// </summary>
-        public Uri WebhooksOnChannelAddedUrl { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_channel_added event
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnChannelAddedMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_channel_added event
-        /// </summary>
-        public Uri WebhooksOnChannelDestroyedUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling the webhooks.on_channel_destroyed.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnChannelDestroyedMethod { get; set; }
-        /// <summary>
-        /// he URL of the webhook to call in response to the on_channel_updated event
-        /// </summary>
-        public Uri WebhooksOnChannelUpdatedUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling the webhooks.on_channel_updated.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnChannelUpdatedMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_channel_updated event
-        /// </summary>
-        public Uri WebhooksOnMemberAddedUrl { get; set; }
-        /// <summary>
-        /// he HTTP method to use when calling the webhooks.on_channel_updated.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMemberAddedMethod { get; set; }
-        /// <summary>
-        /// The URL of the webhook to call in response to the on_member_removed event
-        /// </summary>
-        public Uri WebhooksOnMemberRemovedUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use when calling the webhooks.on_member_removed.url
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMemberRemovedMethod { get; set; }
-        /// <summary>
-        /// The maximum number of Members that can be added to Channels within this Service
-        /// </summary>
-        public int? LimitsChannelMembers { get; set; }
-        /// <summary>
-        /// The maximum number of Channels Users can be a Member of within this Service
-        /// </summary>
-        public int? LimitsUserChannels { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-            WebhookFilters = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DefaultServiceRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultServiceRoleSid", DefaultServiceRoleSid.ToString()));
-            }
-
-            if (DefaultChannelRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultChannelRoleSid", DefaultChannelRoleSid.ToString()));
-            }
-
-            if (DefaultChannelCreatorRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultChannelCreatorRoleSid", DefaultChannelCreatorRoleSid.ToString()));
-            }
-
-            if (ReadStatusEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReadStatusEnabled", ReadStatusEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ReachabilityEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReachabilityEnabled", ReachabilityEnabled.Value.ToString().ToLower()));
-            }
-
-            if (TypingIndicatorTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TypingIndicatorTimeout", TypingIndicatorTimeout.ToString()));
-            }
-
-            if (ConsumptionReportInterval != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConsumptionReportInterval", ConsumptionReportInterval.ToString()));
-            }
-
-            if (NotificationsNewMessageEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Enabled", NotificationsNewMessageEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsNewMessageTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Template", NotificationsNewMessageTemplate));
-            }
-
-            if (NotificationsAddedToChannelEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Enabled", NotificationsAddedToChannelEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsAddedToChannelTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Template", NotificationsAddedToChannelTemplate));
-            }
-
-            if (NotificationsRemovedFromChannelEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Enabled", NotificationsRemovedFromChannelEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsRemovedFromChannelTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Template", NotificationsRemovedFromChannelTemplate));
-            }
-
-            if (NotificationsInvitedToChannelEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Enabled", NotificationsInvitedToChannelEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsInvitedToChannelTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Template", NotificationsInvitedToChannelTemplate));
-            }
-
-            if (PreWebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PreWebhookUrl", Serializers.Url(PreWebhookUrl)));
-            }
-
-            if (PostWebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostWebhookUrl", Serializers.Url(PostWebhookUrl)));
-            }
-
-            if (WebhookMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod.ToString()));
-            }
-
-            if (WebhookFilters != null)
-            {
-                p.AddRange(WebhookFilters.Select(prop => new KeyValuePair<string, string>("WebhookFilters", prop)));
-            }
-
-            if (WebhooksOnMessageSendUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSend.Url", Serializers.Url(WebhooksOnMessageSendUrl)));
-            }
-
-            if (WebhooksOnMessageSendMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSend.Method", WebhooksOnMessageSendMethod.ToString()));
-            }
-
-            if (WebhooksOnMessageUpdateUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdate.Url", Serializers.Url(WebhooksOnMessageUpdateUrl)));
-            }
-
-            if (WebhooksOnMessageUpdateMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdate.Method", WebhooksOnMessageUpdateMethod.ToString()));
-            }
-
-            if (WebhooksOnMessageRemoveUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemove.Url", Serializers.Url(WebhooksOnMessageRemoveUrl)));
-            }
-
-            if (WebhooksOnMessageRemoveMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemove.Method", WebhooksOnMessageRemoveMethod.ToString()));
-            }
-
-            if (WebhooksOnChannelAddUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdd.Url", Serializers.Url(WebhooksOnChannelAddUrl)));
-            }
-
-            if (WebhooksOnChannelAddMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdd.Method", WebhooksOnChannelAddMethod.ToString()));
-            }
-
-            if (WebhooksOnChannelDestroyUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroy.Url", Serializers.Url(WebhooksOnChannelDestroyUrl)));
-            }
-
-            if (WebhooksOnChannelDestroyMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroy.Method", WebhooksOnChannelDestroyMethod.ToString()));
-            }
-
-            if (WebhooksOnChannelUpdateUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdate.Url", Serializers.Url(WebhooksOnChannelUpdateUrl)));
-            }
-
-            if (WebhooksOnChannelUpdateMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdate.Method", WebhooksOnChannelUpdateMethod.ToString()));
-            }
-
-            if (WebhooksOnMemberAddUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdd.Url", Serializers.Url(WebhooksOnMemberAddUrl)));
-            }
-
-            if (WebhooksOnMemberAddMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdd.Method", WebhooksOnMemberAddMethod.ToString()));
-            }
-
-            if (WebhooksOnMemberRemoveUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemove.Url", Serializers.Url(WebhooksOnMemberRemoveUrl)));
-            }
-
-            if (WebhooksOnMemberRemoveMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemove.Method", WebhooksOnMemberRemoveMethod.ToString()));
-            }
-
-            if (WebhooksOnMessageSentUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSent.Url", Serializers.Url(WebhooksOnMessageSentUrl)));
-            }
-
-            if (WebhooksOnMessageSentMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSent.Method", WebhooksOnMessageSentMethod.ToString()));
-            }
-
-            if (WebhooksOnMessageUpdatedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdated.Url", Serializers.Url(WebhooksOnMessageUpdatedUrl)));
-            }
-
-            if (WebhooksOnMessageUpdatedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdated.Method", WebhooksOnMessageUpdatedMethod.ToString()));
-            }
-
-            if (WebhooksOnMessageRemovedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemoved.Url", Serializers.Url(WebhooksOnMessageRemovedUrl)));
-            }
-
-            if (WebhooksOnMessageRemovedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemoved.Method", WebhooksOnMessageRemovedMethod.ToString()));
-            }
-
-            if (WebhooksOnChannelAddedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdded.Url", Serializers.Url(WebhooksOnChannelAddedUrl)));
-            }
-
-            if (WebhooksOnChannelAddedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdded.Method", WebhooksOnChannelAddedMethod.ToString()));
-            }
-
-            if (WebhooksOnChannelDestroyedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroyed.Url", Serializers.Url(WebhooksOnChannelDestroyedUrl)));
-            }
-
-            if (WebhooksOnChannelDestroyedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroyed.Method", WebhooksOnChannelDestroyedMethod.ToString()));
-            }
-
-            if (WebhooksOnChannelUpdatedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdated.Url", Serializers.Url(WebhooksOnChannelUpdatedUrl)));
-            }
-
-            if (WebhooksOnChannelUpdatedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdated.Method", WebhooksOnChannelUpdatedMethod.ToString()));
-            }
-
-            if (WebhooksOnMemberAddedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdded.Url", Serializers.Url(WebhooksOnMemberAddedUrl)));
-            }
-
-            if (WebhooksOnMemberAddedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdded.Method", WebhooksOnMemberAddedMethod.ToString()));
-            }
-
-            if (WebhooksOnMemberRemovedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemoved.Url", Serializers.Url(WebhooksOnMemberRemovedUrl)));
-            }
-
-            if (WebhooksOnMemberRemovedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemoved.Method", WebhooksOnMemberRemovedMethod.ToString()));
-            }
-
-            if (LimitsChannelMembers != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Limits.ChannelMembers", LimitsChannelMembers.ToString()));
-            }
-
-            if (LimitsUserChannels != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Limits.UserChannels", LimitsUserChannels.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new DeleteServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateServiceOptions
+  /// </summary>
+  public class CreateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
+
+    /// <summary>
+    /// Construct a new CreateServiceOptions
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    public CreateServiceOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadServiceOptions
+  /// </summary>
+  public class ReadServiceOptions : ReadOptions<ServiceResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateServiceOptions
+  /// </summary>
+  public class UpdateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The service role assigned to users when they are added to the service
+    /// </summary>
+    public string DefaultServiceRoleSid { get; set; }
+    /// <summary>
+    /// The channel role assigned to users when they are added to a channel
+    /// </summary>
+    public string DefaultChannelRoleSid { get; set; }
+    /// <summary>
+    /// The channel role assigned to a channel creator when they join a new channel
+    /// </summary>
+    public string DefaultChannelCreatorRoleSid { get; set; }
+    /// <summary>
+    /// Whether to enable the Message Consumption Horizon feature
+    /// </summary>
+    public bool? ReadStatusEnabled { get; set; }
+    /// <summary>
+    /// Whether to enable the Reachability Indicator feature for this Service instance
+    /// </summary>
+    public bool? ReachabilityEnabled { get; set; }
+    /// <summary>
+    /// How long in seconds to wait before assuming the user is no longer typing
+    /// </summary>
+    public int? TypingIndicatorTimeout { get; set; }
+    /// <summary>
+    /// DEPRECATED
+    /// </summary>
+    public int? ConsumptionReportInterval { get; set; }
+    /// <summary>
+    /// Whether to send a notification when a new message is added to a channel
+    /// </summary>
+    public bool? NotificationsNewMessageEnabled { get; set; }
+    /// <summary>
+    /// The template to use to create the notification text displayed when a new message is added to a channel
+    /// </summary>
+    public string NotificationsNewMessageTemplate { get; set; }
+    /// <summary>
+    /// Whether to send a notification when a member is added to a channel
+    /// </summary>
+    public bool? NotificationsAddedToChannelEnabled { get; set; }
+    /// <summary>
+    /// The template to use to create the notification text displayed when a member is added to a channel
+    /// </summary>
+    public string NotificationsAddedToChannelTemplate { get; set; }
+    /// <summary>
+    /// Whether to send a notification to a user when they are removed from a channel
+    /// </summary>
+    public bool? NotificationsRemovedFromChannelEnabled { get; set; }
+    /// <summary>
+    /// The template to use to create the notification text displayed to a user when they are removed
+    /// </summary>
+    public string NotificationsRemovedFromChannelTemplate { get; set; }
+    /// <summary>
+    /// Whether to send a notification when a user is invited to a channel
+    /// </summary>
+    public bool? NotificationsInvitedToChannelEnabled { get; set; }
+    /// <summary>
+    /// The template to use to create the notification text displayed when a user is invited to a channel
+    /// </summary>
+    public string NotificationsInvitedToChannelTemplate { get; set; }
+    /// <summary>
+    /// The webhook URL for pre-event webhooks
+    /// </summary>
+    public Uri PreWebhookUrl { get; set; }
+    /// <summary>
+    /// The URL for post-event webhooks
+    /// </summary>
+    public Uri PostWebhookUrl { get; set; }
+    /// <summary>
+    /// The HTTP method  to use for both PRE and POST webhooks
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhookMethod { get; set; }
+    /// <summary>
+    /// The list of WebHook events that are enabled for this Service instance
+    /// </summary>
+    public List<string> WebhookFilters { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_message_send event
+    /// </summary>
+    public Uri WebhooksOnMessageSendUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling the webhooks.on_message_send.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMessageSendMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_message_update event
+    /// </summary>
+    public Uri WebhooksOnMessageUpdateUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling the webhooks.on_message_update.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMessageUpdateMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_message_remove event
+    /// </summary>
+    public Uri WebhooksOnMessageRemoveUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling the webhooks.on_message_remove.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMessageRemoveMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_channel_add event
+    /// </summary>
+    public Uri WebhooksOnChannelAddUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling the webhooks.on_channel_add.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnChannelAddMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_channel_destroy event
+    /// </summary>
+    public Uri WebhooksOnChannelDestroyUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling the webhooks.on_channel_destroy.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnChannelDestroyMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_channel_update event
+    /// </summary>
+    public Uri WebhooksOnChannelUpdateUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling the webhooks.on_channel_update.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnChannelUpdateMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_member_add event
+    /// </summary>
+    public Uri WebhooksOnMemberAddUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling the webhooks.on_member_add.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMemberAddMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_member_remove event
+    /// </summary>
+    public Uri WebhooksOnMemberRemoveUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling the webhooks.on_member_remove.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMemberRemoveMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_message_sent event
+    /// </summary>
+    public Uri WebhooksOnMessageSentUrl { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_message_sent event
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMessageSentMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_message_updated event
+    /// </summary>
+    public Uri WebhooksOnMessageUpdatedUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling the webhooks.on_message_updated.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMessageUpdatedMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_message_removed event
+    /// </summary>
+    public Uri WebhooksOnMessageRemovedUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling the webhooks.on_message_removed.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMessageRemovedMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_channel_added event
+    /// </summary>
+    public Uri WebhooksOnChannelAddedUrl { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_channel_added event
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnChannelAddedMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_channel_added event
+    /// </summary>
+    public Uri WebhooksOnChannelDestroyedUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling the webhooks.on_channel_destroyed.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnChannelDestroyedMethod { get; set; }
+    /// <summary>
+    /// he URL of the webhook to call in response to the on_channel_updated event
+    /// </summary>
+    public Uri WebhooksOnChannelUpdatedUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling the webhooks.on_channel_updated.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnChannelUpdatedMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_channel_updated event
+    /// </summary>
+    public Uri WebhooksOnMemberAddedUrl { get; set; }
+    /// <summary>
+    /// he HTTP method to use when calling the webhooks.on_channel_updated.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMemberAddedMethod { get; set; }
+    /// <summary>
+    /// The URL of the webhook to call in response to the on_member_removed event
+    /// </summary>
+    public Uri WebhooksOnMemberRemovedUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use when calling the webhooks.on_member_removed.url
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMemberRemovedMethod { get; set; }
+    /// <summary>
+    /// The maximum number of Members that can be added to Channels within this Service
+    /// </summary>
+    public int? LimitsChannelMembers { get; set; }
+    /// <summary>
+    /// The maximum number of Channels Users can be a Member of within this Service
+    /// </summary>
+    public int? LimitsUserChannels { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+      WebhookFilters = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DefaultServiceRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultServiceRoleSid", DefaultServiceRoleSid.ToString()));
+      }
+
+      if (DefaultChannelRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultChannelRoleSid", DefaultChannelRoleSid.ToString()));
+      }
+
+      if (DefaultChannelCreatorRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultChannelCreatorRoleSid", DefaultChannelCreatorRoleSid.ToString()));
+      }
+
+      if (ReadStatusEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReadStatusEnabled", ReadStatusEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ReachabilityEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReachabilityEnabled", ReachabilityEnabled.Value.ToString().ToLower()));
+      }
+
+      if (TypingIndicatorTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TypingIndicatorTimeout", TypingIndicatorTimeout.ToString()));
+      }
+
+      if (ConsumptionReportInterval != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConsumptionReportInterval", ConsumptionReportInterval.ToString()));
+      }
+
+      if (NotificationsNewMessageEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Enabled", NotificationsNewMessageEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsNewMessageTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Template", NotificationsNewMessageTemplate));
+      }
+
+      if (NotificationsAddedToChannelEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Enabled", NotificationsAddedToChannelEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsAddedToChannelTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Template", NotificationsAddedToChannelTemplate));
+      }
+
+      if (NotificationsRemovedFromChannelEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Enabled", NotificationsRemovedFromChannelEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsRemovedFromChannelTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Template", NotificationsRemovedFromChannelTemplate));
+      }
+
+      if (NotificationsInvitedToChannelEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Enabled", NotificationsInvitedToChannelEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsInvitedToChannelTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Template", NotificationsInvitedToChannelTemplate));
+      }
+
+      if (PreWebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PreWebhookUrl", Serializers.Url(PreWebhookUrl)));
+      }
+
+      if (PostWebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostWebhookUrl", Serializers.Url(PostWebhookUrl)));
+      }
+
+      if (WebhookMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod.ToString()));
+      }
+
+      if (WebhookFilters != null)
+      {
+        p.AddRange(WebhookFilters.Select(prop => new KeyValuePair<string, string>("WebhookFilters", prop)));
+      }
+
+      if (WebhooksOnMessageSendUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSend.Url", Serializers.Url(WebhooksOnMessageSendUrl)));
+      }
+
+      if (WebhooksOnMessageSendMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSend.Method", WebhooksOnMessageSendMethod.ToString()));
+      }
+
+      if (WebhooksOnMessageUpdateUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdate.Url", Serializers.Url(WebhooksOnMessageUpdateUrl)));
+      }
+
+      if (WebhooksOnMessageUpdateMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdate.Method", WebhooksOnMessageUpdateMethod.ToString()));
+      }
+
+      if (WebhooksOnMessageRemoveUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemove.Url", Serializers.Url(WebhooksOnMessageRemoveUrl)));
+      }
+
+      if (WebhooksOnMessageRemoveMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemove.Method", WebhooksOnMessageRemoveMethod.ToString()));
+      }
+
+      if (WebhooksOnChannelAddUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdd.Url", Serializers.Url(WebhooksOnChannelAddUrl)));
+      }
+
+      if (WebhooksOnChannelAddMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdd.Method", WebhooksOnChannelAddMethod.ToString()));
+      }
+
+      if (WebhooksOnChannelDestroyUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroy.Url", Serializers.Url(WebhooksOnChannelDestroyUrl)));
+      }
+
+      if (WebhooksOnChannelDestroyMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroy.Method", WebhooksOnChannelDestroyMethod.ToString()));
+      }
+
+      if (WebhooksOnChannelUpdateUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdate.Url", Serializers.Url(WebhooksOnChannelUpdateUrl)));
+      }
+
+      if (WebhooksOnChannelUpdateMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdate.Method", WebhooksOnChannelUpdateMethod.ToString()));
+      }
+
+      if (WebhooksOnMemberAddUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdd.Url", Serializers.Url(WebhooksOnMemberAddUrl)));
+      }
+
+      if (WebhooksOnMemberAddMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdd.Method", WebhooksOnMemberAddMethod.ToString()));
+      }
+
+      if (WebhooksOnMemberRemoveUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemove.Url", Serializers.Url(WebhooksOnMemberRemoveUrl)));
+      }
+
+      if (WebhooksOnMemberRemoveMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemove.Method", WebhooksOnMemberRemoveMethod.ToString()));
+      }
+
+      if (WebhooksOnMessageSentUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSent.Url", Serializers.Url(WebhooksOnMessageSentUrl)));
+      }
+
+      if (WebhooksOnMessageSentMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSent.Method", WebhooksOnMessageSentMethod.ToString()));
+      }
+
+      if (WebhooksOnMessageUpdatedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdated.Url", Serializers.Url(WebhooksOnMessageUpdatedUrl)));
+      }
+
+      if (WebhooksOnMessageUpdatedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdated.Method", WebhooksOnMessageUpdatedMethod.ToString()));
+      }
+
+      if (WebhooksOnMessageRemovedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemoved.Url", Serializers.Url(WebhooksOnMessageRemovedUrl)));
+      }
+
+      if (WebhooksOnMessageRemovedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemoved.Method", WebhooksOnMessageRemovedMethod.ToString()));
+      }
+
+      if (WebhooksOnChannelAddedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdded.Url", Serializers.Url(WebhooksOnChannelAddedUrl)));
+      }
+
+      if (WebhooksOnChannelAddedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdded.Method", WebhooksOnChannelAddedMethod.ToString()));
+      }
+
+      if (WebhooksOnChannelDestroyedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroyed.Url", Serializers.Url(WebhooksOnChannelDestroyedUrl)));
+      }
+
+      if (WebhooksOnChannelDestroyedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroyed.Method", WebhooksOnChannelDestroyedMethod.ToString()));
+      }
+
+      if (WebhooksOnChannelUpdatedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdated.Url", Serializers.Url(WebhooksOnChannelUpdatedUrl)));
+      }
+
+      if (WebhooksOnChannelUpdatedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdated.Method", WebhooksOnChannelUpdatedMethod.ToString()));
+      }
+
+      if (WebhooksOnMemberAddedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdded.Url", Serializers.Url(WebhooksOnMemberAddedUrl)));
+      }
+
+      if (WebhooksOnMemberAddedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdded.Method", WebhooksOnMemberAddedMethod.ToString()));
+      }
+
+      if (WebhooksOnMemberRemovedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemoved.Url", Serializers.Url(WebhooksOnMemberRemovedUrl)));
+      }
+
+      if (WebhooksOnMemberRemovedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemoved.Method", WebhooksOnMemberRemovedMethod.ToString()));
+      }
+
+      if (LimitsChannelMembers != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Limits.ChannelMembers", LimitsChannelMembers.ToString()));
+      }
+
+      if (LimitsUserChannels != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Limits.UserChannels", LimitsUserChannels.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V1/ServiceResource.cs b/src/Twilio/Rest/Chat/V1/ServiceResource.cs
index 76c02952e..b83dd3deb 100644
--- a/src/Twilio/Rest/Chat/V1/ServiceResource.cs
+++ b/src/Twilio/Rest/Chat/V1/ServiceResource.cs
@@ -16,837 +16,837 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Chat.V1
-{
-
-    public class ServiceResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Services",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(string friendlyName, ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v1/Services",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v1/Services/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="defaultServiceRoleSid"> The service role assigned to users when they are added to the service </param>
-        /// <param name="defaultChannelRoleSid"> The channel role assigned to users when they are added to a channel </param>
-        /// <param name="defaultChannelCreatorRoleSid"> The channel role assigned to a channel creator when they join a new
-        ///                                    channel </param>
-        /// <param name="readStatusEnabled"> Whether to enable the Message Consumption Horizon feature </param>
-        /// <param name="reachabilityEnabled"> Whether to enable the Reachability Indicator feature for this Service instance
-        ///                           </param>
-        /// <param name="typingIndicatorTimeout"> How long in seconds to wait before assuming the user is no longer typing
-        ///                              </param>
-        /// <param name="consumptionReportInterval"> DEPRECATED </param>
-        /// <param name="notificationsNewMessageEnabled"> Whether to send a notification when a new message is added to a
-        ///                                      channel </param>
-        /// <param name="notificationsNewMessageTemplate"> The template to use to create the notification text displayed when a
-        ///                                       new message is added to a channel </param>
-        /// <param name="notificationsAddedToChannelEnabled"> Whether to send a notification when a member is added to a
-        ///                                          channel </param>
-        /// <param name="notificationsAddedToChannelTemplate"> The template to use to create the notification text displayed
-        ///                                           when a member is added to a channel </param>
-        /// <param name="notificationsRemovedFromChannelEnabled"> Whether to send a notification to a user when they are
-        ///                                              removed from a channel </param>
-        /// <param name="notificationsRemovedFromChannelTemplate"> The template to use to create the notification text
-        ///                                               displayed to a user when they are removed </param>
-        /// <param name="notificationsInvitedToChannelEnabled"> Whether to send a notification when a user is invited to a
-        ///                                            channel </param>
-        /// <param name="notificationsInvitedToChannelTemplate"> The template to use to create the notification text displayed
-        ///                                             when a user is invited to a channel </param>
-        /// <param name="preWebhookUrl"> The webhook URL for pre-event webhooks </param>
-        /// <param name="postWebhookUrl"> The URL for post-event webhooks </param>
-        /// <param name="webhookMethod"> The HTTP method  to use for both PRE and POST webhooks </param>
-        /// <param name="webhookFilters"> The list of WebHook events that are enabled for this Service instance </param>
-        /// <param name="webhooksOnMessageSendUrl"> The URL of the webhook to call in response to the on_message_send event
-        ///                                </param>
-        /// <param name="webhooksOnMessageSendMethod"> The HTTP method to use when calling the webhooks.on_message_send.url
-        ///                                   </param>
-        /// <param name="webhooksOnMessageUpdateUrl"> The URL of the webhook to call in response to the on_message_update event
-        ///                                  </param>
-        /// <param name="webhooksOnMessageUpdateMethod"> The HTTP method to use when calling the webhooks.on_message_update.url
-        ///                                     </param>
-        /// <param name="webhooksOnMessageRemoveUrl"> The URL of the webhook to call in response to the on_message_remove event
-        ///                                  </param>
-        /// <param name="webhooksOnMessageRemoveMethod"> The HTTP method to use when calling the webhooks.on_message_remove.url
-        ///                                     </param>
-        /// <param name="webhooksOnChannelAddUrl"> The URL of the webhook to call in response to the on_channel_add event
-        ///                               </param>
-        /// <param name="webhooksOnChannelAddMethod"> The HTTP method to use when calling the webhooks.on_channel_add.url
-        ///                                  </param>
-        /// <param name="webhooksOnChannelDestroyUrl"> The URL of the webhook to call in response to the on_channel_destroy
-        ///                                   event </param>
-        /// <param name="webhooksOnChannelDestroyMethod"> The HTTP method to use when calling the
-        ///                                      webhooks.on_channel_destroy.url </param>
-        /// <param name="webhooksOnChannelUpdateUrl"> The URL of the webhook to call in response to the on_channel_update event
-        ///                                  </param>
-        /// <param name="webhooksOnChannelUpdateMethod"> The HTTP method to use when calling the webhooks.on_channel_update.url
-        ///                                     </param>
-        /// <param name="webhooksOnMemberAddUrl"> The URL of the webhook to call in response to the on_member_add event </param>
-        /// <param name="webhooksOnMemberAddMethod"> The HTTP method to use when calling the webhooks.on_member_add.url </param>
-        /// <param name="webhooksOnMemberRemoveUrl"> The URL of the webhook to call in response to the on_member_remove event
-        ///                                 </param>
-        /// <param name="webhooksOnMemberRemoveMethod"> The HTTP method to use when calling the webhooks.on_member_remove.url
-        ///                                    </param>
-        /// <param name="webhooksOnMessageSentUrl"> The URL of the webhook to call in response to the on_message_sent event
-        ///                                </param>
-        /// <param name="webhooksOnMessageSentMethod"> The URL of the webhook to call in response to the on_message_sent event
-        ///                                   </param>
-        /// <param name="webhooksOnMessageUpdatedUrl"> The URL of the webhook to call in response to the on_message_updated
-        ///                                   event </param>
-        /// <param name="webhooksOnMessageUpdatedMethod"> The HTTP method to use when calling the
-        ///                                      webhooks.on_message_updated.url </param>
-        /// <param name="webhooksOnMessageRemovedUrl"> The URL of the webhook to call in response to the on_message_removed
-        ///                                   event </param>
-        /// <param name="webhooksOnMessageRemovedMethod"> The HTTP method to use when calling the
-        ///                                      webhooks.on_message_removed.url </param>
-        /// <param name="webhooksOnChannelAddedUrl"> The URL of the webhook to call in response to the on_channel_added event
-        ///                                 </param>
-        /// <param name="webhooksOnChannelAddedMethod"> The URL of the webhook to call in response to the on_channel_added
-        ///                                    event </param>
-        /// <param name="webhooksOnChannelDestroyedUrl"> The URL of the webhook to call in response to the on_channel_added
-        ///                                     event </param>
-        /// <param name="webhooksOnChannelDestroyedMethod"> The HTTP method to use when calling the
-        ///                                        webhooks.on_channel_destroyed.url </param>
-        /// <param name="webhooksOnChannelUpdatedUrl"> he URL of the webhook to call in response to the on_channel_updated
-        ///                                   event </param>
-        /// <param name="webhooksOnChannelUpdatedMethod"> The HTTP method to use when calling the
-        ///                                      webhooks.on_channel_updated.url </param>
-        /// <param name="webhooksOnMemberAddedUrl"> The URL of the webhook to call in response to the on_channel_updated event
-        ///                                </param>
-        /// <param name="webhooksOnMemberAddedMethod"> he HTTP method to use when calling the webhooks.on_channel_updated.url
-        ///                                   </param>
-        /// <param name="webhooksOnMemberRemovedUrl"> The URL of the webhook to call in response to the on_member_removed event
-        ///                                  </param>
-        /// <param name="webhooksOnMemberRemovedMethod"> The HTTP method to use when calling the webhooks.on_member_removed.url
-        ///                                     </param>
-        /// <param name="limitsChannelMembers"> The maximum number of Members that can be added to Channels within this Service
-        ///                            </param>
-        /// <param name="limitsUserChannels"> The maximum number of Channels Users can be a Member of within this Service
-        ///                          </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(string pathSid,
-                                             string friendlyName = null,
-                                             string defaultServiceRoleSid = null,
-                                             string defaultChannelRoleSid = null,
-                                             string defaultChannelCreatorRoleSid = null,
-                                             bool? readStatusEnabled = null,
-                                             bool? reachabilityEnabled = null,
-                                             int? typingIndicatorTimeout = null,
-                                             int? consumptionReportInterval = null,
-                                             bool? notificationsNewMessageEnabled = null,
-                                             string notificationsNewMessageTemplate = null,
-                                             bool? notificationsAddedToChannelEnabled = null,
-                                             string notificationsAddedToChannelTemplate = null,
-                                             bool? notificationsRemovedFromChannelEnabled = null,
-                                             string notificationsRemovedFromChannelTemplate = null,
-                                             bool? notificationsInvitedToChannelEnabled = null,
-                                             string notificationsInvitedToChannelTemplate = null,
-                                             Uri preWebhookUrl = null,
-                                             Uri postWebhookUrl = null,
-                                             Twilio.Http.HttpMethod webhookMethod = null,
-                                             List<string> webhookFilters = null,
-                                             Uri webhooksOnMessageSendUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMessageSendMethod = null,
-                                             Uri webhooksOnMessageUpdateUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMessageUpdateMethod = null,
-                                             Uri webhooksOnMessageRemoveUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMessageRemoveMethod = null,
-                                             Uri webhooksOnChannelAddUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnChannelAddMethod = null,
-                                             Uri webhooksOnChannelDestroyUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnChannelDestroyMethod = null,
-                                             Uri webhooksOnChannelUpdateUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnChannelUpdateMethod = null,
-                                             Uri webhooksOnMemberAddUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMemberAddMethod = null,
-                                             Uri webhooksOnMemberRemoveUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMemberRemoveMethod = null,
-                                             Uri webhooksOnMessageSentUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMessageSentMethod = null,
-                                             Uri webhooksOnMessageUpdatedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMessageUpdatedMethod = null,
-                                             Uri webhooksOnMessageRemovedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMessageRemovedMethod = null,
-                                             Uri webhooksOnChannelAddedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnChannelAddedMethod = null,
-                                             Uri webhooksOnChannelDestroyedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnChannelDestroyedMethod = null,
-                                             Uri webhooksOnChannelUpdatedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnChannelUpdatedMethod = null,
-                                             Uri webhooksOnMemberAddedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMemberAddedMethod = null,
-                                             Uri webhooksOnMemberRemovedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMemberRemovedMethod = null,
-                                             int? limitsChannelMembers = null,
-                                             int? limitsUserChannels = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, WebhooksOnMessageSendUrl = webhooksOnMessageSendUrl, WebhooksOnMessageSendMethod = webhooksOnMessageSendMethod, WebhooksOnMessageUpdateUrl = webhooksOnMessageUpdateUrl, WebhooksOnMessageUpdateMethod = webhooksOnMessageUpdateMethod, WebhooksOnMessageRemoveUrl = webhooksOnMessageRemoveUrl, WebhooksOnMessageRemoveMethod = webhooksOnMessageRemoveMethod, WebhooksOnChannelAddUrl = webhooksOnChannelAddUrl, WebhooksOnChannelAddMethod = webhooksOnChannelAddMethod, WebhooksOnChannelDestroyUrl = webhooksOnChannelDestroyUrl, WebhooksOnChannelDestroyMethod = webhooksOnChannelDestroyMethod, WebhooksOnChannelUpdateUrl = webhooksOnChannelUpdateUrl, WebhooksOnChannelUpdateMethod = webhooksOnChannelUpdateMethod, WebhooksOnMemberAddUrl = webhooksOnMemberAddUrl, WebhooksOnMemberAddMethod = webhooksOnMemberAddMethod, WebhooksOnMemberRemoveUrl = webhooksOnMemberRemoveUrl, WebhooksOnMemberRemoveMethod = webhooksOnMemberRemoveMethod, WebhooksOnMessageSentUrl = webhooksOnMessageSentUrl, WebhooksOnMessageSentMethod = webhooksOnMessageSentMethod, WebhooksOnMessageUpdatedUrl = webhooksOnMessageUpdatedUrl, WebhooksOnMessageUpdatedMethod = webhooksOnMessageUpdatedMethod, WebhooksOnMessageRemovedUrl = webhooksOnMessageRemovedUrl, WebhooksOnMessageRemovedMethod = webhooksOnMessageRemovedMethod, WebhooksOnChannelAddedUrl = webhooksOnChannelAddedUrl, WebhooksOnChannelAddedMethod = webhooksOnChannelAddedMethod, WebhooksOnChannelDestroyedUrl = webhooksOnChannelDestroyedUrl, WebhooksOnChannelDestroyedMethod = webhooksOnChannelDestroyedMethod, WebhooksOnChannelUpdatedUrl = webhooksOnChannelUpdatedUrl, WebhooksOnChannelUpdatedMethod = webhooksOnChannelUpdatedMethod, WebhooksOnMemberAddedUrl = webhooksOnMemberAddedUrl, WebhooksOnMemberAddedMethod = webhooksOnMemberAddedMethod, WebhooksOnMemberRemovedUrl = webhooksOnMemberRemovedUrl, WebhooksOnMemberRemovedMethod = webhooksOnMemberRemovedMethod, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="defaultServiceRoleSid"> The service role assigned to users when they are added to the service </param>
-        /// <param name="defaultChannelRoleSid"> The channel role assigned to users when they are added to a channel </param>
-        /// <param name="defaultChannelCreatorRoleSid"> The channel role assigned to a channel creator when they join a new
-        ///                                    channel </param>
-        /// <param name="readStatusEnabled"> Whether to enable the Message Consumption Horizon feature </param>
-        /// <param name="reachabilityEnabled"> Whether to enable the Reachability Indicator feature for this Service instance
-        ///                           </param>
-        /// <param name="typingIndicatorTimeout"> How long in seconds to wait before assuming the user is no longer typing
-        ///                              </param>
-        /// <param name="consumptionReportInterval"> DEPRECATED </param>
-        /// <param name="notificationsNewMessageEnabled"> Whether to send a notification when a new message is added to a
-        ///                                      channel </param>
-        /// <param name="notificationsNewMessageTemplate"> The template to use to create the notification text displayed when a
-        ///                                       new message is added to a channel </param>
-        /// <param name="notificationsAddedToChannelEnabled"> Whether to send a notification when a member is added to a
-        ///                                          channel </param>
-        /// <param name="notificationsAddedToChannelTemplate"> The template to use to create the notification text displayed
-        ///                                           when a member is added to a channel </param>
-        /// <param name="notificationsRemovedFromChannelEnabled"> Whether to send a notification to a user when they are
-        ///                                              removed from a channel </param>
-        /// <param name="notificationsRemovedFromChannelTemplate"> The template to use to create the notification text
-        ///                                               displayed to a user when they are removed </param>
-        /// <param name="notificationsInvitedToChannelEnabled"> Whether to send a notification when a user is invited to a
-        ///                                            channel </param>
-        /// <param name="notificationsInvitedToChannelTemplate"> The template to use to create the notification text displayed
-        ///                                             when a user is invited to a channel </param>
-        /// <param name="preWebhookUrl"> The webhook URL for pre-event webhooks </param>
-        /// <param name="postWebhookUrl"> The URL for post-event webhooks </param>
-        /// <param name="webhookMethod"> The HTTP method  to use for both PRE and POST webhooks </param>
-        /// <param name="webhookFilters"> The list of WebHook events that are enabled for this Service instance </param>
-        /// <param name="webhooksOnMessageSendUrl"> The URL of the webhook to call in response to the on_message_send event
-        ///                                </param>
-        /// <param name="webhooksOnMessageSendMethod"> The HTTP method to use when calling the webhooks.on_message_send.url
-        ///                                   </param>
-        /// <param name="webhooksOnMessageUpdateUrl"> The URL of the webhook to call in response to the on_message_update event
-        ///                                  </param>
-        /// <param name="webhooksOnMessageUpdateMethod"> The HTTP method to use when calling the webhooks.on_message_update.url
-        ///                                     </param>
-        /// <param name="webhooksOnMessageRemoveUrl"> The URL of the webhook to call in response to the on_message_remove event
-        ///                                  </param>
-        /// <param name="webhooksOnMessageRemoveMethod"> The HTTP method to use when calling the webhooks.on_message_remove.url
-        ///                                     </param>
-        /// <param name="webhooksOnChannelAddUrl"> The URL of the webhook to call in response to the on_channel_add event
-        ///                               </param>
-        /// <param name="webhooksOnChannelAddMethod"> The HTTP method to use when calling the webhooks.on_channel_add.url
-        ///                                  </param>
-        /// <param name="webhooksOnChannelDestroyUrl"> The URL of the webhook to call in response to the on_channel_destroy
-        ///                                   event </param>
-        /// <param name="webhooksOnChannelDestroyMethod"> The HTTP method to use when calling the
-        ///                                      webhooks.on_channel_destroy.url </param>
-        /// <param name="webhooksOnChannelUpdateUrl"> The URL of the webhook to call in response to the on_channel_update event
-        ///                                  </param>
-        /// <param name="webhooksOnChannelUpdateMethod"> The HTTP method to use when calling the webhooks.on_channel_update.url
-        ///                                     </param>
-        /// <param name="webhooksOnMemberAddUrl"> The URL of the webhook to call in response to the on_member_add event </param>
-        /// <param name="webhooksOnMemberAddMethod"> The HTTP method to use when calling the webhooks.on_member_add.url </param>
-        /// <param name="webhooksOnMemberRemoveUrl"> The URL of the webhook to call in response to the on_member_remove event
-        ///                                 </param>
-        /// <param name="webhooksOnMemberRemoveMethod"> The HTTP method to use when calling the webhooks.on_member_remove.url
-        ///                                    </param>
-        /// <param name="webhooksOnMessageSentUrl"> The URL of the webhook to call in response to the on_message_sent event
-        ///                                </param>
-        /// <param name="webhooksOnMessageSentMethod"> The URL of the webhook to call in response to the on_message_sent event
-        ///                                   </param>
-        /// <param name="webhooksOnMessageUpdatedUrl"> The URL of the webhook to call in response to the on_message_updated
-        ///                                   event </param>
-        /// <param name="webhooksOnMessageUpdatedMethod"> The HTTP method to use when calling the
-        ///                                      webhooks.on_message_updated.url </param>
-        /// <param name="webhooksOnMessageRemovedUrl"> The URL of the webhook to call in response to the on_message_removed
-        ///                                   event </param>
-        /// <param name="webhooksOnMessageRemovedMethod"> The HTTP method to use when calling the
-        ///                                      webhooks.on_message_removed.url </param>
-        /// <param name="webhooksOnChannelAddedUrl"> The URL of the webhook to call in response to the on_channel_added event
-        ///                                 </param>
-        /// <param name="webhooksOnChannelAddedMethod"> The URL of the webhook to call in response to the on_channel_added
-        ///                                    event </param>
-        /// <param name="webhooksOnChannelDestroyedUrl"> The URL of the webhook to call in response to the on_channel_added
-        ///                                     event </param>
-        /// <param name="webhooksOnChannelDestroyedMethod"> The HTTP method to use when calling the
-        ///                                        webhooks.on_channel_destroyed.url </param>
-        /// <param name="webhooksOnChannelUpdatedUrl"> he URL of the webhook to call in response to the on_channel_updated
-        ///                                   event </param>
-        /// <param name="webhooksOnChannelUpdatedMethod"> The HTTP method to use when calling the
-        ///                                      webhooks.on_channel_updated.url </param>
-        /// <param name="webhooksOnMemberAddedUrl"> The URL of the webhook to call in response to the on_channel_updated event
-        ///                                </param>
-        /// <param name="webhooksOnMemberAddedMethod"> he HTTP method to use when calling the webhooks.on_channel_updated.url
-        ///                                   </param>
-        /// <param name="webhooksOnMemberRemovedUrl"> The URL of the webhook to call in response to the on_member_removed event
-        ///                                  </param>
-        /// <param name="webhooksOnMemberRemovedMethod"> The HTTP method to use when calling the webhooks.on_member_removed.url
-        ///                                     </param>
-        /// <param name="limitsChannelMembers"> The maximum number of Members that can be added to Channels within this Service
-        ///                            </param>
-        /// <param name="limitsUserChannels"> The maximum number of Channels Users can be a Member of within this Service
-        ///                          </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     string defaultServiceRoleSid = null,
-                                                                                     string defaultChannelRoleSid = null,
-                                                                                     string defaultChannelCreatorRoleSid = null,
-                                                                                     bool? readStatusEnabled = null,
-                                                                                     bool? reachabilityEnabled = null,
-                                                                                     int? typingIndicatorTimeout = null,
-                                                                                     int? consumptionReportInterval = null,
-                                                                                     bool? notificationsNewMessageEnabled = null,
-                                                                                     string notificationsNewMessageTemplate = null,
-                                                                                     bool? notificationsAddedToChannelEnabled = null,
-                                                                                     string notificationsAddedToChannelTemplate = null,
-                                                                                     bool? notificationsRemovedFromChannelEnabled = null,
-                                                                                     string notificationsRemovedFromChannelTemplate = null,
-                                                                                     bool? notificationsInvitedToChannelEnabled = null,
-                                                                                     string notificationsInvitedToChannelTemplate = null,
-                                                                                     Uri preWebhookUrl = null,
-                                                                                     Uri postWebhookUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhookMethod = null,
-                                                                                     List<string> webhookFilters = null,
-                                                                                     Uri webhooksOnMessageSendUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMessageSendMethod = null,
-                                                                                     Uri webhooksOnMessageUpdateUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMessageUpdateMethod = null,
-                                                                                     Uri webhooksOnMessageRemoveUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMessageRemoveMethod = null,
-                                                                                     Uri webhooksOnChannelAddUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnChannelAddMethod = null,
-                                                                                     Uri webhooksOnChannelDestroyUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnChannelDestroyMethod = null,
-                                                                                     Uri webhooksOnChannelUpdateUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnChannelUpdateMethod = null,
-                                                                                     Uri webhooksOnMemberAddUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMemberAddMethod = null,
-                                                                                     Uri webhooksOnMemberRemoveUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMemberRemoveMethod = null,
-                                                                                     Uri webhooksOnMessageSentUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMessageSentMethod = null,
-                                                                                     Uri webhooksOnMessageUpdatedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMessageUpdatedMethod = null,
-                                                                                     Uri webhooksOnMessageRemovedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMessageRemovedMethod = null,
-                                                                                     Uri webhooksOnChannelAddedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnChannelAddedMethod = null,
-                                                                                     Uri webhooksOnChannelDestroyedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnChannelDestroyedMethod = null,
-                                                                                     Uri webhooksOnChannelUpdatedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnChannelUpdatedMethod = null,
-                                                                                     Uri webhooksOnMemberAddedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMemberAddedMethod = null,
-                                                                                     Uri webhooksOnMemberRemovedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMemberRemovedMethod = null,
-                                                                                     int? limitsChannelMembers = null,
-                                                                                     int? limitsUserChannels = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, WebhooksOnMessageSendUrl = webhooksOnMessageSendUrl, WebhooksOnMessageSendMethod = webhooksOnMessageSendMethod, WebhooksOnMessageUpdateUrl = webhooksOnMessageUpdateUrl, WebhooksOnMessageUpdateMethod = webhooksOnMessageUpdateMethod, WebhooksOnMessageRemoveUrl = webhooksOnMessageRemoveUrl, WebhooksOnMessageRemoveMethod = webhooksOnMessageRemoveMethod, WebhooksOnChannelAddUrl = webhooksOnChannelAddUrl, WebhooksOnChannelAddMethod = webhooksOnChannelAddMethod, WebhooksOnChannelDestroyUrl = webhooksOnChannelDestroyUrl, WebhooksOnChannelDestroyMethod = webhooksOnChannelDestroyMethod, WebhooksOnChannelUpdateUrl = webhooksOnChannelUpdateUrl, WebhooksOnChannelUpdateMethod = webhooksOnChannelUpdateMethod, WebhooksOnMemberAddUrl = webhooksOnMemberAddUrl, WebhooksOnMemberAddMethod = webhooksOnMemberAddMethod, WebhooksOnMemberRemoveUrl = webhooksOnMemberRemoveUrl, WebhooksOnMemberRemoveMethod = webhooksOnMemberRemoveMethod, WebhooksOnMessageSentUrl = webhooksOnMessageSentUrl, WebhooksOnMessageSentMethod = webhooksOnMessageSentMethod, WebhooksOnMessageUpdatedUrl = webhooksOnMessageUpdatedUrl, WebhooksOnMessageUpdatedMethod = webhooksOnMessageUpdatedMethod, WebhooksOnMessageRemovedUrl = webhooksOnMessageRemovedUrl, WebhooksOnMessageRemovedMethod = webhooksOnMessageRemovedMethod, WebhooksOnChannelAddedUrl = webhooksOnChannelAddedUrl, WebhooksOnChannelAddedMethod = webhooksOnChannelAddedMethod, WebhooksOnChannelDestroyedUrl = webhooksOnChannelDestroyedUrl, WebhooksOnChannelDestroyedMethod = webhooksOnChannelDestroyedMethod, WebhooksOnChannelUpdatedUrl = webhooksOnChannelUpdatedUrl, WebhooksOnChannelUpdatedMethod = webhooksOnChannelUpdatedMethod, WebhooksOnMemberAddedUrl = webhooksOnMemberAddedUrl, WebhooksOnMemberAddedMethod = webhooksOnMemberAddedMethod, WebhooksOnMemberRemovedUrl = webhooksOnMemberRemovedUrl, WebhooksOnMemberRemovedMethod = webhooksOnMemberRemovedMethod, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ServiceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ServiceResource object represented by the provided JSON </returns>
-        public static ServiceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ServiceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The service role assigned to users when they are added to the service
-        /// </summary>
-        [JsonProperty("default_service_role_sid")]
-        public string DefaultServiceRoleSid { get; private set; }
-        /// <summary>
-        /// The channel role assigned to users when they are added to a channel
-        /// </summary>
-        [JsonProperty("default_channel_role_sid")]
-        public string DefaultChannelRoleSid { get; private set; }
-        /// <summary>
-        /// The channel role assigned to a channel creator when they join a new channel
-        /// </summary>
-        [JsonProperty("default_channel_creator_role_sid")]
-        public string DefaultChannelCreatorRoleSid { get; private set; }
-        /// <summary>
-        /// Whether the Message Consumption Horizon feature is enabled
-        /// </summary>
-        [JsonProperty("read_status_enabled")]
-        public bool? ReadStatusEnabled { get; private set; }
-        /// <summary>
-        /// Whether the Reachability Indicator feature is enabled for this Service instance
-        /// </summary>
-        [JsonProperty("reachability_enabled")]
-        public bool? ReachabilityEnabled { get; private set; }
-        /// <summary>
-        /// How long in seconds to wait before assuming the user is no longer typing
-        /// </summary>
-        [JsonProperty("typing_indicator_timeout")]
-        public int? TypingIndicatorTimeout { get; private set; }
-        /// <summary>
-        /// DEPRECATED
-        /// </summary>
-        [JsonProperty("consumption_report_interval")]
-        public int? ConsumptionReportInterval { get; private set; }
-        /// <summary>
-        /// An object that describes the limits of the service instance
-        /// </summary>
-        [JsonProperty("limits")]
-        public object Limits { get; private set; }
-        /// <summary>
-        /// An object that contains information about the webhooks configured for this service
-        /// </summary>
-        [JsonProperty("webhooks")]
-        public object Webhooks { get; private set; }
-        /// <summary>
-        /// The webhook URL for pre-event webhooks
-        /// </summary>
-        [JsonProperty("pre_webhook_url")]
-        public string PreWebhookUrl { get; private set; }
-        /// <summary>
-        /// The URL for post-event webhooks
-        /// </summary>
-        [JsonProperty("post_webhook_url")]
-        public string PostWebhookUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method  to use for both PRE and POST webhooks
-        /// </summary>
-        [JsonProperty("webhook_method")]
-        public string WebhookMethod { get; private set; }
-        /// <summary>
-        /// The list of WebHook events that are enabled for this Service instance
-        /// </summary>
-        [JsonProperty("webhook_filters")]
-        public List<string> WebhookFilters { get; private set; }
-        /// <summary>
-        /// The notification configuration for the Service instance
-        /// </summary>
-        [JsonProperty("notifications")]
-        public object Notifications { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Service resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The absolute URLs of the Service's Channels, Roles, and Users
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ServiceResource()
-        {
-
-        }
-    }
+{
+
+  public class ServiceResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Services",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(string friendlyName, ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v1/Services",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v1/Services/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="defaultServiceRoleSid"> The service role assigned to users when they are added to the service </param>
+    /// <param name="defaultChannelRoleSid"> The channel role assigned to users when they are added to a channel </param>
+    /// <param name="defaultChannelCreatorRoleSid"> The channel role assigned to a channel creator when they join a new
+    ///                                    channel </param>
+    /// <param name="readStatusEnabled"> Whether to enable the Message Consumption Horizon feature </param>
+    /// <param name="reachabilityEnabled"> Whether to enable the Reachability Indicator feature for this Service instance
+    ///                           </param>
+    /// <param name="typingIndicatorTimeout"> How long in seconds to wait before assuming the user is no longer typing
+    ///                              </param>
+    /// <param name="consumptionReportInterval"> DEPRECATED </param>
+    /// <param name="notificationsNewMessageEnabled"> Whether to send a notification when a new message is added to a
+    ///                                      channel </param>
+    /// <param name="notificationsNewMessageTemplate"> The template to use to create the notification text displayed when a
+    ///                                       new message is added to a channel </param>
+    /// <param name="notificationsAddedToChannelEnabled"> Whether to send a notification when a member is added to a
+    ///                                          channel </param>
+    /// <param name="notificationsAddedToChannelTemplate"> The template to use to create the notification text displayed
+    ///                                           when a member is added to a channel </param>
+    /// <param name="notificationsRemovedFromChannelEnabled"> Whether to send a notification to a user when they are
+    ///                                              removed from a channel </param>
+    /// <param name="notificationsRemovedFromChannelTemplate"> The template to use to create the notification text
+    ///                                               displayed to a user when they are removed </param>
+    /// <param name="notificationsInvitedToChannelEnabled"> Whether to send a notification when a user is invited to a
+    ///                                            channel </param>
+    /// <param name="notificationsInvitedToChannelTemplate"> The template to use to create the notification text displayed
+    ///                                             when a user is invited to a channel </param>
+    /// <param name="preWebhookUrl"> The webhook URL for pre-event webhooks </param>
+    /// <param name="postWebhookUrl"> The URL for post-event webhooks </param>
+    /// <param name="webhookMethod"> The HTTP method  to use for both PRE and POST webhooks </param>
+    /// <param name="webhookFilters"> The list of WebHook events that are enabled for this Service instance </param>
+    /// <param name="webhooksOnMessageSendUrl"> The URL of the webhook to call in response to the on_message_send event
+    ///                                </param>
+    /// <param name="webhooksOnMessageSendMethod"> The HTTP method to use when calling the webhooks.on_message_send.url
+    ///                                   </param>
+    /// <param name="webhooksOnMessageUpdateUrl"> The URL of the webhook to call in response to the on_message_update event
+    ///                                  </param>
+    /// <param name="webhooksOnMessageUpdateMethod"> The HTTP method to use when calling the webhooks.on_message_update.url
+    ///                                     </param>
+    /// <param name="webhooksOnMessageRemoveUrl"> The URL of the webhook to call in response to the on_message_remove event
+    ///                                  </param>
+    /// <param name="webhooksOnMessageRemoveMethod"> The HTTP method to use when calling the webhooks.on_message_remove.url
+    ///                                     </param>
+    /// <param name="webhooksOnChannelAddUrl"> The URL of the webhook to call in response to the on_channel_add event
+    ///                               </param>
+    /// <param name="webhooksOnChannelAddMethod"> The HTTP method to use when calling the webhooks.on_channel_add.url
+    ///                                  </param>
+    /// <param name="webhooksOnChannelDestroyUrl"> The URL of the webhook to call in response to the on_channel_destroy
+    ///                                   event </param>
+    /// <param name="webhooksOnChannelDestroyMethod"> The HTTP method to use when calling the
+    ///                                      webhooks.on_channel_destroy.url </param>
+    /// <param name="webhooksOnChannelUpdateUrl"> The URL of the webhook to call in response to the on_channel_update event
+    ///                                  </param>
+    /// <param name="webhooksOnChannelUpdateMethod"> The HTTP method to use when calling the webhooks.on_channel_update.url
+    ///                                     </param>
+    /// <param name="webhooksOnMemberAddUrl"> The URL of the webhook to call in response to the on_member_add event </param>
+    /// <param name="webhooksOnMemberAddMethod"> The HTTP method to use when calling the webhooks.on_member_add.url </param>
+    /// <param name="webhooksOnMemberRemoveUrl"> The URL of the webhook to call in response to the on_member_remove event
+    ///                                 </param>
+    /// <param name="webhooksOnMemberRemoveMethod"> The HTTP method to use when calling the webhooks.on_member_remove.url
+    ///                                    </param>
+    /// <param name="webhooksOnMessageSentUrl"> The URL of the webhook to call in response to the on_message_sent event
+    ///                                </param>
+    /// <param name="webhooksOnMessageSentMethod"> The URL of the webhook to call in response to the on_message_sent event
+    ///                                   </param>
+    /// <param name="webhooksOnMessageUpdatedUrl"> The URL of the webhook to call in response to the on_message_updated
+    ///                                   event </param>
+    /// <param name="webhooksOnMessageUpdatedMethod"> The HTTP method to use when calling the
+    ///                                      webhooks.on_message_updated.url </param>
+    /// <param name="webhooksOnMessageRemovedUrl"> The URL of the webhook to call in response to the on_message_removed
+    ///                                   event </param>
+    /// <param name="webhooksOnMessageRemovedMethod"> The HTTP method to use when calling the
+    ///                                      webhooks.on_message_removed.url </param>
+    /// <param name="webhooksOnChannelAddedUrl"> The URL of the webhook to call in response to the on_channel_added event
+    ///                                 </param>
+    /// <param name="webhooksOnChannelAddedMethod"> The URL of the webhook to call in response to the on_channel_added
+    ///                                    event </param>
+    /// <param name="webhooksOnChannelDestroyedUrl"> The URL of the webhook to call in response to the on_channel_added
+    ///                                     event </param>
+    /// <param name="webhooksOnChannelDestroyedMethod"> The HTTP method to use when calling the
+    ///                                        webhooks.on_channel_destroyed.url </param>
+    /// <param name="webhooksOnChannelUpdatedUrl"> he URL of the webhook to call in response to the on_channel_updated
+    ///                                   event </param>
+    /// <param name="webhooksOnChannelUpdatedMethod"> The HTTP method to use when calling the
+    ///                                      webhooks.on_channel_updated.url </param>
+    /// <param name="webhooksOnMemberAddedUrl"> The URL of the webhook to call in response to the on_channel_updated event
+    ///                                </param>
+    /// <param name="webhooksOnMemberAddedMethod"> he HTTP method to use when calling the webhooks.on_channel_updated.url
+    ///                                   </param>
+    /// <param name="webhooksOnMemberRemovedUrl"> The URL of the webhook to call in response to the on_member_removed event
+    ///                                  </param>
+    /// <param name="webhooksOnMemberRemovedMethod"> The HTTP method to use when calling the webhooks.on_member_removed.url
+    ///                                     </param>
+    /// <param name="limitsChannelMembers"> The maximum number of Members that can be added to Channels within this Service
+    ///                            </param>
+    /// <param name="limitsUserChannels"> The maximum number of Channels Users can be a Member of within this Service
+    ///                          </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(string pathSid,
+                                         string friendlyName = null,
+                                         string defaultServiceRoleSid = null,
+                                         string defaultChannelRoleSid = null,
+                                         string defaultChannelCreatorRoleSid = null,
+                                         bool? readStatusEnabled = null,
+                                         bool? reachabilityEnabled = null,
+                                         int? typingIndicatorTimeout = null,
+                                         int? consumptionReportInterval = null,
+                                         bool? notificationsNewMessageEnabled = null,
+                                         string notificationsNewMessageTemplate = null,
+                                         bool? notificationsAddedToChannelEnabled = null,
+                                         string notificationsAddedToChannelTemplate = null,
+                                         bool? notificationsRemovedFromChannelEnabled = null,
+                                         string notificationsRemovedFromChannelTemplate = null,
+                                         bool? notificationsInvitedToChannelEnabled = null,
+                                         string notificationsInvitedToChannelTemplate = null,
+                                         Uri preWebhookUrl = null,
+                                         Uri postWebhookUrl = null,
+                                         Twilio.Http.HttpMethod webhookMethod = null,
+                                         List<string> webhookFilters = null,
+                                         Uri webhooksOnMessageSendUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMessageSendMethod = null,
+                                         Uri webhooksOnMessageUpdateUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMessageUpdateMethod = null,
+                                         Uri webhooksOnMessageRemoveUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMessageRemoveMethod = null,
+                                         Uri webhooksOnChannelAddUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnChannelAddMethod = null,
+                                         Uri webhooksOnChannelDestroyUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnChannelDestroyMethod = null,
+                                         Uri webhooksOnChannelUpdateUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnChannelUpdateMethod = null,
+                                         Uri webhooksOnMemberAddUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMemberAddMethod = null,
+                                         Uri webhooksOnMemberRemoveUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMemberRemoveMethod = null,
+                                         Uri webhooksOnMessageSentUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMessageSentMethod = null,
+                                         Uri webhooksOnMessageUpdatedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMessageUpdatedMethod = null,
+                                         Uri webhooksOnMessageRemovedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMessageRemovedMethod = null,
+                                         Uri webhooksOnChannelAddedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnChannelAddedMethod = null,
+                                         Uri webhooksOnChannelDestroyedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnChannelDestroyedMethod = null,
+                                         Uri webhooksOnChannelUpdatedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnChannelUpdatedMethod = null,
+                                         Uri webhooksOnMemberAddedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMemberAddedMethod = null,
+                                         Uri webhooksOnMemberRemovedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMemberRemovedMethod = null,
+                                         int? limitsChannelMembers = null,
+                                         int? limitsUserChannels = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, WebhooksOnMessageSendUrl = webhooksOnMessageSendUrl, WebhooksOnMessageSendMethod = webhooksOnMessageSendMethod, WebhooksOnMessageUpdateUrl = webhooksOnMessageUpdateUrl, WebhooksOnMessageUpdateMethod = webhooksOnMessageUpdateMethod, WebhooksOnMessageRemoveUrl = webhooksOnMessageRemoveUrl, WebhooksOnMessageRemoveMethod = webhooksOnMessageRemoveMethod, WebhooksOnChannelAddUrl = webhooksOnChannelAddUrl, WebhooksOnChannelAddMethod = webhooksOnChannelAddMethod, WebhooksOnChannelDestroyUrl = webhooksOnChannelDestroyUrl, WebhooksOnChannelDestroyMethod = webhooksOnChannelDestroyMethod, WebhooksOnChannelUpdateUrl = webhooksOnChannelUpdateUrl, WebhooksOnChannelUpdateMethod = webhooksOnChannelUpdateMethod, WebhooksOnMemberAddUrl = webhooksOnMemberAddUrl, WebhooksOnMemberAddMethod = webhooksOnMemberAddMethod, WebhooksOnMemberRemoveUrl = webhooksOnMemberRemoveUrl, WebhooksOnMemberRemoveMethod = webhooksOnMemberRemoveMethod, WebhooksOnMessageSentUrl = webhooksOnMessageSentUrl, WebhooksOnMessageSentMethod = webhooksOnMessageSentMethod, WebhooksOnMessageUpdatedUrl = webhooksOnMessageUpdatedUrl, WebhooksOnMessageUpdatedMethod = webhooksOnMessageUpdatedMethod, WebhooksOnMessageRemovedUrl = webhooksOnMessageRemovedUrl, WebhooksOnMessageRemovedMethod = webhooksOnMessageRemovedMethod, WebhooksOnChannelAddedUrl = webhooksOnChannelAddedUrl, WebhooksOnChannelAddedMethod = webhooksOnChannelAddedMethod, WebhooksOnChannelDestroyedUrl = webhooksOnChannelDestroyedUrl, WebhooksOnChannelDestroyedMethod = webhooksOnChannelDestroyedMethod, WebhooksOnChannelUpdatedUrl = webhooksOnChannelUpdatedUrl, WebhooksOnChannelUpdatedMethod = webhooksOnChannelUpdatedMethod, WebhooksOnMemberAddedUrl = webhooksOnMemberAddedUrl, WebhooksOnMemberAddedMethod = webhooksOnMemberAddedMethod, WebhooksOnMemberRemovedUrl = webhooksOnMemberRemovedUrl, WebhooksOnMemberRemovedMethod = webhooksOnMemberRemovedMethod, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="defaultServiceRoleSid"> The service role assigned to users when they are added to the service </param>
+    /// <param name="defaultChannelRoleSid"> The channel role assigned to users when they are added to a channel </param>
+    /// <param name="defaultChannelCreatorRoleSid"> The channel role assigned to a channel creator when they join a new
+    ///                                    channel </param>
+    /// <param name="readStatusEnabled"> Whether to enable the Message Consumption Horizon feature </param>
+    /// <param name="reachabilityEnabled"> Whether to enable the Reachability Indicator feature for this Service instance
+    ///                           </param>
+    /// <param name="typingIndicatorTimeout"> How long in seconds to wait before assuming the user is no longer typing
+    ///                              </param>
+    /// <param name="consumptionReportInterval"> DEPRECATED </param>
+    /// <param name="notificationsNewMessageEnabled"> Whether to send a notification when a new message is added to a
+    ///                                      channel </param>
+    /// <param name="notificationsNewMessageTemplate"> The template to use to create the notification text displayed when a
+    ///                                       new message is added to a channel </param>
+    /// <param name="notificationsAddedToChannelEnabled"> Whether to send a notification when a member is added to a
+    ///                                          channel </param>
+    /// <param name="notificationsAddedToChannelTemplate"> The template to use to create the notification text displayed
+    ///                                           when a member is added to a channel </param>
+    /// <param name="notificationsRemovedFromChannelEnabled"> Whether to send a notification to a user when they are
+    ///                                              removed from a channel </param>
+    /// <param name="notificationsRemovedFromChannelTemplate"> The template to use to create the notification text
+    ///                                               displayed to a user when they are removed </param>
+    /// <param name="notificationsInvitedToChannelEnabled"> Whether to send a notification when a user is invited to a
+    ///                                            channel </param>
+    /// <param name="notificationsInvitedToChannelTemplate"> The template to use to create the notification text displayed
+    ///                                             when a user is invited to a channel </param>
+    /// <param name="preWebhookUrl"> The webhook URL for pre-event webhooks </param>
+    /// <param name="postWebhookUrl"> The URL for post-event webhooks </param>
+    /// <param name="webhookMethod"> The HTTP method  to use for both PRE and POST webhooks </param>
+    /// <param name="webhookFilters"> The list of WebHook events that are enabled for this Service instance </param>
+    /// <param name="webhooksOnMessageSendUrl"> The URL of the webhook to call in response to the on_message_send event
+    ///                                </param>
+    /// <param name="webhooksOnMessageSendMethod"> The HTTP method to use when calling the webhooks.on_message_send.url
+    ///                                   </param>
+    /// <param name="webhooksOnMessageUpdateUrl"> The URL of the webhook to call in response to the on_message_update event
+    ///                                  </param>
+    /// <param name="webhooksOnMessageUpdateMethod"> The HTTP method to use when calling the webhooks.on_message_update.url
+    ///                                     </param>
+    /// <param name="webhooksOnMessageRemoveUrl"> The URL of the webhook to call in response to the on_message_remove event
+    ///                                  </param>
+    /// <param name="webhooksOnMessageRemoveMethod"> The HTTP method to use when calling the webhooks.on_message_remove.url
+    ///                                     </param>
+    /// <param name="webhooksOnChannelAddUrl"> The URL of the webhook to call in response to the on_channel_add event
+    ///                               </param>
+    /// <param name="webhooksOnChannelAddMethod"> The HTTP method to use when calling the webhooks.on_channel_add.url
+    ///                                  </param>
+    /// <param name="webhooksOnChannelDestroyUrl"> The URL of the webhook to call in response to the on_channel_destroy
+    ///                                   event </param>
+    /// <param name="webhooksOnChannelDestroyMethod"> The HTTP method to use when calling the
+    ///                                      webhooks.on_channel_destroy.url </param>
+    /// <param name="webhooksOnChannelUpdateUrl"> The URL of the webhook to call in response to the on_channel_update event
+    ///                                  </param>
+    /// <param name="webhooksOnChannelUpdateMethod"> The HTTP method to use when calling the webhooks.on_channel_update.url
+    ///                                     </param>
+    /// <param name="webhooksOnMemberAddUrl"> The URL of the webhook to call in response to the on_member_add event </param>
+    /// <param name="webhooksOnMemberAddMethod"> The HTTP method to use when calling the webhooks.on_member_add.url </param>
+    /// <param name="webhooksOnMemberRemoveUrl"> The URL of the webhook to call in response to the on_member_remove event
+    ///                                 </param>
+    /// <param name="webhooksOnMemberRemoveMethod"> The HTTP method to use when calling the webhooks.on_member_remove.url
+    ///                                    </param>
+    /// <param name="webhooksOnMessageSentUrl"> The URL of the webhook to call in response to the on_message_sent event
+    ///                                </param>
+    /// <param name="webhooksOnMessageSentMethod"> The URL of the webhook to call in response to the on_message_sent event
+    ///                                   </param>
+    /// <param name="webhooksOnMessageUpdatedUrl"> The URL of the webhook to call in response to the on_message_updated
+    ///                                   event </param>
+    /// <param name="webhooksOnMessageUpdatedMethod"> The HTTP method to use when calling the
+    ///                                      webhooks.on_message_updated.url </param>
+    /// <param name="webhooksOnMessageRemovedUrl"> The URL of the webhook to call in response to the on_message_removed
+    ///                                   event </param>
+    /// <param name="webhooksOnMessageRemovedMethod"> The HTTP method to use when calling the
+    ///                                      webhooks.on_message_removed.url </param>
+    /// <param name="webhooksOnChannelAddedUrl"> The URL of the webhook to call in response to the on_channel_added event
+    ///                                 </param>
+    /// <param name="webhooksOnChannelAddedMethod"> The URL of the webhook to call in response to the on_channel_added
+    ///                                    event </param>
+    /// <param name="webhooksOnChannelDestroyedUrl"> The URL of the webhook to call in response to the on_channel_added
+    ///                                     event </param>
+    /// <param name="webhooksOnChannelDestroyedMethod"> The HTTP method to use when calling the
+    ///                                        webhooks.on_channel_destroyed.url </param>
+    /// <param name="webhooksOnChannelUpdatedUrl"> he URL of the webhook to call in response to the on_channel_updated
+    ///                                   event </param>
+    /// <param name="webhooksOnChannelUpdatedMethod"> The HTTP method to use when calling the
+    ///                                      webhooks.on_channel_updated.url </param>
+    /// <param name="webhooksOnMemberAddedUrl"> The URL of the webhook to call in response to the on_channel_updated event
+    ///                                </param>
+    /// <param name="webhooksOnMemberAddedMethod"> he HTTP method to use when calling the webhooks.on_channel_updated.url
+    ///                                   </param>
+    /// <param name="webhooksOnMemberRemovedUrl"> The URL of the webhook to call in response to the on_member_removed event
+    ///                                  </param>
+    /// <param name="webhooksOnMemberRemovedMethod"> The HTTP method to use when calling the webhooks.on_member_removed.url
+    ///                                     </param>
+    /// <param name="limitsChannelMembers"> The maximum number of Members that can be added to Channels within this Service
+    ///                            </param>
+    /// <param name="limitsUserChannels"> The maximum number of Channels Users can be a Member of within this Service
+    ///                          </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 string defaultServiceRoleSid = null,
+                                                                                 string defaultChannelRoleSid = null,
+                                                                                 string defaultChannelCreatorRoleSid = null,
+                                                                                 bool? readStatusEnabled = null,
+                                                                                 bool? reachabilityEnabled = null,
+                                                                                 int? typingIndicatorTimeout = null,
+                                                                                 int? consumptionReportInterval = null,
+                                                                                 bool? notificationsNewMessageEnabled = null,
+                                                                                 string notificationsNewMessageTemplate = null,
+                                                                                 bool? notificationsAddedToChannelEnabled = null,
+                                                                                 string notificationsAddedToChannelTemplate = null,
+                                                                                 bool? notificationsRemovedFromChannelEnabled = null,
+                                                                                 string notificationsRemovedFromChannelTemplate = null,
+                                                                                 bool? notificationsInvitedToChannelEnabled = null,
+                                                                                 string notificationsInvitedToChannelTemplate = null,
+                                                                                 Uri preWebhookUrl = null,
+                                                                                 Uri postWebhookUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhookMethod = null,
+                                                                                 List<string> webhookFilters = null,
+                                                                                 Uri webhooksOnMessageSendUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMessageSendMethod = null,
+                                                                                 Uri webhooksOnMessageUpdateUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMessageUpdateMethod = null,
+                                                                                 Uri webhooksOnMessageRemoveUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMessageRemoveMethod = null,
+                                                                                 Uri webhooksOnChannelAddUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnChannelAddMethod = null,
+                                                                                 Uri webhooksOnChannelDestroyUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnChannelDestroyMethod = null,
+                                                                                 Uri webhooksOnChannelUpdateUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnChannelUpdateMethod = null,
+                                                                                 Uri webhooksOnMemberAddUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMemberAddMethod = null,
+                                                                                 Uri webhooksOnMemberRemoveUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMemberRemoveMethod = null,
+                                                                                 Uri webhooksOnMessageSentUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMessageSentMethod = null,
+                                                                                 Uri webhooksOnMessageUpdatedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMessageUpdatedMethod = null,
+                                                                                 Uri webhooksOnMessageRemovedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMessageRemovedMethod = null,
+                                                                                 Uri webhooksOnChannelAddedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnChannelAddedMethod = null,
+                                                                                 Uri webhooksOnChannelDestroyedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnChannelDestroyedMethod = null,
+                                                                                 Uri webhooksOnChannelUpdatedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnChannelUpdatedMethod = null,
+                                                                                 Uri webhooksOnMemberAddedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMemberAddedMethod = null,
+                                                                                 Uri webhooksOnMemberRemovedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMemberRemovedMethod = null,
+                                                                                 int? limitsChannelMembers = null,
+                                                                                 int? limitsUserChannels = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, WebhooksOnMessageSendUrl = webhooksOnMessageSendUrl, WebhooksOnMessageSendMethod = webhooksOnMessageSendMethod, WebhooksOnMessageUpdateUrl = webhooksOnMessageUpdateUrl, WebhooksOnMessageUpdateMethod = webhooksOnMessageUpdateMethod, WebhooksOnMessageRemoveUrl = webhooksOnMessageRemoveUrl, WebhooksOnMessageRemoveMethod = webhooksOnMessageRemoveMethod, WebhooksOnChannelAddUrl = webhooksOnChannelAddUrl, WebhooksOnChannelAddMethod = webhooksOnChannelAddMethod, WebhooksOnChannelDestroyUrl = webhooksOnChannelDestroyUrl, WebhooksOnChannelDestroyMethod = webhooksOnChannelDestroyMethod, WebhooksOnChannelUpdateUrl = webhooksOnChannelUpdateUrl, WebhooksOnChannelUpdateMethod = webhooksOnChannelUpdateMethod, WebhooksOnMemberAddUrl = webhooksOnMemberAddUrl, WebhooksOnMemberAddMethod = webhooksOnMemberAddMethod, WebhooksOnMemberRemoveUrl = webhooksOnMemberRemoveUrl, WebhooksOnMemberRemoveMethod = webhooksOnMemberRemoveMethod, WebhooksOnMessageSentUrl = webhooksOnMessageSentUrl, WebhooksOnMessageSentMethod = webhooksOnMessageSentMethod, WebhooksOnMessageUpdatedUrl = webhooksOnMessageUpdatedUrl, WebhooksOnMessageUpdatedMethod = webhooksOnMessageUpdatedMethod, WebhooksOnMessageRemovedUrl = webhooksOnMessageRemovedUrl, WebhooksOnMessageRemovedMethod = webhooksOnMessageRemovedMethod, WebhooksOnChannelAddedUrl = webhooksOnChannelAddedUrl, WebhooksOnChannelAddedMethod = webhooksOnChannelAddedMethod, WebhooksOnChannelDestroyedUrl = webhooksOnChannelDestroyedUrl, WebhooksOnChannelDestroyedMethod = webhooksOnChannelDestroyedMethod, WebhooksOnChannelUpdatedUrl = webhooksOnChannelUpdatedUrl, WebhooksOnChannelUpdatedMethod = webhooksOnChannelUpdatedMethod, WebhooksOnMemberAddedUrl = webhooksOnMemberAddedUrl, WebhooksOnMemberAddedMethod = webhooksOnMemberAddedMethod, WebhooksOnMemberRemovedUrl = webhooksOnMemberRemovedUrl, WebhooksOnMemberRemovedMethod = webhooksOnMemberRemovedMethod, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ServiceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ServiceResource object represented by the provided JSON </returns>
+    public static ServiceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ServiceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The service role assigned to users when they are added to the service
+    /// </summary>
+    [JsonProperty("default_service_role_sid")]
+    public string DefaultServiceRoleSid { get; private set; }
+    /// <summary>
+    /// The channel role assigned to users when they are added to a channel
+    /// </summary>
+    [JsonProperty("default_channel_role_sid")]
+    public string DefaultChannelRoleSid { get; private set; }
+    /// <summary>
+    /// The channel role assigned to a channel creator when they join a new channel
+    /// </summary>
+    [JsonProperty("default_channel_creator_role_sid")]
+    public string DefaultChannelCreatorRoleSid { get; private set; }
+    /// <summary>
+    /// Whether the Message Consumption Horizon feature is enabled
+    /// </summary>
+    [JsonProperty("read_status_enabled")]
+    public bool? ReadStatusEnabled { get; private set; }
+    /// <summary>
+    /// Whether the Reachability Indicator feature is enabled for this Service instance
+    /// </summary>
+    [JsonProperty("reachability_enabled")]
+    public bool? ReachabilityEnabled { get; private set; }
+    /// <summary>
+    /// How long in seconds to wait before assuming the user is no longer typing
+    /// </summary>
+    [JsonProperty("typing_indicator_timeout")]
+    public int? TypingIndicatorTimeout { get; private set; }
+    /// <summary>
+    /// DEPRECATED
+    /// </summary>
+    [JsonProperty("consumption_report_interval")]
+    public int? ConsumptionReportInterval { get; private set; }
+    /// <summary>
+    /// An object that describes the limits of the service instance
+    /// </summary>
+    [JsonProperty("limits")]
+    public object Limits { get; private set; }
+    /// <summary>
+    /// An object that contains information about the webhooks configured for this service
+    /// </summary>
+    [JsonProperty("webhooks")]
+    public object Webhooks { get; private set; }
+    /// <summary>
+    /// The webhook URL for pre-event webhooks
+    /// </summary>
+    [JsonProperty("pre_webhook_url")]
+    public string PreWebhookUrl { get; private set; }
+    /// <summary>
+    /// The URL for post-event webhooks
+    /// </summary>
+    [JsonProperty("post_webhook_url")]
+    public string PostWebhookUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method  to use for both PRE and POST webhooks
+    /// </summary>
+    [JsonProperty("webhook_method")]
+    public string WebhookMethod { get; private set; }
+    /// <summary>
+    /// The list of WebHook events that are enabled for this Service instance
+    /// </summary>
+    [JsonProperty("webhook_filters")]
+    public List<string> WebhookFilters { get; private set; }
+    /// <summary>
+    /// The notification configuration for the Service instance
+    /// </summary>
+    [JsonProperty("notifications")]
+    public object Notifications { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Service resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The absolute URLs of the Service's Channels, Roles, and Users
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ServiceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/CredentialOptions.cs b/src/Twilio/Rest/Chat/V2/CredentialOptions.cs
index 0b14f16f6..e3f8963e9 100644
--- a/src/Twilio/Rest/Chat/V2/CredentialOptions.cs
+++ b/src/Twilio/Rest/Chat/V2/CredentialOptions.cs
@@ -9,255 +9,255 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V2
-{
-
+{
+
+  /// <summary>
+  /// ReadCredentialOptions
+  /// </summary>
+  public class ReadCredentialOptions : ReadOptions<CredentialResource>
+  {
     /// <summary>
-    /// ReadCredentialOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadCredentialOptions : ReadOptions<CredentialResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateCredentialOptions
+  /// </summary>
+  public class CreateCredentialOptions : IOptions<CredentialResource>
+  {
     /// <summary>
-    /// CreateCredentialOptions
+    /// The type of push-notification service the credential is for
     /// </summary>
-    public class CreateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The type of push-notification service the credential is for
-        /// </summary>
-        public CredentialResource.PushServiceEnum Type { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// [APN only] The URL encoded representation of the certificate
-        /// </summary>
-        public string Certificate { get; set; }
-        /// <summary>
-        /// [APN only] The URL encoded representation of the private key
-        /// </summary>
-        public string PrivateKey { get; set; }
-        /// <summary>
-        /// [APN only] Whether to send the credential to sandbox APNs
-        /// </summary>
-        public bool? Sandbox { get; set; }
-        /// <summary>
-        /// [GCM only] The API key for the project that was obtained from the Google Developer console for your GCM Service application credential
-        /// </summary>
-        public string ApiKey { get; set; }
-        /// <summary>
-        /// [FCM only] The Server key of your project from Firebase console
-        /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCredentialOptions
-        /// </summary>
-        /// <param name="type"> The type of push-notification service the credential is for </param>
-        public CreateCredentialOptions(CredentialResource.PushServiceEnum type)
-        {
-            Type = type;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Certificate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
-            }
-
-            if (PrivateKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
-            }
-
-            if (Sandbox != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
-            }
-
-            if (ApiKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
-            }
-
-            if (Secret != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secret", Secret));
-            }
-
-            return p;
-        }
-    }
-
+    public CredentialResource.PushServiceEnum Type { get; }
     /// <summary>
-    /// FetchCredentialOptions
+    /// A string to describe the resource
     /// </summary>
-    public class FetchCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The SID of the Credential resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Credential resource to fetch </param>
-        public FetchCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// UpdateCredentialOptions
+    /// [APN only] The URL encoded representation of the certificate
     /// </summary>
-    public class UpdateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The SID of the Credential resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// [APN only] The URL encoded representation of the certificate
-        /// </summary>
-        public string Certificate { get; set; }
-        /// <summary>
-        /// [APN only] The URL encoded representation of the private key
-        /// </summary>
-        public string PrivateKey { get; set; }
-        /// <summary>
-        /// [APN only] Whether to send the credential to sandbox APNs
-        /// </summary>
-        public bool? Sandbox { get; set; }
-        /// <summary>
-        /// [GCM only] The API key for the project that was obtained from the Google Developer console for your GCM Service application credential
-        /// </summary>
-        public string ApiKey { get; set; }
-        /// <summary>
-        /// [FCM only] The Server key of your project from Firebase console
-        /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Credential resource to update </param>
-        public UpdateCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Certificate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
-            }
-
-            if (PrivateKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
-            }
-
-            if (Sandbox != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
-            }
-
-            if (ApiKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
-            }
-
-            if (Secret != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secret", Secret));
-            }
-
-            return p;
-        }
-    }
-
+    public string Certificate { get; set; }
     /// <summary>
-    /// DeleteCredentialOptions
+    /// [APN only] The URL encoded representation of the private key
     /// </summary>
-    public class DeleteCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The SID of the Credential resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Credential resource to delete </param>
-        public DeleteCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PrivateKey { get; set; }
+    /// <summary>
+    /// [APN only] Whether to send the credential to sandbox APNs
+    /// </summary>
+    public bool? Sandbox { get; set; }
+    /// <summary>
+    /// [GCM only] The API key for the project that was obtained from the Google Developer console for your GCM Service application credential
+    /// </summary>
+    public string ApiKey { get; set; }
+    /// <summary>
+    /// [FCM only] The Server key of your project from Firebase console
+    /// </summary>
+    public string Secret { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCredentialOptions
+    /// </summary>
+    /// <param name="type"> The type of push-notification service the credential is for </param>
+    public CreateCredentialOptions(CredentialResource.PushServiceEnum type)
+    {
+      Type = type;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Certificate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
+      }
+
+      if (PrivateKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
+      }
+
+      if (Sandbox != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
+      }
+
+      if (ApiKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
+      }
+
+      if (Secret != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secret", Secret));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchCredentialOptions
+  /// </summary>
+  public class FetchCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The SID of the Credential resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Credential resource to fetch </param>
+    public FetchCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateCredentialOptions
+  /// </summary>
+  public class UpdateCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The SID of the Credential resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// [APN only] The URL encoded representation of the certificate
+    /// </summary>
+    public string Certificate { get; set; }
+    /// <summary>
+    /// [APN only] The URL encoded representation of the private key
+    /// </summary>
+    public string PrivateKey { get; set; }
+    /// <summary>
+    /// [APN only] Whether to send the credential to sandbox APNs
+    /// </summary>
+    public bool? Sandbox { get; set; }
+    /// <summary>
+    /// [GCM only] The API key for the project that was obtained from the Google Developer console for your GCM Service application credential
+    /// </summary>
+    public string ApiKey { get; set; }
+    /// <summary>
+    /// [FCM only] The Server key of your project from Firebase console
+    /// </summary>
+    public string Secret { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Credential resource to update </param>
+    public UpdateCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Certificate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
+      }
+
+      if (PrivateKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
+      }
+
+      if (Sandbox != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
+      }
+
+      if (ApiKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
+      }
+
+      if (Secret != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secret", Secret));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteCredentialOptions
+  /// </summary>
+  public class DeleteCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The SID of the Credential resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Credential resource to delete </param>
+    public DeleteCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/CredentialResource.cs b/src/Twilio/Rest/Chat/V2/CredentialResource.cs
index 9a335ba70..ce57eb4b1 100644
--- a/src/Twilio/Rest/Chat/V2/CredentialResource.cs
+++ b/src/Twilio/Rest/Chat/V2/CredentialResource.cs
@@ -17,538 +17,538 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V2
-{
-
-    public class CredentialResource : Resource
-    {
-        public sealed class PushServiceEnum : StringEnum
-        {
-            private PushServiceEnum(string value) : base(value) {}
-            public PushServiceEnum() {}
-            public static implicit operator PushServiceEnum(string value)
-            {
-                return new PushServiceEnum(value);
-            }
-
-            public static readonly PushServiceEnum Gcm = new PushServiceEnum("gcm");
-            public static readonly PushServiceEnum Apn = new PushServiceEnum("apn");
-            public static readonly PushServiceEnum Fcm = new PushServiceEnum("fcm");
-        }
-
-        private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Credentials",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Credentials",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="type"> The type of push-notification service the credential is for </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
-        /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
-        /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
-        ///              for your GCM Service application credential </param>
-        /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(CredentialResource.PushServiceEnum type,
-                                                string friendlyName = null,
-                                                string certificate = null,
-                                                string privateKey = null,
-                                                bool? sandbox = null,
-                                                string apiKey = null,
-                                                string secret = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(type){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="type"> The type of push-notification service the credential is for </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
-        /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
-        /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
-        ///              for your GCM Service application credential </param>
-        /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CredentialResource.PushServiceEnum type,
-                                                                                        string friendlyName = null,
-                                                                                        string certificate = null,
-                                                                                        string privateKey = null,
-                                                                                        bool? sandbox = null,
-                                                                                        string apiKey = null,
-                                                                                        string secret = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(type){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Credentials/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Credential resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Credential resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Credentials/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Credential resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
-        /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
-        /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
-        ///              for your GCM Service application credential </param>
-        /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(string pathSid,
-                                                string friendlyName = null,
-                                                string certificate = null,
-                                                string privateKey = null,
-                                                bool? sandbox = null,
-                                                string apiKey = null,
-                                                string secret = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathSid){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Credential resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
-        /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
-        /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
-        ///              for your GCM Service application credential </param>
-        /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathSid,
-                                                                                        string friendlyName = null,
-                                                                                        string certificate = null,
-                                                                                        string privateKey = null,
-                                                                                        bool? sandbox = null,
-                                                                                        string apiKey = null,
-                                                                                        string secret = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathSid){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v2/Credentials/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Credential resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Credential resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CredentialResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CredentialResource object represented by the provided JSON </returns>
-        public static CredentialResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CredentialResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type of push-notification service the credential is for
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CredentialResource.PushServiceEnum Type { get; private set; }
-        /// <summary>
-        /// [APN only] Whether to send the credential to sandbox APNs
-        /// </summary>
-        [JsonProperty("sandbox")]
-        public string Sandbox { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Credential resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CredentialResource()
-        {
-
-        }
-    }
+{
+
+  public class CredentialResource : Resource
+  {
+    public sealed class PushServiceEnum : StringEnum
+    {
+      private PushServiceEnum(string value) : base(value) { }
+      public PushServiceEnum() { }
+      public static implicit operator PushServiceEnum(string value)
+      {
+        return new PushServiceEnum(value);
+      }
+
+      public static readonly PushServiceEnum Gcm = new PushServiceEnum("gcm");
+      public static readonly PushServiceEnum Apn = new PushServiceEnum("apn");
+      public static readonly PushServiceEnum Fcm = new PushServiceEnum("fcm");
+    }
+
+    private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Credentials",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Credentials",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="type"> The type of push-notification service the credential is for </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
+    /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
+    /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
+    ///              for your GCM Service application credential </param>
+    /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(CredentialResource.PushServiceEnum type,
+                                            string friendlyName = null,
+                                            string certificate = null,
+                                            string privateKey = null,
+                                            bool? sandbox = null,
+                                            string apiKey = null,
+                                            string secret = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(type) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="type"> The type of push-notification service the credential is for </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
+    /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
+    /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
+    ///              for your GCM Service application credential </param>
+    /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CredentialResource.PushServiceEnum type,
+                                                                                    string friendlyName = null,
+                                                                                    string certificate = null,
+                                                                                    string privateKey = null,
+                                                                                    bool? sandbox = null,
+                                                                                    string apiKey = null,
+                                                                                    string secret = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(type) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Credentials/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Credential resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Credential resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Credentials/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Credential resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
+    /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
+    /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
+    ///              for your GCM Service application credential </param>
+    /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(string pathSid,
+                                            string friendlyName = null,
+                                            string certificate = null,
+                                            string privateKey = null,
+                                            bool? sandbox = null,
+                                            string apiKey = null,
+                                            string secret = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathSid) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Credential resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL encoded representation of the certificate </param>
+    /// <param name="privateKey"> [APN only] The URL encoded representation of the private key </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
+    /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
+    ///              for your GCM Service application credential </param>
+    /// <param name="secret"> [FCM only] The Server key of your project from Firebase console </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathSid,
+                                                                                    string friendlyName = null,
+                                                                                    string certificate = null,
+                                                                                    string privateKey = null,
+                                                                                    bool? sandbox = null,
+                                                                                    string apiKey = null,
+                                                                                    string secret = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathSid) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v2/Credentials/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Credential resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Credential resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CredentialResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CredentialResource object represented by the provided JSON </returns>
+    public static CredentialResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CredentialResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type of push-notification service the credential is for
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CredentialResource.PushServiceEnum Type { get; private set; }
+    /// <summary>
+    /// [APN only] Whether to send the credential to sandbox APNs
+    /// </summary>
+    [JsonProperty("sandbox")]
+    public string Sandbox { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Credential resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CredentialResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/BindingOptions.cs b/src/Twilio/Rest/Chat/V2/Service/BindingOptions.cs
index daf21cc8f..9f56d2cc8 100644
--- a/src/Twilio/Rest/Chat/V2/Service/BindingOptions.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/BindingOptions.cs
@@ -10,130 +10,130 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// ReadBindingOptions
+  /// </summary>
+  public class ReadBindingOptions : ReadOptions<BindingResource>
+  {
     /// <summary>
-    /// ReadBindingOptions
+    /// The SID of the Service to read the resources from
     /// </summary>
-    public class ReadBindingOptions : ReadOptions<BindingResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The push technology used by the Binding resources to read
-        /// </summary>
-        public List<BindingResource.BindingTypeEnum> BindingType { get; set; }
-        /// <summary>
-        /// The `identity` value of the resources to read
-        /// </summary>
-        public List<string> Identity { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        public ReadBindingOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-            BindingType = new List<BindingResource.BindingTypeEnum>();
-            Identity = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (BindingType != null)
-            {
-                p.AddRange(BindingType.Select(prop => new KeyValuePair<string, string>("BindingType", prop.ToString())));
-            }
-
-            if (Identity != null)
-            {
-                p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// FetchBindingOptions
+    /// The push technology used by the Binding resources to read
     /// </summary>
-    public class FetchBindingOptions : IOptions<BindingResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        public FetchBindingOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<BindingResource.BindingTypeEnum> BindingType { get; set; }
     /// <summary>
-    /// DeleteBindingOptions
+    /// The `identity` value of the resources to read
     /// </summary>
-    public class DeleteBindingOptions : IOptions<BindingResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        public DeleteBindingOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<string> Identity { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    public ReadBindingOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+      BindingType = new List<BindingResource.BindingTypeEnum>();
+      Identity = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (BindingType != null)
+      {
+        p.AddRange(BindingType.Select(prop => new KeyValuePair<string, string>("BindingType", prop.ToString())));
+      }
+
+      if (Identity != null)
+      {
+        p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchBindingOptions
+  /// </summary>
+  public class FetchBindingOptions : IOptions<BindingResource>
+  {
+    /// <summary>
+    /// The SID of the Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    public FetchBindingOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteBindingOptions
+  /// </summary>
+  public class DeleteBindingOptions : IOptions<BindingResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    public DeleteBindingOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/BindingResource.cs b/src/Twilio/Rest/Chat/V2/Service/BindingResource.cs
index 707165bb5..72a276375 100644
--- a/src/Twilio/Rest/Chat/V2/Service/BindingResource.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/BindingResource.cs
@@ -17,389 +17,389 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V2.Service
-{
-
-    public class BindingResource : Resource
-    {
-        public sealed class BindingTypeEnum : StringEnum
-        {
-            private BindingTypeEnum(string value) : base(value) {}
-            public BindingTypeEnum() {}
-            public static implicit operator BindingTypeEnum(string value)
-            {
-                return new BindingTypeEnum(value);
-            }
-
-            public static readonly BindingTypeEnum Gcm = new BindingTypeEnum("gcm");
-            public static readonly BindingTypeEnum Apn = new BindingTypeEnum("apn");
-            public static readonly BindingTypeEnum Fcm = new BindingTypeEnum("fcm");
-        }
-
-        private static Request BuildReadRequest(ReadBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Bindings",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static ResourceSet<BindingResource> Read(ReadBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<BindingResource>.FromJson("bindings", response.Content);
-            return new ResourceSet<BindingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(ReadBindingOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<BindingResource>.FromJson("bindings", response.Content);
-            return new ResourceSet<BindingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="bindingType"> The push technology used by the Binding resources to read </param>
-        /// <param name="identity"> The `identity` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static ResourceSet<BindingResource> Read(string pathServiceSid,
-                                                        List<BindingResource.BindingTypeEnum> bindingType = null,
-                                                        List<string> identity = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadBindingOptions(pathServiceSid){BindingType = bindingType, Identity = identity, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="bindingType"> The push technology used by the Binding resources to read </param>
-        /// <param name="identity"> The `identity` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(string pathServiceSid,
-                                                                                                List<BindingResource.BindingTypeEnum> bindingType = null,
-                                                                                                List<string> identity = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadBindingOptions(pathServiceSid){BindingType = bindingType, Identity = identity, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<BindingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<BindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<BindingResource> NextPage(Page<BindingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<BindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<BindingResource> PreviousPage(Page<BindingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<BindingResource>.FromJson("bindings", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Bindings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static BindingResource Fetch(FetchBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(FetchBindingOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static BindingResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchBindingOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchBindingOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Bindings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static bool Delete(DeleteBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBindingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteBindingOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteBindingOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a BindingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BindingResource object represented by the provided JSON </returns>
-        public static BindingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BindingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the Binding resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The unique endpoint identifier for the Binding
-        /// </summary>
-        [JsonProperty("endpoint")]
-        public string Endpoint { get; private set; }
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The SID of the Credential for the binding
-        /// </summary>
-        [JsonProperty("credential_sid")]
-        public string CredentialSid { get; private set; }
-        /// <summary>
-        /// The push technology to use for the binding
-        /// </summary>
-        [JsonProperty("binding_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public BindingResource.BindingTypeEnum BindingType { get; private set; }
-        /// <summary>
-        /// The Programmable Chat message types the binding is subscribed to
-        /// </summary>
-        [JsonProperty("message_types")]
-        public List<string> MessageTypes { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Binding resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The absolute URLs of the Binding's User
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private BindingResource()
-        {
-
-        }
-    }
+{
+
+  public class BindingResource : Resource
+  {
+    public sealed class BindingTypeEnum : StringEnum
+    {
+      private BindingTypeEnum(string value) : base(value) { }
+      public BindingTypeEnum() { }
+      public static implicit operator BindingTypeEnum(string value)
+      {
+        return new BindingTypeEnum(value);
+      }
+
+      public static readonly BindingTypeEnum Gcm = new BindingTypeEnum("gcm");
+      public static readonly BindingTypeEnum Apn = new BindingTypeEnum("apn");
+      public static readonly BindingTypeEnum Fcm = new BindingTypeEnum("fcm");
+    }
+
+    private static Request BuildReadRequest(ReadBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Bindings",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static ResourceSet<BindingResource> Read(ReadBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<BindingResource>.FromJson("bindings", response.Content);
+      return new ResourceSet<BindingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(ReadBindingOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<BindingResource>.FromJson("bindings", response.Content);
+      return new ResourceSet<BindingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="bindingType"> The push technology used by the Binding resources to read </param>
+    /// <param name="identity"> The `identity` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static ResourceSet<BindingResource> Read(string pathServiceSid,
+                                                    List<BindingResource.BindingTypeEnum> bindingType = null,
+                                                    List<string> identity = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadBindingOptions(pathServiceSid) { BindingType = bindingType, Identity = identity, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="bindingType"> The push technology used by the Binding resources to read </param>
+    /// <param name="identity"> The `identity` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(string pathServiceSid,
+                                                                                            List<BindingResource.BindingTypeEnum> bindingType = null,
+                                                                                            List<string> identity = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadBindingOptions(pathServiceSid) { BindingType = bindingType, Identity = identity, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<BindingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<BindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<BindingResource> NextPage(Page<BindingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<BindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<BindingResource> PreviousPage(Page<BindingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<BindingResource>.FromJson("bindings", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Bindings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static BindingResource Fetch(FetchBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(FetchBindingOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static BindingResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchBindingOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(string pathServiceSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchBindingOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Bindings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static bool Delete(DeleteBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBindingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteBindingOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteBindingOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a BindingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BindingResource object represented by the provided JSON </returns>
+    public static BindingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BindingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the Binding resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The unique endpoint identifier for the Binding
+    /// </summary>
+    [JsonProperty("endpoint")]
+    public string Endpoint { get; private set; }
+    /// <summary>
+    /// The string that identifies the resource's User
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The SID of the Credential for the binding
+    /// </summary>
+    [JsonProperty("credential_sid")]
+    public string CredentialSid { get; private set; }
+    /// <summary>
+    /// The push technology to use for the binding
+    /// </summary>
+    [JsonProperty("binding_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public BindingResource.BindingTypeEnum BindingType { get; private set; }
+    /// <summary>
+    /// The Programmable Chat message types the binding is subscribed to
+    /// </summary>
+    [JsonProperty("message_types")]
+    public List<string> MessageTypes { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Binding resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The absolute URLs of the Binding's User
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private BindingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/Channel/InviteOptions.cs b/src/Twilio/Rest/Chat/V2/Service/Channel/InviteOptions.cs
index e3c09f4be..92468a65e 100644
--- a/src/Twilio/Rest/Chat/V2/Service/Channel/InviteOptions.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/Channel/InviteOptions.cs
@@ -10,193 +10,193 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V2.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// FetchInviteOptions
+  /// </summary>
+  public class FetchInviteOptions : IOptions<InviteResource>
+  {
     /// <summary>
-    /// FetchInviteOptions
-    /// </summary>
-    public class FetchInviteOptions : IOptions<InviteResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the resource to fetch belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The SID of the Invite resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
-        /// <param name="pathSid"> The SID of the Invite resource to fetch </param>
-        public FetchInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// CreateInviteOptions
-    /// </summary>
-    public class CreateInviteOptions : IOptions<InviteResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the new resource belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The `identity` value that identifies the new resource's User
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The Role assigned to the new member
-        /// </summary>
-        public string RoleSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        public CreateInviteOptions(string pathServiceSid, string pathChannelSid, string identity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Channel the resource to fetch belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
     /// <summary>
-    /// ReadInviteOptions
-    /// </summary>
-    public class ReadInviteOptions : ReadOptions<InviteResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the resources to read belong to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The `identity` value of the resources to read
-        /// </summary>
-        public List<string> Identity { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
-        public ReadInviteOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Invite resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteInviteOptions
-    /// </summary>
-    public class DeleteInviteOptions : IOptions<InviteResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the resource to delete belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The SID of the Invite resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to delete belongs to </param>
-        /// <param name="pathSid"> The SID of the Invite resource to delete </param>
-        public DeleteInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new FetchInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
+    /// <param name="pathSid"> The SID of the Invite resource to fetch </param>
+    public FetchInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateInviteOptions
+  /// </summary>
+  public class CreateInviteOptions : IOptions<InviteResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel the new resource belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The `identity` value that identifies the new resource's User
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The Role assigned to the new member
+    /// </summary>
+    public string RoleSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    public CreateInviteOptions(string pathServiceSid, string pathChannelSid, string identity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadInviteOptions
+  /// </summary>
+  public class ReadInviteOptions : ReadOptions<InviteResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel the resources to read belong to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The `identity` value of the resources to read
+    /// </summary>
+    public List<string> Identity { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
+    public ReadInviteOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteInviteOptions
+  /// </summary>
+  public class DeleteInviteOptions : IOptions<InviteResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel the resource to delete belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The SID of the Invite resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to delete belongs to </param>
+    /// <param name="pathSid"> The SID of the Invite resource to delete </param>
+    public DeleteInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/Channel/InviteResource.cs b/src/Twilio/Rest/Chat/V2/Service/Channel/InviteResource.cs
index 5edb375b2..893f155ce 100644
--- a/src/Twilio/Rest/Chat/V2/Service/Channel/InviteResource.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/Channel/InviteResource.cs
@@ -16,456 +16,456 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Chat.V2.Service.Channel
-{
-
-    public class InviteResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Fetch(FetchInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(FetchInviteOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
-        /// <param name="pathSid"> The SID of the Invite resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Fetch(string pathServiceSid,
-                                           string pathChannelSid,
-                                           string pathSid,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
-        /// <param name="pathSid"> The SID of the Invite resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(string pathServiceSid,
-                                                                                   string pathChannelSid,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Create(CreateInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(CreateInviteOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="roleSid"> The Role assigned to the new member </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Create(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string identity,
-                                            string roleSid = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="roleSid"> The Role assigned to the new member </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string identity,
-                                                                                    string roleSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static ResourceSet<InviteResource> Read(ReadInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<InviteResource>.FromJson("invites", response.Content);
-            return new ResourceSet<InviteResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(ReadInviteOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<InviteResource>.FromJson("invites", response.Content);
-            return new ResourceSet<InviteResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
-        /// <param name="identity"> The `identity` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static ResourceSet<InviteResource> Read(string pathServiceSid,
-                                                       string pathChannelSid,
-                                                       List<string> identity = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadInviteOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
-        /// <param name="identity"> The `identity` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(string pathServiceSid,
-                                                                                               string pathChannelSid,
-                                                                                               List<string> identity = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadInviteOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<InviteResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<InviteResource>.FromJson("invites", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<InviteResource> NextPage(Page<InviteResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<InviteResource>.FromJson("invites", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<InviteResource> PreviousPage(Page<InviteResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<InviteResource>.FromJson("invites", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static bool Delete(DeleteInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteInviteOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to delete belongs to </param>
-        /// <param name="pathSid"> The SID of the Invite resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to delete belongs to </param>
-        /// <param name="pathSid"> The SID of the Invite resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a InviteResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> InviteResource object represented by the provided JSON </returns>
-        public static InviteResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<InviteResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Channel the new resource belongs to
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The SID of the Role assigned to the member
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The identity of the User that created the invite
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Invite resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private InviteResource()
-        {
-
-        }
-    }
+{
+
+  public class InviteResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Fetch(FetchInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(FetchInviteOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
+    /// <param name="pathSid"> The SID of the Invite resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Fetch(string pathServiceSid,
+                                       string pathChannelSid,
+                                       string pathSid,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
+    /// <param name="pathSid"> The SID of the Invite resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(string pathServiceSid,
+                                                                               string pathChannelSid,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Create(CreateInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(CreateInviteOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="roleSid"> The Role assigned to the new member </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Create(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string identity,
+                                        string roleSid = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="roleSid"> The Role assigned to the new member </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string identity,
+                                                                                string roleSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static ResourceSet<InviteResource> Read(ReadInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<InviteResource>.FromJson("invites", response.Content);
+      return new ResourceSet<InviteResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(ReadInviteOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<InviteResource>.FromJson("invites", response.Content);
+      return new ResourceSet<InviteResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
+    /// <param name="identity"> The `identity` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static ResourceSet<InviteResource> Read(string pathServiceSid,
+                                                   string pathChannelSid,
+                                                   List<string> identity = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadInviteOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
+    /// <param name="identity"> The `identity` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(string pathServiceSid,
+                                                                                           string pathChannelSid,
+                                                                                           List<string> identity = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadInviteOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<InviteResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<InviteResource>.FromJson("invites", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<InviteResource> NextPage(Page<InviteResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<InviteResource>.FromJson("invites", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<InviteResource> PreviousPage(Page<InviteResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<InviteResource>.FromJson("invites", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static bool Delete(DeleteInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteInviteOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to delete belongs to </param>
+    /// <param name="pathSid"> The SID of the Invite resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to delete belongs to </param>
+    /// <param name="pathSid"> The SID of the Invite resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a InviteResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> InviteResource object represented by the provided JSON </returns>
+    public static InviteResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<InviteResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Channel the new resource belongs to
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The string that identifies the resource's User
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The SID of the Role assigned to the member
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The identity of the User that created the invite
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Invite resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private InviteResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/Channel/MemberOptions.cs b/src/Twilio/Rest/Chat/V2/Service/Channel/MemberOptions.cs
index a14791341..9869bdbee 100644
--- a/src/Twilio/Rest/Chat/V2/Service/Channel/MemberOptions.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/Channel/MemberOptions.cs
@@ -10,387 +10,387 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V2.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// FetchMemberOptions
+  /// </summary>
+  public class FetchMemberOptions : IOptions<MemberResource>
+  {
     /// <summary>
-    /// FetchMemberOptions
-    /// </summary>
-    public class FetchMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the channel the member belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The SID of the Member resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the channel the member belongs to </param>
-        /// <param name="pathSid"> The SID of the Member resource to fetch </param>
-        public FetchMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// CreateMemberOptions
-    /// </summary>
-    public class CreateMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the channel the new member belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The `identity` value that identifies the new resource's User
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The SID of the Role to assign to the member
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The index of the last Message in the Channel the Member has read
-        /// </summary>
-        public int? LastConsumedMessageIndex { get; set; }
-        /// <summary>
-        /// The ISO 8601 based timestamp string representing the datetime of the last Message read event for the member within the Channel
-        /// </summary>
-        public DateTime? LastConsumptionTimestamp { get; set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was updated
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MemberResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the channel the new member belongs to </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        public CreateMemberOptions(string pathServiceSid, string pathChannelSid, string identity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (LastConsumedMessageIndex != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
-            }
-
-            if (LastConsumptionTimestamp != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumptionTimestamp", Serializers.DateTimeIso8601(LastConsumptionTimestamp)));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the channel the member belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
     /// <summary>
-    /// ReadMemberOptions
-    /// </summary>
-    public class ReadMemberOptions : ReadOptions<MemberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the channel the member belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The `identity` value of the resources to read
-        /// </summary>
-        public List<string> Identity { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the channel the member belongs to </param>
-        public ReadMemberOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Member resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteMemberOptions
-    /// </summary>
-    public class DeleteMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the channel the Member resource to delete belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The SID of the Member resource to delete
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MemberResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the channel the Member resource to delete belongs to </param>
-        /// <param name="pathSid"> The SID of the Member resource to delete </param>
-        public DeleteMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the channel the member belongs to </param>
+    /// <param name="pathSid"> The SID of the Member resource to fetch </param>
+    public FetchMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// UpdateMemberOptions
-    /// </summary>
-    public class UpdateMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the channel the member to update belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The SID of the Member resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The SID of the Role to assign to the member
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The index of the last consumed Message for the Channel for the Member
-        /// </summary>
-        public int? LastConsumedMessageIndex { get; set; }
-        /// <summary>
-        /// The ISO 8601 based timestamp string representing the datetime of the last Message read event for the Member within the Channel
-        /// </summary>
-        public DateTime? LastConsumptionTimestamp { get; set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was updated
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MemberResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the channel the member to update belongs to </param>
-        /// <param name="pathSid"> The SID of the Member resource to update </param>
-        public UpdateMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (LastConsumedMessageIndex != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
-            }
-
-            if (LastConsumptionTimestamp != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumptionTimestamp", Serializers.DateTimeIso8601(LastConsumptionTimestamp)));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateMemberOptions
+  /// </summary>
+  public class CreateMemberOptions : IOptions<MemberResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the channel the new member belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The `identity` value that identifies the new resource's User
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The SID of the Role to assign to the member
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The index of the last Message in the Channel the Member has read
+    /// </summary>
+    public int? LastConsumedMessageIndex { get; set; }
+    /// <summary>
+    /// The ISO 8601 based timestamp string representing the datetime of the last Message read event for the member within the Channel
+    /// </summary>
+    public DateTime? LastConsumptionTimestamp { get; set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was updated
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MemberResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the channel the new member belongs to </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    public CreateMemberOptions(string pathServiceSid, string pathChannelSid, string identity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (LastConsumedMessageIndex != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
+      }
+
+      if (LastConsumptionTimestamp != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumptionTimestamp", Serializers.DateTimeIso8601(LastConsumptionTimestamp)));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadMemberOptions
+  /// </summary>
+  public class ReadMemberOptions : ReadOptions<MemberResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the channel the member belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The `identity` value of the resources to read
+    /// </summary>
+    public List<string> Identity { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the channel the member belongs to </param>
+    public ReadMemberOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteMemberOptions
+  /// </summary>
+  public class DeleteMemberOptions : IOptions<MemberResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the channel the Member resource to delete belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The SID of the Member resource to delete
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MemberResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the channel the Member resource to delete belongs to </param>
+    /// <param name="pathSid"> The SID of the Member resource to delete </param>
+    public DeleteMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateMemberOptions
+  /// </summary>
+  public class UpdateMemberOptions : IOptions<MemberResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the channel the member to update belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The SID of the Member resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The SID of the Role to assign to the member
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The index of the last consumed Message for the Channel for the Member
+    /// </summary>
+    public int? LastConsumedMessageIndex { get; set; }
+    /// <summary>
+    /// The ISO 8601 based timestamp string representing the datetime of the last Message read event for the Member within the Channel
+    /// </summary>
+    public DateTime? LastConsumptionTimestamp { get; set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was updated
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MemberResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the channel the member to update belongs to </param>
+    /// <param name="pathSid"> The SID of the Member resource to update </param>
+    public UpdateMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (LastConsumedMessageIndex != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
+      }
+
+      if (LastConsumptionTimestamp != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumptionTimestamp", Serializers.DateTimeIso8601(LastConsumptionTimestamp)));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/Channel/MemberResource.cs b/src/Twilio/Rest/Chat/V2/Service/Channel/MemberResource.cs
index 8f06610e9..7895bfd7f 100644
--- a/src/Twilio/Rest/Chat/V2/Service/Channel/MemberResource.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/Channel/MemberResource.cs
@@ -17,617 +17,617 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V2.Service.Channel
-{
-
-    public class MemberResource : Resource
-    {
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildFetchRequest(FetchMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Fetch(FetchMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(FetchMemberOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the channel the member belongs to </param>
-        /// <param name="pathSid"> The SID of the Member resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Fetch(string pathServiceSid,
-                                           string pathChannelSid,
-                                           string pathSid,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the channel the member belongs to </param>
-        /// <param name="pathSid"> The SID of the Member resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(string pathServiceSid,
-                                                                                   string pathChannelSid,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Create(CreateMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(CreateMemberOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the channel the new member belongs to </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="roleSid"> The SID of the Role to assign to the member </param>
-        /// <param name="lastConsumedMessageIndex"> The index of the last Message in the Channel the Member has read </param>
-        /// <param name="lastConsumptionTimestamp"> The ISO 8601 based timestamp string representing the datetime of the last
-        ///                                Message read event for the member within the Channel </param>
-        /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
-        /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Create(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string identity,
-                                            string roleSid = null,
-                                            int? lastConsumedMessageIndex = null,
-                                            DateTime? lastConsumptionTimestamp = null,
-                                            DateTime? dateCreated = null,
-                                            DateTime? dateUpdated = null,
-                                            string attributes = null,
-                                            MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the channel the new member belongs to </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="roleSid"> The SID of the Role to assign to the member </param>
-        /// <param name="lastConsumedMessageIndex"> The index of the last Message in the Channel the Member has read </param>
-        /// <param name="lastConsumptionTimestamp"> The ISO 8601 based timestamp string representing the datetime of the last
-        ///                                Message read event for the member within the Channel </param>
-        /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
-        /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string identity,
-                                                                                    string roleSid = null,
-                                                                                    int? lastConsumedMessageIndex = null,
-                                                                                    DateTime? lastConsumptionTimestamp = null,
-                                                                                    DateTime? dateCreated = null,
-                                                                                    DateTime? dateUpdated = null,
-                                                                                    string attributes = null,
-                                                                                    MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static ResourceSet<MemberResource> Read(ReadMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MemberResource>.FromJson("members", response.Content);
-            return new ResourceSet<MemberResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(ReadMemberOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MemberResource>.FromJson("members", response.Content);
-            return new ResourceSet<MemberResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the channel the member belongs to </param>
-        /// <param name="identity"> The `identity` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static ResourceSet<MemberResource> Read(string pathServiceSid,
-                                                       string pathChannelSid,
-                                                       List<string> identity = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadMemberOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the channel the member belongs to </param>
-        /// <param name="identity"> The `identity` value of the resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(string pathServiceSid,
-                                                                                               string pathChannelSid,
-                                                                                               List<string> identity = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadMemberOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MemberResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("members", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MemberResource> NextPage(Page<MemberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("members", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MemberResource> PreviousPage(Page<MemberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("members", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static bool Delete(DeleteMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMemberOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the channel the Member resource to delete belongs to </param>
-        /// <param name="pathSid"> The SID of the Member resource to delete </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the channel the Member resource to delete belongs to </param>
-        /// <param name="pathSid"> The SID of the Member resource to delete </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Update(UpdateMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(UpdateMemberOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the channel the member to update belongs to </param>
-        /// <param name="pathSid"> The SID of the Member resource to update </param>
-        /// <param name="roleSid"> The SID of the Role to assign to the member </param>
-        /// <param name="lastConsumedMessageIndex"> The index of the last consumed Message for the Channel for the Member
-        ///                                </param>
-        /// <param name="lastConsumptionTimestamp"> The ISO 8601 based timestamp string representing the datetime of the last
-        ///                                Message read event for the Member within the Channel </param>
-        /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
-        /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Update(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string pathSid,
-                                            string roleSid = null,
-                                            int? lastConsumedMessageIndex = null,
-                                            DateTime? lastConsumptionTimestamp = null,
-                                            DateTime? dateCreated = null,
-                                            DateTime? dateUpdated = null,
-                                            string attributes = null,
-                                            MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid){RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the channel the member to update belongs to </param>
-        /// <param name="pathSid"> The SID of the Member resource to update </param>
-        /// <param name="roleSid"> The SID of the Role to assign to the member </param>
-        /// <param name="lastConsumedMessageIndex"> The index of the last consumed Message for the Channel for the Member
-        ///                                </param>
-        /// <param name="lastConsumptionTimestamp"> The ISO 8601 based timestamp string representing the datetime of the last
-        ///                                Message read event for the Member within the Channel </param>
-        /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
-        /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string pathSid,
-                                                                                    string roleSid = null,
-                                                                                    int? lastConsumedMessageIndex = null,
-                                                                                    DateTime? lastConsumptionTimestamp = null,
-                                                                                    DateTime? dateCreated = null,
-                                                                                    DateTime? dateUpdated = null,
-                                                                                    string attributes = null,
-                                                                                    MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid){RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a MemberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MemberResource object represented by the provided JSON </returns>
-        public static MemberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MemberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Channel for the member
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The SID of the Role assigned to the member
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The index of the last Message that the Member has read within the Channel
-        /// </summary>
-        [JsonProperty("last_consumed_message_index")]
-        public int? LastConsumedMessageIndex { get; private set; }
-        /// <summary>
-        /// The ISO 8601 based timestamp string that represents the datetime of the last Message read event for the Member within the Channel
-        /// </summary>
-        [JsonProperty("last_consumption_timestamp")]
-        public DateTime? LastConsumptionTimestamp { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Member resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The JSON string that stores application-specific data
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-
-        private MemberResource()
-        {
-
-        }
-    }
+{
+
+  public class MemberResource : Resource
+  {
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildFetchRequest(FetchMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Fetch(FetchMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(FetchMemberOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the channel the member belongs to </param>
+    /// <param name="pathSid"> The SID of the Member resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Fetch(string pathServiceSid,
+                                       string pathChannelSid,
+                                       string pathSid,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the channel the member belongs to </param>
+    /// <param name="pathSid"> The SID of the Member resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(string pathServiceSid,
+                                                                               string pathChannelSid,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Create(CreateMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(CreateMemberOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the channel the new member belongs to </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="roleSid"> The SID of the Role to assign to the member </param>
+    /// <param name="lastConsumedMessageIndex"> The index of the last Message in the Channel the Member has read </param>
+    /// <param name="lastConsumptionTimestamp"> The ISO 8601 based timestamp string representing the datetime of the last
+    ///                                Message read event for the member within the Channel </param>
+    /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
+    /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Create(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string identity,
+                                        string roleSid = null,
+                                        int? lastConsumedMessageIndex = null,
+                                        DateTime? lastConsumptionTimestamp = null,
+                                        DateTime? dateCreated = null,
+                                        DateTime? dateUpdated = null,
+                                        string attributes = null,
+                                        MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the channel the new member belongs to </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="roleSid"> The SID of the Role to assign to the member </param>
+    /// <param name="lastConsumedMessageIndex"> The index of the last Message in the Channel the Member has read </param>
+    /// <param name="lastConsumptionTimestamp"> The ISO 8601 based timestamp string representing the datetime of the last
+    ///                                Message read event for the member within the Channel </param>
+    /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
+    /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string identity,
+                                                                                string roleSid = null,
+                                                                                int? lastConsumedMessageIndex = null,
+                                                                                DateTime? lastConsumptionTimestamp = null,
+                                                                                DateTime? dateCreated = null,
+                                                                                DateTime? dateUpdated = null,
+                                                                                string attributes = null,
+                                                                                MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static ResourceSet<MemberResource> Read(ReadMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MemberResource>.FromJson("members", response.Content);
+      return new ResourceSet<MemberResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(ReadMemberOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MemberResource>.FromJson("members", response.Content);
+      return new ResourceSet<MemberResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the channel the member belongs to </param>
+    /// <param name="identity"> The `identity` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static ResourceSet<MemberResource> Read(string pathServiceSid,
+                                                   string pathChannelSid,
+                                                   List<string> identity = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadMemberOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the channel the member belongs to </param>
+    /// <param name="identity"> The `identity` value of the resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(string pathServiceSid,
+                                                                                           string pathChannelSid,
+                                                                                           List<string> identity = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadMemberOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MemberResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("members", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MemberResource> NextPage(Page<MemberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("members", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MemberResource> PreviousPage(Page<MemberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("members", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static bool Delete(DeleteMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMemberOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the channel the Member resource to delete belongs to </param>
+    /// <param name="pathSid"> The SID of the Member resource to delete </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the channel the Member resource to delete belongs to </param>
+    /// <param name="pathSid"> The SID of the Member resource to delete </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Update(UpdateMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(UpdateMemberOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the channel the member to update belongs to </param>
+    /// <param name="pathSid"> The SID of the Member resource to update </param>
+    /// <param name="roleSid"> The SID of the Role to assign to the member </param>
+    /// <param name="lastConsumedMessageIndex"> The index of the last consumed Message for the Channel for the Member
+    ///                                </param>
+    /// <param name="lastConsumptionTimestamp"> The ISO 8601 based timestamp string representing the datetime of the last
+    ///                                Message read event for the Member within the Channel </param>
+    /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
+    /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Update(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string pathSid,
+                                        string roleSid = null,
+                                        int? lastConsumedMessageIndex = null,
+                                        DateTime? lastConsumptionTimestamp = null,
+                                        DateTime? dateCreated = null,
+                                        DateTime? dateUpdated = null,
+                                        string attributes = null,
+                                        MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid) { RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the channel the member to update belongs to </param>
+    /// <param name="pathSid"> The SID of the Member resource to update </param>
+    /// <param name="roleSid"> The SID of the Role to assign to the member </param>
+    /// <param name="lastConsumedMessageIndex"> The index of the last consumed Message for the Channel for the Member
+    ///                                </param>
+    /// <param name="lastConsumptionTimestamp"> The ISO 8601 based timestamp string representing the datetime of the last
+    ///                                Message read event for the Member within the Channel </param>
+    /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
+    /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string pathSid,
+                                                                                string roleSid = null,
+                                                                                int? lastConsumedMessageIndex = null,
+                                                                                DateTime? lastConsumptionTimestamp = null,
+                                                                                DateTime? dateCreated = null,
+                                                                                DateTime? dateUpdated = null,
+                                                                                string attributes = null,
+                                                                                MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid) { RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a MemberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MemberResource object represented by the provided JSON </returns>
+    public static MemberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MemberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Channel for the member
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The string that identifies the resource's User
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The SID of the Role assigned to the member
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The index of the last Message that the Member has read within the Channel
+    /// </summary>
+    [JsonProperty("last_consumed_message_index")]
+    public int? LastConsumedMessageIndex { get; private set; }
+    /// <summary>
+    /// The ISO 8601 based timestamp string that represents the datetime of the last Message read event for the Member within the Channel
+    /// </summary>
+    [JsonProperty("last_consumption_timestamp")]
+    public DateTime? LastConsumptionTimestamp { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Member resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The JSON string that stores application-specific data
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+
+    private MemberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/Channel/MessageOptions.cs b/src/Twilio/Rest/Chat/V2/Service/Channel/MessageOptions.cs
index 65f595845..aff6ee399 100644
--- a/src/Twilio/Rest/Chat/V2/Service/Channel/MessageOptions.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/Channel/MessageOptions.cs
@@ -9,384 +9,384 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V2.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// FetchMessageOptions
+  /// </summary>
+  public class FetchMessageOptions : IOptions<MessageResource>
+  {
     /// <summary>
-    /// FetchMessageOptions
-    /// </summary>
-    public class FetchMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the message to fetch belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The SID of the Message resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the message to fetch belongs to </param>
-        /// <param name="pathSid"> The SID of the Message resource to fetch </param>
-        public FetchMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// CreateMessageOptions
-    /// </summary>
-    public class CreateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the new resource belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The Identity of the new message's author
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was updated
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// The Identity of the User who last updated the Message
-        /// </summary>
-        public string LastUpdatedBy { get; set; }
-        /// <summary>
-        /// The message to send to the channel
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        ///  The Media Sid to be attached to the new Message
-        /// </summary>
-        public string MediaSid { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
-        public CreateMessageOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (LastUpdatedBy != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastUpdatedBy", LastUpdatedBy));
-            }
-
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (MediaSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MediaSid", MediaSid.ToString()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Channel the message to fetch belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
     /// <summary>
-    /// ReadMessageOptions
-    /// </summary>
-    public class ReadMessageOptions : ReadOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the message to read belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sort order of the returned messages
-        /// </summary>
-        public MessageResource.OrderTypeEnum Order { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the message to read belongs to </param>
-        public ReadMessageOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Order != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Message resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteMessageOptions
-    /// </summary>
-    public class DeleteMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the message to delete belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The SID of the Message resource to delete
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the message to delete belongs to </param>
-        /// <param name="pathSid"> The SID of the Message resource to delete </param>
-        public DeleteMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the message to fetch belongs to </param>
+    /// <param name="pathSid"> The SID of the Message resource to fetch </param>
+    public FetchMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// UpdateMessageOptions
-    /// </summary>
-    public class UpdateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the message belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The SID of the Message resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The message to send to the channel
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was updated
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// The Identity of the User who last updated the Message, if applicable
-        /// </summary>
-        public string LastUpdatedBy { get; set; }
-        /// <summary>
-        /// The Identity of the message's author
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the message belongs to </param>
-        /// <param name="pathSid"> The SID of the Message resource to update </param>
-        public UpdateMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (LastUpdatedBy != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastUpdatedBy", LastUpdatedBy));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateMessageOptions
+  /// </summary>
+  public class CreateMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel the new resource belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The Identity of the new message's author
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was updated
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// The Identity of the User who last updated the Message
+    /// </summary>
+    public string LastUpdatedBy { get; set; }
+    /// <summary>
+    /// The message to send to the channel
+    /// </summary>
+    public string Body { get; set; }
+    /// <summary>
+    ///  The Media Sid to be attached to the new Message
+    /// </summary>
+    public string MediaSid { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
+    public CreateMessageOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (LastUpdatedBy != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastUpdatedBy", LastUpdatedBy));
+      }
+
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (MediaSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MediaSid", MediaSid.ToString()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadMessageOptions
+  /// </summary>
+  public class ReadMessageOptions : ReadOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel the message to read belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sort order of the returned messages
+    /// </summary>
+    public MessageResource.OrderTypeEnum Order { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the message to read belongs to </param>
+    public ReadMessageOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Order != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteMessageOptions
+  /// </summary>
+  public class DeleteMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel the message to delete belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The SID of the Message resource to delete
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the message to delete belongs to </param>
+    /// <param name="pathSid"> The SID of the Message resource to delete </param>
+    public DeleteMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateMessageOptions
+  /// </summary>
+  public class UpdateMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel the message belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The SID of the Message resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The message to send to the channel
+    /// </summary>
+    public string Body { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was updated
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// The Identity of the User who last updated the Message, if applicable
+    /// </summary>
+    public string LastUpdatedBy { get; set; }
+    /// <summary>
+    /// The Identity of the message's author
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the message belongs to </param>
+    /// <param name="pathSid"> The SID of the Message resource to update </param>
+    public UpdateMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (LastUpdatedBy != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastUpdatedBy", LastUpdatedBy));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/Channel/MessageResource.cs b/src/Twilio/Rest/Chat/V2/Service/Channel/MessageResource.cs
index 7482c5c1c..9cdabefdb 100644
--- a/src/Twilio/Rest/Chat/V2/Service/Channel/MessageResource.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/Channel/MessageResource.cs
@@ -17,644 +17,644 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V2.Service.Channel
-{
-
-    public class MessageResource : Resource
-    {
-        public sealed class OrderTypeEnum : StringEnum
-        {
-            private OrderTypeEnum(string value) : base(value) {}
-            public OrderTypeEnum() {}
-            public static implicit operator OrderTypeEnum(string value)
-            {
-                return new OrderTypeEnum(value);
-            }
-
-            public static readonly OrderTypeEnum Asc = new OrderTypeEnum("asc");
-            public static readonly OrderTypeEnum Desc = new OrderTypeEnum("desc");
-        }
-
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the message to fetch belongs to </param>
-        /// <param name="pathSid"> The SID of the Message resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string pathSid,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the message to fetch belongs to </param>
-        /// <param name="pathSid"> The SID of the Message resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
-        /// <param name="from"> The Identity of the new message's author </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
-        /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
-        /// <param name="lastUpdatedBy"> The Identity of the User who last updated the Message </param>
-        /// <param name="body"> The message to send to the channel </param>
-        /// <param name="mediaSid">  The Media Sid to be attached to the new Message </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(string pathServiceSid,
-                                             string pathChannelSid,
-                                             string from = null,
-                                             string attributes = null,
-                                             DateTime? dateCreated = null,
-                                             DateTime? dateUpdated = null,
-                                             string lastUpdatedBy = null,
-                                             string body = null,
-                                             string mediaSid = null,
-                                             MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(pathServiceSid, pathChannelSid){From = from, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, Body = body, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
-        /// <param name="from"> The Identity of the new message's author </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
-        /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
-        /// <param name="lastUpdatedBy"> The Identity of the User who last updated the Message </param>
-        /// <param name="body"> The message to send to the channel </param>
-        /// <param name="mediaSid">  The Media Sid to be attached to the new Message </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(string pathServiceSid,
-                                                                                     string pathChannelSid,
-                                                                                     string from = null,
-                                                                                     string attributes = null,
-                                                                                     DateTime? dateCreated = null,
-                                                                                     DateTime? dateUpdated = null,
-                                                                                     string lastUpdatedBy = null,
-                                                                                     string body = null,
-                                                                                     string mediaSid = null,
-                                                                                     MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(pathServiceSid, pathChannelSid){From = from, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, Body = body, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the message to read belongs to </param>
-        /// <param name="order"> The sort order of the returned messages </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(string pathServiceSid,
-                                                        string pathChannelSid,
-                                                        MessageResource.OrderTypeEnum order = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(pathServiceSid, pathChannelSid){Order = order, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the message to read belongs to </param>
-        /// <param name="order"> The sort order of the returned messages </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathServiceSid,
-                                                                                                string pathChannelSid,
-                                                                                                MessageResource.OrderTypeEnum order = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(pathServiceSid, pathChannelSid){Order = order, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the message to delete belongs to </param>
-        /// <param name="pathSid"> The SID of the Message resource to delete </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the message to delete belongs to </param>
-        /// <param name="pathSid"> The SID of the Message resource to delete </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the message belongs to </param>
-        /// <param name="pathSid"> The SID of the Message resource to update </param>
-        /// <param name="body"> The message to send to the channel </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
-        /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
-        /// <param name="lastUpdatedBy"> The Identity of the User who last updated the Message, if applicable </param>
-        /// <param name="from"> The Identity of the message's author </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(string pathServiceSid,
-                                             string pathChannelSid,
-                                             string pathSid,
-                                             string body = null,
-                                             string attributes = null,
-                                             DateTime? dateCreated = null,
-                                             DateTime? dateUpdated = null,
-                                             string lastUpdatedBy = null,
-                                             string from = null,
-                                             MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid){Body = body, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, From = from, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the message belongs to </param>
-        /// <param name="pathSid"> The SID of the Message resource to update </param>
-        /// <param name="body"> The message to send to the channel </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
-        /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
-        /// <param name="lastUpdatedBy"> The Identity of the User who last updated the Message, if applicable </param>
-        /// <param name="from"> The Identity of the message's author </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathServiceSid,
-                                                                                     string pathChannelSid,
-                                                                                     string pathSid,
-                                                                                     string body = null,
-                                                                                     string attributes = null,
-                                                                                     DateTime? dateCreated = null,
-                                                                                     DateTime? dateUpdated = null,
-                                                                                     string lastUpdatedBy = null,
-                                                                                     string from = null,
-                                                                                     MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid){Body = body, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, From = from, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a MessageResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MessageResource object represented by the provided JSON </returns>
-        public static MessageResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MessageResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The JSON string that stores application-specific data
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Channel that the message was sent to
-        /// </summary>
-        [JsonProperty("to")]
-        public string To { get; private set; }
-        /// <summary>
-        /// The SID of the Channel the Message resource belongs to
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The Identity of the User who last updated the Message
-        /// </summary>
-        [JsonProperty("last_updated_by")]
-        public string LastUpdatedBy { get; private set; }
-        /// <summary>
-        /// Whether the message has been edited since  it was created
-        /// </summary>
-        [JsonProperty("was_edited")]
-        public bool? WasEdited { get; private set; }
-        /// <summary>
-        /// The Identity of the message's author
-        /// </summary>
-        [JsonProperty("from")]
-        public string From { get; private set; }
-        /// <summary>
-        /// The content of the message
-        /// </summary>
-        [JsonProperty("body")]
-        public string Body { get; private set; }
-        /// <summary>
-        /// The index of the message within the Channel
-        /// </summary>
-        [JsonProperty("index")]
-        public int? Index { get; private set; }
-        /// <summary>
-        /// The Message type
-        /// </summary>
-        [JsonProperty("type")]
-        public string Type { get; private set; }
-        /// <summary>
-        /// A Media object that describes the Message's media if attached; otherwise, null
-        /// </summary>
-        [JsonProperty("media")]
-        public object Media { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Message resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private MessageResource()
-        {
-
-        }
-    }
+{
+
+  public class MessageResource : Resource
+  {
+    public sealed class OrderTypeEnum : StringEnum
+    {
+      private OrderTypeEnum(string value) : base(value) { }
+      public OrderTypeEnum() { }
+      public static implicit operator OrderTypeEnum(string value)
+      {
+        return new OrderTypeEnum(value);
+      }
+
+      public static readonly OrderTypeEnum Asc = new OrderTypeEnum("asc");
+      public static readonly OrderTypeEnum Desc = new OrderTypeEnum("desc");
+    }
+
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the message to fetch belongs to </param>
+    /// <param name="pathSid"> The SID of the Message resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string pathSid,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the message to fetch belongs to </param>
+    /// <param name="pathSid"> The SID of the Message resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
+    /// <param name="from"> The Identity of the new message's author </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
+    /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
+    /// <param name="lastUpdatedBy"> The Identity of the User who last updated the Message </param>
+    /// <param name="body"> The message to send to the channel </param>
+    /// <param name="mediaSid">  The Media Sid to be attached to the new Message </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(string pathServiceSid,
+                                         string pathChannelSid,
+                                         string from = null,
+                                         string attributes = null,
+                                         DateTime? dateCreated = null,
+                                         DateTime? dateUpdated = null,
+                                         string lastUpdatedBy = null,
+                                         string body = null,
+                                         string mediaSid = null,
+                                         MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(pathServiceSid, pathChannelSid) { From = from, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, Body = body, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
+    /// <param name="from"> The Identity of the new message's author </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
+    /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
+    /// <param name="lastUpdatedBy"> The Identity of the User who last updated the Message </param>
+    /// <param name="body"> The message to send to the channel </param>
+    /// <param name="mediaSid">  The Media Sid to be attached to the new Message </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(string pathServiceSid,
+                                                                                 string pathChannelSid,
+                                                                                 string from = null,
+                                                                                 string attributes = null,
+                                                                                 DateTime? dateCreated = null,
+                                                                                 DateTime? dateUpdated = null,
+                                                                                 string lastUpdatedBy = null,
+                                                                                 string body = null,
+                                                                                 string mediaSid = null,
+                                                                                 MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(pathServiceSid, pathChannelSid) { From = from, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, Body = body, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the message to read belongs to </param>
+    /// <param name="order"> The sort order of the returned messages </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(string pathServiceSid,
+                                                    string pathChannelSid,
+                                                    MessageResource.OrderTypeEnum order = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions(pathServiceSid, pathChannelSid) { Order = order, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the message to read belongs to </param>
+    /// <param name="order"> The sort order of the returned messages </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathServiceSid,
+                                                                                            string pathChannelSid,
+                                                                                            MessageResource.OrderTypeEnum order = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions(pathServiceSid, pathChannelSid) { Order = order, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the message to delete belongs to </param>
+    /// <param name="pathSid"> The SID of the Message resource to delete </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the message to delete belongs to </param>
+    /// <param name="pathSid"> The SID of the Message resource to delete </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the message belongs to </param>
+    /// <param name="pathSid"> The SID of the Message resource to update </param>
+    /// <param name="body"> The message to send to the channel </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
+    /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
+    /// <param name="lastUpdatedBy"> The Identity of the User who last updated the Message, if applicable </param>
+    /// <param name="from"> The Identity of the message's author </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(string pathServiceSid,
+                                         string pathChannelSid,
+                                         string pathSid,
+                                         string body = null,
+                                         string attributes = null,
+                                         DateTime? dateCreated = null,
+                                         DateTime? dateUpdated = null,
+                                         string lastUpdatedBy = null,
+                                         string from = null,
+                                         MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid) { Body = body, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, From = from, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the message belongs to </param>
+    /// <param name="pathSid"> The SID of the Message resource to update </param>
+    /// <param name="body"> The message to send to the channel </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
+    /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
+    /// <param name="lastUpdatedBy"> The Identity of the User who last updated the Message, if applicable </param>
+    /// <param name="from"> The Identity of the message's author </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathServiceSid,
+                                                                                 string pathChannelSid,
+                                                                                 string pathSid,
+                                                                                 string body = null,
+                                                                                 string attributes = null,
+                                                                                 DateTime? dateCreated = null,
+                                                                                 DateTime? dateUpdated = null,
+                                                                                 string lastUpdatedBy = null,
+                                                                                 string from = null,
+                                                                                 MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid) { Body = body, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, From = from, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a MessageResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MessageResource object represented by the provided JSON </returns>
+    public static MessageResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MessageResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The JSON string that stores application-specific data
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Channel that the message was sent to
+    /// </summary>
+    [JsonProperty("to")]
+    public string To { get; private set; }
+    /// <summary>
+    /// The SID of the Channel the Message resource belongs to
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The Identity of the User who last updated the Message
+    /// </summary>
+    [JsonProperty("last_updated_by")]
+    public string LastUpdatedBy { get; private set; }
+    /// <summary>
+    /// Whether the message has been edited since  it was created
+    /// </summary>
+    [JsonProperty("was_edited")]
+    public bool? WasEdited { get; private set; }
+    /// <summary>
+    /// The Identity of the message's author
+    /// </summary>
+    [JsonProperty("from")]
+    public string From { get; private set; }
+    /// <summary>
+    /// The content of the message
+    /// </summary>
+    [JsonProperty("body")]
+    public string Body { get; private set; }
+    /// <summary>
+    /// The index of the message within the Channel
+    /// </summary>
+    [JsonProperty("index")]
+    public int? Index { get; private set; }
+    /// <summary>
+    /// The Message type
+    /// </summary>
+    [JsonProperty("type")]
+    public string Type { get; private set; }
+    /// <summary>
+    /// A Media object that describes the Message's media if attached; otherwise, null
+    /// </summary>
+    [JsonProperty("media")]
+    public object Media { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Message resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private MessageResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/Channel/WebhookOptions.cs b/src/Twilio/Rest/Chat/V2/Service/Channel/WebhookOptions.cs
index 789885491..86abbba9c 100644
--- a/src/Twilio/Rest/Chat/V2/Service/Channel/WebhookOptions.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/Channel/WebhookOptions.cs
@@ -10,328 +10,328 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V2.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// ReadWebhookOptions
+  /// </summary>
+  public class ReadWebhookOptions : ReadOptions<WebhookResource>
+  {
     /// <summary>
-    /// ReadWebhookOptions
-    /// </summary>
-    public class ReadWebhookOptions : ReadOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the resources to read belong to
-        /// </summary>
-        public string PathChannelSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
-        public ReadWebhookOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// FetchWebhookOptions
-    /// </summary>
-    public class FetchWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Service with the Channel to fetch the Webhook resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the resource to fetch belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The SID of the Channel Webhook resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service with the Channel to fetch the Webhook resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
-        /// <param name="pathSid"> The SID of the Channel Webhook resource to fetch </param>
-        public FetchWebhookOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Channel the resources to read belong to
+    /// </summary>
+    public string PathChannelSid { get; }
+
     /// <summary>
-    /// CreateWebhookOptions
-    /// </summary>
-    public class CreateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Service with the Channel to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the new resource belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The type of webhook
-        /// </summary>
-        public WebhookResource.TypeEnum Type { get; }
-        /// <summary>
-        /// The URL of the webhook to call
-        /// </summary>
-        public string ConfigurationUrl { get; set; }
-        /// <summary>
-        /// The HTTP method used to call `configuration.url`
-        /// </summary>
-        public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
-        /// <summary>
-        /// The events that cause us to call the Channel Webhook
-        /// </summary>
-        public List<string> ConfigurationFilters { get; set; }
-        /// <summary>
-        /// A string that will cause us to call the webhook when it is found in a message body
-        /// </summary>
-        public List<string> ConfigurationTriggers { get; set; }
-        /// <summary>
-        /// The SID of the Studio Flow to call when an event occurs
-        /// </summary>
-        public string ConfigurationFlowSid { get; set; }
-        /// <summary>
-        /// The number of times to retry the webhook if the first attempt fails
-        /// </summary>
-        public int? ConfigurationRetryCount { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service with the Channel to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
-        /// <param name="type"> The type of webhook </param>
-        public CreateWebhookOptions(string pathServiceSid, string pathChannelSid, WebhookResource.TypeEnum type)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Type = type;
-            ConfigurationFilters = new List<string>();
-            ConfigurationTriggers = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (ConfigurationUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
-            }
-
-            if (ConfigurationMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
-            }
-
-            if (ConfigurationFilters != null)
-            {
-                p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
-            }
-
-            if (ConfigurationTriggers != null)
-            {
-                p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
-            }
-
-            if (ConfigurationFlowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
-            }
-
-            if (ConfigurationRetryCount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.RetryCount", ConfigurationRetryCount.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new ReadWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
+    public ReadWebhookOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+    }
+
     /// <summary>
-    /// UpdateWebhookOptions
-    /// </summary>
-    public class UpdateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Service with the Channel that has the Webhook resource to update
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel the resource to update belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The SID of the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The URL of the webhook to call
-        /// </summary>
-        public string ConfigurationUrl { get; set; }
-        /// <summary>
-        /// The HTTP method used to call `configuration.url`
-        /// </summary>
-        public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
-        /// <summary>
-        /// The events that cause us to call the Channel Webhook
-        /// </summary>
-        public List<string> ConfigurationFilters { get; set; }
-        /// <summary>
-        /// A string that will cause us to call the webhook when it is found in a message body
-        /// </summary>
-        public List<string> ConfigurationTriggers { get; set; }
-        /// <summary>
-        /// The SID of the Studio Flow to call when an event occurs
-        /// </summary>
-        public string ConfigurationFlowSid { get; set; }
-        /// <summary>
-        /// The number of times to retry the webhook if the first attempt fails
-        /// </summary>
-        public int? ConfigurationRetryCount { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service with the Channel that has the Webhook resource to update
-        ///                      </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to update belongs to </param>
-        /// <param name="pathSid"> The SID of the resource </param>
-        public UpdateWebhookOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-            ConfigurationFilters = new List<string>();
-            ConfigurationTriggers = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ConfigurationUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
-            }
-
-            if (ConfigurationMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
-            }
-
-            if (ConfigurationFilters != null)
-            {
-                p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
-            }
-
-            if (ConfigurationTriggers != null)
-            {
-                p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
-            }
-
-            if (ConfigurationFlowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
-            }
-
-            if (ConfigurationRetryCount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.RetryCount", ConfigurationRetryCount.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchWebhookOptions
+  /// </summary>
+  public class FetchWebhookOptions : IOptions<WebhookResource>
+  {
     /// <summary>
-    /// DeleteWebhookOptions
-    /// </summary>
-    public class DeleteWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Service with the Channel to delete the Webhook resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the channel the resource to delete belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The SID of the Channel Webhook resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service with the Channel to delete the Webhook resource from </param>
-        /// <param name="pathChannelSid"> The SID of the channel the resource to delete belongs to </param>
-        /// <param name="pathSid"> The SID of the Channel Webhook resource to delete </param>
-        public DeleteWebhookOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// The SID of the Service with the Channel to fetch the Webhook resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel the resource to fetch belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The SID of the Channel Webhook resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service with the Channel to fetch the Webhook resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
+    /// <param name="pathSid"> The SID of the Channel Webhook resource to fetch </param>
+    public FetchWebhookOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateWebhookOptions
+  /// </summary>
+  public class CreateWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The SID of the Service with the Channel to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel the new resource belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The type of webhook
+    /// </summary>
+    public WebhookResource.TypeEnum Type { get; }
+    /// <summary>
+    /// The URL of the webhook to call
+    /// </summary>
+    public string ConfigurationUrl { get; set; }
+    /// <summary>
+    /// The HTTP method used to call `configuration.url`
+    /// </summary>
+    public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
+    /// <summary>
+    /// The events that cause us to call the Channel Webhook
+    /// </summary>
+    public List<string> ConfigurationFilters { get; set; }
+    /// <summary>
+    /// A string that will cause us to call the webhook when it is found in a message body
+    /// </summary>
+    public List<string> ConfigurationTriggers { get; set; }
+    /// <summary>
+    /// The SID of the Studio Flow to call when an event occurs
+    /// </summary>
+    public string ConfigurationFlowSid { get; set; }
+    /// <summary>
+    /// The number of times to retry the webhook if the first attempt fails
+    /// </summary>
+    public int? ConfigurationRetryCount { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service with the Channel to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
+    /// <param name="type"> The type of webhook </param>
+    public CreateWebhookOptions(string pathServiceSid, string pathChannelSid, WebhookResource.TypeEnum type)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Type = type;
+      ConfigurationFilters = new List<string>();
+      ConfigurationTriggers = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (ConfigurationUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
+      }
+
+      if (ConfigurationMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
+      }
+
+      if (ConfigurationFilters != null)
+      {
+        p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
+      }
+
+      if (ConfigurationTriggers != null)
+      {
+        p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
+      }
+
+      if (ConfigurationFlowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
+      }
+
+      if (ConfigurationRetryCount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.RetryCount", ConfigurationRetryCount.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateWebhookOptions
+  /// </summary>
+  public class UpdateWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The SID of the Service with the Channel that has the Webhook resource to update
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel the resource to update belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The SID of the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The URL of the webhook to call
+    /// </summary>
+    public string ConfigurationUrl { get; set; }
+    /// <summary>
+    /// The HTTP method used to call `configuration.url`
+    /// </summary>
+    public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
+    /// <summary>
+    /// The events that cause us to call the Channel Webhook
+    /// </summary>
+    public List<string> ConfigurationFilters { get; set; }
+    /// <summary>
+    /// A string that will cause us to call the webhook when it is found in a message body
+    /// </summary>
+    public List<string> ConfigurationTriggers { get; set; }
+    /// <summary>
+    /// The SID of the Studio Flow to call when an event occurs
+    /// </summary>
+    public string ConfigurationFlowSid { get; set; }
+    /// <summary>
+    /// The number of times to retry the webhook if the first attempt fails
+    /// </summary>
+    public int? ConfigurationRetryCount { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service with the Channel that has the Webhook resource to update
+    ///                      </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to update belongs to </param>
+    /// <param name="pathSid"> The SID of the resource </param>
+    public UpdateWebhookOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+      ConfigurationFilters = new List<string>();
+      ConfigurationTriggers = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ConfigurationUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
+      }
+
+      if (ConfigurationMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
+      }
+
+      if (ConfigurationFilters != null)
+      {
+        p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
+      }
+
+      if (ConfigurationTriggers != null)
+      {
+        p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
+      }
+
+      if (ConfigurationFlowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
+      }
+
+      if (ConfigurationRetryCount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.RetryCount", ConfigurationRetryCount.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteWebhookOptions
+  /// </summary>
+  public class DeleteWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The SID of the Service with the Channel to delete the Webhook resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the channel the resource to delete belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The SID of the Channel Webhook resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service with the Channel to delete the Webhook resource from </param>
+    /// <param name="pathChannelSid"> The SID of the channel the resource to delete belongs to </param>
+    /// <param name="pathSid"> The SID of the Channel Webhook resource to delete </param>
+    public DeleteWebhookOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/Channel/WebhookResource.cs b/src/Twilio/Rest/Chat/V2/Service/Channel/WebhookResource.cs
index f06c6cae1..23b4dbb24 100644
--- a/src/Twilio/Rest/Chat/V2/Service/Channel/WebhookResource.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/Channel/WebhookResource.cs
@@ -17,600 +17,600 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V2.Service.Channel
-{
-
-    public class WebhookResource : Resource
-    {
-        public sealed class TypeEnum : StringEnum
-        {
-            private TypeEnum(string value) : base(value) {}
-            public TypeEnum() {}
-            public static implicit operator TypeEnum(string value)
-            {
-                return new TypeEnum(value);
-            }
-
-            public static readonly TypeEnum Webhook = new TypeEnum("webhook");
-            public static readonly TypeEnum Trigger = new TypeEnum("trigger");
-            public static readonly TypeEnum Studio = new TypeEnum("studio");
-        }
-
-        public sealed class MethodEnum : StringEnum
-        {
-            private MethodEnum(string value) : base(value) {}
-            public MethodEnum() {}
-            public static implicit operator MethodEnum(string value)
-            {
-                return new MethodEnum(value);
-            }
-
-            public static readonly MethodEnum Get = new MethodEnum("GET");
-            public static readonly MethodEnum Post = new MethodEnum("POST");
-        }
-
-        private static Request BuildReadRequest(ReadWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static ResourceSet<WebhookResource> Read(ReadWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
-            return new ResourceSet<WebhookResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(ReadWebhookOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
-            return new ResourceSet<WebhookResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static ResourceSet<WebhookResource> Read(string pathServiceSid,
-                                                        string pathChannelSid,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadWebhookOptions(pathServiceSid, pathChannelSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(string pathServiceSid,
-                                                                                                string pathChannelSid,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadWebhookOptions(pathServiceSid, pathChannelSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<WebhookResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<WebhookResource> NextPage(Page<WebhookResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<WebhookResource> PreviousPage(Page<WebhookResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service with the Channel to fetch the Webhook resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
-        /// <param name="pathSid"> The SID of the Channel Webhook resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string pathSid,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service with the Channel to fetch the Webhook resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
-        /// <param name="pathSid"> The SID of the Channel Webhook resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Create(CreateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(CreateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service with the Channel to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
-        /// <param name="type"> The type of webhook </param>
-        /// <param name="configurationUrl"> The URL of the webhook to call </param>
-        /// <param name="configurationMethod"> The HTTP method used to call `configuration.url` </param>
-        /// <param name="configurationFilters"> The events that cause us to call the Channel Webhook </param>
-        /// <param name="configurationTriggers"> A string that will cause us to call the webhook when it is found in a message
-        ///                             body </param>
-        /// <param name="configurationFlowSid"> The SID of the Studio Flow to call when an event occurs </param>
-        /// <param name="configurationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Create(string pathServiceSid,
-                                             string pathChannelSid,
-                                             WebhookResource.TypeEnum type,
-                                             string configurationUrl = null,
-                                             WebhookResource.MethodEnum configurationMethod = null,
-                                             List<string> configurationFilters = null,
-                                             List<string> configurationTriggers = null,
-                                             string configurationFlowSid = null,
-                                             int? configurationRetryCount = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateWebhookOptions(pathServiceSid, pathChannelSid, type){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service with the Channel to create the resource under </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
-        /// <param name="type"> The type of webhook </param>
-        /// <param name="configurationUrl"> The URL of the webhook to call </param>
-        /// <param name="configurationMethod"> The HTTP method used to call `configuration.url` </param>
-        /// <param name="configurationFilters"> The events that cause us to call the Channel Webhook </param>
-        /// <param name="configurationTriggers"> A string that will cause us to call the webhook when it is found in a message
-        ///                             body </param>
-        /// <param name="configurationFlowSid"> The SID of the Studio Flow to call when an event occurs </param>
-        /// <param name="configurationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(string pathServiceSid,
-                                                                                     string pathChannelSid,
-                                                                                     WebhookResource.TypeEnum type,
-                                                                                     string configurationUrl = null,
-                                                                                     WebhookResource.MethodEnum configurationMethod = null,
-                                                                                     List<string> configurationFilters = null,
-                                                                                     List<string> configurationTriggers = null,
-                                                                                     string configurationFlowSid = null,
-                                                                                     int? configurationRetryCount = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateWebhookOptions(pathServiceSid, pathChannelSid, type){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service with the Channel that has the Webhook resource to update
-        ///                      </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to update belongs to </param>
-        /// <param name="pathSid"> The SID of the resource </param>
-        /// <param name="configurationUrl"> The URL of the webhook to call </param>
-        /// <param name="configurationMethod"> The HTTP method used to call `configuration.url` </param>
-        /// <param name="configurationFilters"> The events that cause us to call the Channel Webhook </param>
-        /// <param name="configurationTriggers"> A string that will cause us to call the webhook when it is found in a message
-        ///                             body </param>
-        /// <param name="configurationFlowSid"> The SID of the Studio Flow to call when an event occurs </param>
-        /// <param name="configurationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(string pathServiceSid,
-                                             string pathChannelSid,
-                                             string pathSid,
-                                             string configurationUrl = null,
-                                             WebhookResource.MethodEnum configurationMethod = null,
-                                             List<string> configurationFilters = null,
-                                             List<string> configurationTriggers = null,
-                                             string configurationFlowSid = null,
-                                             int? configurationRetryCount = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathServiceSid, pathChannelSid, pathSid){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service with the Channel that has the Webhook resource to update
-        ///                      </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource to update belongs to </param>
-        /// <param name="pathSid"> The SID of the resource </param>
-        /// <param name="configurationUrl"> The URL of the webhook to call </param>
-        /// <param name="configurationMethod"> The HTTP method used to call `configuration.url` </param>
-        /// <param name="configurationFilters"> The events that cause us to call the Channel Webhook </param>
-        /// <param name="configurationTriggers"> A string that will cause us to call the webhook when it is found in a message
-        ///                             body </param>
-        /// <param name="configurationFlowSid"> The SID of the Studio Flow to call when an event occurs </param>
-        /// <param name="configurationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathServiceSid,
-                                                                                     string pathChannelSid,
-                                                                                     string pathSid,
-                                                                                     string configurationUrl = null,
-                                                                                     WebhookResource.MethodEnum configurationMethod = null,
-                                                                                     List<string> configurationFilters = null,
-                                                                                     List<string> configurationTriggers = null,
-                                                                                     string configurationFlowSid = null,
-                                                                                     int? configurationRetryCount = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathServiceSid, pathChannelSid, pathSid){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static bool Delete(DeleteWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebhookOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service with the Channel to delete the Webhook resource from </param>
-        /// <param name="pathChannelSid"> The SID of the channel the resource to delete belongs to </param>
-        /// <param name="pathSid"> The SID of the Channel Webhook resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service with the Channel to delete the Webhook resource from </param>
-        /// <param name="pathChannelSid"> The SID of the channel the resource to delete belongs to </param>
-        /// <param name="pathSid"> The SID of the Channel Webhook resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WebhookResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WebhookResource object represented by the provided JSON </returns>
-        public static WebhookResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WebhookResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the Channel Webhook resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Channel the Channel Webhook resource belongs to
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The type of webhook
-        /// </summary>
-        [JsonProperty("type")]
-        public string Type { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Channel Webhook resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The JSON string that describes the configuration object for the channel webhook
-        /// </summary>
-        [JsonProperty("configuration")]
-        public object Configuration { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private WebhookResource()
-        {
-
-        }
-    }
+{
+
+  public class WebhookResource : Resource
+  {
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+      public TypeEnum() { }
+      public static implicit operator TypeEnum(string value)
+      {
+        return new TypeEnum(value);
+      }
+
+      public static readonly TypeEnum Webhook = new TypeEnum("webhook");
+      public static readonly TypeEnum Trigger = new TypeEnum("trigger");
+      public static readonly TypeEnum Studio = new TypeEnum("studio");
+    }
+
+    public sealed class MethodEnum : StringEnum
+    {
+      private MethodEnum(string value) : base(value) { }
+      public MethodEnum() { }
+      public static implicit operator MethodEnum(string value)
+      {
+        return new MethodEnum(value);
+      }
+
+      public static readonly MethodEnum Get = new MethodEnum("GET");
+      public static readonly MethodEnum Post = new MethodEnum("POST");
+    }
+
+    private static Request BuildReadRequest(ReadWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static ResourceSet<WebhookResource> Read(ReadWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
+      return new ResourceSet<WebhookResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(ReadWebhookOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
+      return new ResourceSet<WebhookResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static ResourceSet<WebhookResource> Read(string pathServiceSid,
+                                                    string pathChannelSid,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadWebhookOptions(pathServiceSid, pathChannelSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resources to read belong to </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(string pathServiceSid,
+                                                                                            string pathChannelSid,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadWebhookOptions(pathServiceSid, pathChannelSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<WebhookResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<WebhookResource> NextPage(Page<WebhookResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<WebhookResource> PreviousPage(Page<WebhookResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service with the Channel to fetch the Webhook resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
+    /// <param name="pathSid"> The SID of the Channel Webhook resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string pathSid,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service with the Channel to fetch the Webhook resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to fetch belongs to </param>
+    /// <param name="pathSid"> The SID of the Channel Webhook resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Create(CreateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(CreateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service with the Channel to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
+    /// <param name="type"> The type of webhook </param>
+    /// <param name="configurationUrl"> The URL of the webhook to call </param>
+    /// <param name="configurationMethod"> The HTTP method used to call `configuration.url` </param>
+    /// <param name="configurationFilters"> The events that cause us to call the Channel Webhook </param>
+    /// <param name="configurationTriggers"> A string that will cause us to call the webhook when it is found in a message
+    ///                             body </param>
+    /// <param name="configurationFlowSid"> The SID of the Studio Flow to call when an event occurs </param>
+    /// <param name="configurationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Create(string pathServiceSid,
+                                         string pathChannelSid,
+                                         WebhookResource.TypeEnum type,
+                                         string configurationUrl = null,
+                                         WebhookResource.MethodEnum configurationMethod = null,
+                                         List<string> configurationFilters = null,
+                                         List<string> configurationTriggers = null,
+                                         string configurationFlowSid = null,
+                                         int? configurationRetryCount = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateWebhookOptions(pathServiceSid, pathChannelSid, type) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service with the Channel to create the resource under </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the new resource belongs to </param>
+    /// <param name="type"> The type of webhook </param>
+    /// <param name="configurationUrl"> The URL of the webhook to call </param>
+    /// <param name="configurationMethod"> The HTTP method used to call `configuration.url` </param>
+    /// <param name="configurationFilters"> The events that cause us to call the Channel Webhook </param>
+    /// <param name="configurationTriggers"> A string that will cause us to call the webhook when it is found in a message
+    ///                             body </param>
+    /// <param name="configurationFlowSid"> The SID of the Studio Flow to call when an event occurs </param>
+    /// <param name="configurationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(string pathServiceSid,
+                                                                                 string pathChannelSid,
+                                                                                 WebhookResource.TypeEnum type,
+                                                                                 string configurationUrl = null,
+                                                                                 WebhookResource.MethodEnum configurationMethod = null,
+                                                                                 List<string> configurationFilters = null,
+                                                                                 List<string> configurationTriggers = null,
+                                                                                 string configurationFlowSid = null,
+                                                                                 int? configurationRetryCount = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateWebhookOptions(pathServiceSid, pathChannelSid, type) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service with the Channel that has the Webhook resource to update
+    ///                      </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to update belongs to </param>
+    /// <param name="pathSid"> The SID of the resource </param>
+    /// <param name="configurationUrl"> The URL of the webhook to call </param>
+    /// <param name="configurationMethod"> The HTTP method used to call `configuration.url` </param>
+    /// <param name="configurationFilters"> The events that cause us to call the Channel Webhook </param>
+    /// <param name="configurationTriggers"> A string that will cause us to call the webhook when it is found in a message
+    ///                             body </param>
+    /// <param name="configurationFlowSid"> The SID of the Studio Flow to call when an event occurs </param>
+    /// <param name="configurationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(string pathServiceSid,
+                                         string pathChannelSid,
+                                         string pathSid,
+                                         string configurationUrl = null,
+                                         WebhookResource.MethodEnum configurationMethod = null,
+                                         List<string> configurationFilters = null,
+                                         List<string> configurationTriggers = null,
+                                         string configurationFlowSid = null,
+                                         int? configurationRetryCount = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathServiceSid, pathChannelSid, pathSid) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service with the Channel that has the Webhook resource to update
+    ///                      </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource to update belongs to </param>
+    /// <param name="pathSid"> The SID of the resource </param>
+    /// <param name="configurationUrl"> The URL of the webhook to call </param>
+    /// <param name="configurationMethod"> The HTTP method used to call `configuration.url` </param>
+    /// <param name="configurationFilters"> The events that cause us to call the Channel Webhook </param>
+    /// <param name="configurationTriggers"> A string that will cause us to call the webhook when it is found in a message
+    ///                             body </param>
+    /// <param name="configurationFlowSid"> The SID of the Studio Flow to call when an event occurs </param>
+    /// <param name="configurationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathServiceSid,
+                                                                                 string pathChannelSid,
+                                                                                 string pathSid,
+                                                                                 string configurationUrl = null,
+                                                                                 WebhookResource.MethodEnum configurationMethod = null,
+                                                                                 List<string> configurationFilters = null,
+                                                                                 List<string> configurationTriggers = null,
+                                                                                 string configurationFlowSid = null,
+                                                                                 int? configurationRetryCount = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathServiceSid, pathChannelSid, pathSid) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static bool Delete(DeleteWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebhookOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service with the Channel to delete the Webhook resource from </param>
+    /// <param name="pathChannelSid"> The SID of the channel the resource to delete belongs to </param>
+    /// <param name="pathSid"> The SID of the Channel Webhook resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service with the Channel to delete the Webhook resource from </param>
+    /// <param name="pathChannelSid"> The SID of the channel the resource to delete belongs to </param>
+    /// <param name="pathSid"> The SID of the Channel Webhook resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WebhookResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WebhookResource object represented by the provided JSON </returns>
+    public static WebhookResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WebhookResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the Channel Webhook resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Channel the Channel Webhook resource belongs to
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The type of webhook
+    /// </summary>
+    [JsonProperty("type")]
+    public string Type { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Channel Webhook resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The JSON string that describes the configuration object for the channel webhook
+    /// </summary>
+    [JsonProperty("configuration")]
+    public object Configuration { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private WebhookResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/ChannelOptions.cs b/src/Twilio/Rest/Chat/V2/Service/ChannelOptions.cs
index aa2628154..9e5388e7b 100644
--- a/src/Twilio/Rest/Chat/V2/Service/ChannelOptions.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/ChannelOptions.cs
@@ -10,355 +10,355 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchChannelOptions
+  /// </summary>
+  public class FetchChannelOptions : IOptions<ChannelResource>
+  {
     /// <summary>
-    /// FetchChannelOptions
-    /// </summary>
-    public class FetchChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the resource </param>
-        public FetchChannelOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteChannelOptions
-    /// </summary>
-    public class DeleteChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel resource to delete
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ChannelResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the Channel resource to delete </param>
-        public DeleteChannelOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateChannelOptions
-    /// </summary>
-    public class CreateChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the Channel resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// A string to describe the new resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the Channel resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The visibility of the channel
-        /// </summary>
-        public ChannelResource.ChannelTypeEnum Type { get; set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was updated
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// The identity of the User that created the Channel
-        /// </summary>
-        public string CreatedBy { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ChannelResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Channel resource under </param>
-        public CreateChannelOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (CreatedBy != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CreatedBy", CreatedBy));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the resource </param>
+    public FetchChannelOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadChannelOptions
-    /// </summary>
-    public class ReadChannelOptions : ReadOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The visibility of the channel to read
-        /// </summary>
-        public List<ChannelResource.ChannelTypeEnum> Type { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        public ReadChannelOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-            Type = new List<ChannelResource.ChannelTypeEnum>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.AddRange(Type.Select(prop => new KeyValuePair<string, string>("Type", prop.ToString())));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteChannelOptions
+  /// </summary>
+  public class DeleteChannelOptions : IOptions<ChannelResource>
+  {
     /// <summary>
-    /// UpdateChannelOptions
-    /// </summary>
-    public class UpdateChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Channel resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was updated
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// The identity of the User that created the Channel
-        /// </summary>
-        public string CreatedBy { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ChannelResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The SID of the Channel resource to update </param>
-        public UpdateChannelOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (CreatedBy != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CreatedBy", CreatedBy));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel resource to delete
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ChannelResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the Channel resource to delete </param>
+    public DeleteChannelOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateChannelOptions
+  /// </summary>
+  public class CreateChannelOptions : IOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the Channel resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// A string to describe the new resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the Channel resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The visibility of the channel
+    /// </summary>
+    public ChannelResource.ChannelTypeEnum Type { get; set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was updated
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// The identity of the User that created the Channel
+    /// </summary>
+    public string CreatedBy { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ChannelResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Channel resource under </param>
+    public CreateChannelOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (CreatedBy != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CreatedBy", CreatedBy));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadChannelOptions
+  /// </summary>
+  public class ReadChannelOptions : ReadOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The visibility of the channel to read
+    /// </summary>
+    public List<ChannelResource.ChannelTypeEnum> Type { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    public ReadChannelOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+      Type = new List<ChannelResource.ChannelTypeEnum>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.AddRange(Type.Select(prop => new KeyValuePair<string, string>("Type", prop.ToString())));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateChannelOptions
+  /// </summary>
+  public class UpdateChannelOptions : IOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Channel resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was updated
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// The identity of the User that created the Channel
+    /// </summary>
+    public string CreatedBy { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ChannelResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The SID of the Channel resource to update </param>
+    public UpdateChannelOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (CreatedBy != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CreatedBy", CreatedBy));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/ChannelResource.cs b/src/Twilio/Rest/Chat/V2/Service/ChannelResource.cs
index 1612006b9..3e80767d9 100644
--- a/src/Twilio/Rest/Chat/V2/Service/ChannelResource.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/ChannelResource.cs
@@ -17,613 +17,613 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V2.Service
-{
-
-    public class ChannelResource : Resource
-    {
-        public sealed class ChannelTypeEnum : StringEnum
-        {
-            private ChannelTypeEnum(string value) : base(value) {}
-            public ChannelTypeEnum() {}
-            public static implicit operator ChannelTypeEnum(string value)
-            {
-                return new ChannelTypeEnum(value);
-            }
-
-            public static readonly ChannelTypeEnum Public = new ChannelTypeEnum("public");
-            public static readonly ChannelTypeEnum Private = new ChannelTypeEnum("private");
-        }
-
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildFetchRequest(FetchChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Fetch(FetchChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(FetchChannelOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchChannelOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchChannelOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static bool Delete(DeleteChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteChannelOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the Channel resource to delete </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathSid,
-                                  ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteChannelOptions(pathServiceSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the Channel resource to delete </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteChannelOptions(pathServiceSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Create(CreateChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(CreateChannelOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Channel resource under </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the Channel resource </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="type"> The visibility of the channel </param>
-        /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
-        /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
-        /// <param name="createdBy"> The identity of the User that created the Channel </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Create(string pathServiceSid,
-                                             string friendlyName = null,
-                                             string uniqueName = null,
-                                             string attributes = null,
-                                             ChannelResource.ChannelTypeEnum type = null,
-                                             DateTime? dateCreated = null,
-                                             DateTime? dateUpdated = null,
-                                             string createdBy = null,
-                                             ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateChannelOptions(pathServiceSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Channel resource under </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the Channel resource </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="type"> The visibility of the channel </param>
-        /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
-        /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
-        /// <param name="createdBy"> The identity of the User that created the Channel </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(string pathServiceSid,
-                                                                                     string friendlyName = null,
-                                                                                     string uniqueName = null,
-                                                                                     string attributes = null,
-                                                                                     ChannelResource.ChannelTypeEnum type = null,
-                                                                                     DateTime? dateCreated = null,
-                                                                                     DateTime? dateUpdated = null,
-                                                                                     string createdBy = null,
-                                                                                     ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateChannelOptions(pathServiceSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ResourceSet<ChannelResource> Read(ReadChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<ChannelResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(ReadChannelOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<ChannelResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="type"> The visibility of the channel to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ResourceSet<ChannelResource> Read(string pathServiceSid,
-                                                        List<ChannelResource.ChannelTypeEnum> type = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadChannelOptions(pathServiceSid){Type = type, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="type"> The visibility of the channel to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(string pathServiceSid,
-                                                                                                List<ChannelResource.ChannelTypeEnum> type = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadChannelOptions(pathServiceSid){Type = type, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ChannelResource> NextPage(Page<ChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ChannelResource> PreviousPage(Page<ChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("channels", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Update(UpdateChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(UpdateChannelOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The SID of the Channel resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
-        /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
-        /// <param name="createdBy"> The identity of the User that created the Channel </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Update(string pathServiceSid,
-                                             string pathSid,
-                                             string friendlyName = null,
-                                             string uniqueName = null,
-                                             string attributes = null,
-                                             DateTime? dateCreated = null,
-                                             DateTime? dateUpdated = null,
-                                             string createdBy = null,
-                                             ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateChannelOptions(pathServiceSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The SID of the Channel resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
-        /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
-        /// <param name="createdBy"> The identity of the User that created the Channel </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(string pathServiceSid,
-                                                                                     string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     string uniqueName = null,
-                                                                                     string attributes = null,
-                                                                                     DateTime? dateCreated = null,
-                                                                                     DateTime? dateUpdated = null,
-                                                                                     string createdBy = null,
-                                                                                     ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateChannelOptions(pathServiceSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ChannelResource object represented by the provided JSON </returns>
-        public static ChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The JSON string that stores application-specific data
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The visibility of the channel. Can be: `public` or `private`
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ChannelResource.ChannelTypeEnum Type { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The identity of the User that created the channel
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-        /// <summary>
-        /// The number of Members in the Channel
-        /// </summary>
-        [JsonProperty("members_count")]
-        public int? MembersCount { get; private set; }
-        /// <summary>
-        /// The number of Messages that have been passed in the Channel
-        /// </summary>
-        [JsonProperty("messages_count")]
-        public int? MessagesCount { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Channel resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Absolute URLs to access the Members, Messages , Invites and, if it exists, the last Message for the Channel
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class ChannelResource : Resource
+  {
+    public sealed class ChannelTypeEnum : StringEnum
+    {
+      private ChannelTypeEnum(string value) : base(value) { }
+      public ChannelTypeEnum() { }
+      public static implicit operator ChannelTypeEnum(string value)
+      {
+        return new ChannelTypeEnum(value);
+      }
+
+      public static readonly ChannelTypeEnum Public = new ChannelTypeEnum("public");
+      public static readonly ChannelTypeEnum Private = new ChannelTypeEnum("private");
+    }
+
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildFetchRequest(FetchChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Fetch(FetchChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(FetchChannelOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchChannelOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(string pathServiceSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchChannelOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static bool Delete(DeleteChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteChannelOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the Channel resource to delete </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathSid,
+                              ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteChannelOptions(pathServiceSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the Channel resource to delete </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteChannelOptions(pathServiceSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Create(CreateChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(CreateChannelOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Channel resource under </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the Channel resource </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="type"> The visibility of the channel </param>
+    /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
+    /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
+    /// <param name="createdBy"> The identity of the User that created the Channel </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Create(string pathServiceSid,
+                                         string friendlyName = null,
+                                         string uniqueName = null,
+                                         string attributes = null,
+                                         ChannelResource.ChannelTypeEnum type = null,
+                                         DateTime? dateCreated = null,
+                                         DateTime? dateUpdated = null,
+                                         string createdBy = null,
+                                         ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateChannelOptions(pathServiceSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Channel resource under </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the Channel resource </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="type"> The visibility of the channel </param>
+    /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
+    /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
+    /// <param name="createdBy"> The identity of the User that created the Channel </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(string pathServiceSid,
+                                                                                 string friendlyName = null,
+                                                                                 string uniqueName = null,
+                                                                                 string attributes = null,
+                                                                                 ChannelResource.ChannelTypeEnum type = null,
+                                                                                 DateTime? dateCreated = null,
+                                                                                 DateTime? dateUpdated = null,
+                                                                                 string createdBy = null,
+                                                                                 ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateChannelOptions(pathServiceSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ResourceSet<ChannelResource> Read(ReadChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<ChannelResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(ReadChannelOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<ChannelResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="type"> The visibility of the channel to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ResourceSet<ChannelResource> Read(string pathServiceSid,
+                                                    List<ChannelResource.ChannelTypeEnum> type = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadChannelOptions(pathServiceSid) { Type = type, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="type"> The visibility of the channel to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(string pathServiceSid,
+                                                                                            List<ChannelResource.ChannelTypeEnum> type = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadChannelOptions(pathServiceSid) { Type = type, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ChannelResource> NextPage(Page<ChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ChannelResource> PreviousPage(Page<ChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("channels", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Update(UpdateChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(UpdateChannelOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The SID of the Channel resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
+    /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
+    /// <param name="createdBy"> The identity of the User that created the Channel </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Update(string pathServiceSid,
+                                         string pathSid,
+                                         string friendlyName = null,
+                                         string uniqueName = null,
+                                         string attributes = null,
+                                         DateTime? dateCreated = null,
+                                         DateTime? dateUpdated = null,
+                                         string createdBy = null,
+                                         ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateChannelOptions(pathServiceSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The SID of the Channel resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="dateCreated"> The ISO 8601 date and time in GMT when the resource was created </param>
+    /// <param name="dateUpdated"> The ISO 8601 date and time in GMT when the resource was updated </param>
+    /// <param name="createdBy"> The identity of the User that created the Channel </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(string pathServiceSid,
+                                                                                 string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 string uniqueName = null,
+                                                                                 string attributes = null,
+                                                                                 DateTime? dateCreated = null,
+                                                                                 DateTime? dateUpdated = null,
+                                                                                 string createdBy = null,
+                                                                                 ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateChannelOptions(pathServiceSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ChannelResource object represented by the provided JSON </returns>
+    public static ChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The JSON string that stores application-specific data
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The visibility of the channel. Can be: `public` or `private`
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ChannelResource.ChannelTypeEnum Type { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The identity of the User that created the channel
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+    /// <summary>
+    /// The number of Members in the Channel
+    /// </summary>
+    [JsonProperty("members_count")]
+    public int? MembersCount { get; private set; }
+    /// <summary>
+    /// The number of Messages that have been passed in the Channel
+    /// </summary>
+    [JsonProperty("messages_count")]
+    public int? MessagesCount { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Channel resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Absolute URLs to access the Members, Messages , Invites and, if it exists, the last Message for the Channel
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/RoleOptions.cs b/src/Twilio/Rest/Chat/V2/Service/RoleOptions.cs
index 855ae99c1..bccb66ac1 100644
--- a/src/Twilio/Rest/Chat/V2/Service/RoleOptions.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/RoleOptions.cs
@@ -10,221 +10,221 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchRoleOptions
+  /// </summary>
+  public class FetchRoleOptions : IOptions<RoleResource>
+  {
     /// <summary>
-    /// FetchRoleOptions
-    /// </summary>
-    public class FetchRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Role resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to fetch </param>
-        public FetchRoleOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteRoleOptions
-    /// </summary>
-    public class DeleteRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Role resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to delete </param>
-        public DeleteRoleOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Role resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateRoleOptions
-    /// </summary>
-    public class CreateRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// A string to describe the new resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The type of role
-        /// </summary>
-        public RoleResource.RoleTypeEnum Type { get; }
-        /// <summary>
-        /// A permission the role should have
-        /// </summary>
-        public List<string> Permission { get; }
-
-        /// <summary>
-        /// Construct a new CreateRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="type"> The type of role </param>
-        /// <param name="permission"> A permission the role should have </param>
-        public CreateRoleOptions(string pathServiceSid,
-                                 string friendlyName,
-                                 RoleResource.RoleTypeEnum type,
-                                 List<string> permission)
-        {
-            PathServiceSid = pathServiceSid;
-            FriendlyName = friendlyName;
-            Type = type;
-            Permission = permission;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (Permission != null)
-            {
-                p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to fetch </param>
+    public FetchRoleOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadRoleOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadRoleOptions : ReadOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        public ReadRoleOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteRoleOptions
+  /// </summary>
+  public class DeleteRoleOptions : IOptions<RoleResource>
+  {
     /// <summary>
-    /// UpdateRoleOptions
-    /// </summary>
-    public class UpdateRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Role resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A permission the role should have
-        /// </summary>
-        public List<string> Permission { get; }
-
-        /// <summary>
-        /// Construct a new UpdateRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to update </param>
-        /// <param name="permission"> A permission the role should have </param>
-        public UpdateRoleOptions(string pathServiceSid, string pathSid, List<string> permission)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-            Permission = permission;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Permission != null)
-            {
-                p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Role resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to delete </param>
+    public DeleteRoleOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateRoleOptions
+  /// </summary>
+  public class CreateRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// A string to describe the new resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The type of role
+    /// </summary>
+    public RoleResource.RoleTypeEnum Type { get; }
+    /// <summary>
+    /// A permission the role should have
+    /// </summary>
+    public List<string> Permission { get; }
+
+    /// <summary>
+    /// Construct a new CreateRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="type"> The type of role </param>
+    /// <param name="permission"> A permission the role should have </param>
+    public CreateRoleOptions(string pathServiceSid,
+                             string friendlyName,
+                             RoleResource.RoleTypeEnum type,
+                             List<string> permission)
+    {
+      PathServiceSid = pathServiceSid;
+      FriendlyName = friendlyName;
+      Type = type;
+      Permission = permission;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (Permission != null)
+      {
+        p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadRoleOptions
+  /// </summary>
+  public class ReadRoleOptions : ReadOptions<RoleResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    public ReadRoleOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateRoleOptions
+  /// </summary>
+  public class UpdateRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Role resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A permission the role should have
+    /// </summary>
+    public List<string> Permission { get; }
+
+    /// <summary>
+    /// Construct a new UpdateRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to update </param>
+    /// <param name="permission"> A permission the role should have </param>
+    public UpdateRoleOptions(string pathServiceSid, string pathSid, List<string> permission)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+      Permission = permission;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Permission != null)
+      {
+        p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/RoleResource.cs b/src/Twilio/Rest/Chat/V2/Service/RoleResource.cs
index bea207ef3..0a1208744 100644
--- a/src/Twilio/Rest/Chat/V2/Service/RoleResource.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/RoleResource.cs
@@ -17,521 +17,521 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V2.Service
-{
-
-    public class RoleResource : Resource
-    {
-        public sealed class RoleTypeEnum : StringEnum
-        {
-            private RoleTypeEnum(string value) : base(value) {}
-            public RoleTypeEnum() {}
-            public static implicit operator RoleTypeEnum(string value)
-            {
-                return new RoleTypeEnum(value);
-            }
-
-            public static readonly RoleTypeEnum Channel = new RoleTypeEnum("channel");
-            public static readonly RoleTypeEnum Deployment = new RoleTypeEnum("deployment");
-        }
-
-        private static Request BuildFetchRequest(FetchRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Fetch(FetchRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(FetchRoleOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRoleOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(string pathServiceSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchRoleOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static bool Delete(DeleteRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoleOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoleOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoleOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Roles",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Create(CreateRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(CreateRoleOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="type"> The type of role </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Create(string pathServiceSid,
-                                          string friendlyName,
-                                          RoleResource.RoleTypeEnum type,
-                                          List<string> permission,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="type"> The type of role </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(string pathServiceSid,
-                                                                                  string friendlyName,
-                                                                                  RoleResource.RoleTypeEnum type,
-                                                                                  List<string> permission,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Roles",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static ResourceSet<RoleResource> Read(ReadRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RoleResource>.FromJson("roles", response.Content);
-            return new ResourceSet<RoleResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(ReadRoleOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RoleResource>.FromJson("roles", response.Content);
-            return new ResourceSet<RoleResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static ResourceSet<RoleResource> Read(string pathServiceSid,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadRoleOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(string pathServiceSid,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadRoleOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RoleResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RoleResource> NextPage(Page<RoleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RoleResource> PreviousPage(Page<RoleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Update(UpdateRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(UpdateRoleOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to update </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Update(string pathServiceSid,
-                                          string pathSid,
-                                          List<string> permission,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to update </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(string pathServiceSid,
-                                                                                  string pathSid,
-                                                                                  List<string> permission,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RoleResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RoleResource object represented by the provided JSON </returns>
-        public static RoleResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RoleResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type of role
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoleResource.RoleTypeEnum Type { get; private set; }
-        /// <summary>
-        /// An array of the permissions the role has been granted
-        /// </summary>
-        [JsonProperty("permissions")]
-        public List<string> Permissions { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Role resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private RoleResource()
-        {
-
-        }
-    }
+{
+
+  public class RoleResource : Resource
+  {
+    public sealed class RoleTypeEnum : StringEnum
+    {
+      private RoleTypeEnum(string value) : base(value) { }
+      public RoleTypeEnum() { }
+      public static implicit operator RoleTypeEnum(string value)
+      {
+        return new RoleTypeEnum(value);
+      }
+
+      public static readonly RoleTypeEnum Channel = new RoleTypeEnum("channel");
+      public static readonly RoleTypeEnum Deployment = new RoleTypeEnum("deployment");
+    }
+
+    private static Request BuildFetchRequest(FetchRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Fetch(FetchRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(FetchRoleOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRoleOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(string pathServiceSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchRoleOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static bool Delete(DeleteRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoleOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoleOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoleOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Roles",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Create(CreateRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(CreateRoleOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="type"> The type of role </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Create(string pathServiceSid,
+                                      string friendlyName,
+                                      RoleResource.RoleTypeEnum type,
+                                      List<string> permission,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="type"> The type of role </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(string pathServiceSid,
+                                                                              string friendlyName,
+                                                                              RoleResource.RoleTypeEnum type,
+                                                                              List<string> permission,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Roles",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static ResourceSet<RoleResource> Read(ReadRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RoleResource>.FromJson("roles", response.Content);
+      return new ResourceSet<RoleResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(ReadRoleOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RoleResource>.FromJson("roles", response.Content);
+      return new ResourceSet<RoleResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static ResourceSet<RoleResource> Read(string pathServiceSid,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadRoleOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(string pathServiceSid,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadRoleOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RoleResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RoleResource> NextPage(Page<RoleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RoleResource> PreviousPage(Page<RoleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Update(UpdateRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(UpdateRoleOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to update </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Update(string pathServiceSid,
+                                      string pathSid,
+                                      List<string> permission,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to update </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(string pathServiceSid,
+                                                                              string pathSid,
+                                                                              List<string> permission,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RoleResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RoleResource object represented by the provided JSON </returns>
+    public static RoleResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RoleResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type of role
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoleResource.RoleTypeEnum Type { get; private set; }
+    /// <summary>
+    /// An array of the permissions the role has been granted
+    /// </summary>
+    [JsonProperty("permissions")]
+    public List<string> Permissions { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Role resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private RoleResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/User/UserBindingOptions.cs b/src/Twilio/Rest/Chat/V2/Service/User/UserBindingOptions.cs
index 53ae10bca..96d20be6b 100644
--- a/src/Twilio/Rest/Chat/V2/Service/User/UserBindingOptions.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/User/UserBindingOptions.cs
@@ -10,138 +10,138 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V2.Service.User
-{
-
+{
+
+  /// <summary>
+  /// ReadUserBindingOptions
+  /// </summary>
+  public class ReadUserBindingOptions : ReadOptions<UserBindingResource>
+  {
     /// <summary>
-    /// ReadUserBindingOptions
+    /// The SID of the Service to read the resource from
     /// </summary>
-    public class ReadUserBindingOptions : ReadOptions<UserBindingResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the User with the User Bindings to read
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The push technology used by the User Binding resources to read
-        /// </summary>
-        public List<UserBindingResource.BindingTypeEnum> BindingType { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadUserBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
-        /// <param name="pathUserSid"> The SID of the User with the User Bindings to read </param>
-        public ReadUserBindingOptions(string pathServiceSid, string pathUserSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-            BindingType = new List<UserBindingResource.BindingTypeEnum>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (BindingType != null)
-            {
-                p.AddRange(BindingType.Select(prop => new KeyValuePair<string, string>("BindingType", prop.ToString())));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// FetchUserBindingOptions
+    /// The SID of the User with the User Bindings to read
     /// </summary>
-    public class FetchUserBindingOptions : IOptions<UserBindingResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the User with the binding
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The SID of the User Binding resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUserBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathUserSid"> The SID of the User with the binding </param>
-        /// <param name="pathSid"> The SID of the User Binding resource to fetch </param>
-        public FetchUserBindingOptions(string pathServiceSid, string pathUserSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathUserSid { get; }
     /// <summary>
-    /// DeleteUserBindingOptions
+    /// The push technology used by the User Binding resources to read
     /// </summary>
-    public class DeleteUserBindingOptions : IOptions<UserBindingResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the User of the User Bindings to delete
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The SID of the User Binding resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteUserBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathUserSid"> The SID of the User of the User Bindings to delete </param>
-        /// <param name="pathSid"> The SID of the User Binding resource to delete </param>
-        public DeleteUserBindingOptions(string pathServiceSid, string pathUserSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<UserBindingResource.BindingTypeEnum> BindingType { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadUserBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
+    /// <param name="pathUserSid"> The SID of the User with the User Bindings to read </param>
+    public ReadUserBindingOptions(string pathServiceSid, string pathUserSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+      BindingType = new List<UserBindingResource.BindingTypeEnum>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (BindingType != null)
+      {
+        p.AddRange(BindingType.Select(prop => new KeyValuePair<string, string>("BindingType", prop.ToString())));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchUserBindingOptions
+  /// </summary>
+  public class FetchUserBindingOptions : IOptions<UserBindingResource>
+  {
+    /// <summary>
+    /// The SID of the Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the User with the binding
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The SID of the User Binding resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchUserBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathUserSid"> The SID of the User with the binding </param>
+    /// <param name="pathSid"> The SID of the User Binding resource to fetch </param>
+    public FetchUserBindingOptions(string pathServiceSid, string pathUserSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteUserBindingOptions
+  /// </summary>
+  public class DeleteUserBindingOptions : IOptions<UserBindingResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the User of the User Bindings to delete
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The SID of the User Binding resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteUserBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathUserSid"> The SID of the User of the User Bindings to delete </param>
+    /// <param name="pathSid"> The SID of the User Binding resource to delete </param>
+    public DeleteUserBindingOptions(string pathServiceSid, string pathUserSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/User/UserBindingResource.cs b/src/Twilio/Rest/Chat/V2/Service/User/UserBindingResource.cs
index 2519b4f6f..a9f59066e 100644
--- a/src/Twilio/Rest/Chat/V2/Service/User/UserBindingResource.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/User/UserBindingResource.cs
@@ -17,398 +17,398 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V2.Service.User
-{
-
-    public class UserBindingResource : Resource
-    {
-        public sealed class BindingTypeEnum : StringEnum
-        {
-            private BindingTypeEnum(string value) : base(value) {}
-            public BindingTypeEnum() {}
-            public static implicit operator BindingTypeEnum(string value)
-            {
-                return new BindingTypeEnum(value);
-            }
-
-            public static readonly BindingTypeEnum Gcm = new BindingTypeEnum("gcm");
-            public static readonly BindingTypeEnum Apn = new BindingTypeEnum("apn");
-            public static readonly BindingTypeEnum Fcm = new BindingTypeEnum("fcm");
-        }
-
-        private static Request BuildReadRequest(ReadUserBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Bindings",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UserBinding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserBinding </returns>
-        public static ResourceSet<UserBindingResource> Read(ReadUserBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserBindingResource>.FromJson("bindings", response.Content);
-            return new ResourceSet<UserBindingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UserBinding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserBinding </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserBindingResource>> ReadAsync(ReadUserBindingOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserBindingResource>.FromJson("bindings", response.Content);
-            return new ResourceSet<UserBindingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
-        /// <param name="pathUserSid"> The SID of the User with the User Bindings to read </param>
-        /// <param name="bindingType"> The push technology used by the User Binding resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserBinding </returns>
-        public static ResourceSet<UserBindingResource> Read(string pathServiceSid,
-                                                            string pathUserSid,
-                                                            List<UserBindingResource.BindingTypeEnum> bindingType = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadUserBindingOptions(pathServiceSid, pathUserSid){BindingType = bindingType, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
-        /// <param name="pathUserSid"> The SID of the User with the User Bindings to read </param>
-        /// <param name="bindingType"> The push technology used by the User Binding resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserBinding </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserBindingResource>> ReadAsync(string pathServiceSid,
-                                                                                                    string pathUserSid,
-                                                                                                    List<UserBindingResource.BindingTypeEnum> bindingType = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadUserBindingOptions(pathServiceSid, pathUserSid){BindingType = bindingType, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserBindingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserBindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserBindingResource> NextPage(Page<UserBindingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<UserBindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserBindingResource> PreviousPage(Page<UserBindingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<UserBindingResource>.FromJson("bindings", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchUserBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Bindings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch UserBinding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserBinding </returns>
-        public static UserBindingResource Fetch(FetchUserBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch UserBinding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserBinding </returns>
-        public static async System.Threading.Tasks.Task<UserBindingResource> FetchAsync(FetchUserBindingOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathUserSid"> The SID of the User with the binding </param>
-        /// <param name="pathSid"> The SID of the User Binding resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserBinding </returns>
-        public static UserBindingResource Fetch(string pathServiceSid,
-                                                string pathUserSid,
-                                                string pathSid,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathUserSid"> The SID of the User with the binding </param>
-        /// <param name="pathSid"> The SID of the User Binding resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserBinding </returns>
-        public static async System.Threading.Tasks.Task<UserBindingResource> FetchAsync(string pathServiceSid,
-                                                                                        string pathUserSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteUserBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Bindings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete UserBinding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserBinding </returns>
-        public static bool Delete(DeleteUserBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete UserBinding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserBinding </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserBindingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathUserSid"> The SID of the User of the User Bindings to delete </param>
-        /// <param name="pathSid"> The SID of the User Binding resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserBinding </returns>
-        public static bool Delete(string pathServiceSid, string pathUserSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathUserSid"> The SID of the User of the User Bindings to delete </param>
-        /// <param name="pathSid"> The SID of the User Binding resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserBinding </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathUserSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a UserBindingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserBindingResource object represented by the provided JSON </returns>
-        public static UserBindingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserBindingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The unique endpoint identifier for the User Binding
-        /// </summary>
-        [JsonProperty("endpoint")]
-        public string Endpoint { get; private set; }
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The SID of the User with the binding
-        /// </summary>
-        [JsonProperty("user_sid")]
-        public string UserSid { get; private set; }
-        /// <summary>
-        /// The SID of the Credential for the binding
-        /// </summary>
-        [JsonProperty("credential_sid")]
-        public string CredentialSid { get; private set; }
-        /// <summary>
-        /// The push technology to use for the binding
-        /// </summary>
-        [JsonProperty("binding_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public UserBindingResource.BindingTypeEnum BindingType { get; private set; }
-        /// <summary>
-        /// The Programmable Chat message types the binding is subscribed to
-        /// </summary>
-        [JsonProperty("message_types")]
-        public List<string> MessageTypes { get; private set; }
-        /// <summary>
-        /// The absolute URL of the User Binding resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private UserBindingResource()
-        {
-
-        }
-    }
+{
+
+  public class UserBindingResource : Resource
+  {
+    public sealed class BindingTypeEnum : StringEnum
+    {
+      private BindingTypeEnum(string value) : base(value) { }
+      public BindingTypeEnum() { }
+      public static implicit operator BindingTypeEnum(string value)
+      {
+        return new BindingTypeEnum(value);
+      }
+
+      public static readonly BindingTypeEnum Gcm = new BindingTypeEnum("gcm");
+      public static readonly BindingTypeEnum Apn = new BindingTypeEnum("apn");
+      public static readonly BindingTypeEnum Fcm = new BindingTypeEnum("fcm");
+    }
+
+    private static Request BuildReadRequest(ReadUserBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Bindings",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UserBinding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserBinding </returns>
+    public static ResourceSet<UserBindingResource> Read(ReadUserBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserBindingResource>.FromJson("bindings", response.Content);
+      return new ResourceSet<UserBindingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UserBinding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserBinding </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserBindingResource>> ReadAsync(ReadUserBindingOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserBindingResource>.FromJson("bindings", response.Content);
+      return new ResourceSet<UserBindingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
+    /// <param name="pathUserSid"> The SID of the User with the User Bindings to read </param>
+    /// <param name="bindingType"> The push technology used by the User Binding resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserBinding </returns>
+    public static ResourceSet<UserBindingResource> Read(string pathServiceSid,
+                                                        string pathUserSid,
+                                                        List<UserBindingResource.BindingTypeEnum> bindingType = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadUserBindingOptions(pathServiceSid, pathUserSid) { BindingType = bindingType, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
+    /// <param name="pathUserSid"> The SID of the User with the User Bindings to read </param>
+    /// <param name="bindingType"> The push technology used by the User Binding resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserBinding </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserBindingResource>> ReadAsync(string pathServiceSid,
+                                                                                                string pathUserSid,
+                                                                                                List<UserBindingResource.BindingTypeEnum> bindingType = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadUserBindingOptions(pathServiceSid, pathUserSid) { BindingType = bindingType, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserBindingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserBindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserBindingResource> NextPage(Page<UserBindingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<UserBindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserBindingResource> PreviousPage(Page<UserBindingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<UserBindingResource>.FromJson("bindings", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchUserBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Bindings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch UserBinding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserBinding </returns>
+    public static UserBindingResource Fetch(FetchUserBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch UserBinding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserBinding </returns>
+    public static async System.Threading.Tasks.Task<UserBindingResource> FetchAsync(FetchUserBindingOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathUserSid"> The SID of the User with the binding </param>
+    /// <param name="pathSid"> The SID of the User Binding resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserBinding </returns>
+    public static UserBindingResource Fetch(string pathServiceSid,
+                                            string pathUserSid,
+                                            string pathSid,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathUserSid"> The SID of the User with the binding </param>
+    /// <param name="pathSid"> The SID of the User Binding resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserBinding </returns>
+    public static async System.Threading.Tasks.Task<UserBindingResource> FetchAsync(string pathServiceSid,
+                                                                                    string pathUserSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteUserBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Bindings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete UserBinding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserBinding </returns>
+    public static bool Delete(DeleteUserBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete UserBinding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserBinding </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserBindingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathUserSid"> The SID of the User of the User Bindings to delete </param>
+    /// <param name="pathSid"> The SID of the User Binding resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserBinding </returns>
+    public static bool Delete(string pathServiceSid, string pathUserSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathUserSid"> The SID of the User of the User Bindings to delete </param>
+    /// <param name="pathSid"> The SID of the User Binding resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserBinding </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathUserSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a UserBindingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserBindingResource object represented by the provided JSON </returns>
+    public static UserBindingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserBindingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The unique endpoint identifier for the User Binding
+    /// </summary>
+    [JsonProperty("endpoint")]
+    public string Endpoint { get; private set; }
+    /// <summary>
+    /// The string that identifies the resource's User
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The SID of the User with the binding
+    /// </summary>
+    [JsonProperty("user_sid")]
+    public string UserSid { get; private set; }
+    /// <summary>
+    /// The SID of the Credential for the binding
+    /// </summary>
+    [JsonProperty("credential_sid")]
+    public string CredentialSid { get; private set; }
+    /// <summary>
+    /// The push technology to use for the binding
+    /// </summary>
+    [JsonProperty("binding_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public UserBindingResource.BindingTypeEnum BindingType { get; private set; }
+    /// <summary>
+    /// The Programmable Chat message types the binding is subscribed to
+    /// </summary>
+    [JsonProperty("message_types")]
+    public List<string> MessageTypes { get; private set; }
+    /// <summary>
+    /// The absolute URL of the User Binding resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private UserBindingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/User/UserChannelOptions.cs b/src/Twilio/Rest/Chat/V2/Service/User/UserChannelOptions.cs
index 11ba58102..280327515 100644
--- a/src/Twilio/Rest/Chat/V2/Service/User/UserChannelOptions.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/User/UserChannelOptions.cs
@@ -9,196 +9,196 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V2.Service.User
-{
-
+{
+
+  /// <summary>
+  /// List all Channels for a given User.
+  /// </summary>
+  public class ReadUserChannelOptions : ReadOptions<UserChannelResource>
+  {
     /// <summary>
-    /// List all Channels for a given User.
-    /// </summary>
-    public class ReadUserChannelOptions : ReadOptions<UserChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the User to fetch the User Channel resources from
-        /// </summary>
-        public string PathUserSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadUserChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
-        public ReadUserChannelOptions(string pathServiceSid, string pathUserSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// FetchUserChannelOptions
-    /// </summary>
-    public class FetchUserChannelOptions : IOptions<UserChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the User Channel resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the User to fetch the User Channel resource from
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The SID of the Channel that has the User Channel to fetch
-        /// </summary>
-        public string PathChannelSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUserChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the User Channel resource from </param>
-        /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel that has the User Channel to fetch </param>
-        public FetchUserChannelOptions(string pathServiceSid, string pathUserSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the User to fetch the User Channel resources from
+    /// </summary>
+    public string PathUserSid { get; }
+
     /// <summary>
-    /// Removes User from selected Channel.
-    /// </summary>
-    public class DeleteUserChannelOptions : IOptions<UserChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the User to fetch the User Channel resources from
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The SID of the Channel the resource belongs to
-        /// </summary>
-        public string PathChannelSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteUserChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource belongs to </param>
-        public DeleteUserChannelOptions(string pathServiceSid, string pathUserSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new ReadUserChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
+    public ReadUserChannelOptions(string pathServiceSid, string pathUserSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+    }
+
     /// <summary>
-    /// UpdateUserChannelOptions
-    /// </summary>
-    public class UpdateUserChannelOptions : IOptions<UserChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the User to update the User Channel resource from
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The SID of the Channel with the User Channel resource to update
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The push notification level to assign to the User Channel
-        /// </summary>
-        public UserChannelResource.NotificationLevelEnum NotificationLevel { get; set; }
-        /// <summary>
-        /// The index of the last Message that the Member has read within the Channel
-        /// </summary>
-        public int? LastConsumedMessageIndex { get; set; }
-        /// <summary>
-        /// The ISO 8601 based timestamp string that represents the datetime of the last Message read event for the Member within the Channel
-        /// </summary>
-        public DateTime? LastConsumptionTimestamp { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateUserChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathUserSid"> The SID of the User to update the User Channel resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel with the User Channel resource to update </param>
-        public UpdateUserChannelOptions(string pathServiceSid, string pathUserSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (NotificationLevel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NotificationLevel", NotificationLevel.ToString()));
-            }
-
-            if (LastConsumedMessageIndex != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
-            }
-
-            if (LastConsumptionTimestamp != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumptionTimestamp", Serializers.DateTimeIso8601(LastConsumptionTimestamp)));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchUserChannelOptions
+  /// </summary>
+  public class FetchUserChannelOptions : IOptions<UserChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Service to fetch the User Channel resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the User to fetch the User Channel resource from
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The SID of the Channel that has the User Channel to fetch
+    /// </summary>
+    public string PathChannelSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchUserChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the User Channel resource from </param>
+    /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel that has the User Channel to fetch </param>
+    public FetchUserChannelOptions(string pathServiceSid, string pathUserSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+      PathChannelSid = pathChannelSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Removes User from selected Channel.
+  /// </summary>
+  public class DeleteUserChannelOptions : IOptions<UserChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the User to fetch the User Channel resources from
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The SID of the Channel the resource belongs to
+    /// </summary>
+    public string PathChannelSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteUserChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource belongs to </param>
+    public DeleteUserChannelOptions(string pathServiceSid, string pathUserSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+      PathChannelSid = pathChannelSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateUserChannelOptions
+  /// </summary>
+  public class UpdateUserChannelOptions : IOptions<UserChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the User to update the User Channel resource from
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The SID of the Channel with the User Channel resource to update
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The push notification level to assign to the User Channel
+    /// </summary>
+    public UserChannelResource.NotificationLevelEnum NotificationLevel { get; set; }
+    /// <summary>
+    /// The index of the last Message that the Member has read within the Channel
+    /// </summary>
+    public int? LastConsumedMessageIndex { get; set; }
+    /// <summary>
+    /// The ISO 8601 based timestamp string that represents the datetime of the last Message read event for the Member within the Channel
+    /// </summary>
+    public DateTime? LastConsumptionTimestamp { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateUserChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathUserSid"> The SID of the User to update the User Channel resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel with the User Channel resource to update </param>
+    public UpdateUserChannelOptions(string pathServiceSid, string pathUserSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+      PathChannelSid = pathChannelSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (NotificationLevel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NotificationLevel", NotificationLevel.ToString()));
+      }
+
+      if (LastConsumedMessageIndex != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
+      }
+
+      if (LastConsumptionTimestamp != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumptionTimestamp", Serializers.DateTimeIso8601(LastConsumptionTimestamp)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/User/UserChannelResource.cs b/src/Twilio/Rest/Chat/V2/Service/User/UserChannelResource.cs
index 1f0d279e3..27d289514 100644
--- a/src/Twilio/Rest/Chat/V2/Service/User/UserChannelResource.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/User/UserChannelResource.cs
@@ -17,498 +17,498 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V2.Service.User
-{
-
-    public class UserChannelResource : Resource
-    {
-        public sealed class ChannelStatusEnum : StringEnum
-        {
-            private ChannelStatusEnum(string value) : base(value) {}
-            public ChannelStatusEnum() {}
-            public static implicit operator ChannelStatusEnum(string value)
-            {
-                return new ChannelStatusEnum(value);
-            }
-
-            public static readonly ChannelStatusEnum Joined = new ChannelStatusEnum("joined");
-            public static readonly ChannelStatusEnum Invited = new ChannelStatusEnum("invited");
-            public static readonly ChannelStatusEnum NotParticipating = new ChannelStatusEnum("not_participating");
-        }
-
-        public sealed class NotificationLevelEnum : StringEnum
-        {
-            private NotificationLevelEnum(string value) : base(value) {}
-            public NotificationLevelEnum() {}
-            public static implicit operator NotificationLevelEnum(string value)
-            {
-                return new NotificationLevelEnum(value);
-            }
-
-            public static readonly NotificationLevelEnum Default = new NotificationLevelEnum("default");
-            public static readonly NotificationLevelEnum Muted = new NotificationLevelEnum("muted");
-        }
-
-        private static Request BuildReadRequest(ReadUserChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// List all Channels for a given User.
-        /// </summary>
-        /// <param name="options"> Read UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static ResourceSet<UserChannelResource> Read(ReadUserChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<UserChannelResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List all Channels for a given User.
-        /// </summary>
-        /// <param name="options"> Read UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(ReadUserChannelOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<UserChannelResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// List all Channels for a given User.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static ResourceSet<UserChannelResource> Read(string pathServiceSid,
-                                                            string pathUserSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List all Channels for a given User.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(string pathServiceSid,
-                                                                                                    string pathUserSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserChannelResource> NextPage(Page<UserChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<UserChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserChannelResource> PreviousPage(Page<UserChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<UserChannelResource>.FromJson("channels", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchUserChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels/" + options.PathChannelSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static UserChannelResource Fetch(FetchUserChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<UserChannelResource> FetchAsync(FetchUserChannelOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the User Channel resource from </param>
-        /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel that has the User Channel to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static UserChannelResource Fetch(string pathServiceSid,
-                                                string pathUserSid,
-                                                string pathChannelSid,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the User Channel resource from </param>
-        /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel that has the User Channel to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<UserChannelResource> FetchAsync(string pathServiceSid,
-                                                                                        string pathUserSid,
-                                                                                        string pathChannelSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteUserChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels/" + options.PathChannelSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Removes User from selected Channel.
-        /// </summary>
-        /// <param name="options"> Delete UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static bool Delete(DeleteUserChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Removes User from selected Channel.
-        /// </summary>
-        /// <param name="options"> Delete UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserChannelOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Removes User from selected Channel.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource belongs to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathUserSid,
-                                  string pathChannelSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Removes User from selected Channel.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel the resource belongs to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathUserSid,
-                                                                          string pathChannelSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateUserChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels/" + options.PathChannelSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static UserChannelResource Update(UpdateUserChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<UserChannelResource> UpdateAsync(UpdateUserChannelOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathUserSid"> The SID of the User to update the User Channel resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel with the User Channel resource to update </param>
-        /// <param name="notificationLevel"> The push notification level to assign to the User Channel </param>
-        /// <param name="lastConsumedMessageIndex"> The index of the last Message that the Member has read within the Channel
-        ///                                </param>
-        /// <param name="lastConsumptionTimestamp"> The ISO 8601 based timestamp string that represents the datetime of the
-        ///                                last Message read event for the Member within the Channel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static UserChannelResource Update(string pathServiceSid,
-                                                 string pathUserSid,
-                                                 string pathChannelSid,
-                                                 UserChannelResource.NotificationLevelEnum notificationLevel = null,
-                                                 int? lastConsumedMessageIndex = null,
-                                                 DateTime? lastConsumptionTimestamp = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid){NotificationLevel = notificationLevel, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathUserSid"> The SID of the User to update the User Channel resource from </param>
-        /// <param name="pathChannelSid"> The SID of the Channel with the User Channel resource to update </param>
-        /// <param name="notificationLevel"> The push notification level to assign to the User Channel </param>
-        /// <param name="lastConsumedMessageIndex"> The index of the last Message that the Member has read within the Channel
-        ///                                </param>
-        /// <param name="lastConsumptionTimestamp"> The ISO 8601 based timestamp string that represents the datetime of the
-        ///                                last Message read event for the Member within the Channel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<UserChannelResource> UpdateAsync(string pathServiceSid,
-                                                                                         string pathUserSid,
-                                                                                         string pathChannelSid,
-                                                                                         UserChannelResource.NotificationLevelEnum notificationLevel = null,
-                                                                                         int? lastConsumedMessageIndex = null,
-                                                                                         DateTime? lastConsumptionTimestamp = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid){NotificationLevel = notificationLevel, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a UserChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserChannelResource object represented by the provided JSON </returns>
-        public static UserChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Channel the resource belongs to
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The SID of the User the User Channel belongs to
-        /// </summary>
-        [JsonProperty("user_sid")]
-        public string UserSid { get; private set; }
-        /// <summary>
-        /// The SID of the User as a Member in the Channel
-        /// </summary>
-        [JsonProperty("member_sid")]
-        public string MemberSid { get; private set; }
-        /// <summary>
-        /// The status of the User on the Channel
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public UserChannelResource.ChannelStatusEnum Status { get; private set; }
-        /// <summary>
-        /// The index of the last Message in the Channel the Member has read
-        /// </summary>
-        [JsonProperty("last_consumed_message_index")]
-        public int? LastConsumedMessageIndex { get; private set; }
-        /// <summary>
-        /// The number of unread Messages in the Channel for the User
-        /// </summary>
-        [JsonProperty("unread_messages_count")]
-        public int? UnreadMessagesCount { get; private set; }
-        /// <summary>
-        /// Absolute URLs to access the Members, Messages , Invites and, if it exists, the last Message for the Channel
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The push notification level of the User for the Channel
-        /// </summary>
-        [JsonProperty("notification_level")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public UserChannelResource.NotificationLevelEnum NotificationLevel { get; private set; }
-
-        private UserChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class UserChannelResource : Resource
+  {
+    public sealed class ChannelStatusEnum : StringEnum
+    {
+      private ChannelStatusEnum(string value) : base(value) { }
+      public ChannelStatusEnum() { }
+      public static implicit operator ChannelStatusEnum(string value)
+      {
+        return new ChannelStatusEnum(value);
+      }
+
+      public static readonly ChannelStatusEnum Joined = new ChannelStatusEnum("joined");
+      public static readonly ChannelStatusEnum Invited = new ChannelStatusEnum("invited");
+      public static readonly ChannelStatusEnum NotParticipating = new ChannelStatusEnum("not_participating");
+    }
+
+    public sealed class NotificationLevelEnum : StringEnum
+    {
+      private NotificationLevelEnum(string value) : base(value) { }
+      public NotificationLevelEnum() { }
+      public static implicit operator NotificationLevelEnum(string value)
+      {
+        return new NotificationLevelEnum(value);
+      }
+
+      public static readonly NotificationLevelEnum Default = new NotificationLevelEnum("default");
+      public static readonly NotificationLevelEnum Muted = new NotificationLevelEnum("muted");
+    }
+
+    private static Request BuildReadRequest(ReadUserChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// List all Channels for a given User.
+    /// </summary>
+    /// <param name="options"> Read UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static ResourceSet<UserChannelResource> Read(ReadUserChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<UserChannelResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List all Channels for a given User.
+    /// </summary>
+    /// <param name="options"> Read UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(ReadUserChannelOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<UserChannelResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// List all Channels for a given User.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static ResourceSet<UserChannelResource> Read(string pathServiceSid,
+                                                        string pathUserSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List all Channels for a given User.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(string pathServiceSid,
+                                                                                                string pathUserSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserChannelResource> NextPage(Page<UserChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<UserChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserChannelResource> PreviousPage(Page<UserChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<UserChannelResource>.FromJson("channels", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchUserChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels/" + options.PathChannelSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static UserChannelResource Fetch(FetchUserChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<UserChannelResource> FetchAsync(FetchUserChannelOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the User Channel resource from </param>
+    /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel that has the User Channel to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static UserChannelResource Fetch(string pathServiceSid,
+                                            string pathUserSid,
+                                            string pathChannelSid,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the User Channel resource from </param>
+    /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel that has the User Channel to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<UserChannelResource> FetchAsync(string pathServiceSid,
+                                                                                    string pathUserSid,
+                                                                                    string pathChannelSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteUserChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels/" + options.PathChannelSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Removes User from selected Channel.
+    /// </summary>
+    /// <param name="options"> Delete UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static bool Delete(DeleteUserChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Removes User from selected Channel.
+    /// </summary>
+    /// <param name="options"> Delete UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserChannelOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Removes User from selected Channel.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource belongs to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathUserSid,
+                              string pathChannelSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Removes User from selected Channel.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pathUserSid"> The SID of the User to fetch the User Channel resources from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel the resource belongs to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathUserSid,
+                                                                      string pathChannelSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateUserChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels/" + options.PathChannelSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static UserChannelResource Update(UpdateUserChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<UserChannelResource> UpdateAsync(UpdateUserChannelOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathUserSid"> The SID of the User to update the User Channel resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel with the User Channel resource to update </param>
+    /// <param name="notificationLevel"> The push notification level to assign to the User Channel </param>
+    /// <param name="lastConsumedMessageIndex"> The index of the last Message that the Member has read within the Channel
+    ///                                </param>
+    /// <param name="lastConsumptionTimestamp"> The ISO 8601 based timestamp string that represents the datetime of the
+    ///                                last Message read event for the Member within the Channel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static UserChannelResource Update(string pathServiceSid,
+                                             string pathUserSid,
+                                             string pathChannelSid,
+                                             UserChannelResource.NotificationLevelEnum notificationLevel = null,
+                                             int? lastConsumedMessageIndex = null,
+                                             DateTime? lastConsumptionTimestamp = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid) { NotificationLevel = notificationLevel, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathUserSid"> The SID of the User to update the User Channel resource from </param>
+    /// <param name="pathChannelSid"> The SID of the Channel with the User Channel resource to update </param>
+    /// <param name="notificationLevel"> The push notification level to assign to the User Channel </param>
+    /// <param name="lastConsumedMessageIndex"> The index of the last Message that the Member has read within the Channel
+    ///                                </param>
+    /// <param name="lastConsumptionTimestamp"> The ISO 8601 based timestamp string that represents the datetime of the
+    ///                                last Message read event for the Member within the Channel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<UserChannelResource> UpdateAsync(string pathServiceSid,
+                                                                                     string pathUserSid,
+                                                                                     string pathChannelSid,
+                                                                                     UserChannelResource.NotificationLevelEnum notificationLevel = null,
+                                                                                     int? lastConsumedMessageIndex = null,
+                                                                                     DateTime? lastConsumptionTimestamp = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid) { NotificationLevel = notificationLevel, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a UserChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserChannelResource object represented by the provided JSON </returns>
+    public static UserChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Channel the resource belongs to
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The SID of the User the User Channel belongs to
+    /// </summary>
+    [JsonProperty("user_sid")]
+    public string UserSid { get; private set; }
+    /// <summary>
+    /// The SID of the User as a Member in the Channel
+    /// </summary>
+    [JsonProperty("member_sid")]
+    public string MemberSid { get; private set; }
+    /// <summary>
+    /// The status of the User on the Channel
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public UserChannelResource.ChannelStatusEnum Status { get; private set; }
+    /// <summary>
+    /// The index of the last Message in the Channel the Member has read
+    /// </summary>
+    [JsonProperty("last_consumed_message_index")]
+    public int? LastConsumedMessageIndex { get; private set; }
+    /// <summary>
+    /// The number of unread Messages in the Channel for the User
+    /// </summary>
+    [JsonProperty("unread_messages_count")]
+    public int? UnreadMessagesCount { get; private set; }
+    /// <summary>
+    /// Absolute URLs to access the Members, Messages , Invites and, if it exists, the last Message for the Channel
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The push notification level of the User for the Channel
+    /// </summary>
+    [JsonProperty("notification_level")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public UserChannelResource.NotificationLevelEnum NotificationLevel { get; private set; }
+
+    private UserChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/UserOptions.cs b/src/Twilio/Rest/Chat/V2/Service/UserOptions.cs
index d23e856c9..26483cbd9 100644
--- a/src/Twilio/Rest/Chat/V2/Service/UserOptions.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/UserOptions.cs
@@ -9,275 +9,275 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchUserOptions
+  /// </summary>
+  public class FetchUserOptions : IOptions<UserResource>
+  {
     /// <summary>
-    /// FetchUserOptions
+    /// The SID of the Service to fetch the resource from
     /// </summary>
-    public class FetchUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the User resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the User resource to fetch </param>
-        public FetchUserOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteUserOptions
+    /// The SID of the User resource to fetch
     /// </summary>
-    public class DeleteUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of  the User resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of  the User resource to delete </param>
-        public DeleteUserOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateUserOptions
+    /// Construct a new FetchUserOptions
     /// </summary>
-    public class CreateUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the new resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The `identity` value that identifies the new resource's User
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The SID of the Role assigned to this user
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// A string to describe the new resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the new resource under </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        public CreateUserOptions(string pathServiceSid, string identity)
-        {
-            PathServiceSid = pathServiceSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the User resource to fetch </param>
+    public FetchUserOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadUserOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadUserOptions : ReadOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the User resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the User resources from </param>
-        public ReadUserOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteUserOptions
+  /// </summary>
+  public class DeleteUserOptions : IOptions<UserResource>
+  {
     /// <summary>
-    /// UpdateUserOptions
+    /// The SID of the Service to delete the resource from
     /// </summary>
-    public class UpdateUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the User resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The SID id of the Role assigned to this user
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// A valid JSON string that contains application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The SID of the User resource to update </param>
-        public UpdateUserOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of  the User resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of  the User resource to delete </param>
+    public DeleteUserOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateUserOptions
+  /// </summary>
+  public class CreateUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the new resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The `identity` value that identifies the new resource's User
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The SID of the Role assigned to this user
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// A string to describe the new resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the new resource under </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    public CreateUserOptions(string pathServiceSid, string identity)
+    {
+      PathServiceSid = pathServiceSid;
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadUserOptions
+  /// </summary>
+  public class ReadUserOptions : ReadOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the User resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the User resources from </param>
+    public ReadUserOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateUserOptions
+  /// </summary>
+  public class UpdateUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the User resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The SID id of the Role assigned to this user
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// A valid JSON string that contains application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The SID of the User resource to update </param>
+    public UpdateUserOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/Service/UserResource.cs b/src/Twilio/Rest/Chat/V2/Service/UserResource.cs
index d3802e33e..2a4f4d8b4 100644
--- a/src/Twilio/Rest/Chat/V2/Service/UserResource.cs
+++ b/src/Twilio/Rest/Chat/V2/Service/UserResource.cs
@@ -17,565 +17,565 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Chat.V2.Service
-{
-
-    public class UserResource : Resource
-    {
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the User resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the User resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathServiceSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static bool Delete(DeleteUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of  the User resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of  the User resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Users",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Create(CreateUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> CreateAsync(CreateUserOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the new resource under </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="roleSid"> The SID of the Role assigned to this user </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Create(string pathServiceSid,
-                                          string identity,
-                                          string roleSid = null,
-                                          string attributes = null,
-                                          string friendlyName = null,
-                                          UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateUserOptions(pathServiceSid, identity){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the new resource under </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="roleSid"> The SID of the Role assigned to this user </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> CreateAsync(string pathServiceSid,
-                                                                                  string identity,
-                                                                                  string roleSid = null,
-                                                                                  string attributes = null,
-                                                                                  string friendlyName = null,
-                                                                                  UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateUserOptions(pathServiceSid, identity){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Users",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static ResourceSet<UserResource> Read(ReadUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserResource>.FromJson("users", response.Content);
-            return new ResourceSet<UserResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(ReadUserOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserResource>.FromJson("users", response.Content);
-            return new ResourceSet<UserResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the User resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static ResourceSet<UserResource> Read(string pathServiceSid,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadUserOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the User resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(string pathServiceSid,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadUserOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserResource> NextPage(Page<UserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserResource> PreviousPage(Page<UserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The SID of the User resource to update </param>
-        /// <param name="roleSid"> The SID id of the Role assigned to this user </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(string pathServiceSid,
-                                          string pathSid,
-                                          string roleSid = null,
-                                          string attributes = null,
-                                          string friendlyName = null,
-                                          UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathServiceSid, pathSid){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The SID of the User resource to update </param>
-        /// <param name="roleSid"> The SID id of the Role assigned to this user </param>
-        /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathServiceSid,
-                                                                                  string pathSid,
-                                                                                  string roleSid = null,
-                                                                                  string attributes = null,
-                                                                                  string friendlyName = null,
-                                                                                  UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathServiceSid, pathSid){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a UserResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserResource object represented by the provided JSON </returns>
-        public static UserResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The JSON string that stores application-specific data
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The SID of the Role assigned to the user
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// Whether the User is actively connected to the Service instance and online
-        /// </summary>
-        [JsonProperty("is_online")]
-        public bool? IsOnline { get; private set; }
-        /// <summary>
-        /// Whether the User has a potentially valid Push Notification registration for the Service instance
-        /// </summary>
-        [JsonProperty("is_notifiable")]
-        public bool? IsNotifiable { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The number of Channels the User is a Member of
-        /// </summary>
-        [JsonProperty("joined_channels_count")]
-        public int? JoinedChannelsCount { get; private set; }
-        /// <summary>
-        /// The absolute URLs of the Channel and Binding resources related to the user
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The absolute URL of the User resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private UserResource()
-        {
-
-        }
-    }
+{
+
+  public class UserResource : Resource
+  {
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the User resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the User resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathServiceSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static bool Delete(DeleteUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of  the User resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of  the User resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Users",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Create(CreateUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> CreateAsync(CreateUserOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the new resource under </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="roleSid"> The SID of the Role assigned to this user </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Create(string pathServiceSid,
+                                      string identity,
+                                      string roleSid = null,
+                                      string attributes = null,
+                                      string friendlyName = null,
+                                      UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateUserOptions(pathServiceSid, identity) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the new resource under </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="roleSid"> The SID of the Role assigned to this user </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> CreateAsync(string pathServiceSid,
+                                                                              string identity,
+                                                                              string roleSid = null,
+                                                                              string attributes = null,
+                                                                              string friendlyName = null,
+                                                                              UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateUserOptions(pathServiceSid, identity) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Users",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static ResourceSet<UserResource> Read(ReadUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserResource>.FromJson("users", response.Content);
+      return new ResourceSet<UserResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(ReadUserOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserResource>.FromJson("users", response.Content);
+      return new ResourceSet<UserResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the User resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static ResourceSet<UserResource> Read(string pathServiceSid,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadUserOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the User resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(string pathServiceSid,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadUserOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserResource> NextPage(Page<UserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserResource> PreviousPage(Page<UserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The SID of the User resource to update </param>
+    /// <param name="roleSid"> The SID id of the Role assigned to this user </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(string pathServiceSid,
+                                      string pathSid,
+                                      string roleSid = null,
+                                      string attributes = null,
+                                      string friendlyName = null,
+                                      UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathServiceSid, pathSid) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The SID of the User resource to update </param>
+    /// <param name="roleSid"> The SID id of the Role assigned to this user </param>
+    /// <param name="attributes"> A valid JSON string that contains application-specific data </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathServiceSid,
+                                                                              string pathSid,
+                                                                              string roleSid = null,
+                                                                              string attributes = null,
+                                                                              string friendlyName = null,
+                                                                              UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathServiceSid, pathSid) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a UserResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserResource object represented by the provided JSON </returns>
+    public static UserResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The JSON string that stores application-specific data
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The SID of the Role assigned to the user
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The string that identifies the resource's User
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// Whether the User is actively connected to the Service instance and online
+    /// </summary>
+    [JsonProperty("is_online")]
+    public bool? IsOnline { get; private set; }
+    /// <summary>
+    /// Whether the User has a potentially valid Push Notification registration for the Service instance
+    /// </summary>
+    [JsonProperty("is_notifiable")]
+    public bool? IsNotifiable { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The number of Channels the User is a Member of
+    /// </summary>
+    [JsonProperty("joined_channels_count")]
+    public int? JoinedChannelsCount { get; private set; }
+    /// <summary>
+    /// The absolute URLs of the Channel and Binding resources related to the user
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The absolute URL of the User resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private UserResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/ServiceOptions.cs b/src/Twilio/Rest/Chat/V2/ServiceOptions.cs
index e977ec2cc..752261a7c 100644
--- a/src/Twilio/Rest/Chat/V2/ServiceOptions.cs
+++ b/src/Twilio/Rest/Chat/V2/ServiceOptions.cs
@@ -10,427 +10,427 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Chat.V2
-{
-
+{
+
+  /// <summary>
+  /// FetchServiceOptions
+  /// </summary>
+  public class FetchServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// FetchServiceOptions
+    /// The SID of the Service resource to fetch
     /// </summary>
-    public class FetchServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The SID of the Service resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to fetch </param>
-        public FetchServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteServiceOptions
+    /// Construct a new FetchServiceOptions
     /// </summary>
-    public class DeleteServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The SID of the Service resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to delete </param>
-        public DeleteServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The SID of the Service resource to fetch </param>
+    public FetchServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// CreateServiceOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Construct a new CreateServiceOptions
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        public CreateServiceOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteServiceOptions
+  /// </summary>
+  public class DeleteServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// ReadServiceOptions
-    /// </summary>
-    public class ReadServiceOptions : ReadOptions<ServiceResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Service resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// UpdateServiceOptions
-    /// </summary>
-    public class UpdateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The SID of the Service resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The service role assigned to users when they are added to the service
-        /// </summary>
-        public string DefaultServiceRoleSid { get; set; }
-        /// <summary>
-        /// The channel role assigned to users when they are added to a channel
-        /// </summary>
-        public string DefaultChannelRoleSid { get; set; }
-        /// <summary>
-        /// The channel role assigned to a channel creator when they join a new channel
-        /// </summary>
-        public string DefaultChannelCreatorRoleSid { get; set; }
-        /// <summary>
-        /// Whether to enable the Message Consumption Horizon feature
-        /// </summary>
-        public bool? ReadStatusEnabled { get; set; }
-        /// <summary>
-        /// Whether to enable the Reachability Indicator feature for this Service instance
-        /// </summary>
-        public bool? ReachabilityEnabled { get; set; }
-        /// <summary>
-        /// How long in seconds to wait before assuming the user is no longer typing
-        /// </summary>
-        public int? TypingIndicatorTimeout { get; set; }
-        /// <summary>
-        /// DEPRECATED
-        /// </summary>
-        public int? ConsumptionReportInterval { get; set; }
-        /// <summary>
-        /// Whether to send a notification when a new message is added to a channel
-        /// </summary>
-        public bool? NotificationsNewMessageEnabled { get; set; }
-        /// <summary>
-        /// The template to use to create the notification text displayed when a new message is added to a channel
-        /// </summary>
-        public string NotificationsNewMessageTemplate { get; set; }
-        /// <summary>
-        /// The name of the sound to play when a new message is added to a channel
-        /// </summary>
-        public string NotificationsNewMessageSound { get; set; }
-        /// <summary>
-        /// Whether the new message badge is enabled
-        /// </summary>
-        public bool? NotificationsNewMessageBadgeCountEnabled { get; set; }
-        /// <summary>
-        /// Whether to send a notification when a member is added to a channel
-        /// </summary>
-        public bool? NotificationsAddedToChannelEnabled { get; set; }
-        /// <summary>
-        /// The template to use to create the notification text displayed when a member is added to a channel
-        /// </summary>
-        public string NotificationsAddedToChannelTemplate { get; set; }
-        /// <summary>
-        /// The name of the sound to play when a member is added to a channel
-        /// </summary>
-        public string NotificationsAddedToChannelSound { get; set; }
-        /// <summary>
-        /// Whether to send a notification to a user when they are removed from a channel
-        /// </summary>
-        public bool? NotificationsRemovedFromChannelEnabled { get; set; }
-        /// <summary>
-        /// The template to use to create the notification text displayed to a user when they are removed
-        /// </summary>
-        public string NotificationsRemovedFromChannelTemplate { get; set; }
-        /// <summary>
-        /// The name of the sound to play to a user when they are removed from a channel
-        /// </summary>
-        public string NotificationsRemovedFromChannelSound { get; set; }
-        /// <summary>
-        /// Whether to send a notification when a user is invited to a channel
-        /// </summary>
-        public bool? NotificationsInvitedToChannelEnabled { get; set; }
-        /// <summary>
-        /// The template to use to create the notification text displayed when a user is invited to a channel
-        /// </summary>
-        public string NotificationsInvitedToChannelTemplate { get; set; }
-        /// <summary>
-        /// The name of the sound to play when a user is invited to a channel
-        /// </summary>
-        public string NotificationsInvitedToChannelSound { get; set; }
-        /// <summary>
-        /// The webhook URL for pre-event webhooks
-        /// </summary>
-        public Uri PreWebhookUrl { get; set; }
-        /// <summary>
-        /// The URL for post-event webhooks
-        /// </summary>
-        public Uri PostWebhookUrl { get; set; }
-        /// <summary>
-        /// The HTTP method  to use for both PRE and POST webhooks
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhookMethod { get; set; }
-        /// <summary>
-        /// The list of webhook events that are enabled for this Service instance
-        /// </summary>
-        public List<string> WebhookFilters { get; set; }
-        /// <summary>
-        /// The maximum number of Members that can be added to Channels within this Service
-        /// </summary>
-        public int? LimitsChannelMembers { get; set; }
-        /// <summary>
-        /// The maximum number of Channels Users can be a Member of within this Service
-        /// </summary>
-        public int? LimitsUserChannels { get; set; }
-        /// <summary>
-        /// The message to send when a media message has no text
-        /// </summary>
-        public string MediaCompatibilityMessage { get; set; }
-        /// <summary>
-        /// Count of times webhook will be retried in case of timeout or 429/503/504 HTTP responses
-        /// </summary>
-        public int? PreWebhookRetryCount { get; set; }
-        /// <summary>
-        /// The number of times calls to the `post_webhook_url` will be retried
-        /// </summary>
-        public int? PostWebhookRetryCount { get; set; }
-        /// <summary>
-        /// Whether to log notifications
-        /// </summary>
-        public bool? NotificationsLogEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to update </param>
-        public UpdateServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-            WebhookFilters = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DefaultServiceRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultServiceRoleSid", DefaultServiceRoleSid.ToString()));
-            }
-
-            if (DefaultChannelRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultChannelRoleSid", DefaultChannelRoleSid.ToString()));
-            }
-
-            if (DefaultChannelCreatorRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultChannelCreatorRoleSid", DefaultChannelCreatorRoleSid.ToString()));
-            }
-
-            if (ReadStatusEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReadStatusEnabled", ReadStatusEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ReachabilityEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReachabilityEnabled", ReachabilityEnabled.Value.ToString().ToLower()));
-            }
-
-            if (TypingIndicatorTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TypingIndicatorTimeout", TypingIndicatorTimeout.ToString()));
-            }
-
-            if (ConsumptionReportInterval != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConsumptionReportInterval", ConsumptionReportInterval.ToString()));
-            }
-
-            if (NotificationsNewMessageEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Enabled", NotificationsNewMessageEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsNewMessageTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Template", NotificationsNewMessageTemplate));
-            }
-
-            if (NotificationsNewMessageSound != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Sound", NotificationsNewMessageSound));
-            }
-
-            if (NotificationsNewMessageBadgeCountEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.BadgeCountEnabled", NotificationsNewMessageBadgeCountEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsAddedToChannelEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Enabled", NotificationsAddedToChannelEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsAddedToChannelTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Template", NotificationsAddedToChannelTemplate));
-            }
-
-            if (NotificationsAddedToChannelSound != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Sound", NotificationsAddedToChannelSound));
-            }
-
-            if (NotificationsRemovedFromChannelEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Enabled", NotificationsRemovedFromChannelEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsRemovedFromChannelTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Template", NotificationsRemovedFromChannelTemplate));
-            }
-
-            if (NotificationsRemovedFromChannelSound != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Sound", NotificationsRemovedFromChannelSound));
-            }
-
-            if (NotificationsInvitedToChannelEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Enabled", NotificationsInvitedToChannelEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsInvitedToChannelTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Template", NotificationsInvitedToChannelTemplate));
-            }
-
-            if (NotificationsInvitedToChannelSound != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Sound", NotificationsInvitedToChannelSound));
-            }
-
-            if (PreWebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PreWebhookUrl", Serializers.Url(PreWebhookUrl)));
-            }
-
-            if (PostWebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostWebhookUrl", Serializers.Url(PostWebhookUrl)));
-            }
-
-            if (WebhookMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod.ToString()));
-            }
-
-            if (WebhookFilters != null)
-            {
-                p.AddRange(WebhookFilters.Select(prop => new KeyValuePair<string, string>("WebhookFilters", prop)));
-            }
-
-            if (LimitsChannelMembers != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Limits.ChannelMembers", LimitsChannelMembers.ToString()));
-            }
-
-            if (LimitsUserChannels != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Limits.UserChannels", LimitsUserChannels.ToString()));
-            }
-
-            if (MediaCompatibilityMessage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Media.CompatibilityMessage", MediaCompatibilityMessage));
-            }
-
-            if (PreWebhookRetryCount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PreWebhookRetryCount", PreWebhookRetryCount.ToString()));
-            }
-
-            if (PostWebhookRetryCount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostWebhookRetryCount", PostWebhookRetryCount.ToString()));
-            }
-
-            if (NotificationsLogEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.LogEnabled", NotificationsLogEnabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new DeleteServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to delete </param>
+    public DeleteServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateServiceOptions
+  /// </summary>
+  public class CreateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
+
+    /// <summary>
+    /// Construct a new CreateServiceOptions
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    public CreateServiceOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadServiceOptions
+  /// </summary>
+  public class ReadServiceOptions : ReadOptions<ServiceResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateServiceOptions
+  /// </summary>
+  public class UpdateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The SID of the Service resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The service role assigned to users when they are added to the service
+    /// </summary>
+    public string DefaultServiceRoleSid { get; set; }
+    /// <summary>
+    /// The channel role assigned to users when they are added to a channel
+    /// </summary>
+    public string DefaultChannelRoleSid { get; set; }
+    /// <summary>
+    /// The channel role assigned to a channel creator when they join a new channel
+    /// </summary>
+    public string DefaultChannelCreatorRoleSid { get; set; }
+    /// <summary>
+    /// Whether to enable the Message Consumption Horizon feature
+    /// </summary>
+    public bool? ReadStatusEnabled { get; set; }
+    /// <summary>
+    /// Whether to enable the Reachability Indicator feature for this Service instance
+    /// </summary>
+    public bool? ReachabilityEnabled { get; set; }
+    /// <summary>
+    /// How long in seconds to wait before assuming the user is no longer typing
+    /// </summary>
+    public int? TypingIndicatorTimeout { get; set; }
+    /// <summary>
+    /// DEPRECATED
+    /// </summary>
+    public int? ConsumptionReportInterval { get; set; }
+    /// <summary>
+    /// Whether to send a notification when a new message is added to a channel
+    /// </summary>
+    public bool? NotificationsNewMessageEnabled { get; set; }
+    /// <summary>
+    /// The template to use to create the notification text displayed when a new message is added to a channel
+    /// </summary>
+    public string NotificationsNewMessageTemplate { get; set; }
+    /// <summary>
+    /// The name of the sound to play when a new message is added to a channel
+    /// </summary>
+    public string NotificationsNewMessageSound { get; set; }
+    /// <summary>
+    /// Whether the new message badge is enabled
+    /// </summary>
+    public bool? NotificationsNewMessageBadgeCountEnabled { get; set; }
+    /// <summary>
+    /// Whether to send a notification when a member is added to a channel
+    /// </summary>
+    public bool? NotificationsAddedToChannelEnabled { get; set; }
+    /// <summary>
+    /// The template to use to create the notification text displayed when a member is added to a channel
+    /// </summary>
+    public string NotificationsAddedToChannelTemplate { get; set; }
+    /// <summary>
+    /// The name of the sound to play when a member is added to a channel
+    /// </summary>
+    public string NotificationsAddedToChannelSound { get; set; }
+    /// <summary>
+    /// Whether to send a notification to a user when they are removed from a channel
+    /// </summary>
+    public bool? NotificationsRemovedFromChannelEnabled { get; set; }
+    /// <summary>
+    /// The template to use to create the notification text displayed to a user when they are removed
+    /// </summary>
+    public string NotificationsRemovedFromChannelTemplate { get; set; }
+    /// <summary>
+    /// The name of the sound to play to a user when they are removed from a channel
+    /// </summary>
+    public string NotificationsRemovedFromChannelSound { get; set; }
+    /// <summary>
+    /// Whether to send a notification when a user is invited to a channel
+    /// </summary>
+    public bool? NotificationsInvitedToChannelEnabled { get; set; }
+    /// <summary>
+    /// The template to use to create the notification text displayed when a user is invited to a channel
+    /// </summary>
+    public string NotificationsInvitedToChannelTemplate { get; set; }
+    /// <summary>
+    /// The name of the sound to play when a user is invited to a channel
+    /// </summary>
+    public string NotificationsInvitedToChannelSound { get; set; }
+    /// <summary>
+    /// The webhook URL for pre-event webhooks
+    /// </summary>
+    public Uri PreWebhookUrl { get; set; }
+    /// <summary>
+    /// The URL for post-event webhooks
+    /// </summary>
+    public Uri PostWebhookUrl { get; set; }
+    /// <summary>
+    /// The HTTP method  to use for both PRE and POST webhooks
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhookMethod { get; set; }
+    /// <summary>
+    /// The list of webhook events that are enabled for this Service instance
+    /// </summary>
+    public List<string> WebhookFilters { get; set; }
+    /// <summary>
+    /// The maximum number of Members that can be added to Channels within this Service
+    /// </summary>
+    public int? LimitsChannelMembers { get; set; }
+    /// <summary>
+    /// The maximum number of Channels Users can be a Member of within this Service
+    /// </summary>
+    public int? LimitsUserChannels { get; set; }
+    /// <summary>
+    /// The message to send when a media message has no text
+    /// </summary>
+    public string MediaCompatibilityMessage { get; set; }
+    /// <summary>
+    /// Count of times webhook will be retried in case of timeout or 429/503/504 HTTP responses
+    /// </summary>
+    public int? PreWebhookRetryCount { get; set; }
+    /// <summary>
+    /// The number of times calls to the `post_webhook_url` will be retried
+    /// </summary>
+    public int? PostWebhookRetryCount { get; set; }
+    /// <summary>
+    /// Whether to log notifications
+    /// </summary>
+    public bool? NotificationsLogEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to update </param>
+    public UpdateServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+      WebhookFilters = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DefaultServiceRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultServiceRoleSid", DefaultServiceRoleSid.ToString()));
+      }
+
+      if (DefaultChannelRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultChannelRoleSid", DefaultChannelRoleSid.ToString()));
+      }
+
+      if (DefaultChannelCreatorRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultChannelCreatorRoleSid", DefaultChannelCreatorRoleSid.ToString()));
+      }
+
+      if (ReadStatusEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReadStatusEnabled", ReadStatusEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ReachabilityEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReachabilityEnabled", ReachabilityEnabled.Value.ToString().ToLower()));
+      }
+
+      if (TypingIndicatorTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TypingIndicatorTimeout", TypingIndicatorTimeout.ToString()));
+      }
+
+      if (ConsumptionReportInterval != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConsumptionReportInterval", ConsumptionReportInterval.ToString()));
+      }
+
+      if (NotificationsNewMessageEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Enabled", NotificationsNewMessageEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsNewMessageTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Template", NotificationsNewMessageTemplate));
+      }
+
+      if (NotificationsNewMessageSound != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Sound", NotificationsNewMessageSound));
+      }
+
+      if (NotificationsNewMessageBadgeCountEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.BadgeCountEnabled", NotificationsNewMessageBadgeCountEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsAddedToChannelEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Enabled", NotificationsAddedToChannelEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsAddedToChannelTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Template", NotificationsAddedToChannelTemplate));
+      }
+
+      if (NotificationsAddedToChannelSound != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Sound", NotificationsAddedToChannelSound));
+      }
+
+      if (NotificationsRemovedFromChannelEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Enabled", NotificationsRemovedFromChannelEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsRemovedFromChannelTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Template", NotificationsRemovedFromChannelTemplate));
+      }
+
+      if (NotificationsRemovedFromChannelSound != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Sound", NotificationsRemovedFromChannelSound));
+      }
+
+      if (NotificationsInvitedToChannelEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Enabled", NotificationsInvitedToChannelEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsInvitedToChannelTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Template", NotificationsInvitedToChannelTemplate));
+      }
+
+      if (NotificationsInvitedToChannelSound != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Sound", NotificationsInvitedToChannelSound));
+      }
+
+      if (PreWebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PreWebhookUrl", Serializers.Url(PreWebhookUrl)));
+      }
+
+      if (PostWebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostWebhookUrl", Serializers.Url(PostWebhookUrl)));
+      }
+
+      if (WebhookMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod.ToString()));
+      }
+
+      if (WebhookFilters != null)
+      {
+        p.AddRange(WebhookFilters.Select(prop => new KeyValuePair<string, string>("WebhookFilters", prop)));
+      }
+
+      if (LimitsChannelMembers != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Limits.ChannelMembers", LimitsChannelMembers.ToString()));
+      }
+
+      if (LimitsUserChannels != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Limits.UserChannels", LimitsUserChannels.ToString()));
+      }
+
+      if (MediaCompatibilityMessage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Media.CompatibilityMessage", MediaCompatibilityMessage));
+      }
+
+      if (PreWebhookRetryCount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PreWebhookRetryCount", PreWebhookRetryCount.ToString()));
+      }
+
+      if (PostWebhookRetryCount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostWebhookRetryCount", PostWebhookRetryCount.ToString()));
+      }
+
+      if (NotificationsLogEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.LogEnabled", NotificationsLogEnabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Chat/V2/ServiceResource.cs b/src/Twilio/Rest/Chat/V2/ServiceResource.cs
index 8c06aae13..26157a822 100644
--- a/src/Twilio/Rest/Chat/V2/ServiceResource.cs
+++ b/src/Twilio/Rest/Chat/V2/ServiceResource.cs
@@ -16,705 +16,705 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Chat.V2
-{
-
-    public class ServiceResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(string friendlyName, ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Chat,
-                "/v2/Services",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Chat)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Chat,
-                "/v2/Services/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="defaultServiceRoleSid"> The service role assigned to users when they are added to the service </param>
-        /// <param name="defaultChannelRoleSid"> The channel role assigned to users when they are added to a channel </param>
-        /// <param name="defaultChannelCreatorRoleSid"> The channel role assigned to a channel creator when they join a new
-        ///                                    channel </param>
-        /// <param name="readStatusEnabled"> Whether to enable the Message Consumption Horizon feature </param>
-        /// <param name="reachabilityEnabled"> Whether to enable the Reachability Indicator feature for this Service instance
-        ///                           </param>
-        /// <param name="typingIndicatorTimeout"> How long in seconds to wait before assuming the user is no longer typing
-        ///                              </param>
-        /// <param name="consumptionReportInterval"> DEPRECATED </param>
-        /// <param name="notificationsNewMessageEnabled"> Whether to send a notification when a new message is added to a
-        ///                                      channel </param>
-        /// <param name="notificationsNewMessageTemplate"> The template to use to create the notification text displayed when a
-        ///                                       new message is added to a channel </param>
-        /// <param name="notificationsNewMessageSound"> The name of the sound to play when a new message is added to a channel
-        ///                                    </param>
-        /// <param name="notificationsNewMessageBadgeCountEnabled"> Whether the new message badge is enabled </param>
-        /// <param name="notificationsAddedToChannelEnabled"> Whether to send a notification when a member is added to a
-        ///                                          channel </param>
-        /// <param name="notificationsAddedToChannelTemplate"> The template to use to create the notification text displayed
-        ///                                           when a member is added to a channel </param>
-        /// <param name="notificationsAddedToChannelSound"> The name of the sound to play when a member is added to a channel
-        ///                                        </param>
-        /// <param name="notificationsRemovedFromChannelEnabled"> Whether to send a notification to a user when they are
-        ///                                              removed from a channel </param>
-        /// <param name="notificationsRemovedFromChannelTemplate"> The template to use to create the notification text
-        ///                                               displayed to a user when they are removed </param>
-        /// <param name="notificationsRemovedFromChannelSound"> The name of the sound to play to a user when they are removed
-        ///                                            from a channel </param>
-        /// <param name="notificationsInvitedToChannelEnabled"> Whether to send a notification when a user is invited to a
-        ///                                            channel </param>
-        /// <param name="notificationsInvitedToChannelTemplate"> The template to use to create the notification text displayed
-        ///                                             when a user is invited to a channel </param>
-        /// <param name="notificationsInvitedToChannelSound"> The name of the sound to play when a user is invited to a channel
-        ///                                          </param>
-        /// <param name="preWebhookUrl"> The webhook URL for pre-event webhooks </param>
-        /// <param name="postWebhookUrl"> The URL for post-event webhooks </param>
-        /// <param name="webhookMethod"> The HTTP method  to use for both PRE and POST webhooks </param>
-        /// <param name="webhookFilters"> The list of webhook events that are enabled for this Service instance </param>
-        /// <param name="limitsChannelMembers"> The maximum number of Members that can be added to Channels within this Service
-        ///                            </param>
-        /// <param name="limitsUserChannels"> The maximum number of Channels Users can be a Member of within this Service
-        ///                          </param>
-        /// <param name="mediaCompatibilityMessage"> The message to send when a media message has no text </param>
-        /// <param name="preWebhookRetryCount"> Count of times webhook will be retried in case of timeout or 429/503/504 HTTP
-        ///                            responses </param>
-        /// <param name="postWebhookRetryCount"> The number of times calls to the `post_webhook_url` will be retried </param>
-        /// <param name="notificationsLogEnabled"> Whether to log notifications </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(string pathSid,
-                                             string friendlyName = null,
-                                             string defaultServiceRoleSid = null,
-                                             string defaultChannelRoleSid = null,
-                                             string defaultChannelCreatorRoleSid = null,
-                                             bool? readStatusEnabled = null,
-                                             bool? reachabilityEnabled = null,
-                                             int? typingIndicatorTimeout = null,
-                                             int? consumptionReportInterval = null,
-                                             bool? notificationsNewMessageEnabled = null,
-                                             string notificationsNewMessageTemplate = null,
-                                             string notificationsNewMessageSound = null,
-                                             bool? notificationsNewMessageBadgeCountEnabled = null,
-                                             bool? notificationsAddedToChannelEnabled = null,
-                                             string notificationsAddedToChannelTemplate = null,
-                                             string notificationsAddedToChannelSound = null,
-                                             bool? notificationsRemovedFromChannelEnabled = null,
-                                             string notificationsRemovedFromChannelTemplate = null,
-                                             string notificationsRemovedFromChannelSound = null,
-                                             bool? notificationsInvitedToChannelEnabled = null,
-                                             string notificationsInvitedToChannelTemplate = null,
-                                             string notificationsInvitedToChannelSound = null,
-                                             Uri preWebhookUrl = null,
-                                             Uri postWebhookUrl = null,
-                                             Twilio.Http.HttpMethod webhookMethod = null,
-                                             List<string> webhookFilters = null,
-                                             int? limitsChannelMembers = null,
-                                             int? limitsUserChannels = null,
-                                             string mediaCompatibilityMessage = null,
-                                             int? preWebhookRetryCount = null,
-                                             int? postWebhookRetryCount = null,
-                                             bool? notificationsLogEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsNewMessageSound = notificationsNewMessageSound, NotificationsNewMessageBadgeCountEnabled = notificationsNewMessageBadgeCountEnabled, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsAddedToChannelSound = notificationsAddedToChannelSound, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsRemovedFromChannelSound = notificationsRemovedFromChannelSound, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, NotificationsInvitedToChannelSound = notificationsInvitedToChannelSound, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels, MediaCompatibilityMessage = mediaCompatibilityMessage, PreWebhookRetryCount = preWebhookRetryCount, PostWebhookRetryCount = postWebhookRetryCount, NotificationsLogEnabled = notificationsLogEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="defaultServiceRoleSid"> The service role assigned to users when they are added to the service </param>
-        /// <param name="defaultChannelRoleSid"> The channel role assigned to users when they are added to a channel </param>
-        /// <param name="defaultChannelCreatorRoleSid"> The channel role assigned to a channel creator when they join a new
-        ///                                    channel </param>
-        /// <param name="readStatusEnabled"> Whether to enable the Message Consumption Horizon feature </param>
-        /// <param name="reachabilityEnabled"> Whether to enable the Reachability Indicator feature for this Service instance
-        ///                           </param>
-        /// <param name="typingIndicatorTimeout"> How long in seconds to wait before assuming the user is no longer typing
-        ///                              </param>
-        /// <param name="consumptionReportInterval"> DEPRECATED </param>
-        /// <param name="notificationsNewMessageEnabled"> Whether to send a notification when a new message is added to a
-        ///                                      channel </param>
-        /// <param name="notificationsNewMessageTemplate"> The template to use to create the notification text displayed when a
-        ///                                       new message is added to a channel </param>
-        /// <param name="notificationsNewMessageSound"> The name of the sound to play when a new message is added to a channel
-        ///                                    </param>
-        /// <param name="notificationsNewMessageBadgeCountEnabled"> Whether the new message badge is enabled </param>
-        /// <param name="notificationsAddedToChannelEnabled"> Whether to send a notification when a member is added to a
-        ///                                          channel </param>
-        /// <param name="notificationsAddedToChannelTemplate"> The template to use to create the notification text displayed
-        ///                                           when a member is added to a channel </param>
-        /// <param name="notificationsAddedToChannelSound"> The name of the sound to play when a member is added to a channel
-        ///                                        </param>
-        /// <param name="notificationsRemovedFromChannelEnabled"> Whether to send a notification to a user when they are
-        ///                                              removed from a channel </param>
-        /// <param name="notificationsRemovedFromChannelTemplate"> The template to use to create the notification text
-        ///                                               displayed to a user when they are removed </param>
-        /// <param name="notificationsRemovedFromChannelSound"> The name of the sound to play to a user when they are removed
-        ///                                            from a channel </param>
-        /// <param name="notificationsInvitedToChannelEnabled"> Whether to send a notification when a user is invited to a
-        ///                                            channel </param>
-        /// <param name="notificationsInvitedToChannelTemplate"> The template to use to create the notification text displayed
-        ///                                             when a user is invited to a channel </param>
-        /// <param name="notificationsInvitedToChannelSound"> The name of the sound to play when a user is invited to a channel
-        ///                                          </param>
-        /// <param name="preWebhookUrl"> The webhook URL for pre-event webhooks </param>
-        /// <param name="postWebhookUrl"> The URL for post-event webhooks </param>
-        /// <param name="webhookMethod"> The HTTP method  to use for both PRE and POST webhooks </param>
-        /// <param name="webhookFilters"> The list of webhook events that are enabled for this Service instance </param>
-        /// <param name="limitsChannelMembers"> The maximum number of Members that can be added to Channels within this Service
-        ///                            </param>
-        /// <param name="limitsUserChannels"> The maximum number of Channels Users can be a Member of within this Service
-        ///                          </param>
-        /// <param name="mediaCompatibilityMessage"> The message to send when a media message has no text </param>
-        /// <param name="preWebhookRetryCount"> Count of times webhook will be retried in case of timeout or 429/503/504 HTTP
-        ///                            responses </param>
-        /// <param name="postWebhookRetryCount"> The number of times calls to the `post_webhook_url` will be retried </param>
-        /// <param name="notificationsLogEnabled"> Whether to log notifications </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     string defaultServiceRoleSid = null,
-                                                                                     string defaultChannelRoleSid = null,
-                                                                                     string defaultChannelCreatorRoleSid = null,
-                                                                                     bool? readStatusEnabled = null,
-                                                                                     bool? reachabilityEnabled = null,
-                                                                                     int? typingIndicatorTimeout = null,
-                                                                                     int? consumptionReportInterval = null,
-                                                                                     bool? notificationsNewMessageEnabled = null,
-                                                                                     string notificationsNewMessageTemplate = null,
-                                                                                     string notificationsNewMessageSound = null,
-                                                                                     bool? notificationsNewMessageBadgeCountEnabled = null,
-                                                                                     bool? notificationsAddedToChannelEnabled = null,
-                                                                                     string notificationsAddedToChannelTemplate = null,
-                                                                                     string notificationsAddedToChannelSound = null,
-                                                                                     bool? notificationsRemovedFromChannelEnabled = null,
-                                                                                     string notificationsRemovedFromChannelTemplate = null,
-                                                                                     string notificationsRemovedFromChannelSound = null,
-                                                                                     bool? notificationsInvitedToChannelEnabled = null,
-                                                                                     string notificationsInvitedToChannelTemplate = null,
-                                                                                     string notificationsInvitedToChannelSound = null,
-                                                                                     Uri preWebhookUrl = null,
-                                                                                     Uri postWebhookUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhookMethod = null,
-                                                                                     List<string> webhookFilters = null,
-                                                                                     int? limitsChannelMembers = null,
-                                                                                     int? limitsUserChannels = null,
-                                                                                     string mediaCompatibilityMessage = null,
-                                                                                     int? preWebhookRetryCount = null,
-                                                                                     int? postWebhookRetryCount = null,
-                                                                                     bool? notificationsLogEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsNewMessageSound = notificationsNewMessageSound, NotificationsNewMessageBadgeCountEnabled = notificationsNewMessageBadgeCountEnabled, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsAddedToChannelSound = notificationsAddedToChannelSound, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsRemovedFromChannelSound = notificationsRemovedFromChannelSound, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, NotificationsInvitedToChannelSound = notificationsInvitedToChannelSound, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels, MediaCompatibilityMessage = mediaCompatibilityMessage, PreWebhookRetryCount = preWebhookRetryCount, PostWebhookRetryCount = postWebhookRetryCount, NotificationsLogEnabled = notificationsLogEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ServiceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ServiceResource object represented by the provided JSON </returns>
-        public static ServiceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ServiceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The service role assigned to users when they are added to the service
-        /// </summary>
-        [JsonProperty("default_service_role_sid")]
-        public string DefaultServiceRoleSid { get; private set; }
-        /// <summary>
-        /// The channel role assigned to users when they are added to a channel
-        /// </summary>
-        [JsonProperty("default_channel_role_sid")]
-        public string DefaultChannelRoleSid { get; private set; }
-        /// <summary>
-        /// The channel role assigned to a channel creator when they join a new channel
-        /// </summary>
-        [JsonProperty("default_channel_creator_role_sid")]
-        public string DefaultChannelCreatorRoleSid { get; private set; }
-        /// <summary>
-        /// Whether the Message Consumption Horizon feature is enabled
-        /// </summary>
-        [JsonProperty("read_status_enabled")]
-        public bool? ReadStatusEnabled { get; private set; }
-        /// <summary>
-        /// Whether the Reachability Indicator feature is enabled for this Service instance
-        /// </summary>
-        [JsonProperty("reachability_enabled")]
-        public bool? ReachabilityEnabled { get; private set; }
-        /// <summary>
-        /// How long in seconds to wait before assuming the user is no longer typing
-        /// </summary>
-        [JsonProperty("typing_indicator_timeout")]
-        public int? TypingIndicatorTimeout { get; private set; }
-        /// <summary>
-        /// DEPRECATED
-        /// </summary>
-        [JsonProperty("consumption_report_interval")]
-        public int? ConsumptionReportInterval { get; private set; }
-        /// <summary>
-        /// An object that describes the limits of the service instance
-        /// </summary>
-        [JsonProperty("limits")]
-        public object Limits { get; private set; }
-        /// <summary>
-        /// The webhook URL for pre-event webhooks
-        /// </summary>
-        [JsonProperty("pre_webhook_url")]
-        public string PreWebhookUrl { get; private set; }
-        /// <summary>
-        /// The URL for post-event webhooks
-        /// </summary>
-        [JsonProperty("post_webhook_url")]
-        public string PostWebhookUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method  to use for both PRE and POST webhooks
-        /// </summary>
-        [JsonProperty("webhook_method")]
-        public string WebhookMethod { get; private set; }
-        /// <summary>
-        /// The list of webhook events that are enabled for this Service instance
-        /// </summary>
-        [JsonProperty("webhook_filters")]
-        public List<string> WebhookFilters { get; private set; }
-        /// <summary>
-        /// Count of times webhook will be retried in case of timeout or 429/503/504 HTTP responses
-        /// </summary>
-        [JsonProperty("pre_webhook_retry_count")]
-        public int? PreWebhookRetryCount { get; private set; }
-        /// <summary>
-        /// The number of times calls to the `post_webhook_url` will be retried
-        /// </summary>
-        [JsonProperty("post_webhook_retry_count")]
-        public int? PostWebhookRetryCount { get; private set; }
-        /// <summary>
-        /// The notification configuration for the Service instance
-        /// </summary>
-        [JsonProperty("notifications")]
-        public object Notifications { get; private set; }
-        /// <summary>
-        /// The properties of the media that the service supports
-        /// </summary>
-        [JsonProperty("media")]
-        public object Media { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Service resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The absolute URLs of the Service's Channels, Roles, and Users
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ServiceResource()
-        {
-
-        }
-    }
+{
+
+  public class ServiceResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(string friendlyName, ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Chat,
+          "/v2/Services",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Chat)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Chat,
+          "/v2/Services/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="defaultServiceRoleSid"> The service role assigned to users when they are added to the service </param>
+    /// <param name="defaultChannelRoleSid"> The channel role assigned to users when they are added to a channel </param>
+    /// <param name="defaultChannelCreatorRoleSid"> The channel role assigned to a channel creator when they join a new
+    ///                                    channel </param>
+    /// <param name="readStatusEnabled"> Whether to enable the Message Consumption Horizon feature </param>
+    /// <param name="reachabilityEnabled"> Whether to enable the Reachability Indicator feature for this Service instance
+    ///                           </param>
+    /// <param name="typingIndicatorTimeout"> How long in seconds to wait before assuming the user is no longer typing
+    ///                              </param>
+    /// <param name="consumptionReportInterval"> DEPRECATED </param>
+    /// <param name="notificationsNewMessageEnabled"> Whether to send a notification when a new message is added to a
+    ///                                      channel </param>
+    /// <param name="notificationsNewMessageTemplate"> The template to use to create the notification text displayed when a
+    ///                                       new message is added to a channel </param>
+    /// <param name="notificationsNewMessageSound"> The name of the sound to play when a new message is added to a channel
+    ///                                    </param>
+    /// <param name="notificationsNewMessageBadgeCountEnabled"> Whether the new message badge is enabled </param>
+    /// <param name="notificationsAddedToChannelEnabled"> Whether to send a notification when a member is added to a
+    ///                                          channel </param>
+    /// <param name="notificationsAddedToChannelTemplate"> The template to use to create the notification text displayed
+    ///                                           when a member is added to a channel </param>
+    /// <param name="notificationsAddedToChannelSound"> The name of the sound to play when a member is added to a channel
+    ///                                        </param>
+    /// <param name="notificationsRemovedFromChannelEnabled"> Whether to send a notification to a user when they are
+    ///                                              removed from a channel </param>
+    /// <param name="notificationsRemovedFromChannelTemplate"> The template to use to create the notification text
+    ///                                               displayed to a user when they are removed </param>
+    /// <param name="notificationsRemovedFromChannelSound"> The name of the sound to play to a user when they are removed
+    ///                                            from a channel </param>
+    /// <param name="notificationsInvitedToChannelEnabled"> Whether to send a notification when a user is invited to a
+    ///                                            channel </param>
+    /// <param name="notificationsInvitedToChannelTemplate"> The template to use to create the notification text displayed
+    ///                                             when a user is invited to a channel </param>
+    /// <param name="notificationsInvitedToChannelSound"> The name of the sound to play when a user is invited to a channel
+    ///                                          </param>
+    /// <param name="preWebhookUrl"> The webhook URL for pre-event webhooks </param>
+    /// <param name="postWebhookUrl"> The URL for post-event webhooks </param>
+    /// <param name="webhookMethod"> The HTTP method  to use for both PRE and POST webhooks </param>
+    /// <param name="webhookFilters"> The list of webhook events that are enabled for this Service instance </param>
+    /// <param name="limitsChannelMembers"> The maximum number of Members that can be added to Channels within this Service
+    ///                            </param>
+    /// <param name="limitsUserChannels"> The maximum number of Channels Users can be a Member of within this Service
+    ///                          </param>
+    /// <param name="mediaCompatibilityMessage"> The message to send when a media message has no text </param>
+    /// <param name="preWebhookRetryCount"> Count of times webhook will be retried in case of timeout or 429/503/504 HTTP
+    ///                            responses </param>
+    /// <param name="postWebhookRetryCount"> The number of times calls to the `post_webhook_url` will be retried </param>
+    /// <param name="notificationsLogEnabled"> Whether to log notifications </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(string pathSid,
+                                         string friendlyName = null,
+                                         string defaultServiceRoleSid = null,
+                                         string defaultChannelRoleSid = null,
+                                         string defaultChannelCreatorRoleSid = null,
+                                         bool? readStatusEnabled = null,
+                                         bool? reachabilityEnabled = null,
+                                         int? typingIndicatorTimeout = null,
+                                         int? consumptionReportInterval = null,
+                                         bool? notificationsNewMessageEnabled = null,
+                                         string notificationsNewMessageTemplate = null,
+                                         string notificationsNewMessageSound = null,
+                                         bool? notificationsNewMessageBadgeCountEnabled = null,
+                                         bool? notificationsAddedToChannelEnabled = null,
+                                         string notificationsAddedToChannelTemplate = null,
+                                         string notificationsAddedToChannelSound = null,
+                                         bool? notificationsRemovedFromChannelEnabled = null,
+                                         string notificationsRemovedFromChannelTemplate = null,
+                                         string notificationsRemovedFromChannelSound = null,
+                                         bool? notificationsInvitedToChannelEnabled = null,
+                                         string notificationsInvitedToChannelTemplate = null,
+                                         string notificationsInvitedToChannelSound = null,
+                                         Uri preWebhookUrl = null,
+                                         Uri postWebhookUrl = null,
+                                         Twilio.Http.HttpMethod webhookMethod = null,
+                                         List<string> webhookFilters = null,
+                                         int? limitsChannelMembers = null,
+                                         int? limitsUserChannels = null,
+                                         string mediaCompatibilityMessage = null,
+                                         int? preWebhookRetryCount = null,
+                                         int? postWebhookRetryCount = null,
+                                         bool? notificationsLogEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsNewMessageSound = notificationsNewMessageSound, NotificationsNewMessageBadgeCountEnabled = notificationsNewMessageBadgeCountEnabled, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsAddedToChannelSound = notificationsAddedToChannelSound, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsRemovedFromChannelSound = notificationsRemovedFromChannelSound, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, NotificationsInvitedToChannelSound = notificationsInvitedToChannelSound, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels, MediaCompatibilityMessage = mediaCompatibilityMessage, PreWebhookRetryCount = preWebhookRetryCount, PostWebhookRetryCount = postWebhookRetryCount, NotificationsLogEnabled = notificationsLogEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="defaultServiceRoleSid"> The service role assigned to users when they are added to the service </param>
+    /// <param name="defaultChannelRoleSid"> The channel role assigned to users when they are added to a channel </param>
+    /// <param name="defaultChannelCreatorRoleSid"> The channel role assigned to a channel creator when they join a new
+    ///                                    channel </param>
+    /// <param name="readStatusEnabled"> Whether to enable the Message Consumption Horizon feature </param>
+    /// <param name="reachabilityEnabled"> Whether to enable the Reachability Indicator feature for this Service instance
+    ///                           </param>
+    /// <param name="typingIndicatorTimeout"> How long in seconds to wait before assuming the user is no longer typing
+    ///                              </param>
+    /// <param name="consumptionReportInterval"> DEPRECATED </param>
+    /// <param name="notificationsNewMessageEnabled"> Whether to send a notification when a new message is added to a
+    ///                                      channel </param>
+    /// <param name="notificationsNewMessageTemplate"> The template to use to create the notification text displayed when a
+    ///                                       new message is added to a channel </param>
+    /// <param name="notificationsNewMessageSound"> The name of the sound to play when a new message is added to a channel
+    ///                                    </param>
+    /// <param name="notificationsNewMessageBadgeCountEnabled"> Whether the new message badge is enabled </param>
+    /// <param name="notificationsAddedToChannelEnabled"> Whether to send a notification when a member is added to a
+    ///                                          channel </param>
+    /// <param name="notificationsAddedToChannelTemplate"> The template to use to create the notification text displayed
+    ///                                           when a member is added to a channel </param>
+    /// <param name="notificationsAddedToChannelSound"> The name of the sound to play when a member is added to a channel
+    ///                                        </param>
+    /// <param name="notificationsRemovedFromChannelEnabled"> Whether to send a notification to a user when they are
+    ///                                              removed from a channel </param>
+    /// <param name="notificationsRemovedFromChannelTemplate"> The template to use to create the notification text
+    ///                                               displayed to a user when they are removed </param>
+    /// <param name="notificationsRemovedFromChannelSound"> The name of the sound to play to a user when they are removed
+    ///                                            from a channel </param>
+    /// <param name="notificationsInvitedToChannelEnabled"> Whether to send a notification when a user is invited to a
+    ///                                            channel </param>
+    /// <param name="notificationsInvitedToChannelTemplate"> The template to use to create the notification text displayed
+    ///                                             when a user is invited to a channel </param>
+    /// <param name="notificationsInvitedToChannelSound"> The name of the sound to play when a user is invited to a channel
+    ///                                          </param>
+    /// <param name="preWebhookUrl"> The webhook URL for pre-event webhooks </param>
+    /// <param name="postWebhookUrl"> The URL for post-event webhooks </param>
+    /// <param name="webhookMethod"> The HTTP method  to use for both PRE and POST webhooks </param>
+    /// <param name="webhookFilters"> The list of webhook events that are enabled for this Service instance </param>
+    /// <param name="limitsChannelMembers"> The maximum number of Members that can be added to Channels within this Service
+    ///                            </param>
+    /// <param name="limitsUserChannels"> The maximum number of Channels Users can be a Member of within this Service
+    ///                          </param>
+    /// <param name="mediaCompatibilityMessage"> The message to send when a media message has no text </param>
+    /// <param name="preWebhookRetryCount"> Count of times webhook will be retried in case of timeout or 429/503/504 HTTP
+    ///                            responses </param>
+    /// <param name="postWebhookRetryCount"> The number of times calls to the `post_webhook_url` will be retried </param>
+    /// <param name="notificationsLogEnabled"> Whether to log notifications </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 string defaultServiceRoleSid = null,
+                                                                                 string defaultChannelRoleSid = null,
+                                                                                 string defaultChannelCreatorRoleSid = null,
+                                                                                 bool? readStatusEnabled = null,
+                                                                                 bool? reachabilityEnabled = null,
+                                                                                 int? typingIndicatorTimeout = null,
+                                                                                 int? consumptionReportInterval = null,
+                                                                                 bool? notificationsNewMessageEnabled = null,
+                                                                                 string notificationsNewMessageTemplate = null,
+                                                                                 string notificationsNewMessageSound = null,
+                                                                                 bool? notificationsNewMessageBadgeCountEnabled = null,
+                                                                                 bool? notificationsAddedToChannelEnabled = null,
+                                                                                 string notificationsAddedToChannelTemplate = null,
+                                                                                 string notificationsAddedToChannelSound = null,
+                                                                                 bool? notificationsRemovedFromChannelEnabled = null,
+                                                                                 string notificationsRemovedFromChannelTemplate = null,
+                                                                                 string notificationsRemovedFromChannelSound = null,
+                                                                                 bool? notificationsInvitedToChannelEnabled = null,
+                                                                                 string notificationsInvitedToChannelTemplate = null,
+                                                                                 string notificationsInvitedToChannelSound = null,
+                                                                                 Uri preWebhookUrl = null,
+                                                                                 Uri postWebhookUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhookMethod = null,
+                                                                                 List<string> webhookFilters = null,
+                                                                                 int? limitsChannelMembers = null,
+                                                                                 int? limitsUserChannels = null,
+                                                                                 string mediaCompatibilityMessage = null,
+                                                                                 int? preWebhookRetryCount = null,
+                                                                                 int? postWebhookRetryCount = null,
+                                                                                 bool? notificationsLogEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsNewMessageSound = notificationsNewMessageSound, NotificationsNewMessageBadgeCountEnabled = notificationsNewMessageBadgeCountEnabled, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsAddedToChannelSound = notificationsAddedToChannelSound, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsRemovedFromChannelSound = notificationsRemovedFromChannelSound, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, NotificationsInvitedToChannelSound = notificationsInvitedToChannelSound, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels, MediaCompatibilityMessage = mediaCompatibilityMessage, PreWebhookRetryCount = preWebhookRetryCount, PostWebhookRetryCount = postWebhookRetryCount, NotificationsLogEnabled = notificationsLogEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ServiceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ServiceResource object represented by the provided JSON </returns>
+    public static ServiceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ServiceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The service role assigned to users when they are added to the service
+    /// </summary>
+    [JsonProperty("default_service_role_sid")]
+    public string DefaultServiceRoleSid { get; private set; }
+    /// <summary>
+    /// The channel role assigned to users when they are added to a channel
+    /// </summary>
+    [JsonProperty("default_channel_role_sid")]
+    public string DefaultChannelRoleSid { get; private set; }
+    /// <summary>
+    /// The channel role assigned to a channel creator when they join a new channel
+    /// </summary>
+    [JsonProperty("default_channel_creator_role_sid")]
+    public string DefaultChannelCreatorRoleSid { get; private set; }
+    /// <summary>
+    /// Whether the Message Consumption Horizon feature is enabled
+    /// </summary>
+    [JsonProperty("read_status_enabled")]
+    public bool? ReadStatusEnabled { get; private set; }
+    /// <summary>
+    /// Whether the Reachability Indicator feature is enabled for this Service instance
+    /// </summary>
+    [JsonProperty("reachability_enabled")]
+    public bool? ReachabilityEnabled { get; private set; }
+    /// <summary>
+    /// How long in seconds to wait before assuming the user is no longer typing
+    /// </summary>
+    [JsonProperty("typing_indicator_timeout")]
+    public int? TypingIndicatorTimeout { get; private set; }
+    /// <summary>
+    /// DEPRECATED
+    /// </summary>
+    [JsonProperty("consumption_report_interval")]
+    public int? ConsumptionReportInterval { get; private set; }
+    /// <summary>
+    /// An object that describes the limits of the service instance
+    /// </summary>
+    [JsonProperty("limits")]
+    public object Limits { get; private set; }
+    /// <summary>
+    /// The webhook URL for pre-event webhooks
+    /// </summary>
+    [JsonProperty("pre_webhook_url")]
+    public string PreWebhookUrl { get; private set; }
+    /// <summary>
+    /// The URL for post-event webhooks
+    /// </summary>
+    [JsonProperty("post_webhook_url")]
+    public string PostWebhookUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method  to use for both PRE and POST webhooks
+    /// </summary>
+    [JsonProperty("webhook_method")]
+    public string WebhookMethod { get; private set; }
+    /// <summary>
+    /// The list of webhook events that are enabled for this Service instance
+    /// </summary>
+    [JsonProperty("webhook_filters")]
+    public List<string> WebhookFilters { get; private set; }
+    /// <summary>
+    /// Count of times webhook will be retried in case of timeout or 429/503/504 HTTP responses
+    /// </summary>
+    [JsonProperty("pre_webhook_retry_count")]
+    public int? PreWebhookRetryCount { get; private set; }
+    /// <summary>
+    /// The number of times calls to the `post_webhook_url` will be retried
+    /// </summary>
+    [JsonProperty("post_webhook_retry_count")]
+    public int? PostWebhookRetryCount { get; private set; }
+    /// <summary>
+    /// The notification configuration for the Service instance
+    /// </summary>
+    [JsonProperty("notifications")]
+    public object Notifications { get; private set; }
+    /// <summary>
+    /// The properties of the media that the service supports
+    /// </summary>
+    [JsonProperty("media")]
+    public object Media { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Service resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The absolute URLs of the Service's Channels, Roles, and Users
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ServiceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Configuration/WebhookOptions.cs b/src/Twilio/Rest/Conversations/V1/Configuration/WebhookOptions.cs
index be392b42a..dbcb4fdb0 100644
--- a/src/Twilio/Rest/Conversations/V1/Configuration/WebhookOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Configuration/WebhookOptions.cs
@@ -10,90 +10,90 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Configuration
-{
-
+{
+
+  /// <summary>
+  /// FetchWebhookOptions
+  /// </summary>
+  public class FetchWebhookOptions : IOptions<WebhookResource>
+  {
     /// <summary>
-    /// FetchWebhookOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateWebhookOptions
+  /// </summary>
+  public class UpdateWebhookOptions : IOptions<WebhookResource>
+  {
     /// <summary>
-    /// UpdateWebhookOptions
+    /// The HTTP method to be used when sending a webhook request.
     /// </summary>
-    public class UpdateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The HTTP method to be used when sending a webhook request.
-        /// </summary>
-        public string Method { get; set; }
-        /// <summary>
-        /// The list of webhook event triggers that are enabled for this Service.
-        /// </summary>
-        public List<string> Filters { get; set; }
-        /// <summary>
-        /// The absolute url the pre-event webhook request should be sent to.
-        /// </summary>
-        public string PreWebhookUrl { get; set; }
-        /// <summary>
-        /// The absolute url the post-event webhook request should be sent to.
-        /// </summary>
-        public string PostWebhookUrl { get; set; }
-        /// <summary>
-        /// The routing target of the webhook.
-        /// </summary>
-        public WebhookResource.TargetEnum Target { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateWebhookOptions
-        /// </summary>
-        public UpdateWebhookOptions()
-        {
-            Filters = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Method != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Method", Method));
-            }
-
-            if (Filters != null)
-            {
-                p.AddRange(Filters.Select(prop => new KeyValuePair<string, string>("Filters", prop)));
-            }
-
-            if (PreWebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PreWebhookUrl", PreWebhookUrl));
-            }
-
-            if (PostWebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostWebhookUrl", PostWebhookUrl));
-            }
-
-            if (Target != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Target", Target.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string Method { get; set; }
+    /// <summary>
+    /// The list of webhook event triggers that are enabled for this Service.
+    /// </summary>
+    public List<string> Filters { get; set; }
+    /// <summary>
+    /// The absolute url the pre-event webhook request should be sent to.
+    /// </summary>
+    public string PreWebhookUrl { get; set; }
+    /// <summary>
+    /// The absolute url the post-event webhook request should be sent to.
+    /// </summary>
+    public string PostWebhookUrl { get; set; }
+    /// <summary>
+    /// The routing target of the webhook.
+    /// </summary>
+    public WebhookResource.TargetEnum Target { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateWebhookOptions
+    /// </summary>
+    public UpdateWebhookOptions()
+    {
+      Filters = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Method != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Method", Method));
+      }
+
+      if (Filters != null)
+      {
+        p.AddRange(Filters.Select(prop => new KeyValuePair<string, string>("Filters", prop)));
+      }
+
+      if (PreWebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PreWebhookUrl", PreWebhookUrl));
+      }
+
+      if (PostWebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostWebhookUrl", PostWebhookUrl));
+      }
+
+      if (Target != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Target", Target.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Configuration/WebhookResource.cs b/src/Twilio/Rest/Conversations/V1/Configuration/WebhookResource.cs
index 7b67ab89e..a46742c7b 100644
--- a/src/Twilio/Rest/Conversations/V1/Configuration/WebhookResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Configuration/WebhookResource.cs
@@ -17,244 +17,244 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Configuration
-{
-
-    public class WebhookResource : Resource
-    {
-        public sealed class TargetEnum : StringEnum
-        {
-            private TargetEnum(string value) : base(value) {}
-            public TargetEnum() {}
-            public static implicit operator TargetEnum(string value)
-            {
-                return new TargetEnum(value);
-            }
-
-            public static readonly TargetEnum Webhook = new TargetEnum("webhook");
-            public static readonly TargetEnum Flex = new TargetEnum("flex");
-        }
-
-        public sealed class MethodEnum : StringEnum
-        {
-            private MethodEnum(string value) : base(value) {}
-            public MethodEnum() {}
-            public static implicit operator MethodEnum(string value)
-            {
-                return new MethodEnum(value);
-            }
-
-            public static readonly MethodEnum Get = new MethodEnum("GET");
-            public static readonly MethodEnum Post = new MethodEnum("POST");
-        }
-
-        private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Configuration/Webhooks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions();
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions();
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Configuration/Webhooks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="method"> The HTTP method to be used when sending a webhook request. </param>
-        /// <param name="filters"> The list of webhook event triggers that are enabled for this Service. </param>
-        /// <param name="preWebhookUrl"> The absolute url the pre-event webhook request should be sent to. </param>
-        /// <param name="postWebhookUrl"> The absolute url the post-event webhook request should be sent to. </param>
-        /// <param name="target"> The routing target of the webhook. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(string method = null,
-                                             List<string> filters = null,
-                                             string preWebhookUrl = null,
-                                             string postWebhookUrl = null,
-                                             WebhookResource.TargetEnum target = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(){Method = method, Filters = filters, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, Target = target};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="method"> The HTTP method to be used when sending a webhook request. </param>
-        /// <param name="filters"> The list of webhook event triggers that are enabled for this Service. </param>
-        /// <param name="preWebhookUrl"> The absolute url the pre-event webhook request should be sent to. </param>
-        /// <param name="postWebhookUrl"> The absolute url the post-event webhook request should be sent to. </param>
-        /// <param name="target"> The routing target of the webhook. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string method = null,
-                                                                                     List<string> filters = null,
-                                                                                     string preWebhookUrl = null,
-                                                                                     string postWebhookUrl = null,
-                                                                                     WebhookResource.TargetEnum target = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(){Method = method, Filters = filters, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, Target = target};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WebhookResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WebhookResource object represented by the provided JSON </returns>
-        public static WebhookResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WebhookResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this conversation.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The HTTP method to be used when sending a webhook request.
-        /// </summary>
-        [JsonProperty("method")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public WebhookResource.MethodEnum Method { get; private set; }
-        /// <summary>
-        /// The list of webhook event triggers that are enabled for this Service.
-        /// </summary>
-        [JsonProperty("filters")]
-        public List<string> Filters { get; private set; }
-        /// <summary>
-        /// The absolute url the pre-event webhook request should be sent to.
-        /// </summary>
-        [JsonProperty("pre_webhook_url")]
-        public string PreWebhookUrl { get; private set; }
-        /// <summary>
-        /// The absolute url the post-event webhook request should be sent to.
-        /// </summary>
-        [JsonProperty("post_webhook_url")]
-        public string PostWebhookUrl { get; private set; }
-        /// <summary>
-        /// The routing target of the webhook.
-        /// </summary>
-        [JsonProperty("target")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public WebhookResource.TargetEnum Target { get; private set; }
-        /// <summary>
-        /// An absolute URL for this webhook.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WebhookResource()
-        {
-
-        }
-    }
+{
+
+  public class WebhookResource : Resource
+  {
+    public sealed class TargetEnum : StringEnum
+    {
+      private TargetEnum(string value) : base(value) { }
+      public TargetEnum() { }
+      public static implicit operator TargetEnum(string value)
+      {
+        return new TargetEnum(value);
+      }
+
+      public static readonly TargetEnum Webhook = new TargetEnum("webhook");
+      public static readonly TargetEnum Flex = new TargetEnum("flex");
+    }
+
+    public sealed class MethodEnum : StringEnum
+    {
+      private MethodEnum(string value) : base(value) { }
+      public MethodEnum() { }
+      public static implicit operator MethodEnum(string value)
+      {
+        return new MethodEnum(value);
+      }
+
+      public static readonly MethodEnum Get = new MethodEnum("GET");
+      public static readonly MethodEnum Post = new MethodEnum("POST");
+    }
+
+    private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Configuration/Webhooks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions();
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions();
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Configuration/Webhooks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="method"> The HTTP method to be used when sending a webhook request. </param>
+    /// <param name="filters"> The list of webhook event triggers that are enabled for this Service. </param>
+    /// <param name="preWebhookUrl"> The absolute url the pre-event webhook request should be sent to. </param>
+    /// <param name="postWebhookUrl"> The absolute url the post-event webhook request should be sent to. </param>
+    /// <param name="target"> The routing target of the webhook. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(string method = null,
+                                         List<string> filters = null,
+                                         string preWebhookUrl = null,
+                                         string postWebhookUrl = null,
+                                         WebhookResource.TargetEnum target = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions() { Method = method, Filters = filters, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, Target = target };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="method"> The HTTP method to be used when sending a webhook request. </param>
+    /// <param name="filters"> The list of webhook event triggers that are enabled for this Service. </param>
+    /// <param name="preWebhookUrl"> The absolute url the pre-event webhook request should be sent to. </param>
+    /// <param name="postWebhookUrl"> The absolute url the post-event webhook request should be sent to. </param>
+    /// <param name="target"> The routing target of the webhook. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string method = null,
+                                                                                 List<string> filters = null,
+                                                                                 string preWebhookUrl = null,
+                                                                                 string postWebhookUrl = null,
+                                                                                 WebhookResource.TargetEnum target = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions() { Method = method, Filters = filters, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, Target = target };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WebhookResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WebhookResource object represented by the provided JSON </returns>
+    public static WebhookResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WebhookResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this conversation.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The HTTP method to be used when sending a webhook request.
+    /// </summary>
+    [JsonProperty("method")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public WebhookResource.MethodEnum Method { get; private set; }
+    /// <summary>
+    /// The list of webhook event triggers that are enabled for this Service.
+    /// </summary>
+    [JsonProperty("filters")]
+    public List<string> Filters { get; private set; }
+    /// <summary>
+    /// The absolute url the pre-event webhook request should be sent to.
+    /// </summary>
+    [JsonProperty("pre_webhook_url")]
+    public string PreWebhookUrl { get; private set; }
+    /// <summary>
+    /// The absolute url the post-event webhook request should be sent to.
+    /// </summary>
+    [JsonProperty("post_webhook_url")]
+    public string PostWebhookUrl { get; private set; }
+    /// <summary>
+    /// The routing target of the webhook.
+    /// </summary>
+    [JsonProperty("target")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public WebhookResource.TargetEnum Target { get; private set; }
+    /// <summary>
+    /// An absolute URL for this webhook.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WebhookResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/ConfigurationOptions.cs b/src/Twilio/Rest/Conversations/V1/ConfigurationOptions.cs
index 6e353fbec..435ed6d70 100644
--- a/src/Twilio/Rest/Conversations/V1/ConfigurationOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/ConfigurationOptions.cs
@@ -9,73 +9,73 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
+{
+
+  /// <summary>
+  /// Fetch the global configuration of conversations on your account
+  /// </summary>
+  public class FetchConfigurationOptions : IOptions<ConfigurationResource>
+  {
     /// <summary>
-    /// Fetch the global configuration of conversations on your account
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchConfigurationOptions : IOptions<ConfigurationResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update the global configuration of conversations on your account
+  /// </summary>
+  public class UpdateConfigurationOptions : IOptions<ConfigurationResource>
+  {
     /// <summary>
-    /// Update the global configuration of conversations on your account
+    /// The SID of the default Conversation Service that every new conversation will be associated with.
     /// </summary>
-    public class UpdateConfigurationOptions : IOptions<ConfigurationResource>
-    {
-        /// <summary>
-        /// The SID of the default Conversation Service that every new conversation will be associated with.
-        /// </summary>
-        public string DefaultChatServiceSid { get; set; }
-        /// <summary>
-        /// The SID of the default Messaging Service that every new conversation will be associated with.
-        /// </summary>
-        public string DefaultMessagingServiceSid { get; set; }
-        /// <summary>
-        /// Default ISO8601 duration when conversation will be switched to `inactive` state.
-        /// </summary>
-        public string DefaultInactiveTimer { get; set; }
-        /// <summary>
-        /// Default ISO8601 duration when conversation will be switched to `closed` state.
-        /// </summary>
-        public string DefaultClosedTimer { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DefaultChatServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultChatServiceSid", DefaultChatServiceSid.ToString()));
-            }
-
-            if (DefaultMessagingServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultMessagingServiceSid", DefaultMessagingServiceSid.ToString()));
-            }
-
-            if (DefaultInactiveTimer != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultInactiveTimer", DefaultInactiveTimer));
-            }
-
-            if (DefaultClosedTimer != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultClosedTimer", DefaultClosedTimer));
-            }
-
-            return p;
-        }
-    }
+    public string DefaultChatServiceSid { get; set; }
+    /// <summary>
+    /// The SID of the default Messaging Service that every new conversation will be associated with.
+    /// </summary>
+    public string DefaultMessagingServiceSid { get; set; }
+    /// <summary>
+    /// Default ISO8601 duration when conversation will be switched to `inactive` state.
+    /// </summary>
+    public string DefaultInactiveTimer { get; set; }
+    /// <summary>
+    /// Default ISO8601 duration when conversation will be switched to `closed` state.
+    /// </summary>
+    public string DefaultClosedTimer { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DefaultChatServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultChatServiceSid", DefaultChatServiceSid.ToString()));
+      }
+
+      if (DefaultMessagingServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultMessagingServiceSid", DefaultMessagingServiceSid.ToString()));
+      }
+
+      if (DefaultInactiveTimer != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultInactiveTimer", DefaultInactiveTimer));
+      }
+
+      if (DefaultClosedTimer != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultClosedTimer", DefaultClosedTimer));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/ConfigurationResource.cs b/src/Twilio/Rest/Conversations/V1/ConfigurationResource.cs
index 008d3671b..6bcc9b92f 100644
--- a/src/Twilio/Rest/Conversations/V1/ConfigurationResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/ConfigurationResource.cs
@@ -16,220 +16,220 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
-    public class ConfigurationResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Configuration",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the global configuration of conversations on your account
-        /// </summary>
-        /// <param name="options"> Fetch Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Fetch(FetchConfigurationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the global configuration of conversations on your account
-        /// </summary>
-        /// <param name="options"> Fetch Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> FetchAsync(FetchConfigurationOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the global configuration of conversations on your account
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Fetch(ITwilioRestClient client = null)
-        {
-            var options = new FetchConfigurationOptions();
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the global configuration of conversations on your account
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> FetchAsync(ITwilioRestClient client = null)
-        {
-            var options = new FetchConfigurationOptions();
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Configuration",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update the global configuration of conversations on your account
-        /// </summary>
-        /// <param name="options"> Update Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Update(UpdateConfigurationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the global configuration of conversations on your account
-        /// </summary>
-        /// <param name="options"> Update Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> UpdateAsync(UpdateConfigurationOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update the global configuration of conversations on your account
-        /// </summary>
-        /// <param name="defaultChatServiceSid"> The SID of the default Conversation Service that every new conversation will
-        ///                             be associated with. </param>
-        /// <param name="defaultMessagingServiceSid"> The SID of the default Messaging Service that every new conversation will
-        ///                                  be associated with. </param>
-        /// <param name="defaultInactiveTimer"> Default ISO8601 duration when conversation will be switched to `inactive`
-        ///                            state. </param>
-        /// <param name="defaultClosedTimer"> Default ISO8601 duration when conversation will be switched to `closed` state.
-        ///                          </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Update(string defaultChatServiceSid = null,
-                                                   string defaultMessagingServiceSid = null,
-                                                   string defaultInactiveTimer = null,
-                                                   string defaultClosedTimer = null,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new UpdateConfigurationOptions(){DefaultChatServiceSid = defaultChatServiceSid, DefaultMessagingServiceSid = defaultMessagingServiceSid, DefaultInactiveTimer = defaultInactiveTimer, DefaultClosedTimer = defaultClosedTimer};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the global configuration of conversations on your account
-        /// </summary>
-        /// <param name="defaultChatServiceSid"> The SID of the default Conversation Service that every new conversation will
-        ///                             be associated with. </param>
-        /// <param name="defaultMessagingServiceSid"> The SID of the default Messaging Service that every new conversation will
-        ///                                  be associated with. </param>
-        /// <param name="defaultInactiveTimer"> Default ISO8601 duration when conversation will be switched to `inactive`
-        ///                            state. </param>
-        /// <param name="defaultClosedTimer"> Default ISO8601 duration when conversation will be switched to `closed` state.
-        ///                          </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> UpdateAsync(string defaultChatServiceSid = null,
-                                                                                           string defaultMessagingServiceSid = null,
-                                                                                           string defaultInactiveTimer = null,
-                                                                                           string defaultClosedTimer = null,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new UpdateConfigurationOptions(){DefaultChatServiceSid = defaultChatServiceSid, DefaultMessagingServiceSid = defaultMessagingServiceSid, DefaultInactiveTimer = defaultInactiveTimer, DefaultClosedTimer = defaultClosedTimer};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ConfigurationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ConfigurationResource object represented by the provided JSON </returns>
-        public static ConfigurationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ConfigurationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account responsible for this configuration.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the default Conversation Service that every new conversation is associated with.
-        /// </summary>
-        [JsonProperty("default_chat_service_sid")]
-        public string DefaultChatServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the default Messaging Service that every new conversation is associated with.
-        /// </summary>
-        [JsonProperty("default_messaging_service_sid")]
-        public string DefaultMessagingServiceSid { get; private set; }
-        /// <summary>
-        /// Default ISO8601 duration when conversation will be switched to `inactive` state.
-        /// </summary>
-        [JsonProperty("default_inactive_timer")]
-        public string DefaultInactiveTimer { get; private set; }
-        /// <summary>
-        /// Default ISO8601 duration when conversation will be switched to `closed` state.
-        /// </summary>
-        [JsonProperty("default_closed_timer")]
-        public string DefaultClosedTimer { get; private set; }
-        /// <summary>
-        /// An absolute URL for this global configuration.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Absolute URLs to access the webhook and default service configurations.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ConfigurationResource()
-        {
-
-        }
-    }
+{
+
+  public class ConfigurationResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Configuration",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the global configuration of conversations on your account
+    /// </summary>
+    /// <param name="options"> Fetch Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Fetch(FetchConfigurationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the global configuration of conversations on your account
+    /// </summary>
+    /// <param name="options"> Fetch Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> FetchAsync(FetchConfigurationOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the global configuration of conversations on your account
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Fetch(ITwilioRestClient client = null)
+    {
+      var options = new FetchConfigurationOptions();
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the global configuration of conversations on your account
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> FetchAsync(ITwilioRestClient client = null)
+    {
+      var options = new FetchConfigurationOptions();
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Configuration",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update the global configuration of conversations on your account
+    /// </summary>
+    /// <param name="options"> Update Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Update(UpdateConfigurationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the global configuration of conversations on your account
+    /// </summary>
+    /// <param name="options"> Update Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> UpdateAsync(UpdateConfigurationOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update the global configuration of conversations on your account
+    /// </summary>
+    /// <param name="defaultChatServiceSid"> The SID of the default Conversation Service that every new conversation will
+    ///                             be associated with. </param>
+    /// <param name="defaultMessagingServiceSid"> The SID of the default Messaging Service that every new conversation will
+    ///                                  be associated with. </param>
+    /// <param name="defaultInactiveTimer"> Default ISO8601 duration when conversation will be switched to `inactive`
+    ///                            state. </param>
+    /// <param name="defaultClosedTimer"> Default ISO8601 duration when conversation will be switched to `closed` state.
+    ///                          </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Update(string defaultChatServiceSid = null,
+                                               string defaultMessagingServiceSid = null,
+                                               string defaultInactiveTimer = null,
+                                               string defaultClosedTimer = null,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new UpdateConfigurationOptions() { DefaultChatServiceSid = defaultChatServiceSid, DefaultMessagingServiceSid = defaultMessagingServiceSid, DefaultInactiveTimer = defaultInactiveTimer, DefaultClosedTimer = defaultClosedTimer };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the global configuration of conversations on your account
+    /// </summary>
+    /// <param name="defaultChatServiceSid"> The SID of the default Conversation Service that every new conversation will
+    ///                             be associated with. </param>
+    /// <param name="defaultMessagingServiceSid"> The SID of the default Messaging Service that every new conversation will
+    ///                                  be associated with. </param>
+    /// <param name="defaultInactiveTimer"> Default ISO8601 duration when conversation will be switched to `inactive`
+    ///                            state. </param>
+    /// <param name="defaultClosedTimer"> Default ISO8601 duration when conversation will be switched to `closed` state.
+    ///                          </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> UpdateAsync(string defaultChatServiceSid = null,
+                                                                                       string defaultMessagingServiceSid = null,
+                                                                                       string defaultInactiveTimer = null,
+                                                                                       string defaultClosedTimer = null,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new UpdateConfigurationOptions() { DefaultChatServiceSid = defaultChatServiceSid, DefaultMessagingServiceSid = defaultMessagingServiceSid, DefaultInactiveTimer = defaultInactiveTimer, DefaultClosedTimer = defaultClosedTimer };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ConfigurationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ConfigurationResource object represented by the provided JSON </returns>
+    public static ConfigurationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ConfigurationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account responsible for this configuration.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the default Conversation Service that every new conversation is associated with.
+    /// </summary>
+    [JsonProperty("default_chat_service_sid")]
+    public string DefaultChatServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the default Messaging Service that every new conversation is associated with.
+    /// </summary>
+    [JsonProperty("default_messaging_service_sid")]
+    public string DefaultMessagingServiceSid { get; private set; }
+    /// <summary>
+    /// Default ISO8601 duration when conversation will be switched to `inactive` state.
+    /// </summary>
+    [JsonProperty("default_inactive_timer")]
+    public string DefaultInactiveTimer { get; private set; }
+    /// <summary>
+    /// Default ISO8601 duration when conversation will be switched to `closed` state.
+    /// </summary>
+    [JsonProperty("default_closed_timer")]
+    public string DefaultClosedTimer { get; private set; }
+    /// <summary>
+    /// An absolute URL for this global configuration.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Absolute URLs to access the webhook and default service configurations.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ConfigurationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Conversation/Message/DeliveryReceiptOptions.cs b/src/Twilio/Rest/Conversations/V1/Conversation/Message/DeliveryReceiptOptions.cs
index e6222524f..5e387b9bb 100644
--- a/src/Twilio/Rest/Conversations/V1/Conversation/Message/DeliveryReceiptOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Conversation/Message/DeliveryReceiptOptions.cs
@@ -9,87 +9,87 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Conversation.Message
-{
-
+{
+
+  /// <summary>
+  /// Fetch the delivery and read receipts of the conversation message
+  /// </summary>
+  public class FetchDeliveryReceiptOptions : IOptions<DeliveryReceiptResource>
+  {
     /// <summary>
-    /// Fetch the delivery and read receipts of the conversation message
+    /// The unique ID of the Conversation for this delivery receipt.
     /// </summary>
-    public class FetchDeliveryReceiptOptions : IOptions<DeliveryReceiptResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this delivery receipt.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// The SID of the message the delivery receipt belongs to.
-        /// </summary>
-        public string PathMessageSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchDeliveryReceiptOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
-        /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchDeliveryReceiptOptions(string pathConversationSid, string pathMessageSid, string pathSid)
-        {
-            PathConversationSid = pathConversationSid;
-            PathMessageSid = pathMessageSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathConversationSid { get; }
     /// <summary>
-    /// Retrieve a list of all delivery and read receipts of the conversation message
+    /// The SID of the message the delivery receipt belongs to.
     /// </summary>
-    public class ReadDeliveryReceiptOptions : ReadOptions<DeliveryReceiptResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this delivery receipt.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// The SID of the message the delivery receipt belongs to.
-        /// </summary>
-        public string PathMessageSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadDeliveryReceiptOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
-        /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
-        public ReadDeliveryReceiptOptions(string pathConversationSid, string pathMessageSid)
-        {
-            PathConversationSid = pathConversationSid;
-            PathMessageSid = pathMessageSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathMessageSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchDeliveryReceiptOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
+    /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchDeliveryReceiptOptions(string pathConversationSid, string pathMessageSid, string pathSid)
+    {
+      PathConversationSid = pathConversationSid;
+      PathMessageSid = pathMessageSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all delivery and read receipts of the conversation message
+  /// </summary>
+  public class ReadDeliveryReceiptOptions : ReadOptions<DeliveryReceiptResource>
+  {
+    /// <summary>
+    /// The unique ID of the Conversation for this delivery receipt.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// The SID of the message the delivery receipt belongs to.
+    /// </summary>
+    public string PathMessageSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadDeliveryReceiptOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
+    /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
+    public ReadDeliveryReceiptOptions(string pathConversationSid, string pathMessageSid)
+    {
+      PathConversationSid = pathConversationSid;
+      PathMessageSid = pathMessageSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Conversation/Message/DeliveryReceiptResource.cs b/src/Twilio/Rest/Conversations/V1/Conversation/Message/DeliveryReceiptResource.cs
index f81c77a76..74040fd5f 100644
--- a/src/Twilio/Rest/Conversations/V1/Conversation/Message/DeliveryReceiptResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Conversation/Message/DeliveryReceiptResource.cs
@@ -17,320 +17,320 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Conversation.Message
-{
-
-    public class DeliveryReceiptResource : Resource
-    {
-        public sealed class DeliveryStatusEnum : StringEnum
-        {
-            private DeliveryStatusEnum(string value) : base(value) {}
-            public DeliveryStatusEnum() {}
-            public static implicit operator DeliveryStatusEnum(string value)
-            {
-                return new DeliveryStatusEnum(value);
-            }
-
-            public static readonly DeliveryStatusEnum Read = new DeliveryStatusEnum("read");
-            public static readonly DeliveryStatusEnum Failed = new DeliveryStatusEnum("failed");
-            public static readonly DeliveryStatusEnum Delivered = new DeliveryStatusEnum("delivered");
-            public static readonly DeliveryStatusEnum Undelivered = new DeliveryStatusEnum("undelivered");
-            public static readonly DeliveryStatusEnum Sent = new DeliveryStatusEnum("sent");
-        }
-
-        private static Request BuildFetchRequest(FetchDeliveryReceiptOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathMessageSid + "/Receipts/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="options"> Fetch DeliveryReceipt parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DeliveryReceipt </returns>
-        public static DeliveryReceiptResource Fetch(FetchDeliveryReceiptOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="options"> Fetch DeliveryReceipt parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
-        public static async System.Threading.Tasks.Task<DeliveryReceiptResource> FetchAsync(FetchDeliveryReceiptOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
-        /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DeliveryReceipt </returns>
-        public static DeliveryReceiptResource Fetch(string pathConversationSid,
-                                                    string pathMessageSid,
-                                                    string pathSid,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchDeliveryReceiptOptions(pathConversationSid, pathMessageSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
-        /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
-        public static async System.Threading.Tasks.Task<DeliveryReceiptResource> FetchAsync(string pathConversationSid,
-                                                                                            string pathMessageSid,
-                                                                                            string pathSid,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchDeliveryReceiptOptions(pathConversationSid, pathMessageSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadDeliveryReceiptOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathMessageSid + "/Receipts",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="options"> Read DeliveryReceipt parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DeliveryReceipt </returns>
-        public static ResourceSet<DeliveryReceiptResource> Read(ReadDeliveryReceiptOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
-            return new ResourceSet<DeliveryReceiptResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="options"> Read DeliveryReceipt parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DeliveryReceiptResource>> ReadAsync(ReadDeliveryReceiptOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
-            return new ResourceSet<DeliveryReceiptResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
-        /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DeliveryReceipt </returns>
-        public static ResourceSet<DeliveryReceiptResource> Read(string pathConversationSid,
-                                                                string pathMessageSid,
-                                                                int? pageSize = null,
-                                                                long? limit = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadDeliveryReceiptOptions(pathConversationSid, pathMessageSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
-        /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DeliveryReceiptResource>> ReadAsync(string pathConversationSid,
-                                                                                                        string pathMessageSid,
-                                                                                                        int? pageSize = null,
-                                                                                                        long? limit = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadDeliveryReceiptOptions(pathConversationSid, pathMessageSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DeliveryReceiptResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DeliveryReceiptResource> NextPage(Page<DeliveryReceiptResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DeliveryReceiptResource> PreviousPage(Page<DeliveryReceiptResource> page,
-                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a DeliveryReceiptResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DeliveryReceiptResource object represented by the provided JSON </returns>
-        public static DeliveryReceiptResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DeliveryReceiptResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this participant.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation for this message.
-        /// </summary>
-        [JsonProperty("conversation_sid")]
-        public string ConversationSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the message the delivery receipt belongs to
-        /// </summary>
-        [JsonProperty("message_sid")]
-        public string MessageSid { get; private set; }
-        /// <summary>
-        /// A messaging channel-specific identifier for the message delivered to participant
-        /// </summary>
-        [JsonProperty("channel_message_sid")]
-        public string ChannelMessageSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the participant the delivery receipt belongs to.
-        /// </summary>
-        [JsonProperty("participant_sid")]
-        public string ParticipantSid { get; private set; }
-        /// <summary>
-        /// The message delivery status
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public DeliveryReceiptResource.DeliveryStatusEnum Status { get; private set; }
-        /// <summary>
-        /// The message [delivery error code](https://www.twilio.com/docs/sms/api/message-resource#delivery-related-errors) for a `failed` status
-        /// </summary>
-        [JsonProperty("error_code")]
-        public int? ErrorCode { get; private set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An absolute URL for this delivery receipt.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private DeliveryReceiptResource()
-        {
-
-        }
-    }
+{
+
+  public class DeliveryReceiptResource : Resource
+  {
+    public sealed class DeliveryStatusEnum : StringEnum
+    {
+      private DeliveryStatusEnum(string value) : base(value) { }
+      public DeliveryStatusEnum() { }
+      public static implicit operator DeliveryStatusEnum(string value)
+      {
+        return new DeliveryStatusEnum(value);
+      }
+
+      public static readonly DeliveryStatusEnum Read = new DeliveryStatusEnum("read");
+      public static readonly DeliveryStatusEnum Failed = new DeliveryStatusEnum("failed");
+      public static readonly DeliveryStatusEnum Delivered = new DeliveryStatusEnum("delivered");
+      public static readonly DeliveryStatusEnum Undelivered = new DeliveryStatusEnum("undelivered");
+      public static readonly DeliveryStatusEnum Sent = new DeliveryStatusEnum("sent");
+    }
+
+    private static Request BuildFetchRequest(FetchDeliveryReceiptOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathMessageSid + "/Receipts/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="options"> Fetch DeliveryReceipt parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DeliveryReceipt </returns>
+    public static DeliveryReceiptResource Fetch(FetchDeliveryReceiptOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="options"> Fetch DeliveryReceipt parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
+    public static async System.Threading.Tasks.Task<DeliveryReceiptResource> FetchAsync(FetchDeliveryReceiptOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
+    /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DeliveryReceipt </returns>
+    public static DeliveryReceiptResource Fetch(string pathConversationSid,
+                                                string pathMessageSid,
+                                                string pathSid,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchDeliveryReceiptOptions(pathConversationSid, pathMessageSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
+    /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
+    public static async System.Threading.Tasks.Task<DeliveryReceiptResource> FetchAsync(string pathConversationSid,
+                                                                                        string pathMessageSid,
+                                                                                        string pathSid,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchDeliveryReceiptOptions(pathConversationSid, pathMessageSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadDeliveryReceiptOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathMessageSid + "/Receipts",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="options"> Read DeliveryReceipt parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DeliveryReceipt </returns>
+    public static ResourceSet<DeliveryReceiptResource> Read(ReadDeliveryReceiptOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
+      return new ResourceSet<DeliveryReceiptResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="options"> Read DeliveryReceipt parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DeliveryReceiptResource>> ReadAsync(ReadDeliveryReceiptOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
+      return new ResourceSet<DeliveryReceiptResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
+    /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DeliveryReceipt </returns>
+    public static ResourceSet<DeliveryReceiptResource> Read(string pathConversationSid,
+                                                            string pathMessageSid,
+                                                            int? pageSize = null,
+                                                            long? limit = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadDeliveryReceiptOptions(pathConversationSid, pathMessageSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
+    /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DeliveryReceiptResource>> ReadAsync(string pathConversationSid,
+                                                                                                    string pathMessageSid,
+                                                                                                    int? pageSize = null,
+                                                                                                    long? limit = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadDeliveryReceiptOptions(pathConversationSid, pathMessageSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DeliveryReceiptResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DeliveryReceiptResource> NextPage(Page<DeliveryReceiptResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DeliveryReceiptResource> PreviousPage(Page<DeliveryReceiptResource> page,
+                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a DeliveryReceiptResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DeliveryReceiptResource object represented by the provided JSON </returns>
+    public static DeliveryReceiptResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DeliveryReceiptResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this participant.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation for this message.
+    /// </summary>
+    [JsonProperty("conversation_sid")]
+    public string ConversationSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the message the delivery receipt belongs to
+    /// </summary>
+    [JsonProperty("message_sid")]
+    public string MessageSid { get; private set; }
+    /// <summary>
+    /// A messaging channel-specific identifier for the message delivered to participant
+    /// </summary>
+    [JsonProperty("channel_message_sid")]
+    public string ChannelMessageSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the participant the delivery receipt belongs to.
+    /// </summary>
+    [JsonProperty("participant_sid")]
+    public string ParticipantSid { get; private set; }
+    /// <summary>
+    /// The message delivery status
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public DeliveryReceiptResource.DeliveryStatusEnum Status { get; private set; }
+    /// <summary>
+    /// The message [delivery error code](https://www.twilio.com/docs/sms/api/message-resource#delivery-related-errors) for a `failed` status
+    /// </summary>
+    [JsonProperty("error_code")]
+    public int? ErrorCode { get; private set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An absolute URL for this delivery receipt.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private DeliveryReceiptResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Conversation/MessageOptions.cs b/src/Twilio/Rest/Conversations/V1/Conversation/MessageOptions.cs
index c216f7112..484146fc9 100644
--- a/src/Twilio/Rest/Conversations/V1/Conversation/MessageOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Conversation/MessageOptions.cs
@@ -9,336 +9,336 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Conversation
-{
-
+{
+
+  /// <summary>
+  /// Add a new message to the conversation
+  /// </summary>
+  public class CreateMessageOptions : IOptions<MessageResource>
+  {
     /// <summary>
-    /// Add a new message to the conversation
-    /// </summary>
-    public class CreateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this message.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// The channel specific identifier of the message's author.
-        /// </summary>
-        public string Author { get; set; }
-        /// <summary>
-        /// The content of the message.
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// A string metadata field you can use to store any data you wish.
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The Media SID to be attached to the new Message.
-        /// </summary>
-        public string MediaSid { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMessageOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        public CreateMessageOptions(string pathConversationSid)
-        {
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Author != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Author", Author));
-            }
-
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (MediaSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MediaSid", MediaSid.ToString()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique ID of the Conversation for this message.
+    /// </summary>
+    public string PathConversationSid { get; }
     /// <summary>
-    /// Update an existing message in the conversation
-    /// </summary>
-    public class UpdateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this message.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The channel specific identifier of the message's author.
-        /// </summary>
-        public string Author { get; set; }
-        /// <summary>
-        /// The content of the message.
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// A string metadata field you can use to store any data you wish.
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateMessageOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public UpdateMessageOptions(string pathConversationSid, string pathSid)
-        {
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Author != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Author", Author));
-            }
-
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The channel specific identifier of the message's author.
+    /// </summary>
+    public string Author { get; set; }
     /// <summary>
-    /// Remove a message from the conversation
-    /// </summary>
-    public class DeleteMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this message.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteMessageOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteMessageOptions(string pathConversationSid, string pathSid)
-        {
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The content of the message.
+    /// </summary>
+    public string Body { get; set; }
     /// <summary>
-    /// Fetch a message from the conversation
-    /// </summary>
-    public class FetchMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this message.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMessageOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchMessageOptions(string pathConversationSid, string pathSid)
-        {
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The date that this resource was created.
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
     /// <summary>
-    /// Retrieve a list of all messages in the conversation
-    /// </summary>
-    public class ReadMessageOptions : ReadOptions<MessageResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for messages.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// The sort order of the returned messages
-        /// </summary>
-        public MessageResource.OrderTypeEnum Order { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMessageOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for messages. </param>
-        public ReadMessageOptions(string pathConversationSid)
-        {
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Order != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The date that this resource was last updated.
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// A string metadata field you can use to store any data you wish.
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The Media SID to be attached to the new Message.
+    /// </summary>
+    public string MediaSid { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMessageOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    public CreateMessageOptions(string pathConversationSid)
+    {
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Author != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Author", Author));
+      }
+
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (MediaSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MediaSid", MediaSid.ToString()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing message in the conversation
+  /// </summary>
+  public class UpdateMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The unique ID of the Conversation for this message.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The channel specific identifier of the message's author.
+    /// </summary>
+    public string Author { get; set; }
+    /// <summary>
+    /// The content of the message.
+    /// </summary>
+    public string Body { get; set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// A string metadata field you can use to store any data you wish.
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateMessageOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public UpdateMessageOptions(string pathConversationSid, string pathSid)
+    {
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Author != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Author", Author));
+      }
+
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove a message from the conversation
+  /// </summary>
+  public class DeleteMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The unique ID of the Conversation for this message.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteMessageOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteMessageOptions(string pathConversationSid, string pathSid)
+    {
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a message from the conversation
+  /// </summary>
+  public class FetchMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The unique ID of the Conversation for this message.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchMessageOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchMessageOptions(string pathConversationSid, string pathSid)
+    {
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all messages in the conversation
+  /// </summary>
+  public class ReadMessageOptions : ReadOptions<MessageResource>
+  {
+    /// <summary>
+    /// The unique ID of the Conversation for messages.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// The sort order of the returned messages
+    /// </summary>
+    public MessageResource.OrderTypeEnum Order { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMessageOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for messages. </param>
+    public ReadMessageOptions(string pathConversationSid)
+    {
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Order != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Conversation/MessageResource.cs b/src/Twilio/Rest/Conversations/V1/Conversation/MessageResource.cs
index 4f6366d69..0ae61848f 100644
--- a/src/Twilio/Rest/Conversations/V1/Conversation/MessageResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Conversation/MessageResource.cs
@@ -17,604 +17,604 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Conversation
-{
-
-    public class MessageResource : Resource
-    {
-        public sealed class OrderTypeEnum : StringEnum
-        {
-            private OrderTypeEnum(string value) : base(value) {}
-            public OrderTypeEnum() {}
-            public static implicit operator OrderTypeEnum(string value)
-            {
-                return new OrderTypeEnum(value);
-            }
-
-            public static readonly OrderTypeEnum Asc = new OrderTypeEnum("asc");
-            public static readonly OrderTypeEnum Desc = new OrderTypeEnum("desc");
-        }
-
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Messages",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Add a new message to the conversation
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new message to the conversation
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Add a new message to the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="author"> The channel specific identifier of the message's author. </param>
-        /// <param name="body"> The content of the message. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
-        /// <param name="mediaSid"> The Media SID to be attached to the new Message. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(string pathConversationSid,
-                                             string author = null,
-                                             string body = null,
-                                             DateTime? dateCreated = null,
-                                             DateTime? dateUpdated = null,
-                                             string attributes = null,
-                                             string mediaSid = null,
-                                             MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(pathConversationSid){Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new message to the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="author"> The channel specific identifier of the message's author. </param>
-        /// <param name="body"> The content of the message. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
-        /// <param name="mediaSid"> The Media SID to be attached to the new Message. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(string pathConversationSid,
-                                                                                     string author = null,
-                                                                                     string body = null,
-                                                                                     DateTime? dateCreated = null,
-                                                                                     DateTime? dateUpdated = null,
-                                                                                     string attributes = null,
-                                                                                     string mediaSid = null,
-                                                                                     MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(pathConversationSid){Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Update an existing message in the conversation
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing message in the conversation
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing message in the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="author"> The channel specific identifier of the message's author. </param>
-        /// <param name="body"> The content of the message. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(string pathConversationSid,
-                                             string pathSid,
-                                             string author = null,
-                                             string body = null,
-                                             DateTime? dateCreated = null,
-                                             DateTime? dateUpdated = null,
-                                             string attributes = null,
-                                             MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathConversationSid, pathSid){Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing message in the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="author"> The channel specific identifier of the message's author. </param>
-        /// <param name="body"> The content of the message. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathConversationSid,
-                                                                                     string pathSid,
-                                                                                     string author = null,
-                                                                                     string body = null,
-                                                                                     DateTime? dateCreated = null,
-                                                                                     DateTime? dateUpdated = null,
-                                                                                     string attributes = null,
-                                                                                     MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathConversationSid, pathSid){Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Remove a message from the conversation
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a message from the conversation
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a message from the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(string pathConversationSid,
-                                  string pathSid,
-                                  MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathConversationSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a message from the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathConversationSid,
-                                                                          string pathSid,
-                                                                          MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathConversationSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a message from the conversation
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a message from the conversation
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a message from the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(string pathConversationSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathConversationSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a message from the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathConversationSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathConversationSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Messages",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all messages in the conversation
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all messages in the conversation
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all messages in the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for messages. </param>
-        /// <param name="order"> The sort order of the returned messages </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(string pathConversationSid,
-                                                        MessageResource.OrderTypeEnum order = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(pathConversationSid){Order = order, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all messages in the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for messages. </param>
-        /// <param name="order"> The sort order of the returned messages </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathConversationSid,
-                                                                                                MessageResource.OrderTypeEnum order = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(pathConversationSid){Order = order, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a MessageResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MessageResource object represented by the provided JSON </returns>
-        public static MessageResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MessageResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this message.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation for this message.
-        /// </summary>
-        [JsonProperty("conversation_sid")]
-        public string ConversationSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The index of the message within the Conversation.
-        /// </summary>
-        [JsonProperty("index")]
-        public int? Index { get; private set; }
-        /// <summary>
-        /// The channel specific identifier of the message's author.
-        /// </summary>
-        [JsonProperty("author")]
-        public string Author { get; private set; }
-        /// <summary>
-        /// The content of the message.
-        /// </summary>
-        [JsonProperty("body")]
-        public string Body { get; private set; }
-        /// <summary>
-        /// An array of objects that describe the Message's media if attached, otherwise, null.
-        /// </summary>
-        [JsonProperty("media")]
-        public List<object> Media { get; private set; }
-        /// <summary>
-        /// A string metadata field you can use to store any data you wish.
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The unique ID of messages's author participant.
-        /// </summary>
-        [JsonProperty("participant_sid")]
-        public string ParticipantSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An absolute API URL for this message.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// An object that contains the summary of delivery statuses for the message to non-chat participants.
-        /// </summary>
-        [JsonProperty("delivery")]
-        public object Delivery { get; private set; }
-        /// <summary>
-        /// Absolute URL to access the receipts of this message.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private MessageResource()
-        {
-
-        }
-    }
+{
+
+  public class MessageResource : Resource
+  {
+    public sealed class OrderTypeEnum : StringEnum
+    {
+      private OrderTypeEnum(string value) : base(value) { }
+      public OrderTypeEnum() { }
+      public static implicit operator OrderTypeEnum(string value)
+      {
+        return new OrderTypeEnum(value);
+      }
+
+      public static readonly OrderTypeEnum Asc = new OrderTypeEnum("asc");
+      public static readonly OrderTypeEnum Desc = new OrderTypeEnum("desc");
+    }
+
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Messages",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Add a new message to the conversation
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new message to the conversation
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Add a new message to the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="author"> The channel specific identifier of the message's author. </param>
+    /// <param name="body"> The content of the message. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
+    /// <param name="mediaSid"> The Media SID to be attached to the new Message. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(string pathConversationSid,
+                                         string author = null,
+                                         string body = null,
+                                         DateTime? dateCreated = null,
+                                         DateTime? dateUpdated = null,
+                                         string attributes = null,
+                                         string mediaSid = null,
+                                         MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(pathConversationSid) { Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new message to the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="author"> The channel specific identifier of the message's author. </param>
+    /// <param name="body"> The content of the message. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
+    /// <param name="mediaSid"> The Media SID to be attached to the new Message. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(string pathConversationSid,
+                                                                                 string author = null,
+                                                                                 string body = null,
+                                                                                 DateTime? dateCreated = null,
+                                                                                 DateTime? dateUpdated = null,
+                                                                                 string attributes = null,
+                                                                                 string mediaSid = null,
+                                                                                 MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(pathConversationSid) { Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Update an existing message in the conversation
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing message in the conversation
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing message in the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="author"> The channel specific identifier of the message's author. </param>
+    /// <param name="body"> The content of the message. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(string pathConversationSid,
+                                         string pathSid,
+                                         string author = null,
+                                         string body = null,
+                                         DateTime? dateCreated = null,
+                                         DateTime? dateUpdated = null,
+                                         string attributes = null,
+                                         MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathConversationSid, pathSid) { Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing message in the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="author"> The channel specific identifier of the message's author. </param>
+    /// <param name="body"> The content of the message. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathConversationSid,
+                                                                                 string pathSid,
+                                                                                 string author = null,
+                                                                                 string body = null,
+                                                                                 DateTime? dateCreated = null,
+                                                                                 DateTime? dateUpdated = null,
+                                                                                 string attributes = null,
+                                                                                 MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathConversationSid, pathSid) { Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Remove a message from the conversation
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a message from the conversation
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a message from the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(string pathConversationSid,
+                              string pathSid,
+                              MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathConversationSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a message from the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathConversationSid,
+                                                                      string pathSid,
+                                                                      MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathConversationSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a message from the conversation
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a message from the conversation
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a message from the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(string pathConversationSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathConversationSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a message from the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathConversationSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathConversationSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Messages",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all messages in the conversation
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all messages in the conversation
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all messages in the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for messages. </param>
+    /// <param name="order"> The sort order of the returned messages </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(string pathConversationSid,
+                                                    MessageResource.OrderTypeEnum order = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions(pathConversationSid) { Order = order, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all messages in the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for messages. </param>
+    /// <param name="order"> The sort order of the returned messages </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathConversationSid,
+                                                                                            MessageResource.OrderTypeEnum order = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions(pathConversationSid) { Order = order, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a MessageResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MessageResource object represented by the provided JSON </returns>
+    public static MessageResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MessageResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this message.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation for this message.
+    /// </summary>
+    [JsonProperty("conversation_sid")]
+    public string ConversationSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The index of the message within the Conversation.
+    /// </summary>
+    [JsonProperty("index")]
+    public int? Index { get; private set; }
+    /// <summary>
+    /// The channel specific identifier of the message's author.
+    /// </summary>
+    [JsonProperty("author")]
+    public string Author { get; private set; }
+    /// <summary>
+    /// The content of the message.
+    /// </summary>
+    [JsonProperty("body")]
+    public string Body { get; private set; }
+    /// <summary>
+    /// An array of objects that describe the Message's media if attached, otherwise, null.
+    /// </summary>
+    [JsonProperty("media")]
+    public List<object> Media { get; private set; }
+    /// <summary>
+    /// A string metadata field you can use to store any data you wish.
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The unique ID of messages's author participant.
+    /// </summary>
+    [JsonProperty("participant_sid")]
+    public string ParticipantSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An absolute API URL for this message.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// An object that contains the summary of delivery statuses for the message to non-chat participants.
+    /// </summary>
+    [JsonProperty("delivery")]
+    public object Delivery { get; private set; }
+    /// <summary>
+    /// Absolute URL to access the receipts of this message.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private MessageResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Conversation/ParticipantOptions.cs b/src/Twilio/Rest/Conversations/V1/Conversation/ParticipantOptions.cs
index f1891ec46..8ad733689 100644
--- a/src/Twilio/Rest/Conversations/V1/Conversation/ParticipantOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Conversation/ParticipantOptions.cs
@@ -9,381 +9,381 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Conversation
-{
-
+{
+
+  /// <summary>
+  /// Add a new participant to the conversation
+  /// </summary>
+  public class CreateParticipantOptions : IOptions<ParticipantResource>
+  {
     /// <summary>
-    /// Add a new participant to the conversation
-    /// </summary>
-    public class CreateParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this participant.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A unique string identifier for the conversation participant as Conversation User.
-        /// </summary>
-        public string Identity { get; set; }
-        /// <summary>
-        /// The address of the participant's device.
-        /// </summary>
-        public string MessagingBindingAddress { get; set; }
-        /// <summary>
-        /// The address of the Twilio phone number that the participant is in contact with.
-        /// </summary>
-        public string MessagingBindingProxyAddress { get; set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The address of the Twilio phone number that is used in Group MMS.
-        /// </summary>
-        public string MessagingBindingProjectedAddress { get; set; }
-        /// <summary>
-        /// The SID of a conversation-level Role to assign to the participant
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ParticipantResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateParticipantOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        public CreateParticipantOptions(string pathConversationSid)
-        {
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (MessagingBindingAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingBinding.Address", MessagingBindingAddress));
-            }
-
-            if (MessagingBindingProxyAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingBinding.ProxyAddress", MessagingBindingProxyAddress));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (MessagingBindingProjectedAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingBinding.ProjectedAddress", MessagingBindingProjectedAddress));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique ID of the Conversation for this participant.
+    /// </summary>
+    public string PathConversationSid { get; }
     /// <summary>
-    /// Update an existing participant in the conversation
-    /// </summary>
-    public class UpdateParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this participant.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The SID of a conversation-level Role to assign to the participant
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The address of the Twilio phone number that the participant is in contact with.
-        /// </summary>
-        public string MessagingBindingProxyAddress { get; set; }
-        /// <summary>
-        /// The address of the Twilio phone number that is used in Group MMS.
-        /// </summary>
-        public string MessagingBindingProjectedAddress { get; set; }
-        /// <summary>
-        /// A unique string identifier for the conversation participant as Conversation User.
-        /// </summary>
-        public string Identity { get; set; }
-        /// <summary>
-        /// Index of last “read” message in the Conversation for the Participant.
-        /// </summary>
-        public int? LastReadMessageIndex { get; set; }
-        /// <summary>
-        /// Timestamp of last “read” message in the Conversation for the Participant.
-        /// </summary>
-        public string LastReadTimestamp { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ParticipantResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateParticipantOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public UpdateParticipantOptions(string pathConversationSid, string pathSid)
-        {
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (MessagingBindingProxyAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingBinding.ProxyAddress", MessagingBindingProxyAddress));
-            }
-
-            if (MessagingBindingProjectedAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingBinding.ProjectedAddress", MessagingBindingProjectedAddress));
-            }
-
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (LastReadMessageIndex != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastReadMessageIndex", LastReadMessageIndex.ToString()));
-            }
-
-            if (LastReadTimestamp != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastReadTimestamp", LastReadTimestamp));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// A unique string identifier for the conversation participant as Conversation User.
+    /// </summary>
+    public string Identity { get; set; }
     /// <summary>
-    /// Remove a participant from the conversation
-    /// </summary>
-    public class DeleteParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this participant.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ParticipantResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteParticipantOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteParticipantOptions(string pathConversationSid, string pathSid)
-        {
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The address of the participant's device.
+    /// </summary>
+    public string MessagingBindingAddress { get; set; }
     /// <summary>
-    /// Fetch a participant of the conversation
-    /// </summary>
-    public class FetchParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this participant.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchParticipantOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchParticipantOptions(string pathConversationSid, string pathSid)
-        {
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The address of the Twilio phone number that the participant is in contact with.
+    /// </summary>
+    public string MessagingBindingProxyAddress { get; set; }
     /// <summary>
-    /// Retrieve a list of all participants of the conversation
+    /// The date that this resource was created.
     /// </summary>
-    public class ReadParticipantOptions : ReadOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for participants.
-        /// </summary>
-        public string PathConversationSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadParticipantOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for participants. </param>
-        public ReadParticipantOptions(string pathConversationSid)
-        {
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The address of the Twilio phone number that is used in Group MMS.
+    /// </summary>
+    public string MessagingBindingProjectedAddress { get; set; }
+    /// <summary>
+    /// The SID of a conversation-level Role to assign to the participant
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ParticipantResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateParticipantOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    public CreateParticipantOptions(string pathConversationSid)
+    {
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (MessagingBindingAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingBinding.Address", MessagingBindingAddress));
+      }
+
+      if (MessagingBindingProxyAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingBinding.ProxyAddress", MessagingBindingProxyAddress));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (MessagingBindingProjectedAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingBinding.ProjectedAddress", MessagingBindingProjectedAddress));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing participant in the conversation
+  /// </summary>
+  public class UpdateParticipantOptions : IOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The unique ID of the Conversation for this participant.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The SID of a conversation-level Role to assign to the participant
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The address of the Twilio phone number that the participant is in contact with.
+    /// </summary>
+    public string MessagingBindingProxyAddress { get; set; }
+    /// <summary>
+    /// The address of the Twilio phone number that is used in Group MMS.
+    /// </summary>
+    public string MessagingBindingProjectedAddress { get; set; }
+    /// <summary>
+    /// A unique string identifier for the conversation participant as Conversation User.
+    /// </summary>
+    public string Identity { get; set; }
+    /// <summary>
+    /// Index of last “read” message in the Conversation for the Participant.
+    /// </summary>
+    public int? LastReadMessageIndex { get; set; }
+    /// <summary>
+    /// Timestamp of last “read” message in the Conversation for the Participant.
+    /// </summary>
+    public string LastReadTimestamp { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ParticipantResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateParticipantOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public UpdateParticipantOptions(string pathConversationSid, string pathSid)
+    {
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (MessagingBindingProxyAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingBinding.ProxyAddress", MessagingBindingProxyAddress));
+      }
+
+      if (MessagingBindingProjectedAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingBinding.ProjectedAddress", MessagingBindingProjectedAddress));
+      }
+
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (LastReadMessageIndex != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastReadMessageIndex", LastReadMessageIndex.ToString()));
+      }
+
+      if (LastReadTimestamp != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastReadTimestamp", LastReadTimestamp));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove a participant from the conversation
+  /// </summary>
+  public class DeleteParticipantOptions : IOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The unique ID of the Conversation for this participant.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ParticipantResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteParticipantOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteParticipantOptions(string pathConversationSid, string pathSid)
+    {
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a participant of the conversation
+  /// </summary>
+  public class FetchParticipantOptions : IOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The unique ID of the Conversation for this participant.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchParticipantOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchParticipantOptions(string pathConversationSid, string pathSid)
+    {
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all participants of the conversation
+  /// </summary>
+  public class ReadParticipantOptions : ReadOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The unique ID of the Conversation for participants.
+    /// </summary>
+    public string PathConversationSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadParticipantOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for participants. </param>
+    public ReadParticipantOptions(string pathConversationSid)
+    {
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Conversation/ParticipantResource.cs b/src/Twilio/Rest/Conversations/V1/Conversation/ParticipantResource.cs
index 8c8ac5681..f88b02ba2 100644
--- a/src/Twilio/Rest/Conversations/V1/Conversation/ParticipantResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Conversation/ParticipantResource.cs
@@ -17,609 +17,609 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Conversation
-{
-
-    public class ParticipantResource : Resource
-    {
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildCreateRequest(CreateParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Participants",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Add a new participant to the conversation
-        /// </summary>
-        /// <param name="options"> Create Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Create(CreateParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new participant to the conversation
-        /// </summary>
-        /// <param name="options"> Create Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(CreateParticipantOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Add a new participant to the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
-        /// <param name="messagingBindingAddress"> The address of the participant's device. </param>
-        /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
-        ///                                    contact with. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
-        ///                                        </param>
-        /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Create(string pathConversationSid,
-                                                 string identity = null,
-                                                 string messagingBindingAddress = null,
-                                                 string messagingBindingProxyAddress = null,
-                                                 DateTime? dateCreated = null,
-                                                 DateTime? dateUpdated = null,
-                                                 string attributes = null,
-                                                 string messagingBindingProjectedAddress = null,
-                                                 string roleSid = null,
-                                                 ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateParticipantOptions(pathConversationSid){Identity = identity, MessagingBindingAddress = messagingBindingAddress, MessagingBindingProxyAddress = messagingBindingProxyAddress, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new participant to the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
-        /// <param name="messagingBindingAddress"> The address of the participant's device. </param>
-        /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
-        ///                                    contact with. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
-        ///                                        </param>
-        /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(string pathConversationSid,
-                                                                                         string identity = null,
-                                                                                         string messagingBindingAddress = null,
-                                                                                         string messagingBindingProxyAddress = null,
-                                                                                         DateTime? dateCreated = null,
-                                                                                         DateTime? dateUpdated = null,
-                                                                                         string attributes = null,
-                                                                                         string messagingBindingProjectedAddress = null,
-                                                                                         string roleSid = null,
-                                                                                         ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateParticipantOptions(pathConversationSid){Identity = identity, MessagingBindingAddress = messagingBindingAddress, MessagingBindingProxyAddress = messagingBindingProxyAddress, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Participants/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Update an existing participant in the conversation
-        /// </summary>
-        /// <param name="options"> Update Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Update(UpdateParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing participant in the conversation
-        /// </summary>
-        /// <param name="options"> Update Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(UpdateParticipantOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing participant in the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
-        /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
-        ///                                    contact with. </param>
-        /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
-        ///                                        </param>
-        /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
-        /// <param name="lastReadMessageIndex"> Index of last “read” message in the Conversation for the Participant. </param>
-        /// <param name="lastReadTimestamp"> Timestamp of last “read” message in the Conversation for the Participant. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Update(string pathConversationSid,
-                                                 string pathSid,
-                                                 DateTime? dateCreated = null,
-                                                 DateTime? dateUpdated = null,
-                                                 string attributes = null,
-                                                 string roleSid = null,
-                                                 string messagingBindingProxyAddress = null,
-                                                 string messagingBindingProjectedAddress = null,
-                                                 string identity = null,
-                                                 int? lastReadMessageIndex = null,
-                                                 string lastReadTimestamp = null,
-                                                 ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateParticipantOptions(pathConversationSid, pathSid){DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, RoleSid = roleSid, MessagingBindingProxyAddress = messagingBindingProxyAddress, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, Identity = identity, LastReadMessageIndex = lastReadMessageIndex, LastReadTimestamp = lastReadTimestamp, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing participant in the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
-        /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
-        ///                                    contact with. </param>
-        /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
-        ///                                        </param>
-        /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
-        /// <param name="lastReadMessageIndex"> Index of last “read” message in the Conversation for the Participant. </param>
-        /// <param name="lastReadTimestamp"> Timestamp of last “read” message in the Conversation for the Participant. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(string pathConversationSid,
-                                                                                         string pathSid,
-                                                                                         DateTime? dateCreated = null,
-                                                                                         DateTime? dateUpdated = null,
-                                                                                         string attributes = null,
-                                                                                         string roleSid = null,
-                                                                                         string messagingBindingProxyAddress = null,
-                                                                                         string messagingBindingProjectedAddress = null,
-                                                                                         string identity = null,
-                                                                                         int? lastReadMessageIndex = null,
-                                                                                         string lastReadTimestamp = null,
-                                                                                         ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateParticipantOptions(pathConversationSid, pathSid){DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, RoleSid = roleSid, MessagingBindingProxyAddress = messagingBindingProxyAddress, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, Identity = identity, LastReadMessageIndex = lastReadMessageIndex, LastReadTimestamp = lastReadTimestamp, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Participants/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Remove a participant from the conversation
-        /// </summary>
-        /// <param name="options"> Delete Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static bool Delete(DeleteParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a participant from the conversation
-        /// </summary>
-        /// <param name="options"> Delete Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteParticipantOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a participant from the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static bool Delete(string pathConversationSid,
-                                  string pathSid,
-                                  ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteParticipantOptions(pathConversationSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a participant from the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathConversationSid,
-                                                                          string pathSid,
-                                                                          ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteParticipantOptions(pathConversationSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Participants/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a participant of the conversation
-        /// </summary>
-        /// <param name="options"> Fetch Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Fetch(FetchParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a participant of the conversation
-        /// </summary>
-        /// <param name="options"> Fetch Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(FetchParticipantOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a participant of the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Fetch(string pathConversationSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchParticipantOptions(pathConversationSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a participant of the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(string pathConversationSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchParticipantOptions(pathConversationSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Participants",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all participants of the conversation
-        /// </summary>
-        /// <param name="options"> Read Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ResourceSet<ParticipantResource> Read(ReadParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantResource>.FromJson("participants", response.Content);
-            return new ResourceSet<ParticipantResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all participants of the conversation
-        /// </summary>
-        /// <param name="options"> Read Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(ReadParticipantOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantResource>.FromJson("participants", response.Content);
-            return new ResourceSet<ParticipantResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all participants of the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for participants. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ResourceSet<ParticipantResource> Read(string pathConversationSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantOptions(pathConversationSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all participants of the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for participants. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(string pathConversationSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantOptions(pathConversationSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ParticipantResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ParticipantResource> NextPage(Page<ParticipantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ParticipantResource> PreviousPage(Page<ParticipantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a ParticipantResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ParticipantResource object represented by the provided JSON </returns>
-        public static ParticipantResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ParticipantResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this participant.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation for this participant.
-        /// </summary>
-        [JsonProperty("conversation_sid")]
-        public string ConversationSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A unique string identifier for the conversation participant as Conversation User.
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// Information about how this participant exchanges messages with the conversation.
-        /// </summary>
-        [JsonProperty("messaging_binding")]
-        public object MessagingBinding { get; private set; }
-        /// <summary>
-        /// The SID of a conversation-level Role to assign to the participant
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An absolute URL for this participant.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Index of last “read” message in the Conversation for the Participant.
-        /// </summary>
-        [JsonProperty("last_read_message_index")]
-        public int? LastReadMessageIndex { get; private set; }
-        /// <summary>
-        /// Timestamp of last “read” message in the Conversation for the Participant.
-        /// </summary>
-        [JsonProperty("last_read_timestamp")]
-        public string LastReadTimestamp { get; private set; }
-
-        private ParticipantResource()
-        {
-
-        }
-    }
+{
+
+  public class ParticipantResource : Resource
+  {
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildCreateRequest(CreateParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Participants",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Add a new participant to the conversation
+    /// </summary>
+    /// <param name="options"> Create Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Create(CreateParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new participant to the conversation
+    /// </summary>
+    /// <param name="options"> Create Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(CreateParticipantOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Add a new participant to the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
+    /// <param name="messagingBindingAddress"> The address of the participant's device. </param>
+    /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
+    ///                                    contact with. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
+    ///                                        </param>
+    /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Create(string pathConversationSid,
+                                             string identity = null,
+                                             string messagingBindingAddress = null,
+                                             string messagingBindingProxyAddress = null,
+                                             DateTime? dateCreated = null,
+                                             DateTime? dateUpdated = null,
+                                             string attributes = null,
+                                             string messagingBindingProjectedAddress = null,
+                                             string roleSid = null,
+                                             ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateParticipantOptions(pathConversationSid) { Identity = identity, MessagingBindingAddress = messagingBindingAddress, MessagingBindingProxyAddress = messagingBindingProxyAddress, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new participant to the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
+    /// <param name="messagingBindingAddress"> The address of the participant's device. </param>
+    /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
+    ///                                    contact with. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
+    ///                                        </param>
+    /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(string pathConversationSid,
+                                                                                     string identity = null,
+                                                                                     string messagingBindingAddress = null,
+                                                                                     string messagingBindingProxyAddress = null,
+                                                                                     DateTime? dateCreated = null,
+                                                                                     DateTime? dateUpdated = null,
+                                                                                     string attributes = null,
+                                                                                     string messagingBindingProjectedAddress = null,
+                                                                                     string roleSid = null,
+                                                                                     ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateParticipantOptions(pathConversationSid) { Identity = identity, MessagingBindingAddress = messagingBindingAddress, MessagingBindingProxyAddress = messagingBindingProxyAddress, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Participants/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Update an existing participant in the conversation
+    /// </summary>
+    /// <param name="options"> Update Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Update(UpdateParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing participant in the conversation
+    /// </summary>
+    /// <param name="options"> Update Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(UpdateParticipantOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing participant in the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
+    /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
+    ///                                    contact with. </param>
+    /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
+    ///                                        </param>
+    /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
+    /// <param name="lastReadMessageIndex"> Index of last “read” message in the Conversation for the Participant. </param>
+    /// <param name="lastReadTimestamp"> Timestamp of last “read” message in the Conversation for the Participant. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Update(string pathConversationSid,
+                                             string pathSid,
+                                             DateTime? dateCreated = null,
+                                             DateTime? dateUpdated = null,
+                                             string attributes = null,
+                                             string roleSid = null,
+                                             string messagingBindingProxyAddress = null,
+                                             string messagingBindingProjectedAddress = null,
+                                             string identity = null,
+                                             int? lastReadMessageIndex = null,
+                                             string lastReadTimestamp = null,
+                                             ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateParticipantOptions(pathConversationSid, pathSid) { DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, RoleSid = roleSid, MessagingBindingProxyAddress = messagingBindingProxyAddress, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, Identity = identity, LastReadMessageIndex = lastReadMessageIndex, LastReadTimestamp = lastReadTimestamp, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing participant in the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
+    /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
+    ///                                    contact with. </param>
+    /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
+    ///                                        </param>
+    /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
+    /// <param name="lastReadMessageIndex"> Index of last “read” message in the Conversation for the Participant. </param>
+    /// <param name="lastReadTimestamp"> Timestamp of last “read” message in the Conversation for the Participant. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(string pathConversationSid,
+                                                                                     string pathSid,
+                                                                                     DateTime? dateCreated = null,
+                                                                                     DateTime? dateUpdated = null,
+                                                                                     string attributes = null,
+                                                                                     string roleSid = null,
+                                                                                     string messagingBindingProxyAddress = null,
+                                                                                     string messagingBindingProjectedAddress = null,
+                                                                                     string identity = null,
+                                                                                     int? lastReadMessageIndex = null,
+                                                                                     string lastReadTimestamp = null,
+                                                                                     ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateParticipantOptions(pathConversationSid, pathSid) { DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, RoleSid = roleSid, MessagingBindingProxyAddress = messagingBindingProxyAddress, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, Identity = identity, LastReadMessageIndex = lastReadMessageIndex, LastReadTimestamp = lastReadTimestamp, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Participants/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Remove a participant from the conversation
+    /// </summary>
+    /// <param name="options"> Delete Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static bool Delete(DeleteParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a participant from the conversation
+    /// </summary>
+    /// <param name="options"> Delete Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteParticipantOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a participant from the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static bool Delete(string pathConversationSid,
+                              string pathSid,
+                              ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteParticipantOptions(pathConversationSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a participant from the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathConversationSid,
+                                                                      string pathSid,
+                                                                      ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteParticipantOptions(pathConversationSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Participants/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a participant of the conversation
+    /// </summary>
+    /// <param name="options"> Fetch Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Fetch(FetchParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a participant of the conversation
+    /// </summary>
+    /// <param name="options"> Fetch Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(FetchParticipantOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a participant of the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Fetch(string pathConversationSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchParticipantOptions(pathConversationSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a participant of the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(string pathConversationSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchParticipantOptions(pathConversationSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Participants",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all participants of the conversation
+    /// </summary>
+    /// <param name="options"> Read Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ResourceSet<ParticipantResource> Read(ReadParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantResource>.FromJson("participants", response.Content);
+      return new ResourceSet<ParticipantResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all participants of the conversation
+    /// </summary>
+    /// <param name="options"> Read Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(ReadParticipantOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantResource>.FromJson("participants", response.Content);
+      return new ResourceSet<ParticipantResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all participants of the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for participants. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ResourceSet<ParticipantResource> Read(string pathConversationSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantOptions(pathConversationSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all participants of the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for participants. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(string pathConversationSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantOptions(pathConversationSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ParticipantResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ParticipantResource> NextPage(Page<ParticipantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ParticipantResource> PreviousPage(Page<ParticipantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a ParticipantResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ParticipantResource object represented by the provided JSON </returns>
+    public static ParticipantResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ParticipantResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this participant.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation for this participant.
+    /// </summary>
+    [JsonProperty("conversation_sid")]
+    public string ConversationSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A unique string identifier for the conversation participant as Conversation User.
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// Information about how this participant exchanges messages with the conversation.
+    /// </summary>
+    [JsonProperty("messaging_binding")]
+    public object MessagingBinding { get; private set; }
+    /// <summary>
+    /// The SID of a conversation-level Role to assign to the participant
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An absolute URL for this participant.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Index of last “read” message in the Conversation for the Participant.
+    /// </summary>
+    [JsonProperty("last_read_message_index")]
+    public int? LastReadMessageIndex { get; private set; }
+    /// <summary>
+    /// Timestamp of last “read” message in the Conversation for the Participant.
+    /// </summary>
+    [JsonProperty("last_read_timestamp")]
+    public string LastReadTimestamp { get; private set; }
+
+    private ParticipantResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Conversation/WebhookOptions.cs b/src/Twilio/Rest/Conversations/V1/Conversation/WebhookOptions.cs
index 20623e514..b02505296 100644
--- a/src/Twilio/Rest/Conversations/V1/Conversation/WebhookOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Conversation/WebhookOptions.cs
@@ -10,288 +10,288 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Conversation
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all webhooks scoped to the conversation
+  /// </summary>
+  public class ReadWebhookOptions : ReadOptions<WebhookResource>
+  {
     /// <summary>
-    /// Retrieve a list of all webhooks scoped to the conversation
+    /// The unique ID of the Conversation for this webhook.
     /// </summary>
-    public class ReadWebhookOptions : ReadOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this webhook.
-        /// </summary>
-        public string PathConversationSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadWebhookOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        public ReadWebhookOptions(string pathConversationSid)
-        {
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathConversationSid { get; }
+
     /// <summary>
-    /// Fetch the configuration of a conversation-scoped webhook
+    /// Construct a new ReadWebhookOptions
     /// </summary>
-    public class FetchWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this webhook.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchWebhookOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchWebhookOptions(string pathConversationSid, string pathSid)
-        {
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    public ReadWebhookOptions(string pathConversationSid)
+    {
+      PathConversationSid = pathConversationSid;
+    }
+
     /// <summary>
-    /// Create a new webhook scoped to the conversation
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this webhook.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// The target of this webhook.
-        /// </summary>
-        public WebhookResource.TargetEnum Target { get; }
-        /// <summary>
-        /// The absolute url the webhook request should be sent to.
-        /// </summary>
-        public string ConfigurationUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to be used when sending a webhook request.
-        /// </summary>
-        public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
-        /// <summary>
-        /// The list of events, firing webhook event for this Conversation.
-        /// </summary>
-        public List<string> ConfigurationFilters { get; set; }
-        /// <summary>
-        /// The list of keywords, firing webhook event for this Conversation.
-        /// </summary>
-        public List<string> ConfigurationTriggers { get; set; }
-        /// <summary>
-        /// The studio flow SID, where the webhook should be sent to.
-        /// </summary>
-        public string ConfigurationFlowSid { get; set; }
-        /// <summary>
-        /// The message index for which and it's successors the webhook will be replayed.
-        /// </summary>
-        public int? ConfigurationReplayAfter { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateWebhookOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="target"> The target of this webhook. </param>
-        public CreateWebhookOptions(string pathConversationSid, WebhookResource.TargetEnum target)
-        {
-            PathConversationSid = pathConversationSid;
-            Target = target;
-            ConfigurationFilters = new List<string>();
-            ConfigurationTriggers = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Target != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Target", Target.ToString()));
-            }
-
-            if (ConfigurationUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
-            }
-
-            if (ConfigurationMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
-            }
-
-            if (ConfigurationFilters != null)
-            {
-                p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
-            }
-
-            if (ConfigurationTriggers != null)
-            {
-                p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
-            }
-
-            if (ConfigurationFlowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
-            }
-
-            if (ConfigurationReplayAfter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.ReplayAfter", ConfigurationReplayAfter.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch the configuration of a conversation-scoped webhook
+  /// </summary>
+  public class FetchWebhookOptions : IOptions<WebhookResource>
+  {
     /// <summary>
-    /// Update an existing conversation-scoped webhook
+    /// The unique ID of the Conversation for this webhook.
     /// </summary>
-    public class UpdateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this webhook.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The absolute url the webhook request should be sent to.
-        /// </summary>
-        public string ConfigurationUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to be used when sending a webhook request.
-        /// </summary>
-        public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
-        /// <summary>
-        /// The list of events, firing webhook event for this Conversation.
-        /// </summary>
-        public List<string> ConfigurationFilters { get; set; }
-        /// <summary>
-        /// The list of keywords, firing webhook event for this Conversation.
-        /// </summary>
-        public List<string> ConfigurationTriggers { get; set; }
-        /// <summary>
-        /// The studio flow SID, where the webhook should be sent to.
-        /// </summary>
-        public string ConfigurationFlowSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateWebhookOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public UpdateWebhookOptions(string pathConversationSid, string pathSid)
-        {
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-            ConfigurationFilters = new List<string>();
-            ConfigurationTriggers = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ConfigurationUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
-            }
-
-            if (ConfigurationMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
-            }
-
-            if (ConfigurationFilters != null)
-            {
-                p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
-            }
-
-            if (ConfigurationTriggers != null)
-            {
-                p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
-            }
-
-            if (ConfigurationFlowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathConversationSid { get; }
     /// <summary>
-    /// Remove an existing webhook scoped to the conversation
+    /// A 34 character string that uniquely identifies this resource.
     /// </summary>
-    public class DeleteWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The unique ID of the Conversation for this webhook.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteWebhookOptions
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteWebhookOptions(string pathConversationSid, string pathSid)
-        {
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchWebhookOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchWebhookOptions(string pathConversationSid, string pathSid)
+    {
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Create a new webhook scoped to the conversation
+  /// </summary>
+  public class CreateWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The unique ID of the Conversation for this webhook.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// The target of this webhook.
+    /// </summary>
+    public WebhookResource.TargetEnum Target { get; }
+    /// <summary>
+    /// The absolute url the webhook request should be sent to.
+    /// </summary>
+    public string ConfigurationUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to be used when sending a webhook request.
+    /// </summary>
+    public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
+    /// <summary>
+    /// The list of events, firing webhook event for this Conversation.
+    /// </summary>
+    public List<string> ConfigurationFilters { get; set; }
+    /// <summary>
+    /// The list of keywords, firing webhook event for this Conversation.
+    /// </summary>
+    public List<string> ConfigurationTriggers { get; set; }
+    /// <summary>
+    /// The studio flow SID, where the webhook should be sent to.
+    /// </summary>
+    public string ConfigurationFlowSid { get; set; }
+    /// <summary>
+    /// The message index for which and it's successors the webhook will be replayed.
+    /// </summary>
+    public int? ConfigurationReplayAfter { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateWebhookOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="target"> The target of this webhook. </param>
+    public CreateWebhookOptions(string pathConversationSid, WebhookResource.TargetEnum target)
+    {
+      PathConversationSid = pathConversationSid;
+      Target = target;
+      ConfigurationFilters = new List<string>();
+      ConfigurationTriggers = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Target != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Target", Target.ToString()));
+      }
+
+      if (ConfigurationUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
+      }
+
+      if (ConfigurationMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
+      }
+
+      if (ConfigurationFilters != null)
+      {
+        p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
+      }
+
+      if (ConfigurationTriggers != null)
+      {
+        p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
+      }
+
+      if (ConfigurationFlowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
+      }
+
+      if (ConfigurationReplayAfter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.ReplayAfter", ConfigurationReplayAfter.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing conversation-scoped webhook
+  /// </summary>
+  public class UpdateWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The unique ID of the Conversation for this webhook.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The absolute url the webhook request should be sent to.
+    /// </summary>
+    public string ConfigurationUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to be used when sending a webhook request.
+    /// </summary>
+    public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
+    /// <summary>
+    /// The list of events, firing webhook event for this Conversation.
+    /// </summary>
+    public List<string> ConfigurationFilters { get; set; }
+    /// <summary>
+    /// The list of keywords, firing webhook event for this Conversation.
+    /// </summary>
+    public List<string> ConfigurationTriggers { get; set; }
+    /// <summary>
+    /// The studio flow SID, where the webhook should be sent to.
+    /// </summary>
+    public string ConfigurationFlowSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateWebhookOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public UpdateWebhookOptions(string pathConversationSid, string pathSid)
+    {
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+      ConfigurationFilters = new List<string>();
+      ConfigurationTriggers = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ConfigurationUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
+      }
+
+      if (ConfigurationMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
+      }
+
+      if (ConfigurationFilters != null)
+      {
+        p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
+      }
+
+      if (ConfigurationTriggers != null)
+      {
+        p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
+      }
+
+      if (ConfigurationFlowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove an existing webhook scoped to the conversation
+  /// </summary>
+  public class DeleteWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The unique ID of the Conversation for this webhook.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteWebhookOptions
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteWebhookOptions(string pathConversationSid, string pathSid)
+    {
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Conversation/WebhookResource.cs b/src/Twilio/Rest/Conversations/V1/Conversation/WebhookResource.cs
index e41e2fca4..4c36ae2cf 100644
--- a/src/Twilio/Rest/Conversations/V1/Conversation/WebhookResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Conversation/WebhookResource.cs
@@ -17,563 +17,563 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Conversation
-{
-
-    public class WebhookResource : Resource
-    {
-        public sealed class TargetEnum : StringEnum
-        {
-            private TargetEnum(string value) : base(value) {}
-            public TargetEnum() {}
-            public static implicit operator TargetEnum(string value)
-            {
-                return new TargetEnum(value);
-            }
-
-            public static readonly TargetEnum Webhook = new TargetEnum("webhook");
-            public static readonly TargetEnum Trigger = new TargetEnum("trigger");
-            public static readonly TargetEnum Studio = new TargetEnum("studio");
-        }
-
-        public sealed class MethodEnum : StringEnum
-        {
-            private MethodEnum(string value) : base(value) {}
-            public MethodEnum() {}
-            public static implicit operator MethodEnum(string value)
-            {
-                return new MethodEnum(value);
-            }
-
-            public static readonly MethodEnum Get = new MethodEnum("GET");
-            public static readonly MethodEnum Post = new MethodEnum("POST");
-        }
-
-        private static Request BuildReadRequest(ReadWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Webhooks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all webhooks scoped to the conversation
-        /// </summary>
-        /// <param name="options"> Read Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static ResourceSet<WebhookResource> Read(ReadWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
-            return new ResourceSet<WebhookResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all webhooks scoped to the conversation
-        /// </summary>
-        /// <param name="options"> Read Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(ReadWebhookOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
-            return new ResourceSet<WebhookResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all webhooks scoped to the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static ResourceSet<WebhookResource> Read(string pathConversationSid,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadWebhookOptions(pathConversationSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all webhooks scoped to the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(string pathConversationSid,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadWebhookOptions(pathConversationSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<WebhookResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<WebhookResource> NextPage(Page<WebhookResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<WebhookResource> PreviousPage(Page<WebhookResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Webhooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the configuration of a conversation-scoped webhook
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the configuration of a conversation-scoped webhook
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the configuration of a conversation-scoped webhook
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(string pathConversationSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathConversationSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the configuration of a conversation-scoped webhook
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathConversationSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathConversationSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Webhooks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new webhook scoped to the conversation
-        /// </summary>
-        /// <param name="options"> Create Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Create(CreateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new webhook scoped to the conversation
-        /// </summary>
-        /// <param name="options"> Create Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(CreateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new webhook scoped to the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="target"> The target of this webhook. </param>
-        /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
-        /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
-        /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
-        /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
-        /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
-        /// <param name="configurationReplayAfter"> The message index for which and it's successors the webhook will be
-        ///                                replayed. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Create(string pathConversationSid,
-                                             WebhookResource.TargetEnum target,
-                                             string configurationUrl = null,
-                                             WebhookResource.MethodEnum configurationMethod = null,
-                                             List<string> configurationFilters = null,
-                                             List<string> configurationTriggers = null,
-                                             string configurationFlowSid = null,
-                                             int? configurationReplayAfter = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateWebhookOptions(pathConversationSid, target){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationReplayAfter = configurationReplayAfter};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new webhook scoped to the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="target"> The target of this webhook. </param>
-        /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
-        /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
-        /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
-        /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
-        /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
-        /// <param name="configurationReplayAfter"> The message index for which and it's successors the webhook will be
-        ///                                replayed. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(string pathConversationSid,
-                                                                                     WebhookResource.TargetEnum target,
-                                                                                     string configurationUrl = null,
-                                                                                     WebhookResource.MethodEnum configurationMethod = null,
-                                                                                     List<string> configurationFilters = null,
-                                                                                     List<string> configurationTriggers = null,
-                                                                                     string configurationFlowSid = null,
-                                                                                     int? configurationReplayAfter = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateWebhookOptions(pathConversationSid, target){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationReplayAfter = configurationReplayAfter};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Webhooks/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an existing conversation-scoped webhook
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing conversation-scoped webhook
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing conversation-scoped webhook
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
-        /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
-        /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
-        /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
-        /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(string pathConversationSid,
-                                             string pathSid,
-                                             string configurationUrl = null,
-                                             WebhookResource.MethodEnum configurationMethod = null,
-                                             List<string> configurationFilters = null,
-                                             List<string> configurationTriggers = null,
-                                             string configurationFlowSid = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathConversationSid, pathSid){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing conversation-scoped webhook
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
-        /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
-        /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
-        /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
-        /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathConversationSid,
-                                                                                     string pathSid,
-                                                                                     string configurationUrl = null,
-                                                                                     WebhookResource.MethodEnum configurationMethod = null,
-                                                                                     List<string> configurationFilters = null,
-                                                                                     List<string> configurationTriggers = null,
-                                                                                     string configurationFlowSid = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathConversationSid, pathSid){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathConversationSid + "/Webhooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove an existing webhook scoped to the conversation
-        /// </summary>
-        /// <param name="options"> Delete Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static bool Delete(DeleteWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an existing webhook scoped to the conversation
-        /// </summary>
-        /// <param name="options"> Delete Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebhookOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove an existing webhook scoped to the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static bool Delete(string pathConversationSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebhookOptions(pathConversationSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an existing webhook scoped to the conversation
-        /// </summary>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathConversationSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebhookOptions(pathConversationSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WebhookResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WebhookResource object represented by the provided JSON </returns>
-        public static WebhookResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WebhookResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Account responsible for this conversation.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation for this webhook.
-        /// </summary>
-        [JsonProperty("conversation_sid")]
-        public string ConversationSid { get; private set; }
-        /// <summary>
-        /// The target of this webhook.
-        /// </summary>
-        [JsonProperty("target")]
-        public string Target { get; private set; }
-        /// <summary>
-        /// An absolute URL for this webhook.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The configuration of this webhook.
-        /// </summary>
-        [JsonProperty("configuration")]
-        public object Configuration { get; private set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private WebhookResource()
-        {
-
-        }
-    }
+{
+
+  public class WebhookResource : Resource
+  {
+    public sealed class TargetEnum : StringEnum
+    {
+      private TargetEnum(string value) : base(value) { }
+      public TargetEnum() { }
+      public static implicit operator TargetEnum(string value)
+      {
+        return new TargetEnum(value);
+      }
+
+      public static readonly TargetEnum Webhook = new TargetEnum("webhook");
+      public static readonly TargetEnum Trigger = new TargetEnum("trigger");
+      public static readonly TargetEnum Studio = new TargetEnum("studio");
+    }
+
+    public sealed class MethodEnum : StringEnum
+    {
+      private MethodEnum(string value) : base(value) { }
+      public MethodEnum() { }
+      public static implicit operator MethodEnum(string value)
+      {
+        return new MethodEnum(value);
+      }
+
+      public static readonly MethodEnum Get = new MethodEnum("GET");
+      public static readonly MethodEnum Post = new MethodEnum("POST");
+    }
+
+    private static Request BuildReadRequest(ReadWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Webhooks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all webhooks scoped to the conversation
+    /// </summary>
+    /// <param name="options"> Read Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static ResourceSet<WebhookResource> Read(ReadWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
+      return new ResourceSet<WebhookResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all webhooks scoped to the conversation
+    /// </summary>
+    /// <param name="options"> Read Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(ReadWebhookOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
+      return new ResourceSet<WebhookResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all webhooks scoped to the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static ResourceSet<WebhookResource> Read(string pathConversationSid,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadWebhookOptions(pathConversationSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all webhooks scoped to the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(string pathConversationSid,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadWebhookOptions(pathConversationSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<WebhookResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<WebhookResource> NextPage(Page<WebhookResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<WebhookResource> PreviousPage(Page<WebhookResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Webhooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the configuration of a conversation-scoped webhook
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the configuration of a conversation-scoped webhook
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the configuration of a conversation-scoped webhook
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(string pathConversationSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathConversationSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the configuration of a conversation-scoped webhook
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathConversationSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathConversationSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Webhooks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new webhook scoped to the conversation
+    /// </summary>
+    /// <param name="options"> Create Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Create(CreateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new webhook scoped to the conversation
+    /// </summary>
+    /// <param name="options"> Create Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(CreateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new webhook scoped to the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="target"> The target of this webhook. </param>
+    /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
+    /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
+    /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
+    /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
+    /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
+    /// <param name="configurationReplayAfter"> The message index for which and it's successors the webhook will be
+    ///                                replayed. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Create(string pathConversationSid,
+                                         WebhookResource.TargetEnum target,
+                                         string configurationUrl = null,
+                                         WebhookResource.MethodEnum configurationMethod = null,
+                                         List<string> configurationFilters = null,
+                                         List<string> configurationTriggers = null,
+                                         string configurationFlowSid = null,
+                                         int? configurationReplayAfter = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateWebhookOptions(pathConversationSid, target) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationReplayAfter = configurationReplayAfter };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new webhook scoped to the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="target"> The target of this webhook. </param>
+    /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
+    /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
+    /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
+    /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
+    /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
+    /// <param name="configurationReplayAfter"> The message index for which and it's successors the webhook will be
+    ///                                replayed. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(string pathConversationSid,
+                                                                                 WebhookResource.TargetEnum target,
+                                                                                 string configurationUrl = null,
+                                                                                 WebhookResource.MethodEnum configurationMethod = null,
+                                                                                 List<string> configurationFilters = null,
+                                                                                 List<string> configurationTriggers = null,
+                                                                                 string configurationFlowSid = null,
+                                                                                 int? configurationReplayAfter = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateWebhookOptions(pathConversationSid, target) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationReplayAfter = configurationReplayAfter };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Webhooks/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an existing conversation-scoped webhook
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing conversation-scoped webhook
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing conversation-scoped webhook
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
+    /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
+    /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
+    /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
+    /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(string pathConversationSid,
+                                         string pathSid,
+                                         string configurationUrl = null,
+                                         WebhookResource.MethodEnum configurationMethod = null,
+                                         List<string> configurationFilters = null,
+                                         List<string> configurationTriggers = null,
+                                         string configurationFlowSid = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathConversationSid, pathSid) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing conversation-scoped webhook
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
+    /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
+    /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
+    /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
+    /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathConversationSid,
+                                                                                 string pathSid,
+                                                                                 string configurationUrl = null,
+                                                                                 WebhookResource.MethodEnum configurationMethod = null,
+                                                                                 List<string> configurationFilters = null,
+                                                                                 List<string> configurationTriggers = null,
+                                                                                 string configurationFlowSid = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathConversationSid, pathSid) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathConversationSid + "/Webhooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove an existing webhook scoped to the conversation
+    /// </summary>
+    /// <param name="options"> Delete Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static bool Delete(DeleteWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an existing webhook scoped to the conversation
+    /// </summary>
+    /// <param name="options"> Delete Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebhookOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove an existing webhook scoped to the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static bool Delete(string pathConversationSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebhookOptions(pathConversationSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an existing webhook scoped to the conversation
+    /// </summary>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathConversationSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebhookOptions(pathConversationSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WebhookResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WebhookResource object represented by the provided JSON </returns>
+    public static WebhookResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WebhookResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Account responsible for this conversation.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation for this webhook.
+    /// </summary>
+    [JsonProperty("conversation_sid")]
+    public string ConversationSid { get; private set; }
+    /// <summary>
+    /// The target of this webhook.
+    /// </summary>
+    [JsonProperty("target")]
+    public string Target { get; private set; }
+    /// <summary>
+    /// An absolute URL for this webhook.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The configuration of this webhook.
+    /// </summary>
+    [JsonProperty("configuration")]
+    public object Configuration { get; private set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private WebhookResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/ConversationOptions.cs b/src/Twilio/Rest/Conversations/V1/ConversationOptions.cs
index 06f50e183..e1a2d23dd 100644
--- a/src/Twilio/Rest/Conversations/V1/ConversationOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/ConversationOptions.cs
@@ -9,345 +9,345 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
+{
+
+  /// <summary>
+  /// Create a new conversation in your account's default service
+  /// </summary>
+  public class CreateConversationOptions : IOptions<ConversationResource>
+  {
     /// <summary>
-    /// Create a new conversation in your account's default service
-    /// </summary>
-    public class CreateConversationOptions : IOptions<ConversationResource>
-    {
-        /// <summary>
-        /// The human-readable name of this conversation.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// The unique ID of the Messaging Service this conversation belongs to.
-        /// </summary>
-        public string MessagingServiceSid { get; set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// Current state of this conversation.
-        /// </summary>
-        public ConversationResource.StateEnum State { get; set; }
-        /// <summary>
-        /// ISO8601 duration when conversation will be switched to `inactive` state.
-        /// </summary>
-        public string TimersInactive { get; set; }
-        /// <summary>
-        /// ISO8601 duration when conversation will be switched to `closed` state.
-        /// </summary>
-        public string TimersClosed { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ConversationResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (MessagingServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (State != null)
-            {
-                p.Add(new KeyValuePair<string, string>("State", State.ToString()));
-            }
-
-            if (TimersInactive != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timers.Inactive", TimersInactive));
-            }
-
-            if (TimersClosed != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timers.Closed", TimersClosed));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The human-readable name of this conversation.
+    /// </summary>
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// Update an existing conversation in your account's default service
-    /// </summary>
-    public class UpdateConversationOptions : IOptions<ConversationResource>
-    {
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The human-readable name of this conversation.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The unique ID of the Messaging Service this conversation belongs to.
-        /// </summary>
-        public string MessagingServiceSid { get; set; }
-        /// <summary>
-        /// Current state of this conversation.
-        /// </summary>
-        public ConversationResource.StateEnum State { get; set; }
-        /// <summary>
-        /// ISO8601 duration when conversation will be switched to `inactive` state.
-        /// </summary>
-        public string TimersInactive { get; set; }
-        /// <summary>
-        /// ISO8601 duration when conversation will be switched to `closed` state.
-        /// </summary>
-        public string TimersClosed { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ConversationResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateConversationOptions
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public UpdateConversationOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (MessagingServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
-            }
-
-            if (State != null)
-            {
-                p.Add(new KeyValuePair<string, string>("State", State.ToString()));
-            }
-
-            if (TimersInactive != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timers.Inactive", TimersInactive));
-            }
-
-            if (TimersClosed != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timers.Closed", TimersClosed));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
     /// <summary>
-    /// Remove a conversation from your account's default service
-    /// </summary>
-    public class DeleteConversationOptions : IOptions<ConversationResource>
-    {
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ConversationResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteConversationOptions
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteConversationOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The date that this resource was created.
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
     /// <summary>
-    /// Fetch a conversation from your account's default service
+    /// The date that this resource was last updated.
     /// </summary>
-    public class FetchConversationOptions : IOptions<ConversationResource>
-    {
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchConversationOptions
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchConversationOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public DateTime? DateUpdated { get; set; }
     /// <summary>
-    /// Retrieve a list of conversations in your account's default service
-    /// </summary>
-    public class ReadConversationOptions : ReadOptions<ConversationResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The unique ID of the Messaging Service this conversation belongs to.
+    /// </summary>
+    public string MessagingServiceSid { get; set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// Current state of this conversation.
+    /// </summary>
+    public ConversationResource.StateEnum State { get; set; }
+    /// <summary>
+    /// ISO8601 duration when conversation will be switched to `inactive` state.
+    /// </summary>
+    public string TimersInactive { get; set; }
+    /// <summary>
+    /// ISO8601 duration when conversation will be switched to `closed` state.
+    /// </summary>
+    public string TimersClosed { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ConversationResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (MessagingServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (State != null)
+      {
+        p.Add(new KeyValuePair<string, string>("State", State.ToString()));
+      }
+
+      if (TimersInactive != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timers.Inactive", TimersInactive));
+      }
+
+      if (TimersClosed != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timers.Closed", TimersClosed));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing conversation in your account's default service
+  /// </summary>
+  public class UpdateConversationOptions : IOptions<ConversationResource>
+  {
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The human-readable name of this conversation.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The unique ID of the Messaging Service this conversation belongs to.
+    /// </summary>
+    public string MessagingServiceSid { get; set; }
+    /// <summary>
+    /// Current state of this conversation.
+    /// </summary>
+    public ConversationResource.StateEnum State { get; set; }
+    /// <summary>
+    /// ISO8601 duration when conversation will be switched to `inactive` state.
+    /// </summary>
+    public string TimersInactive { get; set; }
+    /// <summary>
+    /// ISO8601 duration when conversation will be switched to `closed` state.
+    /// </summary>
+    public string TimersClosed { get; set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ConversationResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateConversationOptions
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public UpdateConversationOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (MessagingServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
+      }
+
+      if (State != null)
+      {
+        p.Add(new KeyValuePair<string, string>("State", State.ToString()));
+      }
+
+      if (TimersInactive != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timers.Inactive", TimersInactive));
+      }
+
+      if (TimersClosed != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timers.Closed", TimersClosed));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove a conversation from your account's default service
+  /// </summary>
+  public class DeleteConversationOptions : IOptions<ConversationResource>
+  {
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ConversationResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteConversationOptions
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteConversationOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a conversation from your account's default service
+  /// </summary>
+  public class FetchConversationOptions : IOptions<ConversationResource>
+  {
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchConversationOptions
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchConversationOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of conversations in your account's default service
+  /// </summary>
+  public class ReadConversationOptions : ReadOptions<ConversationResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/ConversationResource.cs b/src/Twilio/Rest/Conversations/V1/ConversationResource.cs
index 65a5019a5..051f44dc1 100644
--- a/src/Twilio/Rest/Conversations/V1/ConversationResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/ConversationResource.cs
@@ -17,612 +17,612 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
-    public class ConversationResource : Resource
-    {
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        public sealed class StateEnum : StringEnum
-        {
-            private StateEnum(string value) : base(value) {}
-            public StateEnum() {}
-            public static implicit operator StateEnum(string value)
-            {
-                return new StateEnum(value);
-            }
-
-            public static readonly StateEnum Inactive = new StateEnum("inactive");
-            public static readonly StateEnum Active = new StateEnum("active");
-            public static readonly StateEnum Closed = new StateEnum("closed");
-        }
-
-        private static Request BuildCreateRequest(CreateConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Conversations",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Create a new conversation in your account's default service
-        /// </summary>
-        /// <param name="options"> Create Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ConversationResource Create(CreateConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new conversation in your account's default service
-        /// </summary>
-        /// <param name="options"> Create Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ConversationResource> CreateAsync(CreateConversationOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new conversation in your account's default service
-        /// </summary>
-        /// <param name="friendlyName"> The human-readable name of this conversation. </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="state"> Current state of this conversation. </param>
-        /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
-        /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ConversationResource Create(string friendlyName = null,
-                                                  string uniqueName = null,
-                                                  DateTime? dateCreated = null,
-                                                  DateTime? dateUpdated = null,
-                                                  string messagingServiceSid = null,
-                                                  string attributes = null,
-                                                  ConversationResource.StateEnum state = null,
-                                                  string timersInactive = null,
-                                                  string timersClosed = null,
-                                                  ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateConversationOptions(){FriendlyName = friendlyName, UniqueName = uniqueName, DateCreated = dateCreated, DateUpdated = dateUpdated, MessagingServiceSid = messagingServiceSid, Attributes = attributes, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new conversation in your account's default service
-        /// </summary>
-        /// <param name="friendlyName"> The human-readable name of this conversation. </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="state"> Current state of this conversation. </param>
-        /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
-        /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ConversationResource> CreateAsync(string friendlyName = null,
-                                                                                          string uniqueName = null,
-                                                                                          DateTime? dateCreated = null,
-                                                                                          DateTime? dateUpdated = null,
-                                                                                          string messagingServiceSid = null,
-                                                                                          string attributes = null,
-                                                                                          ConversationResource.StateEnum state = null,
-                                                                                          string timersInactive = null,
-                                                                                          string timersClosed = null,
-                                                                                          ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateConversationOptions(){FriendlyName = friendlyName, UniqueName = uniqueName, DateCreated = dateCreated, DateUpdated = dateUpdated, MessagingServiceSid = messagingServiceSid, Attributes = attributes, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Update an existing conversation in your account's default service
-        /// </summary>
-        /// <param name="options"> Update Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ConversationResource Update(UpdateConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing conversation in your account's default service
-        /// </summary>
-        /// <param name="options"> Update Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ConversationResource> UpdateAsync(UpdateConversationOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing conversation in your account's default service
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="friendlyName"> The human-readable name of this conversation. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
-        /// <param name="state"> Current state of this conversation. </param>
-        /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
-        /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ConversationResource Update(string pathSid,
-                                                  string friendlyName = null,
-                                                  DateTime? dateCreated = null,
-                                                  DateTime? dateUpdated = null,
-                                                  string attributes = null,
-                                                  string messagingServiceSid = null,
-                                                  ConversationResource.StateEnum state = null,
-                                                  string timersInactive = null,
-                                                  string timersClosed = null,
-                                                  string uniqueName = null,
-                                                  ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateConversationOptions(pathSid){FriendlyName = friendlyName, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingServiceSid = messagingServiceSid, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, UniqueName = uniqueName, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing conversation in your account's default service
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="friendlyName"> The human-readable name of this conversation. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
-        /// <param name="state"> Current state of this conversation. </param>
-        /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
-        /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ConversationResource> UpdateAsync(string pathSid,
-                                                                                          string friendlyName = null,
-                                                                                          DateTime? dateCreated = null,
-                                                                                          DateTime? dateUpdated = null,
-                                                                                          string attributes = null,
-                                                                                          string messagingServiceSid = null,
-                                                                                          ConversationResource.StateEnum state = null,
-                                                                                          string timersInactive = null,
-                                                                                          string timersClosed = null,
-                                                                                          string uniqueName = null,
-                                                                                          ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateConversationOptions(pathSid){FriendlyName = friendlyName, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingServiceSid = messagingServiceSid, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, UniqueName = uniqueName, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Remove a conversation from your account's default service
-        /// </summary>
-        /// <param name="options"> Delete Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static bool Delete(DeleteConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a conversation from your account's default service
-        /// </summary>
-        /// <param name="options"> Delete Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteConversationOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a conversation from your account's default service
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static bool Delete(string pathSid,
-                                  ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteConversationOptions(pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a conversation from your account's default service
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteConversationOptions(pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Conversations/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a conversation from your account's default service
-        /// </summary>
-        /// <param name="options"> Fetch Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ConversationResource Fetch(FetchConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a conversation from your account's default service
-        /// </summary>
-        /// <param name="options"> Fetch Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ConversationResource> FetchAsync(FetchConversationOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a conversation from your account's default service
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ConversationResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchConversationOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a conversation from your account's default service
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ConversationResource> FetchAsync(string pathSid,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchConversationOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Conversations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of conversations in your account's default service
-        /// </summary>
-        /// <param name="options"> Read Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ResourceSet<ConversationResource> Read(ReadConversationOptions options,
-                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ConversationResource>.FromJson("conversations", response.Content);
-            return new ResourceSet<ConversationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of conversations in your account's default service
-        /// </summary>
-        /// <param name="options"> Read Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ConversationResource>> ReadAsync(ReadConversationOptions options,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ConversationResource>.FromJson("conversations", response.Content);
-            return new ResourceSet<ConversationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of conversations in your account's default service
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ResourceSet<ConversationResource> Read(int? pageSize = null,
-                                                             long? limit = null,
-                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadConversationOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of conversations in your account's default service
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ConversationResource>> ReadAsync(int? pageSize = null,
-                                                                                                     long? limit = null,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadConversationOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ConversationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ConversationResource> NextPage(Page<ConversationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ConversationResource> PreviousPage(Page<ConversationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a ConversationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ConversationResource object represented by the provided JSON </returns>
-        public static ConversationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ConversationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this conversation.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation Service this conversation belongs to.
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Messaging Service this conversation belongs to.
-        /// </summary>
-        [JsonProperty("messaging_service_sid")]
-        public string MessagingServiceSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The human-readable name of this conversation.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// Current state of this conversation.
-        /// </summary>
-        [JsonProperty("state")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ConversationResource.StateEnum State { get; private set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Timer date values for this conversation.
-        /// </summary>
-        [JsonProperty("timers")]
-        public object Timers { get; private set; }
-        /// <summary>
-        /// An absolute URL for this conversation.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Absolute URLs to access the participants, messages and webhooks of this conversation.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The bindings
-        /// </summary>
-        [JsonProperty("bindings")]
-        public object Bindings { get; private set; }
-
-        private ConversationResource()
-        {
-
-        }
-    }
+{
+
+  public class ConversationResource : Resource
+  {
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    public sealed class StateEnum : StringEnum
+    {
+      private StateEnum(string value) : base(value) { }
+      public StateEnum() { }
+      public static implicit operator StateEnum(string value)
+      {
+        return new StateEnum(value);
+      }
+
+      public static readonly StateEnum Inactive = new StateEnum("inactive");
+      public static readonly StateEnum Active = new StateEnum("active");
+      public static readonly StateEnum Closed = new StateEnum("closed");
+    }
+
+    private static Request BuildCreateRequest(CreateConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Conversations",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Create a new conversation in your account's default service
+    /// </summary>
+    /// <param name="options"> Create Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ConversationResource Create(CreateConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new conversation in your account's default service
+    /// </summary>
+    /// <param name="options"> Create Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ConversationResource> CreateAsync(CreateConversationOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new conversation in your account's default service
+    /// </summary>
+    /// <param name="friendlyName"> The human-readable name of this conversation. </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="state"> Current state of this conversation. </param>
+    /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
+    /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ConversationResource Create(string friendlyName = null,
+                                              string uniqueName = null,
+                                              DateTime? dateCreated = null,
+                                              DateTime? dateUpdated = null,
+                                              string messagingServiceSid = null,
+                                              string attributes = null,
+                                              ConversationResource.StateEnum state = null,
+                                              string timersInactive = null,
+                                              string timersClosed = null,
+                                              ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateConversationOptions() { FriendlyName = friendlyName, UniqueName = uniqueName, DateCreated = dateCreated, DateUpdated = dateUpdated, MessagingServiceSid = messagingServiceSid, Attributes = attributes, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new conversation in your account's default service
+    /// </summary>
+    /// <param name="friendlyName"> The human-readable name of this conversation. </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="state"> Current state of this conversation. </param>
+    /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
+    /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ConversationResource> CreateAsync(string friendlyName = null,
+                                                                                      string uniqueName = null,
+                                                                                      DateTime? dateCreated = null,
+                                                                                      DateTime? dateUpdated = null,
+                                                                                      string messagingServiceSid = null,
+                                                                                      string attributes = null,
+                                                                                      ConversationResource.StateEnum state = null,
+                                                                                      string timersInactive = null,
+                                                                                      string timersClosed = null,
+                                                                                      ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateConversationOptions() { FriendlyName = friendlyName, UniqueName = uniqueName, DateCreated = dateCreated, DateUpdated = dateUpdated, MessagingServiceSid = messagingServiceSid, Attributes = attributes, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Update an existing conversation in your account's default service
+    /// </summary>
+    /// <param name="options"> Update Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ConversationResource Update(UpdateConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing conversation in your account's default service
+    /// </summary>
+    /// <param name="options"> Update Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ConversationResource> UpdateAsync(UpdateConversationOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing conversation in your account's default service
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="friendlyName"> The human-readable name of this conversation. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
+    /// <param name="state"> Current state of this conversation. </param>
+    /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
+    /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ConversationResource Update(string pathSid,
+                                              string friendlyName = null,
+                                              DateTime? dateCreated = null,
+                                              DateTime? dateUpdated = null,
+                                              string attributes = null,
+                                              string messagingServiceSid = null,
+                                              ConversationResource.StateEnum state = null,
+                                              string timersInactive = null,
+                                              string timersClosed = null,
+                                              string uniqueName = null,
+                                              ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateConversationOptions(pathSid) { FriendlyName = friendlyName, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingServiceSid = messagingServiceSid, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, UniqueName = uniqueName, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing conversation in your account's default service
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="friendlyName"> The human-readable name of this conversation. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
+    /// <param name="state"> Current state of this conversation. </param>
+    /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
+    /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ConversationResource> UpdateAsync(string pathSid,
+                                                                                      string friendlyName = null,
+                                                                                      DateTime? dateCreated = null,
+                                                                                      DateTime? dateUpdated = null,
+                                                                                      string attributes = null,
+                                                                                      string messagingServiceSid = null,
+                                                                                      ConversationResource.StateEnum state = null,
+                                                                                      string timersInactive = null,
+                                                                                      string timersClosed = null,
+                                                                                      string uniqueName = null,
+                                                                                      ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateConversationOptions(pathSid) { FriendlyName = friendlyName, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingServiceSid = messagingServiceSid, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, UniqueName = uniqueName, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Remove a conversation from your account's default service
+    /// </summary>
+    /// <param name="options"> Delete Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static bool Delete(DeleteConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a conversation from your account's default service
+    /// </summary>
+    /// <param name="options"> Delete Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteConversationOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a conversation from your account's default service
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static bool Delete(string pathSid,
+                              ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteConversationOptions(pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a conversation from your account's default service
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteConversationOptions(pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Conversations/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a conversation from your account's default service
+    /// </summary>
+    /// <param name="options"> Fetch Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ConversationResource Fetch(FetchConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a conversation from your account's default service
+    /// </summary>
+    /// <param name="options"> Fetch Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ConversationResource> FetchAsync(FetchConversationOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a conversation from your account's default service
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ConversationResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchConversationOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a conversation from your account's default service
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ConversationResource> FetchAsync(string pathSid,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchConversationOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Conversations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of conversations in your account's default service
+    /// </summary>
+    /// <param name="options"> Read Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ResourceSet<ConversationResource> Read(ReadConversationOptions options,
+                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ConversationResource>.FromJson("conversations", response.Content);
+      return new ResourceSet<ConversationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of conversations in your account's default service
+    /// </summary>
+    /// <param name="options"> Read Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ConversationResource>> ReadAsync(ReadConversationOptions options,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ConversationResource>.FromJson("conversations", response.Content);
+      return new ResourceSet<ConversationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of conversations in your account's default service
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ResourceSet<ConversationResource> Read(int? pageSize = null,
+                                                         long? limit = null,
+                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadConversationOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of conversations in your account's default service
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ConversationResource>> ReadAsync(int? pageSize = null,
+                                                                                                 long? limit = null,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadConversationOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ConversationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ConversationResource> NextPage(Page<ConversationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ConversationResource> PreviousPage(Page<ConversationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a ConversationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ConversationResource object represented by the provided JSON </returns>
+    public static ConversationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ConversationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this conversation.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation Service this conversation belongs to.
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Messaging Service this conversation belongs to.
+    /// </summary>
+    [JsonProperty("messaging_service_sid")]
+    public string MessagingServiceSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The human-readable name of this conversation.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// Current state of this conversation.
+    /// </summary>
+    [JsonProperty("state")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ConversationResource.StateEnum State { get; private set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Timer date values for this conversation.
+    /// </summary>
+    [JsonProperty("timers")]
+    public object Timers { get; private set; }
+    /// <summary>
+    /// An absolute URL for this conversation.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Absolute URLs to access the participants, messages and webhooks of this conversation.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The bindings
+    /// </summary>
+    [JsonProperty("bindings")]
+    public object Bindings { get; private set; }
+
+    private ConversationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/CredentialOptions.cs b/src/Twilio/Rest/Conversations/V1/CredentialOptions.cs
index 292c90d82..08796b11e 100644
--- a/src/Twilio/Rest/Conversations/V1/CredentialOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/CredentialOptions.cs
@@ -9,264 +9,264 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
+{
+
+  /// <summary>
+  /// Add a new push notification credential to your account
+  /// </summary>
+  public class CreateCredentialOptions : IOptions<CredentialResource>
+  {
     /// <summary>
-    /// Add a new push notification credential to your account
+    /// The type of push-notification service the credential is for.
     /// </summary>
-    public class CreateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The type of push-notification service the credential is for.
-        /// </summary>
-        public CredentialResource.PushTypeEnum Type { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// [APN only] The URL encoded representation of the certificate.
-        /// </summary>
-        public string Certificate { get; set; }
-        /// <summary>
-        /// [APN only] The URL encoded representation of the private key.
-        /// </summary>
-        public string PrivateKey { get; set; }
-        /// <summary>
-        /// [APN only] Whether to send the credential to sandbox APNs.
-        /// </summary>
-        public bool? Sandbox { get; set; }
-        /// <summary>
-        /// [GCM only] The API key for the project that was obtained from the Google Developer console for your GCM Service application credential.
-        /// </summary>
-        public string ApiKey { get; set; }
-        /// <summary>
-        /// [FCM only] The Server key of your project from Firebase console.
-        /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCredentialOptions
-        /// </summary>
-        /// <param name="type"> The type of push-notification service the credential is for. </param>
-        public CreateCredentialOptions(CredentialResource.PushTypeEnum type)
-        {
-            Type = type;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Certificate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
-            }
-
-            if (PrivateKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
-            }
-
-            if (Sandbox != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
-            }
-
-            if (ApiKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
-            }
-
-            if (Secret != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secret", Secret));
-            }
-
-            return p;
-        }
-    }
-
+    public CredentialResource.PushTypeEnum Type { get; }
     /// <summary>
-    /// Update an existing push notification credential on your account
+    /// A string to describe the resource
     /// </summary>
-    public class UpdateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The type of push-notification service the credential is for.
-        /// </summary>
-        public CredentialResource.PushTypeEnum Type { get; set; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// [APN only] The URL encoded representation of the certificate.
-        /// </summary>
-        public string Certificate { get; set; }
-        /// <summary>
-        /// [APN only] The URL encoded representation of the private key.
-        /// </summary>
-        public string PrivateKey { get; set; }
-        /// <summary>
-        /// [APN only] Whether to send the credential to sandbox APNs.
-        /// </summary>
-        public bool? Sandbox { get; set; }
-        /// <summary>
-        /// [GCM only] The API key for the project that was obtained from the Google Developer console for your GCM Service application credential.
-        /// </summary>
-        public string ApiKey { get; set; }
-        /// <summary>
-        /// [FCM only] The Server key of your project from Firebase console.
-        /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public UpdateCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Certificate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
-            }
-
-            if (PrivateKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
-            }
-
-            if (Sandbox != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
-            }
-
-            if (ApiKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
-            }
-
-            if (Secret != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secret", Secret));
-            }
-
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// Remove a push notification credential from your account
+    /// [APN only] The URL encoded representation of the certificate.
     /// </summary>
-    public class DeleteCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string Certificate { get; set; }
     /// <summary>
-    /// Fetch a push notification credential from your account
+    /// [APN only] The URL encoded representation of the private key.
     /// </summary>
-    public class FetchCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PrivateKey { get; set; }
     /// <summary>
-    /// Retrieve a list of all push notification credentials on your account
+    /// [APN only] Whether to send the credential to sandbox APNs.
     /// </summary>
-    public class ReadCredentialOptions : ReadOptions<CredentialResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public bool? Sandbox { get; set; }
+    /// <summary>
+    /// [GCM only] The API key for the project that was obtained from the Google Developer console for your GCM Service application credential.
+    /// </summary>
+    public string ApiKey { get; set; }
+    /// <summary>
+    /// [FCM only] The Server key of your project from Firebase console.
+    /// </summary>
+    public string Secret { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCredentialOptions
+    /// </summary>
+    /// <param name="type"> The type of push-notification service the credential is for. </param>
+    public CreateCredentialOptions(CredentialResource.PushTypeEnum type)
+    {
+      Type = type;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Certificate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
+      }
+
+      if (PrivateKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
+      }
+
+      if (Sandbox != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
+      }
+
+      if (ApiKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
+      }
+
+      if (Secret != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secret", Secret));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing push notification credential on your account
+  /// </summary>
+  public class UpdateCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The type of push-notification service the credential is for.
+    /// </summary>
+    public CredentialResource.PushTypeEnum Type { get; set; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// [APN only] The URL encoded representation of the certificate.
+    /// </summary>
+    public string Certificate { get; set; }
+    /// <summary>
+    /// [APN only] The URL encoded representation of the private key.
+    /// </summary>
+    public string PrivateKey { get; set; }
+    /// <summary>
+    /// [APN only] Whether to send the credential to sandbox APNs.
+    /// </summary>
+    public bool? Sandbox { get; set; }
+    /// <summary>
+    /// [GCM only] The API key for the project that was obtained from the Google Developer console for your GCM Service application credential.
+    /// </summary>
+    public string ApiKey { get; set; }
+    /// <summary>
+    /// [FCM only] The Server key of your project from Firebase console.
+    /// </summary>
+    public string Secret { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public UpdateCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Certificate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
+      }
+
+      if (PrivateKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
+      }
+
+      if (Sandbox != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
+      }
+
+      if (ApiKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
+      }
+
+      if (Secret != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secret", Secret));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove a push notification credential from your account
+  /// </summary>
+  public class DeleteCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a push notification credential from your account
+  /// </summary>
+  public class FetchCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all push notification credentials on your account
+  /// </summary>
+  public class ReadCredentialOptions : ReadOptions<CredentialResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/CredentialResource.cs b/src/Twilio/Rest/Conversations/V1/CredentialResource.cs
index 55fd2d0b1..e8807049f 100644
--- a/src/Twilio/Rest/Conversations/V1/CredentialResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/CredentialResource.cs
@@ -17,542 +17,542 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
-    public class CredentialResource : Resource
-    {
-        public sealed class PushTypeEnum : StringEnum
-        {
-            private PushTypeEnum(string value) : base(value) {}
-            public PushTypeEnum() {}
-            public static implicit operator PushTypeEnum(string value)
-            {
-                return new PushTypeEnum(value);
-            }
-
-            public static readonly PushTypeEnum Apn = new PushTypeEnum("apn");
-            public static readonly PushTypeEnum Gcm = new PushTypeEnum("gcm");
-            public static readonly PushTypeEnum Fcm = new PushTypeEnum("fcm");
-        }
-
-        private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Credentials",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Add a new push notification credential to your account
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new push notification credential to your account
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Add a new push notification credential to your account
-        /// </summary>
-        /// <param name="type"> The type of push-notification service the credential is for. </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL encoded representation of the certificate. </param>
-        /// <param name="privateKey"> [APN only] The URL encoded representation of the private key. </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs. </param>
-        /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
-        ///              for your GCM Service application credential. </param>
-        /// <param name="secret"> [FCM only] The Server key of your project from Firebase console. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(CredentialResource.PushTypeEnum type,
-                                                string friendlyName = null,
-                                                string certificate = null,
-                                                string privateKey = null,
-                                                bool? sandbox = null,
-                                                string apiKey = null,
-                                                string secret = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(type){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new push notification credential to your account
-        /// </summary>
-        /// <param name="type"> The type of push-notification service the credential is for. </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL encoded representation of the certificate. </param>
-        /// <param name="privateKey"> [APN only] The URL encoded representation of the private key. </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs. </param>
-        /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
-        ///              for your GCM Service application credential. </param>
-        /// <param name="secret"> [FCM only] The Server key of your project from Firebase console. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CredentialResource.PushTypeEnum type,
-                                                                                        string friendlyName = null,
-                                                                                        string certificate = null,
-                                                                                        string privateKey = null,
-                                                                                        bool? sandbox = null,
-                                                                                        string apiKey = null,
-                                                                                        string secret = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(type){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Credentials/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an existing push notification credential on your account
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing push notification credential on your account
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing push notification credential on your account
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="type"> The type of push-notification service the credential is for. </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL encoded representation of the certificate. </param>
-        /// <param name="privateKey"> [APN only] The URL encoded representation of the private key. </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs. </param>
-        /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
-        ///              for your GCM Service application credential. </param>
-        /// <param name="secret"> [FCM only] The Server key of your project from Firebase console. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(string pathSid,
-                                                CredentialResource.PushTypeEnum type = null,
-                                                string friendlyName = null,
-                                                string certificate = null,
-                                                string privateKey = null,
-                                                bool? sandbox = null,
-                                                string apiKey = null,
-                                                string secret = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathSid){Type = type, FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing push notification credential on your account
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="type"> The type of push-notification service the credential is for. </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL encoded representation of the certificate. </param>
-        /// <param name="privateKey"> [APN only] The URL encoded representation of the private key. </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs. </param>
-        /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
-        ///              for your GCM Service application credential. </param>
-        /// <param name="secret"> [FCM only] The Server key of your project from Firebase console. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathSid,
-                                                                                        CredentialResource.PushTypeEnum type = null,
-                                                                                        string friendlyName = null,
-                                                                                        string certificate = null,
-                                                                                        string privateKey = null,
-                                                                                        bool? sandbox = null,
-                                                                                        string apiKey = null,
-                                                                                        string secret = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathSid){Type = type, FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Credentials/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove a push notification credential from your account
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a push notification credential from your account
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a push notification credential from your account
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a push notification credential from your account
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Credentials/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a push notification credential from your account
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a push notification credential from your account
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a push notification credential from your account
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a push notification credential from your account
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Credentials",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all push notification credentials on your account
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all push notification credentials on your account
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all push notification credentials on your account
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all push notification credentials on your account
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a CredentialResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CredentialResource object represented by the provided JSON </returns>
-        public static CredentialResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CredentialResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Account responsible for this credential.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The human-readable name of this credential.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type of push-notification service the credential is for.
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CredentialResource.PushTypeEnum Type { get; private set; }
-        /// <summary>
-        /// [APN only] Whether to send the credential to sandbox APNs.
-        /// </summary>
-        [JsonProperty("sandbox")]
-        public string Sandbox { get; private set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An absolute URL for this credential.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CredentialResource()
-        {
-
-        }
-    }
+{
+
+  public class CredentialResource : Resource
+  {
+    public sealed class PushTypeEnum : StringEnum
+    {
+      private PushTypeEnum(string value) : base(value) { }
+      public PushTypeEnum() { }
+      public static implicit operator PushTypeEnum(string value)
+      {
+        return new PushTypeEnum(value);
+      }
+
+      public static readonly PushTypeEnum Apn = new PushTypeEnum("apn");
+      public static readonly PushTypeEnum Gcm = new PushTypeEnum("gcm");
+      public static readonly PushTypeEnum Fcm = new PushTypeEnum("fcm");
+    }
+
+    private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Credentials",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Add a new push notification credential to your account
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new push notification credential to your account
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Add a new push notification credential to your account
+    /// </summary>
+    /// <param name="type"> The type of push-notification service the credential is for. </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL encoded representation of the certificate. </param>
+    /// <param name="privateKey"> [APN only] The URL encoded representation of the private key. </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs. </param>
+    /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
+    ///              for your GCM Service application credential. </param>
+    /// <param name="secret"> [FCM only] The Server key of your project from Firebase console. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(CredentialResource.PushTypeEnum type,
+                                            string friendlyName = null,
+                                            string certificate = null,
+                                            string privateKey = null,
+                                            bool? sandbox = null,
+                                            string apiKey = null,
+                                            string secret = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(type) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new push notification credential to your account
+    /// </summary>
+    /// <param name="type"> The type of push-notification service the credential is for. </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL encoded representation of the certificate. </param>
+    /// <param name="privateKey"> [APN only] The URL encoded representation of the private key. </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs. </param>
+    /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
+    ///              for your GCM Service application credential. </param>
+    /// <param name="secret"> [FCM only] The Server key of your project from Firebase console. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CredentialResource.PushTypeEnum type,
+                                                                                    string friendlyName = null,
+                                                                                    string certificate = null,
+                                                                                    string privateKey = null,
+                                                                                    bool? sandbox = null,
+                                                                                    string apiKey = null,
+                                                                                    string secret = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(type) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Credentials/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an existing push notification credential on your account
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing push notification credential on your account
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing push notification credential on your account
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="type"> The type of push-notification service the credential is for. </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL encoded representation of the certificate. </param>
+    /// <param name="privateKey"> [APN only] The URL encoded representation of the private key. </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs. </param>
+    /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
+    ///              for your GCM Service application credential. </param>
+    /// <param name="secret"> [FCM only] The Server key of your project from Firebase console. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(string pathSid,
+                                            CredentialResource.PushTypeEnum type = null,
+                                            string friendlyName = null,
+                                            string certificate = null,
+                                            string privateKey = null,
+                                            bool? sandbox = null,
+                                            string apiKey = null,
+                                            string secret = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathSid) { Type = type, FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing push notification credential on your account
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="type"> The type of push-notification service the credential is for. </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL encoded representation of the certificate. </param>
+    /// <param name="privateKey"> [APN only] The URL encoded representation of the private key. </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs. </param>
+    /// <param name="apiKey"> [GCM only] The API key for the project that was obtained from the Google Developer console
+    ///              for your GCM Service application credential. </param>
+    /// <param name="secret"> [FCM only] The Server key of your project from Firebase console. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathSid,
+                                                                                    CredentialResource.PushTypeEnum type = null,
+                                                                                    string friendlyName = null,
+                                                                                    string certificate = null,
+                                                                                    string privateKey = null,
+                                                                                    bool? sandbox = null,
+                                                                                    string apiKey = null,
+                                                                                    string secret = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathSid) { Type = type, FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Credentials/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove a push notification credential from your account
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a push notification credential from your account
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a push notification credential from your account
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a push notification credential from your account
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Credentials/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a push notification credential from your account
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a push notification credential from your account
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a push notification credential from your account
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a push notification credential from your account
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Credentials",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all push notification credentials on your account
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all push notification credentials on your account
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all push notification credentials on your account
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all push notification credentials on your account
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a CredentialResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CredentialResource object represented by the provided JSON </returns>
+    public static CredentialResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CredentialResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Account responsible for this credential.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The human-readable name of this credential.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type of push-notification service the credential is for.
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CredentialResource.PushTypeEnum Type { get; private set; }
+    /// <summary>
+    /// [APN only] Whether to send the credential to sandbox APNs.
+    /// </summary>
+    [JsonProperty("sandbox")]
+    public string Sandbox { get; private set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An absolute URL for this credential.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CredentialResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/ParticipantConversationOptions.cs b/src/Twilio/Rest/Conversations/V1/ParticipantConversationOptions.cs
index 726f2ed96..28f836222 100644
--- a/src/Twilio/Rest/Conversations/V1/ParticipantConversationOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/ParticipantConversationOptions.cs
@@ -9,46 +9,46 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
+  /// should be specified.
+  /// </summary>
+  public class ReadParticipantConversationOptions : ReadOptions<ParticipantConversationResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
-    /// should be specified.
+    /// A unique string identifier for the conversation participant as Conversation User.
     /// </summary>
-    public class ReadParticipantConversationOptions : ReadOptions<ParticipantConversationResource>
-    {
-        /// <summary>
-        /// A unique string identifier for the conversation participant as Conversation User.
-        /// </summary>
-        public string Identity { get; set; }
-        /// <summary>
-        /// A unique string identifier for the conversation participant who's not a Conversation User.
-        /// </summary>
-        public string Address { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (Address != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Address", Address));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string Identity { get; set; }
+    /// <summary>
+    /// A unique string identifier for the conversation participant who's not a Conversation User.
+    /// </summary>
+    public string Address { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (Address != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Address", Address));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/ParticipantConversationResource.cs b/src/Twilio/Rest/Conversations/V1/ParticipantConversationResource.cs
index 3d99d1d12..5cd958d0a 100644
--- a/src/Twilio/Rest/Conversations/V1/ParticipantConversationResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/ParticipantConversationResource.cs
@@ -17,274 +17,274 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
-    public class ParticipantConversationResource : Resource
-    {
-        public sealed class StateEnum : StringEnum
-        {
-            private StateEnum(string value) : base(value) {}
-            public StateEnum() {}
-            public static implicit operator StateEnum(string value)
-            {
-                return new StateEnum(value);
-            }
-
-            public static readonly StateEnum Inactive = new StateEnum("inactive");
-            public static readonly StateEnum Active = new StateEnum("active");
-            public static readonly StateEnum Closed = new StateEnum("closed");
-        }
-
-        private static Request BuildReadRequest(ReadParticipantConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/ParticipantConversations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
-        /// should be specified.
-        /// </summary>
-        /// <param name="options"> Read ParticipantConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ParticipantConversation </returns>
-        public static ResourceSet<ParticipantConversationResource> Read(ReadParticipantConversationOptions options,
-                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
-            return new ResourceSet<ParticipantConversationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
-        /// should be specified.
-        /// </summary>
-        /// <param name="options"> Read ParticipantConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ParticipantConversation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantConversationResource>> ReadAsync(ReadParticipantConversationOptions options,
-                                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
-            return new ResourceSet<ParticipantConversationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
-        /// should be specified.
-        /// </summary>
-        /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
-        /// <param name="address"> A unique string identifier for the conversation participant who's not a Conversation User.
-        ///               </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ParticipantConversation </returns>
-        public static ResourceSet<ParticipantConversationResource> Read(string identity = null,
-                                                                        string address = null,
-                                                                        int? pageSize = null,
-                                                                        long? limit = null,
-                                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantConversationOptions(){Identity = identity, Address = address, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
-        /// should be specified.
-        /// </summary>
-        /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
-        /// <param name="address"> A unique string identifier for the conversation participant who's not a Conversation User.
-        ///               </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ParticipantConversation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantConversationResource>> ReadAsync(string identity = null,
-                                                                                                                string address = null,
-                                                                                                                int? pageSize = null,
-                                                                                                                long? limit = null,
-                                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantConversationOptions(){Identity = identity, Address = address, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ParticipantConversationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ParticipantConversationResource> NextPage(Page<ParticipantConversationResource> page,
-                                                                     ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ParticipantConversationResource> PreviousPage(Page<ParticipantConversationResource> page,
-                                                                         ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a ParticipantConversationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ParticipantConversationResource object represented by the provided JSON </returns>
-        public static ParticipantConversationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ParticipantConversationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this conversation.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation Service this conversation belongs to.
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Participant.
-        /// </summary>
-        [JsonProperty("participant_sid")]
-        public string ParticipantSid { get; private set; }
-        /// <summary>
-        /// The unique ID for the conversation participant as Conversation User.
-        /// </summary>
-        [JsonProperty("participant_user_sid")]
-        public string ParticipantUserSid { get; private set; }
-        /// <summary>
-        /// A unique string identifier for the conversation participant as Conversation User.
-        /// </summary>
-        [JsonProperty("participant_identity")]
-        public string ParticipantIdentity { get; private set; }
-        /// <summary>
-        /// Information about how this participant exchanges messages with the conversation.
-        /// </summary>
-        [JsonProperty("participant_messaging_binding")]
-        public object ParticipantMessagingBinding { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation this Participant belongs to.
-        /// </summary>
-        [JsonProperty("conversation_sid")]
-        public string ConversationSid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the Conversation resource
-        /// </summary>
-        [JsonProperty("conversation_unique_name")]
-        public string ConversationUniqueName { get; private set; }
-        /// <summary>
-        /// The human-readable name of this conversation.
-        /// </summary>
-        [JsonProperty("conversation_friendly_name")]
-        public string ConversationFriendlyName { get; private set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        [JsonProperty("conversation_attributes")]
-        public string ConversationAttributes { get; private set; }
-        /// <summary>
-        /// The date that this conversation was created.
-        /// </summary>
-        [JsonProperty("conversation_date_created")]
-        public DateTime? ConversationDateCreated { get; private set; }
-        /// <summary>
-        /// The date that this conversation was last updated.
-        /// </summary>
-        [JsonProperty("conversation_date_updated")]
-        public DateTime? ConversationDateUpdated { get; private set; }
-        /// <summary>
-        /// Creator of this conversation.
-        /// </summary>
-        [JsonProperty("conversation_created_by")]
-        public string ConversationCreatedBy { get; private set; }
-        /// <summary>
-        /// The current state of this User Conversation
-        /// </summary>
-        [JsonProperty("conversation_state")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ParticipantConversationResource.StateEnum ConversationState { get; private set; }
-        /// <summary>
-        /// Timer date values for this conversation.
-        /// </summary>
-        [JsonProperty("conversation_timers")]
-        public object ConversationTimers { get; private set; }
-        /// <summary>
-        /// Absolute URLs to access the participant and conversation of this Participant Conversation.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ParticipantConversationResource()
-        {
-
-        }
-    }
+{
+
+  public class ParticipantConversationResource : Resource
+  {
+    public sealed class StateEnum : StringEnum
+    {
+      private StateEnum(string value) : base(value) { }
+      public StateEnum() { }
+      public static implicit operator StateEnum(string value)
+      {
+        return new StateEnum(value);
+      }
+
+      public static readonly StateEnum Inactive = new StateEnum("inactive");
+      public static readonly StateEnum Active = new StateEnum("active");
+      public static readonly StateEnum Closed = new StateEnum("closed");
+    }
+
+    private static Request BuildReadRequest(ReadParticipantConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/ParticipantConversations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
+    /// should be specified.
+    /// </summary>
+    /// <param name="options"> Read ParticipantConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ParticipantConversation </returns>
+    public static ResourceSet<ParticipantConversationResource> Read(ReadParticipantConversationOptions options,
+                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
+      return new ResourceSet<ParticipantConversationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
+    /// should be specified.
+    /// </summary>
+    /// <param name="options"> Read ParticipantConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ParticipantConversation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantConversationResource>> ReadAsync(ReadParticipantConversationOptions options,
+                                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
+      return new ResourceSet<ParticipantConversationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
+    /// should be specified.
+    /// </summary>
+    /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
+    /// <param name="address"> A unique string identifier for the conversation participant who's not a Conversation User.
+    ///               </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ParticipantConversation </returns>
+    public static ResourceSet<ParticipantConversationResource> Read(string identity = null,
+                                                                    string address = null,
+                                                                    int? pageSize = null,
+                                                                    long? limit = null,
+                                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantConversationOptions() { Identity = identity, Address = address, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
+    /// should be specified.
+    /// </summary>
+    /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
+    /// <param name="address"> A unique string identifier for the conversation participant who's not a Conversation User.
+    ///               </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ParticipantConversation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantConversationResource>> ReadAsync(string identity = null,
+                                                                                                            string address = null,
+                                                                                                            int? pageSize = null,
+                                                                                                            long? limit = null,
+                                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantConversationOptions() { Identity = identity, Address = address, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ParticipantConversationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ParticipantConversationResource> NextPage(Page<ParticipantConversationResource> page,
+                                                                 ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ParticipantConversationResource> PreviousPage(Page<ParticipantConversationResource> page,
+                                                                     ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a ParticipantConversationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ParticipantConversationResource object represented by the provided JSON </returns>
+    public static ParticipantConversationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ParticipantConversationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this conversation.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation Service this conversation belongs to.
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Participant.
+    /// </summary>
+    [JsonProperty("participant_sid")]
+    public string ParticipantSid { get; private set; }
+    /// <summary>
+    /// The unique ID for the conversation participant as Conversation User.
+    /// </summary>
+    [JsonProperty("participant_user_sid")]
+    public string ParticipantUserSid { get; private set; }
+    /// <summary>
+    /// A unique string identifier for the conversation participant as Conversation User.
+    /// </summary>
+    [JsonProperty("participant_identity")]
+    public string ParticipantIdentity { get; private set; }
+    /// <summary>
+    /// Information about how this participant exchanges messages with the conversation.
+    /// </summary>
+    [JsonProperty("participant_messaging_binding")]
+    public object ParticipantMessagingBinding { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation this Participant belongs to.
+    /// </summary>
+    [JsonProperty("conversation_sid")]
+    public string ConversationSid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the Conversation resource
+    /// </summary>
+    [JsonProperty("conversation_unique_name")]
+    public string ConversationUniqueName { get; private set; }
+    /// <summary>
+    /// The human-readable name of this conversation.
+    /// </summary>
+    [JsonProperty("conversation_friendly_name")]
+    public string ConversationFriendlyName { get; private set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    [JsonProperty("conversation_attributes")]
+    public string ConversationAttributes { get; private set; }
+    /// <summary>
+    /// The date that this conversation was created.
+    /// </summary>
+    [JsonProperty("conversation_date_created")]
+    public DateTime? ConversationDateCreated { get; private set; }
+    /// <summary>
+    /// The date that this conversation was last updated.
+    /// </summary>
+    [JsonProperty("conversation_date_updated")]
+    public DateTime? ConversationDateUpdated { get; private set; }
+    /// <summary>
+    /// Creator of this conversation.
+    /// </summary>
+    [JsonProperty("conversation_created_by")]
+    public string ConversationCreatedBy { get; private set; }
+    /// <summary>
+    /// The current state of this User Conversation
+    /// </summary>
+    [JsonProperty("conversation_state")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ParticipantConversationResource.StateEnum ConversationState { get; private set; }
+    /// <summary>
+    /// Timer date values for this conversation.
+    /// </summary>
+    [JsonProperty("conversation_timers")]
+    public object ConversationTimers { get; private set; }
+    /// <summary>
+    /// Absolute URLs to access the participant and conversation of this Participant Conversation.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ParticipantConversationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/RoleOptions.cs b/src/Twilio/Rest/Conversations/V1/RoleOptions.cs
index aebaaf3dd..2ecda4a16 100644
--- a/src/Twilio/Rest/Conversations/V1/RoleOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/RoleOptions.cs
@@ -10,180 +10,180 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
+{
+
+  /// <summary>
+  /// Create a new user role in your account's default service
+  /// </summary>
+  public class CreateRoleOptions : IOptions<RoleResource>
+  {
     /// <summary>
-    /// Create a new user role in your account's default service
-    /// </summary>
-    public class CreateRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// A string to describe the new resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The type of role
-        /// </summary>
-        public RoleResource.RoleTypeEnum Type { get; }
-        /// <summary>
-        /// A permission the role should have
-        /// </summary>
-        public List<string> Permission { get; }
-
-        /// <summary>
-        /// Construct a new CreateRoleOptions
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="type"> The type of role </param>
-        /// <param name="permission"> A permission the role should have </param>
-        public CreateRoleOptions(string friendlyName, RoleResource.RoleTypeEnum type, List<string> permission)
-        {
-            FriendlyName = friendlyName;
-            Type = type;
-            Permission = permission;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (Permission != null)
-            {
-                p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
-            }
-
-            return p;
-        }
-    }
-
+    /// A string to describe the new resource
+    /// </summary>
+    public string FriendlyName { get; }
     /// <summary>
-    /// Update an existing user role in your account's default service
-    /// </summary>
-    public class UpdateRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Role resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A permission the role should have
-        /// </summary>
-        public List<string> Permission { get; }
-
-        /// <summary>
-        /// Construct a new UpdateRoleOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Role resource to update </param>
-        /// <param name="permission"> A permission the role should have </param>
-        public UpdateRoleOptions(string pathSid, List<string> permission)
-        {
-            PathSid = pathSid;
-            Permission = permission;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Permission != null)
-            {
-                p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
-            }
-
-            return p;
-        }
-    }
-
+    /// The type of role
+    /// </summary>
+    public RoleResource.RoleTypeEnum Type { get; }
     /// <summary>
-    /// Remove a user role from your account's default service
+    /// A permission the role should have
     /// </summary>
-    public class DeleteRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Role resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRoleOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Role resource to delete </param>
-        public DeleteRoleOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<string> Permission { get; }
+
     /// <summary>
-    /// Fetch a user role from your account's default service
+    /// Construct a new CreateRoleOptions
     /// </summary>
-    public class FetchRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Role resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRoleOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Role resource to fetch </param>
-        public FetchRoleOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="type"> The type of role </param>
+    /// <param name="permission"> A permission the role should have </param>
+    public CreateRoleOptions(string friendlyName, RoleResource.RoleTypeEnum type, List<string> permission)
+    {
+      FriendlyName = friendlyName;
+      Type = type;
+      Permission = permission;
+    }
+
     /// <summary>
-    /// Retrieve a list of all user roles in your account's default service
-    /// </summary>
-    public class ReadRoleOptions : ReadOptions<RoleResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (Permission != null)
+      {
+        p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing user role in your account's default service
+  /// </summary>
+  public class UpdateRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The SID of the Role resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A permission the role should have
+    /// </summary>
+    public List<string> Permission { get; }
+
+    /// <summary>
+    /// Construct a new UpdateRoleOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Role resource to update </param>
+    /// <param name="permission"> A permission the role should have </param>
+    public UpdateRoleOptions(string pathSid, List<string> permission)
+    {
+      PathSid = pathSid;
+      Permission = permission;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Permission != null)
+      {
+        p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove a user role from your account's default service
+  /// </summary>
+  public class DeleteRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The SID of the Role resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRoleOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Role resource to delete </param>
+    public DeleteRoleOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a user role from your account's default service
+  /// </summary>
+  public class FetchRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The SID of the Role resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchRoleOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Role resource to fetch </param>
+    public FetchRoleOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all user roles in your account's default service
+  /// </summary>
+  public class ReadRoleOptions : ReadOptions<RoleResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/RoleResource.cs b/src/Twilio/Rest/Conversations/V1/RoleResource.cs
index 0ad54bac1..1bd1120ca 100644
--- a/src/Twilio/Rest/Conversations/V1/RoleResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/RoleResource.cs
@@ -17,500 +17,500 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
-    public class RoleResource : Resource
-    {
-        public sealed class RoleTypeEnum : StringEnum
-        {
-            private RoleTypeEnum(string value) : base(value) {}
-            public RoleTypeEnum() {}
-            public static implicit operator RoleTypeEnum(string value)
-            {
-                return new RoleTypeEnum(value);
-            }
-
-            public static readonly RoleTypeEnum Conversation = new RoleTypeEnum("conversation");
-            public static readonly RoleTypeEnum Service = new RoleTypeEnum("service");
-        }
-
-        private static Request BuildCreateRequest(CreateRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Roles",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new user role in your account's default service
-        /// </summary>
-        /// <param name="options"> Create Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Create(CreateRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new user role in your account's default service
-        /// </summary>
-        /// <param name="options"> Create Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(CreateRoleOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new user role in your account's default service
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="type"> The type of role </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Create(string friendlyName,
-                                          RoleResource.RoleTypeEnum type,
-                                          List<string> permission,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateRoleOptions(friendlyName, type, permission);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new user role in your account's default service
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="type"> The type of role </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(string friendlyName,
-                                                                                  RoleResource.RoleTypeEnum type,
-                                                                                  List<string> permission,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateRoleOptions(friendlyName, type, permission);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Roles/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an existing user role in your account's default service
-        /// </summary>
-        /// <param name="options"> Update Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Update(UpdateRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing user role in your account's default service
-        /// </summary>
-        /// <param name="options"> Update Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(UpdateRoleOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing user role in your account's default service
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Role resource to update </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Update(string pathSid, List<string> permission, ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoleOptions(pathSid, permission);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing user role in your account's default service
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Role resource to update </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(string pathSid,
-                                                                                  List<string> permission,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoleOptions(pathSid, permission);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Roles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove a user role from your account's default service
-        /// </summary>
-        /// <param name="options"> Delete Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static bool Delete(DeleteRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a user role from your account's default service
-        /// </summary>
-        /// <param name="options"> Delete Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoleOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a user role from your account's default service
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Role resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoleOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a user role from your account's default service
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Role resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoleOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Roles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a user role from your account's default service
-        /// </summary>
-        /// <param name="options"> Fetch Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Fetch(FetchRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a user role from your account's default service
-        /// </summary>
-        /// <param name="options"> Fetch Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(FetchRoleOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a user role from your account's default service
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Role resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRoleOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a user role from your account's default service
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Role resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchRoleOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Roles",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all user roles in your account's default service
-        /// </summary>
-        /// <param name="options"> Read Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static ResourceSet<RoleResource> Read(ReadRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RoleResource>.FromJson("roles", response.Content);
-            return new ResourceSet<RoleResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all user roles in your account's default service
-        /// </summary>
-        /// <param name="options"> Read Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(ReadRoleOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RoleResource>.FromJson("roles", response.Content);
-            return new ResourceSet<RoleResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all user roles in your account's default service
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static ResourceSet<RoleResource> Read(int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadRoleOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all user roles in your account's default service
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadRoleOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RoleResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RoleResource> NextPage(Page<RoleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RoleResource> PreviousPage(Page<RoleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a RoleResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RoleResource object represented by the provided JSON </returns>
-        public static RoleResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RoleResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type of role
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoleResource.RoleTypeEnum Type { get; private set; }
-        /// <summary>
-        /// An array of the permissions the role has been granted
-        /// </summary>
-        [JsonProperty("permissions")]
-        public List<string> Permissions { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An absolute URL for this user role.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private RoleResource()
-        {
-
-        }
-    }
+{
+
+  public class RoleResource : Resource
+  {
+    public sealed class RoleTypeEnum : StringEnum
+    {
+      private RoleTypeEnum(string value) : base(value) { }
+      public RoleTypeEnum() { }
+      public static implicit operator RoleTypeEnum(string value)
+      {
+        return new RoleTypeEnum(value);
+      }
+
+      public static readonly RoleTypeEnum Conversation = new RoleTypeEnum("conversation");
+      public static readonly RoleTypeEnum Service = new RoleTypeEnum("service");
+    }
+
+    private static Request BuildCreateRequest(CreateRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Roles",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new user role in your account's default service
+    /// </summary>
+    /// <param name="options"> Create Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Create(CreateRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new user role in your account's default service
+    /// </summary>
+    /// <param name="options"> Create Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(CreateRoleOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new user role in your account's default service
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="type"> The type of role </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Create(string friendlyName,
+                                      RoleResource.RoleTypeEnum type,
+                                      List<string> permission,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateRoleOptions(friendlyName, type, permission);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new user role in your account's default service
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="type"> The type of role </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(string friendlyName,
+                                                                              RoleResource.RoleTypeEnum type,
+                                                                              List<string> permission,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateRoleOptions(friendlyName, type, permission);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Roles/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an existing user role in your account's default service
+    /// </summary>
+    /// <param name="options"> Update Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Update(UpdateRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing user role in your account's default service
+    /// </summary>
+    /// <param name="options"> Update Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(UpdateRoleOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing user role in your account's default service
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Role resource to update </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Update(string pathSid, List<string> permission, ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoleOptions(pathSid, permission);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing user role in your account's default service
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Role resource to update </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(string pathSid,
+                                                                              List<string> permission,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoleOptions(pathSid, permission);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Roles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove a user role from your account's default service
+    /// </summary>
+    /// <param name="options"> Delete Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static bool Delete(DeleteRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a user role from your account's default service
+    /// </summary>
+    /// <param name="options"> Delete Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoleOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a user role from your account's default service
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Role resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoleOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a user role from your account's default service
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Role resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoleOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Roles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a user role from your account's default service
+    /// </summary>
+    /// <param name="options"> Fetch Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Fetch(FetchRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a user role from your account's default service
+    /// </summary>
+    /// <param name="options"> Fetch Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(FetchRoleOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a user role from your account's default service
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Role resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRoleOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a user role from your account's default service
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Role resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchRoleOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Roles",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all user roles in your account's default service
+    /// </summary>
+    /// <param name="options"> Read Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static ResourceSet<RoleResource> Read(ReadRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RoleResource>.FromJson("roles", response.Content);
+      return new ResourceSet<RoleResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all user roles in your account's default service
+    /// </summary>
+    /// <param name="options"> Read Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(ReadRoleOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RoleResource>.FromJson("roles", response.Content);
+      return new ResourceSet<RoleResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all user roles in your account's default service
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static ResourceSet<RoleResource> Read(int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadRoleOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all user roles in your account's default service
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadRoleOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RoleResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RoleResource> NextPage(Page<RoleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RoleResource> PreviousPage(Page<RoleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a RoleResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RoleResource object represented by the provided JSON </returns>
+    public static RoleResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RoleResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type of role
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoleResource.RoleTypeEnum Type { get; private set; }
+    /// <summary>
+    /// An array of the permissions the role has been granted
+    /// </summary>
+    [JsonProperty("permissions")]
+    public List<string> Permissions { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An absolute URL for this user role.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private RoleResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/BindingOptions.cs b/src/Twilio/Rest/Conversations/V1/Service/BindingOptions.cs
index 324f05ff8..f291dc473 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/BindingOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/BindingOptions.cs
@@ -10,130 +10,130 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// Remove a push notification binding from the conversation service
+  /// </summary>
+  public class DeleteBindingOptions : IOptions<BindingResource>
+  {
     /// <summary>
-    /// Remove a push notification binding from the conversation service
+    /// The SID of the Conversation Service to delete the resource from
     /// </summary>
-    public class DeleteBindingOptions : IOptions<BindingResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service to delete the resource from
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The SID of the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteBindingOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        public DeleteBindingOptions(string pathChatServiceSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathChatServiceSid { get; }
     /// <summary>
-    /// Fetch a push notification binding from the conversation service
+    /// The SID of the resource to delete
     /// </summary>
-    public class FetchBindingOptions : IOptions<BindingResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchBindingOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchBindingOptions(string pathChatServiceSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// Retrieve a list of all push notification bindings in the conversation service
+    /// Construct a new DeleteBindingOptions
     /// </summary>
-    public class ReadBindingOptions : ReadOptions<BindingResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The push technology used by the Binding resources to read.
-        /// </summary>
-        public List<BindingResource.BindingTypeEnum> BindingType { get; set; }
-        /// <summary>
-        /// The identity of Conversation User associated with this binding.
-        /// </summary>
-        public List<string> Identity { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadBindingOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        public ReadBindingOptions(string pathChatServiceSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            BindingType = new List<BindingResource.BindingTypeEnum>();
-            Identity = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (BindingType != null)
-            {
-                p.AddRange(BindingType.Select(prop => new KeyValuePair<string, string>("BindingType", prop.ToString())));
-            }
-
-            if (Identity != null)
-            {
-                p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    public DeleteBindingOptions(string pathChatServiceSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a push notification binding from the conversation service
+  /// </summary>
+  public class FetchBindingOptions : IOptions<BindingResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchBindingOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchBindingOptions(string pathChatServiceSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all push notification bindings in the conversation service
+  /// </summary>
+  public class ReadBindingOptions : ReadOptions<BindingResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The push technology used by the Binding resources to read.
+    /// </summary>
+    public List<BindingResource.BindingTypeEnum> BindingType { get; set; }
+    /// <summary>
+    /// The identity of Conversation User associated with this binding.
+    /// </summary>
+    public List<string> Identity { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadBindingOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    public ReadBindingOptions(string pathChatServiceSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      BindingType = new List<BindingResource.BindingTypeEnum>();
+      Identity = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (BindingType != null)
+      {
+        p.AddRange(BindingType.Select(prop => new KeyValuePair<string, string>("BindingType", prop.ToString())));
+      }
+
+      if (Identity != null)
+      {
+        p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/BindingResource.cs b/src/Twilio/Rest/Conversations/V1/Service/BindingResource.cs
index c702b92f7..154f0c48e 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/BindingResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/BindingResource.cs
@@ -17,384 +17,384 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Service
-{
-
-    public class BindingResource : Resource
-    {
-        public sealed class BindingTypeEnum : StringEnum
-        {
-            private BindingTypeEnum(string value) : base(value) {}
-            public BindingTypeEnum() {}
-            public static implicit operator BindingTypeEnum(string value)
-            {
-                return new BindingTypeEnum(value);
-            }
-
-            public static readonly BindingTypeEnum Apn = new BindingTypeEnum("apn");
-            public static readonly BindingTypeEnum Gcm = new BindingTypeEnum("gcm");
-            public static readonly BindingTypeEnum Fcm = new BindingTypeEnum("fcm");
-        }
-
-        private static Request BuildDeleteRequest(DeleteBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Bindings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove a push notification binding from the conversation service
-        /// </summary>
-        /// <param name="options"> Delete Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static bool Delete(DeleteBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a push notification binding from the conversation service
-        /// </summary>
-        /// <param name="options"> Delete Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBindingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a push notification binding from the conversation service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static bool Delete(string pathChatServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteBindingOptions(pathChatServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a push notification binding from the conversation service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteBindingOptions(pathChatServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Bindings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a push notification binding from the conversation service
-        /// </summary>
-        /// <param name="options"> Fetch Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static BindingResource Fetch(FetchBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a push notification binding from the conversation service
-        /// </summary>
-        /// <param name="options"> Fetch Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(FetchBindingOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a push notification binding from the conversation service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static BindingResource Fetch(string pathChatServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchBindingOptions(pathChatServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a push notification binding from the conversation service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(string pathChatServiceSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchBindingOptions(pathChatServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Bindings",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all push notification bindings in the conversation service
-        /// </summary>
-        /// <param name="options"> Read Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static ResourceSet<BindingResource> Read(ReadBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<BindingResource>.FromJson("bindings", response.Content);
-            return new ResourceSet<BindingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all push notification bindings in the conversation service
-        /// </summary>
-        /// <param name="options"> Read Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(ReadBindingOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<BindingResource>.FromJson("bindings", response.Content);
-            return new ResourceSet<BindingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all push notification bindings in the conversation service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="bindingType"> The push technology used by the Binding resources to read. </param>
-        /// <param name="identity"> The identity of Conversation User associated with this binding. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static ResourceSet<BindingResource> Read(string pathChatServiceSid,
-                                                        List<BindingResource.BindingTypeEnum> bindingType = null,
-                                                        List<string> identity = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadBindingOptions(pathChatServiceSid){BindingType = bindingType, Identity = identity, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all push notification bindings in the conversation service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="bindingType"> The push technology used by the Binding resources to read. </param>
-        /// <param name="identity"> The identity of Conversation User associated with this binding. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(string pathChatServiceSid,
-                                                                                                List<BindingResource.BindingTypeEnum> bindingType = null,
-                                                                                                List<string> identity = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadBindingOptions(pathChatServiceSid){BindingType = bindingType, Identity = identity, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<BindingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<BindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<BindingResource> NextPage(Page<BindingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<BindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<BindingResource> PreviousPage(Page<BindingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<BindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a BindingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BindingResource object represented by the provided JSON </returns>
-        public static BindingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BindingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Account responsible for this binding.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Credential for the binding.
-        /// </summary>
-        [JsonProperty("credential_sid")]
-        public string CredentialSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The unique endpoint identifier for the Binding.
-        /// </summary>
-        [JsonProperty("endpoint")]
-        public string Endpoint { get; private set; }
-        /// <summary>
-        /// The identity of Conversation User associated with this binding.
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The push technology to use for the binding.
-        /// </summary>
-        [JsonProperty("binding_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public BindingResource.BindingTypeEnum BindingType { get; private set; }
-        /// <summary>
-        /// The Conversation message types the binding is subscribed to.
-        /// </summary>
-        [JsonProperty("message_types")]
-        public List<string> MessageTypes { get; private set; }
-        /// <summary>
-        /// An absolute URL for this binding.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private BindingResource()
-        {
-
-        }
-    }
+{
+
+  public class BindingResource : Resource
+  {
+    public sealed class BindingTypeEnum : StringEnum
+    {
+      private BindingTypeEnum(string value) : base(value) { }
+      public BindingTypeEnum() { }
+      public static implicit operator BindingTypeEnum(string value)
+      {
+        return new BindingTypeEnum(value);
+      }
+
+      public static readonly BindingTypeEnum Apn = new BindingTypeEnum("apn");
+      public static readonly BindingTypeEnum Gcm = new BindingTypeEnum("gcm");
+      public static readonly BindingTypeEnum Fcm = new BindingTypeEnum("fcm");
+    }
+
+    private static Request BuildDeleteRequest(DeleteBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Bindings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove a push notification binding from the conversation service
+    /// </summary>
+    /// <param name="options"> Delete Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static bool Delete(DeleteBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a push notification binding from the conversation service
+    /// </summary>
+    /// <param name="options"> Delete Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBindingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a push notification binding from the conversation service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static bool Delete(string pathChatServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteBindingOptions(pathChatServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a push notification binding from the conversation service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteBindingOptions(pathChatServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Bindings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a push notification binding from the conversation service
+    /// </summary>
+    /// <param name="options"> Fetch Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static BindingResource Fetch(FetchBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a push notification binding from the conversation service
+    /// </summary>
+    /// <param name="options"> Fetch Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(FetchBindingOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a push notification binding from the conversation service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static BindingResource Fetch(string pathChatServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchBindingOptions(pathChatServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a push notification binding from the conversation service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(string pathChatServiceSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchBindingOptions(pathChatServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Bindings",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all push notification bindings in the conversation service
+    /// </summary>
+    /// <param name="options"> Read Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static ResourceSet<BindingResource> Read(ReadBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<BindingResource>.FromJson("bindings", response.Content);
+      return new ResourceSet<BindingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all push notification bindings in the conversation service
+    /// </summary>
+    /// <param name="options"> Read Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(ReadBindingOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<BindingResource>.FromJson("bindings", response.Content);
+      return new ResourceSet<BindingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all push notification bindings in the conversation service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="bindingType"> The push technology used by the Binding resources to read. </param>
+    /// <param name="identity"> The identity of Conversation User associated with this binding. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static ResourceSet<BindingResource> Read(string pathChatServiceSid,
+                                                    List<BindingResource.BindingTypeEnum> bindingType = null,
+                                                    List<string> identity = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadBindingOptions(pathChatServiceSid) { BindingType = bindingType, Identity = identity, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all push notification bindings in the conversation service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="bindingType"> The push technology used by the Binding resources to read. </param>
+    /// <param name="identity"> The identity of Conversation User associated with this binding. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(string pathChatServiceSid,
+                                                                                            List<BindingResource.BindingTypeEnum> bindingType = null,
+                                                                                            List<string> identity = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadBindingOptions(pathChatServiceSid) { BindingType = bindingType, Identity = identity, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<BindingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<BindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<BindingResource> NextPage(Page<BindingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<BindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<BindingResource> PreviousPage(Page<BindingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<BindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a BindingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BindingResource object represented by the provided JSON </returns>
+    public static BindingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BindingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Account responsible for this binding.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Credential for the binding.
+    /// </summary>
+    [JsonProperty("credential_sid")]
+    public string CredentialSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The unique endpoint identifier for the Binding.
+    /// </summary>
+    [JsonProperty("endpoint")]
+    public string Endpoint { get; private set; }
+    /// <summary>
+    /// The identity of Conversation User associated with this binding.
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The push technology to use for the binding.
+    /// </summary>
+    [JsonProperty("binding_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public BindingResource.BindingTypeEnum BindingType { get; private set; }
+    /// <summary>
+    /// The Conversation message types the binding is subscribed to.
+    /// </summary>
+    [JsonProperty("message_types")]
+    public List<string> MessageTypes { get; private set; }
+    /// <summary>
+    /// An absolute URL for this binding.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private BindingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/Configuration/NotificationOptions.cs b/src/Twilio/Rest/Conversations/V1/Service/Configuration/NotificationOptions.cs
index bab24ded1..3aa05e4b0 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/Configuration/NotificationOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/Configuration/NotificationOptions.cs
@@ -9,181 +9,181 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Service.Configuration
-{
-
+{
+
+  /// <summary>
+  /// Update push notification service settings
+  /// </summary>
+  public class UpdateNotificationOptions : IOptions<NotificationResource>
+  {
     /// <summary>
-    /// Update push notification service settings
-    /// </summary>
-    public class UpdateNotificationOptions : IOptions<NotificationResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the Configuration applies to.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// Weather the notification logging is enabled.
-        /// </summary>
-        public bool? LogEnabled { get; set; }
-        /// <summary>
-        /// Whether to send a notification when a new message is added to a conversation.
-        /// </summary>
-        public bool? NewMessageEnabled { get; set; }
-        /// <summary>
-        /// The template to use to create the notification text displayed when a new message is added to a conversation.
-        /// </summary>
-        public string NewMessageTemplate { get; set; }
-        /// <summary>
-        /// The name of the sound to play when a new message is added to a conversation.
-        /// </summary>
-        public string NewMessageSound { get; set; }
-        /// <summary>
-        /// Whether the new message badge is enabled.
-        /// </summary>
-        public bool? NewMessageBadgeCountEnabled { get; set; }
-        /// <summary>
-        /// Whether to send a notification when a participant is added to a conversation.
-        /// </summary>
-        public bool? AddedToConversationEnabled { get; set; }
-        /// <summary>
-        /// The template to use to create the notification text displayed when a participant is added to a conversation.
-        /// </summary>
-        public string AddedToConversationTemplate { get; set; }
-        /// <summary>
-        /// The name of the sound to play when a participant is added to a conversation.
-        /// </summary>
-        public string AddedToConversationSound { get; set; }
-        /// <summary>
-        /// Whether to send a notification to a user when they are removed from a conversation.
-        /// </summary>
-        public bool? RemovedFromConversationEnabled { get; set; }
-        /// <summary>
-        /// The template to use to create the notification text displayed to a user when they are removed.
-        /// </summary>
-        public string RemovedFromConversationTemplate { get; set; }
-        /// <summary>
-        /// The name of the sound to play to a user when they are removed from a conversation.
-        /// </summary>
-        public string RemovedFromConversationSound { get; set; }
-        /// <summary>
-        /// Whether to send a notification when a new message with media/file attachments is added to a conversation.
-        /// </summary>
-        public bool? NewMessageWithMediaEnabled { get; set; }
-        /// <summary>
-        /// The template to use to create the notification text displayed when a new message with media/file attachments is added to a conversation.
-        /// </summary>
-        public string NewMessageWithMediaTemplate { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateNotificationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the Configuration applies to. </param>
-        public UpdateNotificationOptions(string pathChatServiceSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (LogEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LogEnabled", LogEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NewMessageEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NewMessage.Enabled", NewMessageEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NewMessageTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NewMessage.Template", NewMessageTemplate));
-            }
-
-            if (NewMessageSound != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NewMessage.Sound", NewMessageSound));
-            }
-
-            if (NewMessageBadgeCountEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NewMessage.BadgeCountEnabled", NewMessageBadgeCountEnabled.Value.ToString().ToLower()));
-            }
-
-            if (AddedToConversationEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AddedToConversation.Enabled", AddedToConversationEnabled.Value.ToString().ToLower()));
-            }
-
-            if (AddedToConversationTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AddedToConversation.Template", AddedToConversationTemplate));
-            }
-
-            if (AddedToConversationSound != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AddedToConversation.Sound", AddedToConversationSound));
-            }
-
-            if (RemovedFromConversationEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RemovedFromConversation.Enabled", RemovedFromConversationEnabled.Value.ToString().ToLower()));
-            }
-
-            if (RemovedFromConversationTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RemovedFromConversation.Template", RemovedFromConversationTemplate));
-            }
-
-            if (RemovedFromConversationSound != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RemovedFromConversation.Sound", RemovedFromConversationSound));
-            }
-
-            if (NewMessageWithMediaEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NewMessage.WithMedia.Enabled", NewMessageWithMediaEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NewMessageWithMediaTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NewMessage.WithMedia.Template", NewMessageWithMediaTemplate));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Conversation Service that the Configuration applies to.
+    /// </summary>
+    public string PathChatServiceSid { get; }
     /// <summary>
-    /// Fetch push notification service settings
+    /// Weather the notification logging is enabled.
     /// </summary>
-    public class FetchNotificationOptions : IOptions<NotificationResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the Configuration applies to.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchNotificationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the Configuration applies to. </param>
-        public FetchNotificationOptions(string pathChatServiceSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public bool? LogEnabled { get; set; }
+    /// <summary>
+    /// Whether to send a notification when a new message is added to a conversation.
+    /// </summary>
+    public bool? NewMessageEnabled { get; set; }
+    /// <summary>
+    /// The template to use to create the notification text displayed when a new message is added to a conversation.
+    /// </summary>
+    public string NewMessageTemplate { get; set; }
+    /// <summary>
+    /// The name of the sound to play when a new message is added to a conversation.
+    /// </summary>
+    public string NewMessageSound { get; set; }
+    /// <summary>
+    /// Whether the new message badge is enabled.
+    /// </summary>
+    public bool? NewMessageBadgeCountEnabled { get; set; }
+    /// <summary>
+    /// Whether to send a notification when a participant is added to a conversation.
+    /// </summary>
+    public bool? AddedToConversationEnabled { get; set; }
+    /// <summary>
+    /// The template to use to create the notification text displayed when a participant is added to a conversation.
+    /// </summary>
+    public string AddedToConversationTemplate { get; set; }
+    /// <summary>
+    /// The name of the sound to play when a participant is added to a conversation.
+    /// </summary>
+    public string AddedToConversationSound { get; set; }
+    /// <summary>
+    /// Whether to send a notification to a user when they are removed from a conversation.
+    /// </summary>
+    public bool? RemovedFromConversationEnabled { get; set; }
+    /// <summary>
+    /// The template to use to create the notification text displayed to a user when they are removed.
+    /// </summary>
+    public string RemovedFromConversationTemplate { get; set; }
+    /// <summary>
+    /// The name of the sound to play to a user when they are removed from a conversation.
+    /// </summary>
+    public string RemovedFromConversationSound { get; set; }
+    /// <summary>
+    /// Whether to send a notification when a new message with media/file attachments is added to a conversation.
+    /// </summary>
+    public bool? NewMessageWithMediaEnabled { get; set; }
+    /// <summary>
+    /// The template to use to create the notification text displayed when a new message with media/file attachments is added to a conversation.
+    /// </summary>
+    public string NewMessageWithMediaTemplate { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateNotificationOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the Configuration applies to. </param>
+    public UpdateNotificationOptions(string pathChatServiceSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (LogEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LogEnabled", LogEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NewMessageEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NewMessage.Enabled", NewMessageEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NewMessageTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NewMessage.Template", NewMessageTemplate));
+      }
+
+      if (NewMessageSound != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NewMessage.Sound", NewMessageSound));
+      }
+
+      if (NewMessageBadgeCountEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NewMessage.BadgeCountEnabled", NewMessageBadgeCountEnabled.Value.ToString().ToLower()));
+      }
+
+      if (AddedToConversationEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AddedToConversation.Enabled", AddedToConversationEnabled.Value.ToString().ToLower()));
+      }
+
+      if (AddedToConversationTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AddedToConversation.Template", AddedToConversationTemplate));
+      }
+
+      if (AddedToConversationSound != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AddedToConversation.Sound", AddedToConversationSound));
+      }
+
+      if (RemovedFromConversationEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RemovedFromConversation.Enabled", RemovedFromConversationEnabled.Value.ToString().ToLower()));
+      }
+
+      if (RemovedFromConversationTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RemovedFromConversation.Template", RemovedFromConversationTemplate));
+      }
+
+      if (RemovedFromConversationSound != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RemovedFromConversation.Sound", RemovedFromConversationSound));
+      }
+
+      if (NewMessageWithMediaEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NewMessage.WithMedia.Enabled", NewMessageWithMediaEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NewMessageWithMediaTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NewMessage.WithMedia.Template", NewMessageWithMediaTemplate));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch push notification service settings
+  /// </summary>
+  public class FetchNotificationOptions : IOptions<NotificationResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the Configuration applies to.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchNotificationOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the Configuration applies to. </param>
+    public FetchNotificationOptions(string pathChatServiceSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/Configuration/NotificationResource.cs b/src/Twilio/Rest/Conversations/V1/Service/Configuration/NotificationResource.cs
index 5ec10dac3..89dc47100 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/Configuration/NotificationResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/Configuration/NotificationResource.cs
@@ -16,275 +16,275 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Conversations.V1.Service.Configuration
-{
-
-    public class NotificationResource : Resource
-    {
-        private static Request BuildUpdateRequest(UpdateNotificationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Configuration/Notifications",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update push notification service settings
-        /// </summary>
-        /// <param name="options"> Update Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static NotificationResource Update(UpdateNotificationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update push notification service settings
-        /// </summary>
-        /// <param name="options"> Update Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<NotificationResource> UpdateAsync(UpdateNotificationOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update push notification service settings
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the Configuration applies to. </param>
-        /// <param name="logEnabled"> Weather the notification logging is enabled. </param>
-        /// <param name="newMessageEnabled"> Whether to send a notification when a new message is added to a conversation.
-        ///                         </param>
-        /// <param name="newMessageTemplate"> The template to use to create the notification text displayed when a new message
-        ///                          is added to a conversation. </param>
-        /// <param name="newMessageSound"> The name of the sound to play when a new message is added to a conversation. </param>
-        /// <param name="newMessageBadgeCountEnabled"> Whether the new message badge is enabled. </param>
-        /// <param name="addedToConversationEnabled"> Whether to send a notification when a participant is added to a
-        ///                                  conversation. </param>
-        /// <param name="addedToConversationTemplate"> The template to use to create the notification text displayed when a
-        ///                                   participant is added to a conversation. </param>
-        /// <param name="addedToConversationSound"> The name of the sound to play when a participant is added to a
-        ///                                conversation. </param>
-        /// <param name="removedFromConversationEnabled"> Whether to send a notification to a user when they are removed from a
-        ///                                      conversation. </param>
-        /// <param name="removedFromConversationTemplate"> The template to use to create the notification text displayed to a
-        ///                                       user when they are removed. </param>
-        /// <param name="removedFromConversationSound"> The name of the sound to play to a user when they are removed from a
-        ///                                    conversation. </param>
-        /// <param name="newMessageWithMediaEnabled"> Whether to send a notification when a new message with media/file
-        ///                                  attachments is added to a conversation. </param>
-        /// <param name="newMessageWithMediaTemplate"> The template to use to create the notification text displayed when a new
-        ///                                   message with media/file attachments is added to a conversation. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static NotificationResource Update(string pathChatServiceSid,
-                                                  bool? logEnabled = null,
-                                                  bool? newMessageEnabled = null,
-                                                  string newMessageTemplate = null,
-                                                  string newMessageSound = null,
-                                                  bool? newMessageBadgeCountEnabled = null,
-                                                  bool? addedToConversationEnabled = null,
-                                                  string addedToConversationTemplate = null,
-                                                  string addedToConversationSound = null,
-                                                  bool? removedFromConversationEnabled = null,
-                                                  string removedFromConversationTemplate = null,
-                                                  string removedFromConversationSound = null,
-                                                  bool? newMessageWithMediaEnabled = null,
-                                                  string newMessageWithMediaTemplate = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateNotificationOptions(pathChatServiceSid){LogEnabled = logEnabled, NewMessageEnabled = newMessageEnabled, NewMessageTemplate = newMessageTemplate, NewMessageSound = newMessageSound, NewMessageBadgeCountEnabled = newMessageBadgeCountEnabled, AddedToConversationEnabled = addedToConversationEnabled, AddedToConversationTemplate = addedToConversationTemplate, AddedToConversationSound = addedToConversationSound, RemovedFromConversationEnabled = removedFromConversationEnabled, RemovedFromConversationTemplate = removedFromConversationTemplate, RemovedFromConversationSound = removedFromConversationSound, NewMessageWithMediaEnabled = newMessageWithMediaEnabled, NewMessageWithMediaTemplate = newMessageWithMediaTemplate};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update push notification service settings
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the Configuration applies to. </param>
-        /// <param name="logEnabled"> Weather the notification logging is enabled. </param>
-        /// <param name="newMessageEnabled"> Whether to send a notification when a new message is added to a conversation.
-        ///                         </param>
-        /// <param name="newMessageTemplate"> The template to use to create the notification text displayed when a new message
-        ///                          is added to a conversation. </param>
-        /// <param name="newMessageSound"> The name of the sound to play when a new message is added to a conversation. </param>
-        /// <param name="newMessageBadgeCountEnabled"> Whether the new message badge is enabled. </param>
-        /// <param name="addedToConversationEnabled"> Whether to send a notification when a participant is added to a
-        ///                                  conversation. </param>
-        /// <param name="addedToConversationTemplate"> The template to use to create the notification text displayed when a
-        ///                                   participant is added to a conversation. </param>
-        /// <param name="addedToConversationSound"> The name of the sound to play when a participant is added to a
-        ///                                conversation. </param>
-        /// <param name="removedFromConversationEnabled"> Whether to send a notification to a user when they are removed from a
-        ///                                      conversation. </param>
-        /// <param name="removedFromConversationTemplate"> The template to use to create the notification text displayed to a
-        ///                                       user when they are removed. </param>
-        /// <param name="removedFromConversationSound"> The name of the sound to play to a user when they are removed from a
-        ///                                    conversation. </param>
-        /// <param name="newMessageWithMediaEnabled"> Whether to send a notification when a new message with media/file
-        ///                                  attachments is added to a conversation. </param>
-        /// <param name="newMessageWithMediaTemplate"> The template to use to create the notification text displayed when a new
-        ///                                   message with media/file attachments is added to a conversation. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<NotificationResource> UpdateAsync(string pathChatServiceSid,
-                                                                                          bool? logEnabled = null,
-                                                                                          bool? newMessageEnabled = null,
-                                                                                          string newMessageTemplate = null,
-                                                                                          string newMessageSound = null,
-                                                                                          bool? newMessageBadgeCountEnabled = null,
-                                                                                          bool? addedToConversationEnabled = null,
-                                                                                          string addedToConversationTemplate = null,
-                                                                                          string addedToConversationSound = null,
-                                                                                          bool? removedFromConversationEnabled = null,
-                                                                                          string removedFromConversationTemplate = null,
-                                                                                          string removedFromConversationSound = null,
-                                                                                          bool? newMessageWithMediaEnabled = null,
-                                                                                          string newMessageWithMediaTemplate = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateNotificationOptions(pathChatServiceSid){LogEnabled = logEnabled, NewMessageEnabled = newMessageEnabled, NewMessageTemplate = newMessageTemplate, NewMessageSound = newMessageSound, NewMessageBadgeCountEnabled = newMessageBadgeCountEnabled, AddedToConversationEnabled = addedToConversationEnabled, AddedToConversationTemplate = addedToConversationTemplate, AddedToConversationSound = addedToConversationSound, RemovedFromConversationEnabled = removedFromConversationEnabled, RemovedFromConversationTemplate = removedFromConversationTemplate, RemovedFromConversationSound = removedFromConversationSound, NewMessageWithMediaEnabled = newMessageWithMediaEnabled, NewMessageWithMediaTemplate = newMessageWithMediaTemplate};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchNotificationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Configuration/Notifications",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch push notification service settings
-        /// </summary>
-        /// <param name="options"> Fetch Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static NotificationResource Fetch(FetchNotificationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch push notification service settings
-        /// </summary>
-        /// <param name="options"> Fetch Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<NotificationResource> FetchAsync(FetchNotificationOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch push notification service settings
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the Configuration applies to. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static NotificationResource Fetch(string pathChatServiceSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchNotificationOptions(pathChatServiceSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch push notification service settings
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the Configuration applies to. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<NotificationResource> FetchAsync(string pathChatServiceSid,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchNotificationOptions(pathChatServiceSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a NotificationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NotificationResource object represented by the provided JSON </returns>
-        public static NotificationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NotificationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this configuration.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Conversation Service that the Configuration applies to.
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The Push Notification configuration for New Messages.
-        /// </summary>
-        [JsonProperty("new_message")]
-        public object NewMessage { get; private set; }
-        /// <summary>
-        /// The Push Notification configuration for being added to a Conversation.
-        /// </summary>
-        [JsonProperty("added_to_conversation")]
-        public object AddedToConversation { get; private set; }
-        /// <summary>
-        /// The Push Notification configuration for being removed from a Conversation.
-        /// </summary>
-        [JsonProperty("removed_from_conversation")]
-        public object RemovedFromConversation { get; private set; }
-        /// <summary>
-        /// Weather the notification logging is enabled.
-        /// </summary>
-        [JsonProperty("log_enabled")]
-        public bool? LogEnabled { get; private set; }
-        /// <summary>
-        /// An absolute URL for this configuration.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private NotificationResource()
-        {
-
-        }
-    }
+{
+
+  public class NotificationResource : Resource
+  {
+    private static Request BuildUpdateRequest(UpdateNotificationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Configuration/Notifications",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update push notification service settings
+    /// </summary>
+    /// <param name="options"> Update Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static NotificationResource Update(UpdateNotificationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update push notification service settings
+    /// </summary>
+    /// <param name="options"> Update Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<NotificationResource> UpdateAsync(UpdateNotificationOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update push notification service settings
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the Configuration applies to. </param>
+    /// <param name="logEnabled"> Weather the notification logging is enabled. </param>
+    /// <param name="newMessageEnabled"> Whether to send a notification when a new message is added to a conversation.
+    ///                         </param>
+    /// <param name="newMessageTemplate"> The template to use to create the notification text displayed when a new message
+    ///                          is added to a conversation. </param>
+    /// <param name="newMessageSound"> The name of the sound to play when a new message is added to a conversation. </param>
+    /// <param name="newMessageBadgeCountEnabled"> Whether the new message badge is enabled. </param>
+    /// <param name="addedToConversationEnabled"> Whether to send a notification when a participant is added to a
+    ///                                  conversation. </param>
+    /// <param name="addedToConversationTemplate"> The template to use to create the notification text displayed when a
+    ///                                   participant is added to a conversation. </param>
+    /// <param name="addedToConversationSound"> The name of the sound to play when a participant is added to a
+    ///                                conversation. </param>
+    /// <param name="removedFromConversationEnabled"> Whether to send a notification to a user when they are removed from a
+    ///                                      conversation. </param>
+    /// <param name="removedFromConversationTemplate"> The template to use to create the notification text displayed to a
+    ///                                       user when they are removed. </param>
+    /// <param name="removedFromConversationSound"> The name of the sound to play to a user when they are removed from a
+    ///                                    conversation. </param>
+    /// <param name="newMessageWithMediaEnabled"> Whether to send a notification when a new message with media/file
+    ///                                  attachments is added to a conversation. </param>
+    /// <param name="newMessageWithMediaTemplate"> The template to use to create the notification text displayed when a new
+    ///                                   message with media/file attachments is added to a conversation. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static NotificationResource Update(string pathChatServiceSid,
+                                              bool? logEnabled = null,
+                                              bool? newMessageEnabled = null,
+                                              string newMessageTemplate = null,
+                                              string newMessageSound = null,
+                                              bool? newMessageBadgeCountEnabled = null,
+                                              bool? addedToConversationEnabled = null,
+                                              string addedToConversationTemplate = null,
+                                              string addedToConversationSound = null,
+                                              bool? removedFromConversationEnabled = null,
+                                              string removedFromConversationTemplate = null,
+                                              string removedFromConversationSound = null,
+                                              bool? newMessageWithMediaEnabled = null,
+                                              string newMessageWithMediaTemplate = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateNotificationOptions(pathChatServiceSid) { LogEnabled = logEnabled, NewMessageEnabled = newMessageEnabled, NewMessageTemplate = newMessageTemplate, NewMessageSound = newMessageSound, NewMessageBadgeCountEnabled = newMessageBadgeCountEnabled, AddedToConversationEnabled = addedToConversationEnabled, AddedToConversationTemplate = addedToConversationTemplate, AddedToConversationSound = addedToConversationSound, RemovedFromConversationEnabled = removedFromConversationEnabled, RemovedFromConversationTemplate = removedFromConversationTemplate, RemovedFromConversationSound = removedFromConversationSound, NewMessageWithMediaEnabled = newMessageWithMediaEnabled, NewMessageWithMediaTemplate = newMessageWithMediaTemplate };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update push notification service settings
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the Configuration applies to. </param>
+    /// <param name="logEnabled"> Weather the notification logging is enabled. </param>
+    /// <param name="newMessageEnabled"> Whether to send a notification when a new message is added to a conversation.
+    ///                         </param>
+    /// <param name="newMessageTemplate"> The template to use to create the notification text displayed when a new message
+    ///                          is added to a conversation. </param>
+    /// <param name="newMessageSound"> The name of the sound to play when a new message is added to a conversation. </param>
+    /// <param name="newMessageBadgeCountEnabled"> Whether the new message badge is enabled. </param>
+    /// <param name="addedToConversationEnabled"> Whether to send a notification when a participant is added to a
+    ///                                  conversation. </param>
+    /// <param name="addedToConversationTemplate"> The template to use to create the notification text displayed when a
+    ///                                   participant is added to a conversation. </param>
+    /// <param name="addedToConversationSound"> The name of the sound to play when a participant is added to a
+    ///                                conversation. </param>
+    /// <param name="removedFromConversationEnabled"> Whether to send a notification to a user when they are removed from a
+    ///                                      conversation. </param>
+    /// <param name="removedFromConversationTemplate"> The template to use to create the notification text displayed to a
+    ///                                       user when they are removed. </param>
+    /// <param name="removedFromConversationSound"> The name of the sound to play to a user when they are removed from a
+    ///                                    conversation. </param>
+    /// <param name="newMessageWithMediaEnabled"> Whether to send a notification when a new message with media/file
+    ///                                  attachments is added to a conversation. </param>
+    /// <param name="newMessageWithMediaTemplate"> The template to use to create the notification text displayed when a new
+    ///                                   message with media/file attachments is added to a conversation. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<NotificationResource> UpdateAsync(string pathChatServiceSid,
+                                                                                      bool? logEnabled = null,
+                                                                                      bool? newMessageEnabled = null,
+                                                                                      string newMessageTemplate = null,
+                                                                                      string newMessageSound = null,
+                                                                                      bool? newMessageBadgeCountEnabled = null,
+                                                                                      bool? addedToConversationEnabled = null,
+                                                                                      string addedToConversationTemplate = null,
+                                                                                      string addedToConversationSound = null,
+                                                                                      bool? removedFromConversationEnabled = null,
+                                                                                      string removedFromConversationTemplate = null,
+                                                                                      string removedFromConversationSound = null,
+                                                                                      bool? newMessageWithMediaEnabled = null,
+                                                                                      string newMessageWithMediaTemplate = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateNotificationOptions(pathChatServiceSid) { LogEnabled = logEnabled, NewMessageEnabled = newMessageEnabled, NewMessageTemplate = newMessageTemplate, NewMessageSound = newMessageSound, NewMessageBadgeCountEnabled = newMessageBadgeCountEnabled, AddedToConversationEnabled = addedToConversationEnabled, AddedToConversationTemplate = addedToConversationTemplate, AddedToConversationSound = addedToConversationSound, RemovedFromConversationEnabled = removedFromConversationEnabled, RemovedFromConversationTemplate = removedFromConversationTemplate, RemovedFromConversationSound = removedFromConversationSound, NewMessageWithMediaEnabled = newMessageWithMediaEnabled, NewMessageWithMediaTemplate = newMessageWithMediaTemplate };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchNotificationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Configuration/Notifications",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch push notification service settings
+    /// </summary>
+    /// <param name="options"> Fetch Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static NotificationResource Fetch(FetchNotificationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch push notification service settings
+    /// </summary>
+    /// <param name="options"> Fetch Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<NotificationResource> FetchAsync(FetchNotificationOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch push notification service settings
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the Configuration applies to. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static NotificationResource Fetch(string pathChatServiceSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchNotificationOptions(pathChatServiceSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch push notification service settings
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the Configuration applies to. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<NotificationResource> FetchAsync(string pathChatServiceSid,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchNotificationOptions(pathChatServiceSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a NotificationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NotificationResource object represented by the provided JSON </returns>
+    public static NotificationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NotificationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this configuration.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Conversation Service that the Configuration applies to.
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The Push Notification configuration for New Messages.
+    /// </summary>
+    [JsonProperty("new_message")]
+    public object NewMessage { get; private set; }
+    /// <summary>
+    /// The Push Notification configuration for being added to a Conversation.
+    /// </summary>
+    [JsonProperty("added_to_conversation")]
+    public object AddedToConversation { get; private set; }
+    /// <summary>
+    /// The Push Notification configuration for being removed from a Conversation.
+    /// </summary>
+    [JsonProperty("removed_from_conversation")]
+    public object RemovedFromConversation { get; private set; }
+    /// <summary>
+    /// Weather the notification logging is enabled.
+    /// </summary>
+    [JsonProperty("log_enabled")]
+    public bool? LogEnabled { get; private set; }
+    /// <summary>
+    /// An absolute URL for this configuration.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private NotificationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/Configuration/WebhookOptions.cs b/src/Twilio/Rest/Conversations/V1/Service/Configuration/WebhookOptions.cs
index 42b8f0353..4e0cdaa04 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/Configuration/WebhookOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/Configuration/WebhookOptions.cs
@@ -10,105 +10,105 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Service.Configuration
-{
-
+{
+
+  /// <summary>
+  /// Update a specific Webhook.
+  /// </summary>
+  public class UpdateWebhookOptions : IOptions<WebhookResource>
+  {
     /// <summary>
-    /// Update a specific Webhook.
+    /// The unique ID of the [Conversation Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation belongs to.
     /// </summary>
-    public class UpdateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The unique ID of the [Conversation Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation belongs to.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The absolute url the pre-event webhook request should be sent to.
-        /// </summary>
-        public Uri PreWebhookUrl { get; set; }
-        /// <summary>
-        /// The absolute url the post-event webhook request should be sent to.
-        /// </summary>
-        public Uri PostWebhookUrl { get; set; }
-        /// <summary>
-        /// The list of events that your configured webhook targets will receive. Events not configured here will not fire.
-        /// </summary>
-        public List<string> Filters { get; set; }
-        /// <summary>
-        /// The HTTP method to be used when sending a webhook request
-        /// </summary>
-        public string Method { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateWebhookOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The unique ID of the [Conversation
-        ///                          Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation
-        ///                          belongs to. </param>
-        public UpdateWebhookOptions(string pathChatServiceSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            Filters = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PreWebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PreWebhookUrl", Serializers.Url(PreWebhookUrl)));
-            }
-
-            if (PostWebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostWebhookUrl", Serializers.Url(PostWebhookUrl)));
-            }
-
-            if (Filters != null)
-            {
-                p.AddRange(Filters.Select(prop => new KeyValuePair<string, string>("Filters", prop)));
-            }
-
-            if (Method != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Method", Method));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathChatServiceSid { get; }
     /// <summary>
-    /// Fetch a specific service webhook configuration.
+    /// The absolute url the pre-event webhook request should be sent to.
     /// </summary>
-    public class FetchWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The unique ID of the [Conversation Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation belongs to.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchWebhookOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The unique ID of the [Conversation
-        ///                          Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation
-        ///                          belongs to. </param>
-        public FetchWebhookOptions(string pathChatServiceSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public Uri PreWebhookUrl { get; set; }
+    /// <summary>
+    /// The absolute url the post-event webhook request should be sent to.
+    /// </summary>
+    public Uri PostWebhookUrl { get; set; }
+    /// <summary>
+    /// The list of events that your configured webhook targets will receive. Events not configured here will not fire.
+    /// </summary>
+    public List<string> Filters { get; set; }
+    /// <summary>
+    /// The HTTP method to be used when sending a webhook request
+    /// </summary>
+    public string Method { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateWebhookOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The unique ID of the [Conversation
+    ///                          Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation
+    ///                          belongs to. </param>
+    public UpdateWebhookOptions(string pathChatServiceSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      Filters = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PreWebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PreWebhookUrl", Serializers.Url(PreWebhookUrl)));
+      }
+
+      if (PostWebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostWebhookUrl", Serializers.Url(PostWebhookUrl)));
+      }
+
+      if (Filters != null)
+      {
+        p.AddRange(Filters.Select(prop => new KeyValuePair<string, string>("Filters", prop)));
+      }
+
+      if (Method != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Method", Method));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific service webhook configuration.
+  /// </summary>
+  public class FetchWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The unique ID of the [Conversation Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation belongs to.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchWebhookOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The unique ID of the [Conversation
+    ///                          Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation
+    ///                          belongs to. </param>
+    public FetchWebhookOptions(string pathChatServiceSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/Configuration/WebhookResource.cs b/src/Twilio/Rest/Conversations/V1/Service/Configuration/WebhookResource.cs
index 33b3d0ecc..5e4acffe8 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/Configuration/WebhookResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/Configuration/WebhookResource.cs
@@ -17,243 +17,243 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Service.Configuration
-{
-
-    public class WebhookResource : Resource
-    {
-        public sealed class MethodEnum : StringEnum
-        {
-            private MethodEnum(string value) : base(value) {}
-            public MethodEnum() {}
-            public static implicit operator MethodEnum(string value)
-            {
-                return new MethodEnum(value);
-            }
-
-            public static readonly MethodEnum Get = new MethodEnum("GET");
-            public static readonly MethodEnum Post = new MethodEnum("POST");
-        }
-
-        private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Configuration/Webhooks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Webhook.
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Webhook.
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Webhook.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The unique ID of the [Conversation
-        ///                          Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation
-        ///                          belongs to. </param>
-        /// <param name="preWebhookUrl"> The absolute url the pre-event webhook request should be sent to. </param>
-        /// <param name="postWebhookUrl"> The absolute url the post-event webhook request should be sent to. </param>
-        /// <param name="filters"> The list of events that your configured webhook targets will receive. Events not configured
-        ///               here will not fire. </param>
-        /// <param name="method"> The HTTP method to be used when sending a webhook request </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(string pathChatServiceSid,
-                                             Uri preWebhookUrl = null,
-                                             Uri postWebhookUrl = null,
-                                             List<string> filters = null,
-                                             string method = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathChatServiceSid){PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, Filters = filters, Method = method};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Webhook.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The unique ID of the [Conversation
-        ///                          Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation
-        ///                          belongs to. </param>
-        /// <param name="preWebhookUrl"> The absolute url the pre-event webhook request should be sent to. </param>
-        /// <param name="postWebhookUrl"> The absolute url the post-event webhook request should be sent to. </param>
-        /// <param name="filters"> The list of events that your configured webhook targets will receive. Events not configured
-        ///               here will not fire. </param>
-        /// <param name="method"> The HTTP method to be used when sending a webhook request </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathChatServiceSid,
-                                                                                     Uri preWebhookUrl = null,
-                                                                                     Uri postWebhookUrl = null,
-                                                                                     List<string> filters = null,
-                                                                                     string method = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathChatServiceSid){PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, Filters = filters, Method = method};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Configuration/Webhooks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific service webhook configuration.
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific service webhook configuration.
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific service webhook configuration.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The unique ID of the [Conversation
-        ///                          Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation
-        ///                          belongs to. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(string pathChatServiceSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathChatServiceSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific service webhook configuration.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The unique ID of the [Conversation
-        ///                          Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation
-        ///                          belongs to. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathChatServiceSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathChatServiceSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WebhookResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WebhookResource object represented by the provided JSON </returns>
-        public static WebhookResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WebhookResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this service.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the [Conversation Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation belongs to.
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The absolute url the pre-event webhook request should be sent to.
-        /// </summary>
-        [JsonProperty("pre_webhook_url")]
-        public Uri PreWebhookUrl { get; private set; }
-        /// <summary>
-        /// The absolute url the post-event webhook request should be sent to.
-        /// </summary>
-        [JsonProperty("post_webhook_url")]
-        public Uri PostWebhookUrl { get; private set; }
-        /// <summary>
-        /// The list of events that your configured webhook targets will receive. Events not configured here will not fire.
-        /// </summary>
-        [JsonProperty("filters")]
-        public List<string> Filters { get; private set; }
-        /// <summary>
-        /// The HTTP method to be used when sending a webhook request
-        /// </summary>
-        [JsonProperty("method")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public WebhookResource.MethodEnum Method { get; private set; }
-        /// <summary>
-        /// An absolute URL for this webhook.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WebhookResource()
-        {
-
-        }
-    }
+{
+
+  public class WebhookResource : Resource
+  {
+    public sealed class MethodEnum : StringEnum
+    {
+      private MethodEnum(string value) : base(value) { }
+      public MethodEnum() { }
+      public static implicit operator MethodEnum(string value)
+      {
+        return new MethodEnum(value);
+      }
+
+      public static readonly MethodEnum Get = new MethodEnum("GET");
+      public static readonly MethodEnum Post = new MethodEnum("POST");
+    }
+
+    private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Configuration/Webhooks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Webhook.
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Webhook.
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Webhook.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The unique ID of the [Conversation
+    ///                          Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation
+    ///                          belongs to. </param>
+    /// <param name="preWebhookUrl"> The absolute url the pre-event webhook request should be sent to. </param>
+    /// <param name="postWebhookUrl"> The absolute url the post-event webhook request should be sent to. </param>
+    /// <param name="filters"> The list of events that your configured webhook targets will receive. Events not configured
+    ///               here will not fire. </param>
+    /// <param name="method"> The HTTP method to be used when sending a webhook request </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(string pathChatServiceSid,
+                                         Uri preWebhookUrl = null,
+                                         Uri postWebhookUrl = null,
+                                         List<string> filters = null,
+                                         string method = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathChatServiceSid) { PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, Filters = filters, Method = method };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Webhook.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The unique ID of the [Conversation
+    ///                          Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation
+    ///                          belongs to. </param>
+    /// <param name="preWebhookUrl"> The absolute url the pre-event webhook request should be sent to. </param>
+    /// <param name="postWebhookUrl"> The absolute url the post-event webhook request should be sent to. </param>
+    /// <param name="filters"> The list of events that your configured webhook targets will receive. Events not configured
+    ///               here will not fire. </param>
+    /// <param name="method"> The HTTP method to be used when sending a webhook request </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathChatServiceSid,
+                                                                                 Uri preWebhookUrl = null,
+                                                                                 Uri postWebhookUrl = null,
+                                                                                 List<string> filters = null,
+                                                                                 string method = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathChatServiceSid) { PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, Filters = filters, Method = method };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Configuration/Webhooks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific service webhook configuration.
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific service webhook configuration.
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific service webhook configuration.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The unique ID of the [Conversation
+    ///                          Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation
+    ///                          belongs to. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(string pathChatServiceSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathChatServiceSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific service webhook configuration.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The unique ID of the [Conversation
+    ///                          Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation
+    ///                          belongs to. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathChatServiceSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathChatServiceSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WebhookResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WebhookResource object represented by the provided JSON </returns>
+    public static WebhookResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WebhookResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this service.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the [Conversation Service](https://www.twilio.com/docs/conversations/api/service-resource) this conversation belongs to.
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The absolute url the pre-event webhook request should be sent to.
+    /// </summary>
+    [JsonProperty("pre_webhook_url")]
+    public Uri PreWebhookUrl { get; private set; }
+    /// <summary>
+    /// The absolute url the post-event webhook request should be sent to.
+    /// </summary>
+    [JsonProperty("post_webhook_url")]
+    public Uri PostWebhookUrl { get; private set; }
+    /// <summary>
+    /// The list of events that your configured webhook targets will receive. Events not configured here will not fire.
+    /// </summary>
+    [JsonProperty("filters")]
+    public List<string> Filters { get; private set; }
+    /// <summary>
+    /// The HTTP method to be used when sending a webhook request
+    /// </summary>
+    [JsonProperty("method")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public WebhookResource.MethodEnum Method { get; private set; }
+    /// <summary>
+    /// An absolute URL for this webhook.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WebhookResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/ConfigurationOptions.cs b/src/Twilio/Rest/Conversations/V1/Service/ConfigurationOptions.cs
index bf0349c87..2d5a94f9b 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/ConfigurationOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/ConfigurationOptions.cs
@@ -9,100 +9,100 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// Fetch the configuration of a conversation service
+  /// </summary>
+  public class FetchConfigurationOptions : IOptions<ConfigurationResource>
+  {
     /// <summary>
-    /// Fetch the configuration of a conversation service
+    /// The SID of the Service configuration resource to fetch
     /// </summary>
-    public class FetchConfigurationOptions : IOptions<ConfigurationResource>
-    {
-        /// <summary>
-        /// The SID of the Service configuration resource to fetch
-        /// </summary>
-        public string PathChatServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchConfigurationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Service configuration resource to fetch </param>
-        public FetchConfigurationOptions(string pathChatServiceSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathChatServiceSid { get; }
+
     /// <summary>
-    /// Update configuration settings of a conversation service
+    /// Construct a new FetchConfigurationOptions
     /// </summary>
-    public class UpdateConfigurationOptions : IOptions<ConfigurationResource>
-    {
-        /// <summary>
-        /// The SID of the Service configuration resource to update
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The role assigned to a conversation creator when they join a new conversation
-        /// </summary>
-        public string DefaultConversationCreatorRoleSid { get; set; }
-        /// <summary>
-        /// The role assigned to users when they are added to a conversation
-        /// </summary>
-        public string DefaultConversationRoleSid { get; set; }
-        /// <summary>
-        /// The service role assigned to users when they are added to the service
-        /// </summary>
-        public string DefaultChatServiceRoleSid { get; set; }
-        /// <summary>
-        /// Whether the Reachability Indicator feature is enabled for this Conversations Service
-        /// </summary>
-        public bool? ReachabilityEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateConfigurationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Service configuration resource to update </param>
-        public UpdateConfigurationOptions(string pathChatServiceSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DefaultConversationCreatorRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultConversationCreatorRoleSid", DefaultConversationCreatorRoleSid.ToString()));
-            }
-
-            if (DefaultConversationRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultConversationRoleSid", DefaultConversationRoleSid.ToString()));
-            }
-
-            if (DefaultChatServiceRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultChatServiceRoleSid", DefaultChatServiceRoleSid.ToString()));
-            }
-
-            if (ReachabilityEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReachabilityEnabled", ReachabilityEnabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathChatServiceSid"> The SID of the Service configuration resource to fetch </param>
+    public FetchConfigurationOptions(string pathChatServiceSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update configuration settings of a conversation service
+  /// </summary>
+  public class UpdateConfigurationOptions : IOptions<ConfigurationResource>
+  {
+    /// <summary>
+    /// The SID of the Service configuration resource to update
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The role assigned to a conversation creator when they join a new conversation
+    /// </summary>
+    public string DefaultConversationCreatorRoleSid { get; set; }
+    /// <summary>
+    /// The role assigned to users when they are added to a conversation
+    /// </summary>
+    public string DefaultConversationRoleSid { get; set; }
+    /// <summary>
+    /// The service role assigned to users when they are added to the service
+    /// </summary>
+    public string DefaultChatServiceRoleSid { get; set; }
+    /// <summary>
+    /// Whether the Reachability Indicator feature is enabled for this Conversations Service
+    /// </summary>
+    public bool? ReachabilityEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateConfigurationOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Service configuration resource to update </param>
+    public UpdateConfigurationOptions(string pathChatServiceSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DefaultConversationCreatorRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultConversationCreatorRoleSid", DefaultConversationCreatorRoleSid.ToString()));
+      }
+
+      if (DefaultConversationRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultConversationRoleSid", DefaultConversationRoleSid.ToString()));
+      }
+
+      if (DefaultChatServiceRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultChatServiceRoleSid", DefaultChatServiceRoleSid.ToString()));
+      }
+
+      if (ReachabilityEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReachabilityEnabled", ReachabilityEnabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/ConfigurationResource.cs b/src/Twilio/Rest/Conversations/V1/Service/ConfigurationResource.cs
index 11eff907c..0c94db962 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/ConfigurationResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/ConfigurationResource.cs
@@ -16,225 +16,225 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Conversations.V1.Service
-{
-
-    public class ConfigurationResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Configuration",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the configuration of a conversation service
-        /// </summary>
-        /// <param name="options"> Fetch Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Fetch(FetchConfigurationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the configuration of a conversation service
-        /// </summary>
-        /// <param name="options"> Fetch Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> FetchAsync(FetchConfigurationOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the configuration of a conversation service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Service configuration resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Fetch(string pathChatServiceSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchConfigurationOptions(pathChatServiceSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the configuration of a conversation service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Service configuration resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> FetchAsync(string pathChatServiceSid,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchConfigurationOptions(pathChatServiceSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Configuration",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update configuration settings of a conversation service
-        /// </summary>
-        /// <param name="options"> Update Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Update(UpdateConfigurationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update configuration settings of a conversation service
-        /// </summary>
-        /// <param name="options"> Update Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> UpdateAsync(UpdateConfigurationOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update configuration settings of a conversation service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Service configuration resource to update </param>
-        /// <param name="defaultConversationCreatorRoleSid"> The role assigned to a conversation creator when they join a new
-        ///                                         conversation </param>
-        /// <param name="defaultConversationRoleSid"> The role assigned to users when they are added to a conversation </param>
-        /// <param name="defaultChatServiceRoleSid"> The service role assigned to users when they are added to the service
-        ///                                 </param>
-        /// <param name="reachabilityEnabled"> Whether the Reachability Indicator feature is enabled for this Conversations
-        ///                           Service </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Update(string pathChatServiceSid,
-                                                   string defaultConversationCreatorRoleSid = null,
-                                                   string defaultConversationRoleSid = null,
-                                                   string defaultChatServiceRoleSid = null,
-                                                   bool? reachabilityEnabled = null,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new UpdateConfigurationOptions(pathChatServiceSid){DefaultConversationCreatorRoleSid = defaultConversationCreatorRoleSid, DefaultConversationRoleSid = defaultConversationRoleSid, DefaultChatServiceRoleSid = defaultChatServiceRoleSid, ReachabilityEnabled = reachabilityEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update configuration settings of a conversation service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Service configuration resource to update </param>
-        /// <param name="defaultConversationCreatorRoleSid"> The role assigned to a conversation creator when they join a new
-        ///                                         conversation </param>
-        /// <param name="defaultConversationRoleSid"> The role assigned to users when they are added to a conversation </param>
-        /// <param name="defaultChatServiceRoleSid"> The service role assigned to users when they are added to the service
-        ///                                 </param>
-        /// <param name="reachabilityEnabled"> Whether the Reachability Indicator feature is enabled for this Conversations
-        ///                           Service </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> UpdateAsync(string pathChatServiceSid,
-                                                                                           string defaultConversationCreatorRoleSid = null,
-                                                                                           string defaultConversationRoleSid = null,
-                                                                                           string defaultChatServiceRoleSid = null,
-                                                                                           bool? reachabilityEnabled = null,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new UpdateConfigurationOptions(pathChatServiceSid){DefaultConversationCreatorRoleSid = defaultConversationCreatorRoleSid, DefaultConversationRoleSid = defaultConversationRoleSid, DefaultChatServiceRoleSid = defaultChatServiceRoleSid, ReachabilityEnabled = reachabilityEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ConfigurationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ConfigurationResource object represented by the provided JSON </returns>
-        public static ConfigurationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ConfigurationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The role assigned to a conversation creator user when they join a new conversation
-        /// </summary>
-        [JsonProperty("default_conversation_creator_role_sid")]
-        public string DefaultConversationCreatorRoleSid { get; private set; }
-        /// <summary>
-        /// The role assigned to users when they are added to a conversation
-        /// </summary>
-        [JsonProperty("default_conversation_role_sid")]
-        public string DefaultConversationRoleSid { get; private set; }
-        /// <summary>
-        /// The service role assigned to users when they are added to the service
-        /// </summary>
-        [JsonProperty("default_chat_service_role_sid")]
-        public string DefaultChatServiceRoleSid { get; private set; }
-        /// <summary>
-        /// An absolute URL for this service configuration.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Absolute URL to access the push notifications configuration of this service.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// Whether the Reachability Indicator feature is enabled for this Conversations Service
-        /// </summary>
-        [JsonProperty("reachability_enabled")]
-        public bool? ReachabilityEnabled { get; private set; }
-
-        private ConfigurationResource()
-        {
-
-        }
-    }
+{
+
+  public class ConfigurationResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Configuration",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the configuration of a conversation service
+    /// </summary>
+    /// <param name="options"> Fetch Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Fetch(FetchConfigurationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the configuration of a conversation service
+    /// </summary>
+    /// <param name="options"> Fetch Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> FetchAsync(FetchConfigurationOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the configuration of a conversation service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Service configuration resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Fetch(string pathChatServiceSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchConfigurationOptions(pathChatServiceSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the configuration of a conversation service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Service configuration resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> FetchAsync(string pathChatServiceSid,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchConfigurationOptions(pathChatServiceSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Configuration",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update configuration settings of a conversation service
+    /// </summary>
+    /// <param name="options"> Update Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Update(UpdateConfigurationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update configuration settings of a conversation service
+    /// </summary>
+    /// <param name="options"> Update Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> UpdateAsync(UpdateConfigurationOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update configuration settings of a conversation service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Service configuration resource to update </param>
+    /// <param name="defaultConversationCreatorRoleSid"> The role assigned to a conversation creator when they join a new
+    ///                                         conversation </param>
+    /// <param name="defaultConversationRoleSid"> The role assigned to users when they are added to a conversation </param>
+    /// <param name="defaultChatServiceRoleSid"> The service role assigned to users when they are added to the service
+    ///                                 </param>
+    /// <param name="reachabilityEnabled"> Whether the Reachability Indicator feature is enabled for this Conversations
+    ///                           Service </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Update(string pathChatServiceSid,
+                                               string defaultConversationCreatorRoleSid = null,
+                                               string defaultConversationRoleSid = null,
+                                               string defaultChatServiceRoleSid = null,
+                                               bool? reachabilityEnabled = null,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new UpdateConfigurationOptions(pathChatServiceSid) { DefaultConversationCreatorRoleSid = defaultConversationCreatorRoleSid, DefaultConversationRoleSid = defaultConversationRoleSid, DefaultChatServiceRoleSid = defaultChatServiceRoleSid, ReachabilityEnabled = reachabilityEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update configuration settings of a conversation service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Service configuration resource to update </param>
+    /// <param name="defaultConversationCreatorRoleSid"> The role assigned to a conversation creator when they join a new
+    ///                                         conversation </param>
+    /// <param name="defaultConversationRoleSid"> The role assigned to users when they are added to a conversation </param>
+    /// <param name="defaultChatServiceRoleSid"> The service role assigned to users when they are added to the service
+    ///                                 </param>
+    /// <param name="reachabilityEnabled"> Whether the Reachability Indicator feature is enabled for this Conversations
+    ///                           Service </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> UpdateAsync(string pathChatServiceSid,
+                                                                                       string defaultConversationCreatorRoleSid = null,
+                                                                                       string defaultConversationRoleSid = null,
+                                                                                       string defaultChatServiceRoleSid = null,
+                                                                                       bool? reachabilityEnabled = null,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new UpdateConfigurationOptions(pathChatServiceSid) { DefaultConversationCreatorRoleSid = defaultConversationCreatorRoleSid, DefaultConversationRoleSid = defaultConversationRoleSid, DefaultChatServiceRoleSid = defaultChatServiceRoleSid, ReachabilityEnabled = reachabilityEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ConfigurationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ConfigurationResource object represented by the provided JSON </returns>
+    public static ConfigurationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ConfigurationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The role assigned to a conversation creator user when they join a new conversation
+    /// </summary>
+    [JsonProperty("default_conversation_creator_role_sid")]
+    public string DefaultConversationCreatorRoleSid { get; private set; }
+    /// <summary>
+    /// The role assigned to users when they are added to a conversation
+    /// </summary>
+    [JsonProperty("default_conversation_role_sid")]
+    public string DefaultConversationRoleSid { get; private set; }
+    /// <summary>
+    /// The service role assigned to users when they are added to the service
+    /// </summary>
+    [JsonProperty("default_chat_service_role_sid")]
+    public string DefaultChatServiceRoleSid { get; private set; }
+    /// <summary>
+    /// An absolute URL for this service configuration.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Absolute URL to access the push notifications configuration of this service.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// Whether the Reachability Indicator feature is enabled for this Conversations Service
+    /// </summary>
+    [JsonProperty("reachability_enabled")]
+    public bool? ReachabilityEnabled { get; private set; }
+
+    private ConfigurationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/Conversation/Message/DeliveryReceiptOptions.cs b/src/Twilio/Rest/Conversations/V1/Service/Conversation/Message/DeliveryReceiptOptions.cs
index b86d19fd3..f25af3e0f 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/Conversation/Message/DeliveryReceiptOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/Conversation/Message/DeliveryReceiptOptions.cs
@@ -9,102 +9,102 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Service.Conversation.Message
-{
-
+{
+
+  /// <summary>
+  /// Fetch the delivery and read receipts of the conversation message
+  /// </summary>
+  public class FetchDeliveryReceiptOptions : IOptions<DeliveryReceiptResource>
+  {
     /// <summary>
-    /// Fetch the delivery and read receipts of the conversation message
+    /// The SID of the Conversation Service that the resource is associated with.
     /// </summary>
-    public class FetchDeliveryReceiptOptions : IOptions<DeliveryReceiptResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this delivery receipt.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// The SID of the message the delivery receipt belongs to.
-        /// </summary>
-        public string PathMessageSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchDeliveryReceiptOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
-        /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchDeliveryReceiptOptions(string pathChatServiceSid,
-                                           string pathConversationSid,
-                                           string pathMessageSid,
-                                           string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-            PathMessageSid = pathMessageSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathChatServiceSid { get; }
     /// <summary>
-    /// Retrieve a list of all delivery and read receipts of the conversation message
+    /// The unique ID of the Conversation for this delivery receipt.
     /// </summary>
-    public class ReadDeliveryReceiptOptions : ReadOptions<DeliveryReceiptResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this delivery receipt.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// The SID of the message the delivery receipt belongs to.
-        /// </summary>
-        public string PathMessageSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadDeliveryReceiptOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
-        /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
-        public ReadDeliveryReceiptOptions(string pathChatServiceSid, string pathConversationSid, string pathMessageSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-            PathMessageSid = pathMessageSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// The SID of the message the delivery receipt belongs to.
+    /// </summary>
+    public string PathMessageSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchDeliveryReceiptOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
+    /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchDeliveryReceiptOptions(string pathChatServiceSid,
+                                       string pathConversationSid,
+                                       string pathMessageSid,
+                                       string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+      PathMessageSid = pathMessageSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all delivery and read receipts of the conversation message
+  /// </summary>
+  public class ReadDeliveryReceiptOptions : ReadOptions<DeliveryReceiptResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Conversation for this delivery receipt.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// The SID of the message the delivery receipt belongs to.
+    /// </summary>
+    public string PathMessageSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadDeliveryReceiptOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
+    /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
+    public ReadDeliveryReceiptOptions(string pathChatServiceSid, string pathConversationSid, string pathMessageSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+      PathMessageSid = pathMessageSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/Conversation/Message/DeliveryReceiptResource.cs b/src/Twilio/Rest/Conversations/V1/Service/Conversation/Message/DeliveryReceiptResource.cs
index 781e66c5d..60623de2c 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/Conversation/Message/DeliveryReceiptResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/Conversation/Message/DeliveryReceiptResource.cs
@@ -17,333 +17,333 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Service.Conversation.Message
-{
-
-    public class DeliveryReceiptResource : Resource
-    {
-        public sealed class DeliveryStatusEnum : StringEnum
-        {
-            private DeliveryStatusEnum(string value) : base(value) {}
-            public DeliveryStatusEnum() {}
-            public static implicit operator DeliveryStatusEnum(string value)
-            {
-                return new DeliveryStatusEnum(value);
-            }
-
-            public static readonly DeliveryStatusEnum Read = new DeliveryStatusEnum("read");
-            public static readonly DeliveryStatusEnum Failed = new DeliveryStatusEnum("failed");
-            public static readonly DeliveryStatusEnum Delivered = new DeliveryStatusEnum("delivered");
-            public static readonly DeliveryStatusEnum Undelivered = new DeliveryStatusEnum("undelivered");
-            public static readonly DeliveryStatusEnum Sent = new DeliveryStatusEnum("sent");
-        }
-
-        private static Request BuildFetchRequest(FetchDeliveryReceiptOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathMessageSid + "/Receipts/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="options"> Fetch DeliveryReceipt parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DeliveryReceipt </returns>
-        public static DeliveryReceiptResource Fetch(FetchDeliveryReceiptOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="options"> Fetch DeliveryReceipt parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
-        public static async System.Threading.Tasks.Task<DeliveryReceiptResource> FetchAsync(FetchDeliveryReceiptOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
-        /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DeliveryReceipt </returns>
-        public static DeliveryReceiptResource Fetch(string pathChatServiceSid,
-                                                    string pathConversationSid,
-                                                    string pathMessageSid,
-                                                    string pathSid,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchDeliveryReceiptOptions(pathChatServiceSid, pathConversationSid, pathMessageSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
-        /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
-        public static async System.Threading.Tasks.Task<DeliveryReceiptResource> FetchAsync(string pathChatServiceSid,
-                                                                                            string pathConversationSid,
-                                                                                            string pathMessageSid,
-                                                                                            string pathSid,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchDeliveryReceiptOptions(pathChatServiceSid, pathConversationSid, pathMessageSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadDeliveryReceiptOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathMessageSid + "/Receipts",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="options"> Read DeliveryReceipt parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DeliveryReceipt </returns>
-        public static ResourceSet<DeliveryReceiptResource> Read(ReadDeliveryReceiptOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
-            return new ResourceSet<DeliveryReceiptResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="options"> Read DeliveryReceipt parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DeliveryReceiptResource>> ReadAsync(ReadDeliveryReceiptOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
-            return new ResourceSet<DeliveryReceiptResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
-        /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DeliveryReceipt </returns>
-        public static ResourceSet<DeliveryReceiptResource> Read(string pathChatServiceSid,
-                                                                string pathConversationSid,
-                                                                string pathMessageSid,
-                                                                int? pageSize = null,
-                                                                long? limit = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadDeliveryReceiptOptions(pathChatServiceSid, pathConversationSid, pathMessageSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all delivery and read receipts of the conversation message
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
-        /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DeliveryReceiptResource>> ReadAsync(string pathChatServiceSid,
-                                                                                                        string pathConversationSid,
-                                                                                                        string pathMessageSid,
-                                                                                                        int? pageSize = null,
-                                                                                                        long? limit = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadDeliveryReceiptOptions(pathChatServiceSid, pathConversationSid, pathMessageSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DeliveryReceiptResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DeliveryReceiptResource> NextPage(Page<DeliveryReceiptResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DeliveryReceiptResource> PreviousPage(Page<DeliveryReceiptResource> page,
-                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a DeliveryReceiptResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DeliveryReceiptResource object represented by the provided JSON </returns>
-        public static DeliveryReceiptResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DeliveryReceiptResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this participant.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation for this message.
-        /// </summary>
-        [JsonProperty("conversation_sid")]
-        public string ConversationSid { get; private set; }
-        /// <summary>
-        /// The SID of the message the delivery receipt belongs to
-        /// </summary>
-        [JsonProperty("message_sid")]
-        public string MessageSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A messaging channel-specific identifier for the message delivered to participant
-        /// </summary>
-        [JsonProperty("channel_message_sid")]
-        public string ChannelMessageSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the participant the delivery receipt belongs to.
-        /// </summary>
-        [JsonProperty("participant_sid")]
-        public string ParticipantSid { get; private set; }
-        /// <summary>
-        /// The message delivery status
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public DeliveryReceiptResource.DeliveryStatusEnum Status { get; private set; }
-        /// <summary>
-        /// The message [delivery error code](https://www.twilio.com/docs/sms/api/message-resource#delivery-related-errors) for a `failed` status
-        /// </summary>
-        [JsonProperty("error_code")]
-        public int? ErrorCode { get; private set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An absolute URL for this delivery receipt.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private DeliveryReceiptResource()
-        {
-
-        }
-    }
+{
+
+  public class DeliveryReceiptResource : Resource
+  {
+    public sealed class DeliveryStatusEnum : StringEnum
+    {
+      private DeliveryStatusEnum(string value) : base(value) { }
+      public DeliveryStatusEnum() { }
+      public static implicit operator DeliveryStatusEnum(string value)
+      {
+        return new DeliveryStatusEnum(value);
+      }
+
+      public static readonly DeliveryStatusEnum Read = new DeliveryStatusEnum("read");
+      public static readonly DeliveryStatusEnum Failed = new DeliveryStatusEnum("failed");
+      public static readonly DeliveryStatusEnum Delivered = new DeliveryStatusEnum("delivered");
+      public static readonly DeliveryStatusEnum Undelivered = new DeliveryStatusEnum("undelivered");
+      public static readonly DeliveryStatusEnum Sent = new DeliveryStatusEnum("sent");
+    }
+
+    private static Request BuildFetchRequest(FetchDeliveryReceiptOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathMessageSid + "/Receipts/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="options"> Fetch DeliveryReceipt parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DeliveryReceipt </returns>
+    public static DeliveryReceiptResource Fetch(FetchDeliveryReceiptOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="options"> Fetch DeliveryReceipt parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
+    public static async System.Threading.Tasks.Task<DeliveryReceiptResource> FetchAsync(FetchDeliveryReceiptOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
+    /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DeliveryReceipt </returns>
+    public static DeliveryReceiptResource Fetch(string pathChatServiceSid,
+                                                string pathConversationSid,
+                                                string pathMessageSid,
+                                                string pathSid,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchDeliveryReceiptOptions(pathChatServiceSid, pathConversationSid, pathMessageSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
+    /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
+    public static async System.Threading.Tasks.Task<DeliveryReceiptResource> FetchAsync(string pathChatServiceSid,
+                                                                                        string pathConversationSid,
+                                                                                        string pathMessageSid,
+                                                                                        string pathSid,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchDeliveryReceiptOptions(pathChatServiceSid, pathConversationSid, pathMessageSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadDeliveryReceiptOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathMessageSid + "/Receipts",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="options"> Read DeliveryReceipt parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DeliveryReceipt </returns>
+    public static ResourceSet<DeliveryReceiptResource> Read(ReadDeliveryReceiptOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
+      return new ResourceSet<DeliveryReceiptResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="options"> Read DeliveryReceipt parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DeliveryReceiptResource>> ReadAsync(ReadDeliveryReceiptOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
+      return new ResourceSet<DeliveryReceiptResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
+    /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DeliveryReceipt </returns>
+    public static ResourceSet<DeliveryReceiptResource> Read(string pathChatServiceSid,
+                                                            string pathConversationSid,
+                                                            string pathMessageSid,
+                                                            int? pageSize = null,
+                                                            long? limit = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadDeliveryReceiptOptions(pathChatServiceSid, pathConversationSid, pathMessageSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all delivery and read receipts of the conversation message
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this delivery receipt. </param>
+    /// <param name="pathMessageSid"> The SID of the message the delivery receipt belongs to. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DeliveryReceipt </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DeliveryReceiptResource>> ReadAsync(string pathChatServiceSid,
+                                                                                                    string pathConversationSid,
+                                                                                                    string pathMessageSid,
+                                                                                                    int? pageSize = null,
+                                                                                                    long? limit = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadDeliveryReceiptOptions(pathChatServiceSid, pathConversationSid, pathMessageSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DeliveryReceiptResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DeliveryReceiptResource> NextPage(Page<DeliveryReceiptResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DeliveryReceiptResource> PreviousPage(Page<DeliveryReceiptResource> page,
+                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<DeliveryReceiptResource>.FromJson("delivery_receipts", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a DeliveryReceiptResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DeliveryReceiptResource object represented by the provided JSON </returns>
+    public static DeliveryReceiptResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DeliveryReceiptResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this participant.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation for this message.
+    /// </summary>
+    [JsonProperty("conversation_sid")]
+    public string ConversationSid { get; private set; }
+    /// <summary>
+    /// The SID of the message the delivery receipt belongs to
+    /// </summary>
+    [JsonProperty("message_sid")]
+    public string MessageSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A messaging channel-specific identifier for the message delivered to participant
+    /// </summary>
+    [JsonProperty("channel_message_sid")]
+    public string ChannelMessageSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the participant the delivery receipt belongs to.
+    /// </summary>
+    [JsonProperty("participant_sid")]
+    public string ParticipantSid { get; private set; }
+    /// <summary>
+    /// The message delivery status
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public DeliveryReceiptResource.DeliveryStatusEnum Status { get; private set; }
+    /// <summary>
+    /// The message [delivery error code](https://www.twilio.com/docs/sms/api/message-resource#delivery-related-errors) for a `failed` status
+    /// </summary>
+    [JsonProperty("error_code")]
+    public int? ErrorCode { get; private set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An absolute URL for this delivery receipt.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private DeliveryReceiptResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/Conversation/MessageOptions.cs b/src/Twilio/Rest/Conversations/V1/Service/Conversation/MessageOptions.cs
index 51f69ff1f..2076c57ae 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/Conversation/MessageOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/Conversation/MessageOptions.cs
@@ -9,366 +9,366 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Service.Conversation
-{
-
+{
+
+  /// <summary>
+  /// Add a new message to the conversation in a specific service
+  /// </summary>
+  public class CreateMessageOptions : IOptions<MessageResource>
+  {
     /// <summary>
-    /// Add a new message to the conversation in a specific service
-    /// </summary>
-    public class CreateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this message.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// The channel specific identifier of the message's author.
-        /// </summary>
-        public string Author { get; set; }
-        /// <summary>
-        /// The content of the message.
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// A string metadata field you can use to store any data you wish.
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The Media SID to be attached to the new Message.
-        /// </summary>
-        public string MediaSid { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMessageOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        public CreateMessageOptions(string pathChatServiceSid, string pathConversationSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Author != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Author", Author));
-            }
-
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (MediaSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MediaSid", MediaSid.ToString()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
     /// <summary>
-    /// Update an existing message in the conversation
-    /// </summary>
-    public class UpdateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this message.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The channel specific identifier of the message's author.
-        /// </summary>
-        public string Author { get; set; }
-        /// <summary>
-        /// The content of the message.
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// A string metadata field you can use to store any data you wish.
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateMessageOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public UpdateMessageOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Author != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Author", Author));
-            }
-
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique ID of the Conversation for this message.
+    /// </summary>
+    public string PathConversationSid { get; }
     /// <summary>
-    /// Remove a message from the conversation
-    /// </summary>
-    public class DeleteMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this message.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteMessageOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteMessageOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The channel specific identifier of the message's author.
+    /// </summary>
+    public string Author { get; set; }
     /// <summary>
-    /// Fetch a message from the conversation
-    /// </summary>
-    public class FetchMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this message.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMessageOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchMessageOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The content of the message.
+    /// </summary>
+    public string Body { get; set; }
     /// <summary>
-    /// Retrieve a list of all messages in the conversation
-    /// </summary>
-    public class ReadMessageOptions : ReadOptions<MessageResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for messages.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// The sort order of the returned messages
-        /// </summary>
-        public MessageResource.OrderTypeEnum Order { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMessageOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for messages. </param>
-        public ReadMessageOptions(string pathChatServiceSid, string pathConversationSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Order != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The date that this resource was created.
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// A string metadata field you can use to store any data you wish.
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The Media SID to be attached to the new Message.
+    /// </summary>
+    public string MediaSid { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMessageOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    public CreateMessageOptions(string pathChatServiceSid, string pathConversationSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Author != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Author", Author));
+      }
+
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (MediaSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MediaSid", MediaSid.ToString()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing message in the conversation
+  /// </summary>
+  public class UpdateMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Conversation for this message.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The channel specific identifier of the message's author.
+    /// </summary>
+    public string Author { get; set; }
+    /// <summary>
+    /// The content of the message.
+    /// </summary>
+    public string Body { get; set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// A string metadata field you can use to store any data you wish.
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateMessageOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public UpdateMessageOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Author != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Author", Author));
+      }
+
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove a message from the conversation
+  /// </summary>
+  public class DeleteMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Conversation for this message.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteMessageOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteMessageOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a message from the conversation
+  /// </summary>
+  public class FetchMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Conversation for this message.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchMessageOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchMessageOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all messages in the conversation
+  /// </summary>
+  public class ReadMessageOptions : ReadOptions<MessageResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Conversation for messages.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// The sort order of the returned messages
+    /// </summary>
+    public MessageResource.OrderTypeEnum Order { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMessageOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for messages. </param>
+    public ReadMessageOptions(string pathChatServiceSid, string pathConversationSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Order != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/Conversation/MessageResource.cs b/src/Twilio/Rest/Conversations/V1/Service/Conversation/MessageResource.cs
index 51b3765a0..b20b175f9 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/Conversation/MessageResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/Conversation/MessageResource.cs
@@ -17,631 +17,631 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Service.Conversation
-{
-
-    public class MessageResource : Resource
-    {
-        public sealed class OrderTypeEnum : StringEnum
-        {
-            private OrderTypeEnum(string value) : base(value) {}
-            public OrderTypeEnum() {}
-            public static implicit operator OrderTypeEnum(string value)
-            {
-                return new OrderTypeEnum(value);
-            }
-
-            public static readonly OrderTypeEnum Asc = new OrderTypeEnum("asc");
-            public static readonly OrderTypeEnum Desc = new OrderTypeEnum("desc");
-        }
-
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Add a new message to the conversation in a specific service
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new message to the conversation in a specific service
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Add a new message to the conversation in a specific service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="author"> The channel specific identifier of the message's author. </param>
-        /// <param name="body"> The content of the message. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
-        /// <param name="mediaSid"> The Media SID to be attached to the new Message. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(string pathChatServiceSid,
-                                             string pathConversationSid,
-                                             string author = null,
-                                             string body = null,
-                                             DateTime? dateCreated = null,
-                                             DateTime? dateUpdated = null,
-                                             string attributes = null,
-                                             string mediaSid = null,
-                                             MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(pathChatServiceSid, pathConversationSid){Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new message to the conversation in a specific service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="author"> The channel specific identifier of the message's author. </param>
-        /// <param name="body"> The content of the message. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
-        /// <param name="mediaSid"> The Media SID to be attached to the new Message. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(string pathChatServiceSid,
-                                                                                     string pathConversationSid,
-                                                                                     string author = null,
-                                                                                     string body = null,
-                                                                                     DateTime? dateCreated = null,
-                                                                                     DateTime? dateUpdated = null,
-                                                                                     string attributes = null,
-                                                                                     string mediaSid = null,
-                                                                                     MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(pathChatServiceSid, pathConversationSid){Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Update an existing message in the conversation
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing message in the conversation
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing message in the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="author"> The channel specific identifier of the message's author. </param>
-        /// <param name="body"> The content of the message. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(string pathChatServiceSid,
-                                             string pathConversationSid,
-                                             string pathSid,
-                                             string author = null,
-                                             string body = null,
-                                             DateTime? dateCreated = null,
-                                             DateTime? dateUpdated = null,
-                                             string attributes = null,
-                                             MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathChatServiceSid, pathConversationSid, pathSid){Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing message in the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="author"> The channel specific identifier of the message's author. </param>
-        /// <param name="body"> The content of the message. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathChatServiceSid,
-                                                                                     string pathConversationSid,
-                                                                                     string pathSid,
-                                                                                     string author = null,
-                                                                                     string body = null,
-                                                                                     DateTime? dateCreated = null,
-                                                                                     DateTime? dateUpdated = null,
-                                                                                     string attributes = null,
-                                                                                     MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathChatServiceSid, pathConversationSid, pathSid){Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Remove a message from the conversation
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a message from the conversation
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a message from the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(string pathChatServiceSid,
-                                  string pathConversationSid,
-                                  string pathSid,
-                                  MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathChatServiceSid, pathConversationSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a message from the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
-                                                                          string pathConversationSid,
-                                                                          string pathSid,
-                                                                          MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathChatServiceSid, pathConversationSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a message from the conversation
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a message from the conversation
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a message from the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(string pathChatServiceSid,
-                                            string pathConversationSid,
-                                            string pathSid,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathChatServiceSid, pathConversationSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a message from the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathChatServiceSid,
-                                                                                    string pathConversationSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathChatServiceSid, pathConversationSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all messages in the conversation
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all messages in the conversation
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all messages in the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for messages. </param>
-        /// <param name="order"> The sort order of the returned messages </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(string pathChatServiceSid,
-                                                        string pathConversationSid,
-                                                        MessageResource.OrderTypeEnum order = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(pathChatServiceSid, pathConversationSid){Order = order, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all messages in the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for messages. </param>
-        /// <param name="order"> The sort order of the returned messages </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathChatServiceSid,
-                                                                                                string pathConversationSid,
-                                                                                                MessageResource.OrderTypeEnum order = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(pathChatServiceSid, pathConversationSid){Order = order, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a MessageResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MessageResource object represented by the provided JSON </returns>
-        public static MessageResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MessageResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this message.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation for this message.
-        /// </summary>
-        [JsonProperty("conversation_sid")]
-        public string ConversationSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The index of the message within the Conversation.
-        /// </summary>
-        [JsonProperty("index")]
-        public int? Index { get; private set; }
-        /// <summary>
-        /// The channel specific identifier of the message's author.
-        /// </summary>
-        [JsonProperty("author")]
-        public string Author { get; private set; }
-        /// <summary>
-        /// The content of the message.
-        /// </summary>
-        [JsonProperty("body")]
-        public string Body { get; private set; }
-        /// <summary>
-        /// An array of objects that describe the Message's media if attached, otherwise, null.
-        /// </summary>
-        [JsonProperty("media")]
-        public List<object> Media { get; private set; }
-        /// <summary>
-        /// A string metadata field you can use to store any data you wish.
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The unique ID of messages's author participant.
-        /// </summary>
-        [JsonProperty("participant_sid")]
-        public string ParticipantSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An object that contains the summary of delivery statuses for the message to non-chat participants.
-        /// </summary>
-        [JsonProperty("delivery")]
-        public object Delivery { get; private set; }
-        /// <summary>
-        /// An absolute URL for this message.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Absolute URL to access the receipts of this message.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private MessageResource()
-        {
-
-        }
-    }
+{
+
+  public class MessageResource : Resource
+  {
+    public sealed class OrderTypeEnum : StringEnum
+    {
+      private OrderTypeEnum(string value) : base(value) { }
+      public OrderTypeEnum() { }
+      public static implicit operator OrderTypeEnum(string value)
+      {
+        return new OrderTypeEnum(value);
+      }
+
+      public static readonly OrderTypeEnum Asc = new OrderTypeEnum("asc");
+      public static readonly OrderTypeEnum Desc = new OrderTypeEnum("desc");
+    }
+
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Add a new message to the conversation in a specific service
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new message to the conversation in a specific service
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Add a new message to the conversation in a specific service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="author"> The channel specific identifier of the message's author. </param>
+    /// <param name="body"> The content of the message. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
+    /// <param name="mediaSid"> The Media SID to be attached to the new Message. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(string pathChatServiceSid,
+                                         string pathConversationSid,
+                                         string author = null,
+                                         string body = null,
+                                         DateTime? dateCreated = null,
+                                         DateTime? dateUpdated = null,
+                                         string attributes = null,
+                                         string mediaSid = null,
+                                         MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(pathChatServiceSid, pathConversationSid) { Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new message to the conversation in a specific service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="author"> The channel specific identifier of the message's author. </param>
+    /// <param name="body"> The content of the message. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
+    /// <param name="mediaSid"> The Media SID to be attached to the new Message. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(string pathChatServiceSid,
+                                                                                 string pathConversationSid,
+                                                                                 string author = null,
+                                                                                 string body = null,
+                                                                                 DateTime? dateCreated = null,
+                                                                                 DateTime? dateUpdated = null,
+                                                                                 string attributes = null,
+                                                                                 string mediaSid = null,
+                                                                                 MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(pathChatServiceSid, pathConversationSid) { Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Update an existing message in the conversation
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing message in the conversation
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing message in the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="author"> The channel specific identifier of the message's author. </param>
+    /// <param name="body"> The content of the message. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(string pathChatServiceSid,
+                                         string pathConversationSid,
+                                         string pathSid,
+                                         string author = null,
+                                         string body = null,
+                                         DateTime? dateCreated = null,
+                                         DateTime? dateUpdated = null,
+                                         string attributes = null,
+                                         MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathChatServiceSid, pathConversationSid, pathSid) { Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing message in the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="author"> The channel specific identifier of the message's author. </param>
+    /// <param name="body"> The content of the message. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> A string metadata field you can use to store any data you wish. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathChatServiceSid,
+                                                                                 string pathConversationSid,
+                                                                                 string pathSid,
+                                                                                 string author = null,
+                                                                                 string body = null,
+                                                                                 DateTime? dateCreated = null,
+                                                                                 DateTime? dateUpdated = null,
+                                                                                 string attributes = null,
+                                                                                 MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathChatServiceSid, pathConversationSid, pathSid) { Author = author, Body = body, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Remove a message from the conversation
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a message from the conversation
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a message from the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(string pathChatServiceSid,
+                              string pathConversationSid,
+                              string pathSid,
+                              MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathChatServiceSid, pathConversationSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a message from the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
+                                                                      string pathConversationSid,
+                                                                      string pathSid,
+                                                                      MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathChatServiceSid, pathConversationSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a message from the conversation
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a message from the conversation
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a message from the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(string pathChatServiceSid,
+                                        string pathConversationSid,
+                                        string pathSid,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathChatServiceSid, pathConversationSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a message from the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this message. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathChatServiceSid,
+                                                                                string pathConversationSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathChatServiceSid, pathConversationSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Messages",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all messages in the conversation
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all messages in the conversation
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all messages in the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for messages. </param>
+    /// <param name="order"> The sort order of the returned messages </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(string pathChatServiceSid,
+                                                    string pathConversationSid,
+                                                    MessageResource.OrderTypeEnum order = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions(pathChatServiceSid, pathConversationSid) { Order = order, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all messages in the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for messages. </param>
+    /// <param name="order"> The sort order of the returned messages </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathChatServiceSid,
+                                                                                            string pathConversationSid,
+                                                                                            MessageResource.OrderTypeEnum order = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions(pathChatServiceSid, pathConversationSid) { Order = order, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a MessageResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MessageResource object represented by the provided JSON </returns>
+    public static MessageResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MessageResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this message.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation for this message.
+    /// </summary>
+    [JsonProperty("conversation_sid")]
+    public string ConversationSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The index of the message within the Conversation.
+    /// </summary>
+    [JsonProperty("index")]
+    public int? Index { get; private set; }
+    /// <summary>
+    /// The channel specific identifier of the message's author.
+    /// </summary>
+    [JsonProperty("author")]
+    public string Author { get; private set; }
+    /// <summary>
+    /// The content of the message.
+    /// </summary>
+    [JsonProperty("body")]
+    public string Body { get; private set; }
+    /// <summary>
+    /// An array of objects that describe the Message's media if attached, otherwise, null.
+    /// </summary>
+    [JsonProperty("media")]
+    public List<object> Media { get; private set; }
+    /// <summary>
+    /// A string metadata field you can use to store any data you wish.
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The unique ID of messages's author participant.
+    /// </summary>
+    [JsonProperty("participant_sid")]
+    public string ParticipantSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An object that contains the summary of delivery statuses for the message to non-chat participants.
+    /// </summary>
+    [JsonProperty("delivery")]
+    public object Delivery { get; private set; }
+    /// <summary>
+    /// An absolute URL for this message.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Absolute URL to access the receipts of this message.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private MessageResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/Conversation/ParticipantOptions.cs b/src/Twilio/Rest/Conversations/V1/Service/Conversation/ParticipantOptions.cs
index 997fdb1bd..3e21df989 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/Conversation/ParticipantOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/Conversation/ParticipantOptions.cs
@@ -9,411 +9,411 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Service.Conversation
-{
-
+{
+
+  /// <summary>
+  /// Add a new participant to the conversation in a specific service
+  /// </summary>
+  public class CreateParticipantOptions : IOptions<ParticipantResource>
+  {
     /// <summary>
-    /// Add a new participant to the conversation in a specific service
-    /// </summary>
-    public class CreateParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this participant.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A unique string identifier for the conversation participant as Conversation User.
-        /// </summary>
-        public string Identity { get; set; }
-        /// <summary>
-        /// The address of the participant's device.
-        /// </summary>
-        public string MessagingBindingAddress { get; set; }
-        /// <summary>
-        /// The address of the Twilio phone number that the participant is in contact with.
-        /// </summary>
-        public string MessagingBindingProxyAddress { get; set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The address of the Twilio phone number that is used in Group MMS.
-        /// </summary>
-        public string MessagingBindingProjectedAddress { get; set; }
-        /// <summary>
-        /// The SID of a conversation-level Role to assign to the participant
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ParticipantResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateParticipantOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        public CreateParticipantOptions(string pathChatServiceSid, string pathConversationSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (MessagingBindingAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingBinding.Address", MessagingBindingAddress));
-            }
-
-            if (MessagingBindingProxyAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingBinding.ProxyAddress", MessagingBindingProxyAddress));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (MessagingBindingProjectedAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingBinding.ProjectedAddress", MessagingBindingProjectedAddress));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
     /// <summary>
-    /// Update an existing participant in the conversation
-    /// </summary>
-    public class UpdateParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this participant.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// A unique string identifier for the conversation participant as Conversation User.
-        /// </summary>
-        public string Identity { get; set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The SID of a conversation-level Role to assign to the participant
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The address of the Twilio phone number that the participant is in contact with.
-        /// </summary>
-        public string MessagingBindingProxyAddress { get; set; }
-        /// <summary>
-        /// The address of the Twilio phone number that is used in Group MMS.
-        /// </summary>
-        public string MessagingBindingProjectedAddress { get; set; }
-        /// <summary>
-        /// Index of last “read” message in the Conversation for the Participant.
-        /// </summary>
-        public int? LastReadMessageIndex { get; set; }
-        /// <summary>
-        /// Timestamp of last “read” message in the Conversation for the Participant.
-        /// </summary>
-        public string LastReadTimestamp { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ParticipantResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateParticipantOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public UpdateParticipantOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (MessagingBindingProxyAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingBinding.ProxyAddress", MessagingBindingProxyAddress));
-            }
-
-            if (MessagingBindingProjectedAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingBinding.ProjectedAddress", MessagingBindingProjectedAddress));
-            }
-
-            if (LastReadMessageIndex != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastReadMessageIndex", LastReadMessageIndex.ToString()));
-            }
-
-            if (LastReadTimestamp != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastReadTimestamp", LastReadTimestamp));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique ID of the Conversation for this participant.
+    /// </summary>
+    public string PathConversationSid { get; }
     /// <summary>
-    /// Remove a participant from the conversation
-    /// </summary>
-    public class DeleteParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this participant.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ParticipantResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteParticipantOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteParticipantOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// A unique string identifier for the conversation participant as Conversation User.
+    /// </summary>
+    public string Identity { get; set; }
     /// <summary>
-    /// Fetch a participant of the conversation
-    /// </summary>
-    public class FetchParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this participant.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchParticipantOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchParticipantOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The address of the participant's device.
+    /// </summary>
+    public string MessagingBindingAddress { get; set; }
     /// <summary>
-    /// Retrieve a list of all participants of the conversation
-    /// </summary>
-    public class ReadParticipantOptions : ReadOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for participants.
-        /// </summary>
-        public string PathConversationSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadParticipantOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for participants. </param>
-        public ReadParticipantOptions(string pathChatServiceSid, string pathConversationSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The address of the Twilio phone number that the participant is in contact with.
+    /// </summary>
+    public string MessagingBindingProxyAddress { get; set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The address of the Twilio phone number that is used in Group MMS.
+    /// </summary>
+    public string MessagingBindingProjectedAddress { get; set; }
+    /// <summary>
+    /// The SID of a conversation-level Role to assign to the participant
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ParticipantResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateParticipantOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    public CreateParticipantOptions(string pathChatServiceSid, string pathConversationSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (MessagingBindingAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingBinding.Address", MessagingBindingAddress));
+      }
+
+      if (MessagingBindingProxyAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingBinding.ProxyAddress", MessagingBindingProxyAddress));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (MessagingBindingProjectedAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingBinding.ProjectedAddress", MessagingBindingProjectedAddress));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing participant in the conversation
+  /// </summary>
+  public class UpdateParticipantOptions : IOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Conversation for this participant.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// A unique string identifier for the conversation participant as Conversation User.
+    /// </summary>
+    public string Identity { get; set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The SID of a conversation-level Role to assign to the participant
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The address of the Twilio phone number that the participant is in contact with.
+    /// </summary>
+    public string MessagingBindingProxyAddress { get; set; }
+    /// <summary>
+    /// The address of the Twilio phone number that is used in Group MMS.
+    /// </summary>
+    public string MessagingBindingProjectedAddress { get; set; }
+    /// <summary>
+    /// Index of last “read” message in the Conversation for the Participant.
+    /// </summary>
+    public int? LastReadMessageIndex { get; set; }
+    /// <summary>
+    /// Timestamp of last “read” message in the Conversation for the Participant.
+    /// </summary>
+    public string LastReadTimestamp { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ParticipantResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateParticipantOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public UpdateParticipantOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (MessagingBindingProxyAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingBinding.ProxyAddress", MessagingBindingProxyAddress));
+      }
+
+      if (MessagingBindingProjectedAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingBinding.ProjectedAddress", MessagingBindingProjectedAddress));
+      }
+
+      if (LastReadMessageIndex != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastReadMessageIndex", LastReadMessageIndex.ToString()));
+      }
+
+      if (LastReadTimestamp != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastReadTimestamp", LastReadTimestamp));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove a participant from the conversation
+  /// </summary>
+  public class DeleteParticipantOptions : IOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Conversation for this participant.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ParticipantResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteParticipantOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteParticipantOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a participant of the conversation
+  /// </summary>
+  public class FetchParticipantOptions : IOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Conversation for this participant.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchParticipantOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchParticipantOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all participants of the conversation
+  /// </summary>
+  public class ReadParticipantOptions : ReadOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Conversation for participants.
+    /// </summary>
+    public string PathConversationSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadParticipantOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for participants. </param>
+    public ReadParticipantOptions(string pathChatServiceSid, string pathConversationSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/Conversation/ParticipantResource.cs b/src/Twilio/Rest/Conversations/V1/Service/Conversation/ParticipantResource.cs
index 5f92ae0ad..1e16a82e6 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/Conversation/ParticipantResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/Conversation/ParticipantResource.cs
@@ -17,636 +17,636 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Service.Conversation
-{
-
-    public class ParticipantResource : Resource
-    {
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildCreateRequest(CreateParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Participants",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Add a new participant to the conversation in a specific service
-        /// </summary>
-        /// <param name="options"> Create Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Create(CreateParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new participant to the conversation in a specific service
-        /// </summary>
-        /// <param name="options"> Create Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(CreateParticipantOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Add a new participant to the conversation in a specific service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
-        /// <param name="messagingBindingAddress"> The address of the participant's device. </param>
-        /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
-        ///                                    contact with. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
-        ///                                        </param>
-        /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Create(string pathChatServiceSid,
-                                                 string pathConversationSid,
-                                                 string identity = null,
-                                                 string messagingBindingAddress = null,
-                                                 string messagingBindingProxyAddress = null,
-                                                 DateTime? dateCreated = null,
-                                                 DateTime? dateUpdated = null,
-                                                 string attributes = null,
-                                                 string messagingBindingProjectedAddress = null,
-                                                 string roleSid = null,
-                                                 ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateParticipantOptions(pathChatServiceSid, pathConversationSid){Identity = identity, MessagingBindingAddress = messagingBindingAddress, MessagingBindingProxyAddress = messagingBindingProxyAddress, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new participant to the conversation in a specific service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
-        /// <param name="messagingBindingAddress"> The address of the participant's device. </param>
-        /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
-        ///                                    contact with. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
-        ///                                        </param>
-        /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(string pathChatServiceSid,
-                                                                                         string pathConversationSid,
-                                                                                         string identity = null,
-                                                                                         string messagingBindingAddress = null,
-                                                                                         string messagingBindingProxyAddress = null,
-                                                                                         DateTime? dateCreated = null,
-                                                                                         DateTime? dateUpdated = null,
-                                                                                         string attributes = null,
-                                                                                         string messagingBindingProjectedAddress = null,
-                                                                                         string roleSid = null,
-                                                                                         ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateParticipantOptions(pathChatServiceSid, pathConversationSid){Identity = identity, MessagingBindingAddress = messagingBindingAddress, MessagingBindingProxyAddress = messagingBindingProxyAddress, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Participants/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Update an existing participant in the conversation
-        /// </summary>
-        /// <param name="options"> Update Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Update(UpdateParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing participant in the conversation
-        /// </summary>
-        /// <param name="options"> Update Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(UpdateParticipantOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing participant in the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
-        /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
-        ///                                    contact with. </param>
-        /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
-        ///                                        </param>
-        /// <param name="lastReadMessageIndex"> Index of last “read” message in the Conversation for the Participant. </param>
-        /// <param name="lastReadTimestamp"> Timestamp of last “read” message in the Conversation for the Participant. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Update(string pathChatServiceSid,
-                                                 string pathConversationSid,
-                                                 string pathSid,
-                                                 DateTime? dateCreated = null,
-                                                 DateTime? dateUpdated = null,
-                                                 string identity = null,
-                                                 string attributes = null,
-                                                 string roleSid = null,
-                                                 string messagingBindingProxyAddress = null,
-                                                 string messagingBindingProjectedAddress = null,
-                                                 int? lastReadMessageIndex = null,
-                                                 string lastReadTimestamp = null,
-                                                 ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateParticipantOptions(pathChatServiceSid, pathConversationSid, pathSid){DateCreated = dateCreated, DateUpdated = dateUpdated, Identity = identity, Attributes = attributes, RoleSid = roleSid, MessagingBindingProxyAddress = messagingBindingProxyAddress, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, LastReadMessageIndex = lastReadMessageIndex, LastReadTimestamp = lastReadTimestamp, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing participant in the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
-        /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
-        ///                                    contact with. </param>
-        /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
-        ///                                        </param>
-        /// <param name="lastReadMessageIndex"> Index of last “read” message in the Conversation for the Participant. </param>
-        /// <param name="lastReadTimestamp"> Timestamp of last “read” message in the Conversation for the Participant. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(string pathChatServiceSid,
-                                                                                         string pathConversationSid,
-                                                                                         string pathSid,
-                                                                                         DateTime? dateCreated = null,
-                                                                                         DateTime? dateUpdated = null,
-                                                                                         string identity = null,
-                                                                                         string attributes = null,
-                                                                                         string roleSid = null,
-                                                                                         string messagingBindingProxyAddress = null,
-                                                                                         string messagingBindingProjectedAddress = null,
-                                                                                         int? lastReadMessageIndex = null,
-                                                                                         string lastReadTimestamp = null,
-                                                                                         ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateParticipantOptions(pathChatServiceSid, pathConversationSid, pathSid){DateCreated = dateCreated, DateUpdated = dateUpdated, Identity = identity, Attributes = attributes, RoleSid = roleSid, MessagingBindingProxyAddress = messagingBindingProxyAddress, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, LastReadMessageIndex = lastReadMessageIndex, LastReadTimestamp = lastReadTimestamp, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Participants/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Remove a participant from the conversation
-        /// </summary>
-        /// <param name="options"> Delete Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static bool Delete(DeleteParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a participant from the conversation
-        /// </summary>
-        /// <param name="options"> Delete Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteParticipantOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a participant from the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static bool Delete(string pathChatServiceSid,
-                                  string pathConversationSid,
-                                  string pathSid,
-                                  ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteParticipantOptions(pathChatServiceSid, pathConversationSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a participant from the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
-                                                                          string pathConversationSid,
-                                                                          string pathSid,
-                                                                          ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteParticipantOptions(pathChatServiceSid, pathConversationSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Participants/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a participant of the conversation
-        /// </summary>
-        /// <param name="options"> Fetch Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Fetch(FetchParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a participant of the conversation
-        /// </summary>
-        /// <param name="options"> Fetch Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(FetchParticipantOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a participant of the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Fetch(string pathChatServiceSid,
-                                                string pathConversationSid,
-                                                string pathSid,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchParticipantOptions(pathChatServiceSid, pathConversationSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a participant of the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(string pathChatServiceSid,
-                                                                                        string pathConversationSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchParticipantOptions(pathChatServiceSid, pathConversationSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Participants",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all participants of the conversation
-        /// </summary>
-        /// <param name="options"> Read Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ResourceSet<ParticipantResource> Read(ReadParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantResource>.FromJson("participants", response.Content);
-            return new ResourceSet<ParticipantResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all participants of the conversation
-        /// </summary>
-        /// <param name="options"> Read Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(ReadParticipantOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantResource>.FromJson("participants", response.Content);
-            return new ResourceSet<ParticipantResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all participants of the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for participants. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ResourceSet<ParticipantResource> Read(string pathChatServiceSid,
-                                                            string pathConversationSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantOptions(pathChatServiceSid, pathConversationSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all participants of the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for participants. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(string pathChatServiceSid,
-                                                                                                    string pathConversationSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantOptions(pathChatServiceSid, pathConversationSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ParticipantResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ParticipantResource> NextPage(Page<ParticipantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ParticipantResource> PreviousPage(Page<ParticipantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a ParticipantResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ParticipantResource object represented by the provided JSON </returns>
-        public static ParticipantResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ParticipantResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this participant.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation for this participant.
-        /// </summary>
-        [JsonProperty("conversation_sid")]
-        public string ConversationSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A unique string identifier for the conversation participant as Conversation User.
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// Information about how this participant exchanges messages with the conversation.
-        /// </summary>
-        [JsonProperty("messaging_binding")]
-        public object MessagingBinding { get; private set; }
-        /// <summary>
-        /// The SID of a conversation-level Role to assign to the participant
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An absolute URL for this participant.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Index of last “read” message in the Conversation for the Participant.
-        /// </summary>
-        [JsonProperty("last_read_message_index")]
-        public int? LastReadMessageIndex { get; private set; }
-        /// <summary>
-        /// Timestamp of last “read” message in the Conversation for the Participant.
-        /// </summary>
-        [JsonProperty("last_read_timestamp")]
-        public string LastReadTimestamp { get; private set; }
-
-        private ParticipantResource()
-        {
-
-        }
-    }
+{
+
+  public class ParticipantResource : Resource
+  {
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildCreateRequest(CreateParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Participants",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Add a new participant to the conversation in a specific service
+    /// </summary>
+    /// <param name="options"> Create Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Create(CreateParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new participant to the conversation in a specific service
+    /// </summary>
+    /// <param name="options"> Create Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(CreateParticipantOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Add a new participant to the conversation in a specific service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
+    /// <param name="messagingBindingAddress"> The address of the participant's device. </param>
+    /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
+    ///                                    contact with. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
+    ///                                        </param>
+    /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Create(string pathChatServiceSid,
+                                             string pathConversationSid,
+                                             string identity = null,
+                                             string messagingBindingAddress = null,
+                                             string messagingBindingProxyAddress = null,
+                                             DateTime? dateCreated = null,
+                                             DateTime? dateUpdated = null,
+                                             string attributes = null,
+                                             string messagingBindingProjectedAddress = null,
+                                             string roleSid = null,
+                                             ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateParticipantOptions(pathChatServiceSid, pathConversationSid) { Identity = identity, MessagingBindingAddress = messagingBindingAddress, MessagingBindingProxyAddress = messagingBindingProxyAddress, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new participant to the conversation in a specific service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
+    /// <param name="messagingBindingAddress"> The address of the participant's device. </param>
+    /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
+    ///                                    contact with. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
+    ///                                        </param>
+    /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(string pathChatServiceSid,
+                                                                                     string pathConversationSid,
+                                                                                     string identity = null,
+                                                                                     string messagingBindingAddress = null,
+                                                                                     string messagingBindingProxyAddress = null,
+                                                                                     DateTime? dateCreated = null,
+                                                                                     DateTime? dateUpdated = null,
+                                                                                     string attributes = null,
+                                                                                     string messagingBindingProjectedAddress = null,
+                                                                                     string roleSid = null,
+                                                                                     ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateParticipantOptions(pathChatServiceSid, pathConversationSid) { Identity = identity, MessagingBindingAddress = messagingBindingAddress, MessagingBindingProxyAddress = messagingBindingProxyAddress, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Participants/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Update an existing participant in the conversation
+    /// </summary>
+    /// <param name="options"> Update Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Update(UpdateParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing participant in the conversation
+    /// </summary>
+    /// <param name="options"> Update Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(UpdateParticipantOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing participant in the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
+    /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
+    ///                                    contact with. </param>
+    /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
+    ///                                        </param>
+    /// <param name="lastReadMessageIndex"> Index of last “read” message in the Conversation for the Participant. </param>
+    /// <param name="lastReadTimestamp"> Timestamp of last “read” message in the Conversation for the Participant. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Update(string pathChatServiceSid,
+                                             string pathConversationSid,
+                                             string pathSid,
+                                             DateTime? dateCreated = null,
+                                             DateTime? dateUpdated = null,
+                                             string identity = null,
+                                             string attributes = null,
+                                             string roleSid = null,
+                                             string messagingBindingProxyAddress = null,
+                                             string messagingBindingProjectedAddress = null,
+                                             int? lastReadMessageIndex = null,
+                                             string lastReadTimestamp = null,
+                                             ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateParticipantOptions(pathChatServiceSid, pathConversationSid, pathSid) { DateCreated = dateCreated, DateUpdated = dateUpdated, Identity = identity, Attributes = attributes, RoleSid = roleSid, MessagingBindingProxyAddress = messagingBindingProxyAddress, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, LastReadMessageIndex = lastReadMessageIndex, LastReadTimestamp = lastReadTimestamp, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing participant in the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="roleSid"> The SID of a conversation-level Role to assign to the participant </param>
+    /// <param name="messagingBindingProxyAddress"> The address of the Twilio phone number that the participant is in
+    ///                                    contact with. </param>
+    /// <param name="messagingBindingProjectedAddress"> The address of the Twilio phone number that is used in Group MMS.
+    ///                                        </param>
+    /// <param name="lastReadMessageIndex"> Index of last “read” message in the Conversation for the Participant. </param>
+    /// <param name="lastReadTimestamp"> Timestamp of last “read” message in the Conversation for the Participant. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(string pathChatServiceSid,
+                                                                                     string pathConversationSid,
+                                                                                     string pathSid,
+                                                                                     DateTime? dateCreated = null,
+                                                                                     DateTime? dateUpdated = null,
+                                                                                     string identity = null,
+                                                                                     string attributes = null,
+                                                                                     string roleSid = null,
+                                                                                     string messagingBindingProxyAddress = null,
+                                                                                     string messagingBindingProjectedAddress = null,
+                                                                                     int? lastReadMessageIndex = null,
+                                                                                     string lastReadTimestamp = null,
+                                                                                     ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateParticipantOptions(pathChatServiceSid, pathConversationSid, pathSid) { DateCreated = dateCreated, DateUpdated = dateUpdated, Identity = identity, Attributes = attributes, RoleSid = roleSid, MessagingBindingProxyAddress = messagingBindingProxyAddress, MessagingBindingProjectedAddress = messagingBindingProjectedAddress, LastReadMessageIndex = lastReadMessageIndex, LastReadTimestamp = lastReadTimestamp, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Participants/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Remove a participant from the conversation
+    /// </summary>
+    /// <param name="options"> Delete Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static bool Delete(DeleteParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a participant from the conversation
+    /// </summary>
+    /// <param name="options"> Delete Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteParticipantOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a participant from the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static bool Delete(string pathChatServiceSid,
+                              string pathConversationSid,
+                              string pathSid,
+                              ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteParticipantOptions(pathChatServiceSid, pathConversationSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a participant from the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
+                                                                      string pathConversationSid,
+                                                                      string pathSid,
+                                                                      ParticipantResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteParticipantOptions(pathChatServiceSid, pathConversationSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Participants/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a participant of the conversation
+    /// </summary>
+    /// <param name="options"> Fetch Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Fetch(FetchParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a participant of the conversation
+    /// </summary>
+    /// <param name="options"> Fetch Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(FetchParticipantOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a participant of the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Fetch(string pathChatServiceSid,
+                                            string pathConversationSid,
+                                            string pathSid,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchParticipantOptions(pathChatServiceSid, pathConversationSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a participant of the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this participant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(string pathChatServiceSid,
+                                                                                    string pathConversationSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchParticipantOptions(pathChatServiceSid, pathConversationSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Participants",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all participants of the conversation
+    /// </summary>
+    /// <param name="options"> Read Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ResourceSet<ParticipantResource> Read(ReadParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantResource>.FromJson("participants", response.Content);
+      return new ResourceSet<ParticipantResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all participants of the conversation
+    /// </summary>
+    /// <param name="options"> Read Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(ReadParticipantOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantResource>.FromJson("participants", response.Content);
+      return new ResourceSet<ParticipantResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all participants of the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for participants. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ResourceSet<ParticipantResource> Read(string pathChatServiceSid,
+                                                        string pathConversationSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantOptions(pathChatServiceSid, pathConversationSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all participants of the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for participants. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(string pathChatServiceSid,
+                                                                                                string pathConversationSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantOptions(pathChatServiceSid, pathConversationSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ParticipantResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ParticipantResource> NextPage(Page<ParticipantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ParticipantResource> PreviousPage(Page<ParticipantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a ParticipantResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ParticipantResource object represented by the provided JSON </returns>
+    public static ParticipantResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ParticipantResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this participant.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation for this participant.
+    /// </summary>
+    [JsonProperty("conversation_sid")]
+    public string ConversationSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A unique string identifier for the conversation participant as Conversation User.
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// Information about how this participant exchanges messages with the conversation.
+    /// </summary>
+    [JsonProperty("messaging_binding")]
+    public object MessagingBinding { get; private set; }
+    /// <summary>
+    /// The SID of a conversation-level Role to assign to the participant
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An absolute URL for this participant.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Index of last “read” message in the Conversation for the Participant.
+    /// </summary>
+    [JsonProperty("last_read_message_index")]
+    public int? LastReadMessageIndex { get; private set; }
+    /// <summary>
+    /// Timestamp of last “read” message in the Conversation for the Participant.
+    /// </summary>
+    [JsonProperty("last_read_timestamp")]
+    public string LastReadTimestamp { get; private set; }
+
+    private ParticipantResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/Conversation/WebhookOptions.cs b/src/Twilio/Rest/Conversations/V1/Service/Conversation/WebhookOptions.cs
index 34ad0f257..2541cfea6 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/Conversation/WebhookOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/Conversation/WebhookOptions.cs
@@ -10,318 +10,318 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Service.Conversation
-{
-
+{
+
+  /// <summary>
+  /// Create a new webhook scoped to the conversation in a specific service
+  /// </summary>
+  public class CreateWebhookOptions : IOptions<WebhookResource>
+  {
     /// <summary>
-    /// Create a new webhook scoped to the conversation in a specific service
-    /// </summary>
-    public class CreateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this webhook.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// The target of this webhook.
-        /// </summary>
-        public WebhookResource.TargetEnum Target { get; }
-        /// <summary>
-        /// The absolute url the webhook request should be sent to.
-        /// </summary>
-        public string ConfigurationUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to be used when sending a webhook request.
-        /// </summary>
-        public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
-        /// <summary>
-        /// The list of events, firing webhook event for this Conversation.
-        /// </summary>
-        public List<string> ConfigurationFilters { get; set; }
-        /// <summary>
-        /// The list of keywords, firing webhook event for this Conversation.
-        /// </summary>
-        public List<string> ConfigurationTriggers { get; set; }
-        /// <summary>
-        /// The studio flow SID, where the webhook should be sent to.
-        /// </summary>
-        public string ConfigurationFlowSid { get; set; }
-        /// <summary>
-        /// The message index for which and it's successors the webhook will be replayed.
-        /// </summary>
-        public int? ConfigurationReplayAfter { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateWebhookOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="target"> The target of this webhook. </param>
-        public CreateWebhookOptions(string pathChatServiceSid, string pathConversationSid, WebhookResource.TargetEnum target)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-            Target = target;
-            ConfigurationFilters = new List<string>();
-            ConfigurationTriggers = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Target != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Target", Target.ToString()));
-            }
-
-            if (ConfigurationUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
-            }
-
-            if (ConfigurationMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
-            }
-
-            if (ConfigurationFilters != null)
-            {
-                p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
-            }
-
-            if (ConfigurationTriggers != null)
-            {
-                p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
-            }
-
-            if (ConfigurationFlowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
-            }
-
-            if (ConfigurationReplayAfter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.ReplayAfter", ConfigurationReplayAfter.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
     /// <summary>
-    /// Update an existing conversation-scoped webhook
-    /// </summary>
-    public class UpdateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this webhook.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The absolute url the webhook request should be sent to.
-        /// </summary>
-        public string ConfigurationUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to be used when sending a webhook request.
-        /// </summary>
-        public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
-        /// <summary>
-        /// The list of events, firing webhook event for this Conversation.
-        /// </summary>
-        public List<string> ConfigurationFilters { get; set; }
-        /// <summary>
-        /// The list of keywords, firing webhook event for this Conversation.
-        /// </summary>
-        public List<string> ConfigurationTriggers { get; set; }
-        /// <summary>
-        /// The studio flow SID, where the webhook should be sent to.
-        /// </summary>
-        public string ConfigurationFlowSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateWebhookOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public UpdateWebhookOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-            ConfigurationFilters = new List<string>();
-            ConfigurationTriggers = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ConfigurationUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
-            }
-
-            if (ConfigurationMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
-            }
-
-            if (ConfigurationFilters != null)
-            {
-                p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
-            }
-
-            if (ConfigurationTriggers != null)
-            {
-                p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
-            }
-
-            if (ConfigurationFlowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique ID of the Conversation for this webhook.
+    /// </summary>
+    public string PathConversationSid { get; }
     /// <summary>
-    /// Remove an existing webhook scoped to the conversation
-    /// </summary>
-    public class DeleteWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this webhook.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteWebhookOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteWebhookOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The target of this webhook.
+    /// </summary>
+    public WebhookResource.TargetEnum Target { get; }
     /// <summary>
-    /// Fetch the configuration of a conversation-scoped webhook
-    /// </summary>
-    public class FetchWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this webhook.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchWebhookOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchWebhookOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The absolute url the webhook request should be sent to.
+    /// </summary>
+    public string ConfigurationUrl { get; set; }
     /// <summary>
-    /// Retrieve a list of all webhooks scoped to the conversation
-    /// </summary>
-    public class ReadWebhookOptions : ReadOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique ID of the Conversation for this webhook.
-        /// </summary>
-        public string PathConversationSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadWebhookOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        public ReadWebhookOptions(string pathChatServiceSid, string pathConversationSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The HTTP method to be used when sending a webhook request.
+    /// </summary>
+    public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
+    /// <summary>
+    /// The list of events, firing webhook event for this Conversation.
+    /// </summary>
+    public List<string> ConfigurationFilters { get; set; }
+    /// <summary>
+    /// The list of keywords, firing webhook event for this Conversation.
+    /// </summary>
+    public List<string> ConfigurationTriggers { get; set; }
+    /// <summary>
+    /// The studio flow SID, where the webhook should be sent to.
+    /// </summary>
+    public string ConfigurationFlowSid { get; set; }
+    /// <summary>
+    /// The message index for which and it's successors the webhook will be replayed.
+    /// </summary>
+    public int? ConfigurationReplayAfter { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateWebhookOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="target"> The target of this webhook. </param>
+    public CreateWebhookOptions(string pathChatServiceSid, string pathConversationSid, WebhookResource.TargetEnum target)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+      Target = target;
+      ConfigurationFilters = new List<string>();
+      ConfigurationTriggers = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Target != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Target", Target.ToString()));
+      }
+
+      if (ConfigurationUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
+      }
+
+      if (ConfigurationMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
+      }
+
+      if (ConfigurationFilters != null)
+      {
+        p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
+      }
+
+      if (ConfigurationTriggers != null)
+      {
+        p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
+      }
+
+      if (ConfigurationFlowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
+      }
+
+      if (ConfigurationReplayAfter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.ReplayAfter", ConfigurationReplayAfter.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing conversation-scoped webhook
+  /// </summary>
+  public class UpdateWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Conversation for this webhook.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The absolute url the webhook request should be sent to.
+    /// </summary>
+    public string ConfigurationUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to be used when sending a webhook request.
+    /// </summary>
+    public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
+    /// <summary>
+    /// The list of events, firing webhook event for this Conversation.
+    /// </summary>
+    public List<string> ConfigurationFilters { get; set; }
+    /// <summary>
+    /// The list of keywords, firing webhook event for this Conversation.
+    /// </summary>
+    public List<string> ConfigurationTriggers { get; set; }
+    /// <summary>
+    /// The studio flow SID, where the webhook should be sent to.
+    /// </summary>
+    public string ConfigurationFlowSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateWebhookOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public UpdateWebhookOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+      ConfigurationFilters = new List<string>();
+      ConfigurationTriggers = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ConfigurationUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
+      }
+
+      if (ConfigurationMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
+      }
+
+      if (ConfigurationFilters != null)
+      {
+        p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
+      }
+
+      if (ConfigurationTriggers != null)
+      {
+        p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
+      }
+
+      if (ConfigurationFlowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove an existing webhook scoped to the conversation
+  /// </summary>
+  public class DeleteWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Conversation for this webhook.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteWebhookOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteWebhookOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch the configuration of a conversation-scoped webhook
+  /// </summary>
+  public class FetchWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Conversation for this webhook.
+    /// </summary>
+    public string PathConversationSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchWebhookOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchWebhookOptions(string pathChatServiceSid, string pathConversationSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all webhooks scoped to the conversation
+  /// </summary>
+  public class ReadWebhookOptions : ReadOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique ID of the Conversation for this webhook.
+    /// </summary>
+    public string PathConversationSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadWebhookOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    public ReadWebhookOptions(string pathChatServiceSid, string pathConversationSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/Conversation/WebhookResource.cs b/src/Twilio/Rest/Conversations/V1/Service/Conversation/WebhookResource.cs
index 858b56034..dd51cb890 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/Conversation/WebhookResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/Conversation/WebhookResource.cs
@@ -17,592 +17,592 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Service.Conversation
-{
-
-    public class WebhookResource : Resource
-    {
-        public sealed class TargetEnum : StringEnum
-        {
-            private TargetEnum(string value) : base(value) {}
-            public TargetEnum() {}
-            public static implicit operator TargetEnum(string value)
-            {
-                return new TargetEnum(value);
-            }
-
-            public static readonly TargetEnum Webhook = new TargetEnum("webhook");
-            public static readonly TargetEnum Trigger = new TargetEnum("trigger");
-            public static readonly TargetEnum Studio = new TargetEnum("studio");
-        }
-
-        public sealed class MethodEnum : StringEnum
-        {
-            private MethodEnum(string value) : base(value) {}
-            public MethodEnum() {}
-            public static implicit operator MethodEnum(string value)
-            {
-                return new MethodEnum(value);
-            }
-
-            public static readonly MethodEnum Get = new MethodEnum("GET");
-            public static readonly MethodEnum Post = new MethodEnum("POST");
-        }
-
-        private static Request BuildCreateRequest(CreateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Webhooks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new webhook scoped to the conversation in a specific service
-        /// </summary>
-        /// <param name="options"> Create Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Create(CreateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new webhook scoped to the conversation in a specific service
-        /// </summary>
-        /// <param name="options"> Create Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(CreateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new webhook scoped to the conversation in a specific service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="target"> The target of this webhook. </param>
-        /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
-        /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
-        /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
-        /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
-        /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
-        /// <param name="configurationReplayAfter"> The message index for which and it's successors the webhook will be
-        ///                                replayed. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Create(string pathChatServiceSid,
-                                             string pathConversationSid,
-                                             WebhookResource.TargetEnum target,
-                                             string configurationUrl = null,
-                                             WebhookResource.MethodEnum configurationMethod = null,
-                                             List<string> configurationFilters = null,
-                                             List<string> configurationTriggers = null,
-                                             string configurationFlowSid = null,
-                                             int? configurationReplayAfter = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateWebhookOptions(pathChatServiceSid, pathConversationSid, target){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationReplayAfter = configurationReplayAfter};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new webhook scoped to the conversation in a specific service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="target"> The target of this webhook. </param>
-        /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
-        /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
-        /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
-        /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
-        /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
-        /// <param name="configurationReplayAfter"> The message index for which and it's successors the webhook will be
-        ///                                replayed. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(string pathChatServiceSid,
-                                                                                     string pathConversationSid,
-                                                                                     WebhookResource.TargetEnum target,
-                                                                                     string configurationUrl = null,
-                                                                                     WebhookResource.MethodEnum configurationMethod = null,
-                                                                                     List<string> configurationFilters = null,
-                                                                                     List<string> configurationTriggers = null,
-                                                                                     string configurationFlowSid = null,
-                                                                                     int? configurationReplayAfter = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateWebhookOptions(pathChatServiceSid, pathConversationSid, target){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationReplayAfter = configurationReplayAfter};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Webhooks/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an existing conversation-scoped webhook
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing conversation-scoped webhook
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing conversation-scoped webhook
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
-        /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
-        /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
-        /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
-        /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(string pathChatServiceSid,
-                                             string pathConversationSid,
-                                             string pathSid,
-                                             string configurationUrl = null,
-                                             WebhookResource.MethodEnum configurationMethod = null,
-                                             List<string> configurationFilters = null,
-                                             List<string> configurationTriggers = null,
-                                             string configurationFlowSid = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathChatServiceSid, pathConversationSid, pathSid){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing conversation-scoped webhook
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
-        /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
-        /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
-        /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
-        /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathChatServiceSid,
-                                                                                     string pathConversationSid,
-                                                                                     string pathSid,
-                                                                                     string configurationUrl = null,
-                                                                                     WebhookResource.MethodEnum configurationMethod = null,
-                                                                                     List<string> configurationFilters = null,
-                                                                                     List<string> configurationTriggers = null,
-                                                                                     string configurationFlowSid = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathChatServiceSid, pathConversationSid, pathSid){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Webhooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove an existing webhook scoped to the conversation
-        /// </summary>
-        /// <param name="options"> Delete Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static bool Delete(DeleteWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an existing webhook scoped to the conversation
-        /// </summary>
-        /// <param name="options"> Delete Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebhookOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove an existing webhook scoped to the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static bool Delete(string pathChatServiceSid,
-                                  string pathConversationSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebhookOptions(pathChatServiceSid, pathConversationSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an existing webhook scoped to the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
-                                                                          string pathConversationSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebhookOptions(pathChatServiceSid, pathConversationSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Webhooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the configuration of a conversation-scoped webhook
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the configuration of a conversation-scoped webhook
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the configuration of a conversation-scoped webhook
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(string pathChatServiceSid,
-                                            string pathConversationSid,
-                                            string pathSid,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathChatServiceSid, pathConversationSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the configuration of a conversation-scoped webhook
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathChatServiceSid,
-                                                                                    string pathConversationSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathChatServiceSid, pathConversationSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Webhooks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all webhooks scoped to the conversation
-        /// </summary>
-        /// <param name="options"> Read Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static ResourceSet<WebhookResource> Read(ReadWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
-            return new ResourceSet<WebhookResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all webhooks scoped to the conversation
-        /// </summary>
-        /// <param name="options"> Read Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(ReadWebhookOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
-            return new ResourceSet<WebhookResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all webhooks scoped to the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static ResourceSet<WebhookResource> Read(string pathChatServiceSid,
-                                                        string pathConversationSid,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadWebhookOptions(pathChatServiceSid, pathConversationSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all webhooks scoped to the conversation
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(string pathChatServiceSid,
-                                                                                                string pathConversationSid,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadWebhookOptions(pathChatServiceSid, pathConversationSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<WebhookResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<WebhookResource> NextPage(Page<WebhookResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<WebhookResource> PreviousPage(Page<WebhookResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a WebhookResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WebhookResource object represented by the provided JSON </returns>
-        public static WebhookResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WebhookResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Account responsible for this conversation.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation for this webhook.
-        /// </summary>
-        [JsonProperty("conversation_sid")]
-        public string ConversationSid { get; private set; }
-        /// <summary>
-        /// The target of this webhook.
-        /// </summary>
-        [JsonProperty("target")]
-        public string Target { get; private set; }
-        /// <summary>
-        /// An absolute URL for this webhook.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The configuration of this webhook.
-        /// </summary>
-        [JsonProperty("configuration")]
-        public object Configuration { get; private set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private WebhookResource()
-        {
-
-        }
-    }
+{
+
+  public class WebhookResource : Resource
+  {
+    public sealed class TargetEnum : StringEnum
+    {
+      private TargetEnum(string value) : base(value) { }
+      public TargetEnum() { }
+      public static implicit operator TargetEnum(string value)
+      {
+        return new TargetEnum(value);
+      }
+
+      public static readonly TargetEnum Webhook = new TargetEnum("webhook");
+      public static readonly TargetEnum Trigger = new TargetEnum("trigger");
+      public static readonly TargetEnum Studio = new TargetEnum("studio");
+    }
+
+    public sealed class MethodEnum : StringEnum
+    {
+      private MethodEnum(string value) : base(value) { }
+      public MethodEnum() { }
+      public static implicit operator MethodEnum(string value)
+      {
+        return new MethodEnum(value);
+      }
+
+      public static readonly MethodEnum Get = new MethodEnum("GET");
+      public static readonly MethodEnum Post = new MethodEnum("POST");
+    }
+
+    private static Request BuildCreateRequest(CreateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Webhooks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new webhook scoped to the conversation in a specific service
+    /// </summary>
+    /// <param name="options"> Create Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Create(CreateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new webhook scoped to the conversation in a specific service
+    /// </summary>
+    /// <param name="options"> Create Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(CreateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new webhook scoped to the conversation in a specific service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="target"> The target of this webhook. </param>
+    /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
+    /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
+    /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
+    /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
+    /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
+    /// <param name="configurationReplayAfter"> The message index for which and it's successors the webhook will be
+    ///                                replayed. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Create(string pathChatServiceSid,
+                                         string pathConversationSid,
+                                         WebhookResource.TargetEnum target,
+                                         string configurationUrl = null,
+                                         WebhookResource.MethodEnum configurationMethod = null,
+                                         List<string> configurationFilters = null,
+                                         List<string> configurationTriggers = null,
+                                         string configurationFlowSid = null,
+                                         int? configurationReplayAfter = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateWebhookOptions(pathChatServiceSid, pathConversationSid, target) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationReplayAfter = configurationReplayAfter };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new webhook scoped to the conversation in a specific service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="target"> The target of this webhook. </param>
+    /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
+    /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
+    /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
+    /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
+    /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
+    /// <param name="configurationReplayAfter"> The message index for which and it's successors the webhook will be
+    ///                                replayed. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(string pathChatServiceSid,
+                                                                                 string pathConversationSid,
+                                                                                 WebhookResource.TargetEnum target,
+                                                                                 string configurationUrl = null,
+                                                                                 WebhookResource.MethodEnum configurationMethod = null,
+                                                                                 List<string> configurationFilters = null,
+                                                                                 List<string> configurationTriggers = null,
+                                                                                 string configurationFlowSid = null,
+                                                                                 int? configurationReplayAfter = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateWebhookOptions(pathChatServiceSid, pathConversationSid, target) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationReplayAfter = configurationReplayAfter };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Webhooks/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an existing conversation-scoped webhook
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing conversation-scoped webhook
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing conversation-scoped webhook
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
+    /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
+    /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
+    /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
+    /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(string pathChatServiceSid,
+                                         string pathConversationSid,
+                                         string pathSid,
+                                         string configurationUrl = null,
+                                         WebhookResource.MethodEnum configurationMethod = null,
+                                         List<string> configurationFilters = null,
+                                         List<string> configurationTriggers = null,
+                                         string configurationFlowSid = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathChatServiceSid, pathConversationSid, pathSid) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing conversation-scoped webhook
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="configurationUrl"> The absolute url the webhook request should be sent to. </param>
+    /// <param name="configurationMethod"> The HTTP method to be used when sending a webhook request. </param>
+    /// <param name="configurationFilters"> The list of events, firing webhook event for this Conversation. </param>
+    /// <param name="configurationTriggers"> The list of keywords, firing webhook event for this Conversation. </param>
+    /// <param name="configurationFlowSid"> The studio flow SID, where the webhook should be sent to. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathChatServiceSid,
+                                                                                 string pathConversationSid,
+                                                                                 string pathSid,
+                                                                                 string configurationUrl = null,
+                                                                                 WebhookResource.MethodEnum configurationMethod = null,
+                                                                                 List<string> configurationFilters = null,
+                                                                                 List<string> configurationTriggers = null,
+                                                                                 string configurationFlowSid = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathChatServiceSid, pathConversationSid, pathSid) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Webhooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove an existing webhook scoped to the conversation
+    /// </summary>
+    /// <param name="options"> Delete Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static bool Delete(DeleteWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an existing webhook scoped to the conversation
+    /// </summary>
+    /// <param name="options"> Delete Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebhookOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove an existing webhook scoped to the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static bool Delete(string pathChatServiceSid,
+                              string pathConversationSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebhookOptions(pathChatServiceSid, pathConversationSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an existing webhook scoped to the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
+                                                                      string pathConversationSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebhookOptions(pathChatServiceSid, pathConversationSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Webhooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the configuration of a conversation-scoped webhook
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the configuration of a conversation-scoped webhook
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the configuration of a conversation-scoped webhook
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(string pathChatServiceSid,
+                                        string pathConversationSid,
+                                        string pathSid,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathChatServiceSid, pathConversationSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the configuration of a conversation-scoped webhook
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathChatServiceSid,
+                                                                                string pathConversationSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathChatServiceSid, pathConversationSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathConversationSid + "/Webhooks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all webhooks scoped to the conversation
+    /// </summary>
+    /// <param name="options"> Read Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static ResourceSet<WebhookResource> Read(ReadWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
+      return new ResourceSet<WebhookResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all webhooks scoped to the conversation
+    /// </summary>
+    /// <param name="options"> Read Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(ReadWebhookOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
+      return new ResourceSet<WebhookResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all webhooks scoped to the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static ResourceSet<WebhookResource> Read(string pathChatServiceSid,
+                                                    string pathConversationSid,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadWebhookOptions(pathChatServiceSid, pathConversationSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all webhooks scoped to the conversation
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathConversationSid"> The unique ID of the Conversation for this webhook. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(string pathChatServiceSid,
+                                                                                            string pathConversationSid,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadWebhookOptions(pathChatServiceSid, pathConversationSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<WebhookResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<WebhookResource> NextPage(Page<WebhookResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<WebhookResource> PreviousPage(Page<WebhookResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a WebhookResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WebhookResource object represented by the provided JSON </returns>
+    public static WebhookResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WebhookResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Account responsible for this conversation.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation for this webhook.
+    /// </summary>
+    [JsonProperty("conversation_sid")]
+    public string ConversationSid { get; private set; }
+    /// <summary>
+    /// The target of this webhook.
+    /// </summary>
+    [JsonProperty("target")]
+    public string Target { get; private set; }
+    /// <summary>
+    /// An absolute URL for this webhook.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The configuration of this webhook.
+    /// </summary>
+    [JsonProperty("configuration")]
+    public object Configuration { get; private set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private WebhookResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/ConversationOptions.cs b/src/Twilio/Rest/Conversations/V1/Service/ConversationOptions.cs
index f7f95ac35..47e4462ae 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/ConversationOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/ConversationOptions.cs
@@ -9,390 +9,390 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// Create a new conversation in your service
+  /// </summary>
+  public class CreateConversationOptions : IOptions<ConversationResource>
+  {
     /// <summary>
-    /// Create a new conversation in your service
-    /// </summary>
-    public class CreateConversationOptions : IOptions<ConversationResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The human-readable name of this conversation.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The unique ID of the Messaging Service this conversation belongs to.
-        /// </summary>
-        public string MessagingServiceSid { get; set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// Current state of this conversation.
-        /// </summary>
-        public ConversationResource.StateEnum State { get; set; }
-        /// <summary>
-        /// ISO8601 duration when conversation will be switched to `inactive` state.
-        /// </summary>
-        public string TimersInactive { get; set; }
-        /// <summary>
-        /// ISO8601 duration when conversation will be switched to `closed` state.
-        /// </summary>
-        public string TimersClosed { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ConversationResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateConversationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        public CreateConversationOptions(string pathChatServiceSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (MessagingServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (State != null)
-            {
-                p.Add(new KeyValuePair<string, string>("State", State.ToString()));
-            }
-
-            if (TimersInactive != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timers.Inactive", TimersInactive));
-            }
-
-            if (TimersClosed != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timers.Closed", TimersClosed));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
     /// <summary>
-    /// Update an existing conversation in your service
-    /// </summary>
-    public class UpdateConversationOptions : IOptions<ConversationResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The human-readable name of this conversation.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The unique ID of the Messaging Service this conversation belongs to.
-        /// </summary>
-        public string MessagingServiceSid { get; set; }
-        /// <summary>
-        /// Current state of this conversation.
-        /// </summary>
-        public ConversationResource.StateEnum State { get; set; }
-        /// <summary>
-        /// ISO8601 duration when conversation will be switched to `inactive` state.
-        /// </summary>
-        public string TimersInactive { get; set; }
-        /// <summary>
-        /// ISO8601 duration when conversation will be switched to `closed` state.
-        /// </summary>
-        public string TimersClosed { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ConversationResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateConversationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public UpdateConversationOptions(string pathChatServiceSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (MessagingServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
-            }
-
-            if (State != null)
-            {
-                p.Add(new KeyValuePair<string, string>("State", State.ToString()));
-            }
-
-            if (TimersInactive != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timers.Inactive", TimersInactive));
-            }
-
-            if (TimersClosed != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timers.Closed", TimersClosed));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The human-readable name of this conversation.
+    /// </summary>
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// Remove a conversation from your service
-    /// </summary>
-    public class DeleteConversationOptions : IOptions<ConversationResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ConversationResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteConversationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteConversationOptions(string pathChatServiceSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
     /// <summary>
-    /// Fetch a conversation from your service
-    /// </summary>
-    public class FetchConversationOptions : IOptions<ConversationResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchConversationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchConversationOptions(string pathChatServiceSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    public string Attributes { get; set; }
     /// <summary>
-    /// Retrieve a list of conversations in your service
+    /// The unique ID of the Messaging Service this conversation belongs to.
     /// </summary>
-    public class ReadConversationOptions : ReadOptions<ConversationResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadConversationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        public ReadConversationOptions(string pathChatServiceSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string MessagingServiceSid { get; set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// Current state of this conversation.
+    /// </summary>
+    public ConversationResource.StateEnum State { get; set; }
+    /// <summary>
+    /// ISO8601 duration when conversation will be switched to `inactive` state.
+    /// </summary>
+    public string TimersInactive { get; set; }
+    /// <summary>
+    /// ISO8601 duration when conversation will be switched to `closed` state.
+    /// </summary>
+    public string TimersClosed { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ConversationResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateConversationOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    public CreateConversationOptions(string pathChatServiceSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (MessagingServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (State != null)
+      {
+        p.Add(new KeyValuePair<string, string>("State", State.ToString()));
+      }
+
+      if (TimersInactive != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timers.Inactive", TimersInactive));
+      }
+
+      if (TimersClosed != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timers.Closed", TimersClosed));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing conversation in your service
+  /// </summary>
+  public class UpdateConversationOptions : IOptions<ConversationResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The human-readable name of this conversation.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The unique ID of the Messaging Service this conversation belongs to.
+    /// </summary>
+    public string MessagingServiceSid { get; set; }
+    /// <summary>
+    /// Current state of this conversation.
+    /// </summary>
+    public ConversationResource.StateEnum State { get; set; }
+    /// <summary>
+    /// ISO8601 duration when conversation will be switched to `inactive` state.
+    /// </summary>
+    public string TimersInactive { get; set; }
+    /// <summary>
+    /// ISO8601 duration when conversation will be switched to `closed` state.
+    /// </summary>
+    public string TimersClosed { get; set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ConversationResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateConversationOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public UpdateConversationOptions(string pathChatServiceSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (MessagingServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
+      }
+
+      if (State != null)
+      {
+        p.Add(new KeyValuePair<string, string>("State", State.ToString()));
+      }
+
+      if (TimersInactive != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timers.Inactive", TimersInactive));
+      }
+
+      if (TimersClosed != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timers.Closed", TimersClosed));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove a conversation from your service
+  /// </summary>
+  public class DeleteConversationOptions : IOptions<ConversationResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ConversationResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteConversationOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteConversationOptions(string pathChatServiceSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a conversation from your service
+  /// </summary>
+  public class FetchConversationOptions : IOptions<ConversationResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchConversationOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchConversationOptions(string pathChatServiceSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of conversations in your service
+  /// </summary>
+  public class ReadConversationOptions : ReadOptions<ConversationResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadConversationOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    public ReadConversationOptions(string pathChatServiceSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/ConversationResource.cs b/src/Twilio/Rest/Conversations/V1/Service/ConversationResource.cs
index 741c3de13..000534a71 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/ConversationResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/ConversationResource.cs
@@ -17,631 +17,631 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Service
-{
-
-    public class ConversationResource : Resource
-    {
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        public sealed class StateEnum : StringEnum
-        {
-            private StateEnum(string value) : base(value) {}
-            public StateEnum() {}
-            public static implicit operator StateEnum(string value)
-            {
-                return new StateEnum(value);
-            }
-
-            public static readonly StateEnum Inactive = new StateEnum("inactive");
-            public static readonly StateEnum Active = new StateEnum("active");
-            public static readonly StateEnum Closed = new StateEnum("closed");
-        }
-
-        private static Request BuildCreateRequest(CreateConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Create a new conversation in your service
-        /// </summary>
-        /// <param name="options"> Create Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ConversationResource Create(CreateConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new conversation in your service
-        /// </summary>
-        /// <param name="options"> Create Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ConversationResource> CreateAsync(CreateConversationOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new conversation in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="friendlyName"> The human-readable name of this conversation. </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="state"> Current state of this conversation. </param>
-        /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
-        /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ConversationResource Create(string pathChatServiceSid,
-                                                  string friendlyName = null,
-                                                  string uniqueName = null,
-                                                  string attributes = null,
-                                                  string messagingServiceSid = null,
-                                                  DateTime? dateCreated = null,
-                                                  DateTime? dateUpdated = null,
-                                                  ConversationResource.StateEnum state = null,
-                                                  string timersInactive = null,
-                                                  string timersClosed = null,
-                                                  ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateConversationOptions(pathChatServiceSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, MessagingServiceSid = messagingServiceSid, DateCreated = dateCreated, DateUpdated = dateUpdated, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new conversation in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="friendlyName"> The human-readable name of this conversation. </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="state"> Current state of this conversation. </param>
-        /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
-        /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ConversationResource> CreateAsync(string pathChatServiceSid,
-                                                                                          string friendlyName = null,
-                                                                                          string uniqueName = null,
-                                                                                          string attributes = null,
-                                                                                          string messagingServiceSid = null,
-                                                                                          DateTime? dateCreated = null,
-                                                                                          DateTime? dateUpdated = null,
-                                                                                          ConversationResource.StateEnum state = null,
-                                                                                          string timersInactive = null,
-                                                                                          string timersClosed = null,
-                                                                                          ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateConversationOptions(pathChatServiceSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, MessagingServiceSid = messagingServiceSid, DateCreated = dateCreated, DateUpdated = dateUpdated, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Update an existing conversation in your service
-        /// </summary>
-        /// <param name="options"> Update Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ConversationResource Update(UpdateConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing conversation in your service
-        /// </summary>
-        /// <param name="options"> Update Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ConversationResource> UpdateAsync(UpdateConversationOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing conversation in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="friendlyName"> The human-readable name of this conversation. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
-        /// <param name="state"> Current state of this conversation. </param>
-        /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
-        /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ConversationResource Update(string pathChatServiceSid,
-                                                  string pathSid,
-                                                  string friendlyName = null,
-                                                  DateTime? dateCreated = null,
-                                                  DateTime? dateUpdated = null,
-                                                  string attributes = null,
-                                                  string messagingServiceSid = null,
-                                                  ConversationResource.StateEnum state = null,
-                                                  string timersInactive = null,
-                                                  string timersClosed = null,
-                                                  string uniqueName = null,
-                                                  ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateConversationOptions(pathChatServiceSid, pathSid){FriendlyName = friendlyName, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingServiceSid = messagingServiceSid, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, UniqueName = uniqueName, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing conversation in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="friendlyName"> The human-readable name of this conversation. </param>
-        /// <param name="dateCreated"> The date that this resource was created. </param>
-        /// <param name="dateUpdated"> The date that this resource was last updated. </param>
-        /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
-        /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
-        /// <param name="state"> Current state of this conversation. </param>
-        /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
-        /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ConversationResource> UpdateAsync(string pathChatServiceSid,
-                                                                                          string pathSid,
-                                                                                          string friendlyName = null,
-                                                                                          DateTime? dateCreated = null,
-                                                                                          DateTime? dateUpdated = null,
-                                                                                          string attributes = null,
-                                                                                          string messagingServiceSid = null,
-                                                                                          ConversationResource.StateEnum state = null,
-                                                                                          string timersInactive = null,
-                                                                                          string timersClosed = null,
-                                                                                          string uniqueName = null,
-                                                                                          ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateConversationOptions(pathChatServiceSid, pathSid){FriendlyName = friendlyName, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingServiceSid = messagingServiceSid, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, UniqueName = uniqueName, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Remove a conversation from your service
-        /// </summary>
-        /// <param name="options"> Delete Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static bool Delete(DeleteConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a conversation from your service
-        /// </summary>
-        /// <param name="options"> Delete Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteConversationOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a conversation from your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static bool Delete(string pathChatServiceSid,
-                                  string pathSid,
-                                  ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteConversationOptions(pathChatServiceSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a conversation from your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
-                                                                          string pathSid,
-                                                                          ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteConversationOptions(pathChatServiceSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a conversation from your service
-        /// </summary>
-        /// <param name="options"> Fetch Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ConversationResource Fetch(FetchConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a conversation from your service
-        /// </summary>
-        /// <param name="options"> Fetch Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ConversationResource> FetchAsync(FetchConversationOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a conversation from your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ConversationResource Fetch(string pathChatServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchConversationOptions(pathChatServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a conversation from your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ConversationResource> FetchAsync(string pathChatServiceSid,
-                                                                                         string pathSid,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchConversationOptions(pathChatServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Conversations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of conversations in your service
-        /// </summary>
-        /// <param name="options"> Read Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ResourceSet<ConversationResource> Read(ReadConversationOptions options,
-                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ConversationResource>.FromJson("conversations", response.Content);
-            return new ResourceSet<ConversationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of conversations in your service
-        /// </summary>
-        /// <param name="options"> Read Conversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ConversationResource>> ReadAsync(ReadConversationOptions options,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ConversationResource>.FromJson("conversations", response.Content);
-            return new ResourceSet<ConversationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of conversations in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Conversation </returns>
-        public static ResourceSet<ConversationResource> Read(string pathChatServiceSid,
-                                                             int? pageSize = null,
-                                                             long? limit = null,
-                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadConversationOptions(pathChatServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of conversations in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Conversation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ConversationResource>> ReadAsync(string pathChatServiceSid,
-                                                                                                     int? pageSize = null,
-                                                                                                     long? limit = null,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadConversationOptions(pathChatServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ConversationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ConversationResource> NextPage(Page<ConversationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ConversationResource> PreviousPage(Page<ConversationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a ConversationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ConversationResource object represented by the provided JSON </returns>
-        public static ConversationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ConversationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this conversation.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation Service this conversation belongs to.
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Messaging Service this conversation belongs to.
-        /// </summary>
-        [JsonProperty("messaging_service_sid")]
-        public string MessagingServiceSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The human-readable name of this conversation.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// Current state of this conversation.
-        /// </summary>
-        [JsonProperty("state")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ConversationResource.StateEnum State { get; private set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Timer date values for this conversation.
-        /// </summary>
-        [JsonProperty("timers")]
-        public object Timers { get; private set; }
-        /// <summary>
-        /// An absolute URL for this conversation.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Absolute URLs to access the participants, messages and webhooks of this conversation.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The bindings
-        /// </summary>
-        [JsonProperty("bindings")]
-        public object Bindings { get; private set; }
-
-        private ConversationResource()
-        {
-
-        }
-    }
+{
+
+  public class ConversationResource : Resource
+  {
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    public sealed class StateEnum : StringEnum
+    {
+      private StateEnum(string value) : base(value) { }
+      public StateEnum() { }
+      public static implicit operator StateEnum(string value)
+      {
+        return new StateEnum(value);
+      }
+
+      public static readonly StateEnum Inactive = new StateEnum("inactive");
+      public static readonly StateEnum Active = new StateEnum("active");
+      public static readonly StateEnum Closed = new StateEnum("closed");
+    }
+
+    private static Request BuildCreateRequest(CreateConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Create a new conversation in your service
+    /// </summary>
+    /// <param name="options"> Create Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ConversationResource Create(CreateConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new conversation in your service
+    /// </summary>
+    /// <param name="options"> Create Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ConversationResource> CreateAsync(CreateConversationOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new conversation in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="friendlyName"> The human-readable name of this conversation. </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="state"> Current state of this conversation. </param>
+    /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
+    /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ConversationResource Create(string pathChatServiceSid,
+                                              string friendlyName = null,
+                                              string uniqueName = null,
+                                              string attributes = null,
+                                              string messagingServiceSid = null,
+                                              DateTime? dateCreated = null,
+                                              DateTime? dateUpdated = null,
+                                              ConversationResource.StateEnum state = null,
+                                              string timersInactive = null,
+                                              string timersClosed = null,
+                                              ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateConversationOptions(pathChatServiceSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, MessagingServiceSid = messagingServiceSid, DateCreated = dateCreated, DateUpdated = dateUpdated, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new conversation in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="friendlyName"> The human-readable name of this conversation. </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="state"> Current state of this conversation. </param>
+    /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
+    /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ConversationResource> CreateAsync(string pathChatServiceSid,
+                                                                                      string friendlyName = null,
+                                                                                      string uniqueName = null,
+                                                                                      string attributes = null,
+                                                                                      string messagingServiceSid = null,
+                                                                                      DateTime? dateCreated = null,
+                                                                                      DateTime? dateUpdated = null,
+                                                                                      ConversationResource.StateEnum state = null,
+                                                                                      string timersInactive = null,
+                                                                                      string timersClosed = null,
+                                                                                      ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateConversationOptions(pathChatServiceSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, MessagingServiceSid = messagingServiceSid, DateCreated = dateCreated, DateUpdated = dateUpdated, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Update an existing conversation in your service
+    /// </summary>
+    /// <param name="options"> Update Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ConversationResource Update(UpdateConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing conversation in your service
+    /// </summary>
+    /// <param name="options"> Update Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ConversationResource> UpdateAsync(UpdateConversationOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing conversation in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="friendlyName"> The human-readable name of this conversation. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
+    /// <param name="state"> Current state of this conversation. </param>
+    /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
+    /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ConversationResource Update(string pathChatServiceSid,
+                                              string pathSid,
+                                              string friendlyName = null,
+                                              DateTime? dateCreated = null,
+                                              DateTime? dateUpdated = null,
+                                              string attributes = null,
+                                              string messagingServiceSid = null,
+                                              ConversationResource.StateEnum state = null,
+                                              string timersInactive = null,
+                                              string timersClosed = null,
+                                              string uniqueName = null,
+                                              ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateConversationOptions(pathChatServiceSid, pathSid) { FriendlyName = friendlyName, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingServiceSid = messagingServiceSid, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, UniqueName = uniqueName, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing conversation in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="friendlyName"> The human-readable name of this conversation. </param>
+    /// <param name="dateCreated"> The date that this resource was created. </param>
+    /// <param name="dateUpdated"> The date that this resource was last updated. </param>
+    /// <param name="attributes"> An optional string metadata field you can use to store any data you wish. </param>
+    /// <param name="messagingServiceSid"> The unique ID of the Messaging Service this conversation belongs to. </param>
+    /// <param name="state"> Current state of this conversation. </param>
+    /// <param name="timersInactive"> ISO8601 duration when conversation will be switched to `inactive` state. </param>
+    /// <param name="timersClosed"> ISO8601 duration when conversation will be switched to `closed` state. </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ConversationResource> UpdateAsync(string pathChatServiceSid,
+                                                                                      string pathSid,
+                                                                                      string friendlyName = null,
+                                                                                      DateTime? dateCreated = null,
+                                                                                      DateTime? dateUpdated = null,
+                                                                                      string attributes = null,
+                                                                                      string messagingServiceSid = null,
+                                                                                      ConversationResource.StateEnum state = null,
+                                                                                      string timersInactive = null,
+                                                                                      string timersClosed = null,
+                                                                                      string uniqueName = null,
+                                                                                      ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateConversationOptions(pathChatServiceSid, pathSid) { FriendlyName = friendlyName, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, MessagingServiceSid = messagingServiceSid, State = state, TimersInactive = timersInactive, TimersClosed = timersClosed, UniqueName = uniqueName, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Remove a conversation from your service
+    /// </summary>
+    /// <param name="options"> Delete Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static bool Delete(DeleteConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a conversation from your service
+    /// </summary>
+    /// <param name="options"> Delete Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteConversationOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a conversation from your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static bool Delete(string pathChatServiceSid,
+                              string pathSid,
+                              ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteConversationOptions(pathChatServiceSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a conversation from your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
+                                                                      string pathSid,
+                                                                      ConversationResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteConversationOptions(pathChatServiceSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a conversation from your service
+    /// </summary>
+    /// <param name="options"> Fetch Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ConversationResource Fetch(FetchConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a conversation from your service
+    /// </summary>
+    /// <param name="options"> Fetch Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ConversationResource> FetchAsync(FetchConversationOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a conversation from your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ConversationResource Fetch(string pathChatServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchConversationOptions(pathChatServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a conversation from your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ConversationResource> FetchAsync(string pathChatServiceSid,
+                                                                                     string pathSid,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchConversationOptions(pathChatServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Conversations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of conversations in your service
+    /// </summary>
+    /// <param name="options"> Read Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ResourceSet<ConversationResource> Read(ReadConversationOptions options,
+                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ConversationResource>.FromJson("conversations", response.Content);
+      return new ResourceSet<ConversationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of conversations in your service
+    /// </summary>
+    /// <param name="options"> Read Conversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ConversationResource>> ReadAsync(ReadConversationOptions options,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ConversationResource>.FromJson("conversations", response.Content);
+      return new ResourceSet<ConversationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of conversations in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Conversation </returns>
+    public static ResourceSet<ConversationResource> Read(string pathChatServiceSid,
+                                                         int? pageSize = null,
+                                                         long? limit = null,
+                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadConversationOptions(pathChatServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of conversations in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Conversation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ConversationResource>> ReadAsync(string pathChatServiceSid,
+                                                                                                 int? pageSize = null,
+                                                                                                 long? limit = null,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadConversationOptions(pathChatServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ConversationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ConversationResource> NextPage(Page<ConversationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ConversationResource> PreviousPage(Page<ConversationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a ConversationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ConversationResource object represented by the provided JSON </returns>
+    public static ConversationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ConversationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this conversation.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation Service this conversation belongs to.
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Messaging Service this conversation belongs to.
+    /// </summary>
+    [JsonProperty("messaging_service_sid")]
+    public string MessagingServiceSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The human-readable name of this conversation.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// Current state of this conversation.
+    /// </summary>
+    [JsonProperty("state")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ConversationResource.StateEnum State { get; private set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Timer date values for this conversation.
+    /// </summary>
+    [JsonProperty("timers")]
+    public object Timers { get; private set; }
+    /// <summary>
+    /// An absolute URL for this conversation.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Absolute URLs to access the participants, messages and webhooks of this conversation.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The bindings
+    /// </summary>
+    [JsonProperty("bindings")]
+    public object Bindings { get; private set; }
+
+    private ConversationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/ParticipantConversationOptions.cs b/src/Twilio/Rest/Conversations/V1/Service/ParticipantConversationOptions.cs
index dfc05532b..12ff6bc7f 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/ParticipantConversationOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/ParticipantConversationOptions.cs
@@ -9,59 +9,59 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
+  /// should be specified.
+  /// </summary>
+  public class ReadParticipantConversationOptions : ReadOptions<ParticipantConversationResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
-    /// should be specified.
+    /// The SID of the Conversation Service that the resource is associated with.
     /// </summary>
-    public class ReadParticipantConversationOptions : ReadOptions<ParticipantConversationResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// A unique string identifier for the conversation participant as Conversation User.
-        /// </summary>
-        public string Identity { get; set; }
-        /// <summary>
-        /// A unique string identifier for the conversation participant who's not a Conversation User.
-        /// </summary>
-        public string Address { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadParticipantConversationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        public ReadParticipantConversationOptions(string pathChatServiceSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (Address != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Address", Address));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// A unique string identifier for the conversation participant as Conversation User.
+    /// </summary>
+    public string Identity { get; set; }
+    /// <summary>
+    /// A unique string identifier for the conversation participant who's not a Conversation User.
+    /// </summary>
+    public string Address { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadParticipantConversationOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    public ReadParticipantConversationOptions(string pathChatServiceSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (Address != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Address", Address));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/ParticipantConversationResource.cs b/src/Twilio/Rest/Conversations/V1/Service/ParticipantConversationResource.cs
index 34622c632..101d9702e 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/ParticipantConversationResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/ParticipantConversationResource.cs
@@ -17,278 +17,278 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Service
-{
-
-    public class ParticipantConversationResource : Resource
-    {
-        public sealed class StateEnum : StringEnum
-        {
-            private StateEnum(string value) : base(value) {}
-            public StateEnum() {}
-            public static implicit operator StateEnum(string value)
-            {
-                return new StateEnum(value);
-            }
-
-            public static readonly StateEnum Inactive = new StateEnum("inactive");
-            public static readonly StateEnum Active = new StateEnum("active");
-            public static readonly StateEnum Closed = new StateEnum("closed");
-        }
-
-        private static Request BuildReadRequest(ReadParticipantConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/ParticipantConversations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
-        /// should be specified.
-        /// </summary>
-        /// <param name="options"> Read ParticipantConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ParticipantConversation </returns>
-        public static ResourceSet<ParticipantConversationResource> Read(ReadParticipantConversationOptions options,
-                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
-            return new ResourceSet<ParticipantConversationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
-        /// should be specified.
-        /// </summary>
-        /// <param name="options"> Read ParticipantConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ParticipantConversation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantConversationResource>> ReadAsync(ReadParticipantConversationOptions options,
-                                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
-            return new ResourceSet<ParticipantConversationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
-        /// should be specified.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
-        /// <param name="address"> A unique string identifier for the conversation participant who's not a Conversation User.
-        ///               </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ParticipantConversation </returns>
-        public static ResourceSet<ParticipantConversationResource> Read(string pathChatServiceSid,
-                                                                        string identity = null,
-                                                                        string address = null,
-                                                                        int? pageSize = null,
-                                                                        long? limit = null,
-                                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantConversationOptions(pathChatServiceSid){Identity = identity, Address = address, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
-        /// should be specified.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
-        /// <param name="address"> A unique string identifier for the conversation participant who's not a Conversation User.
-        ///               </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ParticipantConversation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantConversationResource>> ReadAsync(string pathChatServiceSid,
-                                                                                                                string identity = null,
-                                                                                                                string address = null,
-                                                                                                                int? pageSize = null,
-                                                                                                                long? limit = null,
-                                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantConversationOptions(pathChatServiceSid){Identity = identity, Address = address, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ParticipantConversationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ParticipantConversationResource> NextPage(Page<ParticipantConversationResource> page,
-                                                                     ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ParticipantConversationResource> PreviousPage(Page<ParticipantConversationResource> page,
-                                                                         ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a ParticipantConversationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ParticipantConversationResource object represented by the provided JSON </returns>
-        public static ParticipantConversationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ParticipantConversationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this conversation.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation Service this conversation belongs to.
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Participant.
-        /// </summary>
-        [JsonProperty("participant_sid")]
-        public string ParticipantSid { get; private set; }
-        /// <summary>
-        /// The unique ID for the conversation participant as Conversation User.
-        /// </summary>
-        [JsonProperty("participant_user_sid")]
-        public string ParticipantUserSid { get; private set; }
-        /// <summary>
-        /// A unique string identifier for the conversation participant as Conversation User.
-        /// </summary>
-        [JsonProperty("participant_identity")]
-        public string ParticipantIdentity { get; private set; }
-        /// <summary>
-        /// Information about how this participant exchanges messages with the conversation.
-        /// </summary>
-        [JsonProperty("participant_messaging_binding")]
-        public object ParticipantMessagingBinding { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation this Participant belongs to.
-        /// </summary>
-        [JsonProperty("conversation_sid")]
-        public string ConversationSid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the Conversation resource.
-        /// </summary>
-        [JsonProperty("conversation_unique_name")]
-        public string ConversationUniqueName { get; private set; }
-        /// <summary>
-        /// The human-readable name of this conversation.
-        /// </summary>
-        [JsonProperty("conversation_friendly_name")]
-        public string ConversationFriendlyName { get; private set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        [JsonProperty("conversation_attributes")]
-        public string ConversationAttributes { get; private set; }
-        /// <summary>
-        /// The date that this conversation was created.
-        /// </summary>
-        [JsonProperty("conversation_date_created")]
-        public DateTime? ConversationDateCreated { get; private set; }
-        /// <summary>
-        /// The date that this conversation was last updated.
-        /// </summary>
-        [JsonProperty("conversation_date_updated")]
-        public DateTime? ConversationDateUpdated { get; private set; }
-        /// <summary>
-        /// Creator of this conversation.
-        /// </summary>
-        [JsonProperty("conversation_created_by")]
-        public string ConversationCreatedBy { get; private set; }
-        /// <summary>
-        /// The current state of this User Conversation
-        /// </summary>
-        [JsonProperty("conversation_state")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ParticipantConversationResource.StateEnum ConversationState { get; private set; }
-        /// <summary>
-        /// Timer date values for this conversation.
-        /// </summary>
-        [JsonProperty("conversation_timers")]
-        public object ConversationTimers { get; private set; }
-        /// <summary>
-        /// Absolute URLs to access the participant and conversation of this Participant Conversation.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ParticipantConversationResource()
-        {
-
-        }
-    }
+{
+
+  public class ParticipantConversationResource : Resource
+  {
+    public sealed class StateEnum : StringEnum
+    {
+      private StateEnum(string value) : base(value) { }
+      public StateEnum() { }
+      public static implicit operator StateEnum(string value)
+      {
+        return new StateEnum(value);
+      }
+
+      public static readonly StateEnum Inactive = new StateEnum("inactive");
+      public static readonly StateEnum Active = new StateEnum("active");
+      public static readonly StateEnum Closed = new StateEnum("closed");
+    }
+
+    private static Request BuildReadRequest(ReadParticipantConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/ParticipantConversations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
+    /// should be specified.
+    /// </summary>
+    /// <param name="options"> Read ParticipantConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ParticipantConversation </returns>
+    public static ResourceSet<ParticipantConversationResource> Read(ReadParticipantConversationOptions options,
+                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
+      return new ResourceSet<ParticipantConversationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
+    /// should be specified.
+    /// </summary>
+    /// <param name="options"> Read ParticipantConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ParticipantConversation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantConversationResource>> ReadAsync(ReadParticipantConversationOptions options,
+                                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
+      return new ResourceSet<ParticipantConversationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
+    /// should be specified.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
+    /// <param name="address"> A unique string identifier for the conversation participant who's not a Conversation User.
+    ///               </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ParticipantConversation </returns>
+    public static ResourceSet<ParticipantConversationResource> Read(string pathChatServiceSid,
+                                                                    string identity = null,
+                                                                    string address = null,
+                                                                    int? pageSize = null,
+                                                                    long? limit = null,
+                                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantConversationOptions(pathChatServiceSid) { Identity = identity, Address = address, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Conversations that this Participant belongs to by identity or by address. Only one parameter
+    /// should be specified.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="identity"> A unique string identifier for the conversation participant as Conversation User. </param>
+    /// <param name="address"> A unique string identifier for the conversation participant who's not a Conversation User.
+    ///               </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ParticipantConversation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantConversationResource>> ReadAsync(string pathChatServiceSid,
+                                                                                                            string identity = null,
+                                                                                                            string address = null,
+                                                                                                            int? pageSize = null,
+                                                                                                            long? limit = null,
+                                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantConversationOptions(pathChatServiceSid) { Identity = identity, Address = address, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ParticipantConversationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ParticipantConversationResource> NextPage(Page<ParticipantConversationResource> page,
+                                                                 ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ParticipantConversationResource> PreviousPage(Page<ParticipantConversationResource> page,
+                                                                     ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a ParticipantConversationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ParticipantConversationResource object represented by the provided JSON </returns>
+    public static ParticipantConversationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ParticipantConversationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this conversation.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation Service this conversation belongs to.
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Participant.
+    /// </summary>
+    [JsonProperty("participant_sid")]
+    public string ParticipantSid { get; private set; }
+    /// <summary>
+    /// The unique ID for the conversation participant as Conversation User.
+    /// </summary>
+    [JsonProperty("participant_user_sid")]
+    public string ParticipantUserSid { get; private set; }
+    /// <summary>
+    /// A unique string identifier for the conversation participant as Conversation User.
+    /// </summary>
+    [JsonProperty("participant_identity")]
+    public string ParticipantIdentity { get; private set; }
+    /// <summary>
+    /// Information about how this participant exchanges messages with the conversation.
+    /// </summary>
+    [JsonProperty("participant_messaging_binding")]
+    public object ParticipantMessagingBinding { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation this Participant belongs to.
+    /// </summary>
+    [JsonProperty("conversation_sid")]
+    public string ConversationSid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the Conversation resource.
+    /// </summary>
+    [JsonProperty("conversation_unique_name")]
+    public string ConversationUniqueName { get; private set; }
+    /// <summary>
+    /// The human-readable name of this conversation.
+    /// </summary>
+    [JsonProperty("conversation_friendly_name")]
+    public string ConversationFriendlyName { get; private set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    [JsonProperty("conversation_attributes")]
+    public string ConversationAttributes { get; private set; }
+    /// <summary>
+    /// The date that this conversation was created.
+    /// </summary>
+    [JsonProperty("conversation_date_created")]
+    public DateTime? ConversationDateCreated { get; private set; }
+    /// <summary>
+    /// The date that this conversation was last updated.
+    /// </summary>
+    [JsonProperty("conversation_date_updated")]
+    public DateTime? ConversationDateUpdated { get; private set; }
+    /// <summary>
+    /// Creator of this conversation.
+    /// </summary>
+    [JsonProperty("conversation_created_by")]
+    public string ConversationCreatedBy { get; private set; }
+    /// <summary>
+    /// The current state of this User Conversation
+    /// </summary>
+    [JsonProperty("conversation_state")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ParticipantConversationResource.StateEnum ConversationState { get; private set; }
+    /// <summary>
+    /// Timer date values for this conversation.
+    /// </summary>
+    [JsonProperty("conversation_timers")]
+    public object ConversationTimers { get; private set; }
+    /// <summary>
+    /// Absolute URLs to access the participant and conversation of this Participant Conversation.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ParticipantConversationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/RoleOptions.cs b/src/Twilio/Rest/Conversations/V1/Service/RoleOptions.cs
index b75e8f8f7..cb1a013e8 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/RoleOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/RoleOptions.cs
@@ -10,221 +10,221 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// Create a new user role in your service
+  /// </summary>
+  public class CreateRoleOptions : IOptions<RoleResource>
+  {
     /// <summary>
-    /// Create a new user role in your service
-    /// </summary>
-    public class CreateRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service to create the resource under
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// A string to describe the new resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The type of role
-        /// </summary>
-        public RoleResource.RoleTypeEnum Type { get; }
-        /// <summary>
-        /// A permission the role should have
-        /// </summary>
-        public List<string> Permission { get; }
-
-        /// <summary>
-        /// Construct a new CreateRoleOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to create the resource under </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="type"> The type of role </param>
-        /// <param name="permission"> A permission the role should have </param>
-        public CreateRoleOptions(string pathChatServiceSid,
-                                 string friendlyName,
-                                 RoleResource.RoleTypeEnum type,
-                                 List<string> permission)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            FriendlyName = friendlyName;
-            Type = type;
-            Permission = permission;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (Permission != null)
-            {
-                p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Conversation Service to create the resource under
+    /// </summary>
+    public string PathChatServiceSid { get; }
     /// <summary>
-    /// Update an existing user role in your service
-    /// </summary>
-    public class UpdateRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service to update the resource from
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The SID of the Role resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A permission the role should have
-        /// </summary>
-        public List<string> Permission { get; }
-
-        /// <summary>
-        /// Construct a new UpdateRoleOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to update the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to update </param>
-        /// <param name="permission"> A permission the role should have </param>
-        public UpdateRoleOptions(string pathChatServiceSid, string pathSid, List<string> permission)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathSid = pathSid;
-            Permission = permission;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Permission != null)
-            {
-                p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
-            }
-
-            return p;
-        }
-    }
-
+    /// A string to describe the new resource
+    /// </summary>
+    public string FriendlyName { get; }
     /// <summary>
-    /// Remove a user role from your service
-    /// </summary>
-    public class DeleteRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service to delete the resource from
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The SID of the Role resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRoleOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to delete </param>
-        public DeleteRoleOptions(string pathChatServiceSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The type of role
+    /// </summary>
+    public RoleResource.RoleTypeEnum Type { get; }
     /// <summary>
-    /// Fetch a user role from your service
-    /// </summary>
-    public class FetchRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service to fetch the resource from
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The SID of the Role resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRoleOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to fetch </param>
-        public FetchRoleOptions(string pathChatServiceSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// A permission the role should have
+    /// </summary>
+    public List<string> Permission { get; }
+
     /// <summary>
-    /// Retrieve a list of all user roles in your service
+    /// Construct a new CreateRoleOptions
     /// </summary>
-    public class ReadRoleOptions : ReadOptions<RoleResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service to read the resources from
-        /// </summary>
-        public string PathChatServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadRoleOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to read the resources from </param>
-        public ReadRoleOptions(string pathChatServiceSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to create the resource under </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="type"> The type of role </param>
+    /// <param name="permission"> A permission the role should have </param>
+    public CreateRoleOptions(string pathChatServiceSid,
+                             string friendlyName,
+                             RoleResource.RoleTypeEnum type,
+                             List<string> permission)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      FriendlyName = friendlyName;
+      Type = type;
+      Permission = permission;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (Permission != null)
+      {
+        p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing user role in your service
+  /// </summary>
+  public class UpdateRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service to update the resource from
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The SID of the Role resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A permission the role should have
+    /// </summary>
+    public List<string> Permission { get; }
+
+    /// <summary>
+    /// Construct a new UpdateRoleOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to update the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to update </param>
+    /// <param name="permission"> A permission the role should have </param>
+    public UpdateRoleOptions(string pathChatServiceSid, string pathSid, List<string> permission)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathSid = pathSid;
+      Permission = permission;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Permission != null)
+      {
+        p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove a user role from your service
+  /// </summary>
+  public class DeleteRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service to delete the resource from
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The SID of the Role resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRoleOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to delete </param>
+    public DeleteRoleOptions(string pathChatServiceSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a user role from your service
+  /// </summary>
+  public class FetchRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service to fetch the resource from
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The SID of the Role resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchRoleOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to fetch </param>
+    public FetchRoleOptions(string pathChatServiceSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all user roles in your service
+  /// </summary>
+  public class ReadRoleOptions : ReadOptions<RoleResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service to read the resources from
+    /// </summary>
+    public string PathChatServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadRoleOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to read the resources from </param>
+    public ReadRoleOptions(string pathChatServiceSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/RoleResource.cs b/src/Twilio/Rest/Conversations/V1/Service/RoleResource.cs
index 24e20dc0e..e90bd4816 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/RoleResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/RoleResource.cs
@@ -17,521 +17,521 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Service
-{
-
-    public class RoleResource : Resource
-    {
-        public sealed class RoleTypeEnum : StringEnum
-        {
-            private RoleTypeEnum(string value) : base(value) {}
-            public RoleTypeEnum() {}
-            public static implicit operator RoleTypeEnum(string value)
-            {
-                return new RoleTypeEnum(value);
-            }
-
-            public static readonly RoleTypeEnum Conversation = new RoleTypeEnum("conversation");
-            public static readonly RoleTypeEnum Service = new RoleTypeEnum("service");
-        }
-
-        private static Request BuildCreateRequest(CreateRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Roles",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new user role in your service
-        /// </summary>
-        /// <param name="options"> Create Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Create(CreateRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new user role in your service
-        /// </summary>
-        /// <param name="options"> Create Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(CreateRoleOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new user role in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to create the resource under </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="type"> The type of role </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Create(string pathChatServiceSid,
-                                          string friendlyName,
-                                          RoleResource.RoleTypeEnum type,
-                                          List<string> permission,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateRoleOptions(pathChatServiceSid, friendlyName, type, permission);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new user role in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to create the resource under </param>
-        /// <param name="friendlyName"> A string to describe the new resource </param>
-        /// <param name="type"> The type of role </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(string pathChatServiceSid,
-                                                                                  string friendlyName,
-                                                                                  RoleResource.RoleTypeEnum type,
-                                                                                  List<string> permission,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateRoleOptions(pathChatServiceSid, friendlyName, type, permission);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Roles/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an existing user role in your service
-        /// </summary>
-        /// <param name="options"> Update Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Update(UpdateRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing user role in your service
-        /// </summary>
-        /// <param name="options"> Update Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(UpdateRoleOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing user role in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to update the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to update </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Update(string pathChatServiceSid,
-                                          string pathSid,
-                                          List<string> permission,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoleOptions(pathChatServiceSid, pathSid, permission);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing user role in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to update the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to update </param>
-        /// <param name="permission"> A permission the role should have </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(string pathChatServiceSid,
-                                                                                  string pathSid,
-                                                                                  List<string> permission,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoleOptions(pathChatServiceSid, pathSid, permission);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Roles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove a user role from your service
-        /// </summary>
-        /// <param name="options"> Delete Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static bool Delete(DeleteRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a user role from your service
-        /// </summary>
-        /// <param name="options"> Delete Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoleOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a user role from your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static bool Delete(string pathChatServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoleOptions(pathChatServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a user role from your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoleOptions(pathChatServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Roles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a user role from your service
-        /// </summary>
-        /// <param name="options"> Fetch Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Fetch(FetchRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a user role from your service
-        /// </summary>
-        /// <param name="options"> Fetch Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(FetchRoleOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a user role from your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Fetch(string pathChatServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRoleOptions(pathChatServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a user role from your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the Role resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(string pathChatServiceSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchRoleOptions(pathChatServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Roles",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all user roles in your service
-        /// </summary>
-        /// <param name="options"> Read Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static ResourceSet<RoleResource> Read(ReadRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RoleResource>.FromJson("roles", response.Content);
-            return new ResourceSet<RoleResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all user roles in your service
-        /// </summary>
-        /// <param name="options"> Read Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(ReadRoleOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RoleResource>.FromJson("roles", response.Content);
-            return new ResourceSet<RoleResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all user roles in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static ResourceSet<RoleResource> Read(string pathChatServiceSid,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadRoleOptions(pathChatServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all user roles in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(string pathChatServiceSid,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadRoleOptions(pathChatServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RoleResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RoleResource> NextPage(Page<RoleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RoleResource> PreviousPage(Page<RoleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a RoleResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RoleResource object represented by the provided JSON </returns>
-        public static RoleResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RoleResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type of role
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoleResource.RoleTypeEnum Type { get; private set; }
-        /// <summary>
-        /// An array of the permissions the role has been granted
-        /// </summary>
-        [JsonProperty("permissions")]
-        public List<string> Permissions { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An absolute URL for this user role.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private RoleResource()
-        {
-
-        }
-    }
+{
+
+  public class RoleResource : Resource
+  {
+    public sealed class RoleTypeEnum : StringEnum
+    {
+      private RoleTypeEnum(string value) : base(value) { }
+      public RoleTypeEnum() { }
+      public static implicit operator RoleTypeEnum(string value)
+      {
+        return new RoleTypeEnum(value);
+      }
+
+      public static readonly RoleTypeEnum Conversation = new RoleTypeEnum("conversation");
+      public static readonly RoleTypeEnum Service = new RoleTypeEnum("service");
+    }
+
+    private static Request BuildCreateRequest(CreateRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Roles",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new user role in your service
+    /// </summary>
+    /// <param name="options"> Create Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Create(CreateRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new user role in your service
+    /// </summary>
+    /// <param name="options"> Create Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(CreateRoleOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new user role in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to create the resource under </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="type"> The type of role </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Create(string pathChatServiceSid,
+                                      string friendlyName,
+                                      RoleResource.RoleTypeEnum type,
+                                      List<string> permission,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateRoleOptions(pathChatServiceSid, friendlyName, type, permission);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new user role in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to create the resource under </param>
+    /// <param name="friendlyName"> A string to describe the new resource </param>
+    /// <param name="type"> The type of role </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(string pathChatServiceSid,
+                                                                              string friendlyName,
+                                                                              RoleResource.RoleTypeEnum type,
+                                                                              List<string> permission,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateRoleOptions(pathChatServiceSid, friendlyName, type, permission);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Roles/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an existing user role in your service
+    /// </summary>
+    /// <param name="options"> Update Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Update(UpdateRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing user role in your service
+    /// </summary>
+    /// <param name="options"> Update Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(UpdateRoleOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing user role in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to update the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to update </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Update(string pathChatServiceSid,
+                                      string pathSid,
+                                      List<string> permission,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoleOptions(pathChatServiceSid, pathSid, permission);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing user role in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to update the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to update </param>
+    /// <param name="permission"> A permission the role should have </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(string pathChatServiceSid,
+                                                                              string pathSid,
+                                                                              List<string> permission,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoleOptions(pathChatServiceSid, pathSid, permission);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Roles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove a user role from your service
+    /// </summary>
+    /// <param name="options"> Delete Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static bool Delete(DeleteRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a user role from your service
+    /// </summary>
+    /// <param name="options"> Delete Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoleOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a user role from your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static bool Delete(string pathChatServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoleOptions(pathChatServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a user role from your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoleOptions(pathChatServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Roles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a user role from your service
+    /// </summary>
+    /// <param name="options"> Fetch Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Fetch(FetchRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a user role from your service
+    /// </summary>
+    /// <param name="options"> Fetch Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(FetchRoleOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a user role from your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Fetch(string pathChatServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRoleOptions(pathChatServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a user role from your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the Role resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(string pathChatServiceSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchRoleOptions(pathChatServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Roles",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all user roles in your service
+    /// </summary>
+    /// <param name="options"> Read Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static ResourceSet<RoleResource> Read(ReadRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RoleResource>.FromJson("roles", response.Content);
+      return new ResourceSet<RoleResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all user roles in your service
+    /// </summary>
+    /// <param name="options"> Read Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(ReadRoleOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RoleResource>.FromJson("roles", response.Content);
+      return new ResourceSet<RoleResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all user roles in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static ResourceSet<RoleResource> Read(string pathChatServiceSid,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadRoleOptions(pathChatServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all user roles in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(string pathChatServiceSid,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadRoleOptions(pathChatServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RoleResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RoleResource> NextPage(Page<RoleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RoleResource> PreviousPage(Page<RoleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a RoleResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RoleResource object represented by the provided JSON </returns>
+    public static RoleResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RoleResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type of role
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoleResource.RoleTypeEnum Type { get; private set; }
+    /// <summary>
+    /// An array of the permissions the role has been granted
+    /// </summary>
+    [JsonProperty("permissions")]
+    public List<string> Permissions { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An absolute URL for this user role.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private RoleResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/User/UserConversationOptions.cs b/src/Twilio/Rest/Conversations/V1/Service/User/UserConversationOptions.cs
index 0ce00a555..57e61f9f7 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/User/UserConversationOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/User/UserConversationOptions.cs
@@ -9,196 +9,196 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Service.User
-{
-
+{
+
+  /// <summary>
+  /// Update a specific User Conversation.
+  /// </summary>
+  public class UpdateUserConversationOptions : IOptions<UserConversationResource>
+  {
     /// <summary>
-    /// Update a specific User Conversation.
-    /// </summary>
-    public class UpdateUserConversationOptions : IOptions<UserConversationResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique SID identifier of the User.
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The unique SID identifier of the Conversation.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// The Notification Level of this User Conversation.
-        /// </summary>
-        public UserConversationResource.NotificationLevelEnum NotificationLevel { get; set; }
-        /// <summary>
-        /// The date of the last message read in conversation by the user.
-        /// </summary>
-        public DateTime? LastReadTimestamp { get; set; }
-        /// <summary>
-        /// The index of the last read Message.
-        /// </summary>
-        public int? LastReadMessageIndex { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateUserConversationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        public UpdateUserConversationOptions(string pathChatServiceSid, string pathUserSid, string pathConversationSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathUserSid = pathUserSid;
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (NotificationLevel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NotificationLevel", NotificationLevel.ToString()));
-            }
-
-            if (LastReadTimestamp != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastReadTimestamp", Serializers.DateTimeIso8601(LastReadTimestamp)));
-            }
-
-            if (LastReadMessageIndex != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastReadMessageIndex", LastReadMessageIndex.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
     /// <summary>
-    /// Delete a specific User Conversation.
-    /// </summary>
-    public class DeleteUserConversationOptions : IOptions<UserConversationResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique SID identifier of the User.
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The unique SID identifier of the Conversation.
-        /// </summary>
-        public string PathConversationSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteUserConversationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        public DeleteUserConversationOptions(string pathChatServiceSid, string pathUserSid, string pathConversationSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathUserSid = pathUserSid;
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The unique SID identifier of the User.
+    /// </summary>
+    public string PathUserSid { get; }
     /// <summary>
-    /// Fetch a specific User Conversation.
-    /// </summary>
-    public class FetchUserConversationOptions : IOptions<UserConversationResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique SID identifier of the User.
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The unique SID identifier of the Conversation.
-        /// </summary>
-        public string PathConversationSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUserConversationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        public FetchUserConversationOptions(string pathChatServiceSid, string pathUserSid, string pathConversationSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathUserSid = pathUserSid;
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The unique SID identifier of the Conversation.
+    /// </summary>
+    public string PathConversationSid { get; }
     /// <summary>
-    /// Retrieve a list of all User Conversations for the User.
-    /// </summary>
-    public class ReadUserConversationOptions : ReadOptions<UserConversationResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with.
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The unique SID identifier of the User.
-        /// </summary>
-        public string PathUserSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadUserConversationOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        public ReadUserConversationOptions(string pathChatServiceSid, string pathUserSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathUserSid = pathUserSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The Notification Level of this User Conversation.
+    /// </summary>
+    public UserConversationResource.NotificationLevelEnum NotificationLevel { get; set; }
+    /// <summary>
+    /// The date of the last message read in conversation by the user.
+    /// </summary>
+    public DateTime? LastReadTimestamp { get; set; }
+    /// <summary>
+    /// The index of the last read Message.
+    /// </summary>
+    public int? LastReadMessageIndex { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateUserConversationOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    public UpdateUserConversationOptions(string pathChatServiceSid, string pathUserSid, string pathConversationSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathUserSid = pathUserSid;
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (NotificationLevel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NotificationLevel", NotificationLevel.ToString()));
+      }
+
+      if (LastReadTimestamp != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastReadTimestamp", Serializers.DateTimeIso8601(LastReadTimestamp)));
+      }
+
+      if (LastReadMessageIndex != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastReadMessageIndex", LastReadMessageIndex.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific User Conversation.
+  /// </summary>
+  public class DeleteUserConversationOptions : IOptions<UserConversationResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique SID identifier of the User.
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The unique SID identifier of the Conversation.
+    /// </summary>
+    public string PathConversationSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteUserConversationOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    public DeleteUserConversationOptions(string pathChatServiceSid, string pathUserSid, string pathConversationSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathUserSid = pathUserSid;
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific User Conversation.
+  /// </summary>
+  public class FetchUserConversationOptions : IOptions<UserConversationResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique SID identifier of the User.
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The unique SID identifier of the Conversation.
+    /// </summary>
+    public string PathConversationSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchUserConversationOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    public FetchUserConversationOptions(string pathChatServiceSid, string pathUserSid, string pathConversationSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathUserSid = pathUserSid;
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all User Conversations for the User.
+  /// </summary>
+  public class ReadUserConversationOptions : ReadOptions<UserConversationResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with.
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The unique SID identifier of the User.
+    /// </summary>
+    public string PathUserSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadUserConversationOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    public ReadUserConversationOptions(string pathChatServiceSid, string pathUserSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathUserSid = pathUserSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/User/UserConversationResource.cs b/src/Twilio/Rest/Conversations/V1/Service/User/UserConversationResource.cs
index 9b23f3cad..70735b6e6 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/User/UserConversationResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/User/UserConversationResource.cs
@@ -17,531 +17,531 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Service.User
-{
-
-    public class UserConversationResource : Resource
-    {
-        public sealed class NotificationLevelEnum : StringEnum
-        {
-            private NotificationLevelEnum(string value) : base(value) {}
-            public NotificationLevelEnum() {}
-            public static implicit operator NotificationLevelEnum(string value)
-            {
-                return new NotificationLevelEnum(value);
-            }
-
-            public static readonly NotificationLevelEnum Default = new NotificationLevelEnum("default");
-            public static readonly NotificationLevelEnum Muted = new NotificationLevelEnum("muted");
-        }
-
-        public sealed class StateEnum : StringEnum
-        {
-            private StateEnum(string value) : base(value) {}
-            public StateEnum() {}
-            public static implicit operator StateEnum(string value)
-            {
-                return new StateEnum(value);
-            }
-
-            public static readonly StateEnum Inactive = new StateEnum("inactive");
-            public static readonly StateEnum Active = new StateEnum("active");
-            public static readonly StateEnum Closed = new StateEnum("closed");
-        }
-
-        private static Request BuildUpdateRequest(UpdateUserConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathUserSid + "/Conversations/" + options.PathConversationSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific User Conversation.
-        /// </summary>
-        /// <param name="options"> Update UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static UserConversationResource Update(UpdateUserConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific User Conversation.
-        /// </summary>
-        /// <param name="options"> Update UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<UserConversationResource> UpdateAsync(UpdateUserConversationOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific User Conversation.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        /// <param name="notificationLevel"> The Notification Level of this User Conversation. </param>
-        /// <param name="lastReadTimestamp"> The date of the last message read in conversation by the user. </param>
-        /// <param name="lastReadMessageIndex"> The index of the last read Message. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static UserConversationResource Update(string pathChatServiceSid,
-                                                      string pathUserSid,
-                                                      string pathConversationSid,
-                                                      UserConversationResource.NotificationLevelEnum notificationLevel = null,
-                                                      DateTime? lastReadTimestamp = null,
-                                                      int? lastReadMessageIndex = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserConversationOptions(pathChatServiceSid, pathUserSid, pathConversationSid){NotificationLevel = notificationLevel, LastReadTimestamp = lastReadTimestamp, LastReadMessageIndex = lastReadMessageIndex};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific User Conversation.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        /// <param name="notificationLevel"> The Notification Level of this User Conversation. </param>
-        /// <param name="lastReadTimestamp"> The date of the last message read in conversation by the user. </param>
-        /// <param name="lastReadMessageIndex"> The index of the last read Message. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<UserConversationResource> UpdateAsync(string pathChatServiceSid,
-                                                                                              string pathUserSid,
-                                                                                              string pathConversationSid,
-                                                                                              UserConversationResource.NotificationLevelEnum notificationLevel = null,
-                                                                                              DateTime? lastReadTimestamp = null,
-                                                                                              int? lastReadMessageIndex = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserConversationOptions(pathChatServiceSid, pathUserSid, pathConversationSid){NotificationLevel = notificationLevel, LastReadTimestamp = lastReadTimestamp, LastReadMessageIndex = lastReadMessageIndex};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteUserConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathUserSid + "/Conversations/" + options.PathConversationSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific User Conversation.
-        /// </summary>
-        /// <param name="options"> Delete UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static bool Delete(DeleteUserConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific User Conversation.
-        /// </summary>
-        /// <param name="options"> Delete UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserConversationOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific User Conversation.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static bool Delete(string pathChatServiceSid,
-                                  string pathUserSid,
-                                  string pathConversationSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserConversationOptions(pathChatServiceSid, pathUserSid, pathConversationSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific User Conversation.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
-                                                                          string pathUserSid,
-                                                                          string pathConversationSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserConversationOptions(pathChatServiceSid, pathUserSid, pathConversationSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchUserConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathUserSid + "/Conversations/" + options.PathConversationSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific User Conversation.
-        /// </summary>
-        /// <param name="options"> Fetch UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static UserConversationResource Fetch(FetchUserConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific User Conversation.
-        /// </summary>
-        /// <param name="options"> Fetch UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<UserConversationResource> FetchAsync(FetchUserConversationOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific User Conversation.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static UserConversationResource Fetch(string pathChatServiceSid,
-                                                     string pathUserSid,
-                                                     string pathConversationSid,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchUserConversationOptions(pathChatServiceSid, pathUserSid, pathConversationSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific User Conversation.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<UserConversationResource> FetchAsync(string pathChatServiceSid,
-                                                                                             string pathUserSid,
-                                                                                             string pathConversationSid,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new FetchUserConversationOptions(pathChatServiceSid, pathUserSid, pathConversationSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadUserConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathUserSid + "/Conversations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all User Conversations for the User.
-        /// </summary>
-        /// <param name="options"> Read UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static ResourceSet<UserConversationResource> Read(ReadUserConversationOptions options,
-                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserConversationResource>.FromJson("conversations", response.Content);
-            return new ResourceSet<UserConversationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all User Conversations for the User.
-        /// </summary>
-        /// <param name="options"> Read UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserConversationResource>> ReadAsync(ReadUserConversationOptions options,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserConversationResource>.FromJson("conversations", response.Content);
-            return new ResourceSet<UserConversationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all User Conversations for the User.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static ResourceSet<UserConversationResource> Read(string pathChatServiceSid,
-                                                                 string pathUserSid,
-                                                                 int? pageSize = null,
-                                                                 long? limit = null,
-                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadUserConversationOptions(pathChatServiceSid, pathUserSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all User Conversations for the User.
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserConversationResource>> ReadAsync(string pathChatServiceSid,
-                                                                                                         string pathUserSid,
-                                                                                                         int? pageSize = null,
-                                                                                                         long? limit = null,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadUserConversationOptions(pathChatServiceSid, pathUserSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserConversationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserConversationResource> NextPage(Page<UserConversationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<UserConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserConversationResource> PreviousPage(Page<UserConversationResource> page,
-                                                                  ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<UserConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a UserConversationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserConversationResource object represented by the provided JSON </returns>
-        public static UserConversationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserConversationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this conversation.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation Service this conversation belongs to.
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation for this User Conversation.
-        /// </summary>
-        [JsonProperty("conversation_sid")]
-        public string ConversationSid { get; private set; }
-        /// <summary>
-        /// The number of unread Messages in the Conversation.
-        /// </summary>
-        [JsonProperty("unread_messages_count")]
-        public int? UnreadMessagesCount { get; private set; }
-        /// <summary>
-        /// The index of the last read Message .
-        /// </summary>
-        [JsonProperty("last_read_message_index")]
-        public int? LastReadMessageIndex { get; private set; }
-        /// <summary>
-        /// Participant Sid.
-        /// </summary>
-        [JsonProperty("participant_sid")]
-        public string ParticipantSid { get; private set; }
-        /// <summary>
-        /// The unique ID for the User.
-        /// </summary>
-        [JsonProperty("user_sid")]
-        public string UserSid { get; private set; }
-        /// <summary>
-        /// The human-readable name of this conversation.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The current state of this User Conversation
-        /// </summary>
-        [JsonProperty("conversation_state")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public UserConversationResource.StateEnum ConversationState { get; private set; }
-        /// <summary>
-        /// Timer date values for this conversation.
-        /// </summary>
-        [JsonProperty("timers")]
-        public object Timers { get; private set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The date that this conversation was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this conversation was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Creator of this conversation.
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-        /// <summary>
-        /// The Notification Level of this User Conversation.
-        /// </summary>
-        [JsonProperty("notification_level")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public UserConversationResource.NotificationLevelEnum NotificationLevel { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the Conversation resource.
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Absolute URLs to access the participant and conversation of this user conversation.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private UserConversationResource()
-        {
-
-        }
-    }
+{
+
+  public class UserConversationResource : Resource
+  {
+    public sealed class NotificationLevelEnum : StringEnum
+    {
+      private NotificationLevelEnum(string value) : base(value) { }
+      public NotificationLevelEnum() { }
+      public static implicit operator NotificationLevelEnum(string value)
+      {
+        return new NotificationLevelEnum(value);
+      }
+
+      public static readonly NotificationLevelEnum Default = new NotificationLevelEnum("default");
+      public static readonly NotificationLevelEnum Muted = new NotificationLevelEnum("muted");
+    }
+
+    public sealed class StateEnum : StringEnum
+    {
+      private StateEnum(string value) : base(value) { }
+      public StateEnum() { }
+      public static implicit operator StateEnum(string value)
+      {
+        return new StateEnum(value);
+      }
+
+      public static readonly StateEnum Inactive = new StateEnum("inactive");
+      public static readonly StateEnum Active = new StateEnum("active");
+      public static readonly StateEnum Closed = new StateEnum("closed");
+    }
+
+    private static Request BuildUpdateRequest(UpdateUserConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathUserSid + "/Conversations/" + options.PathConversationSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific User Conversation.
+    /// </summary>
+    /// <param name="options"> Update UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static UserConversationResource Update(UpdateUserConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific User Conversation.
+    /// </summary>
+    /// <param name="options"> Update UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<UserConversationResource> UpdateAsync(UpdateUserConversationOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific User Conversation.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    /// <param name="notificationLevel"> The Notification Level of this User Conversation. </param>
+    /// <param name="lastReadTimestamp"> The date of the last message read in conversation by the user. </param>
+    /// <param name="lastReadMessageIndex"> The index of the last read Message. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static UserConversationResource Update(string pathChatServiceSid,
+                                                  string pathUserSid,
+                                                  string pathConversationSid,
+                                                  UserConversationResource.NotificationLevelEnum notificationLevel = null,
+                                                  DateTime? lastReadTimestamp = null,
+                                                  int? lastReadMessageIndex = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserConversationOptions(pathChatServiceSid, pathUserSid, pathConversationSid) { NotificationLevel = notificationLevel, LastReadTimestamp = lastReadTimestamp, LastReadMessageIndex = lastReadMessageIndex };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific User Conversation.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    /// <param name="notificationLevel"> The Notification Level of this User Conversation. </param>
+    /// <param name="lastReadTimestamp"> The date of the last message read in conversation by the user. </param>
+    /// <param name="lastReadMessageIndex"> The index of the last read Message. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<UserConversationResource> UpdateAsync(string pathChatServiceSid,
+                                                                                          string pathUserSid,
+                                                                                          string pathConversationSid,
+                                                                                          UserConversationResource.NotificationLevelEnum notificationLevel = null,
+                                                                                          DateTime? lastReadTimestamp = null,
+                                                                                          int? lastReadMessageIndex = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserConversationOptions(pathChatServiceSid, pathUserSid, pathConversationSid) { NotificationLevel = notificationLevel, LastReadTimestamp = lastReadTimestamp, LastReadMessageIndex = lastReadMessageIndex };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteUserConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathUserSid + "/Conversations/" + options.PathConversationSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific User Conversation.
+    /// </summary>
+    /// <param name="options"> Delete UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static bool Delete(DeleteUserConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific User Conversation.
+    /// </summary>
+    /// <param name="options"> Delete UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserConversationOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific User Conversation.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static bool Delete(string pathChatServiceSid,
+                              string pathUserSid,
+                              string pathConversationSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserConversationOptions(pathChatServiceSid, pathUserSid, pathConversationSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific User Conversation.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
+                                                                      string pathUserSid,
+                                                                      string pathConversationSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserConversationOptions(pathChatServiceSid, pathUserSid, pathConversationSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchUserConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathUserSid + "/Conversations/" + options.PathConversationSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific User Conversation.
+    /// </summary>
+    /// <param name="options"> Fetch UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static UserConversationResource Fetch(FetchUserConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific User Conversation.
+    /// </summary>
+    /// <param name="options"> Fetch UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<UserConversationResource> FetchAsync(FetchUserConversationOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific User Conversation.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static UserConversationResource Fetch(string pathChatServiceSid,
+                                                 string pathUserSid,
+                                                 string pathConversationSid,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchUserConversationOptions(pathChatServiceSid, pathUserSid, pathConversationSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific User Conversation.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<UserConversationResource> FetchAsync(string pathChatServiceSid,
+                                                                                         string pathUserSid,
+                                                                                         string pathConversationSid,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new FetchUserConversationOptions(pathChatServiceSid, pathUserSid, pathConversationSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadUserConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathUserSid + "/Conversations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all User Conversations for the User.
+    /// </summary>
+    /// <param name="options"> Read UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static ResourceSet<UserConversationResource> Read(ReadUserConversationOptions options,
+                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserConversationResource>.FromJson("conversations", response.Content);
+      return new ResourceSet<UserConversationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all User Conversations for the User.
+    /// </summary>
+    /// <param name="options"> Read UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserConversationResource>> ReadAsync(ReadUserConversationOptions options,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserConversationResource>.FromJson("conversations", response.Content);
+      return new ResourceSet<UserConversationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all User Conversations for the User.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static ResourceSet<UserConversationResource> Read(string pathChatServiceSid,
+                                                             string pathUserSid,
+                                                             int? pageSize = null,
+                                                             long? limit = null,
+                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadUserConversationOptions(pathChatServiceSid, pathUserSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all User Conversations for the User.
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with. </param>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserConversationResource>> ReadAsync(string pathChatServiceSid,
+                                                                                                     string pathUserSid,
+                                                                                                     int? pageSize = null,
+                                                                                                     long? limit = null,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadUserConversationOptions(pathChatServiceSid, pathUserSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserConversationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserConversationResource> NextPage(Page<UserConversationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<UserConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserConversationResource> PreviousPage(Page<UserConversationResource> page,
+                                                              ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<UserConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a UserConversationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserConversationResource object represented by the provided JSON </returns>
+    public static UserConversationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserConversationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this conversation.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation Service this conversation belongs to.
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation for this User Conversation.
+    /// </summary>
+    [JsonProperty("conversation_sid")]
+    public string ConversationSid { get; private set; }
+    /// <summary>
+    /// The number of unread Messages in the Conversation.
+    /// </summary>
+    [JsonProperty("unread_messages_count")]
+    public int? UnreadMessagesCount { get; private set; }
+    /// <summary>
+    /// The index of the last read Message .
+    /// </summary>
+    [JsonProperty("last_read_message_index")]
+    public int? LastReadMessageIndex { get; private set; }
+    /// <summary>
+    /// Participant Sid.
+    /// </summary>
+    [JsonProperty("participant_sid")]
+    public string ParticipantSid { get; private set; }
+    /// <summary>
+    /// The unique ID for the User.
+    /// </summary>
+    [JsonProperty("user_sid")]
+    public string UserSid { get; private set; }
+    /// <summary>
+    /// The human-readable name of this conversation.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The current state of this User Conversation
+    /// </summary>
+    [JsonProperty("conversation_state")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public UserConversationResource.StateEnum ConversationState { get; private set; }
+    /// <summary>
+    /// Timer date values for this conversation.
+    /// </summary>
+    [JsonProperty("timers")]
+    public object Timers { get; private set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The date that this conversation was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this conversation was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Creator of this conversation.
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+    /// <summary>
+    /// The Notification Level of this User Conversation.
+    /// </summary>
+    [JsonProperty("notification_level")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public UserConversationResource.NotificationLevelEnum NotificationLevel { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the Conversation resource.
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Absolute URLs to access the participant and conversation of this user conversation.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private UserConversationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/UserOptions.cs b/src/Twilio/Rest/Conversations/V1/Service/UserOptions.cs
index 75dbc412d..c7034729e 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/UserOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/UserOptions.cs
@@ -9,293 +9,293 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// Add a new conversation user to your service
+  /// </summary>
+  public class CreateUserOptions : IOptions<UserResource>
+  {
     /// <summary>
-    /// Add a new conversation user to your service
+    /// The SID of the Conversation Service that the resource is associated with
     /// </summary>
-    public class CreateUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The JSON Object string that stores application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The SID of a service-level Role to assign to the user
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateUserOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with </param>
-        /// <param name="identity"> The string that identifies the resource's User </param>
-        public CreateUserOptions(string pathChatServiceSid, string identity)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathChatServiceSid { get; }
     /// <summary>
-    /// Update an existing conversation user in your service
+    /// The string that identifies the resource's User
     /// </summary>
-    public class UpdateUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The SID of the User resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The JSON Object string that stores application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The SID of a service-level Role to assign to the user
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateUserOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with </param>
-        /// <param name="pathSid"> The SID of the User resource to update </param>
-        public UpdateUserOptions(string pathChatServiceSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string Identity { get; }
     /// <summary>
-    /// Remove a conversation user from your service
+    /// The string that you assigned to describe the resource
     /// </summary>
-    public class DeleteUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service to delete the resource from
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The SID of  the User resource to delete
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteUserOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of  the User resource to delete </param>
-        public DeleteUserOptions(string pathChatServiceSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// Fetch a conversation user from your service
+    /// The JSON Object string that stores application-specific data
     /// </summary>
-    public class FetchUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service to fetch the resource from
-        /// </summary>
-        public string PathChatServiceSid { get; }
-        /// <summary>
-        /// The SID of the User resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUserOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the User resource to fetch </param>
-        public FetchUserOptions(string pathChatServiceSid, string pathSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string Attributes { get; set; }
     /// <summary>
-    /// Retrieve a list of all conversation users in your service
+    /// The SID of a service-level Role to assign to the user
     /// </summary>
-    public class ReadUserOptions : ReadOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the Conversation Service to read the User resources from
-        /// </summary>
-        public string PathChatServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadUserOptions
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to read the User resources from </param>
-        public ReadUserOptions(string pathChatServiceSid)
-        {
-            PathChatServiceSid = pathChatServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateUserOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with </param>
+    /// <param name="identity"> The string that identifies the resource's User </param>
+    public CreateUserOptions(string pathChatServiceSid, string identity)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing conversation user in your service
+  /// </summary>
+  public class UpdateUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The SID of the User resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The JSON Object string that stores application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The SID of a service-level Role to assign to the user
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateUserOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with </param>
+    /// <param name="pathSid"> The SID of the User resource to update </param>
+    public UpdateUserOptions(string pathChatServiceSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove a conversation user from your service
+  /// </summary>
+  public class DeleteUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service to delete the resource from
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The SID of  the User resource to delete
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteUserOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of  the User resource to delete </param>
+    public DeleteUserOptions(string pathChatServiceSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a conversation user from your service
+  /// </summary>
+  public class FetchUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service to fetch the resource from
+    /// </summary>
+    public string PathChatServiceSid { get; }
+    /// <summary>
+    /// The SID of the User resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchUserOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the User resource to fetch </param>
+    public FetchUserOptions(string pathChatServiceSid, string pathSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all conversation users in your service
+  /// </summary>
+  public class ReadUserOptions : ReadOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of the Conversation Service to read the User resources from
+    /// </summary>
+    public string PathChatServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadUserOptions
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to read the User resources from </param>
+    public ReadUserOptions(string pathChatServiceSid)
+    {
+      PathChatServiceSid = pathChatServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/Service/UserResource.cs b/src/Twilio/Rest/Conversations/V1/Service/UserResource.cs
index c410d9fec..69d985fc4 100644
--- a/src/Twilio/Rest/Conversations/V1/Service/UserResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/Service/UserResource.cs
@@ -17,566 +17,566 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.Service
-{
-
-    public class UserResource : Resource
-    {
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildCreateRequest(CreateUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Users",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Add a new conversation user to your service
-        /// </summary>
-        /// <param name="options"> Create User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Create(CreateUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new conversation user to your service
-        /// </summary>
-        /// <param name="options"> Create User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> CreateAsync(CreateUserOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Add a new conversation user to your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with </param>
-        /// <param name="identity"> The string that identifies the resource's User </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
-        /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Create(string pathChatServiceSid,
-                                          string identity,
-                                          string friendlyName = null,
-                                          string attributes = null,
-                                          string roleSid = null,
-                                          UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateUserOptions(pathChatServiceSid, identity){FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new conversation user to your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with </param>
-        /// <param name="identity"> The string that identifies the resource's User </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
-        /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> CreateAsync(string pathChatServiceSid,
-                                                                                  string identity,
-                                                                                  string friendlyName = null,
-                                                                                  string attributes = null,
-                                                                                  string roleSid = null,
-                                                                                  UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateUserOptions(pathChatServiceSid, identity){FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Update an existing conversation user in your service
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing conversation user in your service
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing conversation user in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with </param>
-        /// <param name="pathSid"> The SID of the User resource to update </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
-        /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(string pathChatServiceSid,
-                                          string pathSid,
-                                          string friendlyName = null,
-                                          string attributes = null,
-                                          string roleSid = null,
-                                          UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathChatServiceSid, pathSid){FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing conversation user in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with </param>
-        /// <param name="pathSid"> The SID of the User resource to update </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
-        /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathChatServiceSid,
-                                                                                  string pathSid,
-                                                                                  string friendlyName = null,
-                                                                                  string attributes = null,
-                                                                                  string roleSid = null,
-                                                                                  UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathChatServiceSid, pathSid){FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Remove a conversation user from your service
-        /// </summary>
-        /// <param name="options"> Delete User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static bool Delete(DeleteUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a conversation user from your service
-        /// </summary>
-        /// <param name="options"> Delete User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a conversation user from your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of  the User resource to delete </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static bool Delete(string pathChatServiceSid,
-                                  string pathSid,
-                                  UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserOptions(pathChatServiceSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a conversation user from your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID of  the User resource to delete </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
-                                                                          string pathSid,
-                                                                          UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserOptions(pathChatServiceSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a conversation user from your service
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a conversation user from your service
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a conversation user from your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the User resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(string pathChatServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathChatServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a conversation user from your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID of the User resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathChatServiceSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathChatServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathChatServiceSid + "/Users",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all conversation users in your service
-        /// </summary>
-        /// <param name="options"> Read User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static ResourceSet<UserResource> Read(ReadUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserResource>.FromJson("users", response.Content);
-            return new ResourceSet<UserResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all conversation users in your service
-        /// </summary>
-        /// <param name="options"> Read User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(ReadUserOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserResource>.FromJson("users", response.Content);
-            return new ResourceSet<UserResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all conversation users in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to read the User resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static ResourceSet<UserResource> Read(string pathChatServiceSid,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadUserOptions(pathChatServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all conversation users in your service
-        /// </summary>
-        /// <param name="pathChatServiceSid"> The SID of the Conversation Service to read the User resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(string pathChatServiceSid,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadUserOptions(pathChatServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserResource> NextPage(Page<UserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserResource> PreviousPage(Page<UserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a UserResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserResource object represented by the provided JSON </returns>
-        public static UserResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of a service-level Role assigned to the user
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The JSON Object string that stores application-specific data
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// Whether the User is actively connected to this Conversations Service and online
-        /// </summary>
-        [JsonProperty("is_online")]
-        public bool? IsOnline { get; private set; }
-        /// <summary>
-        /// Whether the User has a potentially valid Push Notification registration for this Conversations Service
-        /// </summary>
-        [JsonProperty("is_notifiable")]
-        public bool? IsNotifiable { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An absolute URL for this user.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private UserResource()
-        {
-
-        }
-    }
+{
+
+  public class UserResource : Resource
+  {
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildCreateRequest(CreateUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Users",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Add a new conversation user to your service
+    /// </summary>
+    /// <param name="options"> Create User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Create(CreateUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new conversation user to your service
+    /// </summary>
+    /// <param name="options"> Create User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> CreateAsync(CreateUserOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Add a new conversation user to your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with </param>
+    /// <param name="identity"> The string that identifies the resource's User </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
+    /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Create(string pathChatServiceSid,
+                                      string identity,
+                                      string friendlyName = null,
+                                      string attributes = null,
+                                      string roleSid = null,
+                                      UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateUserOptions(pathChatServiceSid, identity) { FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new conversation user to your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with </param>
+    /// <param name="identity"> The string that identifies the resource's User </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
+    /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> CreateAsync(string pathChatServiceSid,
+                                                                              string identity,
+                                                                              string friendlyName = null,
+                                                                              string attributes = null,
+                                                                              string roleSid = null,
+                                                                              UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateUserOptions(pathChatServiceSid, identity) { FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Update an existing conversation user in your service
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing conversation user in your service
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing conversation user in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with </param>
+    /// <param name="pathSid"> The SID of the User resource to update </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
+    /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(string pathChatServiceSid,
+                                      string pathSid,
+                                      string friendlyName = null,
+                                      string attributes = null,
+                                      string roleSid = null,
+                                      UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathChatServiceSid, pathSid) { FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing conversation user in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service that the resource is associated with </param>
+    /// <param name="pathSid"> The SID of the User resource to update </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
+    /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathChatServiceSid,
+                                                                              string pathSid,
+                                                                              string friendlyName = null,
+                                                                              string attributes = null,
+                                                                              string roleSid = null,
+                                                                              UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathChatServiceSid, pathSid) { FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Remove a conversation user from your service
+    /// </summary>
+    /// <param name="options"> Delete User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static bool Delete(DeleteUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a conversation user from your service
+    /// </summary>
+    /// <param name="options"> Delete User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a conversation user from your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of  the User resource to delete </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static bool Delete(string pathChatServiceSid,
+                              string pathSid,
+                              UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserOptions(pathChatServiceSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a conversation user from your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID of  the User resource to delete </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathChatServiceSid,
+                                                                      string pathSid,
+                                                                      UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserOptions(pathChatServiceSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Users/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a conversation user from your service
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a conversation user from your service
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a conversation user from your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the User resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(string pathChatServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathChatServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a conversation user from your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID of the User resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathChatServiceSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathChatServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathChatServiceSid + "/Users",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all conversation users in your service
+    /// </summary>
+    /// <param name="options"> Read User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static ResourceSet<UserResource> Read(ReadUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserResource>.FromJson("users", response.Content);
+      return new ResourceSet<UserResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all conversation users in your service
+    /// </summary>
+    /// <param name="options"> Read User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(ReadUserOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserResource>.FromJson("users", response.Content);
+      return new ResourceSet<UserResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all conversation users in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to read the User resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static ResourceSet<UserResource> Read(string pathChatServiceSid,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadUserOptions(pathChatServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all conversation users in your service
+    /// </summary>
+    /// <param name="pathChatServiceSid"> The SID of the Conversation Service to read the User resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(string pathChatServiceSid,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadUserOptions(pathChatServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserResource> NextPage(Page<UserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserResource> PreviousPage(Page<UserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a UserResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserResource object represented by the provided JSON </returns>
+    public static UserResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of a service-level Role assigned to the user
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The string that identifies the resource's User
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The JSON Object string that stores application-specific data
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// Whether the User is actively connected to this Conversations Service and online
+    /// </summary>
+    [JsonProperty("is_online")]
+    public bool? IsOnline { get; private set; }
+    /// <summary>
+    /// Whether the User has a potentially valid Push Notification registration for this Conversations Service
+    /// </summary>
+    [JsonProperty("is_notifiable")]
+    public bool? IsNotifiable { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An absolute URL for this user.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private UserResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/ServiceOptions.cs b/src/Twilio/Rest/Conversations/V1/ServiceOptions.cs
index d38bb414a..e9c0ff9b6 100644
--- a/src/Twilio/Rest/Conversations/V1/ServiceOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/ServiceOptions.cs
@@ -9,118 +9,118 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
+{
+
+  /// <summary>
+  /// Create a new conversation service on your account
+  /// </summary>
+  public class CreateServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// Create a new conversation service on your account
+    /// The human-readable name of this service.
     /// </summary>
-    public class CreateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The human-readable name of this service.
-        /// </summary>
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Construct a new CreateServiceOptions
-        /// </summary>
-        /// <param name="friendlyName"> The human-readable name of this service. </param>
-        public CreateServiceOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; }
+
     /// <summary>
-    /// Remove a conversation service with all its nested resources from your account
+    /// Construct a new CreateServiceOptions
     /// </summary>
-    public class DeleteServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="friendlyName"> The human-readable name of this service. </param>
+    public CreateServiceOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+    }
+
     /// <summary>
-    /// Fetch a conversation service from your account
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove a conversation service with all its nested resources from your account
+  /// </summary>
+  public class DeleteServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// Retrieve a list of all conversation services on your account
+    /// A 34 character string that uniquely identifies this resource.
     /// </summary>
-    public class ReadServiceOptions : ReadOptions<ServiceResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a conversation service from your account
+  /// </summary>
+  public class FetchServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all conversation services on your account
+  /// </summary>
+  public class ReadServiceOptions : ReadOptions<ServiceResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/ServiceResource.cs b/src/Twilio/Rest/Conversations/V1/ServiceResource.cs
index 43e75d25a..194374dda 100644
--- a/src/Twilio/Rest/Conversations/V1/ServiceResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/ServiceResource.cs
@@ -16,397 +16,397 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
-    public class ServiceResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Services",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new conversation service on your account
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new conversation service on your account
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new conversation service on your account
-        /// </summary>
-        /// <param name="friendlyName"> The human-readable name of this service. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(string friendlyName, ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new conversation service on your account
-        /// </summary>
-        /// <param name="friendlyName"> The human-readable name of this service. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove a conversation service with all its nested resources from your account
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a conversation service with all its nested resources from your account
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a conversation service with all its nested resources from your account
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a conversation service with all its nested resources from your account
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a conversation service from your account
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a conversation service from your account
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a conversation service from your account
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a conversation service from your account
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Services",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all conversation services on your account
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all conversation services on your account
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all conversation services on your account
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all conversation services on your account
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a ServiceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ServiceResource object represented by the provided JSON </returns>
-        public static ServiceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ServiceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this service.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The human-readable name of this service.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The date that this resource was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An absolute URL for this service.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Absolute URLs to access the conversations, users, roles, bindings and configuration of this service.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ServiceResource()
-        {
-
-        }
-    }
+{
+
+  public class ServiceResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Services",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new conversation service on your account
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new conversation service on your account
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new conversation service on your account
+    /// </summary>
+    /// <param name="friendlyName"> The human-readable name of this service. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(string friendlyName, ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new conversation service on your account
+    /// </summary>
+    /// <param name="friendlyName"> The human-readable name of this service. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove a conversation service with all its nested resources from your account
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a conversation service with all its nested resources from your account
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a conversation service with all its nested resources from your account
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a conversation service with all its nested resources from your account
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a conversation service from your account
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a conversation service from your account
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a conversation service from your account
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a conversation service from your account
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Services",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all conversation services on your account
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all conversation services on your account
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all conversation services on your account
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all conversation services on your account
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a ServiceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ServiceResource object represented by the provided JSON </returns>
+    public static ServiceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ServiceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this service.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The human-readable name of this service.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The date that this resource was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An absolute URL for this service.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Absolute URLs to access the conversations, users, roles, bindings and configuration of this service.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ServiceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/User/UserConversationOptions.cs b/src/Twilio/Rest/Conversations/V1/User/UserConversationOptions.cs
index 482a3374d..cbd517f8d 100644
--- a/src/Twilio/Rest/Conversations/V1/User/UserConversationOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/User/UserConversationOptions.cs
@@ -9,172 +9,172 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1.User
-{
-
+{
+
+  /// <summary>
+  /// Update a specific User Conversation.
+  /// </summary>
+  public class UpdateUserConversationOptions : IOptions<UserConversationResource>
+  {
     /// <summary>
-    /// Update a specific User Conversation.
-    /// </summary>
-    public class UpdateUserConversationOptions : IOptions<UserConversationResource>
-    {
-        /// <summary>
-        /// The unique SID identifier of the User.
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The unique SID identifier of the Conversation.
-        /// </summary>
-        public string PathConversationSid { get; }
-        /// <summary>
-        /// The Notification Level of this User Conversation.
-        /// </summary>
-        public UserConversationResource.NotificationLevelEnum NotificationLevel { get; set; }
-        /// <summary>
-        /// The date of the last message read in conversation by the user.
-        /// </summary>
-        public DateTime? LastReadTimestamp { get; set; }
-        /// <summary>
-        /// The index of the last read Message.
-        /// </summary>
-        public int? LastReadMessageIndex { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateUserConversationOptions
-        /// </summary>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        public UpdateUserConversationOptions(string pathUserSid, string pathConversationSid)
-        {
-            PathUserSid = pathUserSid;
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (NotificationLevel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NotificationLevel", NotificationLevel.ToString()));
-            }
-
-            if (LastReadTimestamp != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastReadTimestamp", Serializers.DateTimeIso8601(LastReadTimestamp)));
-            }
-
-            if (LastReadMessageIndex != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastReadMessageIndex", LastReadMessageIndex.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique SID identifier of the User.
+    /// </summary>
+    public string PathUserSid { get; }
     /// <summary>
-    /// Delete a specific User Conversation.
-    /// </summary>
-    public class DeleteUserConversationOptions : IOptions<UserConversationResource>
-    {
-        /// <summary>
-        /// The unique SID identifier of the User.
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The unique SID identifier of the Conversation.
-        /// </summary>
-        public string PathConversationSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteUserConversationOptions
-        /// </summary>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        public DeleteUserConversationOptions(string pathUserSid, string pathConversationSid)
-        {
-            PathUserSid = pathUserSid;
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The unique SID identifier of the Conversation.
+    /// </summary>
+    public string PathConversationSid { get; }
     /// <summary>
-    /// Fetch a specific User Conversation.
-    /// </summary>
-    public class FetchUserConversationOptions : IOptions<UserConversationResource>
-    {
-        /// <summary>
-        /// The unique SID identifier of the User.
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The unique SID identifier of the Conversation.
-        /// </summary>
-        public string PathConversationSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUserConversationOptions
-        /// </summary>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        public FetchUserConversationOptions(string pathUserSid, string pathConversationSid)
-        {
-            PathUserSid = pathUserSid;
-            PathConversationSid = pathConversationSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The Notification Level of this User Conversation.
+    /// </summary>
+    public UserConversationResource.NotificationLevelEnum NotificationLevel { get; set; }
     /// <summary>
-    /// Retrieve a list of all User Conversations for the User.
+    /// The date of the last message read in conversation by the user.
     /// </summary>
-    public class ReadUserConversationOptions : ReadOptions<UserConversationResource>
-    {
-        /// <summary>
-        /// The unique SID identifier of the User.
-        /// </summary>
-        public string PathUserSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadUserConversationOptions
-        /// </summary>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        public ReadUserConversationOptions(string pathUserSid)
-        {
-            PathUserSid = pathUserSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public DateTime? LastReadTimestamp { get; set; }
+    /// <summary>
+    /// The index of the last read Message.
+    /// </summary>
+    public int? LastReadMessageIndex { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateUserConversationOptions
+    /// </summary>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    public UpdateUserConversationOptions(string pathUserSid, string pathConversationSid)
+    {
+      PathUserSid = pathUserSid;
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (NotificationLevel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NotificationLevel", NotificationLevel.ToString()));
+      }
+
+      if (LastReadTimestamp != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastReadTimestamp", Serializers.DateTimeIso8601(LastReadTimestamp)));
+      }
+
+      if (LastReadMessageIndex != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastReadMessageIndex", LastReadMessageIndex.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific User Conversation.
+  /// </summary>
+  public class DeleteUserConversationOptions : IOptions<UserConversationResource>
+  {
+    /// <summary>
+    /// The unique SID identifier of the User.
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The unique SID identifier of the Conversation.
+    /// </summary>
+    public string PathConversationSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteUserConversationOptions
+    /// </summary>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    public DeleteUserConversationOptions(string pathUserSid, string pathConversationSid)
+    {
+      PathUserSid = pathUserSid;
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific User Conversation.
+  /// </summary>
+  public class FetchUserConversationOptions : IOptions<UserConversationResource>
+  {
+    /// <summary>
+    /// The unique SID identifier of the User.
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The unique SID identifier of the Conversation.
+    /// </summary>
+    public string PathConversationSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchUserConversationOptions
+    /// </summary>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    public FetchUserConversationOptions(string pathUserSid, string pathConversationSid)
+    {
+      PathUserSid = pathUserSid;
+      PathConversationSid = pathConversationSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all User Conversations for the User.
+  /// </summary>
+  public class ReadUserConversationOptions : ReadOptions<UserConversationResource>
+  {
+    /// <summary>
+    /// The unique SID identifier of the User.
+    /// </summary>
+    public string PathUserSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadUserConversationOptions
+    /// </summary>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    public ReadUserConversationOptions(string pathUserSid)
+    {
+      PathUserSid = pathUserSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/User/UserConversationResource.cs b/src/Twilio/Rest/Conversations/V1/User/UserConversationResource.cs
index ca5004786..38cb63d30 100644
--- a/src/Twilio/Rest/Conversations/V1/User/UserConversationResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/User/UserConversationResource.cs
@@ -17,513 +17,513 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1.User
-{
-
-    public class UserConversationResource : Resource
-    {
-        public sealed class NotificationLevelEnum : StringEnum
-        {
-            private NotificationLevelEnum(string value) : base(value) {}
-            public NotificationLevelEnum() {}
-            public static implicit operator NotificationLevelEnum(string value)
-            {
-                return new NotificationLevelEnum(value);
-            }
-
-            public static readonly NotificationLevelEnum Default = new NotificationLevelEnum("default");
-            public static readonly NotificationLevelEnum Muted = new NotificationLevelEnum("muted");
-        }
-
-        public sealed class StateEnum : StringEnum
-        {
-            private StateEnum(string value) : base(value) {}
-            public StateEnum() {}
-            public static implicit operator StateEnum(string value)
-            {
-                return new StateEnum(value);
-            }
-
-            public static readonly StateEnum Inactive = new StateEnum("inactive");
-            public static readonly StateEnum Active = new StateEnum("active");
-            public static readonly StateEnum Closed = new StateEnum("closed");
-        }
-
-        private static Request BuildUpdateRequest(UpdateUserConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Users/" + options.PathUserSid + "/Conversations/" + options.PathConversationSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific User Conversation.
-        /// </summary>
-        /// <param name="options"> Update UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static UserConversationResource Update(UpdateUserConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific User Conversation.
-        /// </summary>
-        /// <param name="options"> Update UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<UserConversationResource> UpdateAsync(UpdateUserConversationOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific User Conversation.
-        /// </summary>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        /// <param name="notificationLevel"> The Notification Level of this User Conversation. </param>
-        /// <param name="lastReadTimestamp"> The date of the last message read in conversation by the user. </param>
-        /// <param name="lastReadMessageIndex"> The index of the last read Message. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static UserConversationResource Update(string pathUserSid,
-                                                      string pathConversationSid,
-                                                      UserConversationResource.NotificationLevelEnum notificationLevel = null,
-                                                      DateTime? lastReadTimestamp = null,
-                                                      int? lastReadMessageIndex = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserConversationOptions(pathUserSid, pathConversationSid){NotificationLevel = notificationLevel, LastReadTimestamp = lastReadTimestamp, LastReadMessageIndex = lastReadMessageIndex};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific User Conversation.
-        /// </summary>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        /// <param name="notificationLevel"> The Notification Level of this User Conversation. </param>
-        /// <param name="lastReadTimestamp"> The date of the last message read in conversation by the user. </param>
-        /// <param name="lastReadMessageIndex"> The index of the last read Message. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<UserConversationResource> UpdateAsync(string pathUserSid,
-                                                                                              string pathConversationSid,
-                                                                                              UserConversationResource.NotificationLevelEnum notificationLevel = null,
-                                                                                              DateTime? lastReadTimestamp = null,
-                                                                                              int? lastReadMessageIndex = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserConversationOptions(pathUserSid, pathConversationSid){NotificationLevel = notificationLevel, LastReadTimestamp = lastReadTimestamp, LastReadMessageIndex = lastReadMessageIndex};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteUserConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Users/" + options.PathUserSid + "/Conversations/" + options.PathConversationSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific User Conversation.
-        /// </summary>
-        /// <param name="options"> Delete UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static bool Delete(DeleteUserConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific User Conversation.
-        /// </summary>
-        /// <param name="options"> Delete UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserConversationOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific User Conversation.
-        /// </summary>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static bool Delete(string pathUserSid, string pathConversationSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserConversationOptions(pathUserSid, pathConversationSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific User Conversation.
-        /// </summary>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathUserSid,
-                                                                          string pathConversationSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserConversationOptions(pathUserSid, pathConversationSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchUserConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Users/" + options.PathUserSid + "/Conversations/" + options.PathConversationSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific User Conversation.
-        /// </summary>
-        /// <param name="options"> Fetch UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static UserConversationResource Fetch(FetchUserConversationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific User Conversation.
-        /// </summary>
-        /// <param name="options"> Fetch UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<UserConversationResource> FetchAsync(FetchUserConversationOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific User Conversation.
-        /// </summary>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static UserConversationResource Fetch(string pathUserSid,
-                                                     string pathConversationSid,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchUserConversationOptions(pathUserSid, pathConversationSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific User Conversation.
-        /// </summary>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<UserConversationResource> FetchAsync(string pathUserSid,
-                                                                                             string pathConversationSid,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new FetchUserConversationOptions(pathUserSid, pathConversationSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadUserConversationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Users/" + options.PathUserSid + "/Conversations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all User Conversations for the User.
-        /// </summary>
-        /// <param name="options"> Read UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static ResourceSet<UserConversationResource> Read(ReadUserConversationOptions options,
-                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserConversationResource>.FromJson("conversations", response.Content);
-            return new ResourceSet<UserConversationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all User Conversations for the User.
-        /// </summary>
-        /// <param name="options"> Read UserConversation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserConversationResource>> ReadAsync(ReadUserConversationOptions options,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserConversationResource>.FromJson("conversations", response.Content);
-            return new ResourceSet<UserConversationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all User Conversations for the User.
-        /// </summary>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserConversation </returns>
-        public static ResourceSet<UserConversationResource> Read(string pathUserSid,
-                                                                 int? pageSize = null,
-                                                                 long? limit = null,
-                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadUserConversationOptions(pathUserSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all User Conversations for the User.
-        /// </summary>
-        /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserConversation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserConversationResource>> ReadAsync(string pathUserSid,
-                                                                                                         int? pageSize = null,
-                                                                                                         long? limit = null,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadUserConversationOptions(pathUserSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserConversationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserConversationResource> NextPage(Page<UserConversationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<UserConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserConversationResource> PreviousPage(Page<UserConversationResource> page,
-                                                                  ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<UserConversationResource>.FromJson("conversations", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a UserConversationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserConversationResource object represented by the provided JSON </returns>
-        public static UserConversationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserConversationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account responsible for this conversation.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation Service this conversation belongs to.
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Conversation for this User Conversation.
-        /// </summary>
-        [JsonProperty("conversation_sid")]
-        public string ConversationSid { get; private set; }
-        /// <summary>
-        /// The number of unread Messages in the Conversation.
-        /// </summary>
-        [JsonProperty("unread_messages_count")]
-        public int? UnreadMessagesCount { get; private set; }
-        /// <summary>
-        /// The index of the last read Message .
-        /// </summary>
-        [JsonProperty("last_read_message_index")]
-        public int? LastReadMessageIndex { get; private set; }
-        /// <summary>
-        /// Participant Sid.
-        /// </summary>
-        [JsonProperty("participant_sid")]
-        public string ParticipantSid { get; private set; }
-        /// <summary>
-        /// The unique ID for the User.
-        /// </summary>
-        [JsonProperty("user_sid")]
-        public string UserSid { get; private set; }
-        /// <summary>
-        /// The human-readable name of this conversation.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The current state of this User Conversation
-        /// </summary>
-        [JsonProperty("conversation_state")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public UserConversationResource.StateEnum ConversationState { get; private set; }
-        /// <summary>
-        /// Timer date values for this conversation.
-        /// </summary>
-        [JsonProperty("timers")]
-        public object Timers { get; private set; }
-        /// <summary>
-        /// An optional string metadata field you can use to store any data you wish.
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The date that this conversation was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this conversation was last updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Creator of this conversation.
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-        /// <summary>
-        /// The Notification Level of this User Conversation.
-        /// </summary>
-        [JsonProperty("notification_level")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public UserConversationResource.NotificationLevelEnum NotificationLevel { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the Conversation resource.
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Absolute URLs to access the participant and conversation of this user conversation.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private UserConversationResource()
-        {
-
-        }
-    }
+{
+
+  public class UserConversationResource : Resource
+  {
+    public sealed class NotificationLevelEnum : StringEnum
+    {
+      private NotificationLevelEnum(string value) : base(value) { }
+      public NotificationLevelEnum() { }
+      public static implicit operator NotificationLevelEnum(string value)
+      {
+        return new NotificationLevelEnum(value);
+      }
+
+      public static readonly NotificationLevelEnum Default = new NotificationLevelEnum("default");
+      public static readonly NotificationLevelEnum Muted = new NotificationLevelEnum("muted");
+    }
+
+    public sealed class StateEnum : StringEnum
+    {
+      private StateEnum(string value) : base(value) { }
+      public StateEnum() { }
+      public static implicit operator StateEnum(string value)
+      {
+        return new StateEnum(value);
+      }
+
+      public static readonly StateEnum Inactive = new StateEnum("inactive");
+      public static readonly StateEnum Active = new StateEnum("active");
+      public static readonly StateEnum Closed = new StateEnum("closed");
+    }
+
+    private static Request BuildUpdateRequest(UpdateUserConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Users/" + options.PathUserSid + "/Conversations/" + options.PathConversationSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific User Conversation.
+    /// </summary>
+    /// <param name="options"> Update UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static UserConversationResource Update(UpdateUserConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific User Conversation.
+    /// </summary>
+    /// <param name="options"> Update UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<UserConversationResource> UpdateAsync(UpdateUserConversationOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific User Conversation.
+    /// </summary>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    /// <param name="notificationLevel"> The Notification Level of this User Conversation. </param>
+    /// <param name="lastReadTimestamp"> The date of the last message read in conversation by the user. </param>
+    /// <param name="lastReadMessageIndex"> The index of the last read Message. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static UserConversationResource Update(string pathUserSid,
+                                                  string pathConversationSid,
+                                                  UserConversationResource.NotificationLevelEnum notificationLevel = null,
+                                                  DateTime? lastReadTimestamp = null,
+                                                  int? lastReadMessageIndex = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserConversationOptions(pathUserSid, pathConversationSid) { NotificationLevel = notificationLevel, LastReadTimestamp = lastReadTimestamp, LastReadMessageIndex = lastReadMessageIndex };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific User Conversation.
+    /// </summary>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    /// <param name="notificationLevel"> The Notification Level of this User Conversation. </param>
+    /// <param name="lastReadTimestamp"> The date of the last message read in conversation by the user. </param>
+    /// <param name="lastReadMessageIndex"> The index of the last read Message. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<UserConversationResource> UpdateAsync(string pathUserSid,
+                                                                                          string pathConversationSid,
+                                                                                          UserConversationResource.NotificationLevelEnum notificationLevel = null,
+                                                                                          DateTime? lastReadTimestamp = null,
+                                                                                          int? lastReadMessageIndex = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserConversationOptions(pathUserSid, pathConversationSid) { NotificationLevel = notificationLevel, LastReadTimestamp = lastReadTimestamp, LastReadMessageIndex = lastReadMessageIndex };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteUserConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Users/" + options.PathUserSid + "/Conversations/" + options.PathConversationSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific User Conversation.
+    /// </summary>
+    /// <param name="options"> Delete UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static bool Delete(DeleteUserConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific User Conversation.
+    /// </summary>
+    /// <param name="options"> Delete UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserConversationOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific User Conversation.
+    /// </summary>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static bool Delete(string pathUserSid, string pathConversationSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserConversationOptions(pathUserSid, pathConversationSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific User Conversation.
+    /// </summary>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathUserSid,
+                                                                      string pathConversationSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserConversationOptions(pathUserSid, pathConversationSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchUserConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Users/" + options.PathUserSid + "/Conversations/" + options.PathConversationSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific User Conversation.
+    /// </summary>
+    /// <param name="options"> Fetch UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static UserConversationResource Fetch(FetchUserConversationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific User Conversation.
+    /// </summary>
+    /// <param name="options"> Fetch UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<UserConversationResource> FetchAsync(FetchUserConversationOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific User Conversation.
+    /// </summary>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static UserConversationResource Fetch(string pathUserSid,
+                                                 string pathConversationSid,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchUserConversationOptions(pathUserSid, pathConversationSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific User Conversation.
+    /// </summary>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pathConversationSid"> The unique SID identifier of the Conversation. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<UserConversationResource> FetchAsync(string pathUserSid,
+                                                                                         string pathConversationSid,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new FetchUserConversationOptions(pathUserSid, pathConversationSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadUserConversationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Users/" + options.PathUserSid + "/Conversations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all User Conversations for the User.
+    /// </summary>
+    /// <param name="options"> Read UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static ResourceSet<UserConversationResource> Read(ReadUserConversationOptions options,
+                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserConversationResource>.FromJson("conversations", response.Content);
+      return new ResourceSet<UserConversationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all User Conversations for the User.
+    /// </summary>
+    /// <param name="options"> Read UserConversation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserConversationResource>> ReadAsync(ReadUserConversationOptions options,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserConversationResource>.FromJson("conversations", response.Content);
+      return new ResourceSet<UserConversationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all User Conversations for the User.
+    /// </summary>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserConversation </returns>
+    public static ResourceSet<UserConversationResource> Read(string pathUserSid,
+                                                             int? pageSize = null,
+                                                             long? limit = null,
+                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadUserConversationOptions(pathUserSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all User Conversations for the User.
+    /// </summary>
+    /// <param name="pathUserSid"> The unique SID identifier of the User. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserConversation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserConversationResource>> ReadAsync(string pathUserSid,
+                                                                                                     int? pageSize = null,
+                                                                                                     long? limit = null,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadUserConversationOptions(pathUserSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserConversationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserConversationResource> NextPage(Page<UserConversationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<UserConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserConversationResource> PreviousPage(Page<UserConversationResource> page,
+                                                              ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<UserConversationResource>.FromJson("conversations", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a UserConversationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserConversationResource object represented by the provided JSON </returns>
+    public static UserConversationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserConversationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account responsible for this conversation.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation Service this conversation belongs to.
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Conversation for this User Conversation.
+    /// </summary>
+    [JsonProperty("conversation_sid")]
+    public string ConversationSid { get; private set; }
+    /// <summary>
+    /// The number of unread Messages in the Conversation.
+    /// </summary>
+    [JsonProperty("unread_messages_count")]
+    public int? UnreadMessagesCount { get; private set; }
+    /// <summary>
+    /// The index of the last read Message .
+    /// </summary>
+    [JsonProperty("last_read_message_index")]
+    public int? LastReadMessageIndex { get; private set; }
+    /// <summary>
+    /// Participant Sid.
+    /// </summary>
+    [JsonProperty("participant_sid")]
+    public string ParticipantSid { get; private set; }
+    /// <summary>
+    /// The unique ID for the User.
+    /// </summary>
+    [JsonProperty("user_sid")]
+    public string UserSid { get; private set; }
+    /// <summary>
+    /// The human-readable name of this conversation.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The current state of this User Conversation
+    /// </summary>
+    [JsonProperty("conversation_state")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public UserConversationResource.StateEnum ConversationState { get; private set; }
+    /// <summary>
+    /// Timer date values for this conversation.
+    /// </summary>
+    [JsonProperty("timers")]
+    public object Timers { get; private set; }
+    /// <summary>
+    /// An optional string metadata field you can use to store any data you wish.
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The date that this conversation was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this conversation was last updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Creator of this conversation.
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+    /// <summary>
+    /// The Notification Level of this User Conversation.
+    /// </summary>
+    [JsonProperty("notification_level")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public UserConversationResource.NotificationLevelEnum NotificationLevel { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the Conversation resource.
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Absolute URLs to access the participant and conversation of this user conversation.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private UserConversationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/UserOptions.cs b/src/Twilio/Rest/Conversations/V1/UserOptions.cs
index a09ce6734..bfd8dd962 100644
--- a/src/Twilio/Rest/Conversations/V1/UserOptions.cs
+++ b/src/Twilio/Rest/Conversations/V1/UserOptions.cs
@@ -9,255 +9,255 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
+{
+
+  /// <summary>
+  /// Add a new conversation user to your account's default service
+  /// </summary>
+  public class CreateUserOptions : IOptions<UserResource>
+  {
     /// <summary>
-    /// Add a new conversation user to your account's default service
+    /// The string that identifies the resource's User
     /// </summary>
-    public class CreateUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The JSON Object string that stores application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The SID of a service-level Role to assign to the user
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateUserOptions
-        /// </summary>
-        /// <param name="identity"> The string that identifies the resource's User </param>
-        public CreateUserOptions(string identity)
-        {
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string Identity { get; }
     /// <summary>
-    /// Update an existing conversation user in your account's default service
+    /// The string that you assigned to describe the resource
     /// </summary>
-    public class UpdateUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the User resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The JSON Object string that stores application-specific data
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The SID of a service-level Role to assign to the user
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateUserOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the User resource to update </param>
-        public UpdateUserOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// Remove a conversation user from your account's default service
+    /// The JSON Object string that stores application-specific data
     /// </summary>
-    public class DeleteUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of  the User resource to delete
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteUserOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of  the User resource to delete </param>
-        public DeleteUserOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string Attributes { get; set; }
     /// <summary>
-    /// Fetch a conversation user from your account's default service
+    /// The SID of a service-level Role to assign to the user
     /// </summary>
-    public class FetchUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the User resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUserOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the User resource to fetch </param>
-        public FetchUserOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string RoleSid { get; set; }
     /// <summary>
-    /// Retrieve a list of all conversation users in your account's default service
+    /// The X-Twilio-Webhook-Enabled HTTP request header
     /// </summary>
-    public class ReadUserOptions : ReadOptions<UserResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateUserOptions
+    /// </summary>
+    /// <param name="identity"> The string that identifies the resource's User </param>
+    public CreateUserOptions(string identity)
+    {
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing conversation user in your account's default service
+  /// </summary>
+  public class UpdateUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of the User resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The JSON Object string that stores application-specific data
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The SID of a service-level Role to assign to the user
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateUserOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the User resource to update </param>
+    public UpdateUserOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove a conversation user from your account's default service
+  /// </summary>
+  public class DeleteUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of  the User resource to delete
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteUserOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of  the User resource to delete </param>
+    public DeleteUserOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a conversation user from your account's default service
+  /// </summary>
+  public class FetchUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of the User resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchUserOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the User resource to fetch </param>
+    public FetchUserOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all conversation users in your account's default service
+  /// </summary>
+  public class ReadUserOptions : ReadOptions<UserResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Conversations/V1/UserResource.cs b/src/Twilio/Rest/Conversations/V1/UserResource.cs
index 3ce629796..f251be459 100644
--- a/src/Twilio/Rest/Conversations/V1/UserResource.cs
+++ b/src/Twilio/Rest/Conversations/V1/UserResource.cs
@@ -17,547 +17,547 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Conversations.V1
-{
-
-    public class UserResource : Resource
-    {
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildCreateRequest(CreateUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Users",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Add a new conversation user to your account's default service
-        /// </summary>
-        /// <param name="options"> Create User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Create(CreateUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new conversation user to your account's default service
-        /// </summary>
-        /// <param name="options"> Create User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> CreateAsync(CreateUserOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Add a new conversation user to your account's default service
-        /// </summary>
-        /// <param name="identity"> The string that identifies the resource's User </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
-        /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Create(string identity,
-                                          string friendlyName = null,
-                                          string attributes = null,
-                                          string roleSid = null,
-                                          UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateUserOptions(identity){FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new conversation user to your account's default service
-        /// </summary>
-        /// <param name="identity"> The string that identifies the resource's User </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
-        /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> CreateAsync(string identity,
-                                                                                  string friendlyName = null,
-                                                                                  string attributes = null,
-                                                                                  string roleSid = null,
-                                                                                  UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateUserOptions(identity){FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Conversations,
-                "/v1/Users/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Update an existing conversation user in your account's default service
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing conversation user in your account's default service
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing conversation user in your account's default service
-        /// </summary>
-        /// <param name="pathSid"> The SID of the User resource to update </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
-        /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(string pathSid,
-                                          string friendlyName = null,
-                                          string attributes = null,
-                                          string roleSid = null,
-                                          UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathSid){FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing conversation user in your account's default service
-        /// </summary>
-        /// <param name="pathSid"> The SID of the User resource to update </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
-        /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathSid,
-                                                                                  string friendlyName = null,
-                                                                                  string attributes = null,
-                                                                                  string roleSid = null,
-                                                                                  UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathSid){FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Conversations,
-                "/v1/Users/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Remove a conversation user from your account's default service
-        /// </summary>
-        /// <param name="options"> Delete User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static bool Delete(DeleteUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a conversation user from your account's default service
-        /// </summary>
-        /// <param name="options"> Delete User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a conversation user from your account's default service
-        /// </summary>
-        /// <param name="pathSid"> The SID of  the User resource to delete </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static bool Delete(string pathSid,
-                                  UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserOptions(pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a conversation user from your account's default service
-        /// </summary>
-        /// <param name="pathSid"> The SID of  the User resource to delete </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
-                                                                          UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserOptions(pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Users/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a conversation user from your account's default service
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a conversation user from your account's default service
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a conversation user from your account's default service
-        /// </summary>
-        /// <param name="pathSid"> The SID of the User resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a conversation user from your account's default service
-        /// </summary>
-        /// <param name="pathSid"> The SID of the User resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Conversations,
-                "/v1/Users",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all conversation users in your account's default service
-        /// </summary>
-        /// <param name="options"> Read User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static ResourceSet<UserResource> Read(ReadUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserResource>.FromJson("users", response.Content);
-            return new ResourceSet<UserResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all conversation users in your account's default service
-        /// </summary>
-        /// <param name="options"> Read User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(ReadUserOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserResource>.FromJson("users", response.Content);
-            return new ResourceSet<UserResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all conversation users in your account's default service
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static ResourceSet<UserResource> Read(int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadUserOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all conversation users in your account's default service
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadUserOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserResource> NextPage(Page<UserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserResource> PreviousPage(Page<UserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Conversations)
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a UserResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserResource object represented by the provided JSON </returns>
-        public static UserResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Conversation Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of a service-level Role assigned to the user
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The JSON Object string that stores application-specific data
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// Whether the User is actively connected to this Conversations Service and online
-        /// </summary>
-        [JsonProperty("is_online")]
-        public bool? IsOnline { get; private set; }
-        /// <summary>
-        /// Whether the User has a potentially valid Push Notification registration for this Conversations Service
-        /// </summary>
-        [JsonProperty("is_notifiable")]
-        public bool? IsNotifiable { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An absolute URL for this user.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private UserResource()
-        {
-
-        }
-    }
+{
+
+  public class UserResource : Resource
+  {
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildCreateRequest(CreateUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Users",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Add a new conversation user to your account's default service
+    /// </summary>
+    /// <param name="options"> Create User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Create(CreateUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new conversation user to your account's default service
+    /// </summary>
+    /// <param name="options"> Create User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> CreateAsync(CreateUserOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Add a new conversation user to your account's default service
+    /// </summary>
+    /// <param name="identity"> The string that identifies the resource's User </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
+    /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Create(string identity,
+                                      string friendlyName = null,
+                                      string attributes = null,
+                                      string roleSid = null,
+                                      UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateUserOptions(identity) { FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new conversation user to your account's default service
+    /// </summary>
+    /// <param name="identity"> The string that identifies the resource's User </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
+    /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> CreateAsync(string identity,
+                                                                              string friendlyName = null,
+                                                                              string attributes = null,
+                                                                              string roleSid = null,
+                                                                              UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateUserOptions(identity) { FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Conversations,
+          "/v1/Users/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Update an existing conversation user in your account's default service
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing conversation user in your account's default service
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing conversation user in your account's default service
+    /// </summary>
+    /// <param name="pathSid"> The SID of the User resource to update </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
+    /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(string pathSid,
+                                      string friendlyName = null,
+                                      string attributes = null,
+                                      string roleSid = null,
+                                      UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathSid) { FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing conversation user in your account's default service
+    /// </summary>
+    /// <param name="pathSid"> The SID of the User resource to update </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The JSON Object string that stores application-specific data </param>
+    /// <param name="roleSid"> The SID of a service-level Role to assign to the user </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathSid,
+                                                                              string friendlyName = null,
+                                                                              string attributes = null,
+                                                                              string roleSid = null,
+                                                                              UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathSid) { FriendlyName = friendlyName, Attributes = attributes, RoleSid = roleSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Conversations,
+          "/v1/Users/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Remove a conversation user from your account's default service
+    /// </summary>
+    /// <param name="options"> Delete User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static bool Delete(DeleteUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a conversation user from your account's default service
+    /// </summary>
+    /// <param name="options"> Delete User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a conversation user from your account's default service
+    /// </summary>
+    /// <param name="pathSid"> The SID of  the User resource to delete </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static bool Delete(string pathSid,
+                              UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserOptions(pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a conversation user from your account's default service
+    /// </summary>
+    /// <param name="pathSid"> The SID of  the User resource to delete </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid,
+                                                                      UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserOptions(pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Users/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a conversation user from your account's default service
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a conversation user from your account's default service
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a conversation user from your account's default service
+    /// </summary>
+    /// <param name="pathSid"> The SID of the User resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a conversation user from your account's default service
+    /// </summary>
+    /// <param name="pathSid"> The SID of the User resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Conversations,
+          "/v1/Users",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all conversation users in your account's default service
+    /// </summary>
+    /// <param name="options"> Read User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static ResourceSet<UserResource> Read(ReadUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserResource>.FromJson("users", response.Content);
+      return new ResourceSet<UserResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all conversation users in your account's default service
+    /// </summary>
+    /// <param name="options"> Read User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(ReadUserOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserResource>.FromJson("users", response.Content);
+      return new ResourceSet<UserResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all conversation users in your account's default service
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static ResourceSet<UserResource> Read(int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadUserOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all conversation users in your account's default service
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadUserOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserResource> NextPage(Page<UserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserResource> PreviousPage(Page<UserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Conversations)
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a UserResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserResource object represented by the provided JSON </returns>
+    public static UserResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Conversation Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of a service-level Role assigned to the user
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The string that identifies the resource's User
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The JSON Object string that stores application-specific data
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// Whether the User is actively connected to this Conversations Service and online
+    /// </summary>
+    [JsonProperty("is_online")]
+    public bool? IsOnline { get; private set; }
+    /// <summary>
+    /// Whether the User has a potentially valid Push Notification registration for this Conversations Service
+    /// </summary>
+    [JsonProperty("is_notifiable")]
+    public bool? IsNotifiable { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An absolute URL for this user.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private UserResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Domain.cs b/src/Twilio/Rest/Domain.cs
index 19a5eb7de..d1172110b 100644
--- a/src/Twilio/Rest/Domain.cs
+++ b/src/Twilio/Rest/Domain.cs
@@ -6,49 +6,49 @@
 using Twilio.Types;
 
 namespace Twilio.Rest
-{
-
-    public sealed class Domain : StringEnum
-    {
-        private Domain(string value) : base(value) {}
-        public Domain() {}
-        public static implicit operator Domain(string value)
-        {
-            return new Domain(value);
-        }
-
-        public static readonly Domain Accounts = new Domain("accounts");
-        public static readonly Domain Api = new Domain("api");
-        public static readonly Domain Autopilot = new Domain("autopilot");
-        public static readonly Domain Chat = new Domain("chat");
-        public static readonly Domain Conversations = new Domain("conversations");
-        public static readonly Domain Events = new Domain("events");
-        public static readonly Domain Fax = new Domain("fax");
-        public static readonly Domain FlexApi = new Domain("flex-api");
-        public static readonly Domain FrontlineApi = new Domain("frontline-api");
-        public static readonly Domain Insights = new Domain("insights");
-        public static readonly Domain IpMessaging = new Domain("ip-messaging");
-        public static readonly Domain Lookups = new Domain("lookups");
-        public static readonly Domain Media = new Domain("media");
-        public static readonly Domain Messaging = new Domain("messaging");
-        public static readonly Domain Monitor = new Domain("monitor");
-        public static readonly Domain Notify = new Domain("notify");
-        public static readonly Domain Numbers = new Domain("numbers");
-        public static readonly Domain Preview = new Domain("preview");
-        public static readonly Domain Pricing = new Domain("pricing");
-        public static readonly Domain Proxy = new Domain("proxy");
-        public static readonly Domain Serverless = new Domain("serverless");
-        public static readonly Domain Studio = new Domain("studio");
-        public static readonly Domain Sync = new Domain("sync");
-        public static readonly Domain Taskrouter = new Domain("taskrouter");
-        public static readonly Domain Trunking = new Domain("trunking");
-        public static readonly Domain Trusthub = new Domain("trusthub");
-        public static readonly Domain Verify = new Domain("verify");
-        public static readonly Domain Video = new Domain("video");
-        public static readonly Domain Voice = new Domain("voice");
-        public static readonly Domain Wireless = new Domain("wireless");
-        public static readonly Domain Supersim = new Domain("supersim");
-        public static readonly Domain Bulkexports = new Domain("bulkexports");
-    }
+{
+
+  public sealed class Domain : StringEnum
+  {
+    private Domain(string value) : base(value) { }
+    public Domain() { }
+    public static implicit operator Domain(string value)
+    {
+      return new Domain(value);
+    }
+
+    public static readonly Domain Accounts = new Domain("accounts");
+    public static readonly Domain Api = new Domain("api");
+    public static readonly Domain Autopilot = new Domain("autopilot");
+    public static readonly Domain Chat = new Domain("chat");
+    public static readonly Domain Conversations = new Domain("conversations");
+    public static readonly Domain Events = new Domain("events");
+    public static readonly Domain Fax = new Domain("fax");
+    public static readonly Domain FlexApi = new Domain("flex-api");
+    public static readonly Domain FrontlineApi = new Domain("frontline-api");
+    public static readonly Domain Insights = new Domain("insights");
+    public static readonly Domain IpMessaging = new Domain("ip-messaging");
+    public static readonly Domain Lookups = new Domain("lookups");
+    public static readonly Domain Media = new Domain("media");
+    public static readonly Domain Messaging = new Domain("messaging");
+    public static readonly Domain Monitor = new Domain("monitor");
+    public static readonly Domain Notify = new Domain("notify");
+    public static readonly Domain Numbers = new Domain("numbers");
+    public static readonly Domain Preview = new Domain("preview");
+    public static readonly Domain Pricing = new Domain("pricing");
+    public static readonly Domain Proxy = new Domain("proxy");
+    public static readonly Domain Serverless = new Domain("serverless");
+    public static readonly Domain Studio = new Domain("studio");
+    public static readonly Domain Sync = new Domain("sync");
+    public static readonly Domain Taskrouter = new Domain("taskrouter");
+    public static readonly Domain Trunking = new Domain("trunking");
+    public static readonly Domain Trusthub = new Domain("trusthub");
+    public static readonly Domain Verify = new Domain("verify");
+    public static readonly Domain Video = new Domain("video");
+    public static readonly Domain Voice = new Domain("voice");
+    public static readonly Domain Wireless = new Domain("wireless");
+    public static readonly Domain Supersim = new Domain("supersim");
+    public static readonly Domain Bulkexports = new Domain("bulkexports");
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/EventTypeOptions.cs b/src/Twilio/Rest/Events/V1/EventTypeOptions.cs
index 941bc6475..4e512f626 100644
--- a/src/Twilio/Rest/Events/V1/EventTypeOptions.cs
+++ b/src/Twilio/Rest/Events/V1/EventTypeOptions.cs
@@ -9,69 +9,69 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Events.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a paginated list of all the available Event Types.
+  /// </summary>
+  public class ReadEventTypeOptions : ReadOptions<EventTypeResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a paginated list of all the available Event Types.
+    /// A string to filter Event Types by schema.
     /// </summary>
-    public class ReadEventTypeOptions : ReadOptions<EventTypeResource>
-    {
-        /// <summary>
-        /// A string to filter Event Types by schema.
-        /// </summary>
-        public string SchemaId { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (SchemaId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SchemaId", SchemaId));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string SchemaId { get; set; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific Event Type.
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchEventTypeOptions : IOptions<EventTypeResource>
-    {
-        /// <summary>
-        /// A string that uniquely identifies this Event Type.
-        /// </summary>
-        public string PathType { get; }
-
-        /// <summary>
-        /// Construct a new FetchEventTypeOptions
-        /// </summary>
-        /// <param name="pathType"> A string that uniquely identifies this Event Type. </param>
-        public FetchEventTypeOptions(string pathType)
-        {
-            PathType = pathType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (SchemaId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SchemaId", SchemaId));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific Event Type.
+  /// </summary>
+  public class FetchEventTypeOptions : IOptions<EventTypeResource>
+  {
+    /// <summary>
+    /// A string that uniquely identifies this Event Type.
+    /// </summary>
+    public string PathType { get; }
+
+    /// <summary>
+    /// Construct a new FetchEventTypeOptions
+    /// </summary>
+    /// <param name="pathType"> A string that uniquely identifies this Event Type. </param>
+    public FetchEventTypeOptions(string pathType)
+    {
+      PathType = pathType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/EventTypeResource.cs b/src/Twilio/Rest/Events/V1/EventTypeResource.cs
index c98c8efc3..87b1370fa 100644
--- a/src/Twilio/Rest/Events/V1/EventTypeResource.cs
+++ b/src/Twilio/Rest/Events/V1/EventTypeResource.cs
@@ -18,268 +18,268 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Events.V1
-{
-
-    public class EventTypeResource : Resource
-    {
-        private static Request BuildReadRequest(ReadEventTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Events,
-                "/v1/Types",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a paginated list of all the available Event Types.
-        /// </summary>
-        /// <param name="options"> Read EventType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EventType </returns>
-        public static ResourceSet<EventTypeResource> Read(ReadEventTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<EventTypeResource>.FromJson("types", response.Content);
-            return new ResourceSet<EventTypeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a paginated list of all the available Event Types.
-        /// </summary>
-        /// <param name="options"> Read EventType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EventType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EventTypeResource>> ReadAsync(ReadEventTypeOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<EventTypeResource>.FromJson("types", response.Content);
-            return new ResourceSet<EventTypeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a paginated list of all the available Event Types.
-        /// </summary>
-        /// <param name="schemaId"> A string to filter Event Types by schema. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EventType </returns>
-        public static ResourceSet<EventTypeResource> Read(string schemaId = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadEventTypeOptions(){SchemaId = schemaId, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a paginated list of all the available Event Types.
-        /// </summary>
-        /// <param name="schemaId"> A string to filter Event Types by schema. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EventType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EventTypeResource>> ReadAsync(string schemaId = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadEventTypeOptions(){SchemaId = schemaId, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<EventTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<EventTypeResource>.FromJson("types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<EventTypeResource> NextPage(Page<EventTypeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Events)
-            );
-
-            var response = client.Request(request);
-            return Page<EventTypeResource>.FromJson("types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<EventTypeResource> PreviousPage(Page<EventTypeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Events)
-            );
-
-            var response = client.Request(request);
-            return Page<EventTypeResource>.FromJson("types", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchEventTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Events,
-                "/v1/Types/" + options.PathType + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Event Type.
-        /// </summary>
-        /// <param name="options"> Fetch EventType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EventType </returns>
-        public static EventTypeResource Fetch(FetchEventTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Event Type.
-        /// </summary>
-        /// <param name="options"> Fetch EventType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EventType </returns>
-        public static async System.Threading.Tasks.Task<EventTypeResource> FetchAsync(FetchEventTypeOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Event Type.
-        /// </summary>
-        /// <param name="pathType"> A string that uniquely identifies this Event Type. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EventType </returns>
-        public static EventTypeResource Fetch(string pathType, ITwilioRestClient client = null)
-        {
-            var options = new FetchEventTypeOptions(pathType);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Event Type.
-        /// </summary>
-        /// <param name="pathType"> A string that uniquely identifies this Event Type. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EventType </returns>
-        public static async System.Threading.Tasks.Task<EventTypeResource> FetchAsync(string pathType,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchEventTypeOptions(pathType);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a EventTypeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EventTypeResource object represented by the provided JSON </returns>
-        public static EventTypeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EventTypeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The Event Type identifier.
-        /// </summary>
-        [JsonProperty("type")]
-        public string Type { get; private set; }
-        /// <summary>
-        /// The Schema identifier for this Event Type.
-        /// </summary>
-        [JsonProperty("schema_id")]
-        public string SchemaId { get; private set; }
-        /// <summary>
-        /// The date this Event Type was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this Event Type was updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Event Type description.
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private EventTypeResource()
-        {
-
-        }
-    }
+{
+
+  public class EventTypeResource : Resource
+  {
+    private static Request BuildReadRequest(ReadEventTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Events,
+          "/v1/Types",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a paginated list of all the available Event Types.
+    /// </summary>
+    /// <param name="options"> Read EventType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EventType </returns>
+    public static ResourceSet<EventTypeResource> Read(ReadEventTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<EventTypeResource>.FromJson("types", response.Content);
+      return new ResourceSet<EventTypeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a paginated list of all the available Event Types.
+    /// </summary>
+    /// <param name="options"> Read EventType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EventType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EventTypeResource>> ReadAsync(ReadEventTypeOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<EventTypeResource>.FromJson("types", response.Content);
+      return new ResourceSet<EventTypeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a paginated list of all the available Event Types.
+    /// </summary>
+    /// <param name="schemaId"> A string to filter Event Types by schema. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EventType </returns>
+    public static ResourceSet<EventTypeResource> Read(string schemaId = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadEventTypeOptions() { SchemaId = schemaId, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a paginated list of all the available Event Types.
+    /// </summary>
+    /// <param name="schemaId"> A string to filter Event Types by schema. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EventType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EventTypeResource>> ReadAsync(string schemaId = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadEventTypeOptions() { SchemaId = schemaId, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<EventTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<EventTypeResource>.FromJson("types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<EventTypeResource> NextPage(Page<EventTypeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Events)
+      );
+
+      var response = client.Request(request);
+      return Page<EventTypeResource>.FromJson("types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<EventTypeResource> PreviousPage(Page<EventTypeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Events)
+      );
+
+      var response = client.Request(request);
+      return Page<EventTypeResource>.FromJson("types", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchEventTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Events,
+          "/v1/Types/" + options.PathType + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Event Type.
+    /// </summary>
+    /// <param name="options"> Fetch EventType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EventType </returns>
+    public static EventTypeResource Fetch(FetchEventTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Event Type.
+    /// </summary>
+    /// <param name="options"> Fetch EventType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EventType </returns>
+    public static async System.Threading.Tasks.Task<EventTypeResource> FetchAsync(FetchEventTypeOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Event Type.
+    /// </summary>
+    /// <param name="pathType"> A string that uniquely identifies this Event Type. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EventType </returns>
+    public static EventTypeResource Fetch(string pathType, ITwilioRestClient client = null)
+    {
+      var options = new FetchEventTypeOptions(pathType);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Event Type.
+    /// </summary>
+    /// <param name="pathType"> A string that uniquely identifies this Event Type. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EventType </returns>
+    public static async System.Threading.Tasks.Task<EventTypeResource> FetchAsync(string pathType,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchEventTypeOptions(pathType);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a EventTypeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EventTypeResource object represented by the provided JSON </returns>
+    public static EventTypeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EventTypeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The Event Type identifier.
+    /// </summary>
+    [JsonProperty("type")]
+    public string Type { get; private set; }
+    /// <summary>
+    /// The Schema identifier for this Event Type.
+    /// </summary>
+    [JsonProperty("schema_id")]
+    public string SchemaId { get; private set; }
+    /// <summary>
+    /// The date this Event Type was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this Event Type was updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Event Type description.
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private EventTypeResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/Schema/SchemaVersionOptions.cs b/src/Twilio/Rest/Events/V1/Schema/SchemaVersionOptions.cs
index 5f37ab8ce..9a87eb84f 100644
--- a/src/Twilio/Rest/Events/V1/Schema/SchemaVersionOptions.cs
+++ b/src/Twilio/Rest/Events/V1/Schema/SchemaVersionOptions.cs
@@ -9,79 +9,79 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Events.V1.Schema
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a paginated list of versions of the schema.
+  /// </summary>
+  public class ReadSchemaVersionOptions : ReadOptions<SchemaVersionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a paginated list of versions of the schema.
+    /// The unique identifier of the schema.
     /// </summary>
-    public class ReadSchemaVersionOptions : ReadOptions<SchemaVersionResource>
-    {
-        /// <summary>
-        /// The unique identifier of the schema.
-        /// </summary>
-        public string PathId { get; }
-
-        /// <summary>
-        /// Construct a new ReadSchemaVersionOptions
-        /// </summary>
-        /// <param name="pathId"> The unique identifier of the schema. </param>
-        public ReadSchemaVersionOptions(string pathId)
-        {
-            PathId = pathId;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathId { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific schema and version.
+    /// Construct a new ReadSchemaVersionOptions
     /// </summary>
-    public class FetchSchemaVersionOptions : IOptions<SchemaVersionResource>
-    {
-        /// <summary>
-        /// The unique identifier of the schema.
-        /// </summary>
-        public string PathId { get; }
-        /// <summary>
-        /// The version of the schema
-        /// </summary>
-        public int? PathSchemaVersion { get; }
-
-        /// <summary>
-        /// Construct a new FetchSchemaVersionOptions
-        /// </summary>
-        /// <param name="pathId"> The unique identifier of the schema. </param>
-        /// <param name="pathSchemaVersion"> The version of the schema </param>
-        public FetchSchemaVersionOptions(string pathId, int? pathSchemaVersion)
-        {
-            PathId = pathId;
-            PathSchemaVersion = pathSchemaVersion;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// <param name="pathId"> The unique identifier of the schema. </param>
+    public ReadSchemaVersionOptions(string pathId)
+    {
+      PathId = pathId;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific schema and version.
+  /// </summary>
+  public class FetchSchemaVersionOptions : IOptions<SchemaVersionResource>
+  {
+    /// <summary>
+    /// The unique identifier of the schema.
+    /// </summary>
+    public string PathId { get; }
+    /// <summary>
+    /// The version of the schema
+    /// </summary>
+    public int? PathSchemaVersion { get; }
+
+    /// <summary>
+    /// Construct a new FetchSchemaVersionOptions
+    /// </summary>
+    /// <param name="pathId"> The unique identifier of the schema. </param>
+    /// <param name="pathSchemaVersion"> The version of the schema </param>
+    public FetchSchemaVersionOptions(string pathId, int? pathSchemaVersion)
+    {
+      PathId = pathId;
+      PathSchemaVersion = pathSchemaVersion;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/Schema/SchemaVersionResource.cs b/src/Twilio/Rest/Events/V1/Schema/SchemaVersionResource.cs
index 9bc5aec3b..fa5c8ef13 100644
--- a/src/Twilio/Rest/Events/V1/Schema/SchemaVersionResource.cs
+++ b/src/Twilio/Rest/Events/V1/Schema/SchemaVersionResource.cs
@@ -18,262 +18,262 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Events.V1.Schema
-{
-
-    public class SchemaVersionResource : Resource
-    {
-        private static Request BuildReadRequest(ReadSchemaVersionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Events,
-                "/v1/Schemas/" + options.PathId + "/Versions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a paginated list of versions of the schema.
-        /// </summary>
-        /// <param name="options"> Read SchemaVersion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SchemaVersion </returns>
-        public static ResourceSet<SchemaVersionResource> Read(ReadSchemaVersionOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SchemaVersionResource>.FromJson("schema_versions", response.Content);
-            return new ResourceSet<SchemaVersionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a paginated list of versions of the schema.
-        /// </summary>
-        /// <param name="options"> Read SchemaVersion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SchemaVersion </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SchemaVersionResource>> ReadAsync(ReadSchemaVersionOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SchemaVersionResource>.FromJson("schema_versions", response.Content);
-            return new ResourceSet<SchemaVersionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a paginated list of versions of the schema.
-        /// </summary>
-        /// <param name="pathId"> The unique identifier of the schema. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SchemaVersion </returns>
-        public static ResourceSet<SchemaVersionResource> Read(string pathId,
-                                                              int? pageSize = null,
-                                                              long? limit = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadSchemaVersionOptions(pathId){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a paginated list of versions of the schema.
-        /// </summary>
-        /// <param name="pathId"> The unique identifier of the schema. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SchemaVersion </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SchemaVersionResource>> ReadAsync(string pathId,
-                                                                                                      int? pageSize = null,
-                                                                                                      long? limit = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadSchemaVersionOptions(pathId){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SchemaVersionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SchemaVersionResource>.FromJson("schema_versions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SchemaVersionResource> NextPage(Page<SchemaVersionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Events)
-            );
-
-            var response = client.Request(request);
-            return Page<SchemaVersionResource>.FromJson("schema_versions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SchemaVersionResource> PreviousPage(Page<SchemaVersionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Events)
-            );
-
-            var response = client.Request(request);
-            return Page<SchemaVersionResource>.FromJson("schema_versions", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchSchemaVersionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Events,
-                "/v1/Schemas/" + options.PathId + "/Versions/" + options.PathSchemaVersion + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific schema and version.
-        /// </summary>
-        /// <param name="options"> Fetch SchemaVersion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SchemaVersion </returns>
-        public static SchemaVersionResource Fetch(FetchSchemaVersionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific schema and version.
-        /// </summary>
-        /// <param name="options"> Fetch SchemaVersion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SchemaVersion </returns>
-        public static async System.Threading.Tasks.Task<SchemaVersionResource> FetchAsync(FetchSchemaVersionOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific schema and version.
-        /// </summary>
-        /// <param name="pathId"> The unique identifier of the schema. </param>
-        /// <param name="pathSchemaVersion"> The version of the schema </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SchemaVersion </returns>
-        public static SchemaVersionResource Fetch(string pathId, int? pathSchemaVersion, ITwilioRestClient client = null)
-        {
-            var options = new FetchSchemaVersionOptions(pathId, pathSchemaVersion);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific schema and version.
-        /// </summary>
-        /// <param name="pathId"> The unique identifier of the schema. </param>
-        /// <param name="pathSchemaVersion"> The version of the schema </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SchemaVersion </returns>
-        public static async System.Threading.Tasks.Task<SchemaVersionResource> FetchAsync(string pathId,
-                                                                                          int? pathSchemaVersion,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchSchemaVersionOptions(pathId, pathSchemaVersion);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SchemaVersionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SchemaVersionResource object represented by the provided JSON </returns>
-        public static SchemaVersionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SchemaVersionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique identifier of the schema.
-        /// </summary>
-        [JsonProperty("id")]
-        public string Id { get; private set; }
-        /// <summary>
-        /// The version of this schema.
-        /// </summary>
-        [JsonProperty("schema_version")]
-        public int? SchemaVersion { get; private set; }
-        /// <summary>
-        /// The date the schema version was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The raw
-        /// </summary>
-        [JsonProperty("raw")]
-        public Uri Raw { get; private set; }
-
-        private SchemaVersionResource()
-        {
-
-        }
-    }
+{
+
+  public class SchemaVersionResource : Resource
+  {
+    private static Request BuildReadRequest(ReadSchemaVersionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Events,
+          "/v1/Schemas/" + options.PathId + "/Versions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a paginated list of versions of the schema.
+    /// </summary>
+    /// <param name="options"> Read SchemaVersion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SchemaVersion </returns>
+    public static ResourceSet<SchemaVersionResource> Read(ReadSchemaVersionOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SchemaVersionResource>.FromJson("schema_versions", response.Content);
+      return new ResourceSet<SchemaVersionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a paginated list of versions of the schema.
+    /// </summary>
+    /// <param name="options"> Read SchemaVersion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SchemaVersion </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SchemaVersionResource>> ReadAsync(ReadSchemaVersionOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SchemaVersionResource>.FromJson("schema_versions", response.Content);
+      return new ResourceSet<SchemaVersionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a paginated list of versions of the schema.
+    /// </summary>
+    /// <param name="pathId"> The unique identifier of the schema. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SchemaVersion </returns>
+    public static ResourceSet<SchemaVersionResource> Read(string pathId,
+                                                          int? pageSize = null,
+                                                          long? limit = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadSchemaVersionOptions(pathId) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a paginated list of versions of the schema.
+    /// </summary>
+    /// <param name="pathId"> The unique identifier of the schema. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SchemaVersion </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SchemaVersionResource>> ReadAsync(string pathId,
+                                                                                                  int? pageSize = null,
+                                                                                                  long? limit = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadSchemaVersionOptions(pathId) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SchemaVersionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SchemaVersionResource>.FromJson("schema_versions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SchemaVersionResource> NextPage(Page<SchemaVersionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Events)
+      );
+
+      var response = client.Request(request);
+      return Page<SchemaVersionResource>.FromJson("schema_versions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SchemaVersionResource> PreviousPage(Page<SchemaVersionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Events)
+      );
+
+      var response = client.Request(request);
+      return Page<SchemaVersionResource>.FromJson("schema_versions", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchSchemaVersionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Events,
+          "/v1/Schemas/" + options.PathId + "/Versions/" + options.PathSchemaVersion + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific schema and version.
+    /// </summary>
+    /// <param name="options"> Fetch SchemaVersion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SchemaVersion </returns>
+    public static SchemaVersionResource Fetch(FetchSchemaVersionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific schema and version.
+    /// </summary>
+    /// <param name="options"> Fetch SchemaVersion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SchemaVersion </returns>
+    public static async System.Threading.Tasks.Task<SchemaVersionResource> FetchAsync(FetchSchemaVersionOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific schema and version.
+    /// </summary>
+    /// <param name="pathId"> The unique identifier of the schema. </param>
+    /// <param name="pathSchemaVersion"> The version of the schema </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SchemaVersion </returns>
+    public static SchemaVersionResource Fetch(string pathId, int? pathSchemaVersion, ITwilioRestClient client = null)
+    {
+      var options = new FetchSchemaVersionOptions(pathId, pathSchemaVersion);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific schema and version.
+    /// </summary>
+    /// <param name="pathId"> The unique identifier of the schema. </param>
+    /// <param name="pathSchemaVersion"> The version of the schema </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SchemaVersion </returns>
+    public static async System.Threading.Tasks.Task<SchemaVersionResource> FetchAsync(string pathId,
+                                                                                      int? pathSchemaVersion,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchSchemaVersionOptions(pathId, pathSchemaVersion);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SchemaVersionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SchemaVersionResource object represented by the provided JSON </returns>
+    public static SchemaVersionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SchemaVersionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique identifier of the schema.
+    /// </summary>
+    [JsonProperty("id")]
+    public string Id { get; private set; }
+    /// <summary>
+    /// The version of this schema.
+    /// </summary>
+    [JsonProperty("schema_version")]
+    public int? SchemaVersion { get; private set; }
+    /// <summary>
+    /// The date the schema version was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The raw
+    /// </summary>
+    [JsonProperty("raw")]
+    public Uri Raw { get; private set; }
+
+    private SchemaVersionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/SchemaOptions.cs b/src/Twilio/Rest/Events/V1/SchemaOptions.cs
index 64df2af7b..f5ef47254 100644
--- a/src/Twilio/Rest/Events/V1/SchemaOptions.cs
+++ b/src/Twilio/Rest/Events/V1/SchemaOptions.cs
@@ -9,37 +9,37 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Events.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific schema with its nested versions.
+  /// </summary>
+  public class FetchSchemaOptions : IOptions<SchemaResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific schema with its nested versions.
+    /// The unique identifier of the schema.
     /// </summary>
-    public class FetchSchemaOptions : IOptions<SchemaResource>
-    {
-        /// <summary>
-        /// The unique identifier of the schema.
-        /// </summary>
-        public string PathId { get; }
-
-        /// <summary>
-        /// Construct a new FetchSchemaOptions
-        /// </summary>
-        /// <param name="pathId"> The unique identifier of the schema. </param>
-        public FetchSchemaOptions(string pathId)
-        {
-            PathId = pathId;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathId { get; }
+
+    /// <summary>
+    /// Construct a new FetchSchemaOptions
+    /// </summary>
+    /// <param name="pathId"> The unique identifier of the schema. </param>
+    public FetchSchemaOptions(string pathId)
+    {
+      PathId = pathId;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/SchemaResource.cs b/src/Twilio/Rest/Events/V1/SchemaResource.cs
index 808d8d57e..7b707ffed 100644
--- a/src/Twilio/Rest/Events/V1/SchemaResource.cs
+++ b/src/Twilio/Rest/Events/V1/SchemaResource.cs
@@ -18,125 +18,125 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Events.V1
-{
-
-    public class SchemaResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSchemaOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Events,
-                "/v1/Schemas/" + options.PathId + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific schema with its nested versions.
-        /// </summary>
-        /// <param name="options"> Fetch Schema parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Schema </returns>
-        public static SchemaResource Fetch(FetchSchemaOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific schema with its nested versions.
-        /// </summary>
-        /// <param name="options"> Fetch Schema parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Schema </returns>
-        public static async System.Threading.Tasks.Task<SchemaResource> FetchAsync(FetchSchemaOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific schema with its nested versions.
-        /// </summary>
-        /// <param name="pathId"> The unique identifier of the schema. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Schema </returns>
-        public static SchemaResource Fetch(string pathId, ITwilioRestClient client = null)
-        {
-            var options = new FetchSchemaOptions(pathId);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific schema with its nested versions.
-        /// </summary>
-        /// <param name="pathId"> The unique identifier of the schema. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Schema </returns>
-        public static async System.Threading.Tasks.Task<SchemaResource> FetchAsync(string pathId,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchSchemaOptions(pathId);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SchemaResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SchemaResource object represented by the provided JSON </returns>
-        public static SchemaResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SchemaResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Schema Identifier.
-        /// </summary>
-        [JsonProperty("id")]
-        public string Id { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Nested resource URLs.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The date that the latest schema version was created.
-        /// </summary>
-        [JsonProperty("latest_version_date_created")]
-        public DateTime? LatestVersionDateCreated { get; private set; }
-        /// <summary>
-        /// Latest schema version.
-        /// </summary>
-        [JsonProperty("latest_version")]
-        public int? LatestVersion { get; private set; }
-
-        private SchemaResource()
-        {
-
-        }
-    }
+{
+
+  public class SchemaResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSchemaOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Events,
+          "/v1/Schemas/" + options.PathId + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific schema with its nested versions.
+    /// </summary>
+    /// <param name="options"> Fetch Schema parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Schema </returns>
+    public static SchemaResource Fetch(FetchSchemaOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific schema with its nested versions.
+    /// </summary>
+    /// <param name="options"> Fetch Schema parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Schema </returns>
+    public static async System.Threading.Tasks.Task<SchemaResource> FetchAsync(FetchSchemaOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific schema with its nested versions.
+    /// </summary>
+    /// <param name="pathId"> The unique identifier of the schema. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Schema </returns>
+    public static SchemaResource Fetch(string pathId, ITwilioRestClient client = null)
+    {
+      var options = new FetchSchemaOptions(pathId);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific schema with its nested versions.
+    /// </summary>
+    /// <param name="pathId"> The unique identifier of the schema. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Schema </returns>
+    public static async System.Threading.Tasks.Task<SchemaResource> FetchAsync(string pathId,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchSchemaOptions(pathId);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SchemaResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SchemaResource object represented by the provided JSON </returns>
+    public static SchemaResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SchemaResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Schema Identifier.
+    /// </summary>
+    [JsonProperty("id")]
+    public string Id { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Nested resource URLs.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The date that the latest schema version was created.
+    /// </summary>
+    [JsonProperty("latest_version_date_created")]
+    public DateTime? LatestVersionDateCreated { get; private set; }
+    /// <summary>
+    /// Latest schema version.
+    /// </summary>
+    [JsonProperty("latest_version")]
+    public int? LatestVersion { get; private set; }
+
+    private SchemaResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/Sink/SinkTestOptions.cs b/src/Twilio/Rest/Events/V1/Sink/SinkTestOptions.cs
index 51292c99a..b2637b1ac 100644
--- a/src/Twilio/Rest/Events/V1/Sink/SinkTestOptions.cs
+++ b/src/Twilio/Rest/Events/V1/Sink/SinkTestOptions.cs
@@ -9,37 +9,37 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Events.V1.Sink
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Sink Test Event for the given Sink.
+  /// </summary>
+  public class CreateSinkTestOptions : IOptions<SinkTestResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Sink Test Event for the given Sink.
+    /// A string that uniquely identifies the Sink to be Tested.
     /// </summary>
-    public class CreateSinkTestOptions : IOptions<SinkTestResource>
-    {
-        /// <summary>
-        /// A string that uniquely identifies the Sink to be Tested.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateSinkTestOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Sink to be Tested. </param>
-        public CreateSinkTestOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new CreateSinkTestOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies the Sink to be Tested. </param>
+    public CreateSinkTestOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/Sink/SinkTestResource.cs b/src/Twilio/Rest/Events/V1/Sink/SinkTestResource.cs
index 212b888a0..085a6917a 100644
--- a/src/Twilio/Rest/Events/V1/Sink/SinkTestResource.cs
+++ b/src/Twilio/Rest/Events/V1/Sink/SinkTestResource.cs
@@ -18,105 +18,105 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Events.V1.Sink
-{
-
-    public class SinkTestResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateSinkTestOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Events,
-                "/v1/Sinks/" + options.PathSid + "/Test",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Sink Test Event for the given Sink.
-        /// </summary>
-        /// <param name="options"> Create SinkTest parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SinkTest </returns>
-        public static SinkTestResource Create(CreateSinkTestOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Sink Test Event for the given Sink.
-        /// </summary>
-        /// <param name="options"> Create SinkTest parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SinkTest </returns>
-        public static async System.Threading.Tasks.Task<SinkTestResource> CreateAsync(CreateSinkTestOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Sink Test Event for the given Sink.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Sink to be Tested. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SinkTest </returns>
-        public static SinkTestResource Create(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new CreateSinkTestOptions(pathSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Sink Test Event for the given Sink.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Sink to be Tested. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SinkTest </returns>
-        public static async System.Threading.Tasks.Task<SinkTestResource> CreateAsync(string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateSinkTestOptions(pathSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SinkTestResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SinkTestResource object represented by the provided JSON </returns>
-        public static SinkTestResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SinkTestResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Feedback indicating whether the test event was generated.
-        /// </summary>
-        [JsonProperty("result")]
-        public string Result { get; private set; }
-
-        private SinkTestResource()
-        {
-
-        }
-    }
+{
+
+  public class SinkTestResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateSinkTestOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Events,
+          "/v1/Sinks/" + options.PathSid + "/Test",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Sink Test Event for the given Sink.
+    /// </summary>
+    /// <param name="options"> Create SinkTest parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SinkTest </returns>
+    public static SinkTestResource Create(CreateSinkTestOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Sink Test Event for the given Sink.
+    /// </summary>
+    /// <param name="options"> Create SinkTest parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SinkTest </returns>
+    public static async System.Threading.Tasks.Task<SinkTestResource> CreateAsync(CreateSinkTestOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Sink Test Event for the given Sink.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies the Sink to be Tested. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SinkTest </returns>
+    public static SinkTestResource Create(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new CreateSinkTestOptions(pathSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Sink Test Event for the given Sink.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies the Sink to be Tested. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SinkTest </returns>
+    public static async System.Threading.Tasks.Task<SinkTestResource> CreateAsync(string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateSinkTestOptions(pathSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SinkTestResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SinkTestResource object represented by the provided JSON </returns>
+    public static SinkTestResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SinkTestResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Feedback indicating whether the test event was generated.
+    /// </summary>
+    [JsonProperty("result")]
+    public string Result { get; private set; }
+
+    private SinkTestResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/Sink/SinkValidateOptions.cs b/src/Twilio/Rest/Events/V1/Sink/SinkValidateOptions.cs
index 19afe9e85..860bac7d5 100644
--- a/src/Twilio/Rest/Events/V1/Sink/SinkValidateOptions.cs
+++ b/src/Twilio/Rest/Events/V1/Sink/SinkValidateOptions.cs
@@ -9,48 +9,48 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Events.V1.Sink
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Validate that a test event for a Sink was received.
+  /// </summary>
+  public class CreateSinkValidateOptions : IOptions<SinkValidateResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Validate that a test event for a Sink was received.
+    /// A string that uniquely identifies the Sink being validated.
     /// </summary>
-    public class CreateSinkValidateOptions : IOptions<SinkValidateResource>
-    {
-        /// <summary>
-        /// A string that uniquely identifies the Sink being validated.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies the test event for a Sink being validated.
-        /// </summary>
-        public string TestId { get; }
-
-        /// <summary>
-        /// Construct a new CreateSinkValidateOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Sink being validated. </param>
-        /// <param name="testId"> A string that uniquely identifies the test event for a Sink being validated. </param>
-        public CreateSinkValidateOptions(string pathSid, string testId)
-        {
-            PathSid = pathSid;
-            TestId = testId;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (TestId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TestId", TestId));
-            }
-
-            return p;
-        }
-    }
+    public string PathSid { get; }
+    /// <summary>
+    /// A string that uniquely identifies the test event for a Sink being validated.
+    /// </summary>
+    public string TestId { get; }
+
+    /// <summary>
+    /// Construct a new CreateSinkValidateOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies the Sink being validated. </param>
+    /// <param name="testId"> A string that uniquely identifies the test event for a Sink being validated. </param>
+    public CreateSinkValidateOptions(string pathSid, string testId)
+    {
+      PathSid = pathSid;
+      TestId = testId;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (TestId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TestId", TestId));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/Sink/SinkValidateResource.cs b/src/Twilio/Rest/Events/V1/Sink/SinkValidateResource.cs
index f16e914d7..3c559c5c6 100644
--- a/src/Twilio/Rest/Events/V1/Sink/SinkValidateResource.cs
+++ b/src/Twilio/Rest/Events/V1/Sink/SinkValidateResource.cs
@@ -18,108 +18,108 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Events.V1.Sink
-{
-
-    public class SinkValidateResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateSinkValidateOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Events,
-                "/v1/Sinks/" + options.PathSid + "/Validate",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Validate that a test event for a Sink was received.
-        /// </summary>
-        /// <param name="options"> Create SinkValidate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SinkValidate </returns>
-        public static SinkValidateResource Create(CreateSinkValidateOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Validate that a test event for a Sink was received.
-        /// </summary>
-        /// <param name="options"> Create SinkValidate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SinkValidate </returns>
-        public static async System.Threading.Tasks.Task<SinkValidateResource> CreateAsync(CreateSinkValidateOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Validate that a test event for a Sink was received.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Sink being validated. </param>
-        /// <param name="testId"> A string that uniquely identifies the test event for a Sink being validated. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SinkValidate </returns>
-        public static SinkValidateResource Create(string pathSid, string testId, ITwilioRestClient client = null)
-        {
-            var options = new CreateSinkValidateOptions(pathSid, testId);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Validate that a test event for a Sink was received.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Sink being validated. </param>
-        /// <param name="testId"> A string that uniquely identifies the test event for a Sink being validated. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SinkValidate </returns>
-        public static async System.Threading.Tasks.Task<SinkValidateResource> CreateAsync(string pathSid,
-                                                                                          string testId,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateSinkValidateOptions(pathSid, testId);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SinkValidateResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SinkValidateResource object represented by the provided JSON </returns>
-        public static SinkValidateResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SinkValidateResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Feedback indicating whether the given Sink was validated.
-        /// </summary>
-        [JsonProperty("result")]
-        public string Result { get; private set; }
-
-        private SinkValidateResource()
-        {
-
-        }
-    }
+{
+
+  public class SinkValidateResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateSinkValidateOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Events,
+          "/v1/Sinks/" + options.PathSid + "/Validate",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Validate that a test event for a Sink was received.
+    /// </summary>
+    /// <param name="options"> Create SinkValidate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SinkValidate </returns>
+    public static SinkValidateResource Create(CreateSinkValidateOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Validate that a test event for a Sink was received.
+    /// </summary>
+    /// <param name="options"> Create SinkValidate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SinkValidate </returns>
+    public static async System.Threading.Tasks.Task<SinkValidateResource> CreateAsync(CreateSinkValidateOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Validate that a test event for a Sink was received.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies the Sink being validated. </param>
+    /// <param name="testId"> A string that uniquely identifies the test event for a Sink being validated. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SinkValidate </returns>
+    public static SinkValidateResource Create(string pathSid, string testId, ITwilioRestClient client = null)
+    {
+      var options = new CreateSinkValidateOptions(pathSid, testId);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Validate that a test event for a Sink was received.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies the Sink being validated. </param>
+    /// <param name="testId"> A string that uniquely identifies the test event for a Sink being validated. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SinkValidate </returns>
+    public static async System.Threading.Tasks.Task<SinkValidateResource> CreateAsync(string pathSid,
+                                                                                      string testId,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateSinkValidateOptions(pathSid, testId);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SinkValidateResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SinkValidateResource object represented by the provided JSON </returns>
+    public static SinkValidateResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SinkValidateResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Feedback indicating whether the given Sink was validated.
+    /// </summary>
+    [JsonProperty("result")]
+    public string Result { get; private set; }
+
+    private SinkValidateResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/SinkOptions.cs b/src/Twilio/Rest/Events/V1/SinkOptions.cs
index d82225da1..48d2d59bb 100644
--- a/src/Twilio/Rest/Events/V1/SinkOptions.cs
+++ b/src/Twilio/Rest/Events/V1/SinkOptions.cs
@@ -9,209 +9,209 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Events.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific Sink.
+  /// </summary>
+  public class FetchSinkOptions : IOptions<SinkResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific Sink.
+    /// A string that uniquely identifies this Sink.
     /// </summary>
-    public class FetchSinkOptions : IOptions<SinkResource>
-    {
-        /// <summary>
-        /// A string that uniquely identifies this Sink.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSinkOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
-        public FetchSinkOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Sink
-    /// </summary>
-    public class CreateSinkOptions : IOptions<SinkResource>
-    {
-        /// <summary>
-        /// Sink Description.
-        /// </summary>
-        public string Description { get; }
-        /// <summary>
-        /// JSON Sink configuration.
-        /// </summary>
-        public object SinkConfiguration { get; }
-        /// <summary>
-        /// Sink type.
-        /// </summary>
-        public SinkResource.SinkTypeEnum SinkType { get; }
-
-        /// <summary>
-        /// Construct a new CreateSinkOptions
-        /// </summary>
-        /// <param name="description"> Sink Description. </param>
-        /// <param name="sinkConfiguration"> JSON Sink configuration. </param>
-        /// <param name="sinkType"> Sink type. </param>
-        public CreateSinkOptions(string description, object sinkConfiguration, SinkResource.SinkTypeEnum sinkType)
-        {
-            Description = description;
-            SinkConfiguration = sinkConfiguration;
-            SinkType = sinkType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Description != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Description", Description));
-            }
-
-            if (SinkConfiguration != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SinkConfiguration", Serializers.JsonObject(SinkConfiguration)));
-            }
-
-            if (SinkType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SinkType", SinkType.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchSinkOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
+    public FetchSinkOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific Sink.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteSinkOptions : IOptions<SinkResource>
-    {
-        /// <summary>
-        /// A string that uniquely identifies this Sink.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSinkOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
-        public DeleteSinkOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Sink
+  /// </summary>
+  public class CreateSinkOptions : IOptions<SinkResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a paginated list of Sinks belonging to the account used to make the request.
-    /// </summary>
-    public class ReadSinkOptions : ReadOptions<SinkResource>
-    {
-        /// <summary>
-        /// A boolean to return sinks used/not used by a subscription.
-        /// </summary>
-        public bool? InUse { get; set; }
-        /// <summary>
-        /// A string to filter sinks by status.
-        /// </summary>
-        public string Status { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (InUse != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InUse", InUse.Value.ToString().ToLower()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Sink Description.
+    /// </summary>
+    public string Description { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update a specific Sink
-    /// </summary>
-    public class UpdateSinkOptions : IOptions<SinkResource>
-    {
-        /// <summary>
-        /// A string that uniquely identifies this Sink.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// Sink Description
-        /// </summary>
-        public string Description { get; }
-
-        /// <summary>
-        /// Construct a new UpdateSinkOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
-        /// <param name="description"> Sink Description </param>
-        public UpdateSinkOptions(string pathSid, string description)
-        {
-            PathSid = pathSid;
-            Description = description;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Description != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Description", Description));
-            }
-
-            return p;
-        }
-    }
+    /// JSON Sink configuration.
+    /// </summary>
+    public object SinkConfiguration { get; }
+    /// <summary>
+    /// Sink type.
+    /// </summary>
+    public SinkResource.SinkTypeEnum SinkType { get; }
+
+    /// <summary>
+    /// Construct a new CreateSinkOptions
+    /// </summary>
+    /// <param name="description"> Sink Description. </param>
+    /// <param name="sinkConfiguration"> JSON Sink configuration. </param>
+    /// <param name="sinkType"> Sink type. </param>
+    public CreateSinkOptions(string description, object sinkConfiguration, SinkResource.SinkTypeEnum sinkType)
+    {
+      Description = description;
+      SinkConfiguration = sinkConfiguration;
+      SinkType = sinkType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Description != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Description", Description));
+      }
+
+      if (SinkConfiguration != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SinkConfiguration", Serializers.JsonObject(SinkConfiguration)));
+      }
+
+      if (SinkType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SinkType", SinkType.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific Sink.
+  /// </summary>
+  public class DeleteSinkOptions : IOptions<SinkResource>
+  {
+    /// <summary>
+    /// A string that uniquely identifies this Sink.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSinkOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
+    public DeleteSinkOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a paginated list of Sinks belonging to the account used to make the request.
+  /// </summary>
+  public class ReadSinkOptions : ReadOptions<SinkResource>
+  {
+    /// <summary>
+    /// A boolean to return sinks used/not used by a subscription.
+    /// </summary>
+    public bool? InUse { get; set; }
+    /// <summary>
+    /// A string to filter sinks by status.
+    /// </summary>
+    public string Status { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (InUse != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InUse", InUse.Value.ToString().ToLower()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update a specific Sink
+  /// </summary>
+  public class UpdateSinkOptions : IOptions<SinkResource>
+  {
+    /// <summary>
+    /// A string that uniquely identifies this Sink.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// Sink Description
+    /// </summary>
+    public string Description { get; }
+
+    /// <summary>
+    /// Construct a new UpdateSinkOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
+    /// <param name="description"> Sink Description </param>
+    public UpdateSinkOptions(string pathSid, string description)
+    {
+      PathSid = pathSid;
+      Description = description;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Description != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Description", Description));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/SinkResource.cs b/src/Twilio/Rest/Events/V1/SinkResource.cs
index a6cfdbf1c..fabb1e490 100644
--- a/src/Twilio/Rest/Events/V1/SinkResource.cs
+++ b/src/Twilio/Rest/Events/V1/SinkResource.cs
@@ -19,525 +19,525 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Events.V1
-{
-
-    public class SinkResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Initialized = new StatusEnum("initialized");
-            public static readonly StatusEnum Validating = new StatusEnum("validating");
-            public static readonly StatusEnum Active = new StatusEnum("active");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        public sealed class SinkTypeEnum : StringEnum
-        {
-            private SinkTypeEnum(string value) : base(value) {}
-            public SinkTypeEnum() {}
-            public static implicit operator SinkTypeEnum(string value)
-            {
-                return new SinkTypeEnum(value);
-            }
-
-            public static readonly SinkTypeEnum Kinesis = new SinkTypeEnum("kinesis");
-            public static readonly SinkTypeEnum Webhook = new SinkTypeEnum("webhook");
-            public static readonly SinkTypeEnum Segment = new SinkTypeEnum("segment");
-        }
-
-        private static Request BuildFetchRequest(FetchSinkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Events,
-                "/v1/Sinks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Sink.
-        /// </summary>
-        /// <param name="options"> Fetch Sink parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sink </returns>
-        public static SinkResource Fetch(FetchSinkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sink.
-        /// </summary>
-        /// <param name="options"> Fetch Sink parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sink </returns>
-        public static async System.Threading.Tasks.Task<SinkResource> FetchAsync(FetchSinkOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Sink.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sink </returns>
-        public static SinkResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSinkOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sink.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sink </returns>
-        public static async System.Threading.Tasks.Task<SinkResource> FetchAsync(string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchSinkOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateSinkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Events,
-                "/v1/Sinks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Sink
-        /// </summary>
-        /// <param name="options"> Create Sink parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sink </returns>
-        public static SinkResource Create(CreateSinkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Sink
-        /// </summary>
-        /// <param name="options"> Create Sink parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sink </returns>
-        public static async System.Threading.Tasks.Task<SinkResource> CreateAsync(CreateSinkOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Sink
-        /// </summary>
-        /// <param name="description"> Sink Description. </param>
-        /// <param name="sinkConfiguration"> JSON Sink configuration. </param>
-        /// <param name="sinkType"> Sink type. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sink </returns>
-        public static SinkResource Create(string description,
-                                          object sinkConfiguration,
-                                          SinkResource.SinkTypeEnum sinkType,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateSinkOptions(description, sinkConfiguration, sinkType);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Sink
-        /// </summary>
-        /// <param name="description"> Sink Description. </param>
-        /// <param name="sinkConfiguration"> JSON Sink configuration. </param>
-        /// <param name="sinkType"> Sink type. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sink </returns>
-        public static async System.Threading.Tasks.Task<SinkResource> CreateAsync(string description,
-                                                                                  object sinkConfiguration,
-                                                                                  SinkResource.SinkTypeEnum sinkType,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateSinkOptions(description, sinkConfiguration, sinkType);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSinkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Events,
-                "/v1/Sinks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Sink.
-        /// </summary>
-        /// <param name="options"> Delete Sink parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sink </returns>
-        public static bool Delete(DeleteSinkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sink.
-        /// </summary>
-        /// <param name="options"> Delete Sink parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sink </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSinkOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Sink.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sink </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSinkOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sink.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sink </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSinkOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSinkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Events,
-                "/v1/Sinks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a paginated list of Sinks belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="options"> Read Sink parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sink </returns>
-        public static ResourceSet<SinkResource> Read(ReadSinkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SinkResource>.FromJson("sinks", response.Content);
-            return new ResourceSet<SinkResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a paginated list of Sinks belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="options"> Read Sink parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sink </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SinkResource>> ReadAsync(ReadSinkOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SinkResource>.FromJson("sinks", response.Content);
-            return new ResourceSet<SinkResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a paginated list of Sinks belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="inUse"> A boolean to return sinks used/not used by a subscription. </param>
-        /// <param name="status"> A string to filter sinks by status. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sink </returns>
-        public static ResourceSet<SinkResource> Read(bool? inUse = null,
-                                                     string status = null,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadSinkOptions(){InUse = inUse, Status = status, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a paginated list of Sinks belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="inUse"> A boolean to return sinks used/not used by a subscription. </param>
-        /// <param name="status"> A string to filter sinks by status. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sink </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SinkResource>> ReadAsync(bool? inUse = null,
-                                                                                             string status = null,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadSinkOptions(){InUse = inUse, Status = status, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SinkResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SinkResource>.FromJson("sinks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SinkResource> NextPage(Page<SinkResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Events)
-            );
-
-            var response = client.Request(request);
-            return Page<SinkResource>.FromJson("sinks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SinkResource> PreviousPage(Page<SinkResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Events)
-            );
-
-            var response = client.Request(request);
-            return Page<SinkResource>.FromJson("sinks", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateSinkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Events,
-                "/v1/Sinks/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Sink
-        /// </summary>
-        /// <param name="options"> Update Sink parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sink </returns>
-        public static SinkResource Update(UpdateSinkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Sink
-        /// </summary>
-        /// <param name="options"> Update Sink parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sink </returns>
-        public static async System.Threading.Tasks.Task<SinkResource> UpdateAsync(UpdateSinkOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Sink
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
-        /// <param name="description"> Sink Description </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sink </returns>
-        public static SinkResource Update(string pathSid, string description, ITwilioRestClient client = null)
-        {
-            var options = new UpdateSinkOptions(pathSid, description);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Sink
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
-        /// <param name="description"> Sink Description </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sink </returns>
-        public static async System.Threading.Tasks.Task<SinkResource> UpdateAsync(string pathSid,
-                                                                                  string description,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateSinkOptions(pathSid, description);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SinkResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SinkResource object represented by the provided JSON </returns>
-        public static SinkResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SinkResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The date this Sink was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this Sink was updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Sink Description
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// A string that uniquely identifies this Sink.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// JSON Sink configuration.
-        /// </summary>
-        [JsonProperty("sink_configuration")]
-        public object SinkConfiguration { get; private set; }
-        /// <summary>
-        /// Sink type.
-        /// </summary>
-        [JsonProperty("sink_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SinkResource.SinkTypeEnum SinkType { get; private set; }
-        /// <summary>
-        /// The Status of this Sink
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SinkResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Nested resource URLs.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private SinkResource()
-        {
-
-        }
-    }
+{
+
+  public class SinkResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Initialized = new StatusEnum("initialized");
+      public static readonly StatusEnum Validating = new StatusEnum("validating");
+      public static readonly StatusEnum Active = new StatusEnum("active");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    public sealed class SinkTypeEnum : StringEnum
+    {
+      private SinkTypeEnum(string value) : base(value) { }
+      public SinkTypeEnum() { }
+      public static implicit operator SinkTypeEnum(string value)
+      {
+        return new SinkTypeEnum(value);
+      }
+
+      public static readonly SinkTypeEnum Kinesis = new SinkTypeEnum("kinesis");
+      public static readonly SinkTypeEnum Webhook = new SinkTypeEnum("webhook");
+      public static readonly SinkTypeEnum Segment = new SinkTypeEnum("segment");
+    }
+
+    private static Request BuildFetchRequest(FetchSinkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Events,
+          "/v1/Sinks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Sink.
+    /// </summary>
+    /// <param name="options"> Fetch Sink parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sink </returns>
+    public static SinkResource Fetch(FetchSinkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sink.
+    /// </summary>
+    /// <param name="options"> Fetch Sink parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sink </returns>
+    public static async System.Threading.Tasks.Task<SinkResource> FetchAsync(FetchSinkOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Sink.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sink </returns>
+    public static SinkResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSinkOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sink.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sink </returns>
+    public static async System.Threading.Tasks.Task<SinkResource> FetchAsync(string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchSinkOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateSinkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Events,
+          "/v1/Sinks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Sink
+    /// </summary>
+    /// <param name="options"> Create Sink parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sink </returns>
+    public static SinkResource Create(CreateSinkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Sink
+    /// </summary>
+    /// <param name="options"> Create Sink parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sink </returns>
+    public static async System.Threading.Tasks.Task<SinkResource> CreateAsync(CreateSinkOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Sink
+    /// </summary>
+    /// <param name="description"> Sink Description. </param>
+    /// <param name="sinkConfiguration"> JSON Sink configuration. </param>
+    /// <param name="sinkType"> Sink type. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sink </returns>
+    public static SinkResource Create(string description,
+                                      object sinkConfiguration,
+                                      SinkResource.SinkTypeEnum sinkType,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateSinkOptions(description, sinkConfiguration, sinkType);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Sink
+    /// </summary>
+    /// <param name="description"> Sink Description. </param>
+    /// <param name="sinkConfiguration"> JSON Sink configuration. </param>
+    /// <param name="sinkType"> Sink type. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sink </returns>
+    public static async System.Threading.Tasks.Task<SinkResource> CreateAsync(string description,
+                                                                              object sinkConfiguration,
+                                                                              SinkResource.SinkTypeEnum sinkType,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateSinkOptions(description, sinkConfiguration, sinkType);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSinkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Events,
+          "/v1/Sinks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Sink.
+    /// </summary>
+    /// <param name="options"> Delete Sink parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sink </returns>
+    public static bool Delete(DeleteSinkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sink.
+    /// </summary>
+    /// <param name="options"> Delete Sink parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sink </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSinkOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Sink.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sink </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSinkOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sink.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sink </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSinkOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSinkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Events,
+          "/v1/Sinks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a paginated list of Sinks belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="options"> Read Sink parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sink </returns>
+    public static ResourceSet<SinkResource> Read(ReadSinkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SinkResource>.FromJson("sinks", response.Content);
+      return new ResourceSet<SinkResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a paginated list of Sinks belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="options"> Read Sink parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sink </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SinkResource>> ReadAsync(ReadSinkOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SinkResource>.FromJson("sinks", response.Content);
+      return new ResourceSet<SinkResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a paginated list of Sinks belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="inUse"> A boolean to return sinks used/not used by a subscription. </param>
+    /// <param name="status"> A string to filter sinks by status. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sink </returns>
+    public static ResourceSet<SinkResource> Read(bool? inUse = null,
+                                                 string status = null,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadSinkOptions() { InUse = inUse, Status = status, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a paginated list of Sinks belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="inUse"> A boolean to return sinks used/not used by a subscription. </param>
+    /// <param name="status"> A string to filter sinks by status. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sink </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SinkResource>> ReadAsync(bool? inUse = null,
+                                                                                         string status = null,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadSinkOptions() { InUse = inUse, Status = status, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SinkResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SinkResource>.FromJson("sinks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SinkResource> NextPage(Page<SinkResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Events)
+      );
+
+      var response = client.Request(request);
+      return Page<SinkResource>.FromJson("sinks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SinkResource> PreviousPage(Page<SinkResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Events)
+      );
+
+      var response = client.Request(request);
+      return Page<SinkResource>.FromJson("sinks", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateSinkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Events,
+          "/v1/Sinks/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Sink
+    /// </summary>
+    /// <param name="options"> Update Sink parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sink </returns>
+    public static SinkResource Update(UpdateSinkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Sink
+    /// </summary>
+    /// <param name="options"> Update Sink parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sink </returns>
+    public static async System.Threading.Tasks.Task<SinkResource> UpdateAsync(UpdateSinkOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Sink
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
+    /// <param name="description"> Sink Description </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sink </returns>
+    public static SinkResource Update(string pathSid, string description, ITwilioRestClient client = null)
+    {
+      var options = new UpdateSinkOptions(pathSid, description);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Sink
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Sink. </param>
+    /// <param name="description"> Sink Description </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sink </returns>
+    public static async System.Threading.Tasks.Task<SinkResource> UpdateAsync(string pathSid,
+                                                                              string description,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateSinkOptions(pathSid, description);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SinkResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SinkResource object represented by the provided JSON </returns>
+    public static SinkResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SinkResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The date this Sink was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this Sink was updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Sink Description
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// A string that uniquely identifies this Sink.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// JSON Sink configuration.
+    /// </summary>
+    [JsonProperty("sink_configuration")]
+    public object SinkConfiguration { get; private set; }
+    /// <summary>
+    /// Sink type.
+    /// </summary>
+    [JsonProperty("sink_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public SinkResource.SinkTypeEnum SinkType { get; private set; }
+    /// <summary>
+    /// The Status of this Sink
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public SinkResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Nested resource URLs.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private SinkResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/Subscription/SubscribedEventOptions.cs b/src/Twilio/Rest/Events/V1/Subscription/SubscribedEventOptions.cs
index d463942a7..aba47e2a6 100644
--- a/src/Twilio/Rest/Events/V1/Subscription/SubscribedEventOptions.cs
+++ b/src/Twilio/Rest/Events/V1/Subscription/SubscribedEventOptions.cs
@@ -9,213 +9,213 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Events.V1.Subscription
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Subscribed Event types for a Subscription.
+  /// </summary>
+  public class ReadSubscribedEventOptions : ReadOptions<SubscribedEventResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Subscribed Event types for a Subscription.
+    /// Subscription SID.
     /// </summary>
-    public class ReadSubscribedEventOptions : ReadOptions<SubscribedEventResource>
-    {
-        /// <summary>
-        /// Subscription SID.
-        /// </summary>
-        public string PathSubscriptionSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadSubscribedEventOptions
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        public ReadSubscribedEventOptions(string pathSubscriptionSid)
-        {
-            PathSubscriptionSid = pathSubscriptionSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSubscriptionSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Subscribed Event type for the subscription
-    /// </summary>
-    public class CreateSubscribedEventOptions : IOptions<SubscribedEventResource>
-    {
-        /// <summary>
-        /// Subscription SID.
-        /// </summary>
-        public string PathSubscriptionSid { get; }
-        /// <summary>
-        /// Type of event being subscribed to.
-        /// </summary>
-        public string Type { get; }
-        /// <summary>
-        /// The schema version that the subscription should use.
-        /// </summary>
-        public int? SchemaVersion { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSubscribedEventOptions
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="type"> Type of event being subscribed to. </param>
-        public CreateSubscribedEventOptions(string pathSubscriptionSid, string type)
-        {
-            PathSubscriptionSid = pathSubscriptionSid;
-            Type = type;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type));
-            }
-
-            if (SchemaVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SchemaVersion", SchemaVersion.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new ReadSubscribedEventOptions
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    public ReadSubscribedEventOptions(string pathSubscriptionSid)
+    {
+      PathSubscriptionSid = pathSubscriptionSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Read an Event for a Subscription.
-    /// </summary>
-    public class FetchSubscribedEventOptions : IOptions<SubscribedEventResource>
-    {
-        /// <summary>
-        /// Subscription SID.
-        /// </summary>
-        public string PathSubscriptionSid { get; }
-        /// <summary>
-        /// Type of event being subscribed to.
-        /// </summary>
-        public string PathType { get; }
-
-        /// <summary>
-        /// Construct a new FetchSubscribedEventOptions
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="pathType"> Type of event being subscribed to. </param>
-        public FetchSubscribedEventOptions(string pathSubscriptionSid, string pathType)
-        {
-            PathSubscriptionSid = pathSubscriptionSid;
-            PathType = pathType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Subscribed Event type for the subscription
+  /// </summary>
+  public class CreateSubscribedEventOptions : IOptions<SubscribedEventResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update an Event for a Subscription.
-    /// </summary>
-    public class UpdateSubscribedEventOptions : IOptions<SubscribedEventResource>
-    {
-        /// <summary>
-        /// Subscription SID.
-        /// </summary>
-        public string PathSubscriptionSid { get; }
-        /// <summary>
-        /// Type of event being subscribed to.
-        /// </summary>
-        public string PathType { get; }
-        /// <summary>
-        /// The schema version that the subscription should use.
-        /// </summary>
-        public int? SchemaVersion { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSubscribedEventOptions
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="pathType"> Type of event being subscribed to. </param>
-        public UpdateSubscribedEventOptions(string pathSubscriptionSid, string pathType)
-        {
-            PathSubscriptionSid = pathSubscriptionSid;
-            PathType = pathType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (SchemaVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SchemaVersion", SchemaVersion.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Subscription SID.
+    /// </summary>
+    public string PathSubscriptionSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Remove an event type from a subscription.
-    /// </summary>
-    public class DeleteSubscribedEventOptions : IOptions<SubscribedEventResource>
-    {
-        /// <summary>
-        /// Subscription SID.
-        /// </summary>
-        public string PathSubscriptionSid { get; }
-        /// <summary>
-        /// Type of event being subscribed to.
-        /// </summary>
-        public string PathType { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSubscribedEventOptions
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="pathType"> Type of event being subscribed to. </param>
-        public DeleteSubscribedEventOptions(string pathSubscriptionSid, string pathType)
-        {
-            PathSubscriptionSid = pathSubscriptionSid;
-            PathType = pathType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Type of event being subscribed to.
+    /// </summary>
+    public string Type { get; }
+    /// <summary>
+    /// The schema version that the subscription should use.
+    /// </summary>
+    public int? SchemaVersion { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateSubscribedEventOptions
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="type"> Type of event being subscribed to. </param>
+    public CreateSubscribedEventOptions(string pathSubscriptionSid, string type)
+    {
+      PathSubscriptionSid = pathSubscriptionSid;
+      Type = type;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type));
+      }
+
+      if (SchemaVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SchemaVersion", SchemaVersion.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Read an Event for a Subscription.
+  /// </summary>
+  public class FetchSubscribedEventOptions : IOptions<SubscribedEventResource>
+  {
+    /// <summary>
+    /// Subscription SID.
+    /// </summary>
+    public string PathSubscriptionSid { get; }
+    /// <summary>
+    /// Type of event being subscribed to.
+    /// </summary>
+    public string PathType { get; }
+
+    /// <summary>
+    /// Construct a new FetchSubscribedEventOptions
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="pathType"> Type of event being subscribed to. </param>
+    public FetchSubscribedEventOptions(string pathSubscriptionSid, string pathType)
+    {
+      PathSubscriptionSid = pathSubscriptionSid;
+      PathType = pathType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update an Event for a Subscription.
+  /// </summary>
+  public class UpdateSubscribedEventOptions : IOptions<SubscribedEventResource>
+  {
+    /// <summary>
+    /// Subscription SID.
+    /// </summary>
+    public string PathSubscriptionSid { get; }
+    /// <summary>
+    /// Type of event being subscribed to.
+    /// </summary>
+    public string PathType { get; }
+    /// <summary>
+    /// The schema version that the subscription should use.
+    /// </summary>
+    public int? SchemaVersion { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSubscribedEventOptions
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="pathType"> Type of event being subscribed to. </param>
+    public UpdateSubscribedEventOptions(string pathSubscriptionSid, string pathType)
+    {
+      PathSubscriptionSid = pathSubscriptionSid;
+      PathType = pathType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (SchemaVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SchemaVersion", SchemaVersion.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Remove an event type from a subscription.
+  /// </summary>
+  public class DeleteSubscribedEventOptions : IOptions<SubscribedEventResource>
+  {
+    /// <summary>
+    /// Subscription SID.
+    /// </summary>
+    public string PathSubscriptionSid { get; }
+    /// <summary>
+    /// Type of event being subscribed to.
+    /// </summary>
+    public string PathType { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSubscribedEventOptions
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="pathType"> Type of event being subscribed to. </param>
+    public DeleteSubscribedEventOptions(string pathSubscriptionSid, string pathType)
+    {
+      PathSubscriptionSid = pathSubscriptionSid;
+      PathType = pathType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/Subscription/SubscribedEventResource.cs b/src/Twilio/Rest/Events/V1/Subscription/SubscribedEventResource.cs
index a3a05b10b..17fdd58ca 100644
--- a/src/Twilio/Rest/Events/V1/Subscription/SubscribedEventResource.cs
+++ b/src/Twilio/Rest/Events/V1/Subscription/SubscribedEventResource.cs
@@ -18,487 +18,487 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Events.V1.Subscription
-{
-
-    public class SubscribedEventResource : Resource
-    {
-        private static Request BuildReadRequest(ReadSubscribedEventOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Events,
-                "/v1/Subscriptions/" + options.PathSubscriptionSid + "/SubscribedEvents",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Subscribed Event types for a Subscription.
-        /// </summary>
-        /// <param name="options"> Read SubscribedEvent parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedEvent </returns>
-        public static ResourceSet<SubscribedEventResource> Read(ReadSubscribedEventOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SubscribedEventResource>.FromJson("types", response.Content);
-            return new ResourceSet<SubscribedEventResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Subscribed Event types for a Subscription.
-        /// </summary>
-        /// <param name="options"> Read SubscribedEvent parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SubscribedEventResource>> ReadAsync(ReadSubscribedEventOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SubscribedEventResource>.FromJson("types", response.Content);
-            return new ResourceSet<SubscribedEventResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Subscribed Event types for a Subscription.
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedEvent </returns>
-        public static ResourceSet<SubscribedEventResource> Read(string pathSubscriptionSid,
-                                                                int? pageSize = null,
-                                                                long? limit = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadSubscribedEventOptions(pathSubscriptionSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Subscribed Event types for a Subscription.
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SubscribedEventResource>> ReadAsync(string pathSubscriptionSid,
-                                                                                                        int? pageSize = null,
-                                                                                                        long? limit = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadSubscribedEventOptions(pathSubscriptionSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SubscribedEventResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SubscribedEventResource>.FromJson("types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SubscribedEventResource> NextPage(Page<SubscribedEventResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Events)
-            );
-
-            var response = client.Request(request);
-            return Page<SubscribedEventResource>.FromJson("types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SubscribedEventResource> PreviousPage(Page<SubscribedEventResource> page,
-                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Events)
-            );
-
-            var response = client.Request(request);
-            return Page<SubscribedEventResource>.FromJson("types", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateSubscribedEventOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Events,
-                "/v1/Subscriptions/" + options.PathSubscriptionSid + "/SubscribedEvents",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Subscribed Event type for the subscription
-        /// </summary>
-        /// <param name="options"> Create SubscribedEvent parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedEvent </returns>
-        public static SubscribedEventResource Create(CreateSubscribedEventOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Subscribed Event type for the subscription
-        /// </summary>
-        /// <param name="options"> Create SubscribedEvent parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
-        public static async System.Threading.Tasks.Task<SubscribedEventResource> CreateAsync(CreateSubscribedEventOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Subscribed Event type for the subscription
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="type"> Type of event being subscribed to. </param>
-        /// <param name="schemaVersion"> The schema version that the subscription should use. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedEvent </returns>
-        public static SubscribedEventResource Create(string pathSubscriptionSid,
-                                                     string type,
-                                                     int? schemaVersion = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateSubscribedEventOptions(pathSubscriptionSid, type){SchemaVersion = schemaVersion};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Subscribed Event type for the subscription
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="type"> Type of event being subscribed to. </param>
-        /// <param name="schemaVersion"> The schema version that the subscription should use. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
-        public static async System.Threading.Tasks.Task<SubscribedEventResource> CreateAsync(string pathSubscriptionSid,
-                                                                                             string type,
-                                                                                             int? schemaVersion = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateSubscribedEventOptions(pathSubscriptionSid, type){SchemaVersion = schemaVersion};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchSubscribedEventOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Events,
-                "/v1/Subscriptions/" + options.PathSubscriptionSid + "/SubscribedEvents/" + options.PathType + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Read an Event for a Subscription.
-        /// </summary>
-        /// <param name="options"> Fetch SubscribedEvent parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedEvent </returns>
-        public static SubscribedEventResource Fetch(FetchSubscribedEventOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Read an Event for a Subscription.
-        /// </summary>
-        /// <param name="options"> Fetch SubscribedEvent parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
-        public static async System.Threading.Tasks.Task<SubscribedEventResource> FetchAsync(FetchSubscribedEventOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Read an Event for a Subscription.
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="pathType"> Type of event being subscribed to. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedEvent </returns>
-        public static SubscribedEventResource Fetch(string pathSubscriptionSid,
-                                                    string pathType,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchSubscribedEventOptions(pathSubscriptionSid, pathType);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Read an Event for a Subscription.
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="pathType"> Type of event being subscribed to. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
-        public static async System.Threading.Tasks.Task<SubscribedEventResource> FetchAsync(string pathSubscriptionSid,
-                                                                                            string pathType,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchSubscribedEventOptions(pathSubscriptionSid, pathType);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSubscribedEventOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Events,
-                "/v1/Subscriptions/" + options.PathSubscriptionSid + "/SubscribedEvents/" + options.PathType + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an Event for a Subscription.
-        /// </summary>
-        /// <param name="options"> Update SubscribedEvent parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedEvent </returns>
-        public static SubscribedEventResource Update(UpdateSubscribedEventOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an Event for a Subscription.
-        /// </summary>
-        /// <param name="options"> Update SubscribedEvent parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
-        public static async System.Threading.Tasks.Task<SubscribedEventResource> UpdateAsync(UpdateSubscribedEventOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an Event for a Subscription.
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="pathType"> Type of event being subscribed to. </param>
-        /// <param name="schemaVersion"> The schema version that the subscription should use. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedEvent </returns>
-        public static SubscribedEventResource Update(string pathSubscriptionSid,
-                                                     string pathType,
-                                                     int? schemaVersion = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateSubscribedEventOptions(pathSubscriptionSid, pathType){SchemaVersion = schemaVersion};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an Event for a Subscription.
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="pathType"> Type of event being subscribed to. </param>
-        /// <param name="schemaVersion"> The schema version that the subscription should use. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
-        public static async System.Threading.Tasks.Task<SubscribedEventResource> UpdateAsync(string pathSubscriptionSid,
-                                                                                             string pathType,
-                                                                                             int? schemaVersion = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateSubscribedEventOptions(pathSubscriptionSid, pathType){SchemaVersion = schemaVersion};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSubscribedEventOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Events,
-                "/v1/Subscriptions/" + options.PathSubscriptionSid + "/SubscribedEvents/" + options.PathType + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove an event type from a subscription.
-        /// </summary>
-        /// <param name="options"> Delete SubscribedEvent parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedEvent </returns>
-        public static bool Delete(DeleteSubscribedEventOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an event type from a subscription.
-        /// </summary>
-        /// <param name="options"> Delete SubscribedEvent parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSubscribedEventOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove an event type from a subscription.
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="pathType"> Type of event being subscribed to. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedEvent </returns>
-        public static bool Delete(string pathSubscriptionSid, string pathType, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSubscribedEventOptions(pathSubscriptionSid, pathType);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an event type from a subscription.
-        /// </summary>
-        /// <param name="pathSubscriptionSid"> Subscription SID. </param>
-        /// <param name="pathType"> Type of event being subscribed to. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSubscriptionSid,
-                                                                          string pathType,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSubscribedEventOptions(pathSubscriptionSid, pathType);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SubscribedEventResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SubscribedEventResource object represented by the provided JSON </returns>
-        public static SubscribedEventResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SubscribedEventResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Account SID.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Type of event being subscribed to.
-        /// </summary>
-        [JsonProperty("type")]
-        public string Type { get; private set; }
-        /// <summary>
-        /// The schema version that the subscription should use.
-        /// </summary>
-        [JsonProperty("schema_version")]
-        public int? SchemaVersion { get; private set; }
-        /// <summary>
-        /// Subscription SID.
-        /// </summary>
-        [JsonProperty("subscription_sid")]
-        public string SubscriptionSid { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SubscribedEventResource()
-        {
-
-        }
-    }
+{
+
+  public class SubscribedEventResource : Resource
+  {
+    private static Request BuildReadRequest(ReadSubscribedEventOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Events,
+          "/v1/Subscriptions/" + options.PathSubscriptionSid + "/SubscribedEvents",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Subscribed Event types for a Subscription.
+    /// </summary>
+    /// <param name="options"> Read SubscribedEvent parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedEvent </returns>
+    public static ResourceSet<SubscribedEventResource> Read(ReadSubscribedEventOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SubscribedEventResource>.FromJson("types", response.Content);
+      return new ResourceSet<SubscribedEventResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Subscribed Event types for a Subscription.
+    /// </summary>
+    /// <param name="options"> Read SubscribedEvent parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SubscribedEventResource>> ReadAsync(ReadSubscribedEventOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SubscribedEventResource>.FromJson("types", response.Content);
+      return new ResourceSet<SubscribedEventResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Subscribed Event types for a Subscription.
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedEvent </returns>
+    public static ResourceSet<SubscribedEventResource> Read(string pathSubscriptionSid,
+                                                            int? pageSize = null,
+                                                            long? limit = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadSubscribedEventOptions(pathSubscriptionSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Subscribed Event types for a Subscription.
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SubscribedEventResource>> ReadAsync(string pathSubscriptionSid,
+                                                                                                    int? pageSize = null,
+                                                                                                    long? limit = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadSubscribedEventOptions(pathSubscriptionSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SubscribedEventResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SubscribedEventResource>.FromJson("types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SubscribedEventResource> NextPage(Page<SubscribedEventResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Events)
+      );
+
+      var response = client.Request(request);
+      return Page<SubscribedEventResource>.FromJson("types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SubscribedEventResource> PreviousPage(Page<SubscribedEventResource> page,
+                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Events)
+      );
+
+      var response = client.Request(request);
+      return Page<SubscribedEventResource>.FromJson("types", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateSubscribedEventOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Events,
+          "/v1/Subscriptions/" + options.PathSubscriptionSid + "/SubscribedEvents",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Subscribed Event type for the subscription
+    /// </summary>
+    /// <param name="options"> Create SubscribedEvent parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedEvent </returns>
+    public static SubscribedEventResource Create(CreateSubscribedEventOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Subscribed Event type for the subscription
+    /// </summary>
+    /// <param name="options"> Create SubscribedEvent parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
+    public static async System.Threading.Tasks.Task<SubscribedEventResource> CreateAsync(CreateSubscribedEventOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Subscribed Event type for the subscription
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="type"> Type of event being subscribed to. </param>
+    /// <param name="schemaVersion"> The schema version that the subscription should use. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedEvent </returns>
+    public static SubscribedEventResource Create(string pathSubscriptionSid,
+                                                 string type,
+                                                 int? schemaVersion = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateSubscribedEventOptions(pathSubscriptionSid, type) { SchemaVersion = schemaVersion };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Subscribed Event type for the subscription
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="type"> Type of event being subscribed to. </param>
+    /// <param name="schemaVersion"> The schema version that the subscription should use. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
+    public static async System.Threading.Tasks.Task<SubscribedEventResource> CreateAsync(string pathSubscriptionSid,
+                                                                                         string type,
+                                                                                         int? schemaVersion = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateSubscribedEventOptions(pathSubscriptionSid, type) { SchemaVersion = schemaVersion };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchSubscribedEventOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Events,
+          "/v1/Subscriptions/" + options.PathSubscriptionSid + "/SubscribedEvents/" + options.PathType + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Read an Event for a Subscription.
+    /// </summary>
+    /// <param name="options"> Fetch SubscribedEvent parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedEvent </returns>
+    public static SubscribedEventResource Fetch(FetchSubscribedEventOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Read an Event for a Subscription.
+    /// </summary>
+    /// <param name="options"> Fetch SubscribedEvent parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
+    public static async System.Threading.Tasks.Task<SubscribedEventResource> FetchAsync(FetchSubscribedEventOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Read an Event for a Subscription.
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="pathType"> Type of event being subscribed to. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedEvent </returns>
+    public static SubscribedEventResource Fetch(string pathSubscriptionSid,
+                                                string pathType,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchSubscribedEventOptions(pathSubscriptionSid, pathType);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Read an Event for a Subscription.
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="pathType"> Type of event being subscribed to. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
+    public static async System.Threading.Tasks.Task<SubscribedEventResource> FetchAsync(string pathSubscriptionSid,
+                                                                                        string pathType,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchSubscribedEventOptions(pathSubscriptionSid, pathType);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSubscribedEventOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Events,
+          "/v1/Subscriptions/" + options.PathSubscriptionSid + "/SubscribedEvents/" + options.PathType + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an Event for a Subscription.
+    /// </summary>
+    /// <param name="options"> Update SubscribedEvent parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedEvent </returns>
+    public static SubscribedEventResource Update(UpdateSubscribedEventOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an Event for a Subscription.
+    /// </summary>
+    /// <param name="options"> Update SubscribedEvent parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
+    public static async System.Threading.Tasks.Task<SubscribedEventResource> UpdateAsync(UpdateSubscribedEventOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an Event for a Subscription.
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="pathType"> Type of event being subscribed to. </param>
+    /// <param name="schemaVersion"> The schema version that the subscription should use. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedEvent </returns>
+    public static SubscribedEventResource Update(string pathSubscriptionSid,
+                                                 string pathType,
+                                                 int? schemaVersion = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateSubscribedEventOptions(pathSubscriptionSid, pathType) { SchemaVersion = schemaVersion };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an Event for a Subscription.
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="pathType"> Type of event being subscribed to. </param>
+    /// <param name="schemaVersion"> The schema version that the subscription should use. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
+    public static async System.Threading.Tasks.Task<SubscribedEventResource> UpdateAsync(string pathSubscriptionSid,
+                                                                                         string pathType,
+                                                                                         int? schemaVersion = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateSubscribedEventOptions(pathSubscriptionSid, pathType) { SchemaVersion = schemaVersion };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSubscribedEventOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Events,
+          "/v1/Subscriptions/" + options.PathSubscriptionSid + "/SubscribedEvents/" + options.PathType + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove an event type from a subscription.
+    /// </summary>
+    /// <param name="options"> Delete SubscribedEvent parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedEvent </returns>
+    public static bool Delete(DeleteSubscribedEventOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an event type from a subscription.
+    /// </summary>
+    /// <param name="options"> Delete SubscribedEvent parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSubscribedEventOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove an event type from a subscription.
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="pathType"> Type of event being subscribed to. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedEvent </returns>
+    public static bool Delete(string pathSubscriptionSid, string pathType, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSubscribedEventOptions(pathSubscriptionSid, pathType);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an event type from a subscription.
+    /// </summary>
+    /// <param name="pathSubscriptionSid"> Subscription SID. </param>
+    /// <param name="pathType"> Type of event being subscribed to. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedEvent </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSubscriptionSid,
+                                                                      string pathType,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSubscribedEventOptions(pathSubscriptionSid, pathType);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SubscribedEventResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SubscribedEventResource object represented by the provided JSON </returns>
+    public static SubscribedEventResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SubscribedEventResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Account SID.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Type of event being subscribed to.
+    /// </summary>
+    [JsonProperty("type")]
+    public string Type { get; private set; }
+    /// <summary>
+    /// The schema version that the subscription should use.
+    /// </summary>
+    [JsonProperty("schema_version")]
+    public int? SchemaVersion { get; private set; }
+    /// <summary>
+    /// Subscription SID.
+    /// </summary>
+    [JsonProperty("subscription_sid")]
+    public string SubscriptionSid { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SubscribedEventResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/SubscriptionOptions.cs b/src/Twilio/Rest/Events/V1/SubscriptionOptions.cs
index edfd8de21..7d6bfe181 100644
--- a/src/Twilio/Rest/Events/V1/SubscriptionOptions.cs
+++ b/src/Twilio/Rest/Events/V1/SubscriptionOptions.cs
@@ -10,207 +10,207 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Events.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a paginated list of Subscriptions belonging to the account used to make the request.
+  /// </summary>
+  public class ReadSubscriptionOptions : ReadOptions<SubscriptionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a paginated list of Subscriptions belonging to the account used to make the request.
+    /// Sink SID.
     /// </summary>
-    public class ReadSubscriptionOptions : ReadOptions<SubscriptionResource>
-    {
-        /// <summary>
-        /// Sink SID.
-        /// </summary>
-        public string SinkSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (SinkSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SinkSid", SinkSid.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string SinkSid { get; set; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific Subscription.
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchSubscriptionOptions : IOptions<SubscriptionResource>
-    {
-        /// <summary>
-        /// A string that uniquely identifies this Subscription.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSubscriptionOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
-        public FetchSubscriptionOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (SinkSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SinkSid", SinkSid.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific Subscription.
+  /// </summary>
+  public class FetchSubscriptionOptions : IOptions<SubscriptionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Subscription.
-    /// </summary>
-    public class CreateSubscriptionOptions : IOptions<SubscriptionResource>
-    {
-        /// <summary>
-        /// Subscription description
-        /// </summary>
-        public string Description { get; }
-        /// <summary>
-        /// Sink SID.
-        /// </summary>
-        public string SinkSid { get; }
-        /// <summary>
-        /// Subscribed Event Types
-        /// </summary>
-        public List<object> Types { get; }
-
-        /// <summary>
-        /// Construct a new CreateSubscriptionOptions
-        /// </summary>
-        /// <param name="description"> Subscription description </param>
-        /// <param name="sinkSid"> Sink SID. </param>
-        /// <param name="types"> Subscribed Event Types </param>
-        public CreateSubscriptionOptions(string description, string sinkSid, List<object> types)
-        {
-            Description = description;
-            SinkSid = sinkSid;
-            Types = types;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Description != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Description", Description));
-            }
-
-            if (SinkSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SinkSid", SinkSid.ToString()));
-            }
-
-            if (Types != null)
-            {
-                p.AddRange(Types.Select(prop => new KeyValuePair<string, string>("Types", Serializers.JsonObject(prop))));
-            }
-
-            return p;
-        }
-    }
-
+    /// A string that uniquely identifies this Subscription.
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update a Subscription.
-    /// </summary>
-    public class UpdateSubscriptionOptions : IOptions<SubscriptionResource>
-    {
-        /// <summary>
-        /// A string that uniquely identifies this Subscription.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// Subscription description.
-        /// </summary>
-        public string Description { get; set; }
-        /// <summary>
-        /// Sink SID.
-        /// </summary>
-        public string SinkSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSubscriptionOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
-        public UpdateSubscriptionOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Description != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Description", Description));
-            }
-
-            if (SinkSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SinkSid", SinkSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchSubscriptionOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
+    public FetchSubscriptionOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific Subscription.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteSubscriptionOptions : IOptions<SubscriptionResource>
-    {
-        /// <summary>
-        /// A string that uniquely identifies this Subscription.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSubscriptionOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
-        public DeleteSubscriptionOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Subscription.
+  /// </summary>
+  public class CreateSubscriptionOptions : IOptions<SubscriptionResource>
+  {
+    /// <summary>
+    /// Subscription description
+    /// </summary>
+    public string Description { get; }
+    /// <summary>
+    /// Sink SID.
+    /// </summary>
+    public string SinkSid { get; }
+    /// <summary>
+    /// Subscribed Event Types
+    /// </summary>
+    public List<object> Types { get; }
+
+    /// <summary>
+    /// Construct a new CreateSubscriptionOptions
+    /// </summary>
+    /// <param name="description"> Subscription description </param>
+    /// <param name="sinkSid"> Sink SID. </param>
+    /// <param name="types"> Subscribed Event Types </param>
+    public CreateSubscriptionOptions(string description, string sinkSid, List<object> types)
+    {
+      Description = description;
+      SinkSid = sinkSid;
+      Types = types;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Description != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Description", Description));
+      }
+
+      if (SinkSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SinkSid", SinkSid.ToString()));
+      }
+
+      if (Types != null)
+      {
+        p.AddRange(Types.Select(prop => new KeyValuePair<string, string>("Types", Serializers.JsonObject(prop))));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update a Subscription.
+  /// </summary>
+  public class UpdateSubscriptionOptions : IOptions<SubscriptionResource>
+  {
+    /// <summary>
+    /// A string that uniquely identifies this Subscription.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// Subscription description.
+    /// </summary>
+    public string Description { get; set; }
+    /// <summary>
+    /// Sink SID.
+    /// </summary>
+    public string SinkSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSubscriptionOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
+    public UpdateSubscriptionOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Description != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Description", Description));
+      }
+
+      if (SinkSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SinkSid", SinkSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific Subscription.
+  /// </summary>
+  public class DeleteSubscriptionOptions : IOptions<SubscriptionResource>
+  {
+    /// <summary>
+    /// A string that uniquely identifies this Subscription.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSubscriptionOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
+    public DeleteSubscriptionOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Events/V1/SubscriptionResource.cs b/src/Twilio/Rest/Events/V1/SubscriptionResource.cs
index 545c0e9cb..7b6287745 100644
--- a/src/Twilio/Rest/Events/V1/SubscriptionResource.cs
+++ b/src/Twilio/Rest/Events/V1/SubscriptionResource.cs
@@ -18,492 +18,492 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Events.V1
-{
-
-    public class SubscriptionResource : Resource
-    {
-        private static Request BuildReadRequest(ReadSubscriptionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Events,
-                "/v1/Subscriptions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a paginated list of Subscriptions belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="options"> Read Subscription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Subscription </returns>
-        public static ResourceSet<SubscriptionResource> Read(ReadSubscriptionOptions options,
-                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SubscriptionResource>.FromJson("subscriptions", response.Content);
-            return new ResourceSet<SubscriptionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a paginated list of Subscriptions belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="options"> Read Subscription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Subscription </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SubscriptionResource>> ReadAsync(ReadSubscriptionOptions options,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SubscriptionResource>.FromJson("subscriptions", response.Content);
-            return new ResourceSet<SubscriptionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a paginated list of Subscriptions belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="sinkSid"> Sink SID. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Subscription </returns>
-        public static ResourceSet<SubscriptionResource> Read(string sinkSid = null,
-                                                             int? pageSize = null,
-                                                             long? limit = null,
-                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadSubscriptionOptions(){SinkSid = sinkSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a paginated list of Subscriptions belonging to the account used to make the request.
-        /// </summary>
-        /// <param name="sinkSid"> Sink SID. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Subscription </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SubscriptionResource>> ReadAsync(string sinkSid = null,
-                                                                                                     int? pageSize = null,
-                                                                                                     long? limit = null,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadSubscriptionOptions(){SinkSid = sinkSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SubscriptionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SubscriptionResource>.FromJson("subscriptions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SubscriptionResource> NextPage(Page<SubscriptionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Events)
-            );
-
-            var response = client.Request(request);
-            return Page<SubscriptionResource>.FromJson("subscriptions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SubscriptionResource> PreviousPage(Page<SubscriptionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Events)
-            );
-
-            var response = client.Request(request);
-            return Page<SubscriptionResource>.FromJson("subscriptions", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchSubscriptionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Events,
-                "/v1/Subscriptions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Subscription.
-        /// </summary>
-        /// <param name="options"> Fetch Subscription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Subscription </returns>
-        public static SubscriptionResource Fetch(FetchSubscriptionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Subscription.
-        /// </summary>
-        /// <param name="options"> Fetch Subscription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Subscription </returns>
-        public static async System.Threading.Tasks.Task<SubscriptionResource> FetchAsync(FetchSubscriptionOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Subscription.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Subscription </returns>
-        public static SubscriptionResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSubscriptionOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Subscription.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Subscription </returns>
-        public static async System.Threading.Tasks.Task<SubscriptionResource> FetchAsync(string pathSid,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchSubscriptionOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateSubscriptionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Events,
-                "/v1/Subscriptions",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Subscription.
-        /// </summary>
-        /// <param name="options"> Create Subscription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Subscription </returns>
-        public static SubscriptionResource Create(CreateSubscriptionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Subscription.
-        /// </summary>
-        /// <param name="options"> Create Subscription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Subscription </returns>
-        public static async System.Threading.Tasks.Task<SubscriptionResource> CreateAsync(CreateSubscriptionOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Subscription.
-        /// </summary>
-        /// <param name="description"> Subscription description </param>
-        /// <param name="sinkSid"> Sink SID. </param>
-        /// <param name="types"> Subscribed Event Types </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Subscription </returns>
-        public static SubscriptionResource Create(string description,
-                                                  string sinkSid,
-                                                  List<object> types,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateSubscriptionOptions(description, sinkSid, types);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Subscription.
-        /// </summary>
-        /// <param name="description"> Subscription description </param>
-        /// <param name="sinkSid"> Sink SID. </param>
-        /// <param name="types"> Subscribed Event Types </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Subscription </returns>
-        public static async System.Threading.Tasks.Task<SubscriptionResource> CreateAsync(string description,
-                                                                                          string sinkSid,
-                                                                                          List<object> types,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateSubscriptionOptions(description, sinkSid, types);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSubscriptionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Events,
-                "/v1/Subscriptions/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a Subscription.
-        /// </summary>
-        /// <param name="options"> Update Subscription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Subscription </returns>
-        public static SubscriptionResource Update(UpdateSubscriptionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a Subscription.
-        /// </summary>
-        /// <param name="options"> Update Subscription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Subscription </returns>
-        public static async System.Threading.Tasks.Task<SubscriptionResource> UpdateAsync(UpdateSubscriptionOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a Subscription.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
-        /// <param name="description"> Subscription description. </param>
-        /// <param name="sinkSid"> Sink SID. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Subscription </returns>
-        public static SubscriptionResource Update(string pathSid,
-                                                  string description = null,
-                                                  string sinkSid = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateSubscriptionOptions(pathSid){Description = description, SinkSid = sinkSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a Subscription.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
-        /// <param name="description"> Subscription description. </param>
-        /// <param name="sinkSid"> Sink SID. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Subscription </returns>
-        public static async System.Threading.Tasks.Task<SubscriptionResource> UpdateAsync(string pathSid,
-                                                                                          string description = null,
-                                                                                          string sinkSid = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateSubscriptionOptions(pathSid){Description = description, SinkSid = sinkSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSubscriptionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Events,
-                "/v1/Subscriptions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Subscription.
-        /// </summary>
-        /// <param name="options"> Delete Subscription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Subscription </returns>
-        public static bool Delete(DeleteSubscriptionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Subscription.
-        /// </summary>
-        /// <param name="options"> Delete Subscription parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Subscription </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSubscriptionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Subscription.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Subscription </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSubscriptionOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Subscription.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Subscription </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSubscriptionOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SubscriptionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SubscriptionResource object represented by the provided JSON </returns>
-        public static SubscriptionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SubscriptionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Account SID.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// A string that uniquely identifies this Subscription.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The date this Subscription was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this Subscription was updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Subscription description
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// Sink SID.
-        /// </summary>
-        [JsonProperty("sink_sid")]
-        public string SinkSid { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Nested resource URLs.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private SubscriptionResource()
-        {
-
-        }
-    }
+{
+
+  public class SubscriptionResource : Resource
+  {
+    private static Request BuildReadRequest(ReadSubscriptionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Events,
+          "/v1/Subscriptions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a paginated list of Subscriptions belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="options"> Read Subscription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Subscription </returns>
+    public static ResourceSet<SubscriptionResource> Read(ReadSubscriptionOptions options,
+                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SubscriptionResource>.FromJson("subscriptions", response.Content);
+      return new ResourceSet<SubscriptionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a paginated list of Subscriptions belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="options"> Read Subscription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Subscription </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SubscriptionResource>> ReadAsync(ReadSubscriptionOptions options,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SubscriptionResource>.FromJson("subscriptions", response.Content);
+      return new ResourceSet<SubscriptionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a paginated list of Subscriptions belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="sinkSid"> Sink SID. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Subscription </returns>
+    public static ResourceSet<SubscriptionResource> Read(string sinkSid = null,
+                                                         int? pageSize = null,
+                                                         long? limit = null,
+                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadSubscriptionOptions() { SinkSid = sinkSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a paginated list of Subscriptions belonging to the account used to make the request.
+    /// </summary>
+    /// <param name="sinkSid"> Sink SID. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Subscription </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SubscriptionResource>> ReadAsync(string sinkSid = null,
+                                                                                                 int? pageSize = null,
+                                                                                                 long? limit = null,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadSubscriptionOptions() { SinkSid = sinkSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SubscriptionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SubscriptionResource>.FromJson("subscriptions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SubscriptionResource> NextPage(Page<SubscriptionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Events)
+      );
+
+      var response = client.Request(request);
+      return Page<SubscriptionResource>.FromJson("subscriptions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SubscriptionResource> PreviousPage(Page<SubscriptionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Events)
+      );
+
+      var response = client.Request(request);
+      return Page<SubscriptionResource>.FromJson("subscriptions", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchSubscriptionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Events,
+          "/v1/Subscriptions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Subscription.
+    /// </summary>
+    /// <param name="options"> Fetch Subscription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Subscription </returns>
+    public static SubscriptionResource Fetch(FetchSubscriptionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Subscription.
+    /// </summary>
+    /// <param name="options"> Fetch Subscription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Subscription </returns>
+    public static async System.Threading.Tasks.Task<SubscriptionResource> FetchAsync(FetchSubscriptionOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Subscription.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Subscription </returns>
+    public static SubscriptionResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSubscriptionOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Subscription.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Subscription </returns>
+    public static async System.Threading.Tasks.Task<SubscriptionResource> FetchAsync(string pathSid,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchSubscriptionOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateSubscriptionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Events,
+          "/v1/Subscriptions",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Subscription.
+    /// </summary>
+    /// <param name="options"> Create Subscription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Subscription </returns>
+    public static SubscriptionResource Create(CreateSubscriptionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Subscription.
+    /// </summary>
+    /// <param name="options"> Create Subscription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Subscription </returns>
+    public static async System.Threading.Tasks.Task<SubscriptionResource> CreateAsync(CreateSubscriptionOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Subscription.
+    /// </summary>
+    /// <param name="description"> Subscription description </param>
+    /// <param name="sinkSid"> Sink SID. </param>
+    /// <param name="types"> Subscribed Event Types </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Subscription </returns>
+    public static SubscriptionResource Create(string description,
+                                              string sinkSid,
+                                              List<object> types,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateSubscriptionOptions(description, sinkSid, types);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Subscription.
+    /// </summary>
+    /// <param name="description"> Subscription description </param>
+    /// <param name="sinkSid"> Sink SID. </param>
+    /// <param name="types"> Subscribed Event Types </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Subscription </returns>
+    public static async System.Threading.Tasks.Task<SubscriptionResource> CreateAsync(string description,
+                                                                                      string sinkSid,
+                                                                                      List<object> types,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateSubscriptionOptions(description, sinkSid, types);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSubscriptionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Events,
+          "/v1/Subscriptions/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a Subscription.
+    /// </summary>
+    /// <param name="options"> Update Subscription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Subscription </returns>
+    public static SubscriptionResource Update(UpdateSubscriptionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a Subscription.
+    /// </summary>
+    /// <param name="options"> Update Subscription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Subscription </returns>
+    public static async System.Threading.Tasks.Task<SubscriptionResource> UpdateAsync(UpdateSubscriptionOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a Subscription.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
+    /// <param name="description"> Subscription description. </param>
+    /// <param name="sinkSid"> Sink SID. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Subscription </returns>
+    public static SubscriptionResource Update(string pathSid,
+                                              string description = null,
+                                              string sinkSid = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateSubscriptionOptions(pathSid) { Description = description, SinkSid = sinkSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a Subscription.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
+    /// <param name="description"> Subscription description. </param>
+    /// <param name="sinkSid"> Sink SID. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Subscription </returns>
+    public static async System.Threading.Tasks.Task<SubscriptionResource> UpdateAsync(string pathSid,
+                                                                                      string description = null,
+                                                                                      string sinkSid = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateSubscriptionOptions(pathSid) { Description = description, SinkSid = sinkSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSubscriptionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Events,
+          "/v1/Subscriptions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Subscription.
+    /// </summary>
+    /// <param name="options"> Delete Subscription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Subscription </returns>
+    public static bool Delete(DeleteSubscriptionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Subscription.
+    /// </summary>
+    /// <param name="options"> Delete Subscription parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Subscription </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSubscriptionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Subscription.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Subscription </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSubscriptionOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Subscription.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies this Subscription. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Subscription </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSubscriptionOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SubscriptionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SubscriptionResource object represented by the provided JSON </returns>
+    public static SubscriptionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SubscriptionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Account SID.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// A string that uniquely identifies this Subscription.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The date this Subscription was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this Subscription was updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Subscription description
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// Sink SID.
+    /// </summary>
+    [JsonProperty("sink_sid")]
+    public string SinkSid { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Nested resource URLs.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private SubscriptionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Fax/V1/Fax/FaxMediaOptions.cs b/src/Twilio/Rest/Fax/V1/Fax/FaxMediaOptions.cs
index 0bb6557de..6a3ae9baa 100644
--- a/src/Twilio/Rest/Fax/V1/Fax/FaxMediaOptions.cs
+++ b/src/Twilio/Rest/Fax/V1/Fax/FaxMediaOptions.cs
@@ -9,116 +9,116 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Fax.V1.Fax
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific fax media instance.
+  /// </summary>
+  public class FetchFaxMediaOptions : IOptions<FaxMediaResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific fax media instance.
+    /// The SID of the fax with the FaxMedia resource to fetch
     /// </summary>
-    public class FetchFaxMediaOptions : IOptions<FaxMediaResource>
-    {
-        /// <summary>
-        /// The SID of the fax with the FaxMedia resource to fetch
-        /// </summary>
-        public string PathFaxSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFaxMediaOptions
-        /// </summary>
-        /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        public FetchFaxMediaOptions(string pathFaxSid, string pathSid)
-        {
-            PathFaxSid = pathFaxSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathFaxSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all fax media instances for the specified fax.
+    /// The unique string that identifies the resource to fetch
     /// </summary>
-    public class ReadFaxMediaOptions : ReadOptions<FaxMediaResource>
-    {
-        /// <summary>
-        /// The SID of the fax with the FaxMedia resources to read
-        /// </summary>
-        public string PathFaxSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadFaxMediaOptions
-        /// </summary>
-        /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resources to read </param>
-        public ReadFaxMediaOptions(string pathFaxSid)
-        {
-            PathFaxSid = pathFaxSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific fax media instance.
+    /// Construct a new FetchFaxMediaOptions
     /// </summary>
-    public class DeleteFaxMediaOptions : IOptions<FaxMediaResource>
-    {
-        /// <summary>
-        /// The SID of the fax with the FaxMedia resource to delete
-        /// </summary>
-        public string PathFaxSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFaxMediaOptions
-        /// </summary>
-        /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteFaxMediaOptions(string pathFaxSid, string pathSid)
-        {
-            PathFaxSid = pathFaxSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    public FetchFaxMediaOptions(string pathFaxSid, string pathSid)
+    {
+      PathFaxSid = pathFaxSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all fax media instances for the specified fax.
+  /// </summary>
+  public class ReadFaxMediaOptions : ReadOptions<FaxMediaResource>
+  {
+    /// <summary>
+    /// The SID of the fax with the FaxMedia resources to read
+    /// </summary>
+    public string PathFaxSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadFaxMediaOptions
+    /// </summary>
+    /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resources to read </param>
+    public ReadFaxMediaOptions(string pathFaxSid)
+    {
+      PathFaxSid = pathFaxSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific fax media instance.
+  /// </summary>
+  public class DeleteFaxMediaOptions : IOptions<FaxMediaResource>
+  {
+    /// <summary>
+    /// The SID of the fax with the FaxMedia resource to delete
+    /// </summary>
+    public string PathFaxSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteFaxMediaOptions
+    /// </summary>
+    /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteFaxMediaOptions(string pathFaxSid, string pathSid)
+    {
+      PathFaxSid = pathFaxSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Fax/V1/Fax/FaxMediaResource.cs b/src/Twilio/Rest/Fax/V1/Fax/FaxMediaResource.cs
index d5192c3c8..19f6991bc 100644
--- a/src/Twilio/Rest/Fax/V1/Fax/FaxMediaResource.cs
+++ b/src/Twilio/Rest/Fax/V1/Fax/FaxMediaResource.cs
@@ -18,341 +18,341 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Fax.V1.Fax
-{
-
-    public class FaxMediaResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchFaxMediaOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Fax,
-                "/v1/Faxes/" + options.PathFaxSid + "/Media/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific fax media instance.
-        /// </summary>
-        /// <param name="options"> Fetch FaxMedia parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FaxMedia </returns>
-        public static FaxMediaResource Fetch(FetchFaxMediaOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific fax media instance.
-        /// </summary>
-        /// <param name="options"> Fetch FaxMedia parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FaxMedia </returns>
-        public static async System.Threading.Tasks.Task<FaxMediaResource> FetchAsync(FetchFaxMediaOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific fax media instance.
-        /// </summary>
-        /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FaxMedia </returns>
-        public static FaxMediaResource Fetch(string pathFaxSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchFaxMediaOptions(pathFaxSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific fax media instance.
-        /// </summary>
-        /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FaxMedia </returns>
-        public static async System.Threading.Tasks.Task<FaxMediaResource> FetchAsync(string pathFaxSid,
-                                                                                     string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchFaxMediaOptions(pathFaxSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadFaxMediaOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Fax,
-                "/v1/Faxes/" + options.PathFaxSid + "/Media",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all fax media instances for the specified fax.
-        /// </summary>
-        /// <param name="options"> Read FaxMedia parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FaxMedia </returns>
-        public static ResourceSet<FaxMediaResource> Read(ReadFaxMediaOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FaxMediaResource>.FromJson("media", response.Content);
-            return new ResourceSet<FaxMediaResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all fax media instances for the specified fax.
-        /// </summary>
-        /// <param name="options"> Read FaxMedia parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FaxMedia </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FaxMediaResource>> ReadAsync(ReadFaxMediaOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FaxMediaResource>.FromJson("media", response.Content);
-            return new ResourceSet<FaxMediaResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all fax media instances for the specified fax.
-        /// </summary>
-        /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FaxMedia </returns>
-        public static ResourceSet<FaxMediaResource> Read(string pathFaxSid,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadFaxMediaOptions(pathFaxSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all fax media instances for the specified fax.
-        /// </summary>
-        /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FaxMedia </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FaxMediaResource>> ReadAsync(string pathFaxSid,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadFaxMediaOptions(pathFaxSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FaxMediaResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FaxMediaResource>.FromJson("media", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FaxMediaResource> NextPage(Page<FaxMediaResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Fax)
-            );
-
-            var response = client.Request(request);
-            return Page<FaxMediaResource>.FromJson("media", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FaxMediaResource> PreviousPage(Page<FaxMediaResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Fax)
-            );
-
-            var response = client.Request(request);
-            return Page<FaxMediaResource>.FromJson("media", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteFaxMediaOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Fax,
-                "/v1/Faxes/" + options.PathFaxSid + "/Media/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific fax media instance.
-        /// </summary>
-        /// <param name="options"> Delete FaxMedia parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FaxMedia </returns>
-        public static bool Delete(DeleteFaxMediaOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific fax media instance.
-        /// </summary>
-        /// <param name="options"> Delete FaxMedia parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FaxMedia </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFaxMediaOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific fax media instance.
-        /// </summary>
-        /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FaxMedia </returns>
-        public static bool Delete(string pathFaxSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFaxMediaOptions(pathFaxSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific fax media instance.
-        /// </summary>
-        /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FaxMedia </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFaxSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteFaxMediaOptions(pathFaxSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FaxMediaResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FaxMediaResource object represented by the provided JSON </returns>
-        public static FaxMediaResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FaxMediaResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the fax the FaxMedia resource is associated with
-        /// </summary>
-        [JsonProperty("fax_sid")]
-        public string FaxSid { get; private set; }
-        /// <summary>
-        /// The content type of the stored fax media
-        /// </summary>
-        [JsonProperty("content_type")]
-        public string ContentType { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the FaxMedia resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private FaxMediaResource()
-        {
-
-        }
-    }
+{
+
+  public class FaxMediaResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchFaxMediaOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Fax,
+          "/v1/Faxes/" + options.PathFaxSid + "/Media/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific fax media instance.
+    /// </summary>
+    /// <param name="options"> Fetch FaxMedia parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FaxMedia </returns>
+    public static FaxMediaResource Fetch(FetchFaxMediaOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific fax media instance.
+    /// </summary>
+    /// <param name="options"> Fetch FaxMedia parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FaxMedia </returns>
+    public static async System.Threading.Tasks.Task<FaxMediaResource> FetchAsync(FetchFaxMediaOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific fax media instance.
+    /// </summary>
+    /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FaxMedia </returns>
+    public static FaxMediaResource Fetch(string pathFaxSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchFaxMediaOptions(pathFaxSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific fax media instance.
+    /// </summary>
+    /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FaxMedia </returns>
+    public static async System.Threading.Tasks.Task<FaxMediaResource> FetchAsync(string pathFaxSid,
+                                                                                 string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchFaxMediaOptions(pathFaxSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadFaxMediaOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Fax,
+          "/v1/Faxes/" + options.PathFaxSid + "/Media",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all fax media instances for the specified fax.
+    /// </summary>
+    /// <param name="options"> Read FaxMedia parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FaxMedia </returns>
+    public static ResourceSet<FaxMediaResource> Read(ReadFaxMediaOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FaxMediaResource>.FromJson("media", response.Content);
+      return new ResourceSet<FaxMediaResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all fax media instances for the specified fax.
+    /// </summary>
+    /// <param name="options"> Read FaxMedia parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FaxMedia </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FaxMediaResource>> ReadAsync(ReadFaxMediaOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FaxMediaResource>.FromJson("media", response.Content);
+      return new ResourceSet<FaxMediaResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all fax media instances for the specified fax.
+    /// </summary>
+    /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FaxMedia </returns>
+    public static ResourceSet<FaxMediaResource> Read(string pathFaxSid,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadFaxMediaOptions(pathFaxSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all fax media instances for the specified fax.
+    /// </summary>
+    /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FaxMedia </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FaxMediaResource>> ReadAsync(string pathFaxSid,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadFaxMediaOptions(pathFaxSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FaxMediaResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FaxMediaResource>.FromJson("media", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FaxMediaResource> NextPage(Page<FaxMediaResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Fax)
+      );
+
+      var response = client.Request(request);
+      return Page<FaxMediaResource>.FromJson("media", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FaxMediaResource> PreviousPage(Page<FaxMediaResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Fax)
+      );
+
+      var response = client.Request(request);
+      return Page<FaxMediaResource>.FromJson("media", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteFaxMediaOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Fax,
+          "/v1/Faxes/" + options.PathFaxSid + "/Media/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific fax media instance.
+    /// </summary>
+    /// <param name="options"> Delete FaxMedia parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FaxMedia </returns>
+    public static bool Delete(DeleteFaxMediaOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific fax media instance.
+    /// </summary>
+    /// <param name="options"> Delete FaxMedia parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FaxMedia </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFaxMediaOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific fax media instance.
+    /// </summary>
+    /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FaxMedia </returns>
+    public static bool Delete(string pathFaxSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFaxMediaOptions(pathFaxSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific fax media instance.
+    /// </summary>
+    /// <param name="pathFaxSid"> The SID of the fax with the FaxMedia resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FaxMedia </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFaxSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteFaxMediaOptions(pathFaxSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FaxMediaResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FaxMediaResource object represented by the provided JSON </returns>
+    public static FaxMediaResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FaxMediaResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the fax the FaxMedia resource is associated with
+    /// </summary>
+    [JsonProperty("fax_sid")]
+    public string FaxSid { get; private set; }
+    /// <summary>
+    /// The content type of the stored fax media
+    /// </summary>
+    [JsonProperty("content_type")]
+    public string ContentType { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the FaxMedia resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private FaxMediaResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Fax/V1/FaxOptions.cs b/src/Twilio/Rest/Fax/V1/FaxOptions.cs
index 67e9d651d..25aeb9d86 100644
--- a/src/Twilio/Rest/Fax/V1/FaxOptions.cs
+++ b/src/Twilio/Rest/Fax/V1/FaxOptions.cs
@@ -9,277 +9,277 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Fax.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific fax.
+  /// </summary>
+  public class FetchFaxOptions : IOptions<FaxResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific fax.
+    /// The unique string that identifies the resource
     /// </summary>
-    public class FetchFaxOptions : IOptions<FaxResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFaxOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchFaxOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all faxes.
+    /// Construct a new FetchFaxOptions
     /// </summary>
-    public class ReadFaxOptions : ReadOptions<FaxResource>
-    {
-        /// <summary>
-        /// Retrieve only those faxes sent from this phone number
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// Retrieve only those faxes sent to this phone number
-        /// </summary>
-        public string To { get; set; }
-        /// <summary>
-        /// Retrieve only faxes created on or before this date
-        /// </summary>
-        public DateTime? DateCreatedOnOrBefore { get; set; }
-        /// <summary>
-        /// Retrieve only faxes created after this date
-        /// </summary>
-        public DateTime? DateCreatedAfter { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To));
-            }
-
-            if (DateCreatedOnOrBefore != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedOnOrBefore", Serializers.DateTimeIso8601(DateCreatedOnOrBefore)));
-            }
-
-            if (DateCreatedAfter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchFaxOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new fax to send to a phone number or SIP endpoint.
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateFaxOptions : IOptions<FaxResource>
-    {
-        /// <summary>
-        /// The phone number to receive the fax
-        /// </summary>
-        public string To { get; }
-        /// <summary>
-        /// The URL of the PDF that contains the fax
-        /// </summary>
-        public Uri MediaUrl { get; }
-        /// <summary>
-        /// The quality of this fax
-        /// </summary>
-        public FaxResource.QualityEnum Quality { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The number the fax was sent from
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// The username for SIP authentication
-        /// </summary>
-        public string SipAuthUsername { get; set; }
-        /// <summary>
-        /// The password for SIP authentication
-        /// </summary>
-        public string SipAuthPassword { get; set; }
-        /// <summary>
-        /// Whether to store a copy of the sent media
-        /// </summary>
-        public bool? StoreMedia { get; set; }
-        /// <summary>
-        /// How long in minutes to try to send the fax
-        /// </summary>
-        public int? Ttl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateFaxOptions
-        /// </summary>
-        /// <param name="to"> The phone number to receive the fax </param>
-        /// <param name="mediaUrl"> The URL of the PDF that contains the fax </param>
-        public CreateFaxOptions(string to, Uri mediaUrl)
-        {
-            To = to;
-            MediaUrl = mediaUrl;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To));
-            }
-
-            if (MediaUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MediaUrl", Serializers.Url(MediaUrl)));
-            }
-
-            if (Quality != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Quality", Quality.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            if (SipAuthUsername != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipAuthUsername", SipAuthUsername));
-            }
-
-            if (SipAuthPassword != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipAuthPassword", SipAuthPassword));
-            }
-
-            if (StoreMedia != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StoreMedia", StoreMedia.Value.ToString().ToLower()));
-            }
-
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all faxes.
+  /// </summary>
+  public class ReadFaxOptions : ReadOptions<FaxResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update a specific fax.
+    /// Retrieve only those faxes sent from this phone number
     /// </summary>
-    public class UpdateFaxOptions : IOptions<FaxResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The new status of the resource
-        /// </summary>
-        public FaxResource.UpdateStatusEnum Status { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateFaxOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateFaxOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string From { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific fax and its associated media.
+    /// Retrieve only those faxes sent to this phone number
     /// </summary>
-    public class DeleteFaxOptions : IOptions<FaxResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFaxOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteFaxOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string To { get; set; }
+    /// <summary>
+    /// Retrieve only faxes created on or before this date
+    /// </summary>
+    public DateTime? DateCreatedOnOrBefore { get; set; }
+    /// <summary>
+    /// Retrieve only faxes created after this date
+    /// </summary>
+    public DateTime? DateCreatedAfter { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To));
+      }
+
+      if (DateCreatedOnOrBefore != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedOnOrBefore", Serializers.DateTimeIso8601(DateCreatedOnOrBefore)));
+      }
+
+      if (DateCreatedAfter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new fax to send to a phone number or SIP endpoint.
+  /// </summary>
+  public class CreateFaxOptions : IOptions<FaxResource>
+  {
+    /// <summary>
+    /// The phone number to receive the fax
+    /// </summary>
+    public string To { get; }
+    /// <summary>
+    /// The URL of the PDF that contains the fax
+    /// </summary>
+    public Uri MediaUrl { get; }
+    /// <summary>
+    /// The quality of this fax
+    /// </summary>
+    public FaxResource.QualityEnum Quality { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The number the fax was sent from
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// The username for SIP authentication
+    /// </summary>
+    public string SipAuthUsername { get; set; }
+    /// <summary>
+    /// The password for SIP authentication
+    /// </summary>
+    public string SipAuthPassword { get; set; }
+    /// <summary>
+    /// Whether to store a copy of the sent media
+    /// </summary>
+    public bool? StoreMedia { get; set; }
+    /// <summary>
+    /// How long in minutes to try to send the fax
+    /// </summary>
+    public int? Ttl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateFaxOptions
+    /// </summary>
+    /// <param name="to"> The phone number to receive the fax </param>
+    /// <param name="mediaUrl"> The URL of the PDF that contains the fax </param>
+    public CreateFaxOptions(string to, Uri mediaUrl)
+    {
+      To = to;
+      MediaUrl = mediaUrl;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To));
+      }
+
+      if (MediaUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MediaUrl", Serializers.Url(MediaUrl)));
+      }
+
+      if (Quality != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Quality", Quality.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      if (SipAuthUsername != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipAuthUsername", SipAuthUsername));
+      }
+
+      if (SipAuthPassword != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipAuthPassword", SipAuthPassword));
+      }
+
+      if (StoreMedia != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StoreMedia", StoreMedia.Value.ToString().ToLower()));
+      }
+
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update a specific fax.
+  /// </summary>
+  public class UpdateFaxOptions : IOptions<FaxResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The new status of the resource
+    /// </summary>
+    public FaxResource.UpdateStatusEnum Status { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateFaxOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateFaxOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific fax and its associated media.
+  /// </summary>
+  public class DeleteFaxOptions : IOptions<FaxResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteFaxOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteFaxOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Fax/V1/FaxResource.cs b/src/Twilio/Rest/Fax/V1/FaxResource.cs
index 8ae7b7bec..cde83ed01 100644
--- a/src/Twilio/Rest/Fax/V1/FaxResource.cs
+++ b/src/Twilio/Rest/Fax/V1/FaxResource.cs
@@ -19,636 +19,636 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Fax.V1
-{
-
-    public class FaxResource : Resource
-    {
-        public sealed class DirectionEnum : StringEnum
-        {
-            private DirectionEnum(string value) : base(value) {}
-            public DirectionEnum() {}
-            public static implicit operator DirectionEnum(string value)
-            {
-                return new DirectionEnum(value);
-            }
-
-            public static readonly DirectionEnum Inbound = new DirectionEnum("inbound");
-            public static readonly DirectionEnum Outbound = new DirectionEnum("outbound");
-        }
-
-        public sealed class QualityEnum : StringEnum
-        {
-            private QualityEnum(string value) : base(value) {}
-            public QualityEnum() {}
-            public static implicit operator QualityEnum(string value)
-            {
-                return new QualityEnum(value);
-            }
-
-            public static readonly QualityEnum Standard = new QualityEnum("standard");
-            public static readonly QualityEnum Fine = new QualityEnum("fine");
-            public static readonly QualityEnum Superfine = new QualityEnum("superfine");
-        }
-
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Queued = new StatusEnum("queued");
-            public static readonly StatusEnum Processing = new StatusEnum("processing");
-            public static readonly StatusEnum Sending = new StatusEnum("sending");
-            public static readonly StatusEnum Delivered = new StatusEnum("delivered");
-            public static readonly StatusEnum Receiving = new StatusEnum("receiving");
-            public static readonly StatusEnum Received = new StatusEnum("received");
-            public static readonly StatusEnum NoAnswer = new StatusEnum("no-answer");
-            public static readonly StatusEnum Busy = new StatusEnum("busy");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-            public static readonly StatusEnum Canceled = new StatusEnum("canceled");
-        }
-
-        public sealed class UpdateStatusEnum : StringEnum
-        {
-            private UpdateStatusEnum(string value) : base(value) {}
-            public UpdateStatusEnum() {}
-            public static implicit operator UpdateStatusEnum(string value)
-            {
-                return new UpdateStatusEnum(value);
-            }
-
-            public static readonly UpdateStatusEnum Canceled = new UpdateStatusEnum("canceled");
-        }
-
-        private static Request BuildFetchRequest(FetchFaxOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Fax,
-                "/v1/Faxes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific fax.
-        /// </summary>
-        /// <param name="options"> Fetch Fax parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fax </returns>
-        public static FaxResource Fetch(FetchFaxOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific fax.
-        /// </summary>
-        /// <param name="options"> Fetch Fax parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fax </returns>
-        public static async System.Threading.Tasks.Task<FaxResource> FetchAsync(FetchFaxOptions options,
-                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific fax.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fax </returns>
-        public static FaxResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchFaxOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific fax.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fax </returns>
-        public static async System.Threading.Tasks.Task<FaxResource> FetchAsync(string pathSid,
-                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchFaxOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadFaxOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Fax,
-                "/v1/Faxes",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all faxes.
-        /// </summary>
-        /// <param name="options"> Read Fax parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fax </returns>
-        public static ResourceSet<FaxResource> Read(ReadFaxOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FaxResource>.FromJson("faxes", response.Content);
-            return new ResourceSet<FaxResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all faxes.
-        /// </summary>
-        /// <param name="options"> Read Fax parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fax </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FaxResource>> ReadAsync(ReadFaxOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FaxResource>.FromJson("faxes", response.Content);
-            return new ResourceSet<FaxResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all faxes.
-        /// </summary>
-        /// <param name="from"> Retrieve only those faxes sent from this phone number </param>
-        /// <param name="to"> Retrieve only those faxes sent to this phone number </param>
-        /// <param name="dateCreatedOnOrBefore"> Retrieve only faxes created on or before this date </param>
-        /// <param name="dateCreatedAfter"> Retrieve only faxes created after this date </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fax </returns>
-        public static ResourceSet<FaxResource> Read(string from = null,
-                                                    string to = null,
-                                                    DateTime? dateCreatedOnOrBefore = null,
-                                                    DateTime? dateCreatedAfter = null,
-                                                    int? pageSize = null,
-                                                    long? limit = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadFaxOptions(){From = from, To = to, DateCreatedOnOrBefore = dateCreatedOnOrBefore, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all faxes.
-        /// </summary>
-        /// <param name="from"> Retrieve only those faxes sent from this phone number </param>
-        /// <param name="to"> Retrieve only those faxes sent to this phone number </param>
-        /// <param name="dateCreatedOnOrBefore"> Retrieve only faxes created on or before this date </param>
-        /// <param name="dateCreatedAfter"> Retrieve only faxes created after this date </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fax </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FaxResource>> ReadAsync(string from = null,
-                                                                                            string to = null,
-                                                                                            DateTime? dateCreatedOnOrBefore = null,
-                                                                                            DateTime? dateCreatedAfter = null,
-                                                                                            int? pageSize = null,
-                                                                                            long? limit = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadFaxOptions(){From = from, To = to, DateCreatedOnOrBefore = dateCreatedOnOrBefore, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FaxResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FaxResource>.FromJson("faxes", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FaxResource> NextPage(Page<FaxResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Fax)
-            );
-
-            var response = client.Request(request);
-            return Page<FaxResource>.FromJson("faxes", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FaxResource> PreviousPage(Page<FaxResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Fax)
-            );
-
-            var response = client.Request(request);
-            return Page<FaxResource>.FromJson("faxes", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateFaxOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Fax,
-                "/v1/Faxes",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new fax to send to a phone number or SIP endpoint.
-        /// </summary>
-        /// <param name="options"> Create Fax parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fax </returns>
-        public static FaxResource Create(CreateFaxOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new fax to send to a phone number or SIP endpoint.
-        /// </summary>
-        /// <param name="options"> Create Fax parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fax </returns>
-        public static async System.Threading.Tasks.Task<FaxResource> CreateAsync(CreateFaxOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new fax to send to a phone number or SIP endpoint.
-        /// </summary>
-        /// <param name="to"> The phone number to receive the fax </param>
-        /// <param name="mediaUrl"> The URL of the PDF that contains the fax </param>
-        /// <param name="quality"> The quality of this fax </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="from"> The number the fax was sent from </param>
-        /// <param name="sipAuthUsername"> The username for SIP authentication </param>
-        /// <param name="sipAuthPassword"> The password for SIP authentication </param>
-        /// <param name="storeMedia"> Whether to store a copy of the sent media </param>
-        /// <param name="ttl"> How long in minutes to try to send the fax </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fax </returns>
-        public static FaxResource Create(string to,
-                                         Uri mediaUrl,
-                                         FaxResource.QualityEnum quality = null,
-                                         Uri statusCallback = null,
-                                         string from = null,
-                                         string sipAuthUsername = null,
-                                         string sipAuthPassword = null,
-                                         bool? storeMedia = null,
-                                         int? ttl = null,
-                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateFaxOptions(to, mediaUrl){Quality = quality, StatusCallback = statusCallback, From = from, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, StoreMedia = storeMedia, Ttl = ttl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new fax to send to a phone number or SIP endpoint.
-        /// </summary>
-        /// <param name="to"> The phone number to receive the fax </param>
-        /// <param name="mediaUrl"> The URL of the PDF that contains the fax </param>
-        /// <param name="quality"> The quality of this fax </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="from"> The number the fax was sent from </param>
-        /// <param name="sipAuthUsername"> The username for SIP authentication </param>
-        /// <param name="sipAuthPassword"> The password for SIP authentication </param>
-        /// <param name="storeMedia"> Whether to store a copy of the sent media </param>
-        /// <param name="ttl"> How long in minutes to try to send the fax </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fax </returns>
-        public static async System.Threading.Tasks.Task<FaxResource> CreateAsync(string to,
-                                                                                 Uri mediaUrl,
-                                                                                 FaxResource.QualityEnum quality = null,
-                                                                                 Uri statusCallback = null,
-                                                                                 string from = null,
-                                                                                 string sipAuthUsername = null,
-                                                                                 string sipAuthPassword = null,
-                                                                                 bool? storeMedia = null,
-                                                                                 int? ttl = null,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateFaxOptions(to, mediaUrl){Quality = quality, StatusCallback = statusCallback, From = from, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, StoreMedia = storeMedia, Ttl = ttl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateFaxOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Fax,
-                "/v1/Faxes/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific fax.
-        /// </summary>
-        /// <param name="options"> Update Fax parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fax </returns>
-        public static FaxResource Update(UpdateFaxOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific fax.
-        /// </summary>
-        /// <param name="options"> Update Fax parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fax </returns>
-        public static async System.Threading.Tasks.Task<FaxResource> UpdateAsync(UpdateFaxOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific fax.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fax </returns>
-        public static FaxResource Update(string pathSid,
-                                         FaxResource.UpdateStatusEnum status = null,
-                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateFaxOptions(pathSid){Status = status};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific fax.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fax </returns>
-        public static async System.Threading.Tasks.Task<FaxResource> UpdateAsync(string pathSid,
-                                                                                 FaxResource.UpdateStatusEnum status = null,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateFaxOptions(pathSid){Status = status};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteFaxOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Fax,
-                "/v1/Faxes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific fax and its associated media.
-        /// </summary>
-        /// <param name="options"> Delete Fax parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fax </returns>
-        public static bool Delete(DeleteFaxOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific fax and its associated media.
-        /// </summary>
-        /// <param name="options"> Delete Fax parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fax </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFaxOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific fax and its associated media.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fax </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFaxOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific fax and its associated media.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fax </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFaxOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FaxResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FaxResource object represented by the provided JSON </returns>
-        public static FaxResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FaxResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The number the fax was sent from
-        /// </summary>
-        [JsonProperty("from")]
-        public string From { get; private set; }
-        /// <summary>
-        /// The phone number that received the fax
-        /// </summary>
-        [JsonProperty("to")]
-        public string To { get; private set; }
-        /// <summary>
-        /// The quality of the fax
-        /// </summary>
-        [JsonProperty("quality")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FaxResource.QualityEnum Quality { get; private set; }
-        /// <summary>
-        /// The SID of the FaxMedia resource that is associated with the Fax
-        /// </summary>
-        [JsonProperty("media_sid")]
-        public string MediaSid { get; private set; }
-        /// <summary>
-        /// The Twilio-hosted URL that can be used to download fax media
-        /// </summary>
-        [JsonProperty("media_url")]
-        public string MediaUrl { get; private set; }
-        /// <summary>
-        /// The number of pages contained in the fax document
-        /// </summary>
-        [JsonProperty("num_pages")]
-        public int? NumPages { get; private set; }
-        /// <summary>
-        /// The time it took to transmit the fax
-        /// </summary>
-        [JsonProperty("duration")]
-        public int? Duration { get; private set; }
-        /// <summary>
-        /// The status of the fax
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FaxResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The direction of the fax
-        /// </summary>
-        [JsonProperty("direction")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FaxResource.DirectionEnum Direction { get; private set; }
-        /// <summary>
-        /// The API version used to transmit the fax
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The fax transmission price
-        /// </summary>
-        [JsonProperty("price")]
-        public decimal? Price { get; private set; }
-        /// <summary>
-        /// The ISO 4217 currency used for billing
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The ISO 8601 formatted date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 formatted date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URLs of the fax's related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The absolute URL of the fax resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private FaxResource()
-        {
-
-        }
-    }
+{
+
+  public class FaxResource : Resource
+  {
+    public sealed class DirectionEnum : StringEnum
+    {
+      private DirectionEnum(string value) : base(value) { }
+      public DirectionEnum() { }
+      public static implicit operator DirectionEnum(string value)
+      {
+        return new DirectionEnum(value);
+      }
+
+      public static readonly DirectionEnum Inbound = new DirectionEnum("inbound");
+      public static readonly DirectionEnum Outbound = new DirectionEnum("outbound");
+    }
+
+    public sealed class QualityEnum : StringEnum
+    {
+      private QualityEnum(string value) : base(value) { }
+      public QualityEnum() { }
+      public static implicit operator QualityEnum(string value)
+      {
+        return new QualityEnum(value);
+      }
+
+      public static readonly QualityEnum Standard = new QualityEnum("standard");
+      public static readonly QualityEnum Fine = new QualityEnum("fine");
+      public static readonly QualityEnum Superfine = new QualityEnum("superfine");
+    }
+
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Queued = new StatusEnum("queued");
+      public static readonly StatusEnum Processing = new StatusEnum("processing");
+      public static readonly StatusEnum Sending = new StatusEnum("sending");
+      public static readonly StatusEnum Delivered = new StatusEnum("delivered");
+      public static readonly StatusEnum Receiving = new StatusEnum("receiving");
+      public static readonly StatusEnum Received = new StatusEnum("received");
+      public static readonly StatusEnum NoAnswer = new StatusEnum("no-answer");
+      public static readonly StatusEnum Busy = new StatusEnum("busy");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+      public static readonly StatusEnum Canceled = new StatusEnum("canceled");
+    }
+
+    public sealed class UpdateStatusEnum : StringEnum
+    {
+      private UpdateStatusEnum(string value) : base(value) { }
+      public UpdateStatusEnum() { }
+      public static implicit operator UpdateStatusEnum(string value)
+      {
+        return new UpdateStatusEnum(value);
+      }
+
+      public static readonly UpdateStatusEnum Canceled = new UpdateStatusEnum("canceled");
+    }
+
+    private static Request BuildFetchRequest(FetchFaxOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Fax,
+          "/v1/Faxes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific fax.
+    /// </summary>
+    /// <param name="options"> Fetch Fax parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fax </returns>
+    public static FaxResource Fetch(FetchFaxOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific fax.
+    /// </summary>
+    /// <param name="options"> Fetch Fax parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fax </returns>
+    public static async System.Threading.Tasks.Task<FaxResource> FetchAsync(FetchFaxOptions options,
+                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific fax.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fax </returns>
+    public static FaxResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchFaxOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific fax.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fax </returns>
+    public static async System.Threading.Tasks.Task<FaxResource> FetchAsync(string pathSid,
+                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchFaxOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadFaxOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Fax,
+          "/v1/Faxes",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all faxes.
+    /// </summary>
+    /// <param name="options"> Read Fax parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fax </returns>
+    public static ResourceSet<FaxResource> Read(ReadFaxOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FaxResource>.FromJson("faxes", response.Content);
+      return new ResourceSet<FaxResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all faxes.
+    /// </summary>
+    /// <param name="options"> Read Fax parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fax </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FaxResource>> ReadAsync(ReadFaxOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FaxResource>.FromJson("faxes", response.Content);
+      return new ResourceSet<FaxResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all faxes.
+    /// </summary>
+    /// <param name="from"> Retrieve only those faxes sent from this phone number </param>
+    /// <param name="to"> Retrieve only those faxes sent to this phone number </param>
+    /// <param name="dateCreatedOnOrBefore"> Retrieve only faxes created on or before this date </param>
+    /// <param name="dateCreatedAfter"> Retrieve only faxes created after this date </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fax </returns>
+    public static ResourceSet<FaxResource> Read(string from = null,
+                                                string to = null,
+                                                DateTime? dateCreatedOnOrBefore = null,
+                                                DateTime? dateCreatedAfter = null,
+                                                int? pageSize = null,
+                                                long? limit = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadFaxOptions() { From = from, To = to, DateCreatedOnOrBefore = dateCreatedOnOrBefore, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all faxes.
+    /// </summary>
+    /// <param name="from"> Retrieve only those faxes sent from this phone number </param>
+    /// <param name="to"> Retrieve only those faxes sent to this phone number </param>
+    /// <param name="dateCreatedOnOrBefore"> Retrieve only faxes created on or before this date </param>
+    /// <param name="dateCreatedAfter"> Retrieve only faxes created after this date </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fax </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FaxResource>> ReadAsync(string from = null,
+                                                                                        string to = null,
+                                                                                        DateTime? dateCreatedOnOrBefore = null,
+                                                                                        DateTime? dateCreatedAfter = null,
+                                                                                        int? pageSize = null,
+                                                                                        long? limit = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadFaxOptions() { From = from, To = to, DateCreatedOnOrBefore = dateCreatedOnOrBefore, DateCreatedAfter = dateCreatedAfter, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FaxResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FaxResource>.FromJson("faxes", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FaxResource> NextPage(Page<FaxResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Fax)
+      );
+
+      var response = client.Request(request);
+      return Page<FaxResource>.FromJson("faxes", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FaxResource> PreviousPage(Page<FaxResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Fax)
+      );
+
+      var response = client.Request(request);
+      return Page<FaxResource>.FromJson("faxes", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateFaxOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Fax,
+          "/v1/Faxes",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new fax to send to a phone number or SIP endpoint.
+    /// </summary>
+    /// <param name="options"> Create Fax parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fax </returns>
+    public static FaxResource Create(CreateFaxOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new fax to send to a phone number or SIP endpoint.
+    /// </summary>
+    /// <param name="options"> Create Fax parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fax </returns>
+    public static async System.Threading.Tasks.Task<FaxResource> CreateAsync(CreateFaxOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new fax to send to a phone number or SIP endpoint.
+    /// </summary>
+    /// <param name="to"> The phone number to receive the fax </param>
+    /// <param name="mediaUrl"> The URL of the PDF that contains the fax </param>
+    /// <param name="quality"> The quality of this fax </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="from"> The number the fax was sent from </param>
+    /// <param name="sipAuthUsername"> The username for SIP authentication </param>
+    /// <param name="sipAuthPassword"> The password for SIP authentication </param>
+    /// <param name="storeMedia"> Whether to store a copy of the sent media </param>
+    /// <param name="ttl"> How long in minutes to try to send the fax </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fax </returns>
+    public static FaxResource Create(string to,
+                                     Uri mediaUrl,
+                                     FaxResource.QualityEnum quality = null,
+                                     Uri statusCallback = null,
+                                     string from = null,
+                                     string sipAuthUsername = null,
+                                     string sipAuthPassword = null,
+                                     bool? storeMedia = null,
+                                     int? ttl = null,
+                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateFaxOptions(to, mediaUrl) { Quality = quality, StatusCallback = statusCallback, From = from, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, StoreMedia = storeMedia, Ttl = ttl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new fax to send to a phone number or SIP endpoint.
+    /// </summary>
+    /// <param name="to"> The phone number to receive the fax </param>
+    /// <param name="mediaUrl"> The URL of the PDF that contains the fax </param>
+    /// <param name="quality"> The quality of this fax </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="from"> The number the fax was sent from </param>
+    /// <param name="sipAuthUsername"> The username for SIP authentication </param>
+    /// <param name="sipAuthPassword"> The password for SIP authentication </param>
+    /// <param name="storeMedia"> Whether to store a copy of the sent media </param>
+    /// <param name="ttl"> How long in minutes to try to send the fax </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fax </returns>
+    public static async System.Threading.Tasks.Task<FaxResource> CreateAsync(string to,
+                                                                             Uri mediaUrl,
+                                                                             FaxResource.QualityEnum quality = null,
+                                                                             Uri statusCallback = null,
+                                                                             string from = null,
+                                                                             string sipAuthUsername = null,
+                                                                             string sipAuthPassword = null,
+                                                                             bool? storeMedia = null,
+                                                                             int? ttl = null,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateFaxOptions(to, mediaUrl) { Quality = quality, StatusCallback = statusCallback, From = from, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, StoreMedia = storeMedia, Ttl = ttl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateFaxOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Fax,
+          "/v1/Faxes/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific fax.
+    /// </summary>
+    /// <param name="options"> Update Fax parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fax </returns>
+    public static FaxResource Update(UpdateFaxOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific fax.
+    /// </summary>
+    /// <param name="options"> Update Fax parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fax </returns>
+    public static async System.Threading.Tasks.Task<FaxResource> UpdateAsync(UpdateFaxOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific fax.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fax </returns>
+    public static FaxResource Update(string pathSid,
+                                     FaxResource.UpdateStatusEnum status = null,
+                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateFaxOptions(pathSid) { Status = status };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific fax.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fax </returns>
+    public static async System.Threading.Tasks.Task<FaxResource> UpdateAsync(string pathSid,
+                                                                             FaxResource.UpdateStatusEnum status = null,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateFaxOptions(pathSid) { Status = status };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteFaxOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Fax,
+          "/v1/Faxes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific fax and its associated media.
+    /// </summary>
+    /// <param name="options"> Delete Fax parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fax </returns>
+    public static bool Delete(DeleteFaxOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific fax and its associated media.
+    /// </summary>
+    /// <param name="options"> Delete Fax parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fax </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFaxOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific fax and its associated media.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fax </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFaxOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific fax and its associated media.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fax </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFaxOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FaxResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FaxResource object represented by the provided JSON </returns>
+    public static FaxResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FaxResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The number the fax was sent from
+    /// </summary>
+    [JsonProperty("from")]
+    public string From { get; private set; }
+    /// <summary>
+    /// The phone number that received the fax
+    /// </summary>
+    [JsonProperty("to")]
+    public string To { get; private set; }
+    /// <summary>
+    /// The quality of the fax
+    /// </summary>
+    [JsonProperty("quality")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FaxResource.QualityEnum Quality { get; private set; }
+    /// <summary>
+    /// The SID of the FaxMedia resource that is associated with the Fax
+    /// </summary>
+    [JsonProperty("media_sid")]
+    public string MediaSid { get; private set; }
+    /// <summary>
+    /// The Twilio-hosted URL that can be used to download fax media
+    /// </summary>
+    [JsonProperty("media_url")]
+    public string MediaUrl { get; private set; }
+    /// <summary>
+    /// The number of pages contained in the fax document
+    /// </summary>
+    [JsonProperty("num_pages")]
+    public int? NumPages { get; private set; }
+    /// <summary>
+    /// The time it took to transmit the fax
+    /// </summary>
+    [JsonProperty("duration")]
+    public int? Duration { get; private set; }
+    /// <summary>
+    /// The status of the fax
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FaxResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The direction of the fax
+    /// </summary>
+    [JsonProperty("direction")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FaxResource.DirectionEnum Direction { get; private set; }
+    /// <summary>
+    /// The API version used to transmit the fax
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The fax transmission price
+    /// </summary>
+    [JsonProperty("price")]
+    public decimal? Price { get; private set; }
+    /// <summary>
+    /// The ISO 4217 currency used for billing
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The ISO 8601 formatted date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 formatted date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URLs of the fax's related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The absolute URL of the fax resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private FaxResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/FlexApi/V1/ChannelOptions.cs b/src/Twilio/Rest/FlexApi/V1/ChannelOptions.cs
index 39d698f34..de09b3b63 100644
--- a/src/Twilio/Rest/FlexApi/V1/ChannelOptions.cs
+++ b/src/Twilio/Rest/FlexApi/V1/ChannelOptions.cs
@@ -9,208 +9,208 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.FlexApi.V1
-{
-
+{
+
+  /// <summary>
+  /// ReadChannelOptions
+  /// </summary>
+  public class ReadChannelOptions : ReadOptions<ChannelResource>
+  {
     /// <summary>
-    /// ReadChannelOptions
-    /// </summary>
-    public class ReadChannelOptions : ReadOptions<ChannelResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchChannelOptions
+  /// </summary>
+  public class FetchChannelOptions : IOptions<ChannelResource>
+  {
     /// <summary>
-    /// FetchChannelOptions
+    /// The SID that identifies the Flex chat channel resource to fetch
     /// </summary>
-    public class FetchChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The SID that identifies the Flex chat channel resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchChannelOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the Flex chat channel resource to fetch </param>
-        public FetchChannelOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateChannelOptions
-    /// </summary>
-    public class CreateChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Flex Flow
-        /// </summary>
-        public string FlexFlowSid { get; }
-        /// <summary>
-        /// The identity value that identifies the new resource's chat User
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The chat participant's friendly name
-        /// </summary>
-        public string ChatUserFriendlyName { get; }
-        /// <summary>
-        /// The chat channel's friendly name
-        /// </summary>
-        public string ChatFriendlyName { get; }
-        /// <summary>
-        /// The Target Contact Identity
-        /// </summary>
-        public string Target { get; set; }
-        /// <summary>
-        /// The chat channel's unique name
-        /// </summary>
-        public string ChatUniqueName { get; set; }
-        /// <summary>
-        /// The pre-engagement data
-        /// </summary>
-        public string PreEngagementData { get; set; }
-        /// <summary>
-        /// The SID of the TaskRouter Task
-        /// </summary>
-        public string TaskSid { get; set; }
-        /// <summary>
-        /// The Task attributes to be added for the TaskRouter Task
-        /// </summary>
-        public string TaskAttributes { get; set; }
-        /// <summary>
-        /// Whether to create the channel as long-lived
-        /// </summary>
-        public bool? LongLived { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateChannelOptions
-        /// </summary>
-        /// <param name="flexFlowSid"> The SID of the Flex Flow </param>
-        /// <param name="identity"> The identity value that identifies the new resource's chat User </param>
-        /// <param name="chatUserFriendlyName"> The chat participant's friendly name </param>
-        /// <param name="chatFriendlyName"> The chat channel's friendly name </param>
-        public CreateChannelOptions(string flexFlowSid,
-                                    string identity,
-                                    string chatUserFriendlyName,
-                                    string chatFriendlyName)
-        {
-            FlexFlowSid = flexFlowSid;
-            Identity = identity;
-            ChatUserFriendlyName = chatUserFriendlyName;
-            ChatFriendlyName = chatFriendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FlexFlowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FlexFlowSid", FlexFlowSid.ToString()));
-            }
-
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (ChatUserFriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChatUserFriendlyName", ChatUserFriendlyName));
-            }
-
-            if (ChatFriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChatFriendlyName", ChatFriendlyName));
-            }
-
-            if (Target != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Target", Target));
-            }
-
-            if (ChatUniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChatUniqueName", ChatUniqueName));
-            }
-
-            if (PreEngagementData != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PreEngagementData", PreEngagementData));
-            }
-
-            if (TaskSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskSid", TaskSid.ToString()));
-            }
-
-            if (TaskAttributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskAttributes", TaskAttributes));
-            }
-
-            if (LongLived != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LongLived", LongLived.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchChannelOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the Flex chat channel resource to fetch </param>
+    public FetchChannelOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// DeleteChannelOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Flex chat channel resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteChannelOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Flex chat channel resource to delete </param>
-        public DeleteChannelOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateChannelOptions
+  /// </summary>
+  public class CreateChannelOptions : IOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Flex Flow
+    /// </summary>
+    public string FlexFlowSid { get; }
+    /// <summary>
+    /// The identity value that identifies the new resource's chat User
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The chat participant's friendly name
+    /// </summary>
+    public string ChatUserFriendlyName { get; }
+    /// <summary>
+    /// The chat channel's friendly name
+    /// </summary>
+    public string ChatFriendlyName { get; }
+    /// <summary>
+    /// The Target Contact Identity
+    /// </summary>
+    public string Target { get; set; }
+    /// <summary>
+    /// The chat channel's unique name
+    /// </summary>
+    public string ChatUniqueName { get; set; }
+    /// <summary>
+    /// The pre-engagement data
+    /// </summary>
+    public string PreEngagementData { get; set; }
+    /// <summary>
+    /// The SID of the TaskRouter Task
+    /// </summary>
+    public string TaskSid { get; set; }
+    /// <summary>
+    /// The Task attributes to be added for the TaskRouter Task
+    /// </summary>
+    public string TaskAttributes { get; set; }
+    /// <summary>
+    /// Whether to create the channel as long-lived
+    /// </summary>
+    public bool? LongLived { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateChannelOptions
+    /// </summary>
+    /// <param name="flexFlowSid"> The SID of the Flex Flow </param>
+    /// <param name="identity"> The identity value that identifies the new resource's chat User </param>
+    /// <param name="chatUserFriendlyName"> The chat participant's friendly name </param>
+    /// <param name="chatFriendlyName"> The chat channel's friendly name </param>
+    public CreateChannelOptions(string flexFlowSid,
+                                string identity,
+                                string chatUserFriendlyName,
+                                string chatFriendlyName)
+    {
+      FlexFlowSid = flexFlowSid;
+      Identity = identity;
+      ChatUserFriendlyName = chatUserFriendlyName;
+      ChatFriendlyName = chatFriendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FlexFlowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FlexFlowSid", FlexFlowSid.ToString()));
+      }
+
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (ChatUserFriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChatUserFriendlyName", ChatUserFriendlyName));
+      }
+
+      if (ChatFriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChatFriendlyName", ChatFriendlyName));
+      }
+
+      if (Target != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Target", Target));
+      }
+
+      if (ChatUniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChatUniqueName", ChatUniqueName));
+      }
+
+      if (PreEngagementData != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PreEngagementData", PreEngagementData));
+      }
+
+      if (TaskSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskSid", TaskSid.ToString()));
+      }
+
+      if (TaskAttributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskAttributes", TaskAttributes));
+      }
+
+      if (LongLived != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LongLived", LongLived.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteChannelOptions
+  /// </summary>
+  public class DeleteChannelOptions : IOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Flex chat channel resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteChannelOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Flex chat channel resource to delete </param>
+    public DeleteChannelOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/FlexApi/V1/ChannelResource.cs b/src/Twilio/Rest/FlexApi/V1/ChannelResource.cs
index f56a387f1..22ac60775 100644
--- a/src/Twilio/Rest/FlexApi/V1/ChannelResource.cs
+++ b/src/Twilio/Rest/FlexApi/V1/ChannelResource.cs
@@ -16,439 +16,439 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.FlexApi.V1
-{
-
-    public class ChannelResource : Resource
-    {
-        private static Request BuildReadRequest(ReadChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.FlexApi,
-                "/v1/Channels",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ResourceSet<ChannelResource> Read(ReadChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ChannelResource>.FromJson("flex_chat_channels", response.Content);
-            return new ResourceSet<ChannelResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(ReadChannelOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ChannelResource>.FromJson("flex_chat_channels", response.Content);
-            return new ResourceSet<ChannelResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ResourceSet<ChannelResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadChannelOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadChannelOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("flex_chat_channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ChannelResource> NextPage(Page<ChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.FlexApi)
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("flex_chat_channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ChannelResource> PreviousPage(Page<ChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.FlexApi)
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("flex_chat_channels", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.FlexApi,
-                "/v1/Channels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Fetch(FetchChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(FetchChannelOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the Flex chat channel resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchChannelOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the Flex chat channel resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchChannelOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.FlexApi,
-                "/v1/Channels",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Create(CreateChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(CreateChannelOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="flexFlowSid"> The SID of the Flex Flow </param>
-        /// <param name="identity"> The identity value that identifies the new resource's chat User </param>
-        /// <param name="chatUserFriendlyName"> The chat participant's friendly name </param>
-        /// <param name="chatFriendlyName"> The chat channel's friendly name </param>
-        /// <param name="target"> The Target Contact Identity </param>
-        /// <param name="chatUniqueName"> The chat channel's unique name </param>
-        /// <param name="preEngagementData"> The pre-engagement data </param>
-        /// <param name="taskSid"> The SID of the TaskRouter Task </param>
-        /// <param name="taskAttributes"> The Task attributes to be added for the TaskRouter Task </param>
-        /// <param name="longLived"> Whether to create the channel as long-lived </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Create(string flexFlowSid,
-                                             string identity,
-                                             string chatUserFriendlyName,
-                                             string chatFriendlyName,
-                                             string target = null,
-                                             string chatUniqueName = null,
-                                             string preEngagementData = null,
-                                             string taskSid = null,
-                                             string taskAttributes = null,
-                                             bool? longLived = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateChannelOptions(flexFlowSid, identity, chatUserFriendlyName, chatFriendlyName){Target = target, ChatUniqueName = chatUniqueName, PreEngagementData = preEngagementData, TaskSid = taskSid, TaskAttributes = taskAttributes, LongLived = longLived};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="flexFlowSid"> The SID of the Flex Flow </param>
-        /// <param name="identity"> The identity value that identifies the new resource's chat User </param>
-        /// <param name="chatUserFriendlyName"> The chat participant's friendly name </param>
-        /// <param name="chatFriendlyName"> The chat channel's friendly name </param>
-        /// <param name="target"> The Target Contact Identity </param>
-        /// <param name="chatUniqueName"> The chat channel's unique name </param>
-        /// <param name="preEngagementData"> The pre-engagement data </param>
-        /// <param name="taskSid"> The SID of the TaskRouter Task </param>
-        /// <param name="taskAttributes"> The Task attributes to be added for the TaskRouter Task </param>
-        /// <param name="longLived"> Whether to create the channel as long-lived </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(string flexFlowSid,
-                                                                                     string identity,
-                                                                                     string chatUserFriendlyName,
-                                                                                     string chatFriendlyName,
-                                                                                     string target = null,
-                                                                                     string chatUniqueName = null,
-                                                                                     string preEngagementData = null,
-                                                                                     string taskSid = null,
-                                                                                     string taskAttributes = null,
-                                                                                     bool? longLived = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateChannelOptions(flexFlowSid, identity, chatUserFriendlyName, chatFriendlyName){Target = target, ChatUniqueName = chatUniqueName, PreEngagementData = preEngagementData, TaskSid = taskSid, TaskAttributes = taskAttributes, LongLived = longLived};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.FlexApi,
-                "/v1/Channels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static bool Delete(DeleteChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteChannelOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Flex chat channel resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteChannelOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Flex chat channel resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteChannelOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ChannelResource object represented by the provided JSON </returns>
-        public static ChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource and owns this Workflow
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Flex Flow
-        /// </summary>
-        [JsonProperty("flex_flow_sid")]
-        public string FlexFlowSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the chat user
-        /// </summary>
-        [JsonProperty("user_sid")]
-        public string UserSid { get; private set; }
-        /// <summary>
-        /// The SID of the TaskRouter Task
-        /// </summary>
-        [JsonProperty("task_sid")]
-        public string TaskSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Flex chat channel resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Flex chat channel was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Flex chat channel was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private ChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class ChannelResource : Resource
+  {
+    private static Request BuildReadRequest(ReadChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.FlexApi,
+          "/v1/Channels",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ResourceSet<ChannelResource> Read(ReadChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ChannelResource>.FromJson("flex_chat_channels", response.Content);
+      return new ResourceSet<ChannelResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(ReadChannelOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ChannelResource>.FromJson("flex_chat_channels", response.Content);
+      return new ResourceSet<ChannelResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ResourceSet<ChannelResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadChannelOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadChannelOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("flex_chat_channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ChannelResource> NextPage(Page<ChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.FlexApi)
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("flex_chat_channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ChannelResource> PreviousPage(Page<ChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.FlexApi)
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("flex_chat_channels", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.FlexApi,
+          "/v1/Channels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Fetch(FetchChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(FetchChannelOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the Flex chat channel resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchChannelOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the Flex chat channel resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchChannelOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.FlexApi,
+          "/v1/Channels",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Create(CreateChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(CreateChannelOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="flexFlowSid"> The SID of the Flex Flow </param>
+    /// <param name="identity"> The identity value that identifies the new resource's chat User </param>
+    /// <param name="chatUserFriendlyName"> The chat participant's friendly name </param>
+    /// <param name="chatFriendlyName"> The chat channel's friendly name </param>
+    /// <param name="target"> The Target Contact Identity </param>
+    /// <param name="chatUniqueName"> The chat channel's unique name </param>
+    /// <param name="preEngagementData"> The pre-engagement data </param>
+    /// <param name="taskSid"> The SID of the TaskRouter Task </param>
+    /// <param name="taskAttributes"> The Task attributes to be added for the TaskRouter Task </param>
+    /// <param name="longLived"> Whether to create the channel as long-lived </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Create(string flexFlowSid,
+                                         string identity,
+                                         string chatUserFriendlyName,
+                                         string chatFriendlyName,
+                                         string target = null,
+                                         string chatUniqueName = null,
+                                         string preEngagementData = null,
+                                         string taskSid = null,
+                                         string taskAttributes = null,
+                                         bool? longLived = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateChannelOptions(flexFlowSid, identity, chatUserFriendlyName, chatFriendlyName) { Target = target, ChatUniqueName = chatUniqueName, PreEngagementData = preEngagementData, TaskSid = taskSid, TaskAttributes = taskAttributes, LongLived = longLived };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="flexFlowSid"> The SID of the Flex Flow </param>
+    /// <param name="identity"> The identity value that identifies the new resource's chat User </param>
+    /// <param name="chatUserFriendlyName"> The chat participant's friendly name </param>
+    /// <param name="chatFriendlyName"> The chat channel's friendly name </param>
+    /// <param name="target"> The Target Contact Identity </param>
+    /// <param name="chatUniqueName"> The chat channel's unique name </param>
+    /// <param name="preEngagementData"> The pre-engagement data </param>
+    /// <param name="taskSid"> The SID of the TaskRouter Task </param>
+    /// <param name="taskAttributes"> The Task attributes to be added for the TaskRouter Task </param>
+    /// <param name="longLived"> Whether to create the channel as long-lived </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(string flexFlowSid,
+                                                                                 string identity,
+                                                                                 string chatUserFriendlyName,
+                                                                                 string chatFriendlyName,
+                                                                                 string target = null,
+                                                                                 string chatUniqueName = null,
+                                                                                 string preEngagementData = null,
+                                                                                 string taskSid = null,
+                                                                                 string taskAttributes = null,
+                                                                                 bool? longLived = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateChannelOptions(flexFlowSid, identity, chatUserFriendlyName, chatFriendlyName) { Target = target, ChatUniqueName = chatUniqueName, PreEngagementData = preEngagementData, TaskSid = taskSid, TaskAttributes = taskAttributes, LongLived = longLived };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.FlexApi,
+          "/v1/Channels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static bool Delete(DeleteChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteChannelOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Flex chat channel resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteChannelOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Flex chat channel resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteChannelOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ChannelResource object represented by the provided JSON </returns>
+    public static ChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource and owns this Workflow
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Flex Flow
+    /// </summary>
+    [JsonProperty("flex_flow_sid")]
+    public string FlexFlowSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the chat user
+    /// </summary>
+    [JsonProperty("user_sid")]
+    public string UserSid { get; private set; }
+    /// <summary>
+    /// The SID of the TaskRouter Task
+    /// </summary>
+    [JsonProperty("task_sid")]
+    public string TaskSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Flex chat channel resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Flex chat channel was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Flex chat channel was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private ChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/FlexApi/V1/ConfigurationOptions.cs b/src/Twilio/Rest/FlexApi/V1/ConfigurationOptions.cs
index 166512856..f94b7309b 100644
--- a/src/Twilio/Rest/FlexApi/V1/ConfigurationOptions.cs
+++ b/src/Twilio/Rest/FlexApi/V1/ConfigurationOptions.cs
@@ -9,61 +9,61 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.FlexApi.V1
-{
-
+{
+
+  /// <summary>
+  /// FetchConfigurationOptions
+  /// </summary>
+  public class FetchConfigurationOptions : IOptions<ConfigurationResource>
+  {
     /// <summary>
-    /// FetchConfigurationOptions
+    /// The Pinned UI version of the Configuration resource to fetch
     /// </summary>
-    public class FetchConfigurationOptions : IOptions<ConfigurationResource>
-    {
-        /// <summary>
-        /// The Pinned UI version of the Configuration resource to fetch
-        /// </summary>
-        public string UiVersion { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UiVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UiVersion", UiVersion));
-            }
-
-            return p;
-        }
-    }
-
+    public string UiVersion { get; set; }
+
     /// <summary>
-    /// CreateConfigurationOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateConfigurationOptions : IOptions<ConfigurationResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UiVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UiVersion", UiVersion));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateConfigurationOptions
+  /// </summary>
+  public class CreateConfigurationOptions : IOptions<ConfigurationResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateConfigurationOptions
+  /// </summary>
+  public class UpdateConfigurationOptions : IOptions<ConfigurationResource>
+  {
     /// <summary>
-    /// UpdateConfigurationOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateConfigurationOptions : IOptions<ConfigurationResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/FlexApi/V1/ConfigurationResource.cs b/src/Twilio/Rest/FlexApi/V1/ConfigurationResource.cs
index c98b0f47b..92dc808cb 100644
--- a/src/Twilio/Rest/FlexApi/V1/ConfigurationResource.cs
+++ b/src/Twilio/Rest/FlexApi/V1/ConfigurationResource.cs
@@ -17,453 +17,453 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.FlexApi.V1
-{
-
-    public class ConfigurationResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Ok = new StatusEnum("ok");
-            public static readonly StatusEnum Inprogress = new StatusEnum("inprogress");
-            public static readonly StatusEnum Notstarted = new StatusEnum("notstarted");
-        }
-
-        private static Request BuildFetchRequest(FetchConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.FlexApi,
-                "/v1/Configuration",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Fetch(FetchConfigurationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> FetchAsync(FetchConfigurationOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="uiVersion"> The Pinned UI version of the Configuration resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Fetch(string uiVersion = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchConfigurationOptions(){UiVersion = uiVersion};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="uiVersion"> The Pinned UI version of the Configuration resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> FetchAsync(string uiVersion = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchConfigurationOptions(){UiVersion = uiVersion};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.FlexApi,
-                "/v1/Configuration",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Create(CreateConfigurationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> CreateAsync(CreateConfigurationOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Create(ITwilioRestClient client = null)
-        {
-            var options = new CreateConfigurationOptions();
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> CreateAsync(ITwilioRestClient client = null)
-        {
-            var options = new CreateConfigurationOptions();
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.FlexApi,
-                "/v1/Configuration",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Update(UpdateConfigurationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Configuration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> UpdateAsync(UpdateConfigurationOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Configuration </returns>
-        public static ConfigurationResource Update(ITwilioRestClient client = null)
-        {
-            var options = new UpdateConfigurationOptions();
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Configuration </returns>
-        public static async System.Threading.Tasks.Task<ConfigurationResource> UpdateAsync(ITwilioRestClient client = null)
-        {
-            var options = new UpdateConfigurationOptions();
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ConfigurationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ConfigurationResource object represented by the provided JSON </returns>
-        public static ConfigurationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ConfigurationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Configuration resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Configuration resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// An object that contains application-specific data
-        /// </summary>
-        [JsonProperty("attributes")]
-        public object Attributes { get; private set; }
-        /// <summary>
-        /// The status of the Flex onboarding
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ConfigurationResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The SID of the TaskRouter Workspace
-        /// </summary>
-        [JsonProperty("taskrouter_workspace_sid")]
-        public string TaskrouterWorkspaceSid { get; private set; }
-        /// <summary>
-        /// The SID of the TaskRouter target Workflow
-        /// </summary>
-        [JsonProperty("taskrouter_target_workflow_sid")]
-        public string TaskrouterTargetWorkflowSid { get; private set; }
-        /// <summary>
-        /// The SID of the TaskRouter Target TaskQueue
-        /// </summary>
-        [JsonProperty("taskrouter_target_taskqueue_sid")]
-        public string TaskrouterTargetTaskqueueSid { get; private set; }
-        /// <summary>
-        /// The list of TaskRouter TaskQueues
-        /// </summary>
-        [JsonProperty("taskrouter_taskqueues")]
-        public List<object> TaskrouterTaskqueues { get; private set; }
-        /// <summary>
-        /// The Skill description for TaskRouter workers
-        /// </summary>
-        [JsonProperty("taskrouter_skills")]
-        public List<object> TaskrouterSkills { get; private set; }
-        /// <summary>
-        /// The TaskRouter default channel capacities and availability for workers
-        /// </summary>
-        [JsonProperty("taskrouter_worker_channels")]
-        public object TaskrouterWorkerChannels { get; private set; }
-        /// <summary>
-        /// The TaskRouter Worker attributes
-        /// </summary>
-        [JsonProperty("taskrouter_worker_attributes")]
-        public object TaskrouterWorkerAttributes { get; private set; }
-        /// <summary>
-        /// The TaskRouter SID of the offline activity
-        /// </summary>
-        [JsonProperty("taskrouter_offline_activity_sid")]
-        public string TaskrouterOfflineActivitySid { get; private set; }
-        /// <summary>
-        /// The URL where the Flex instance is hosted
-        /// </summary>
-        [JsonProperty("runtime_domain")]
-        public Uri RuntimeDomain { get; private set; }
-        /// <summary>
-        /// The SID of the Messaging service instance
-        /// </summary>
-        [JsonProperty("messaging_service_instance_sid")]
-        public string MessagingServiceInstanceSid { get; private set; }
-        /// <summary>
-        /// The SID of the chat service this user belongs to
-        /// </summary>
-        [JsonProperty("chat_service_instance_sid")]
-        public string ChatServiceInstanceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Flex service instance
-        /// </summary>
-        [JsonProperty("flex_service_instance_sid")]
-        public string FlexServiceInstanceSid { get; private set; }
-        /// <summary>
-        /// The primary language of the Flex UI
-        /// </summary>
-        [JsonProperty("ui_language")]
-        public string UiLanguage { get; private set; }
-        /// <summary>
-        /// The object that describes Flex UI characteristics and settings
-        /// </summary>
-        [JsonProperty("ui_attributes")]
-        public object UiAttributes { get; private set; }
-        /// <summary>
-        /// The object that defines the NPM packages and versions to be used in Hosted Flex
-        /// </summary>
-        [JsonProperty("ui_dependencies")]
-        public object UiDependencies { get; private set; }
-        /// <summary>
-        /// The Pinned UI version
-        /// </summary>
-        [JsonProperty("ui_version")]
-        public string UiVersion { get; private set; }
-        /// <summary>
-        /// The Flex Service version
-        /// </summary>
-        [JsonProperty("service_version")]
-        public string ServiceVersion { get; private set; }
-        /// <summary>
-        /// Whether call recording is enabled
-        /// </summary>
-        [JsonProperty("call_recording_enabled")]
-        public bool? CallRecordingEnabled { get; private set; }
-        /// <summary>
-        /// The call recording webhook URL
-        /// </summary>
-        [JsonProperty("call_recording_webhook_url")]
-        public Uri CallRecordingWebhookUrl { get; private set; }
-        /// <summary>
-        /// Whether CRM is present for Flex
-        /// </summary>
-        [JsonProperty("crm_enabled")]
-        public bool? CrmEnabled { get; private set; }
-        /// <summary>
-        /// The CRM Type
-        /// </summary>
-        [JsonProperty("crm_type")]
-        public string CrmType { get; private set; }
-        /// <summary>
-        /// The CRM Callback URL
-        /// </summary>
-        [JsonProperty("crm_callback_url")]
-        public Uri CrmCallbackUrl { get; private set; }
-        /// <summary>
-        /// The CRM Fallback URL
-        /// </summary>
-        [JsonProperty("crm_fallback_url")]
-        public Uri CrmFallbackUrl { get; private set; }
-        /// <summary>
-        /// An object that contains the CRM attributes
-        /// </summary>
-        [JsonProperty("crm_attributes")]
-        public object CrmAttributes { get; private set; }
-        /// <summary>
-        /// The list of public attributes
-        /// </summary>
-        [JsonProperty("public_attributes")]
-        public object PublicAttributes { get; private set; }
-        /// <summary>
-        /// Whether the plugin service enabled
-        /// </summary>
-        [JsonProperty("plugin_service_enabled")]
-        public bool? PluginServiceEnabled { get; private set; }
-        /// <summary>
-        /// The plugin service attributes
-        /// </summary>
-        [JsonProperty("plugin_service_attributes")]
-        public object PluginServiceAttributes { get; private set; }
-        /// <summary>
-        /// A list of objects that contain the configurations for the Integrations supported in this configuration
-        /// </summary>
-        [JsonProperty("integrations")]
-        public List<object> Integrations { get; private set; }
-        /// <summary>
-        /// The list of outbound call flows
-        /// </summary>
-        [JsonProperty("outbound_call_flows")]
-        public object OutboundCallFlows { get; private set; }
-        /// <summary>
-        /// The list of serverless service SIDs
-        /// </summary>
-        [JsonProperty("serverless_service_sids")]
-        public List<string> ServerlessServiceSids { get; private set; }
-        /// <summary>
-        /// Configurable parameters for Queues Statistics
-        /// </summary>
-        [JsonProperty("queue_stats_configuration")]
-        public object QueueStatsConfiguration { get; private set; }
-        /// <summary>
-        /// Configurable parameters for Notifications
-        /// </summary>
-        [JsonProperty("notifications")]
-        public object Notifications { get; private set; }
-        /// <summary>
-        /// Configurable parameters for Markdown
-        /// </summary>
-        [JsonProperty("markdown")]
-        public object Markdown { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Configuration resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Object that controls workspace reporting
-        /// </summary>
-        [JsonProperty("flex_insights_hr")]
-        public object FlexInsightsHr { get; private set; }
-        /// <summary>
-        /// Setting to enable Flex UI redirection
-        /// </summary>
-        [JsonProperty("flex_insights_drilldown")]
-        public bool? FlexInsightsDrilldown { get; private set; }
-        /// <summary>
-        /// URL to redirect to in case drilldown is enabled.
-        /// </summary>
-        [JsonProperty("flex_url")]
-        public Uri FlexUrl { get; private set; }
-
-        private ConfigurationResource()
-        {
-
-        }
-    }
+{
+
+  public class ConfigurationResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Ok = new StatusEnum("ok");
+      public static readonly StatusEnum Inprogress = new StatusEnum("inprogress");
+      public static readonly StatusEnum Notstarted = new StatusEnum("notstarted");
+    }
+
+    private static Request BuildFetchRequest(FetchConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.FlexApi,
+          "/v1/Configuration",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Fetch(FetchConfigurationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> FetchAsync(FetchConfigurationOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="uiVersion"> The Pinned UI version of the Configuration resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Fetch(string uiVersion = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchConfigurationOptions() { UiVersion = uiVersion };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="uiVersion"> The Pinned UI version of the Configuration resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> FetchAsync(string uiVersion = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchConfigurationOptions() { UiVersion = uiVersion };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.FlexApi,
+          "/v1/Configuration",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Create(CreateConfigurationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> CreateAsync(CreateConfigurationOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Create(ITwilioRestClient client = null)
+    {
+      var options = new CreateConfigurationOptions();
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> CreateAsync(ITwilioRestClient client = null)
+    {
+      var options = new CreateConfigurationOptions();
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.FlexApi,
+          "/v1/Configuration",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Update(UpdateConfigurationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Configuration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> UpdateAsync(UpdateConfigurationOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Configuration </returns>
+    public static ConfigurationResource Update(ITwilioRestClient client = null)
+    {
+      var options = new UpdateConfigurationOptions();
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Configuration </returns>
+    public static async System.Threading.Tasks.Task<ConfigurationResource> UpdateAsync(ITwilioRestClient client = null)
+    {
+      var options = new UpdateConfigurationOptions();
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ConfigurationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ConfigurationResource object represented by the provided JSON </returns>
+    public static ConfigurationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ConfigurationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Configuration resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Configuration resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// An object that contains application-specific data
+    /// </summary>
+    [JsonProperty("attributes")]
+    public object Attributes { get; private set; }
+    /// <summary>
+    /// The status of the Flex onboarding
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ConfigurationResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The SID of the TaskRouter Workspace
+    /// </summary>
+    [JsonProperty("taskrouter_workspace_sid")]
+    public string TaskrouterWorkspaceSid { get; private set; }
+    /// <summary>
+    /// The SID of the TaskRouter target Workflow
+    /// </summary>
+    [JsonProperty("taskrouter_target_workflow_sid")]
+    public string TaskrouterTargetWorkflowSid { get; private set; }
+    /// <summary>
+    /// The SID of the TaskRouter Target TaskQueue
+    /// </summary>
+    [JsonProperty("taskrouter_target_taskqueue_sid")]
+    public string TaskrouterTargetTaskqueueSid { get; private set; }
+    /// <summary>
+    /// The list of TaskRouter TaskQueues
+    /// </summary>
+    [JsonProperty("taskrouter_taskqueues")]
+    public List<object> TaskrouterTaskqueues { get; private set; }
+    /// <summary>
+    /// The Skill description for TaskRouter workers
+    /// </summary>
+    [JsonProperty("taskrouter_skills")]
+    public List<object> TaskrouterSkills { get; private set; }
+    /// <summary>
+    /// The TaskRouter default channel capacities and availability for workers
+    /// </summary>
+    [JsonProperty("taskrouter_worker_channels")]
+    public object TaskrouterWorkerChannels { get; private set; }
+    /// <summary>
+    /// The TaskRouter Worker attributes
+    /// </summary>
+    [JsonProperty("taskrouter_worker_attributes")]
+    public object TaskrouterWorkerAttributes { get; private set; }
+    /// <summary>
+    /// The TaskRouter SID of the offline activity
+    /// </summary>
+    [JsonProperty("taskrouter_offline_activity_sid")]
+    public string TaskrouterOfflineActivitySid { get; private set; }
+    /// <summary>
+    /// The URL where the Flex instance is hosted
+    /// </summary>
+    [JsonProperty("runtime_domain")]
+    public Uri RuntimeDomain { get; private set; }
+    /// <summary>
+    /// The SID of the Messaging service instance
+    /// </summary>
+    [JsonProperty("messaging_service_instance_sid")]
+    public string MessagingServiceInstanceSid { get; private set; }
+    /// <summary>
+    /// The SID of the chat service this user belongs to
+    /// </summary>
+    [JsonProperty("chat_service_instance_sid")]
+    public string ChatServiceInstanceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Flex service instance
+    /// </summary>
+    [JsonProperty("flex_service_instance_sid")]
+    public string FlexServiceInstanceSid { get; private set; }
+    /// <summary>
+    /// The primary language of the Flex UI
+    /// </summary>
+    [JsonProperty("ui_language")]
+    public string UiLanguage { get; private set; }
+    /// <summary>
+    /// The object that describes Flex UI characteristics and settings
+    /// </summary>
+    [JsonProperty("ui_attributes")]
+    public object UiAttributes { get; private set; }
+    /// <summary>
+    /// The object that defines the NPM packages and versions to be used in Hosted Flex
+    /// </summary>
+    [JsonProperty("ui_dependencies")]
+    public object UiDependencies { get; private set; }
+    /// <summary>
+    /// The Pinned UI version
+    /// </summary>
+    [JsonProperty("ui_version")]
+    public string UiVersion { get; private set; }
+    /// <summary>
+    /// The Flex Service version
+    /// </summary>
+    [JsonProperty("service_version")]
+    public string ServiceVersion { get; private set; }
+    /// <summary>
+    /// Whether call recording is enabled
+    /// </summary>
+    [JsonProperty("call_recording_enabled")]
+    public bool? CallRecordingEnabled { get; private set; }
+    /// <summary>
+    /// The call recording webhook URL
+    /// </summary>
+    [JsonProperty("call_recording_webhook_url")]
+    public Uri CallRecordingWebhookUrl { get; private set; }
+    /// <summary>
+    /// Whether CRM is present for Flex
+    /// </summary>
+    [JsonProperty("crm_enabled")]
+    public bool? CrmEnabled { get; private set; }
+    /// <summary>
+    /// The CRM Type
+    /// </summary>
+    [JsonProperty("crm_type")]
+    public string CrmType { get; private set; }
+    /// <summary>
+    /// The CRM Callback URL
+    /// </summary>
+    [JsonProperty("crm_callback_url")]
+    public Uri CrmCallbackUrl { get; private set; }
+    /// <summary>
+    /// The CRM Fallback URL
+    /// </summary>
+    [JsonProperty("crm_fallback_url")]
+    public Uri CrmFallbackUrl { get; private set; }
+    /// <summary>
+    /// An object that contains the CRM attributes
+    /// </summary>
+    [JsonProperty("crm_attributes")]
+    public object CrmAttributes { get; private set; }
+    /// <summary>
+    /// The list of public attributes
+    /// </summary>
+    [JsonProperty("public_attributes")]
+    public object PublicAttributes { get; private set; }
+    /// <summary>
+    /// Whether the plugin service enabled
+    /// </summary>
+    [JsonProperty("plugin_service_enabled")]
+    public bool? PluginServiceEnabled { get; private set; }
+    /// <summary>
+    /// The plugin service attributes
+    /// </summary>
+    [JsonProperty("plugin_service_attributes")]
+    public object PluginServiceAttributes { get; private set; }
+    /// <summary>
+    /// A list of objects that contain the configurations for the Integrations supported in this configuration
+    /// </summary>
+    [JsonProperty("integrations")]
+    public List<object> Integrations { get; private set; }
+    /// <summary>
+    /// The list of outbound call flows
+    /// </summary>
+    [JsonProperty("outbound_call_flows")]
+    public object OutboundCallFlows { get; private set; }
+    /// <summary>
+    /// The list of serverless service SIDs
+    /// </summary>
+    [JsonProperty("serverless_service_sids")]
+    public List<string> ServerlessServiceSids { get; private set; }
+    /// <summary>
+    /// Configurable parameters for Queues Statistics
+    /// </summary>
+    [JsonProperty("queue_stats_configuration")]
+    public object QueueStatsConfiguration { get; private set; }
+    /// <summary>
+    /// Configurable parameters for Notifications
+    /// </summary>
+    [JsonProperty("notifications")]
+    public object Notifications { get; private set; }
+    /// <summary>
+    /// Configurable parameters for Markdown
+    /// </summary>
+    [JsonProperty("markdown")]
+    public object Markdown { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Configuration resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Object that controls workspace reporting
+    /// </summary>
+    [JsonProperty("flex_insights_hr")]
+    public object FlexInsightsHr { get; private set; }
+    /// <summary>
+    /// Setting to enable Flex UI redirection
+    /// </summary>
+    [JsonProperty("flex_insights_drilldown")]
+    public bool? FlexInsightsDrilldown { get; private set; }
+    /// <summary>
+    /// URL to redirect to in case drilldown is enabled.
+    /// </summary>
+    [JsonProperty("flex_url")]
+    public Uri FlexUrl { get; private set; }
+
+    private ConfigurationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/FlexApi/V1/FlexFlowOptions.cs b/src/Twilio/Rest/FlexApi/V1/FlexFlowOptions.cs
index b508b7170..d93225325 100644
--- a/src/Twilio/Rest/FlexApi/V1/FlexFlowOptions.cs
+++ b/src/Twilio/Rest/FlexApi/V1/FlexFlowOptions.cs
@@ -9,460 +9,460 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.FlexApi.V1
-{
-
+{
+
+  /// <summary>
+  /// ReadFlexFlowOptions
+  /// </summary>
+  public class ReadFlexFlowOptions : ReadOptions<FlexFlowResource>
+  {
     /// <summary>
-    /// ReadFlexFlowOptions
+    /// The `friendly_name` of the Flex Flow resources to read
     /// </summary>
-    public class ReadFlexFlowOptions : ReadOptions<FlexFlowResource>
-    {
-        /// <summary>
-        /// The `friendly_name` of the Flex Flow resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
+
     /// <summary>
-    /// FetchFlexFlowOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchFlexFlowOptions : IOptions<FlexFlowResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFlexFlowOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchFlexFlowOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchFlexFlowOptions
+  /// </summary>
+  public class FetchFlexFlowOptions : IOptions<FlexFlowResource>
+  {
     /// <summary>
-    /// CreateFlexFlowOptions
-    /// </summary>
-    public class CreateFlexFlowOptions : IOptions<FlexFlowResource>
-    {
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The SID of the chat service
-        /// </summary>
-        public string ChatServiceSid { get; }
-        /// <summary>
-        /// The channel type
-        /// </summary>
-        public FlexFlowResource.ChannelTypeEnum ChannelType { get; }
-        /// <summary>
-        /// The channel contact's Identity
-        /// </summary>
-        public string ContactIdentity { get; set; }
-        /// <summary>
-        /// Whether the new Flex Flow is enabled
-        /// </summary>
-        public bool? Enabled { get; set; }
-        /// <summary>
-        /// The software that will handle inbound messages.
-        /// </summary>
-        public FlexFlowResource.IntegrationTypeEnum IntegrationType { get; set; }
-        /// <summary>
-        /// The SID of the Studio Flow
-        /// </summary>
-        public string IntegrationFlowSid { get; set; }
-        /// <summary>
-        /// The External Webhook URL
-        /// </summary>
-        public Uri IntegrationUrl { get; set; }
-        /// <summary>
-        /// The Workspace SID for a new Task
-        /// </summary>
-        public string IntegrationWorkspaceSid { get; set; }
-        /// <summary>
-        /// The Workflow SID for a new Task
-        /// </summary>
-        public string IntegrationWorkflowSid { get; set; }
-        /// <summary>
-        /// The Task Channel for a new Task
-        /// </summary>
-        public string IntegrationChannel { get; set; }
-        /// <summary>
-        /// The Task timeout in seconds for a new Task
-        /// </summary>
-        public int? IntegrationTimeout { get; set; }
-        /// <summary>
-        /// The Task priority of a new Task
-        /// </summary>
-        public int? IntegrationPriority { get; set; }
-        /// <summary>
-        /// Whether to create a Task when the first message arrives
-        /// </summary>
-        public bool? IntegrationCreationOnMessage { get; set; }
-        /// <summary>
-        /// Reuse this chat channel for future interactions with a contact
-        /// </summary>
-        public bool? LongLived { get; set; }
-        /// <summary>
-        /// Remove active Proxy sessions if the corresponding Task is deleted
-        /// </summary>
-        public bool? JanitorEnabled { get; set; }
-        /// <summary>
-        /// The number of times to retry the webhook if the first attempt fails
-        /// </summary>
-        public int? IntegrationRetryCount { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateFlexFlowOptions
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="chatServiceSid"> The SID of the chat service </param>
-        /// <param name="channelType"> The channel type </param>
-        public CreateFlexFlowOptions(string friendlyName,
-                                     string chatServiceSid,
-                                     FlexFlowResource.ChannelTypeEnum channelType)
-        {
-            FriendlyName = friendlyName;
-            ChatServiceSid = chatServiceSid;
-            ChannelType = channelType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (ChatServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChatServiceSid", ChatServiceSid.ToString()));
-            }
-
-            if (ChannelType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelType", ChannelType.ToString()));
-            }
-
-            if (ContactIdentity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ContactIdentity", ContactIdentity));
-            }
-
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            if (IntegrationType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IntegrationType", IntegrationType.ToString()));
-            }
-
-            if (IntegrationFlowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.FlowSid", IntegrationFlowSid.ToString()));
-            }
-
-            if (IntegrationUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.Url", Serializers.Url(IntegrationUrl)));
-            }
-
-            if (IntegrationWorkspaceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.WorkspaceSid", IntegrationWorkspaceSid.ToString()));
-            }
-
-            if (IntegrationWorkflowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.WorkflowSid", IntegrationWorkflowSid.ToString()));
-            }
-
-            if (IntegrationChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.Channel", IntegrationChannel));
-            }
-
-            if (IntegrationTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.Timeout", IntegrationTimeout.ToString()));
-            }
-
-            if (IntegrationPriority != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.Priority", IntegrationPriority.ToString()));
-            }
-
-            if (IntegrationCreationOnMessage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.CreationOnMessage", IntegrationCreationOnMessage.Value.ToString().ToLower()));
-            }
-
-            if (LongLived != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LongLived", LongLived.Value.ToString().ToLower()));
-            }
-
-            if (JanitorEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("JanitorEnabled", JanitorEnabled.Value.ToString().ToLower()));
-            }
-
-            if (IntegrationRetryCount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.RetryCount", IntegrationRetryCount.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// UpdateFlexFlowOptions
-    /// </summary>
-    public class UpdateFlexFlowOptions : IOptions<FlexFlowResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The SID of the chat service
-        /// </summary>
-        public string ChatServiceSid { get; set; }
-        /// <summary>
-        /// The channel type
-        /// </summary>
-        public FlexFlowResource.ChannelTypeEnum ChannelType { get; set; }
-        /// <summary>
-        /// The channel contact's Identity
-        /// </summary>
-        public string ContactIdentity { get; set; }
-        /// <summary>
-        /// Whether the new Flex Flow is enabled
-        /// </summary>
-        public bool? Enabled { get; set; }
-        /// <summary>
-        /// The software that will handle inbound messages.
-        /// </summary>
-        public FlexFlowResource.IntegrationTypeEnum IntegrationType { get; set; }
-        /// <summary>
-        /// The SID of the Studio Flow
-        /// </summary>
-        public string IntegrationFlowSid { get; set; }
-        /// <summary>
-        /// The External Webhook URL
-        /// </summary>
-        public Uri IntegrationUrl { get; set; }
-        /// <summary>
-        /// The Workspace SID for a new Task
-        /// </summary>
-        public string IntegrationWorkspaceSid { get; set; }
-        /// <summary>
-        /// The Workflow SID for a new Task
-        /// </summary>
-        public string IntegrationWorkflowSid { get; set; }
-        /// <summary>
-        /// The Task Channel for a new Task
-        /// </summary>
-        public string IntegrationChannel { get; set; }
-        /// <summary>
-        /// The Task timeout in seconds for a new Task
-        /// </summary>
-        public int? IntegrationTimeout { get; set; }
-        /// <summary>
-        /// The Task priority of a new Task
-        /// </summary>
-        public int? IntegrationPriority { get; set; }
-        /// <summary>
-        /// Whether to create a Task when the first message arrives
-        /// </summary>
-        public bool? IntegrationCreationOnMessage { get; set; }
-        /// <summary>
-        /// Reuse this chat channel for future interactions with a contact
-        /// </summary>
-        public bool? LongLived { get; set; }
-        /// <summary>
-        /// Remove active Proxy sessions if the corresponding Task is deleted
-        /// </summary>
-        public bool? JanitorEnabled { get; set; }
-        /// <summary>
-        /// The number of times to retry the webhook if the first attempt fails
-        /// </summary>
-        public int? IntegrationRetryCount { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateFlexFlowOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        public UpdateFlexFlowOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (ChatServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChatServiceSid", ChatServiceSid.ToString()));
-            }
-
-            if (ChannelType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelType", ChannelType.ToString()));
-            }
-
-            if (ContactIdentity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ContactIdentity", ContactIdentity));
-            }
-
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            if (IntegrationType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IntegrationType", IntegrationType.ToString()));
-            }
-
-            if (IntegrationFlowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.FlowSid", IntegrationFlowSid.ToString()));
-            }
-
-            if (IntegrationUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.Url", Serializers.Url(IntegrationUrl)));
-            }
-
-            if (IntegrationWorkspaceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.WorkspaceSid", IntegrationWorkspaceSid.ToString()));
-            }
-
-            if (IntegrationWorkflowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.WorkflowSid", IntegrationWorkflowSid.ToString()));
-            }
-
-            if (IntegrationChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.Channel", IntegrationChannel));
-            }
-
-            if (IntegrationTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.Timeout", IntegrationTimeout.ToString()));
-            }
-
-            if (IntegrationPriority != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.Priority", IntegrationPriority.ToString()));
-            }
-
-            if (IntegrationCreationOnMessage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.CreationOnMessage", IntegrationCreationOnMessage.Value.ToString().ToLower()));
-            }
-
-            if (LongLived != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LongLived", LongLived.Value.ToString().ToLower()));
-            }
-
-            if (JanitorEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("JanitorEnabled", JanitorEnabled.Value.ToString().ToLower()));
-            }
-
-            if (IntegrationRetryCount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Integration.RetryCount", IntegrationRetryCount.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchFlexFlowOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchFlexFlowOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// DeleteFlexFlowOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteFlexFlowOptions : IOptions<FlexFlowResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFlexFlowOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeleteFlexFlowOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateFlexFlowOptions
+  /// </summary>
+  public class CreateFlexFlowOptions : IOptions<FlexFlowResource>
+  {
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The SID of the chat service
+    /// </summary>
+    public string ChatServiceSid { get; }
+    /// <summary>
+    /// The channel type
+    /// </summary>
+    public FlexFlowResource.ChannelTypeEnum ChannelType { get; }
+    /// <summary>
+    /// The channel contact's Identity
+    /// </summary>
+    public string ContactIdentity { get; set; }
+    /// <summary>
+    /// Whether the new Flex Flow is enabled
+    /// </summary>
+    public bool? Enabled { get; set; }
+    /// <summary>
+    /// The software that will handle inbound messages.
+    /// </summary>
+    public FlexFlowResource.IntegrationTypeEnum IntegrationType { get; set; }
+    /// <summary>
+    /// The SID of the Studio Flow
+    /// </summary>
+    public string IntegrationFlowSid { get; set; }
+    /// <summary>
+    /// The External Webhook URL
+    /// </summary>
+    public Uri IntegrationUrl { get; set; }
+    /// <summary>
+    /// The Workspace SID for a new Task
+    /// </summary>
+    public string IntegrationWorkspaceSid { get; set; }
+    /// <summary>
+    /// The Workflow SID for a new Task
+    /// </summary>
+    public string IntegrationWorkflowSid { get; set; }
+    /// <summary>
+    /// The Task Channel for a new Task
+    /// </summary>
+    public string IntegrationChannel { get; set; }
+    /// <summary>
+    /// The Task timeout in seconds for a new Task
+    /// </summary>
+    public int? IntegrationTimeout { get; set; }
+    /// <summary>
+    /// The Task priority of a new Task
+    /// </summary>
+    public int? IntegrationPriority { get; set; }
+    /// <summary>
+    /// Whether to create a Task when the first message arrives
+    /// </summary>
+    public bool? IntegrationCreationOnMessage { get; set; }
+    /// <summary>
+    /// Reuse this chat channel for future interactions with a contact
+    /// </summary>
+    public bool? LongLived { get; set; }
+    /// <summary>
+    /// Remove active Proxy sessions if the corresponding Task is deleted
+    /// </summary>
+    public bool? JanitorEnabled { get; set; }
+    /// <summary>
+    /// The number of times to retry the webhook if the first attempt fails
+    /// </summary>
+    public int? IntegrationRetryCount { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateFlexFlowOptions
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="chatServiceSid"> The SID of the chat service </param>
+    /// <param name="channelType"> The channel type </param>
+    public CreateFlexFlowOptions(string friendlyName,
+                                 string chatServiceSid,
+                                 FlexFlowResource.ChannelTypeEnum channelType)
+    {
+      FriendlyName = friendlyName;
+      ChatServiceSid = chatServiceSid;
+      ChannelType = channelType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (ChatServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChatServiceSid", ChatServiceSid.ToString()));
+      }
+
+      if (ChannelType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelType", ChannelType.ToString()));
+      }
+
+      if (ContactIdentity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ContactIdentity", ContactIdentity));
+      }
+
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      if (IntegrationType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IntegrationType", IntegrationType.ToString()));
+      }
+
+      if (IntegrationFlowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.FlowSid", IntegrationFlowSid.ToString()));
+      }
+
+      if (IntegrationUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.Url", Serializers.Url(IntegrationUrl)));
+      }
+
+      if (IntegrationWorkspaceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.WorkspaceSid", IntegrationWorkspaceSid.ToString()));
+      }
+
+      if (IntegrationWorkflowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.WorkflowSid", IntegrationWorkflowSid.ToString()));
+      }
+
+      if (IntegrationChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.Channel", IntegrationChannel));
+      }
+
+      if (IntegrationTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.Timeout", IntegrationTimeout.ToString()));
+      }
+
+      if (IntegrationPriority != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.Priority", IntegrationPriority.ToString()));
+      }
+
+      if (IntegrationCreationOnMessage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.CreationOnMessage", IntegrationCreationOnMessage.Value.ToString().ToLower()));
+      }
+
+      if (LongLived != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LongLived", LongLived.Value.ToString().ToLower()));
+      }
+
+      if (JanitorEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("JanitorEnabled", JanitorEnabled.Value.ToString().ToLower()));
+      }
+
+      if (IntegrationRetryCount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.RetryCount", IntegrationRetryCount.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateFlexFlowOptions
+  /// </summary>
+  public class UpdateFlexFlowOptions : IOptions<FlexFlowResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The SID of the chat service
+    /// </summary>
+    public string ChatServiceSid { get; set; }
+    /// <summary>
+    /// The channel type
+    /// </summary>
+    public FlexFlowResource.ChannelTypeEnum ChannelType { get; set; }
+    /// <summary>
+    /// The channel contact's Identity
+    /// </summary>
+    public string ContactIdentity { get; set; }
+    /// <summary>
+    /// Whether the new Flex Flow is enabled
+    /// </summary>
+    public bool? Enabled { get; set; }
+    /// <summary>
+    /// The software that will handle inbound messages.
+    /// </summary>
+    public FlexFlowResource.IntegrationTypeEnum IntegrationType { get; set; }
+    /// <summary>
+    /// The SID of the Studio Flow
+    /// </summary>
+    public string IntegrationFlowSid { get; set; }
+    /// <summary>
+    /// The External Webhook URL
+    /// </summary>
+    public Uri IntegrationUrl { get; set; }
+    /// <summary>
+    /// The Workspace SID for a new Task
+    /// </summary>
+    public string IntegrationWorkspaceSid { get; set; }
+    /// <summary>
+    /// The Workflow SID for a new Task
+    /// </summary>
+    public string IntegrationWorkflowSid { get; set; }
+    /// <summary>
+    /// The Task Channel for a new Task
+    /// </summary>
+    public string IntegrationChannel { get; set; }
+    /// <summary>
+    /// The Task timeout in seconds for a new Task
+    /// </summary>
+    public int? IntegrationTimeout { get; set; }
+    /// <summary>
+    /// The Task priority of a new Task
+    /// </summary>
+    public int? IntegrationPriority { get; set; }
+    /// <summary>
+    /// Whether to create a Task when the first message arrives
+    /// </summary>
+    public bool? IntegrationCreationOnMessage { get; set; }
+    /// <summary>
+    /// Reuse this chat channel for future interactions with a contact
+    /// </summary>
+    public bool? LongLived { get; set; }
+    /// <summary>
+    /// Remove active Proxy sessions if the corresponding Task is deleted
+    /// </summary>
+    public bool? JanitorEnabled { get; set; }
+    /// <summary>
+    /// The number of times to retry the webhook if the first attempt fails
+    /// </summary>
+    public int? IntegrationRetryCount { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateFlexFlowOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    public UpdateFlexFlowOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (ChatServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChatServiceSid", ChatServiceSid.ToString()));
+      }
+
+      if (ChannelType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelType", ChannelType.ToString()));
+      }
+
+      if (ContactIdentity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ContactIdentity", ContactIdentity));
+      }
+
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      if (IntegrationType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IntegrationType", IntegrationType.ToString()));
+      }
+
+      if (IntegrationFlowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.FlowSid", IntegrationFlowSid.ToString()));
+      }
+
+      if (IntegrationUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.Url", Serializers.Url(IntegrationUrl)));
+      }
+
+      if (IntegrationWorkspaceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.WorkspaceSid", IntegrationWorkspaceSid.ToString()));
+      }
+
+      if (IntegrationWorkflowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.WorkflowSid", IntegrationWorkflowSid.ToString()));
+      }
+
+      if (IntegrationChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.Channel", IntegrationChannel));
+      }
+
+      if (IntegrationTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.Timeout", IntegrationTimeout.ToString()));
+      }
+
+      if (IntegrationPriority != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.Priority", IntegrationPriority.ToString()));
+      }
+
+      if (IntegrationCreationOnMessage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.CreationOnMessage", IntegrationCreationOnMessage.Value.ToString().ToLower()));
+      }
+
+      if (LongLived != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LongLived", LongLived.Value.ToString().ToLower()));
+      }
+
+      if (JanitorEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("JanitorEnabled", JanitorEnabled.Value.ToString().ToLower()));
+      }
+
+      if (IntegrationRetryCount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Integration.RetryCount", IntegrationRetryCount.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteFlexFlowOptions
+  /// </summary>
+  public class DeleteFlexFlowOptions : IOptions<FlexFlowResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteFlexFlowOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeleteFlexFlowOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/FlexApi/V1/FlexFlowResource.cs b/src/Twilio/Rest/FlexApi/V1/FlexFlowResource.cs
index d92f16c5c..5d0209940 100644
--- a/src/Twilio/Rest/FlexApi/V1/FlexFlowResource.cs
+++ b/src/Twilio/Rest/FlexApi/V1/FlexFlowResource.cs
@@ -17,670 +17,670 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.FlexApi.V1
-{
-
-    public class FlexFlowResource : Resource
-    {
-        public sealed class ChannelTypeEnum : StringEnum
-        {
-            private ChannelTypeEnum(string value) : base(value) {}
-            public ChannelTypeEnum() {}
-            public static implicit operator ChannelTypeEnum(string value)
-            {
-                return new ChannelTypeEnum(value);
-            }
-
-            public static readonly ChannelTypeEnum Web = new ChannelTypeEnum("web");
-            public static readonly ChannelTypeEnum Sms = new ChannelTypeEnum("sms");
-            public static readonly ChannelTypeEnum Facebook = new ChannelTypeEnum("facebook");
-            public static readonly ChannelTypeEnum Whatsapp = new ChannelTypeEnum("whatsapp");
-            public static readonly ChannelTypeEnum Line = new ChannelTypeEnum("line");
-            public static readonly ChannelTypeEnum Custom = new ChannelTypeEnum("custom");
-        }
-
-        public sealed class IntegrationTypeEnum : StringEnum
-        {
-            private IntegrationTypeEnum(string value) : base(value) {}
-            public IntegrationTypeEnum() {}
-            public static implicit operator IntegrationTypeEnum(string value)
-            {
-                return new IntegrationTypeEnum(value);
-            }
-
-            public static readonly IntegrationTypeEnum Studio = new IntegrationTypeEnum("studio");
-            public static readonly IntegrationTypeEnum External = new IntegrationTypeEnum("external");
-            public static readonly IntegrationTypeEnum Task = new IntegrationTypeEnum("task");
-        }
-
-        private static Request BuildReadRequest(ReadFlexFlowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.FlexApi,
-                "/v1/FlexFlows",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read FlexFlow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlexFlow </returns>
-        public static ResourceSet<FlexFlowResource> Read(ReadFlexFlowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FlexFlowResource>.FromJson("flex_flows", response.Content);
-            return new ResourceSet<FlexFlowResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read FlexFlow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlexFlow </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FlexFlowResource>> ReadAsync(ReadFlexFlowOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FlexFlowResource>.FromJson("flex_flows", response.Content);
-            return new ResourceSet<FlexFlowResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="friendlyName"> The `friendly_name` of the Flex Flow resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlexFlow </returns>
-        public static ResourceSet<FlexFlowResource> Read(string friendlyName = null,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadFlexFlowOptions(){FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="friendlyName"> The `friendly_name` of the Flex Flow resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlexFlow </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FlexFlowResource>> ReadAsync(string friendlyName = null,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadFlexFlowOptions(){FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FlexFlowResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FlexFlowResource>.FromJson("flex_flows", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FlexFlowResource> NextPage(Page<FlexFlowResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.FlexApi)
-            );
-
-            var response = client.Request(request);
-            return Page<FlexFlowResource>.FromJson("flex_flows", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FlexFlowResource> PreviousPage(Page<FlexFlowResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.FlexApi)
-            );
-
-            var response = client.Request(request);
-            return Page<FlexFlowResource>.FromJson("flex_flows", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchFlexFlowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.FlexApi,
-                "/v1/FlexFlows/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch FlexFlow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlexFlow </returns>
-        public static FlexFlowResource Fetch(FetchFlexFlowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch FlexFlow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlexFlow </returns>
-        public static async System.Threading.Tasks.Task<FlexFlowResource> FetchAsync(FetchFlexFlowOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlexFlow </returns>
-        public static FlexFlowResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchFlexFlowOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlexFlow </returns>
-        public static async System.Threading.Tasks.Task<FlexFlowResource> FetchAsync(string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchFlexFlowOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateFlexFlowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.FlexApi,
-                "/v1/FlexFlows",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create FlexFlow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlexFlow </returns>
-        public static FlexFlowResource Create(CreateFlexFlowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create FlexFlow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlexFlow </returns>
-        public static async System.Threading.Tasks.Task<FlexFlowResource> CreateAsync(CreateFlexFlowOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="chatServiceSid"> The SID of the chat service </param>
-        /// <param name="channelType"> The channel type </param>
-        /// <param name="contactIdentity"> The channel contact's Identity </param>
-        /// <param name="enabled"> Whether the new Flex Flow is enabled </param>
-        /// <param name="integrationType"> The software that will handle inbound messages. </param>
-        /// <param name="integrationFlowSid"> The SID of the Studio Flow </param>
-        /// <param name="integrationUrl"> The External Webhook URL </param>
-        /// <param name="integrationWorkspaceSid"> The Workspace SID for a new Task </param>
-        /// <param name="integrationWorkflowSid"> The Workflow SID for a new Task </param>
-        /// <param name="integrationChannel"> The Task Channel for a new Task </param>
-        /// <param name="integrationTimeout"> The Task timeout in seconds for a new Task </param>
-        /// <param name="integrationPriority"> The Task priority of a new Task </param>
-        /// <param name="integrationCreationOnMessage"> Whether to create a Task when the first message arrives </param>
-        /// <param name="longLived"> Reuse this chat channel for future interactions with a contact </param>
-        /// <param name="janitorEnabled"> Remove active Proxy sessions if the corresponding Task is deleted </param>
-        /// <param name="integrationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlexFlow </returns>
-        public static FlexFlowResource Create(string friendlyName,
-                                              string chatServiceSid,
-                                              FlexFlowResource.ChannelTypeEnum channelType,
-                                              string contactIdentity = null,
-                                              bool? enabled = null,
-                                              FlexFlowResource.IntegrationTypeEnum integrationType = null,
-                                              string integrationFlowSid = null,
-                                              Uri integrationUrl = null,
-                                              string integrationWorkspaceSid = null,
-                                              string integrationWorkflowSid = null,
-                                              string integrationChannel = null,
-                                              int? integrationTimeout = null,
-                                              int? integrationPriority = null,
-                                              bool? integrationCreationOnMessage = null,
-                                              bool? longLived = null,
-                                              bool? janitorEnabled = null,
-                                              int? integrationRetryCount = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateFlexFlowOptions(friendlyName, chatServiceSid, channelType){ContactIdentity = contactIdentity, Enabled = enabled, IntegrationType = integrationType, IntegrationFlowSid = integrationFlowSid, IntegrationUrl = integrationUrl, IntegrationWorkspaceSid = integrationWorkspaceSid, IntegrationWorkflowSid = integrationWorkflowSid, IntegrationChannel = integrationChannel, IntegrationTimeout = integrationTimeout, IntegrationPriority = integrationPriority, IntegrationCreationOnMessage = integrationCreationOnMessage, LongLived = longLived, JanitorEnabled = janitorEnabled, IntegrationRetryCount = integrationRetryCount};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="chatServiceSid"> The SID of the chat service </param>
-        /// <param name="channelType"> The channel type </param>
-        /// <param name="contactIdentity"> The channel contact's Identity </param>
-        /// <param name="enabled"> Whether the new Flex Flow is enabled </param>
-        /// <param name="integrationType"> The software that will handle inbound messages. </param>
-        /// <param name="integrationFlowSid"> The SID of the Studio Flow </param>
-        /// <param name="integrationUrl"> The External Webhook URL </param>
-        /// <param name="integrationWorkspaceSid"> The Workspace SID for a new Task </param>
-        /// <param name="integrationWorkflowSid"> The Workflow SID for a new Task </param>
-        /// <param name="integrationChannel"> The Task Channel for a new Task </param>
-        /// <param name="integrationTimeout"> The Task timeout in seconds for a new Task </param>
-        /// <param name="integrationPriority"> The Task priority of a new Task </param>
-        /// <param name="integrationCreationOnMessage"> Whether to create a Task when the first message arrives </param>
-        /// <param name="longLived"> Reuse this chat channel for future interactions with a contact </param>
-        /// <param name="janitorEnabled"> Remove active Proxy sessions if the corresponding Task is deleted </param>
-        /// <param name="integrationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlexFlow </returns>
-        public static async System.Threading.Tasks.Task<FlexFlowResource> CreateAsync(string friendlyName,
-                                                                                      string chatServiceSid,
-                                                                                      FlexFlowResource.ChannelTypeEnum channelType,
-                                                                                      string contactIdentity = null,
-                                                                                      bool? enabled = null,
-                                                                                      FlexFlowResource.IntegrationTypeEnum integrationType = null,
-                                                                                      string integrationFlowSid = null,
-                                                                                      Uri integrationUrl = null,
-                                                                                      string integrationWorkspaceSid = null,
-                                                                                      string integrationWorkflowSid = null,
-                                                                                      string integrationChannel = null,
-                                                                                      int? integrationTimeout = null,
-                                                                                      int? integrationPriority = null,
-                                                                                      bool? integrationCreationOnMessage = null,
-                                                                                      bool? longLived = null,
-                                                                                      bool? janitorEnabled = null,
-                                                                                      int? integrationRetryCount = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateFlexFlowOptions(friendlyName, chatServiceSid, channelType){ContactIdentity = contactIdentity, Enabled = enabled, IntegrationType = integrationType, IntegrationFlowSid = integrationFlowSid, IntegrationUrl = integrationUrl, IntegrationWorkspaceSid = integrationWorkspaceSid, IntegrationWorkflowSid = integrationWorkflowSid, IntegrationChannel = integrationChannel, IntegrationTimeout = integrationTimeout, IntegrationPriority = integrationPriority, IntegrationCreationOnMessage = integrationCreationOnMessage, LongLived = longLived, JanitorEnabled = janitorEnabled, IntegrationRetryCount = integrationRetryCount};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateFlexFlowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.FlexApi,
-                "/v1/FlexFlows/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update FlexFlow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlexFlow </returns>
-        public static FlexFlowResource Update(UpdateFlexFlowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update FlexFlow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlexFlow </returns>
-        public static async System.Threading.Tasks.Task<FlexFlowResource> UpdateAsync(UpdateFlexFlowOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="chatServiceSid"> The SID of the chat service </param>
-        /// <param name="channelType"> The channel type </param>
-        /// <param name="contactIdentity"> The channel contact's Identity </param>
-        /// <param name="enabled"> Whether the new Flex Flow is enabled </param>
-        /// <param name="integrationType"> The software that will handle inbound messages. </param>
-        /// <param name="integrationFlowSid"> The SID of the Studio Flow </param>
-        /// <param name="integrationUrl"> The External Webhook URL </param>
-        /// <param name="integrationWorkspaceSid"> The Workspace SID for a new Task </param>
-        /// <param name="integrationWorkflowSid"> The Workflow SID for a new Task </param>
-        /// <param name="integrationChannel"> The Task Channel for a new Task </param>
-        /// <param name="integrationTimeout"> The Task timeout in seconds for a new Task </param>
-        /// <param name="integrationPriority"> The Task priority of a new Task </param>
-        /// <param name="integrationCreationOnMessage"> Whether to create a Task when the first message arrives </param>
-        /// <param name="longLived"> Reuse this chat channel for future interactions with a contact </param>
-        /// <param name="janitorEnabled"> Remove active Proxy sessions if the corresponding Task is deleted </param>
-        /// <param name="integrationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlexFlow </returns>
-        public static FlexFlowResource Update(string pathSid,
-                                              string friendlyName = null,
-                                              string chatServiceSid = null,
-                                              FlexFlowResource.ChannelTypeEnum channelType = null,
-                                              string contactIdentity = null,
-                                              bool? enabled = null,
-                                              FlexFlowResource.IntegrationTypeEnum integrationType = null,
-                                              string integrationFlowSid = null,
-                                              Uri integrationUrl = null,
-                                              string integrationWorkspaceSid = null,
-                                              string integrationWorkflowSid = null,
-                                              string integrationChannel = null,
-                                              int? integrationTimeout = null,
-                                              int? integrationPriority = null,
-                                              bool? integrationCreationOnMessage = null,
-                                              bool? longLived = null,
-                                              bool? janitorEnabled = null,
-                                              int? integrationRetryCount = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateFlexFlowOptions(pathSid){FriendlyName = friendlyName, ChatServiceSid = chatServiceSid, ChannelType = channelType, ContactIdentity = contactIdentity, Enabled = enabled, IntegrationType = integrationType, IntegrationFlowSid = integrationFlowSid, IntegrationUrl = integrationUrl, IntegrationWorkspaceSid = integrationWorkspaceSid, IntegrationWorkflowSid = integrationWorkflowSid, IntegrationChannel = integrationChannel, IntegrationTimeout = integrationTimeout, IntegrationPriority = integrationPriority, IntegrationCreationOnMessage = integrationCreationOnMessage, LongLived = longLived, JanitorEnabled = janitorEnabled, IntegrationRetryCount = integrationRetryCount};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="chatServiceSid"> The SID of the chat service </param>
-        /// <param name="channelType"> The channel type </param>
-        /// <param name="contactIdentity"> The channel contact's Identity </param>
-        /// <param name="enabled"> Whether the new Flex Flow is enabled </param>
-        /// <param name="integrationType"> The software that will handle inbound messages. </param>
-        /// <param name="integrationFlowSid"> The SID of the Studio Flow </param>
-        /// <param name="integrationUrl"> The External Webhook URL </param>
-        /// <param name="integrationWorkspaceSid"> The Workspace SID for a new Task </param>
-        /// <param name="integrationWorkflowSid"> The Workflow SID for a new Task </param>
-        /// <param name="integrationChannel"> The Task Channel for a new Task </param>
-        /// <param name="integrationTimeout"> The Task timeout in seconds for a new Task </param>
-        /// <param name="integrationPriority"> The Task priority of a new Task </param>
-        /// <param name="integrationCreationOnMessage"> Whether to create a Task when the first message arrives </param>
-        /// <param name="longLived"> Reuse this chat channel for future interactions with a contact </param>
-        /// <param name="janitorEnabled"> Remove active Proxy sessions if the corresponding Task is deleted </param>
-        /// <param name="integrationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlexFlow </returns>
-        public static async System.Threading.Tasks.Task<FlexFlowResource> UpdateAsync(string pathSid,
-                                                                                      string friendlyName = null,
-                                                                                      string chatServiceSid = null,
-                                                                                      FlexFlowResource.ChannelTypeEnum channelType = null,
-                                                                                      string contactIdentity = null,
-                                                                                      bool? enabled = null,
-                                                                                      FlexFlowResource.IntegrationTypeEnum integrationType = null,
-                                                                                      string integrationFlowSid = null,
-                                                                                      Uri integrationUrl = null,
-                                                                                      string integrationWorkspaceSid = null,
-                                                                                      string integrationWorkflowSid = null,
-                                                                                      string integrationChannel = null,
-                                                                                      int? integrationTimeout = null,
-                                                                                      int? integrationPriority = null,
-                                                                                      bool? integrationCreationOnMessage = null,
-                                                                                      bool? longLived = null,
-                                                                                      bool? janitorEnabled = null,
-                                                                                      int? integrationRetryCount = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateFlexFlowOptions(pathSid){FriendlyName = friendlyName, ChatServiceSid = chatServiceSid, ChannelType = channelType, ContactIdentity = contactIdentity, Enabled = enabled, IntegrationType = integrationType, IntegrationFlowSid = integrationFlowSid, IntegrationUrl = integrationUrl, IntegrationWorkspaceSid = integrationWorkspaceSid, IntegrationWorkflowSid = integrationWorkflowSid, IntegrationChannel = integrationChannel, IntegrationTimeout = integrationTimeout, IntegrationPriority = integrationPriority, IntegrationCreationOnMessage = integrationCreationOnMessage, LongLived = longLived, JanitorEnabled = janitorEnabled, IntegrationRetryCount = integrationRetryCount};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteFlexFlowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.FlexApi,
-                "/v1/FlexFlows/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete FlexFlow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlexFlow </returns>
-        public static bool Delete(DeleteFlexFlowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete FlexFlow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlexFlow </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFlexFlowOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlexFlow </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFlexFlowOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlexFlow </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFlexFlowOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FlexFlowResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FlexFlowResource object represented by the provided JSON </returns>
-        public static FlexFlowResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FlexFlowResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The SID of the chat service
-        /// </summary>
-        [JsonProperty("chat_service_sid")]
-        public string ChatServiceSid { get; private set; }
-        /// <summary>
-        /// The channel type
-        /// </summary>
-        [JsonProperty("channel_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FlexFlowResource.ChannelTypeEnum ChannelType { get; private set; }
-        /// <summary>
-        /// The channel contact's Identity
-        /// </summary>
-        [JsonProperty("contact_identity")]
-        public string ContactIdentity { get; private set; }
-        /// <summary>
-        /// Whether the Flex Flow is enabled
-        /// </summary>
-        [JsonProperty("enabled")]
-        public bool? Enabled { get; private set; }
-        /// <summary>
-        /// The software that will handle inbound messages.
-        /// </summary>
-        [JsonProperty("integration_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FlexFlowResource.IntegrationTypeEnum IntegrationType { get; private set; }
-        /// <summary>
-        /// An object that contains specific parameters for the integration
-        /// </summary>
-        [JsonProperty("integration")]
-        public object Integration { get; private set; }
-        /// <summary>
-        /// Re-use this chat channel for future interactions with a contact
-        /// </summary>
-        [JsonProperty("long_lived")]
-        public bool? LongLived { get; private set; }
-        /// <summary>
-        /// Remove active Proxy sessions if the corresponding Task is deleted.
-        /// </summary>
-        [JsonProperty("janitor_enabled")]
-        public bool? JanitorEnabled { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Flex Flow resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private FlexFlowResource()
-        {
-
-        }
-    }
+{
+
+  public class FlexFlowResource : Resource
+  {
+    public sealed class ChannelTypeEnum : StringEnum
+    {
+      private ChannelTypeEnum(string value) : base(value) { }
+      public ChannelTypeEnum() { }
+      public static implicit operator ChannelTypeEnum(string value)
+      {
+        return new ChannelTypeEnum(value);
+      }
+
+      public static readonly ChannelTypeEnum Web = new ChannelTypeEnum("web");
+      public static readonly ChannelTypeEnum Sms = new ChannelTypeEnum("sms");
+      public static readonly ChannelTypeEnum Facebook = new ChannelTypeEnum("facebook");
+      public static readonly ChannelTypeEnum Whatsapp = new ChannelTypeEnum("whatsapp");
+      public static readonly ChannelTypeEnum Line = new ChannelTypeEnum("line");
+      public static readonly ChannelTypeEnum Custom = new ChannelTypeEnum("custom");
+    }
+
+    public sealed class IntegrationTypeEnum : StringEnum
+    {
+      private IntegrationTypeEnum(string value) : base(value) { }
+      public IntegrationTypeEnum() { }
+      public static implicit operator IntegrationTypeEnum(string value)
+      {
+        return new IntegrationTypeEnum(value);
+      }
+
+      public static readonly IntegrationTypeEnum Studio = new IntegrationTypeEnum("studio");
+      public static readonly IntegrationTypeEnum External = new IntegrationTypeEnum("external");
+      public static readonly IntegrationTypeEnum Task = new IntegrationTypeEnum("task");
+    }
+
+    private static Request BuildReadRequest(ReadFlexFlowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.FlexApi,
+          "/v1/FlexFlows",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read FlexFlow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlexFlow </returns>
+    public static ResourceSet<FlexFlowResource> Read(ReadFlexFlowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FlexFlowResource>.FromJson("flex_flows", response.Content);
+      return new ResourceSet<FlexFlowResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read FlexFlow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlexFlow </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FlexFlowResource>> ReadAsync(ReadFlexFlowOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FlexFlowResource>.FromJson("flex_flows", response.Content);
+      return new ResourceSet<FlexFlowResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="friendlyName"> The `friendly_name` of the Flex Flow resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlexFlow </returns>
+    public static ResourceSet<FlexFlowResource> Read(string friendlyName = null,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadFlexFlowOptions() { FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="friendlyName"> The `friendly_name` of the Flex Flow resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlexFlow </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FlexFlowResource>> ReadAsync(string friendlyName = null,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadFlexFlowOptions() { FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FlexFlowResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FlexFlowResource>.FromJson("flex_flows", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FlexFlowResource> NextPage(Page<FlexFlowResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.FlexApi)
+      );
+
+      var response = client.Request(request);
+      return Page<FlexFlowResource>.FromJson("flex_flows", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FlexFlowResource> PreviousPage(Page<FlexFlowResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.FlexApi)
+      );
+
+      var response = client.Request(request);
+      return Page<FlexFlowResource>.FromJson("flex_flows", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchFlexFlowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.FlexApi,
+          "/v1/FlexFlows/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch FlexFlow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlexFlow </returns>
+    public static FlexFlowResource Fetch(FetchFlexFlowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch FlexFlow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlexFlow </returns>
+    public static async System.Threading.Tasks.Task<FlexFlowResource> FetchAsync(FetchFlexFlowOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlexFlow </returns>
+    public static FlexFlowResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchFlexFlowOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlexFlow </returns>
+    public static async System.Threading.Tasks.Task<FlexFlowResource> FetchAsync(string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchFlexFlowOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateFlexFlowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.FlexApi,
+          "/v1/FlexFlows",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create FlexFlow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlexFlow </returns>
+    public static FlexFlowResource Create(CreateFlexFlowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create FlexFlow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlexFlow </returns>
+    public static async System.Threading.Tasks.Task<FlexFlowResource> CreateAsync(CreateFlexFlowOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="chatServiceSid"> The SID of the chat service </param>
+    /// <param name="channelType"> The channel type </param>
+    /// <param name="contactIdentity"> The channel contact's Identity </param>
+    /// <param name="enabled"> Whether the new Flex Flow is enabled </param>
+    /// <param name="integrationType"> The software that will handle inbound messages. </param>
+    /// <param name="integrationFlowSid"> The SID of the Studio Flow </param>
+    /// <param name="integrationUrl"> The External Webhook URL </param>
+    /// <param name="integrationWorkspaceSid"> The Workspace SID for a new Task </param>
+    /// <param name="integrationWorkflowSid"> The Workflow SID for a new Task </param>
+    /// <param name="integrationChannel"> The Task Channel for a new Task </param>
+    /// <param name="integrationTimeout"> The Task timeout in seconds for a new Task </param>
+    /// <param name="integrationPriority"> The Task priority of a new Task </param>
+    /// <param name="integrationCreationOnMessage"> Whether to create a Task when the first message arrives </param>
+    /// <param name="longLived"> Reuse this chat channel for future interactions with a contact </param>
+    /// <param name="janitorEnabled"> Remove active Proxy sessions if the corresponding Task is deleted </param>
+    /// <param name="integrationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlexFlow </returns>
+    public static FlexFlowResource Create(string friendlyName,
+                                          string chatServiceSid,
+                                          FlexFlowResource.ChannelTypeEnum channelType,
+                                          string contactIdentity = null,
+                                          bool? enabled = null,
+                                          FlexFlowResource.IntegrationTypeEnum integrationType = null,
+                                          string integrationFlowSid = null,
+                                          Uri integrationUrl = null,
+                                          string integrationWorkspaceSid = null,
+                                          string integrationWorkflowSid = null,
+                                          string integrationChannel = null,
+                                          int? integrationTimeout = null,
+                                          int? integrationPriority = null,
+                                          bool? integrationCreationOnMessage = null,
+                                          bool? longLived = null,
+                                          bool? janitorEnabled = null,
+                                          int? integrationRetryCount = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateFlexFlowOptions(friendlyName, chatServiceSid, channelType) { ContactIdentity = contactIdentity, Enabled = enabled, IntegrationType = integrationType, IntegrationFlowSid = integrationFlowSid, IntegrationUrl = integrationUrl, IntegrationWorkspaceSid = integrationWorkspaceSid, IntegrationWorkflowSid = integrationWorkflowSid, IntegrationChannel = integrationChannel, IntegrationTimeout = integrationTimeout, IntegrationPriority = integrationPriority, IntegrationCreationOnMessage = integrationCreationOnMessage, LongLived = longLived, JanitorEnabled = janitorEnabled, IntegrationRetryCount = integrationRetryCount };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="chatServiceSid"> The SID of the chat service </param>
+    /// <param name="channelType"> The channel type </param>
+    /// <param name="contactIdentity"> The channel contact's Identity </param>
+    /// <param name="enabled"> Whether the new Flex Flow is enabled </param>
+    /// <param name="integrationType"> The software that will handle inbound messages. </param>
+    /// <param name="integrationFlowSid"> The SID of the Studio Flow </param>
+    /// <param name="integrationUrl"> The External Webhook URL </param>
+    /// <param name="integrationWorkspaceSid"> The Workspace SID for a new Task </param>
+    /// <param name="integrationWorkflowSid"> The Workflow SID for a new Task </param>
+    /// <param name="integrationChannel"> The Task Channel for a new Task </param>
+    /// <param name="integrationTimeout"> The Task timeout in seconds for a new Task </param>
+    /// <param name="integrationPriority"> The Task priority of a new Task </param>
+    /// <param name="integrationCreationOnMessage"> Whether to create a Task when the first message arrives </param>
+    /// <param name="longLived"> Reuse this chat channel for future interactions with a contact </param>
+    /// <param name="janitorEnabled"> Remove active Proxy sessions if the corresponding Task is deleted </param>
+    /// <param name="integrationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlexFlow </returns>
+    public static async System.Threading.Tasks.Task<FlexFlowResource> CreateAsync(string friendlyName,
+                                                                                  string chatServiceSid,
+                                                                                  FlexFlowResource.ChannelTypeEnum channelType,
+                                                                                  string contactIdentity = null,
+                                                                                  bool? enabled = null,
+                                                                                  FlexFlowResource.IntegrationTypeEnum integrationType = null,
+                                                                                  string integrationFlowSid = null,
+                                                                                  Uri integrationUrl = null,
+                                                                                  string integrationWorkspaceSid = null,
+                                                                                  string integrationWorkflowSid = null,
+                                                                                  string integrationChannel = null,
+                                                                                  int? integrationTimeout = null,
+                                                                                  int? integrationPriority = null,
+                                                                                  bool? integrationCreationOnMessage = null,
+                                                                                  bool? longLived = null,
+                                                                                  bool? janitorEnabled = null,
+                                                                                  int? integrationRetryCount = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateFlexFlowOptions(friendlyName, chatServiceSid, channelType) { ContactIdentity = contactIdentity, Enabled = enabled, IntegrationType = integrationType, IntegrationFlowSid = integrationFlowSid, IntegrationUrl = integrationUrl, IntegrationWorkspaceSid = integrationWorkspaceSid, IntegrationWorkflowSid = integrationWorkflowSid, IntegrationChannel = integrationChannel, IntegrationTimeout = integrationTimeout, IntegrationPriority = integrationPriority, IntegrationCreationOnMessage = integrationCreationOnMessage, LongLived = longLived, JanitorEnabled = janitorEnabled, IntegrationRetryCount = integrationRetryCount };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateFlexFlowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.FlexApi,
+          "/v1/FlexFlows/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update FlexFlow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlexFlow </returns>
+    public static FlexFlowResource Update(UpdateFlexFlowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update FlexFlow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlexFlow </returns>
+    public static async System.Threading.Tasks.Task<FlexFlowResource> UpdateAsync(UpdateFlexFlowOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="chatServiceSid"> The SID of the chat service </param>
+    /// <param name="channelType"> The channel type </param>
+    /// <param name="contactIdentity"> The channel contact's Identity </param>
+    /// <param name="enabled"> Whether the new Flex Flow is enabled </param>
+    /// <param name="integrationType"> The software that will handle inbound messages. </param>
+    /// <param name="integrationFlowSid"> The SID of the Studio Flow </param>
+    /// <param name="integrationUrl"> The External Webhook URL </param>
+    /// <param name="integrationWorkspaceSid"> The Workspace SID for a new Task </param>
+    /// <param name="integrationWorkflowSid"> The Workflow SID for a new Task </param>
+    /// <param name="integrationChannel"> The Task Channel for a new Task </param>
+    /// <param name="integrationTimeout"> The Task timeout in seconds for a new Task </param>
+    /// <param name="integrationPriority"> The Task priority of a new Task </param>
+    /// <param name="integrationCreationOnMessage"> Whether to create a Task when the first message arrives </param>
+    /// <param name="longLived"> Reuse this chat channel for future interactions with a contact </param>
+    /// <param name="janitorEnabled"> Remove active Proxy sessions if the corresponding Task is deleted </param>
+    /// <param name="integrationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlexFlow </returns>
+    public static FlexFlowResource Update(string pathSid,
+                                          string friendlyName = null,
+                                          string chatServiceSid = null,
+                                          FlexFlowResource.ChannelTypeEnum channelType = null,
+                                          string contactIdentity = null,
+                                          bool? enabled = null,
+                                          FlexFlowResource.IntegrationTypeEnum integrationType = null,
+                                          string integrationFlowSid = null,
+                                          Uri integrationUrl = null,
+                                          string integrationWorkspaceSid = null,
+                                          string integrationWorkflowSid = null,
+                                          string integrationChannel = null,
+                                          int? integrationTimeout = null,
+                                          int? integrationPriority = null,
+                                          bool? integrationCreationOnMessage = null,
+                                          bool? longLived = null,
+                                          bool? janitorEnabled = null,
+                                          int? integrationRetryCount = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateFlexFlowOptions(pathSid) { FriendlyName = friendlyName, ChatServiceSid = chatServiceSid, ChannelType = channelType, ContactIdentity = contactIdentity, Enabled = enabled, IntegrationType = integrationType, IntegrationFlowSid = integrationFlowSid, IntegrationUrl = integrationUrl, IntegrationWorkspaceSid = integrationWorkspaceSid, IntegrationWorkflowSid = integrationWorkflowSid, IntegrationChannel = integrationChannel, IntegrationTimeout = integrationTimeout, IntegrationPriority = integrationPriority, IntegrationCreationOnMessage = integrationCreationOnMessage, LongLived = longLived, JanitorEnabled = janitorEnabled, IntegrationRetryCount = integrationRetryCount };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="chatServiceSid"> The SID of the chat service </param>
+    /// <param name="channelType"> The channel type </param>
+    /// <param name="contactIdentity"> The channel contact's Identity </param>
+    /// <param name="enabled"> Whether the new Flex Flow is enabled </param>
+    /// <param name="integrationType"> The software that will handle inbound messages. </param>
+    /// <param name="integrationFlowSid"> The SID of the Studio Flow </param>
+    /// <param name="integrationUrl"> The External Webhook URL </param>
+    /// <param name="integrationWorkspaceSid"> The Workspace SID for a new Task </param>
+    /// <param name="integrationWorkflowSid"> The Workflow SID for a new Task </param>
+    /// <param name="integrationChannel"> The Task Channel for a new Task </param>
+    /// <param name="integrationTimeout"> The Task timeout in seconds for a new Task </param>
+    /// <param name="integrationPriority"> The Task priority of a new Task </param>
+    /// <param name="integrationCreationOnMessage"> Whether to create a Task when the first message arrives </param>
+    /// <param name="longLived"> Reuse this chat channel for future interactions with a contact </param>
+    /// <param name="janitorEnabled"> Remove active Proxy sessions if the corresponding Task is deleted </param>
+    /// <param name="integrationRetryCount"> The number of times to retry the webhook if the first attempt fails </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlexFlow </returns>
+    public static async System.Threading.Tasks.Task<FlexFlowResource> UpdateAsync(string pathSid,
+                                                                                  string friendlyName = null,
+                                                                                  string chatServiceSid = null,
+                                                                                  FlexFlowResource.ChannelTypeEnum channelType = null,
+                                                                                  string contactIdentity = null,
+                                                                                  bool? enabled = null,
+                                                                                  FlexFlowResource.IntegrationTypeEnum integrationType = null,
+                                                                                  string integrationFlowSid = null,
+                                                                                  Uri integrationUrl = null,
+                                                                                  string integrationWorkspaceSid = null,
+                                                                                  string integrationWorkflowSid = null,
+                                                                                  string integrationChannel = null,
+                                                                                  int? integrationTimeout = null,
+                                                                                  int? integrationPriority = null,
+                                                                                  bool? integrationCreationOnMessage = null,
+                                                                                  bool? longLived = null,
+                                                                                  bool? janitorEnabled = null,
+                                                                                  int? integrationRetryCount = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateFlexFlowOptions(pathSid) { FriendlyName = friendlyName, ChatServiceSid = chatServiceSid, ChannelType = channelType, ContactIdentity = contactIdentity, Enabled = enabled, IntegrationType = integrationType, IntegrationFlowSid = integrationFlowSid, IntegrationUrl = integrationUrl, IntegrationWorkspaceSid = integrationWorkspaceSid, IntegrationWorkflowSid = integrationWorkflowSid, IntegrationChannel = integrationChannel, IntegrationTimeout = integrationTimeout, IntegrationPriority = integrationPriority, IntegrationCreationOnMessage = integrationCreationOnMessage, LongLived = longLived, JanitorEnabled = janitorEnabled, IntegrationRetryCount = integrationRetryCount };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteFlexFlowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.FlexApi,
+          "/v1/FlexFlows/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete FlexFlow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlexFlow </returns>
+    public static bool Delete(DeleteFlexFlowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete FlexFlow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlexFlow </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFlexFlowOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlexFlow </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFlexFlowOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlexFlow </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFlexFlowOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FlexFlowResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FlexFlowResource object represented by the provided JSON </returns>
+    public static FlexFlowResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FlexFlowResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The SID of the chat service
+    /// </summary>
+    [JsonProperty("chat_service_sid")]
+    public string ChatServiceSid { get; private set; }
+    /// <summary>
+    /// The channel type
+    /// </summary>
+    [JsonProperty("channel_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FlexFlowResource.ChannelTypeEnum ChannelType { get; private set; }
+    /// <summary>
+    /// The channel contact's Identity
+    /// </summary>
+    [JsonProperty("contact_identity")]
+    public string ContactIdentity { get; private set; }
+    /// <summary>
+    /// Whether the Flex Flow is enabled
+    /// </summary>
+    [JsonProperty("enabled")]
+    public bool? Enabled { get; private set; }
+    /// <summary>
+    /// The software that will handle inbound messages.
+    /// </summary>
+    [JsonProperty("integration_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FlexFlowResource.IntegrationTypeEnum IntegrationType { get; private set; }
+    /// <summary>
+    /// An object that contains specific parameters for the integration
+    /// </summary>
+    [JsonProperty("integration")]
+    public object Integration { get; private set; }
+    /// <summary>
+    /// Re-use this chat channel for future interactions with a contact
+    /// </summary>
+    [JsonProperty("long_lived")]
+    public bool? LongLived { get; private set; }
+    /// <summary>
+    /// Remove active Proxy sessions if the corresponding Task is deleted.
+    /// </summary>
+    [JsonProperty("janitor_enabled")]
+    public bool? JanitorEnabled { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Flex Flow resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private FlexFlowResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/FlexApi/V1/WebChannelOptions.cs b/src/Twilio/Rest/FlexApi/V1/WebChannelOptions.cs
index c57000349..12f2cb067 100644
--- a/src/Twilio/Rest/FlexApi/V1/WebChannelOptions.cs
+++ b/src/Twilio/Rest/FlexApi/V1/WebChannelOptions.cs
@@ -9,219 +9,219 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.FlexApi.V1
-{
-
+{
+
+  /// <summary>
+  /// ReadWebChannelOptions
+  /// </summary>
+  public class ReadWebChannelOptions : ReadOptions<WebChannelResource>
+  {
     /// <summary>
-    /// ReadWebChannelOptions
-    /// </summary>
-    public class ReadWebChannelOptions : ReadOptions<WebChannelResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchWebChannelOptions
+  /// </summary>
+  public class FetchWebChannelOptions : IOptions<WebChannelResource>
+  {
     /// <summary>
-    /// FetchWebChannelOptions
+    /// The SID of the WebChannel resource to fetch
     /// </summary>
-    public class FetchWebChannelOptions : IOptions<WebChannelResource>
-    {
-        /// <summary>
-        /// The SID of the WebChannel resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchWebChannelOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the WebChannel resource to fetch </param>
-        public FetchWebChannelOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateWebChannelOptions
-    /// </summary>
-    public class CreateWebChannelOptions : IOptions<WebChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Flex Flow
-        /// </summary>
-        public string FlexFlowSid { get; }
-        /// <summary>
-        /// The chat identity
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The chat participant's friendly name
-        /// </summary>
-        public string CustomerFriendlyName { get; }
-        /// <summary>
-        /// The chat channel's friendly name
-        /// </summary>
-        public string ChatFriendlyName { get; }
-        /// <summary>
-        /// The chat channel's unique name
-        /// </summary>
-        public string ChatUniqueName { get; set; }
-        /// <summary>
-        /// The pre-engagement data
-        /// </summary>
-        public string PreEngagementData { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateWebChannelOptions
-        /// </summary>
-        /// <param name="flexFlowSid"> The SID of the Flex Flow </param>
-        /// <param name="identity"> The chat identity </param>
-        /// <param name="customerFriendlyName"> The chat participant's friendly name </param>
-        /// <param name="chatFriendlyName"> The chat channel's friendly name </param>
-        public CreateWebChannelOptions(string flexFlowSid,
-                                       string identity,
-                                       string customerFriendlyName,
-                                       string chatFriendlyName)
-        {
-            FlexFlowSid = flexFlowSid;
-            Identity = identity;
-            CustomerFriendlyName = customerFriendlyName;
-            ChatFriendlyName = chatFriendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FlexFlowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FlexFlowSid", FlexFlowSid.ToString()));
-            }
-
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (CustomerFriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CustomerFriendlyName", CustomerFriendlyName));
-            }
-
-            if (ChatFriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChatFriendlyName", ChatFriendlyName));
-            }
-
-            if (ChatUniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChatUniqueName", ChatUniqueName));
-            }
-
-            if (PreEngagementData != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PreEngagementData", PreEngagementData));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchWebChannelOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the WebChannel resource to fetch </param>
+    public FetchWebChannelOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// UpdateWebChannelOptions
-    /// </summary>
-    public class UpdateWebChannelOptions : IOptions<WebChannelResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The chat status
-        /// </summary>
-        public WebChannelResource.ChatStatusEnum ChatStatus { get; set; }
-        /// <summary>
-        /// The post-engagement data
-        /// </summary>
-        public string PostEngagementData { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateWebChannelOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        public UpdateWebChannelOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ChatStatus != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChatStatus", ChatStatus.ToString()));
-            }
-
-            if (PostEngagementData != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostEngagementData", PostEngagementData));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateWebChannelOptions
+  /// </summary>
+  public class CreateWebChannelOptions : IOptions<WebChannelResource>
+  {
     /// <summary>
-    /// DeleteWebChannelOptions
+    /// The SID of the Flex Flow
     /// </summary>
-    public class DeleteWebChannelOptions : IOptions<WebChannelResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteWebChannelOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeleteWebChannelOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string FlexFlowSid { get; }
+    /// <summary>
+    /// The chat identity
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The chat participant's friendly name
+    /// </summary>
+    public string CustomerFriendlyName { get; }
+    /// <summary>
+    /// The chat channel's friendly name
+    /// </summary>
+    public string ChatFriendlyName { get; }
+    /// <summary>
+    /// The chat channel's unique name
+    /// </summary>
+    public string ChatUniqueName { get; set; }
+    /// <summary>
+    /// The pre-engagement data
+    /// </summary>
+    public string PreEngagementData { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateWebChannelOptions
+    /// </summary>
+    /// <param name="flexFlowSid"> The SID of the Flex Flow </param>
+    /// <param name="identity"> The chat identity </param>
+    /// <param name="customerFriendlyName"> The chat participant's friendly name </param>
+    /// <param name="chatFriendlyName"> The chat channel's friendly name </param>
+    public CreateWebChannelOptions(string flexFlowSid,
+                                   string identity,
+                                   string customerFriendlyName,
+                                   string chatFriendlyName)
+    {
+      FlexFlowSid = flexFlowSid;
+      Identity = identity;
+      CustomerFriendlyName = customerFriendlyName;
+      ChatFriendlyName = chatFriendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FlexFlowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FlexFlowSid", FlexFlowSid.ToString()));
+      }
+
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (CustomerFriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CustomerFriendlyName", CustomerFriendlyName));
+      }
+
+      if (ChatFriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChatFriendlyName", ChatFriendlyName));
+      }
+
+      if (ChatUniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChatUniqueName", ChatUniqueName));
+      }
+
+      if (PreEngagementData != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PreEngagementData", PreEngagementData));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateWebChannelOptions
+  /// </summary>
+  public class UpdateWebChannelOptions : IOptions<WebChannelResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The chat status
+    /// </summary>
+    public WebChannelResource.ChatStatusEnum ChatStatus { get; set; }
+    /// <summary>
+    /// The post-engagement data
+    /// </summary>
+    public string PostEngagementData { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateWebChannelOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    public UpdateWebChannelOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ChatStatus != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChatStatus", ChatStatus.ToString()));
+      }
+
+      if (PostEngagementData != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostEngagementData", PostEngagementData));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteWebChannelOptions
+  /// </summary>
+  public class DeleteWebChannelOptions : IOptions<WebChannelResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteWebChannelOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeleteWebChannelOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/FlexApi/V1/WebChannelResource.cs b/src/Twilio/Rest/FlexApi/V1/WebChannelResource.cs
index 4b4e941ee..7dddae7de 100644
--- a/src/Twilio/Rest/FlexApi/V1/WebChannelResource.cs
+++ b/src/Twilio/Rest/FlexApi/V1/WebChannelResource.cs
@@ -17,501 +17,501 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.FlexApi.V1
-{
-
-    public class WebChannelResource : Resource
-    {
-        public sealed class ChatStatusEnum : StringEnum
-        {
-            private ChatStatusEnum(string value) : base(value) {}
-            public ChatStatusEnum() {}
-            public static implicit operator ChatStatusEnum(string value)
-            {
-                return new ChatStatusEnum(value);
-            }
-
-            public static readonly ChatStatusEnum Inactive = new ChatStatusEnum("inactive");
-        }
-
-        private static Request BuildReadRequest(ReadWebChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.FlexApi,
-                "/v1/WebChannels",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read WebChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WebChannel </returns>
-        public static ResourceSet<WebChannelResource> Read(ReadWebChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<WebChannelResource>.FromJson("flex_chat_channels", response.Content);
-            return new ResourceSet<WebChannelResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read WebChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WebChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebChannelResource>> ReadAsync(ReadWebChannelOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<WebChannelResource>.FromJson("flex_chat_channels", response.Content);
-            return new ResourceSet<WebChannelResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WebChannel </returns>
-        public static ResourceSet<WebChannelResource> Read(int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadWebChannelOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WebChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebChannelResource>> ReadAsync(int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadWebChannelOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<WebChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<WebChannelResource>.FromJson("flex_chat_channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<WebChannelResource> NextPage(Page<WebChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.FlexApi)
-            );
-
-            var response = client.Request(request);
-            return Page<WebChannelResource>.FromJson("flex_chat_channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<WebChannelResource> PreviousPage(Page<WebChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.FlexApi)
-            );
-
-            var response = client.Request(request);
-            return Page<WebChannelResource>.FromJson("flex_chat_channels", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchWebChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.FlexApi,
-                "/v1/WebChannels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WebChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WebChannel </returns>
-        public static WebChannelResource Fetch(FetchWebChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WebChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WebChannel </returns>
-        public static async System.Threading.Tasks.Task<WebChannelResource> FetchAsync(FetchWebChannelOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID of the WebChannel resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WebChannel </returns>
-        public static WebChannelResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchWebChannelOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID of the WebChannel resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WebChannel </returns>
-        public static async System.Threading.Tasks.Task<WebChannelResource> FetchAsync(string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchWebChannelOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateWebChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.FlexApi,
-                "/v1/WebChannels",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create WebChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WebChannel </returns>
-        public static WebChannelResource Create(CreateWebChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create WebChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WebChannel </returns>
-        public static async System.Threading.Tasks.Task<WebChannelResource> CreateAsync(CreateWebChannelOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="flexFlowSid"> The SID of the Flex Flow </param>
-        /// <param name="identity"> The chat identity </param>
-        /// <param name="customerFriendlyName"> The chat participant's friendly name </param>
-        /// <param name="chatFriendlyName"> The chat channel's friendly name </param>
-        /// <param name="chatUniqueName"> The chat channel's unique name </param>
-        /// <param name="preEngagementData"> The pre-engagement data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WebChannel </returns>
-        public static WebChannelResource Create(string flexFlowSid,
-                                                string identity,
-                                                string customerFriendlyName,
-                                                string chatFriendlyName,
-                                                string chatUniqueName = null,
-                                                string preEngagementData = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateWebChannelOptions(flexFlowSid, identity, customerFriendlyName, chatFriendlyName){ChatUniqueName = chatUniqueName, PreEngagementData = preEngagementData};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="flexFlowSid"> The SID of the Flex Flow </param>
-        /// <param name="identity"> The chat identity </param>
-        /// <param name="customerFriendlyName"> The chat participant's friendly name </param>
-        /// <param name="chatFriendlyName"> The chat channel's friendly name </param>
-        /// <param name="chatUniqueName"> The chat channel's unique name </param>
-        /// <param name="preEngagementData"> The pre-engagement data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WebChannel </returns>
-        public static async System.Threading.Tasks.Task<WebChannelResource> CreateAsync(string flexFlowSid,
-                                                                                        string identity,
-                                                                                        string customerFriendlyName,
-                                                                                        string chatFriendlyName,
-                                                                                        string chatUniqueName = null,
-                                                                                        string preEngagementData = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateWebChannelOptions(flexFlowSid, identity, customerFriendlyName, chatFriendlyName){ChatUniqueName = chatUniqueName, PreEngagementData = preEngagementData};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateWebChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.FlexApi,
-                "/v1/WebChannels/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update WebChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WebChannel </returns>
-        public static WebChannelResource Update(UpdateWebChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update WebChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WebChannel </returns>
-        public static async System.Threading.Tasks.Task<WebChannelResource> UpdateAsync(UpdateWebChannelOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="chatStatus"> The chat status </param>
-        /// <param name="postEngagementData"> The post-engagement data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WebChannel </returns>
-        public static WebChannelResource Update(string pathSid,
-                                                WebChannelResource.ChatStatusEnum chatStatus = null,
-                                                string postEngagementData = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebChannelOptions(pathSid){ChatStatus = chatStatus, PostEngagementData = postEngagementData};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="chatStatus"> The chat status </param>
-        /// <param name="postEngagementData"> The post-engagement data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WebChannel </returns>
-        public static async System.Threading.Tasks.Task<WebChannelResource> UpdateAsync(string pathSid,
-                                                                                        WebChannelResource.ChatStatusEnum chatStatus = null,
-                                                                                        string postEngagementData = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebChannelOptions(pathSid){ChatStatus = chatStatus, PostEngagementData = postEngagementData};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteWebChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.FlexApi,
-                "/v1/WebChannels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete WebChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WebChannel </returns>
-        public static bool Delete(DeleteWebChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete WebChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WebChannel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebChannelOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WebChannel </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebChannelOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WebChannel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebChannelOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WebChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WebChannelResource object represented by the provided JSON </returns>
-        public static WebChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WebChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource and owns this Workflow
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Flex Flow
-        /// </summary>
-        [JsonProperty("flex_flow_sid")]
-        public string FlexFlowSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the WebChannel resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the WebChannel resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private WebChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class WebChannelResource : Resource
+  {
+    public sealed class ChatStatusEnum : StringEnum
+    {
+      private ChatStatusEnum(string value) : base(value) { }
+      public ChatStatusEnum() { }
+      public static implicit operator ChatStatusEnum(string value)
+      {
+        return new ChatStatusEnum(value);
+      }
+
+      public static readonly ChatStatusEnum Inactive = new ChatStatusEnum("inactive");
+    }
+
+    private static Request BuildReadRequest(ReadWebChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.FlexApi,
+          "/v1/WebChannels",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read WebChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WebChannel </returns>
+    public static ResourceSet<WebChannelResource> Read(ReadWebChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<WebChannelResource>.FromJson("flex_chat_channels", response.Content);
+      return new ResourceSet<WebChannelResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read WebChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WebChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebChannelResource>> ReadAsync(ReadWebChannelOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<WebChannelResource>.FromJson("flex_chat_channels", response.Content);
+      return new ResourceSet<WebChannelResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WebChannel </returns>
+    public static ResourceSet<WebChannelResource> Read(int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadWebChannelOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WebChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebChannelResource>> ReadAsync(int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadWebChannelOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<WebChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<WebChannelResource>.FromJson("flex_chat_channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<WebChannelResource> NextPage(Page<WebChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.FlexApi)
+      );
+
+      var response = client.Request(request);
+      return Page<WebChannelResource>.FromJson("flex_chat_channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<WebChannelResource> PreviousPage(Page<WebChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.FlexApi)
+      );
+
+      var response = client.Request(request);
+      return Page<WebChannelResource>.FromJson("flex_chat_channels", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchWebChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.FlexApi,
+          "/v1/WebChannels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WebChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WebChannel </returns>
+    public static WebChannelResource Fetch(FetchWebChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WebChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WebChannel </returns>
+    public static async System.Threading.Tasks.Task<WebChannelResource> FetchAsync(FetchWebChannelOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID of the WebChannel resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WebChannel </returns>
+    public static WebChannelResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchWebChannelOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID of the WebChannel resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WebChannel </returns>
+    public static async System.Threading.Tasks.Task<WebChannelResource> FetchAsync(string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchWebChannelOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateWebChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.FlexApi,
+          "/v1/WebChannels",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create WebChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WebChannel </returns>
+    public static WebChannelResource Create(CreateWebChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create WebChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WebChannel </returns>
+    public static async System.Threading.Tasks.Task<WebChannelResource> CreateAsync(CreateWebChannelOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="flexFlowSid"> The SID of the Flex Flow </param>
+    /// <param name="identity"> The chat identity </param>
+    /// <param name="customerFriendlyName"> The chat participant's friendly name </param>
+    /// <param name="chatFriendlyName"> The chat channel's friendly name </param>
+    /// <param name="chatUniqueName"> The chat channel's unique name </param>
+    /// <param name="preEngagementData"> The pre-engagement data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WebChannel </returns>
+    public static WebChannelResource Create(string flexFlowSid,
+                                            string identity,
+                                            string customerFriendlyName,
+                                            string chatFriendlyName,
+                                            string chatUniqueName = null,
+                                            string preEngagementData = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateWebChannelOptions(flexFlowSid, identity, customerFriendlyName, chatFriendlyName) { ChatUniqueName = chatUniqueName, PreEngagementData = preEngagementData };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="flexFlowSid"> The SID of the Flex Flow </param>
+    /// <param name="identity"> The chat identity </param>
+    /// <param name="customerFriendlyName"> The chat participant's friendly name </param>
+    /// <param name="chatFriendlyName"> The chat channel's friendly name </param>
+    /// <param name="chatUniqueName"> The chat channel's unique name </param>
+    /// <param name="preEngagementData"> The pre-engagement data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WebChannel </returns>
+    public static async System.Threading.Tasks.Task<WebChannelResource> CreateAsync(string flexFlowSid,
+                                                                                    string identity,
+                                                                                    string customerFriendlyName,
+                                                                                    string chatFriendlyName,
+                                                                                    string chatUniqueName = null,
+                                                                                    string preEngagementData = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateWebChannelOptions(flexFlowSid, identity, customerFriendlyName, chatFriendlyName) { ChatUniqueName = chatUniqueName, PreEngagementData = preEngagementData };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateWebChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.FlexApi,
+          "/v1/WebChannels/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update WebChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WebChannel </returns>
+    public static WebChannelResource Update(UpdateWebChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update WebChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WebChannel </returns>
+    public static async System.Threading.Tasks.Task<WebChannelResource> UpdateAsync(UpdateWebChannelOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="chatStatus"> The chat status </param>
+    /// <param name="postEngagementData"> The post-engagement data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WebChannel </returns>
+    public static WebChannelResource Update(string pathSid,
+                                            WebChannelResource.ChatStatusEnum chatStatus = null,
+                                            string postEngagementData = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebChannelOptions(pathSid) { ChatStatus = chatStatus, PostEngagementData = postEngagementData };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="chatStatus"> The chat status </param>
+    /// <param name="postEngagementData"> The post-engagement data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WebChannel </returns>
+    public static async System.Threading.Tasks.Task<WebChannelResource> UpdateAsync(string pathSid,
+                                                                                    WebChannelResource.ChatStatusEnum chatStatus = null,
+                                                                                    string postEngagementData = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebChannelOptions(pathSid) { ChatStatus = chatStatus, PostEngagementData = postEngagementData };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteWebChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.FlexApi,
+          "/v1/WebChannels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete WebChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WebChannel </returns>
+    public static bool Delete(DeleteWebChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete WebChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WebChannel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebChannelOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WebChannel </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebChannelOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WebChannel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebChannelOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WebChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WebChannelResource object represented by the provided JSON </returns>
+    public static WebChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WebChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource and owns this Workflow
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Flex Flow
+    /// </summary>
+    [JsonProperty("flex_flow_sid")]
+    public string FlexFlowSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the WebChannel resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the WebChannel resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private WebChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/FrontlineApi/V1/UserOptions.cs b/src/Twilio/Rest/FrontlineApi/V1/UserOptions.cs
index 2da04c279..393359b51 100644
--- a/src/Twilio/Rest/FrontlineApi/V1/UserOptions.cs
+++ b/src/Twilio/Rest/FrontlineApi/V1/UserOptions.cs
@@ -9,104 +9,104 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.FrontlineApi.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a frontline user
+  /// </summary>
+  public class FetchUserOptions : IOptions<UserResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a frontline user
+    /// The SID of the User resource to fetch
     /// </summary>
-    public class FetchUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the User resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUserOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the User resource to fetch </param>
-        public FetchUserOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update an existing frontline user
+    /// Construct a new FetchUserOptions
     /// </summary>
-    public class UpdateUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The SID of the User resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The string that you assigned to describe the User
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The avatar URL which will be shown in Frontline application
-        /// </summary>
-        public string Avatar { get; set; }
-        /// <summary>
-        /// Current state of this user
-        /// </summary>
-        public UserResource.StateTypeEnum State { get; set; }
-        /// <summary>
-        /// Whether the User is available for new conversations
-        /// </summary>
-        public bool? IsAvailable { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateUserOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the User resource to update </param>
-        public UpdateUserOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Avatar != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Avatar", Avatar));
-            }
-
-            if (State != null)
-            {
-                p.Add(new KeyValuePair<string, string>("State", State.ToString()));
-            }
-
-            if (IsAvailable != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IsAvailable", IsAvailable.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathSid"> The SID of the User resource to fetch </param>
+    public FetchUserOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update an existing frontline user
+  /// </summary>
+  public class UpdateUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The SID of the User resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The string that you assigned to describe the User
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The avatar URL which will be shown in Frontline application
+    /// </summary>
+    public string Avatar { get; set; }
+    /// <summary>
+    /// Current state of this user
+    /// </summary>
+    public UserResource.StateTypeEnum State { get; set; }
+    /// <summary>
+    /// Whether the User is available for new conversations
+    /// </summary>
+    public bool? IsAvailable { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateUserOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the User resource to update </param>
+    public UpdateUserOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Avatar != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Avatar", Avatar));
+      }
+
+      if (State != null)
+      {
+        p.Add(new KeyValuePair<string, string>("State", State.ToString()));
+      }
+
+      if (IsAvailable != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IsAvailable", IsAvailable.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/FrontlineApi/V1/UserResource.cs b/src/Twilio/Rest/FrontlineApi/V1/UserResource.cs
index 9d9d80c73..f388cf525 100644
--- a/src/Twilio/Rest/FrontlineApi/V1/UserResource.cs
+++ b/src/Twilio/Rest/FrontlineApi/V1/UserResource.cs
@@ -19,233 +19,233 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.FrontlineApi.V1
-{
-
-    public class UserResource : Resource
-    {
-        public sealed class StateTypeEnum : StringEnum
-        {
-            private StateTypeEnum(string value) : base(value) {}
-            public StateTypeEnum() {}
-            public static implicit operator StateTypeEnum(string value)
-            {
-                return new StateTypeEnum(value);
-            }
-
-            public static readonly StateTypeEnum Active = new StateTypeEnum("active");
-            public static readonly StateTypeEnum Deactivated = new StateTypeEnum("deactivated");
-        }
-
-        private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.FrontlineApi,
-                "/v1/Users/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a frontline user
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a frontline user
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a frontline user
-        /// </summary>
-        /// <param name="pathSid"> The SID of the User resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a frontline user
-        /// </summary>
-        /// <param name="pathSid"> The SID of the User resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.FrontlineApi,
-                "/v1/Users/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an existing frontline user
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing frontline user
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing frontline user
-        /// </summary>
-        /// <param name="pathSid"> The SID of the User resource to update </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the User </param>
-        /// <param name="avatar"> The avatar URL which will be shown in Frontline application </param>
-        /// <param name="state"> Current state of this user </param>
-        /// <param name="isAvailable"> Whether the User is available for new conversations </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(string pathSid,
-                                          string friendlyName = null,
-                                          string avatar = null,
-                                          UserResource.StateTypeEnum state = null,
-                                          bool? isAvailable = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathSid){FriendlyName = friendlyName, Avatar = avatar, State = state, IsAvailable = isAvailable};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing frontline user
-        /// </summary>
-        /// <param name="pathSid"> The SID of the User resource to update </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the User </param>
-        /// <param name="avatar"> The avatar URL which will be shown in Frontline application </param>
-        /// <param name="state"> Current state of this user </param>
-        /// <param name="isAvailable"> Whether the User is available for new conversations </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathSid,
-                                                                                  string friendlyName = null,
-                                                                                  string avatar = null,
-                                                                                  UserResource.StateTypeEnum state = null,
-                                                                                  bool? isAvailable = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathSid){FriendlyName = friendlyName, Avatar = avatar, State = state, IsAvailable = isAvailable};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a UserResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserResource object represented by the provided JSON </returns>
-        public static UserResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the User
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The avatar URL which will be shown in Frontline application
-        /// </summary>
-        [JsonProperty("avatar")]
-        public string Avatar { get; private set; }
-        /// <summary>
-        /// Current state of this user
-        /// </summary>
-        [JsonProperty("state")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public UserResource.StateTypeEnum State { get; private set; }
-        /// <summary>
-        /// Whether the User is available for new conversations
-        /// </summary>
-        [JsonProperty("is_available")]
-        public bool? IsAvailable { get; private set; }
-        /// <summary>
-        /// An absolute URL for this user.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private UserResource()
-        {
-
-        }
-    }
+{
+
+  public class UserResource : Resource
+  {
+    public sealed class StateTypeEnum : StringEnum
+    {
+      private StateTypeEnum(string value) : base(value) { }
+      public StateTypeEnum() { }
+      public static implicit operator StateTypeEnum(string value)
+      {
+        return new StateTypeEnum(value);
+      }
+
+      public static readonly StateTypeEnum Active = new StateTypeEnum("active");
+      public static readonly StateTypeEnum Deactivated = new StateTypeEnum("deactivated");
+    }
+
+    private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.FrontlineApi,
+          "/v1/Users/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a frontline user
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a frontline user
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a frontline user
+    /// </summary>
+    /// <param name="pathSid"> The SID of the User resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a frontline user
+    /// </summary>
+    /// <param name="pathSid"> The SID of the User resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.FrontlineApi,
+          "/v1/Users/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an existing frontline user
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing frontline user
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing frontline user
+    /// </summary>
+    /// <param name="pathSid"> The SID of the User resource to update </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the User </param>
+    /// <param name="avatar"> The avatar URL which will be shown in Frontline application </param>
+    /// <param name="state"> Current state of this user </param>
+    /// <param name="isAvailable"> Whether the User is available for new conversations </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(string pathSid,
+                                      string friendlyName = null,
+                                      string avatar = null,
+                                      UserResource.StateTypeEnum state = null,
+                                      bool? isAvailable = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathSid) { FriendlyName = friendlyName, Avatar = avatar, State = state, IsAvailable = isAvailable };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing frontline user
+    /// </summary>
+    /// <param name="pathSid"> The SID of the User resource to update </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the User </param>
+    /// <param name="avatar"> The avatar URL which will be shown in Frontline application </param>
+    /// <param name="state"> Current state of this user </param>
+    /// <param name="isAvailable"> Whether the User is available for new conversations </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathSid,
+                                                                              string friendlyName = null,
+                                                                              string avatar = null,
+                                                                              UserResource.StateTypeEnum state = null,
+                                                                              bool? isAvailable = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathSid) { FriendlyName = friendlyName, Avatar = avatar, State = state, IsAvailable = isAvailable };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a UserResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserResource object represented by the provided JSON </returns>
+    public static UserResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The string that identifies the resource's User
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the User
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The avatar URL which will be shown in Frontline application
+    /// </summary>
+    [JsonProperty("avatar")]
+    public string Avatar { get; private set; }
+    /// <summary>
+    /// Current state of this user
+    /// </summary>
+    [JsonProperty("state")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public UserResource.StateTypeEnum State { get; private set; }
+    /// <summary>
+    /// Whether the User is available for new conversations
+    /// </summary>
+    [JsonProperty("is_available")]
+    public bool? IsAvailable { get; private set; }
+    /// <summary>
+    /// An absolute URL for this user.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private UserResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/Call/CallSummaryOptions.cs b/src/Twilio/Rest/Insights/V1/Call/CallSummaryOptions.cs
index 080def3f1..64b739549 100644
--- a/src/Twilio/Rest/Insights/V1/Call/CallSummaryOptions.cs
+++ b/src/Twilio/Rest/Insights/V1/Call/CallSummaryOptions.cs
@@ -9,44 +9,44 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Insights.V1.Call
-{
-
+{
+
+  /// <summary>
+  /// FetchCallSummaryOptions
+  /// </summary>
+  public class FetchCallSummaryOptions : IOptions<CallSummaryResource>
+  {
     /// <summary>
-    /// FetchCallSummaryOptions
+    /// The call_sid
     /// </summary>
-    public class FetchCallSummaryOptions : IOptions<CallSummaryResource>
-    {
-        /// <summary>
-        /// The call_sid
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The processing_state
-        /// </summary>
-        public CallSummaryResource.ProcessingStateEnum ProcessingState { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchCallSummaryOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The call_sid </param>
-        public FetchCallSummaryOptions(string pathCallSid)
-        {
-            PathCallSid = pathCallSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ProcessingState != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ProcessingState", ProcessingState.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The processing_state
+    /// </summary>
+    public CallSummaryResource.ProcessingStateEnum ProcessingState { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchCallSummaryOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The call_sid </param>
+    public FetchCallSummaryOptions(string pathCallSid)
+    {
+      PathCallSid = pathCallSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ProcessingState != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ProcessingState", ProcessingState.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/Call/CallSummaryResource.cs b/src/Twilio/Rest/Insights/V1/Call/CallSummaryResource.cs
index bd25cc803..dff6dc8e8 100644
--- a/src/Twilio/Rest/Insights/V1/Call/CallSummaryResource.cs
+++ b/src/Twilio/Rest/Insights/V1/Call/CallSummaryResource.cs
@@ -17,260 +17,260 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Insights.V1.Call
-{
-
-    public class CallSummaryResource : Resource
-    {
-        public sealed class CallTypeEnum : StringEnum
-        {
-            private CallTypeEnum(string value) : base(value) {}
-            public CallTypeEnum() {}
-            public static implicit operator CallTypeEnum(string value)
-            {
-                return new CallTypeEnum(value);
-            }
-
-            public static readonly CallTypeEnum Carrier = new CallTypeEnum("carrier");
-            public static readonly CallTypeEnum Sip = new CallTypeEnum("sip");
-            public static readonly CallTypeEnum Trunking = new CallTypeEnum("trunking");
-            public static readonly CallTypeEnum Client = new CallTypeEnum("client");
-        }
-
-        public sealed class CallStateEnum : StringEnum
-        {
-            private CallStateEnum(string value) : base(value) {}
-            public CallStateEnum() {}
-            public static implicit operator CallStateEnum(string value)
-            {
-                return new CallStateEnum(value);
-            }
-
-            public static readonly CallStateEnum Ringing = new CallStateEnum("ringing");
-            public static readonly CallStateEnum Completed = new CallStateEnum("completed");
-            public static readonly CallStateEnum Busy = new CallStateEnum("busy");
-            public static readonly CallStateEnum Fail = new CallStateEnum("fail");
-            public static readonly CallStateEnum Noanswer = new CallStateEnum("noanswer");
-            public static readonly CallStateEnum Canceled = new CallStateEnum("canceled");
-            public static readonly CallStateEnum Answered = new CallStateEnum("answered");
-            public static readonly CallStateEnum Undialed = new CallStateEnum("undialed");
-        }
-
-        public sealed class ProcessingStateEnum : StringEnum
-        {
-            private ProcessingStateEnum(string value) : base(value) {}
-            public ProcessingStateEnum() {}
-            public static implicit operator ProcessingStateEnum(string value)
-            {
-                return new ProcessingStateEnum(value);
-            }
-
-            public static readonly ProcessingStateEnum Complete = new ProcessingStateEnum("complete");
-            public static readonly ProcessingStateEnum Partial = new ProcessingStateEnum("partial");
-        }
-
-        private static Request BuildFetchRequest(FetchCallSummaryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Insights,
-                "/v1/Voice/" + options.PathCallSid + "/Summary",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch CallSummary parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CallSummary </returns>
-        public static CallSummaryResource Fetch(FetchCallSummaryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch CallSummary parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CallSummary </returns>
-        public static async System.Threading.Tasks.Task<CallSummaryResource> FetchAsync(FetchCallSummaryOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathCallSid"> The call_sid </param>
-        /// <param name="processingState"> The processing_state </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CallSummary </returns>
-        public static CallSummaryResource Fetch(string pathCallSid,
-                                                CallSummaryResource.ProcessingStateEnum processingState = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchCallSummaryOptions(pathCallSid){ProcessingState = processingState};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathCallSid"> The call_sid </param>
-        /// <param name="processingState"> The processing_state </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CallSummary </returns>
-        public static async System.Threading.Tasks.Task<CallSummaryResource> FetchAsync(string pathCallSid,
-                                                                                        CallSummaryResource.ProcessingStateEnum processingState = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchCallSummaryOptions(pathCallSid){ProcessingState = processingState};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CallSummaryResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CallSummaryResource object represented by the provided JSON </returns>
-        public static CallSummaryResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CallSummaryResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The call_sid
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The call_type
-        /// </summary>
-        [JsonProperty("call_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CallSummaryResource.CallTypeEnum CallType { get; private set; }
-        /// <summary>
-        /// The call_state
-        /// </summary>
-        [JsonProperty("call_state")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CallSummaryResource.CallStateEnum CallState { get; private set; }
-        /// <summary>
-        /// The processing_state
-        /// </summary>
-        [JsonProperty("processing_state")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CallSummaryResource.ProcessingStateEnum ProcessingState { get; private set; }
-        /// <summary>
-        /// The created_time
-        /// </summary>
-        [JsonProperty("created_time")]
-        public DateTime? CreatedTime { get; private set; }
-        /// <summary>
-        /// The start_time
-        /// </summary>
-        [JsonProperty("start_time")]
-        public DateTime? StartTime { get; private set; }
-        /// <summary>
-        /// The end_time
-        /// </summary>
-        [JsonProperty("end_time")]
-        public DateTime? EndTime { get; private set; }
-        /// <summary>
-        /// The duration
-        /// </summary>
-        [JsonProperty("duration")]
-        public int? Duration { get; private set; }
-        /// <summary>
-        /// The connect_duration
-        /// </summary>
-        [JsonProperty("connect_duration")]
-        public int? ConnectDuration { get; private set; }
-        /// <summary>
-        /// The from
-        /// </summary>
-        [JsonProperty("from")]
-        public object From { get; private set; }
-        /// <summary>
-        /// The to
-        /// </summary>
-        [JsonProperty("to")]
-        public object To { get; private set; }
-        /// <summary>
-        /// The carrier_edge
-        /// </summary>
-        [JsonProperty("carrier_edge")]
-        public object CarrierEdge { get; private set; }
-        /// <summary>
-        /// The client_edge
-        /// </summary>
-        [JsonProperty("client_edge")]
-        public object ClientEdge { get; private set; }
-        /// <summary>
-        /// The sdk_edge
-        /// </summary>
-        [JsonProperty("sdk_edge")]
-        public object SdkEdge { get; private set; }
-        /// <summary>
-        /// The sip_edge
-        /// </summary>
-        [JsonProperty("sip_edge")]
-        public object SipEdge { get; private set; }
-        /// <summary>
-        /// The tags
-        /// </summary>
-        [JsonProperty("tags")]
-        public List<string> Tags { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        [JsonProperty("attributes")]
-        public object Attributes { get; private set; }
-        /// <summary>
-        /// The properties
-        /// </summary>
-        [JsonProperty("properties")]
-        public object Properties { get; private set; }
-        /// <summary>
-        /// The trust
-        /// </summary>
-        [JsonProperty("trust")]
-        public object Trust { get; private set; }
-
-        private CallSummaryResource()
-        {
-
-        }
-    }
+{
+
+  public class CallSummaryResource : Resource
+  {
+    public sealed class CallTypeEnum : StringEnum
+    {
+      private CallTypeEnum(string value) : base(value) { }
+      public CallTypeEnum() { }
+      public static implicit operator CallTypeEnum(string value)
+      {
+        return new CallTypeEnum(value);
+      }
+
+      public static readonly CallTypeEnum Carrier = new CallTypeEnum("carrier");
+      public static readonly CallTypeEnum Sip = new CallTypeEnum("sip");
+      public static readonly CallTypeEnum Trunking = new CallTypeEnum("trunking");
+      public static readonly CallTypeEnum Client = new CallTypeEnum("client");
+    }
+
+    public sealed class CallStateEnum : StringEnum
+    {
+      private CallStateEnum(string value) : base(value) { }
+      public CallStateEnum() { }
+      public static implicit operator CallStateEnum(string value)
+      {
+        return new CallStateEnum(value);
+      }
+
+      public static readonly CallStateEnum Ringing = new CallStateEnum("ringing");
+      public static readonly CallStateEnum Completed = new CallStateEnum("completed");
+      public static readonly CallStateEnum Busy = new CallStateEnum("busy");
+      public static readonly CallStateEnum Fail = new CallStateEnum("fail");
+      public static readonly CallStateEnum Noanswer = new CallStateEnum("noanswer");
+      public static readonly CallStateEnum Canceled = new CallStateEnum("canceled");
+      public static readonly CallStateEnum Answered = new CallStateEnum("answered");
+      public static readonly CallStateEnum Undialed = new CallStateEnum("undialed");
+    }
+
+    public sealed class ProcessingStateEnum : StringEnum
+    {
+      private ProcessingStateEnum(string value) : base(value) { }
+      public ProcessingStateEnum() { }
+      public static implicit operator ProcessingStateEnum(string value)
+      {
+        return new ProcessingStateEnum(value);
+      }
+
+      public static readonly ProcessingStateEnum Complete = new ProcessingStateEnum("complete");
+      public static readonly ProcessingStateEnum Partial = new ProcessingStateEnum("partial");
+    }
+
+    private static Request BuildFetchRequest(FetchCallSummaryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Insights,
+          "/v1/Voice/" + options.PathCallSid + "/Summary",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch CallSummary parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CallSummary </returns>
+    public static CallSummaryResource Fetch(FetchCallSummaryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch CallSummary parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CallSummary </returns>
+    public static async System.Threading.Tasks.Task<CallSummaryResource> FetchAsync(FetchCallSummaryOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathCallSid"> The call_sid </param>
+    /// <param name="processingState"> The processing_state </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CallSummary </returns>
+    public static CallSummaryResource Fetch(string pathCallSid,
+                                            CallSummaryResource.ProcessingStateEnum processingState = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchCallSummaryOptions(pathCallSid) { ProcessingState = processingState };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathCallSid"> The call_sid </param>
+    /// <param name="processingState"> The processing_state </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CallSummary </returns>
+    public static async System.Threading.Tasks.Task<CallSummaryResource> FetchAsync(string pathCallSid,
+                                                                                    CallSummaryResource.ProcessingStateEnum processingState = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchCallSummaryOptions(pathCallSid) { ProcessingState = processingState };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CallSummaryResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CallSummaryResource object represented by the provided JSON </returns>
+    public static CallSummaryResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CallSummaryResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The call_sid
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The call_type
+    /// </summary>
+    [JsonProperty("call_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CallSummaryResource.CallTypeEnum CallType { get; private set; }
+    /// <summary>
+    /// The call_state
+    /// </summary>
+    [JsonProperty("call_state")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CallSummaryResource.CallStateEnum CallState { get; private set; }
+    /// <summary>
+    /// The processing_state
+    /// </summary>
+    [JsonProperty("processing_state")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CallSummaryResource.ProcessingStateEnum ProcessingState { get; private set; }
+    /// <summary>
+    /// The created_time
+    /// </summary>
+    [JsonProperty("created_time")]
+    public DateTime? CreatedTime { get; private set; }
+    /// <summary>
+    /// The start_time
+    /// </summary>
+    [JsonProperty("start_time")]
+    public DateTime? StartTime { get; private set; }
+    /// <summary>
+    /// The end_time
+    /// </summary>
+    [JsonProperty("end_time")]
+    public DateTime? EndTime { get; private set; }
+    /// <summary>
+    /// The duration
+    /// </summary>
+    [JsonProperty("duration")]
+    public int? Duration { get; private set; }
+    /// <summary>
+    /// The connect_duration
+    /// </summary>
+    [JsonProperty("connect_duration")]
+    public int? ConnectDuration { get; private set; }
+    /// <summary>
+    /// The from
+    /// </summary>
+    [JsonProperty("from")]
+    public object From { get; private set; }
+    /// <summary>
+    /// The to
+    /// </summary>
+    [JsonProperty("to")]
+    public object To { get; private set; }
+    /// <summary>
+    /// The carrier_edge
+    /// </summary>
+    [JsonProperty("carrier_edge")]
+    public object CarrierEdge { get; private set; }
+    /// <summary>
+    /// The client_edge
+    /// </summary>
+    [JsonProperty("client_edge")]
+    public object ClientEdge { get; private set; }
+    /// <summary>
+    /// The sdk_edge
+    /// </summary>
+    [JsonProperty("sdk_edge")]
+    public object SdkEdge { get; private set; }
+    /// <summary>
+    /// The sip_edge
+    /// </summary>
+    [JsonProperty("sip_edge")]
+    public object SipEdge { get; private set; }
+    /// <summary>
+    /// The tags
+    /// </summary>
+    [JsonProperty("tags")]
+    public List<string> Tags { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    [JsonProperty("attributes")]
+    public object Attributes { get; private set; }
+    /// <summary>
+    /// The properties
+    /// </summary>
+    [JsonProperty("properties")]
+    public object Properties { get; private set; }
+    /// <summary>
+    /// The trust
+    /// </summary>
+    [JsonProperty("trust")]
+    public object Trust { get; private set; }
+
+    private CallSummaryResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/Call/EventOptions.cs b/src/Twilio/Rest/Insights/V1/Call/EventOptions.cs
index 15cefc67a..f44506070 100644
--- a/src/Twilio/Rest/Insights/V1/Call/EventOptions.cs
+++ b/src/Twilio/Rest/Insights/V1/Call/EventOptions.cs
@@ -9,52 +9,52 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Insights.V1.Call
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadEventOptions
+  /// </summary>
+  public class ReadEventOptions : ReadOptions<EventResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadEventOptions
+    /// The call_sid
     /// </summary>
-    public class ReadEventOptions : ReadOptions<EventResource>
-    {
-        /// <summary>
-        /// The call_sid
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The edge
-        /// </summary>
-        public EventResource.TwilioEdgeEnum Edge { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadEventOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The call_sid </param>
-        public ReadEventOptions(string pathCallSid)
-        {
-            PathCallSid = pathCallSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Edge != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Edge", Edge.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The edge
+    /// </summary>
+    public EventResource.TwilioEdgeEnum Edge { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadEventOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The call_sid </param>
+    public ReadEventOptions(string pathCallSid)
+    {
+      PathCallSid = pathCallSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Edge != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Edge", Edge.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/Call/EventResource.cs b/src/Twilio/Rest/Insights/V1/Call/EventResource.cs
index 32fd30a35..09f595ed4 100644
--- a/src/Twilio/Rest/Insights/V1/Call/EventResource.cs
+++ b/src/Twilio/Rest/Insights/V1/Call/EventResource.cs
@@ -20,259 +20,259 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Insights.V1.Call
-{
-
-    public class EventResource : Resource
-    {
-        public sealed class TwilioEdgeEnum : StringEnum
-        {
-            private TwilioEdgeEnum(string value) : base(value) {}
-            public TwilioEdgeEnum() {}
-            public static implicit operator TwilioEdgeEnum(string value)
-            {
-                return new TwilioEdgeEnum(value);
-            }
-
-            public static readonly TwilioEdgeEnum UnknownEdge = new TwilioEdgeEnum("unknown_edge");
-            public static readonly TwilioEdgeEnum CarrierEdge = new TwilioEdgeEnum("carrier_edge");
-            public static readonly TwilioEdgeEnum SipEdge = new TwilioEdgeEnum("sip_edge");
-            public static readonly TwilioEdgeEnum SdkEdge = new TwilioEdgeEnum("sdk_edge");
-            public static readonly TwilioEdgeEnum ClientEdge = new TwilioEdgeEnum("client_edge");
-        }
-
-        public sealed class LevelEnum : StringEnum
-        {
-            private LevelEnum(string value) : base(value) {}
-            public LevelEnum() {}
-            public static implicit operator LevelEnum(string value)
-            {
-                return new LevelEnum(value);
-            }
-
-            public static readonly LevelEnum Unknown = new LevelEnum("UNKNOWN");
-            public static readonly LevelEnum Debug = new LevelEnum("DEBUG");
-            public static readonly LevelEnum Info = new LevelEnum("INFO");
-            public static readonly LevelEnum Warning = new LevelEnum("WARNING");
-            public static readonly LevelEnum Error = new LevelEnum("ERROR");
-        }
-
-        private static Request BuildReadRequest(ReadEventOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Insights,
-                "/v1/Voice/" + options.PathCallSid + "/Events",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Event parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Event </returns>
-        public static ResourceSet<EventResource> Read(ReadEventOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<EventResource>.FromJson("events", response.Content);
-            return new ResourceSet<EventResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Event parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Event </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(ReadEventOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<EventResource>.FromJson("events", response.Content);
-            return new ResourceSet<EventResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCallSid"> The call_sid </param>
-        /// <param name="edge"> The edge </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Event </returns>
-        public static ResourceSet<EventResource> Read(string pathCallSid,
-                                                      EventResource.TwilioEdgeEnum edge = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadEventOptions(pathCallSid){Edge = edge, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCallSid"> The call_sid </param>
-        /// <param name="edge"> The edge </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Event </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(string pathCallSid,
-                                                                                              EventResource.TwilioEdgeEnum edge = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadEventOptions(pathCallSid){Edge = edge, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<EventResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<EventResource>.FromJson("events", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<EventResource> NextPage(Page<EventResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Insights)
-            );
-
-            var response = client.Request(request);
-            return Page<EventResource>.FromJson("events", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<EventResource> PreviousPage(Page<EventResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Insights)
-            );
-
-            var response = client.Request(request);
-            return Page<EventResource>.FromJson("events", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a EventResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EventResource object represented by the provided JSON </returns>
-        public static EventResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EventResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The timestamp
-        /// </summary>
-        [JsonProperty("timestamp")]
-        public string Timestamp { get; private set; }
-        /// <summary>
-        /// The call_sid
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The edge
-        /// </summary>
-        [JsonProperty("edge")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public EventResource.TwilioEdgeEnum Edge { get; private set; }
-        /// <summary>
-        /// The group
-        /// </summary>
-        [JsonProperty("group")]
-        public string Group { get; private set; }
-        /// <summary>
-        /// The level
-        /// </summary>
-        [JsonProperty("level")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public EventResource.LevelEnum Level { get; private set; }
-        /// <summary>
-        /// The name
-        /// </summary>
-        [JsonProperty("name")]
-        public string Name { get; private set; }
-        /// <summary>
-        /// The carrier_edge
-        /// </summary>
-        [JsonProperty("carrier_edge")]
-        public object CarrierEdge { get; private set; }
-        /// <summary>
-        /// The sip_edge
-        /// </summary>
-        [JsonProperty("sip_edge")]
-        public object SipEdge { get; private set; }
-        /// <summary>
-        /// The sdk_edge
-        /// </summary>
-        [JsonProperty("sdk_edge")]
-        public object SdkEdge { get; private set; }
-        /// <summary>
-        /// The client_edge
-        /// </summary>
-        [JsonProperty("client_edge")]
-        public object ClientEdge { get; private set; }
-
-        private EventResource()
-        {
-
-        }
-    }
+{
+
+  public class EventResource : Resource
+  {
+    public sealed class TwilioEdgeEnum : StringEnum
+    {
+      private TwilioEdgeEnum(string value) : base(value) { }
+      public TwilioEdgeEnum() { }
+      public static implicit operator TwilioEdgeEnum(string value)
+      {
+        return new TwilioEdgeEnum(value);
+      }
+
+      public static readonly TwilioEdgeEnum UnknownEdge = new TwilioEdgeEnum("unknown_edge");
+      public static readonly TwilioEdgeEnum CarrierEdge = new TwilioEdgeEnum("carrier_edge");
+      public static readonly TwilioEdgeEnum SipEdge = new TwilioEdgeEnum("sip_edge");
+      public static readonly TwilioEdgeEnum SdkEdge = new TwilioEdgeEnum("sdk_edge");
+      public static readonly TwilioEdgeEnum ClientEdge = new TwilioEdgeEnum("client_edge");
+    }
+
+    public sealed class LevelEnum : StringEnum
+    {
+      private LevelEnum(string value) : base(value) { }
+      public LevelEnum() { }
+      public static implicit operator LevelEnum(string value)
+      {
+        return new LevelEnum(value);
+      }
+
+      public static readonly LevelEnum Unknown = new LevelEnum("UNKNOWN");
+      public static readonly LevelEnum Debug = new LevelEnum("DEBUG");
+      public static readonly LevelEnum Info = new LevelEnum("INFO");
+      public static readonly LevelEnum Warning = new LevelEnum("WARNING");
+      public static readonly LevelEnum Error = new LevelEnum("ERROR");
+    }
+
+    private static Request BuildReadRequest(ReadEventOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Insights,
+          "/v1/Voice/" + options.PathCallSid + "/Events",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Event parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Event </returns>
+    public static ResourceSet<EventResource> Read(ReadEventOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<EventResource>.FromJson("events", response.Content);
+      return new ResourceSet<EventResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Event parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Event </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(ReadEventOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<EventResource>.FromJson("events", response.Content);
+      return new ResourceSet<EventResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCallSid"> The call_sid </param>
+    /// <param name="edge"> The edge </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Event </returns>
+    public static ResourceSet<EventResource> Read(string pathCallSid,
+                                                  EventResource.TwilioEdgeEnum edge = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadEventOptions(pathCallSid) { Edge = edge, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCallSid"> The call_sid </param>
+    /// <param name="edge"> The edge </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Event </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(string pathCallSid,
+                                                                                          EventResource.TwilioEdgeEnum edge = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadEventOptions(pathCallSid) { Edge = edge, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<EventResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<EventResource>.FromJson("events", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<EventResource> NextPage(Page<EventResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Insights)
+      );
+
+      var response = client.Request(request);
+      return Page<EventResource>.FromJson("events", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<EventResource> PreviousPage(Page<EventResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Insights)
+      );
+
+      var response = client.Request(request);
+      return Page<EventResource>.FromJson("events", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a EventResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EventResource object represented by the provided JSON </returns>
+    public static EventResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EventResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The timestamp
+    /// </summary>
+    [JsonProperty("timestamp")]
+    public string Timestamp { get; private set; }
+    /// <summary>
+    /// The call_sid
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The edge
+    /// </summary>
+    [JsonProperty("edge")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public EventResource.TwilioEdgeEnum Edge { get; private set; }
+    /// <summary>
+    /// The group
+    /// </summary>
+    [JsonProperty("group")]
+    public string Group { get; private set; }
+    /// <summary>
+    /// The level
+    /// </summary>
+    [JsonProperty("level")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public EventResource.LevelEnum Level { get; private set; }
+    /// <summary>
+    /// The name
+    /// </summary>
+    [JsonProperty("name")]
+    public string Name { get; private set; }
+    /// <summary>
+    /// The carrier_edge
+    /// </summary>
+    [JsonProperty("carrier_edge")]
+    public object CarrierEdge { get; private set; }
+    /// <summary>
+    /// The sip_edge
+    /// </summary>
+    [JsonProperty("sip_edge")]
+    public object SipEdge { get; private set; }
+    /// <summary>
+    /// The sdk_edge
+    /// </summary>
+    [JsonProperty("sdk_edge")]
+    public object SdkEdge { get; private set; }
+    /// <summary>
+    /// The client_edge
+    /// </summary>
+    [JsonProperty("client_edge")]
+    public object ClientEdge { get; private set; }
+
+    private EventResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/Call/MetricOptions.cs b/src/Twilio/Rest/Insights/V1/Call/MetricOptions.cs
index 8d9dcb306..a4df63ae7 100644
--- a/src/Twilio/Rest/Insights/V1/Call/MetricOptions.cs
+++ b/src/Twilio/Rest/Insights/V1/Call/MetricOptions.cs
@@ -9,61 +9,61 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Insights.V1.Call
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadMetricOptions
+  /// </summary>
+  public class ReadMetricOptions : ReadOptions<MetricResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadMetricOptions
+    /// The call_sid
     /// </summary>
-    public class ReadMetricOptions : ReadOptions<MetricResource>
-    {
-        /// <summary>
-        /// The call_sid
-        /// </summary>
-        public string PathCallSid { get; }
-        /// <summary>
-        /// The edge
-        /// </summary>
-        public MetricResource.TwilioEdgeEnum Edge { get; set; }
-        /// <summary>
-        /// The direction
-        /// </summary>
-        public MetricResource.StreamDirectionEnum Direction { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMetricOptions
-        /// </summary>
-        /// <param name="pathCallSid"> The call_sid </param>
-        public ReadMetricOptions(string pathCallSid)
-        {
-            PathCallSid = pathCallSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Edge != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Edge", Edge.ToString()));
-            }
-
-            if (Direction != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Direction", Direction.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathCallSid { get; }
+    /// <summary>
+    /// The edge
+    /// </summary>
+    public MetricResource.TwilioEdgeEnum Edge { get; set; }
+    /// <summary>
+    /// The direction
+    /// </summary>
+    public MetricResource.StreamDirectionEnum Direction { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMetricOptions
+    /// </summary>
+    /// <param name="pathCallSid"> The call_sid </param>
+    public ReadMetricOptions(string pathCallSid)
+    {
+      PathCallSid = pathCallSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Edge != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Edge", Edge.ToString()));
+      }
+
+      if (Direction != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Direction", Direction.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/Call/MetricResource.cs b/src/Twilio/Rest/Insights/V1/Call/MetricResource.cs
index b48d3a62a..5e6014f7b 100644
--- a/src/Twilio/Rest/Insights/V1/Call/MetricResource.cs
+++ b/src/Twilio/Rest/Insights/V1/Call/MetricResource.cs
@@ -20,252 +20,252 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Insights.V1.Call
-{
-
-    public class MetricResource : Resource
-    {
-        public sealed class TwilioEdgeEnum : StringEnum
-        {
-            private TwilioEdgeEnum(string value) : base(value) {}
-            public TwilioEdgeEnum() {}
-            public static implicit operator TwilioEdgeEnum(string value)
-            {
-                return new TwilioEdgeEnum(value);
-            }
-
-            public static readonly TwilioEdgeEnum UnknownEdge = new TwilioEdgeEnum("unknown_edge");
-            public static readonly TwilioEdgeEnum CarrierEdge = new TwilioEdgeEnum("carrier_edge");
-            public static readonly TwilioEdgeEnum SipEdge = new TwilioEdgeEnum("sip_edge");
-            public static readonly TwilioEdgeEnum SdkEdge = new TwilioEdgeEnum("sdk_edge");
-            public static readonly TwilioEdgeEnum ClientEdge = new TwilioEdgeEnum("client_edge");
-        }
-
-        public sealed class StreamDirectionEnum : StringEnum
-        {
-            private StreamDirectionEnum(string value) : base(value) {}
-            public StreamDirectionEnum() {}
-            public static implicit operator StreamDirectionEnum(string value)
-            {
-                return new StreamDirectionEnum(value);
-            }
-
-            public static readonly StreamDirectionEnum Unknown = new StreamDirectionEnum("unknown");
-            public static readonly StreamDirectionEnum Inbound = new StreamDirectionEnum("inbound");
-            public static readonly StreamDirectionEnum Outbound = new StreamDirectionEnum("outbound");
-            public static readonly StreamDirectionEnum Both = new StreamDirectionEnum("both");
-        }
-
-        private static Request BuildReadRequest(ReadMetricOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Insights,
-                "/v1/Voice/" + options.PathCallSid + "/Metrics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Metric parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Metric </returns>
-        public static ResourceSet<MetricResource> Read(ReadMetricOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MetricResource>.FromJson("metrics", response.Content);
-            return new ResourceSet<MetricResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Metric parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Metric </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MetricResource>> ReadAsync(ReadMetricOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MetricResource>.FromJson("metrics", response.Content);
-            return new ResourceSet<MetricResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCallSid"> The call_sid </param>
-        /// <param name="edge"> The edge </param>
-        /// <param name="direction"> The direction </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Metric </returns>
-        public static ResourceSet<MetricResource> Read(string pathCallSid,
-                                                       MetricResource.TwilioEdgeEnum edge = null,
-                                                       MetricResource.StreamDirectionEnum direction = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadMetricOptions(pathCallSid){Edge = edge, Direction = direction, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathCallSid"> The call_sid </param>
-        /// <param name="edge"> The edge </param>
-        /// <param name="direction"> The direction </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Metric </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MetricResource>> ReadAsync(string pathCallSid,
-                                                                                               MetricResource.TwilioEdgeEnum edge = null,
-                                                                                               MetricResource.StreamDirectionEnum direction = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadMetricOptions(pathCallSid){Edge = edge, Direction = direction, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MetricResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MetricResource>.FromJson("metrics", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MetricResource> NextPage(Page<MetricResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Insights)
-            );
-
-            var response = client.Request(request);
-            return Page<MetricResource>.FromJson("metrics", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MetricResource> PreviousPage(Page<MetricResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Insights)
-            );
-
-            var response = client.Request(request);
-            return Page<MetricResource>.FromJson("metrics", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a MetricResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MetricResource object represented by the provided JSON </returns>
-        public static MetricResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MetricResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The timestamp
-        /// </summary>
-        [JsonProperty("timestamp")]
-        public string Timestamp { get; private set; }
-        /// <summary>
-        /// The call_sid
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The edge
-        /// </summary>
-        [JsonProperty("edge")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public MetricResource.TwilioEdgeEnum Edge { get; private set; }
-        /// <summary>
-        /// The direction
-        /// </summary>
-        [JsonProperty("direction")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public MetricResource.StreamDirectionEnum Direction { get; private set; }
-        /// <summary>
-        /// The carrier_edge
-        /// </summary>
-        [JsonProperty("carrier_edge")]
-        public object CarrierEdge { get; private set; }
-        /// <summary>
-        /// The sip_edge
-        /// </summary>
-        [JsonProperty("sip_edge")]
-        public object SipEdge { get; private set; }
-        /// <summary>
-        /// The sdk_edge
-        /// </summary>
-        [JsonProperty("sdk_edge")]
-        public object SdkEdge { get; private set; }
-        /// <summary>
-        /// The client_edge
-        /// </summary>
-        [JsonProperty("client_edge")]
-        public object ClientEdge { get; private set; }
-
-        private MetricResource()
-        {
-
-        }
-    }
+{
+
+  public class MetricResource : Resource
+  {
+    public sealed class TwilioEdgeEnum : StringEnum
+    {
+      private TwilioEdgeEnum(string value) : base(value) { }
+      public TwilioEdgeEnum() { }
+      public static implicit operator TwilioEdgeEnum(string value)
+      {
+        return new TwilioEdgeEnum(value);
+      }
+
+      public static readonly TwilioEdgeEnum UnknownEdge = new TwilioEdgeEnum("unknown_edge");
+      public static readonly TwilioEdgeEnum CarrierEdge = new TwilioEdgeEnum("carrier_edge");
+      public static readonly TwilioEdgeEnum SipEdge = new TwilioEdgeEnum("sip_edge");
+      public static readonly TwilioEdgeEnum SdkEdge = new TwilioEdgeEnum("sdk_edge");
+      public static readonly TwilioEdgeEnum ClientEdge = new TwilioEdgeEnum("client_edge");
+    }
+
+    public sealed class StreamDirectionEnum : StringEnum
+    {
+      private StreamDirectionEnum(string value) : base(value) { }
+      public StreamDirectionEnum() { }
+      public static implicit operator StreamDirectionEnum(string value)
+      {
+        return new StreamDirectionEnum(value);
+      }
+
+      public static readonly StreamDirectionEnum Unknown = new StreamDirectionEnum("unknown");
+      public static readonly StreamDirectionEnum Inbound = new StreamDirectionEnum("inbound");
+      public static readonly StreamDirectionEnum Outbound = new StreamDirectionEnum("outbound");
+      public static readonly StreamDirectionEnum Both = new StreamDirectionEnum("both");
+    }
+
+    private static Request BuildReadRequest(ReadMetricOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Insights,
+          "/v1/Voice/" + options.PathCallSid + "/Metrics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Metric parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Metric </returns>
+    public static ResourceSet<MetricResource> Read(ReadMetricOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MetricResource>.FromJson("metrics", response.Content);
+      return new ResourceSet<MetricResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Metric parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Metric </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MetricResource>> ReadAsync(ReadMetricOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MetricResource>.FromJson("metrics", response.Content);
+      return new ResourceSet<MetricResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCallSid"> The call_sid </param>
+    /// <param name="edge"> The edge </param>
+    /// <param name="direction"> The direction </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Metric </returns>
+    public static ResourceSet<MetricResource> Read(string pathCallSid,
+                                                   MetricResource.TwilioEdgeEnum edge = null,
+                                                   MetricResource.StreamDirectionEnum direction = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadMetricOptions(pathCallSid) { Edge = edge, Direction = direction, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathCallSid"> The call_sid </param>
+    /// <param name="edge"> The edge </param>
+    /// <param name="direction"> The direction </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Metric </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MetricResource>> ReadAsync(string pathCallSid,
+                                                                                           MetricResource.TwilioEdgeEnum edge = null,
+                                                                                           MetricResource.StreamDirectionEnum direction = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadMetricOptions(pathCallSid) { Edge = edge, Direction = direction, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MetricResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MetricResource>.FromJson("metrics", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MetricResource> NextPage(Page<MetricResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Insights)
+      );
+
+      var response = client.Request(request);
+      return Page<MetricResource>.FromJson("metrics", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MetricResource> PreviousPage(Page<MetricResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Insights)
+      );
+
+      var response = client.Request(request);
+      return Page<MetricResource>.FromJson("metrics", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a MetricResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MetricResource object represented by the provided JSON </returns>
+    public static MetricResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MetricResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The timestamp
+    /// </summary>
+    [JsonProperty("timestamp")]
+    public string Timestamp { get; private set; }
+    /// <summary>
+    /// The call_sid
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The edge
+    /// </summary>
+    [JsonProperty("edge")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public MetricResource.TwilioEdgeEnum Edge { get; private set; }
+    /// <summary>
+    /// The direction
+    /// </summary>
+    [JsonProperty("direction")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public MetricResource.StreamDirectionEnum Direction { get; private set; }
+    /// <summary>
+    /// The carrier_edge
+    /// </summary>
+    [JsonProperty("carrier_edge")]
+    public object CarrierEdge { get; private set; }
+    /// <summary>
+    /// The sip_edge
+    /// </summary>
+    [JsonProperty("sip_edge")]
+    public object SipEdge { get; private set; }
+    /// <summary>
+    /// The sdk_edge
+    /// </summary>
+    [JsonProperty("sdk_edge")]
+    public object SdkEdge { get; private set; }
+    /// <summary>
+    /// The client_edge
+    /// </summary>
+    [JsonProperty("client_edge")]
+    public object ClientEdge { get; private set; }
+
+    private MetricResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/CallOptions.cs b/src/Twilio/Rest/Insights/V1/CallOptions.cs
index 3dd23d2f7..8fc440cb8 100644
--- a/src/Twilio/Rest/Insights/V1/CallOptions.cs
+++ b/src/Twilio/Rest/Insights/V1/CallOptions.cs
@@ -9,38 +9,38 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Insights.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchCallOptions
+  /// </summary>
+  public class FetchCallOptions : IOptions<CallResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchCallOptions
+    /// The sid
     /// </summary>
-    public class FetchCallOptions : IOptions<CallResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCallOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public FetchCallOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCallOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public FetchCallOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/CallResource.cs b/src/Twilio/Rest/Insights/V1/CallResource.cs
index d02c8f2b4..4a9ed89a0 100644
--- a/src/Twilio/Rest/Insights/V1/CallResource.cs
+++ b/src/Twilio/Rest/Insights/V1/CallResource.cs
@@ -19,115 +19,115 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Insights.V1
-{
-
-    public class CallResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchCallOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Insights,
-                "/v1/Voice/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Call parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Call </returns>
-        public static CallResource Fetch(FetchCallOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Call parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Call </returns>
-        public static async System.Threading.Tasks.Task<CallResource> FetchAsync(FetchCallOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Call </returns>
-        public static CallResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCallOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Call </returns>
-        public static async System.Threading.Tasks.Task<CallResource> FetchAsync(string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchCallOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CallResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CallResource object represented by the provided JSON </returns>
-        public static CallResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CallResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private CallResource()
-        {
-
-        }
-    }
+{
+
+  public class CallResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchCallOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Insights,
+          "/v1/Voice/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Call parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Call </returns>
+    public static CallResource Fetch(FetchCallOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Call parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Call </returns>
+    public static async System.Threading.Tasks.Task<CallResource> FetchAsync(FetchCallOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Call </returns>
+    public static CallResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCallOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Call </returns>
+    public static async System.Threading.Tasks.Task<CallResource> FetchAsync(string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchCallOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CallResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CallResource object represented by the provided JSON </returns>
+    public static CallResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CallResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private CallResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/CallSummariesOptions.cs b/src/Twilio/Rest/Insights/V1/CallSummariesOptions.cs
index a483cfac1..f7c15ad2f 100644
--- a/src/Twilio/Rest/Insights/V1/CallSummariesOptions.cs
+++ b/src/Twilio/Rest/Insights/V1/CallSummariesOptions.cs
@@ -9,189 +9,189 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Insights.V1
-{
-
+{
+
+  /// <summary>
+  /// ReadCallSummariesOptions
+  /// </summary>
+  public class ReadCallSummariesOptions : ReadOptions<CallSummariesResource>
+  {
     /// <summary>
-    /// ReadCallSummariesOptions
-    /// </summary>
-    public class ReadCallSummariesOptions : ReadOptions<CallSummariesResource>
-    {
-        /// <summary>
-        /// The from
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// The to
-        /// </summary>
-        public string To { get; set; }
-        /// <summary>
-        /// The from_carrier
-        /// </summary>
-        public string FromCarrier { get; set; }
-        /// <summary>
-        /// The to_carrier
-        /// </summary>
-        public string ToCarrier { get; set; }
-        /// <summary>
-        /// The from_country_code
-        /// </summary>
-        public string FromCountryCode { get; set; }
-        /// <summary>
-        /// The to_country_code
-        /// </summary>
-        public string ToCountryCode { get; set; }
-        /// <summary>
-        /// The branded
-        /// </summary>
-        public bool? Branded { get; set; }
-        /// <summary>
-        /// The verified_caller
-        /// </summary>
-        public bool? VerifiedCaller { get; set; }
-        /// <summary>
-        /// The has_tag
-        /// </summary>
-        public bool? HasTag { get; set; }
-        /// <summary>
-        /// The start_time
-        /// </summary>
-        public string StartTime { get; set; }
-        /// <summary>
-        /// The end_time
-        /// </summary>
-        public string EndTime { get; set; }
-        /// <summary>
-        /// The call_type
-        /// </summary>
-        public string CallType { get; set; }
-        /// <summary>
-        /// The call_state
-        /// </summary>
-        public string CallState { get; set; }
-        /// <summary>
-        /// The direction
-        /// </summary>
-        public string Direction { get; set; }
-        /// <summary>
-        /// The processing_state
-        /// </summary>
-        public CallSummariesResource.ProcessingStateRequestEnum ProcessingState { get; set; }
-        /// <summary>
-        /// The sort_by
-        /// </summary>
-        public CallSummariesResource.SortByEnum SortBy { get; set; }
-        /// <summary>
-        /// The subaccount
-        /// </summary>
-        public string Subaccount { get; set; }
-        /// <summary>
-        /// The abnormal_session
-        /// </summary>
-        public bool? AbnormalSession { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To));
-            }
-
-            if (FromCarrier != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FromCarrier", FromCarrier));
-            }
-
-            if (ToCarrier != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ToCarrier", ToCarrier));
-            }
-
-            if (FromCountryCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FromCountryCode", FromCountryCode));
-            }
-
-            if (ToCountryCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ToCountryCode", ToCountryCode));
-            }
-
-            if (Branded != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Branded", Branded.Value.ToString().ToLower()));
-            }
-
-            if (VerifiedCaller != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VerifiedCaller", VerifiedCaller.Value.ToString().ToLower()));
-            }
-
-            if (HasTag != null)
-            {
-                p.Add(new KeyValuePair<string, string>("HasTag", HasTag.Value.ToString().ToLower()));
-            }
-
-            if (StartTime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartTime", StartTime));
-            }
-
-            if (EndTime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndTime", EndTime));
-            }
-
-            if (CallType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallType", CallType));
-            }
-
-            if (CallState != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallState", CallState));
-            }
-
-            if (Direction != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Direction", Direction));
-            }
-
-            if (ProcessingState != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ProcessingState", ProcessingState.ToString()));
-            }
-
-            if (SortBy != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SortBy", SortBy.ToString()));
-            }
-
-            if (Subaccount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Subaccount", Subaccount.ToString()));
-            }
-
-            if (AbnormalSession != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AbnormalSession", AbnormalSession.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The from
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// The to
+    /// </summary>
+    public string To { get; set; }
+    /// <summary>
+    /// The from_carrier
+    /// </summary>
+    public string FromCarrier { get; set; }
+    /// <summary>
+    /// The to_carrier
+    /// </summary>
+    public string ToCarrier { get; set; }
+    /// <summary>
+    /// The from_country_code
+    /// </summary>
+    public string FromCountryCode { get; set; }
+    /// <summary>
+    /// The to_country_code
+    /// </summary>
+    public string ToCountryCode { get; set; }
+    /// <summary>
+    /// The branded
+    /// </summary>
+    public bool? Branded { get; set; }
+    /// <summary>
+    /// The verified_caller
+    /// </summary>
+    public bool? VerifiedCaller { get; set; }
+    /// <summary>
+    /// The has_tag
+    /// </summary>
+    public bool? HasTag { get; set; }
+    /// <summary>
+    /// The start_time
+    /// </summary>
+    public string StartTime { get; set; }
+    /// <summary>
+    /// The end_time
+    /// </summary>
+    public string EndTime { get; set; }
+    /// <summary>
+    /// The call_type
+    /// </summary>
+    public string CallType { get; set; }
+    /// <summary>
+    /// The call_state
+    /// </summary>
+    public string CallState { get; set; }
+    /// <summary>
+    /// The direction
+    /// </summary>
+    public string Direction { get; set; }
+    /// <summary>
+    /// The processing_state
+    /// </summary>
+    public CallSummariesResource.ProcessingStateRequestEnum ProcessingState { get; set; }
+    /// <summary>
+    /// The sort_by
+    /// </summary>
+    public CallSummariesResource.SortByEnum SortBy { get; set; }
+    /// <summary>
+    /// The subaccount
+    /// </summary>
+    public string Subaccount { get; set; }
+    /// <summary>
+    /// The abnormal_session
+    /// </summary>
+    public bool? AbnormalSession { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To));
+      }
+
+      if (FromCarrier != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FromCarrier", FromCarrier));
+      }
+
+      if (ToCarrier != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ToCarrier", ToCarrier));
+      }
+
+      if (FromCountryCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FromCountryCode", FromCountryCode));
+      }
+
+      if (ToCountryCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ToCountryCode", ToCountryCode));
+      }
+
+      if (Branded != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Branded", Branded.Value.ToString().ToLower()));
+      }
+
+      if (VerifiedCaller != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VerifiedCaller", VerifiedCaller.Value.ToString().ToLower()));
+      }
+
+      if (HasTag != null)
+      {
+        p.Add(new KeyValuePair<string, string>("HasTag", HasTag.Value.ToString().ToLower()));
+      }
+
+      if (StartTime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartTime", StartTime));
+      }
+
+      if (EndTime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndTime", EndTime));
+      }
+
+      if (CallType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallType", CallType));
+      }
+
+      if (CallState != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallState", CallState));
+      }
+
+      if (Direction != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Direction", Direction));
+      }
+
+      if (ProcessingState != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ProcessingState", ProcessingState.ToString()));
+      }
+
+      if (SortBy != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SortBy", SortBy.ToString()));
+      }
+
+      if (Subaccount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Subaccount", Subaccount.ToString()));
+      }
+
+      if (AbnormalSession != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AbnormalSession", AbnormalSession.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/CallSummariesResource.cs b/src/Twilio/Rest/Insights/V1/CallSummariesResource.cs
index a10072418..1f789637d 100644
--- a/src/Twilio/Rest/Insights/V1/CallSummariesResource.cs
+++ b/src/Twilio/Rest/Insights/V1/CallSummariesResource.cs
@@ -17,434 +17,434 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Insights.V1
-{
-
-    public class CallSummariesResource : Resource
-    {
-        public sealed class CallTypeEnum : StringEnum
-        {
-            private CallTypeEnum(string value) : base(value) {}
-            public CallTypeEnum() {}
-            public static implicit operator CallTypeEnum(string value)
-            {
-                return new CallTypeEnum(value);
-            }
-
-            public static readonly CallTypeEnum Carrier = new CallTypeEnum("carrier");
-            public static readonly CallTypeEnum Sip = new CallTypeEnum("sip");
-            public static readonly CallTypeEnum Trunking = new CallTypeEnum("trunking");
-            public static readonly CallTypeEnum Client = new CallTypeEnum("client");
-        }
-
-        public sealed class CallStateEnum : StringEnum
-        {
-            private CallStateEnum(string value) : base(value) {}
-            public CallStateEnum() {}
-            public static implicit operator CallStateEnum(string value)
-            {
-                return new CallStateEnum(value);
-            }
-
-            public static readonly CallStateEnum Ringing = new CallStateEnum("ringing");
-            public static readonly CallStateEnum Completed = new CallStateEnum("completed");
-            public static readonly CallStateEnum Busy = new CallStateEnum("busy");
-            public static readonly CallStateEnum Fail = new CallStateEnum("fail");
-            public static readonly CallStateEnum Noanswer = new CallStateEnum("noanswer");
-            public static readonly CallStateEnum Canceled = new CallStateEnum("canceled");
-            public static readonly CallStateEnum Answered = new CallStateEnum("answered");
-            public static readonly CallStateEnum Undialed = new CallStateEnum("undialed");
-        }
-
-        public sealed class ProcessingStateEnum : StringEnum
-        {
-            private ProcessingStateEnum(string value) : base(value) {}
-            public ProcessingStateEnum() {}
-            public static implicit operator ProcessingStateEnum(string value)
-            {
-                return new ProcessingStateEnum(value);
-            }
-
-            public static readonly ProcessingStateEnum Complete = new ProcessingStateEnum("complete");
-            public static readonly ProcessingStateEnum Partial = new ProcessingStateEnum("partial");
-        }
-
-        public sealed class CallDirectionEnum : StringEnum
-        {
-            private CallDirectionEnum(string value) : base(value) {}
-            public CallDirectionEnum() {}
-            public static implicit operator CallDirectionEnum(string value)
-            {
-                return new CallDirectionEnum(value);
-            }
-
-            public static readonly CallDirectionEnum OutboundApi = new CallDirectionEnum("outbound_api");
-            public static readonly CallDirectionEnum OutboundDial = new CallDirectionEnum("outbound_dial");
-            public static readonly CallDirectionEnum Inbound = new CallDirectionEnum("inbound");
-            public static readonly CallDirectionEnum TrunkingOriginating = new CallDirectionEnum("trunking_originating");
-            public static readonly CallDirectionEnum TrunkingTerminating = new CallDirectionEnum("trunking_terminating");
-        }
-
-        public sealed class SortByEnum : StringEnum
-        {
-            private SortByEnum(string value) : base(value) {}
-            public SortByEnum() {}
-            public static implicit operator SortByEnum(string value)
-            {
-                return new SortByEnum(value);
-            }
-
-            public static readonly SortByEnum StartTime = new SortByEnum("start_time");
-            public static readonly SortByEnum EndTime = new SortByEnum("end_time");
-        }
-
-        public sealed class ProcessingStateRequestEnum : StringEnum
-        {
-            private ProcessingStateRequestEnum(string value) : base(value) {}
-            public ProcessingStateRequestEnum() {}
-            public static implicit operator ProcessingStateRequestEnum(string value)
-            {
-                return new ProcessingStateRequestEnum(value);
-            }
-
-            public static readonly ProcessingStateRequestEnum Completed = new ProcessingStateRequestEnum("completed");
-            public static readonly ProcessingStateRequestEnum Started = new ProcessingStateRequestEnum("started");
-            public static readonly ProcessingStateRequestEnum Partial = new ProcessingStateRequestEnum("partial");
-            public static readonly ProcessingStateRequestEnum All = new ProcessingStateRequestEnum("all");
-        }
-
-        private static Request BuildReadRequest(ReadCallSummariesOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Insights,
-                "/v1/Voice/Summaries",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read CallSummaries parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CallSummaries </returns>
-        public static ResourceSet<CallSummariesResource> Read(ReadCallSummariesOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CallSummariesResource>.FromJson("call_summaries", response.Content);
-            return new ResourceSet<CallSummariesResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read CallSummaries parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CallSummaries </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CallSummariesResource>> ReadAsync(ReadCallSummariesOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CallSummariesResource>.FromJson("call_summaries", response.Content);
-            return new ResourceSet<CallSummariesResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="from"> The from </param>
-        /// <param name="to"> The to </param>
-        /// <param name="fromCarrier"> The from_carrier </param>
-        /// <param name="toCarrier"> The to_carrier </param>
-        /// <param name="fromCountryCode"> The from_country_code </param>
-        /// <param name="toCountryCode"> The to_country_code </param>
-        /// <param name="branded"> The branded </param>
-        /// <param name="verifiedCaller"> The verified_caller </param>
-        /// <param name="hasTag"> The has_tag </param>
-        /// <param name="startTime"> The start_time </param>
-        /// <param name="endTime"> The end_time </param>
-        /// <param name="callType"> The call_type </param>
-        /// <param name="callState"> The call_state </param>
-        /// <param name="direction"> The direction </param>
-        /// <param name="processingState"> The processing_state </param>
-        /// <param name="sortBy"> The sort_by </param>
-        /// <param name="subaccount"> The subaccount </param>
-        /// <param name="abnormalSession"> The abnormal_session </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CallSummaries </returns>
-        public static ResourceSet<CallSummariesResource> Read(string from = null,
-                                                              string to = null,
-                                                              string fromCarrier = null,
-                                                              string toCarrier = null,
-                                                              string fromCountryCode = null,
-                                                              string toCountryCode = null,
-                                                              bool? branded = null,
-                                                              bool? verifiedCaller = null,
-                                                              bool? hasTag = null,
-                                                              string startTime = null,
-                                                              string endTime = null,
-                                                              string callType = null,
-                                                              string callState = null,
-                                                              string direction = null,
-                                                              CallSummariesResource.ProcessingStateRequestEnum processingState = null,
-                                                              CallSummariesResource.SortByEnum sortBy = null,
-                                                              string subaccount = null,
-                                                              bool? abnormalSession = null,
-                                                              int? pageSize = null,
-                                                              long? limit = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadCallSummariesOptions(){From = from, To = to, FromCarrier = fromCarrier, ToCarrier = toCarrier, FromCountryCode = fromCountryCode, ToCountryCode = toCountryCode, Branded = branded, VerifiedCaller = verifiedCaller, HasTag = hasTag, StartTime = startTime, EndTime = endTime, CallType = callType, CallState = callState, Direction = direction, ProcessingState = processingState, SortBy = sortBy, Subaccount = subaccount, AbnormalSession = abnormalSession, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="from"> The from </param>
-        /// <param name="to"> The to </param>
-        /// <param name="fromCarrier"> The from_carrier </param>
-        /// <param name="toCarrier"> The to_carrier </param>
-        /// <param name="fromCountryCode"> The from_country_code </param>
-        /// <param name="toCountryCode"> The to_country_code </param>
-        /// <param name="branded"> The branded </param>
-        /// <param name="verifiedCaller"> The verified_caller </param>
-        /// <param name="hasTag"> The has_tag </param>
-        /// <param name="startTime"> The start_time </param>
-        /// <param name="endTime"> The end_time </param>
-        /// <param name="callType"> The call_type </param>
-        /// <param name="callState"> The call_state </param>
-        /// <param name="direction"> The direction </param>
-        /// <param name="processingState"> The processing_state </param>
-        /// <param name="sortBy"> The sort_by </param>
-        /// <param name="subaccount"> The subaccount </param>
-        /// <param name="abnormalSession"> The abnormal_session </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CallSummaries </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CallSummariesResource>> ReadAsync(string from = null,
-                                                                                                      string to = null,
-                                                                                                      string fromCarrier = null,
-                                                                                                      string toCarrier = null,
-                                                                                                      string fromCountryCode = null,
-                                                                                                      string toCountryCode = null,
-                                                                                                      bool? branded = null,
-                                                                                                      bool? verifiedCaller = null,
-                                                                                                      bool? hasTag = null,
-                                                                                                      string startTime = null,
-                                                                                                      string endTime = null,
-                                                                                                      string callType = null,
-                                                                                                      string callState = null,
-                                                                                                      string direction = null,
-                                                                                                      CallSummariesResource.ProcessingStateRequestEnum processingState = null,
-                                                                                                      CallSummariesResource.SortByEnum sortBy = null,
-                                                                                                      string subaccount = null,
-                                                                                                      bool? abnormalSession = null,
-                                                                                                      int? pageSize = null,
-                                                                                                      long? limit = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadCallSummariesOptions(){From = from, To = to, FromCarrier = fromCarrier, ToCarrier = toCarrier, FromCountryCode = fromCountryCode, ToCountryCode = toCountryCode, Branded = branded, VerifiedCaller = verifiedCaller, HasTag = hasTag, StartTime = startTime, EndTime = endTime, CallType = callType, CallState = callState, Direction = direction, ProcessingState = processingState, SortBy = sortBy, Subaccount = subaccount, AbnormalSession = abnormalSession, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CallSummariesResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CallSummariesResource>.FromJson("call_summaries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CallSummariesResource> NextPage(Page<CallSummariesResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Insights)
-            );
-
-            var response = client.Request(request);
-            return Page<CallSummariesResource>.FromJson("call_summaries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CallSummariesResource> PreviousPage(Page<CallSummariesResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Insights)
-            );
-
-            var response = client.Request(request);
-            return Page<CallSummariesResource>.FromJson("call_summaries", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a CallSummariesResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CallSummariesResource object represented by the provided JSON </returns>
-        public static CallSummariesResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CallSummariesResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The call_sid
-        /// </summary>
-        [JsonProperty("call_sid")]
-        public string CallSid { get; private set; }
-        /// <summary>
-        /// The call_type
-        /// </summary>
-        [JsonProperty("call_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CallSummariesResource.CallTypeEnum CallType { get; private set; }
-        /// <summary>
-        /// The call_state
-        /// </summary>
-        [JsonProperty("call_state")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CallSummariesResource.CallStateEnum CallState { get; private set; }
-        /// <summary>
-        /// The processing_state
-        /// </summary>
-        [JsonProperty("processing_state")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CallSummariesResource.ProcessingStateEnum ProcessingState { get; private set; }
-        /// <summary>
-        /// The created_time
-        /// </summary>
-        [JsonProperty("created_time")]
-        public DateTime? CreatedTime { get; private set; }
-        /// <summary>
-        /// The start_time
-        /// </summary>
-        [JsonProperty("start_time")]
-        public DateTime? StartTime { get; private set; }
-        /// <summary>
-        /// The end_time
-        /// </summary>
-        [JsonProperty("end_time")]
-        public DateTime? EndTime { get; private set; }
-        /// <summary>
-        /// The duration
-        /// </summary>
-        [JsonProperty("duration")]
-        public int? Duration { get; private set; }
-        /// <summary>
-        /// The connect_duration
-        /// </summary>
-        [JsonProperty("connect_duration")]
-        public int? ConnectDuration { get; private set; }
-        /// <summary>
-        /// The from
-        /// </summary>
-        [JsonProperty("from")]
-        public object From { get; private set; }
-        /// <summary>
-        /// The to
-        /// </summary>
-        [JsonProperty("to")]
-        public object To { get; private set; }
-        /// <summary>
-        /// The carrier_edge
-        /// </summary>
-        [JsonProperty("carrier_edge")]
-        public object CarrierEdge { get; private set; }
-        /// <summary>
-        /// The client_edge
-        /// </summary>
-        [JsonProperty("client_edge")]
-        public object ClientEdge { get; private set; }
-        /// <summary>
-        /// The sdk_edge
-        /// </summary>
-        [JsonProperty("sdk_edge")]
-        public object SdkEdge { get; private set; }
-        /// <summary>
-        /// The sip_edge
-        /// </summary>
-        [JsonProperty("sip_edge")]
-        public object SipEdge { get; private set; }
-        /// <summary>
-        /// The tags
-        /// </summary>
-        [JsonProperty("tags")]
-        public List<string> Tags { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        [JsonProperty("attributes")]
-        public object Attributes { get; private set; }
-        /// <summary>
-        /// The properties
-        /// </summary>
-        [JsonProperty("properties")]
-        public object Properties { get; private set; }
-        /// <summary>
-        /// The trust
-        /// </summary>
-        [JsonProperty("trust")]
-        public object Trust { get; private set; }
-
-        private CallSummariesResource()
-        {
-
-        }
-    }
+{
+
+  public class CallSummariesResource : Resource
+  {
+    public sealed class CallTypeEnum : StringEnum
+    {
+      private CallTypeEnum(string value) : base(value) { }
+      public CallTypeEnum() { }
+      public static implicit operator CallTypeEnum(string value)
+      {
+        return new CallTypeEnum(value);
+      }
+
+      public static readonly CallTypeEnum Carrier = new CallTypeEnum("carrier");
+      public static readonly CallTypeEnum Sip = new CallTypeEnum("sip");
+      public static readonly CallTypeEnum Trunking = new CallTypeEnum("trunking");
+      public static readonly CallTypeEnum Client = new CallTypeEnum("client");
+    }
+
+    public sealed class CallStateEnum : StringEnum
+    {
+      private CallStateEnum(string value) : base(value) { }
+      public CallStateEnum() { }
+      public static implicit operator CallStateEnum(string value)
+      {
+        return new CallStateEnum(value);
+      }
+
+      public static readonly CallStateEnum Ringing = new CallStateEnum("ringing");
+      public static readonly CallStateEnum Completed = new CallStateEnum("completed");
+      public static readonly CallStateEnum Busy = new CallStateEnum("busy");
+      public static readonly CallStateEnum Fail = new CallStateEnum("fail");
+      public static readonly CallStateEnum Noanswer = new CallStateEnum("noanswer");
+      public static readonly CallStateEnum Canceled = new CallStateEnum("canceled");
+      public static readonly CallStateEnum Answered = new CallStateEnum("answered");
+      public static readonly CallStateEnum Undialed = new CallStateEnum("undialed");
+    }
+
+    public sealed class ProcessingStateEnum : StringEnum
+    {
+      private ProcessingStateEnum(string value) : base(value) { }
+      public ProcessingStateEnum() { }
+      public static implicit operator ProcessingStateEnum(string value)
+      {
+        return new ProcessingStateEnum(value);
+      }
+
+      public static readonly ProcessingStateEnum Complete = new ProcessingStateEnum("complete");
+      public static readonly ProcessingStateEnum Partial = new ProcessingStateEnum("partial");
+    }
+
+    public sealed class CallDirectionEnum : StringEnum
+    {
+      private CallDirectionEnum(string value) : base(value) { }
+      public CallDirectionEnum() { }
+      public static implicit operator CallDirectionEnum(string value)
+      {
+        return new CallDirectionEnum(value);
+      }
+
+      public static readonly CallDirectionEnum OutboundApi = new CallDirectionEnum("outbound_api");
+      public static readonly CallDirectionEnum OutboundDial = new CallDirectionEnum("outbound_dial");
+      public static readonly CallDirectionEnum Inbound = new CallDirectionEnum("inbound");
+      public static readonly CallDirectionEnum TrunkingOriginating = new CallDirectionEnum("trunking_originating");
+      public static readonly CallDirectionEnum TrunkingTerminating = new CallDirectionEnum("trunking_terminating");
+    }
+
+    public sealed class SortByEnum : StringEnum
+    {
+      private SortByEnum(string value) : base(value) { }
+      public SortByEnum() { }
+      public static implicit operator SortByEnum(string value)
+      {
+        return new SortByEnum(value);
+      }
+
+      public static readonly SortByEnum StartTime = new SortByEnum("start_time");
+      public static readonly SortByEnum EndTime = new SortByEnum("end_time");
+    }
+
+    public sealed class ProcessingStateRequestEnum : StringEnum
+    {
+      private ProcessingStateRequestEnum(string value) : base(value) { }
+      public ProcessingStateRequestEnum() { }
+      public static implicit operator ProcessingStateRequestEnum(string value)
+      {
+        return new ProcessingStateRequestEnum(value);
+      }
+
+      public static readonly ProcessingStateRequestEnum Completed = new ProcessingStateRequestEnum("completed");
+      public static readonly ProcessingStateRequestEnum Started = new ProcessingStateRequestEnum("started");
+      public static readonly ProcessingStateRequestEnum Partial = new ProcessingStateRequestEnum("partial");
+      public static readonly ProcessingStateRequestEnum All = new ProcessingStateRequestEnum("all");
+    }
+
+    private static Request BuildReadRequest(ReadCallSummariesOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Insights,
+          "/v1/Voice/Summaries",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read CallSummaries parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CallSummaries </returns>
+    public static ResourceSet<CallSummariesResource> Read(ReadCallSummariesOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CallSummariesResource>.FromJson("call_summaries", response.Content);
+      return new ResourceSet<CallSummariesResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read CallSummaries parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CallSummaries </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CallSummariesResource>> ReadAsync(ReadCallSummariesOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CallSummariesResource>.FromJson("call_summaries", response.Content);
+      return new ResourceSet<CallSummariesResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="from"> The from </param>
+    /// <param name="to"> The to </param>
+    /// <param name="fromCarrier"> The from_carrier </param>
+    /// <param name="toCarrier"> The to_carrier </param>
+    /// <param name="fromCountryCode"> The from_country_code </param>
+    /// <param name="toCountryCode"> The to_country_code </param>
+    /// <param name="branded"> The branded </param>
+    /// <param name="verifiedCaller"> The verified_caller </param>
+    /// <param name="hasTag"> The has_tag </param>
+    /// <param name="startTime"> The start_time </param>
+    /// <param name="endTime"> The end_time </param>
+    /// <param name="callType"> The call_type </param>
+    /// <param name="callState"> The call_state </param>
+    /// <param name="direction"> The direction </param>
+    /// <param name="processingState"> The processing_state </param>
+    /// <param name="sortBy"> The sort_by </param>
+    /// <param name="subaccount"> The subaccount </param>
+    /// <param name="abnormalSession"> The abnormal_session </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CallSummaries </returns>
+    public static ResourceSet<CallSummariesResource> Read(string from = null,
+                                                          string to = null,
+                                                          string fromCarrier = null,
+                                                          string toCarrier = null,
+                                                          string fromCountryCode = null,
+                                                          string toCountryCode = null,
+                                                          bool? branded = null,
+                                                          bool? verifiedCaller = null,
+                                                          bool? hasTag = null,
+                                                          string startTime = null,
+                                                          string endTime = null,
+                                                          string callType = null,
+                                                          string callState = null,
+                                                          string direction = null,
+                                                          CallSummariesResource.ProcessingStateRequestEnum processingState = null,
+                                                          CallSummariesResource.SortByEnum sortBy = null,
+                                                          string subaccount = null,
+                                                          bool? abnormalSession = null,
+                                                          int? pageSize = null,
+                                                          long? limit = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadCallSummariesOptions() { From = from, To = to, FromCarrier = fromCarrier, ToCarrier = toCarrier, FromCountryCode = fromCountryCode, ToCountryCode = toCountryCode, Branded = branded, VerifiedCaller = verifiedCaller, HasTag = hasTag, StartTime = startTime, EndTime = endTime, CallType = callType, CallState = callState, Direction = direction, ProcessingState = processingState, SortBy = sortBy, Subaccount = subaccount, AbnormalSession = abnormalSession, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="from"> The from </param>
+    /// <param name="to"> The to </param>
+    /// <param name="fromCarrier"> The from_carrier </param>
+    /// <param name="toCarrier"> The to_carrier </param>
+    /// <param name="fromCountryCode"> The from_country_code </param>
+    /// <param name="toCountryCode"> The to_country_code </param>
+    /// <param name="branded"> The branded </param>
+    /// <param name="verifiedCaller"> The verified_caller </param>
+    /// <param name="hasTag"> The has_tag </param>
+    /// <param name="startTime"> The start_time </param>
+    /// <param name="endTime"> The end_time </param>
+    /// <param name="callType"> The call_type </param>
+    /// <param name="callState"> The call_state </param>
+    /// <param name="direction"> The direction </param>
+    /// <param name="processingState"> The processing_state </param>
+    /// <param name="sortBy"> The sort_by </param>
+    /// <param name="subaccount"> The subaccount </param>
+    /// <param name="abnormalSession"> The abnormal_session </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CallSummaries </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CallSummariesResource>> ReadAsync(string from = null,
+                                                                                                  string to = null,
+                                                                                                  string fromCarrier = null,
+                                                                                                  string toCarrier = null,
+                                                                                                  string fromCountryCode = null,
+                                                                                                  string toCountryCode = null,
+                                                                                                  bool? branded = null,
+                                                                                                  bool? verifiedCaller = null,
+                                                                                                  bool? hasTag = null,
+                                                                                                  string startTime = null,
+                                                                                                  string endTime = null,
+                                                                                                  string callType = null,
+                                                                                                  string callState = null,
+                                                                                                  string direction = null,
+                                                                                                  CallSummariesResource.ProcessingStateRequestEnum processingState = null,
+                                                                                                  CallSummariesResource.SortByEnum sortBy = null,
+                                                                                                  string subaccount = null,
+                                                                                                  bool? abnormalSession = null,
+                                                                                                  int? pageSize = null,
+                                                                                                  long? limit = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadCallSummariesOptions() { From = from, To = to, FromCarrier = fromCarrier, ToCarrier = toCarrier, FromCountryCode = fromCountryCode, ToCountryCode = toCountryCode, Branded = branded, VerifiedCaller = verifiedCaller, HasTag = hasTag, StartTime = startTime, EndTime = endTime, CallType = callType, CallState = callState, Direction = direction, ProcessingState = processingState, SortBy = sortBy, Subaccount = subaccount, AbnormalSession = abnormalSession, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CallSummariesResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CallSummariesResource>.FromJson("call_summaries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CallSummariesResource> NextPage(Page<CallSummariesResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Insights)
+      );
+
+      var response = client.Request(request);
+      return Page<CallSummariesResource>.FromJson("call_summaries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CallSummariesResource> PreviousPage(Page<CallSummariesResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Insights)
+      );
+
+      var response = client.Request(request);
+      return Page<CallSummariesResource>.FromJson("call_summaries", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a CallSummariesResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CallSummariesResource object represented by the provided JSON </returns>
+    public static CallSummariesResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CallSummariesResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The call_sid
+    /// </summary>
+    [JsonProperty("call_sid")]
+    public string CallSid { get; private set; }
+    /// <summary>
+    /// The call_type
+    /// </summary>
+    [JsonProperty("call_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CallSummariesResource.CallTypeEnum CallType { get; private set; }
+    /// <summary>
+    /// The call_state
+    /// </summary>
+    [JsonProperty("call_state")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CallSummariesResource.CallStateEnum CallState { get; private set; }
+    /// <summary>
+    /// The processing_state
+    /// </summary>
+    [JsonProperty("processing_state")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CallSummariesResource.ProcessingStateEnum ProcessingState { get; private set; }
+    /// <summary>
+    /// The created_time
+    /// </summary>
+    [JsonProperty("created_time")]
+    public DateTime? CreatedTime { get; private set; }
+    /// <summary>
+    /// The start_time
+    /// </summary>
+    [JsonProperty("start_time")]
+    public DateTime? StartTime { get; private set; }
+    /// <summary>
+    /// The end_time
+    /// </summary>
+    [JsonProperty("end_time")]
+    public DateTime? EndTime { get; private set; }
+    /// <summary>
+    /// The duration
+    /// </summary>
+    [JsonProperty("duration")]
+    public int? Duration { get; private set; }
+    /// <summary>
+    /// The connect_duration
+    /// </summary>
+    [JsonProperty("connect_duration")]
+    public int? ConnectDuration { get; private set; }
+    /// <summary>
+    /// The from
+    /// </summary>
+    [JsonProperty("from")]
+    public object From { get; private set; }
+    /// <summary>
+    /// The to
+    /// </summary>
+    [JsonProperty("to")]
+    public object To { get; private set; }
+    /// <summary>
+    /// The carrier_edge
+    /// </summary>
+    [JsonProperty("carrier_edge")]
+    public object CarrierEdge { get; private set; }
+    /// <summary>
+    /// The client_edge
+    /// </summary>
+    [JsonProperty("client_edge")]
+    public object ClientEdge { get; private set; }
+    /// <summary>
+    /// The sdk_edge
+    /// </summary>
+    [JsonProperty("sdk_edge")]
+    public object SdkEdge { get; private set; }
+    /// <summary>
+    /// The sip_edge
+    /// </summary>
+    [JsonProperty("sip_edge")]
+    public object SipEdge { get; private set; }
+    /// <summary>
+    /// The tags
+    /// </summary>
+    [JsonProperty("tags")]
+    public List<string> Tags { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    [JsonProperty("attributes")]
+    public object Attributes { get; private set; }
+    /// <summary>
+    /// The properties
+    /// </summary>
+    [JsonProperty("properties")]
+    public object Properties { get; private set; }
+    /// <summary>
+    /// The trust
+    /// </summary>
+    [JsonProperty("trust")]
+    public object Trust { get; private set; }
+
+    private CallSummariesResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/Room/ParticipantOptions.cs b/src/Twilio/Rest/Insights/V1/Room/ParticipantOptions.cs
index 794656502..e6975fded 100644
--- a/src/Twilio/Rest/Insights/V1/Room/ParticipantOptions.cs
+++ b/src/Twilio/Rest/Insights/V1/Room/ParticipantOptions.cs
@@ -9,79 +9,79 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Insights.V1.Room
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Get Video Log Analyzer data for a Room Participant.
+  /// </summary>
+  public class FetchParticipantOptions : IOptions<ParticipantResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Get Video Log Analyzer data for a Room Participant.
+    /// The SID of the Room resource.
     /// </summary>
-    public class FetchParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the Room resource.
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// The SID of the Participant resource.
-        /// </summary>
-        public string PathParticipantSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchParticipantOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource. </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource. </param>
-        public FetchParticipantOptions(string pathRoomSid, string pathParticipantSid)
-        {
-            PathRoomSid = pathRoomSid;
-            PathParticipantSid = pathParticipantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathRoomSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Get a list of room participants.
+    /// The SID of the Participant resource.
     /// </summary>
-    public class ReadParticipantOptions : ReadOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the Room resource.
-        /// </summary>
-        public string PathRoomSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadParticipantOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource. </param>
-        public ReadParticipantOptions(string pathRoomSid)
-        {
-            PathRoomSid = pathRoomSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathParticipantSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchParticipantOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource. </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource. </param>
+    public FetchParticipantOptions(string pathRoomSid, string pathParticipantSid)
+    {
+      PathRoomSid = pathRoomSid;
+      PathParticipantSid = pathParticipantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Get a list of room participants.
+  /// </summary>
+  public class ReadParticipantOptions : ReadOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the Room resource.
+    /// </summary>
+    public string PathRoomSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadParticipantOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource. </param>
+    public ReadParticipantOptions(string pathRoomSid)
+    {
+      PathRoomSid = pathRoomSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/Room/ParticipantResource.cs b/src/Twilio/Rest/Insights/V1/Room/ParticipantResource.cs
index 1b1856963..acc61a0c3 100644
--- a/src/Twilio/Rest/Insights/V1/Room/ParticipantResource.cs
+++ b/src/Twilio/Rest/Insights/V1/Room/ParticipantResource.cs
@@ -19,395 +19,395 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Insights.V1.Room
-{
-
-    public class ParticipantResource : Resource
-    {
-        public sealed class RoomStatusEnum : StringEnum
-        {
-            private RoomStatusEnum(string value) : base(value) {}
-            public RoomStatusEnum() {}
-            public static implicit operator RoomStatusEnum(string value)
-            {
-                return new RoomStatusEnum(value);
-            }
-
-            public static readonly RoomStatusEnum InProgress = new RoomStatusEnum("in_progress");
-            public static readonly RoomStatusEnum Completed = new RoomStatusEnum("completed");
-        }
-
-        public sealed class CodecEnum : StringEnum
-        {
-            private CodecEnum(string value) : base(value) {}
-            public CodecEnum() {}
-            public static implicit operator CodecEnum(string value)
-            {
-                return new CodecEnum(value);
-            }
-
-            public static readonly CodecEnum Vp8 = new CodecEnum("VP8");
-            public static readonly CodecEnum H264 = new CodecEnum("H264");
-            public static readonly CodecEnum Vp9 = new CodecEnum("VP9");
-        }
-
-        public sealed class TwilioRealmEnum : StringEnum
-        {
-            private TwilioRealmEnum(string value) : base(value) {}
-            public TwilioRealmEnum() {}
-            public static implicit operator TwilioRealmEnum(string value)
-            {
-                return new TwilioRealmEnum(value);
-            }
-
-            public static readonly TwilioRealmEnum Us1 = new TwilioRealmEnum("us1");
-            public static readonly TwilioRealmEnum Us2 = new TwilioRealmEnum("us2");
-            public static readonly TwilioRealmEnum Au1 = new TwilioRealmEnum("au1");
-            public static readonly TwilioRealmEnum Br1 = new TwilioRealmEnum("br1");
-            public static readonly TwilioRealmEnum Ie1 = new TwilioRealmEnum("ie1");
-            public static readonly TwilioRealmEnum Jp1 = new TwilioRealmEnum("jp1");
-            public static readonly TwilioRealmEnum Sg1 = new TwilioRealmEnum("sg1");
-            public static readonly TwilioRealmEnum In1 = new TwilioRealmEnum("in1");
-            public static readonly TwilioRealmEnum De1 = new TwilioRealmEnum("de1");
-            public static readonly TwilioRealmEnum Gll = new TwilioRealmEnum("gll");
-        }
-
-        public sealed class EdgeLocationEnum : StringEnum
-        {
-            private EdgeLocationEnum(string value) : base(value) {}
-            public EdgeLocationEnum() {}
-            public static implicit operator EdgeLocationEnum(string value)
-            {
-                return new EdgeLocationEnum(value);
-            }
-
-            public static readonly EdgeLocationEnum Ashburn = new EdgeLocationEnum("ashburn");
-            public static readonly EdgeLocationEnum Dublin = new EdgeLocationEnum("dublin");
-            public static readonly EdgeLocationEnum Frankfurt = new EdgeLocationEnum("frankfurt");
-            public static readonly EdgeLocationEnum Singapore = new EdgeLocationEnum("singapore");
-            public static readonly EdgeLocationEnum Sydney = new EdgeLocationEnum("sydney");
-            public static readonly EdgeLocationEnum SaoPaulo = new EdgeLocationEnum("sao_paulo");
-            public static readonly EdgeLocationEnum Roaming = new EdgeLocationEnum("roaming");
-            public static readonly EdgeLocationEnum Umatilla = new EdgeLocationEnum("umatilla");
-            public static readonly EdgeLocationEnum Tokyo = new EdgeLocationEnum("tokyo");
-        }
-
-        private static Request BuildFetchRequest(FetchParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Insights,
-                "/v1/Video/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Get Video Log Analyzer data for a Room Participant.
-        /// </summary>
-        /// <param name="options"> Fetch Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Fetch(FetchParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Get Video Log Analyzer data for a Room Participant.
-        /// </summary>
-        /// <param name="options"> Fetch Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(FetchParticipantOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Get Video Log Analyzer data for a Room Participant.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource. </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Fetch(string pathRoomSid,
-                                                string pathParticipantSid,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchParticipantOptions(pathRoomSid, pathParticipantSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Get Video Log Analyzer data for a Room Participant.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource. </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(string pathRoomSid,
-                                                                                        string pathParticipantSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchParticipantOptions(pathRoomSid, pathParticipantSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Insights,
-                "/v1/Video/Rooms/" + options.PathRoomSid + "/Participants",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Get a list of room participants.
-        /// </summary>
-        /// <param name="options"> Read Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ResourceSet<ParticipantResource> Read(ReadParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantResource>.FromJson("participants", response.Content);
-            return new ResourceSet<ParticipantResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Get a list of room participants.
-        /// </summary>
-        /// <param name="options"> Read Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(ReadParticipantOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantResource>.FromJson("participants", response.Content);
-            return new ResourceSet<ParticipantResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Get a list of room participants.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ResourceSet<ParticipantResource> Read(string pathRoomSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantOptions(pathRoomSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Get a list of room participants.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(string pathRoomSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantOptions(pathRoomSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ParticipantResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ParticipantResource> NextPage(Page<ParticipantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Insights)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ParticipantResource> PreviousPage(Page<ParticipantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Insights)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a ParticipantResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ParticipantResource object represented by the provided JSON </returns>
-        public static ParticipantResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ParticipantResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Unique identifier for the participant.
-        /// </summary>
-        [JsonProperty("participant_sid")]
-        public string ParticipantSid { get; private set; }
-        /// <summary>
-        /// The application-defined string that uniquely identifies the participant within a Room.
-        /// </summary>
-        [JsonProperty("participant_identity")]
-        public string ParticipantIdentity { get; private set; }
-        /// <summary>
-        /// When the participant joined the room.
-        /// </summary>
-        [JsonProperty("join_time")]
-        public DateTime? JoinTime { get; private set; }
-        /// <summary>
-        /// When the participant left the room
-        /// </summary>
-        [JsonProperty("leave_time")]
-        public DateTime? LeaveTime { get; private set; }
-        /// <summary>
-        /// Amount of time in seconds the participant was in the room.
-        /// </summary>
-        [JsonProperty("duration_sec")]
-        public long? DurationSec { get; private set; }
-        /// <summary>
-        /// Account SID associated with the room.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Unique identifier for the room.
-        /// </summary>
-        [JsonProperty("room_sid")]
-        public string RoomSid { get; private set; }
-        /// <summary>
-        /// Status of the room.
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ParticipantResource.RoomStatusEnum Status { get; private set; }
-        /// <summary>
-        /// Codecs detected from the participant.
-        /// </summary>
-        [JsonProperty("codecs")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public List<ParticipantResource.CodecEnum> Codecs { get; private set; }
-        /// <summary>
-        /// Reason the participant left the room.
-        /// </summary>
-        [JsonProperty("end_reason")]
-        public string EndReason { get; private set; }
-        /// <summary>
-        /// Errors encountered by the participant.
-        /// </summary>
-        [JsonProperty("error_code")]
-        public int? ErrorCode { get; private set; }
-        /// <summary>
-        /// Twilio error code dictionary link.
-        /// </summary>
-        [JsonProperty("error_code_url")]
-        public string ErrorCodeUrl { get; private set; }
-        /// <summary>
-        /// Twilio media region the participant connected to.
-        /// </summary>
-        [JsonProperty("media_region")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ParticipantResource.TwilioRealmEnum MediaRegion { get; private set; }
-        /// <summary>
-        /// Object containing information about the participant's data from the room.
-        /// </summary>
-        [JsonProperty("properties")]
-        public object Properties { get; private set; }
-        /// <summary>
-        /// Name of the edge location the participant connected to.
-        /// </summary>
-        [JsonProperty("edge_location")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ParticipantResource.EdgeLocationEnum EdgeLocation { get; private set; }
-        /// <summary>
-        /// Object containing information about the SDK name and version.
-        /// </summary>
-        [JsonProperty("publisher_info")]
-        public object PublisherInfo { get; private set; }
-        /// <summary>
-        /// URL of the participant resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private ParticipantResource()
-        {
-
-        }
-    }
+{
+
+  public class ParticipantResource : Resource
+  {
+    public sealed class RoomStatusEnum : StringEnum
+    {
+      private RoomStatusEnum(string value) : base(value) { }
+      public RoomStatusEnum() { }
+      public static implicit operator RoomStatusEnum(string value)
+      {
+        return new RoomStatusEnum(value);
+      }
+
+      public static readonly RoomStatusEnum InProgress = new RoomStatusEnum("in_progress");
+      public static readonly RoomStatusEnum Completed = new RoomStatusEnum("completed");
+    }
+
+    public sealed class CodecEnum : StringEnum
+    {
+      private CodecEnum(string value) : base(value) { }
+      public CodecEnum() { }
+      public static implicit operator CodecEnum(string value)
+      {
+        return new CodecEnum(value);
+      }
+
+      public static readonly CodecEnum Vp8 = new CodecEnum("VP8");
+      public static readonly CodecEnum H264 = new CodecEnum("H264");
+      public static readonly CodecEnum Vp9 = new CodecEnum("VP9");
+    }
+
+    public sealed class TwilioRealmEnum : StringEnum
+    {
+      private TwilioRealmEnum(string value) : base(value) { }
+      public TwilioRealmEnum() { }
+      public static implicit operator TwilioRealmEnum(string value)
+      {
+        return new TwilioRealmEnum(value);
+      }
+
+      public static readonly TwilioRealmEnum Us1 = new TwilioRealmEnum("us1");
+      public static readonly TwilioRealmEnum Us2 = new TwilioRealmEnum("us2");
+      public static readonly TwilioRealmEnum Au1 = new TwilioRealmEnum("au1");
+      public static readonly TwilioRealmEnum Br1 = new TwilioRealmEnum("br1");
+      public static readonly TwilioRealmEnum Ie1 = new TwilioRealmEnum("ie1");
+      public static readonly TwilioRealmEnum Jp1 = new TwilioRealmEnum("jp1");
+      public static readonly TwilioRealmEnum Sg1 = new TwilioRealmEnum("sg1");
+      public static readonly TwilioRealmEnum In1 = new TwilioRealmEnum("in1");
+      public static readonly TwilioRealmEnum De1 = new TwilioRealmEnum("de1");
+      public static readonly TwilioRealmEnum Gll = new TwilioRealmEnum("gll");
+    }
+
+    public sealed class EdgeLocationEnum : StringEnum
+    {
+      private EdgeLocationEnum(string value) : base(value) { }
+      public EdgeLocationEnum() { }
+      public static implicit operator EdgeLocationEnum(string value)
+      {
+        return new EdgeLocationEnum(value);
+      }
+
+      public static readonly EdgeLocationEnum Ashburn = new EdgeLocationEnum("ashburn");
+      public static readonly EdgeLocationEnum Dublin = new EdgeLocationEnum("dublin");
+      public static readonly EdgeLocationEnum Frankfurt = new EdgeLocationEnum("frankfurt");
+      public static readonly EdgeLocationEnum Singapore = new EdgeLocationEnum("singapore");
+      public static readonly EdgeLocationEnum Sydney = new EdgeLocationEnum("sydney");
+      public static readonly EdgeLocationEnum SaoPaulo = new EdgeLocationEnum("sao_paulo");
+      public static readonly EdgeLocationEnum Roaming = new EdgeLocationEnum("roaming");
+      public static readonly EdgeLocationEnum Umatilla = new EdgeLocationEnum("umatilla");
+      public static readonly EdgeLocationEnum Tokyo = new EdgeLocationEnum("tokyo");
+    }
+
+    private static Request BuildFetchRequest(FetchParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Insights,
+          "/v1/Video/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Get Video Log Analyzer data for a Room Participant.
+    /// </summary>
+    /// <param name="options"> Fetch Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Fetch(FetchParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Get Video Log Analyzer data for a Room Participant.
+    /// </summary>
+    /// <param name="options"> Fetch Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(FetchParticipantOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Get Video Log Analyzer data for a Room Participant.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource. </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Fetch(string pathRoomSid,
+                                            string pathParticipantSid,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchParticipantOptions(pathRoomSid, pathParticipantSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Get Video Log Analyzer data for a Room Participant.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource. </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(string pathRoomSid,
+                                                                                    string pathParticipantSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchParticipantOptions(pathRoomSid, pathParticipantSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Insights,
+          "/v1/Video/Rooms/" + options.PathRoomSid + "/Participants",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Get a list of room participants.
+    /// </summary>
+    /// <param name="options"> Read Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ResourceSet<ParticipantResource> Read(ReadParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantResource>.FromJson("participants", response.Content);
+      return new ResourceSet<ParticipantResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Get a list of room participants.
+    /// </summary>
+    /// <param name="options"> Read Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(ReadParticipantOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantResource>.FromJson("participants", response.Content);
+      return new ResourceSet<ParticipantResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Get a list of room participants.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ResourceSet<ParticipantResource> Read(string pathRoomSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantOptions(pathRoomSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Get a list of room participants.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(string pathRoomSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantOptions(pathRoomSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ParticipantResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ParticipantResource> NextPage(Page<ParticipantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Insights)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ParticipantResource> PreviousPage(Page<ParticipantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Insights)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a ParticipantResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ParticipantResource object represented by the provided JSON </returns>
+    public static ParticipantResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ParticipantResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Unique identifier for the participant.
+    /// </summary>
+    [JsonProperty("participant_sid")]
+    public string ParticipantSid { get; private set; }
+    /// <summary>
+    /// The application-defined string that uniquely identifies the participant within a Room.
+    /// </summary>
+    [JsonProperty("participant_identity")]
+    public string ParticipantIdentity { get; private set; }
+    /// <summary>
+    /// When the participant joined the room.
+    /// </summary>
+    [JsonProperty("join_time")]
+    public DateTime? JoinTime { get; private set; }
+    /// <summary>
+    /// When the participant left the room
+    /// </summary>
+    [JsonProperty("leave_time")]
+    public DateTime? LeaveTime { get; private set; }
+    /// <summary>
+    /// Amount of time in seconds the participant was in the room.
+    /// </summary>
+    [JsonProperty("duration_sec")]
+    public long? DurationSec { get; private set; }
+    /// <summary>
+    /// Account SID associated with the room.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Unique identifier for the room.
+    /// </summary>
+    [JsonProperty("room_sid")]
+    public string RoomSid { get; private set; }
+    /// <summary>
+    /// Status of the room.
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ParticipantResource.RoomStatusEnum Status { get; private set; }
+    /// <summary>
+    /// Codecs detected from the participant.
+    /// </summary>
+    [JsonProperty("codecs")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public List<ParticipantResource.CodecEnum> Codecs { get; private set; }
+    /// <summary>
+    /// Reason the participant left the room.
+    /// </summary>
+    [JsonProperty("end_reason")]
+    public string EndReason { get; private set; }
+    /// <summary>
+    /// Errors encountered by the participant.
+    /// </summary>
+    [JsonProperty("error_code")]
+    public int? ErrorCode { get; private set; }
+    /// <summary>
+    /// Twilio error code dictionary link.
+    /// </summary>
+    [JsonProperty("error_code_url")]
+    public string ErrorCodeUrl { get; private set; }
+    /// <summary>
+    /// Twilio media region the participant connected to.
+    /// </summary>
+    [JsonProperty("media_region")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ParticipantResource.TwilioRealmEnum MediaRegion { get; private set; }
+    /// <summary>
+    /// Object containing information about the participant's data from the room.
+    /// </summary>
+    [JsonProperty("properties")]
+    public object Properties { get; private set; }
+    /// <summary>
+    /// Name of the edge location the participant connected to.
+    /// </summary>
+    [JsonProperty("edge_location")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ParticipantResource.EdgeLocationEnum EdgeLocation { get; private set; }
+    /// <summary>
+    /// Object containing information about the SDK name and version.
+    /// </summary>
+    [JsonProperty("publisher_info")]
+    public object PublisherInfo { get; private set; }
+    /// <summary>
+    /// URL of the participant resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private ParticipantResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/RoomOptions.cs b/src/Twilio/Rest/Insights/V1/RoomOptions.cs
index 31c2d705e..281a3fd9c 100644
--- a/src/Twilio/Rest/Insights/V1/RoomOptions.cs
+++ b/src/Twilio/Rest/Insights/V1/RoomOptions.cs
@@ -10,114 +10,114 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Insights.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Get Video Log Analyzer data for a Room.
+  /// </summary>
+  public class FetchRoomOptions : IOptions<RoomResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Get Video Log Analyzer data for a Room.
+    /// The SID of the Room resource.
     /// </summary>
-    public class FetchRoomOptions : IOptions<RoomResource>
-    {
-        /// <summary>
-        /// The SID of the Room resource.
-        /// </summary>
-        public string PathRoomSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRoomOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource. </param>
-        public FetchRoomOptions(string pathRoomSid)
-        {
-            PathRoomSid = pathRoomSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathRoomSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Get a list of Programmable Video Rooms.
+    /// Construct a new FetchRoomOptions
     /// </summary>
-    public class ReadRoomOptions : ReadOptions<RoomResource>
-    {
-        /// <summary>
-        /// Type of room.
-        /// </summary>
-        public List<RoomResource.RoomTypeEnum> RoomType { get; set; }
-        /// <summary>
-        /// Codecs used by participants in the room.
-        /// </summary>
-        public List<RoomResource.CodecEnum> Codec { get; set; }
-        /// <summary>
-        /// Room friendly name.
-        /// </summary>
-        public string RoomName { get; set; }
-        /// <summary>
-        /// Only read rooms that started on or after this ISO 8601 timestamp.
-        /// </summary>
-        public DateTime? CreatedAfter { get; set; }
-        /// <summary>
-        /// Only read rooms that started before this ISO 8601 timestamp.
-        /// </summary>
-        public DateTime? CreatedBefore { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadRoomOptions
-        /// </summary>
-        public ReadRoomOptions()
-        {
-            RoomType = new List<RoomResource.RoomTypeEnum>();
-            Codec = new List<RoomResource.CodecEnum>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (RoomType != null)
-            {
-                p.AddRange(RoomType.Select(prop => new KeyValuePair<string, string>("RoomType", prop.ToString())));
-            }
-
-            if (Codec != null)
-            {
-                p.AddRange(Codec.Select(prop => new KeyValuePair<string, string>("Codec", prop.ToString())));
-            }
-
-            if (RoomName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoomName", RoomName));
-            }
-
-            if (CreatedAfter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CreatedAfter", Serializers.DateTimeIso8601(CreatedAfter)));
-            }
-
-            if (CreatedBefore != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CreatedBefore", Serializers.DateTimeIso8601(CreatedBefore)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathRoomSid"> The SID of the Room resource. </param>
+    public FetchRoomOptions(string pathRoomSid)
+    {
+      PathRoomSid = pathRoomSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Get a list of Programmable Video Rooms.
+  /// </summary>
+  public class ReadRoomOptions : ReadOptions<RoomResource>
+  {
+    /// <summary>
+    /// Type of room.
+    /// </summary>
+    public List<RoomResource.RoomTypeEnum> RoomType { get; set; }
+    /// <summary>
+    /// Codecs used by participants in the room.
+    /// </summary>
+    public List<RoomResource.CodecEnum> Codec { get; set; }
+    /// <summary>
+    /// Room friendly name.
+    /// </summary>
+    public string RoomName { get; set; }
+    /// <summary>
+    /// Only read rooms that started on or after this ISO 8601 timestamp.
+    /// </summary>
+    public DateTime? CreatedAfter { get; set; }
+    /// <summary>
+    /// Only read rooms that started before this ISO 8601 timestamp.
+    /// </summary>
+    public DateTime? CreatedBefore { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadRoomOptions
+    /// </summary>
+    public ReadRoomOptions()
+    {
+      RoomType = new List<RoomResource.RoomTypeEnum>();
+      Codec = new List<RoomResource.CodecEnum>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (RoomType != null)
+      {
+        p.AddRange(RoomType.Select(prop => new KeyValuePair<string, string>("RoomType", prop.ToString())));
+      }
+
+      if (Codec != null)
+      {
+        p.AddRange(Codec.Select(prop => new KeyValuePair<string, string>("Codec", prop.ToString())));
+      }
+
+      if (RoomName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoomName", RoomName));
+      }
+
+      if (CreatedAfter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CreatedAfter", Serializers.DateTimeIso8601(CreatedAfter)));
+      }
+
+      if (CreatedBefore != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CreatedBefore", Serializers.DateTimeIso8601(CreatedBefore)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/RoomResource.cs b/src/Twilio/Rest/Insights/V1/RoomResource.cs
index 1d2d4ae73..8549ee6eb 100644
--- a/src/Twilio/Rest/Insights/V1/RoomResource.cs
+++ b/src/Twilio/Rest/Insights/V1/RoomResource.cs
@@ -19,511 +19,511 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Insights.V1
-{
-
-    public class RoomResource : Resource
-    {
-        public sealed class RoomTypeEnum : StringEnum
-        {
-            private RoomTypeEnum(string value) : base(value) {}
-            public RoomTypeEnum() {}
-            public static implicit operator RoomTypeEnum(string value)
-            {
-                return new RoomTypeEnum(value);
-            }
-
-            public static readonly RoomTypeEnum Go = new RoomTypeEnum("go");
-            public static readonly RoomTypeEnum PeerToPeer = new RoomTypeEnum("peer_to_peer");
-            public static readonly RoomTypeEnum Group = new RoomTypeEnum("group");
-            public static readonly RoomTypeEnum GroupSmall = new RoomTypeEnum("group_small");
-        }
-
-        public sealed class RoomStatusEnum : StringEnum
-        {
-            private RoomStatusEnum(string value) : base(value) {}
-            public RoomStatusEnum() {}
-            public static implicit operator RoomStatusEnum(string value)
-            {
-                return new RoomStatusEnum(value);
-            }
-
-            public static readonly RoomStatusEnum InProgress = new RoomStatusEnum("in_progress");
-            public static readonly RoomStatusEnum Completed = new RoomStatusEnum("completed");
-        }
-
-        public sealed class CreatedMethodEnum : StringEnum
-        {
-            private CreatedMethodEnum(string value) : base(value) {}
-            public CreatedMethodEnum() {}
-            public static implicit operator CreatedMethodEnum(string value)
-            {
-                return new CreatedMethodEnum(value);
-            }
-
-            public static readonly CreatedMethodEnum Sdk = new CreatedMethodEnum("sdk");
-            public static readonly CreatedMethodEnum AdHoc = new CreatedMethodEnum("ad_hoc");
-            public static readonly CreatedMethodEnum Api = new CreatedMethodEnum("api");
-        }
-
-        public sealed class EndReasonEnum : StringEnum
-        {
-            private EndReasonEnum(string value) : base(value) {}
-            public EndReasonEnum() {}
-            public static implicit operator EndReasonEnum(string value)
-            {
-                return new EndReasonEnum(value);
-            }
-
-            public static readonly EndReasonEnum RoomEndedViaApi = new EndReasonEnum("room_ended_via_api");
-            public static readonly EndReasonEnum Timeout = new EndReasonEnum("timeout");
-        }
-
-        public sealed class CodecEnum : StringEnum
-        {
-            private CodecEnum(string value) : base(value) {}
-            public CodecEnum() {}
-            public static implicit operator CodecEnum(string value)
-            {
-                return new CodecEnum(value);
-            }
-
-            public static readonly CodecEnum Vp8 = new CodecEnum("VP8");
-            public static readonly CodecEnum H264 = new CodecEnum("H264");
-            public static readonly CodecEnum Vp9 = new CodecEnum("VP9");
-        }
-
-        public sealed class TwilioRealmEnum : StringEnum
-        {
-            private TwilioRealmEnum(string value) : base(value) {}
-            public TwilioRealmEnum() {}
-            public static implicit operator TwilioRealmEnum(string value)
-            {
-                return new TwilioRealmEnum(value);
-            }
-
-            public static readonly TwilioRealmEnum Us1 = new TwilioRealmEnum("us1");
-            public static readonly TwilioRealmEnum Us2 = new TwilioRealmEnum("us2");
-            public static readonly TwilioRealmEnum Au1 = new TwilioRealmEnum("au1");
-            public static readonly TwilioRealmEnum Br1 = new TwilioRealmEnum("br1");
-            public static readonly TwilioRealmEnum Ie1 = new TwilioRealmEnum("ie1");
-            public static readonly TwilioRealmEnum Jp1 = new TwilioRealmEnum("jp1");
-            public static readonly TwilioRealmEnum Sg1 = new TwilioRealmEnum("sg1");
-            public static readonly TwilioRealmEnum In1 = new TwilioRealmEnum("in1");
-            public static readonly TwilioRealmEnum De1 = new TwilioRealmEnum("de1");
-            public static readonly TwilioRealmEnum Gll = new TwilioRealmEnum("gll");
-        }
-
-        public sealed class ProcessingStateEnum : StringEnum
-        {
-            private ProcessingStateEnum(string value) : base(value) {}
-            public ProcessingStateEnum() {}
-            public static implicit operator ProcessingStateEnum(string value)
-            {
-                return new ProcessingStateEnum(value);
-            }
-
-            public static readonly ProcessingStateEnum Complete = new ProcessingStateEnum("complete");
-            public static readonly ProcessingStateEnum InProgress = new ProcessingStateEnum("in_progress");
-        }
-
-        public sealed class EdgeLocationEnum : StringEnum
-        {
-            private EdgeLocationEnum(string value) : base(value) {}
-            public EdgeLocationEnum() {}
-            public static implicit operator EdgeLocationEnum(string value)
-            {
-                return new EdgeLocationEnum(value);
-            }
-
-            public static readonly EdgeLocationEnum Ashburn = new EdgeLocationEnum("ashburn");
-            public static readonly EdgeLocationEnum Dublin = new EdgeLocationEnum("dublin");
-            public static readonly EdgeLocationEnum Frankfurt = new EdgeLocationEnum("frankfurt");
-            public static readonly EdgeLocationEnum Singapore = new EdgeLocationEnum("singapore");
-            public static readonly EdgeLocationEnum Sydney = new EdgeLocationEnum("sydney");
-            public static readonly EdgeLocationEnum SaoPaulo = new EdgeLocationEnum("sao_paulo");
-            public static readonly EdgeLocationEnum Roaming = new EdgeLocationEnum("roaming");
-            public static readonly EdgeLocationEnum Umatilla = new EdgeLocationEnum("umatilla");
-            public static readonly EdgeLocationEnum Tokyo = new EdgeLocationEnum("tokyo");
-        }
-
-        private static Request BuildFetchRequest(FetchRoomOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Insights,
-                "/v1/Video/Rooms/" + options.PathRoomSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Get Video Log Analyzer data for a Room.
-        /// </summary>
-        /// <param name="options"> Fetch Room parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Room </returns>
-        public static RoomResource Fetch(FetchRoomOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Get Video Log Analyzer data for a Room.
-        /// </summary>
-        /// <param name="options"> Fetch Room parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Room </returns>
-        public static async System.Threading.Tasks.Task<RoomResource> FetchAsync(FetchRoomOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Get Video Log Analyzer data for a Room.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Room </returns>
-        public static RoomResource Fetch(string pathRoomSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRoomOptions(pathRoomSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Get Video Log Analyzer data for a Room.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Room </returns>
-        public static async System.Threading.Tasks.Task<RoomResource> FetchAsync(string pathRoomSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchRoomOptions(pathRoomSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRoomOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Insights,
-                "/v1/Video/Rooms",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Get a list of Programmable Video Rooms.
-        /// </summary>
-        /// <param name="options"> Read Room parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Room </returns>
-        public static ResourceSet<RoomResource> Read(ReadRoomOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RoomResource>.FromJson("rooms", response.Content);
-            return new ResourceSet<RoomResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Get a list of Programmable Video Rooms.
-        /// </summary>
-        /// <param name="options"> Read Room parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Room </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoomResource>> ReadAsync(ReadRoomOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RoomResource>.FromJson("rooms", response.Content);
-            return new ResourceSet<RoomResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Get a list of Programmable Video Rooms.
-        /// </summary>
-        /// <param name="roomType"> Type of room. </param>
-        /// <param name="codec"> Codecs used by participants in the room. </param>
-        /// <param name="roomName"> Room friendly name. </param>
-        /// <param name="createdAfter"> Only read rooms that started on or after this ISO 8601 timestamp. </param>
-        /// <param name="createdBefore"> Only read rooms that started before this ISO 8601 timestamp. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Room </returns>
-        public static ResourceSet<RoomResource> Read(List<RoomResource.RoomTypeEnum> roomType = null,
-                                                     List<RoomResource.CodecEnum> codec = null,
-                                                     string roomName = null,
-                                                     DateTime? createdAfter = null,
-                                                     DateTime? createdBefore = null,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadRoomOptions(){RoomType = roomType, Codec = codec, RoomName = roomName, CreatedAfter = createdAfter, CreatedBefore = createdBefore, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Get a list of Programmable Video Rooms.
-        /// </summary>
-        /// <param name="roomType"> Type of room. </param>
-        /// <param name="codec"> Codecs used by participants in the room. </param>
-        /// <param name="roomName"> Room friendly name. </param>
-        /// <param name="createdAfter"> Only read rooms that started on or after this ISO 8601 timestamp. </param>
-        /// <param name="createdBefore"> Only read rooms that started before this ISO 8601 timestamp. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Room </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoomResource>> ReadAsync(List<RoomResource.RoomTypeEnum> roomType = null,
-                                                                                             List<RoomResource.CodecEnum> codec = null,
-                                                                                             string roomName = null,
-                                                                                             DateTime? createdAfter = null,
-                                                                                             DateTime? createdBefore = null,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadRoomOptions(){RoomType = roomType, Codec = codec, RoomName = roomName, CreatedAfter = createdAfter, CreatedBefore = createdBefore, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RoomResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RoomResource>.FromJson("rooms", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RoomResource> NextPage(Page<RoomResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Insights)
-            );
-
-            var response = client.Request(request);
-            return Page<RoomResource>.FromJson("rooms", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RoomResource> PreviousPage(Page<RoomResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Insights)
-            );
-
-            var response = client.Request(request);
-            return Page<RoomResource>.FromJson("rooms", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a RoomResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RoomResource object represented by the provided JSON </returns>
-        public static RoomResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RoomResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Account SID associated with this room.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Unique identifier for the room.
-        /// </summary>
-        [JsonProperty("room_sid")]
-        public string RoomSid { get; private set; }
-        /// <summary>
-        /// room friendly name.
-        /// </summary>
-        [JsonProperty("room_name")]
-        public string RoomName { get; private set; }
-        /// <summary>
-        /// Creation time of the room.
-        /// </summary>
-        [JsonProperty("create_time")]
-        public DateTime? CreateTime { get; private set; }
-        /// <summary>
-        /// End time for the room.
-        /// </summary>
-        [JsonProperty("end_time")]
-        public DateTime? EndTime { get; private set; }
-        /// <summary>
-        /// Type of room.
-        /// </summary>
-        [JsonProperty("room_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoomResource.RoomTypeEnum RoomType { get; private set; }
-        /// <summary>
-        /// Status of the room.
-        /// </summary>
-        [JsonProperty("room_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoomResource.RoomStatusEnum RoomStatus { get; private set; }
-        /// <summary>
-        /// Webhook provided for status callbacks.
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// HTTP method provided for status callback URL.
-        /// </summary>
-        [JsonProperty("status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// How the room was created.
-        /// </summary>
-        [JsonProperty("created_method")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoomResource.CreatedMethodEnum CreatedMethod { get; private set; }
-        /// <summary>
-        /// Reason the room ended.
-        /// </summary>
-        [JsonProperty("end_reason")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoomResource.EndReasonEnum EndReason { get; private set; }
-        /// <summary>
-        /// Max number of total participants allowed by the application settings.
-        /// </summary>
-        [JsonProperty("max_participants")]
-        public int? MaxParticipants { get; private set; }
-        /// <summary>
-        /// Number of participants. May include duplicate identities for participants who left and rejoined.
-        /// </summary>
-        [JsonProperty("unique_participants")]
-        public int? UniqueParticipants { get; private set; }
-        /// <summary>
-        /// Unique number of participant identities.
-        /// </summary>
-        [JsonProperty("unique_participant_identities")]
-        public int? UniqueParticipantIdentities { get; private set; }
-        /// <summary>
-        /// Actual number of concurrent participants.
-        /// </summary>
-        [JsonProperty("concurrent_participants")]
-        public int? ConcurrentParticipants { get; private set; }
-        /// <summary>
-        /// Maximum number of participants allowed in the room at the same time allowed by the application settings.
-        /// </summary>
-        [JsonProperty("max_concurrent_participants")]
-        public int? MaxConcurrentParticipants { get; private set; }
-        /// <summary>
-        /// Codecs used by participants in the room.
-        /// </summary>
-        [JsonProperty("codecs")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public List<RoomResource.CodecEnum> Codecs { get; private set; }
-        /// <summary>
-        /// Region of Twilio media servers for the room.
-        /// </summary>
-        [JsonProperty("media_region")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoomResource.TwilioRealmEnum MediaRegion { get; private set; }
-        /// <summary>
-        /// Total room duration from create time to end time.
-        /// </summary>
-        [JsonProperty("duration_sec")]
-        public long? DurationSec { get; private set; }
-        /// <summary>
-        /// Combined amount of participant time in the room.
-        /// </summary>
-        [JsonProperty("total_participant_duration_sec")]
-        public long? TotalParticipantDurationSec { get; private set; }
-        /// <summary>
-        /// Combined amount of recorded seconds for participants in the room.
-        /// </summary>
-        [JsonProperty("total_recording_duration_sec")]
-        public long? TotalRecordingDurationSec { get; private set; }
-        /// <summary>
-        /// Video Log Analyzer resource state. Will be either `in-progress` or `complete`.
-        /// </summary>
-        [JsonProperty("processing_state")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoomResource.ProcessingStateEnum ProcessingState { get; private set; }
-        /// <summary>
-        /// Boolean indicating if recording is enabled for the room.
-        /// </summary>
-        [JsonProperty("recording_enabled")]
-        public bool? RecordingEnabled { get; private set; }
-        /// <summary>
-        /// Edge location of Twilio media servers for the room.
-        /// </summary>
-        [JsonProperty("edge_location")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoomResource.EdgeLocationEnum EdgeLocation { get; private set; }
-        /// <summary>
-        /// URL for the room resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Room subresources.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private RoomResource()
-        {
-
-        }
-    }
+{
+
+  public class RoomResource : Resource
+  {
+    public sealed class RoomTypeEnum : StringEnum
+    {
+      private RoomTypeEnum(string value) : base(value) { }
+      public RoomTypeEnum() { }
+      public static implicit operator RoomTypeEnum(string value)
+      {
+        return new RoomTypeEnum(value);
+      }
+
+      public static readonly RoomTypeEnum Go = new RoomTypeEnum("go");
+      public static readonly RoomTypeEnum PeerToPeer = new RoomTypeEnum("peer_to_peer");
+      public static readonly RoomTypeEnum Group = new RoomTypeEnum("group");
+      public static readonly RoomTypeEnum GroupSmall = new RoomTypeEnum("group_small");
+    }
+
+    public sealed class RoomStatusEnum : StringEnum
+    {
+      private RoomStatusEnum(string value) : base(value) { }
+      public RoomStatusEnum() { }
+      public static implicit operator RoomStatusEnum(string value)
+      {
+        return new RoomStatusEnum(value);
+      }
+
+      public static readonly RoomStatusEnum InProgress = new RoomStatusEnum("in_progress");
+      public static readonly RoomStatusEnum Completed = new RoomStatusEnum("completed");
+    }
+
+    public sealed class CreatedMethodEnum : StringEnum
+    {
+      private CreatedMethodEnum(string value) : base(value) { }
+      public CreatedMethodEnum() { }
+      public static implicit operator CreatedMethodEnum(string value)
+      {
+        return new CreatedMethodEnum(value);
+      }
+
+      public static readonly CreatedMethodEnum Sdk = new CreatedMethodEnum("sdk");
+      public static readonly CreatedMethodEnum AdHoc = new CreatedMethodEnum("ad_hoc");
+      public static readonly CreatedMethodEnum Api = new CreatedMethodEnum("api");
+    }
+
+    public sealed class EndReasonEnum : StringEnum
+    {
+      private EndReasonEnum(string value) : base(value) { }
+      public EndReasonEnum() { }
+      public static implicit operator EndReasonEnum(string value)
+      {
+        return new EndReasonEnum(value);
+      }
+
+      public static readonly EndReasonEnum RoomEndedViaApi = new EndReasonEnum("room_ended_via_api");
+      public static readonly EndReasonEnum Timeout = new EndReasonEnum("timeout");
+    }
+
+    public sealed class CodecEnum : StringEnum
+    {
+      private CodecEnum(string value) : base(value) { }
+      public CodecEnum() { }
+      public static implicit operator CodecEnum(string value)
+      {
+        return new CodecEnum(value);
+      }
+
+      public static readonly CodecEnum Vp8 = new CodecEnum("VP8");
+      public static readonly CodecEnum H264 = new CodecEnum("H264");
+      public static readonly CodecEnum Vp9 = new CodecEnum("VP9");
+    }
+
+    public sealed class TwilioRealmEnum : StringEnum
+    {
+      private TwilioRealmEnum(string value) : base(value) { }
+      public TwilioRealmEnum() { }
+      public static implicit operator TwilioRealmEnum(string value)
+      {
+        return new TwilioRealmEnum(value);
+      }
+
+      public static readonly TwilioRealmEnum Us1 = new TwilioRealmEnum("us1");
+      public static readonly TwilioRealmEnum Us2 = new TwilioRealmEnum("us2");
+      public static readonly TwilioRealmEnum Au1 = new TwilioRealmEnum("au1");
+      public static readonly TwilioRealmEnum Br1 = new TwilioRealmEnum("br1");
+      public static readonly TwilioRealmEnum Ie1 = new TwilioRealmEnum("ie1");
+      public static readonly TwilioRealmEnum Jp1 = new TwilioRealmEnum("jp1");
+      public static readonly TwilioRealmEnum Sg1 = new TwilioRealmEnum("sg1");
+      public static readonly TwilioRealmEnum In1 = new TwilioRealmEnum("in1");
+      public static readonly TwilioRealmEnum De1 = new TwilioRealmEnum("de1");
+      public static readonly TwilioRealmEnum Gll = new TwilioRealmEnum("gll");
+    }
+
+    public sealed class ProcessingStateEnum : StringEnum
+    {
+      private ProcessingStateEnum(string value) : base(value) { }
+      public ProcessingStateEnum() { }
+      public static implicit operator ProcessingStateEnum(string value)
+      {
+        return new ProcessingStateEnum(value);
+      }
+
+      public static readonly ProcessingStateEnum Complete = new ProcessingStateEnum("complete");
+      public static readonly ProcessingStateEnum InProgress = new ProcessingStateEnum("in_progress");
+    }
+
+    public sealed class EdgeLocationEnum : StringEnum
+    {
+      private EdgeLocationEnum(string value) : base(value) { }
+      public EdgeLocationEnum() { }
+      public static implicit operator EdgeLocationEnum(string value)
+      {
+        return new EdgeLocationEnum(value);
+      }
+
+      public static readonly EdgeLocationEnum Ashburn = new EdgeLocationEnum("ashburn");
+      public static readonly EdgeLocationEnum Dublin = new EdgeLocationEnum("dublin");
+      public static readonly EdgeLocationEnum Frankfurt = new EdgeLocationEnum("frankfurt");
+      public static readonly EdgeLocationEnum Singapore = new EdgeLocationEnum("singapore");
+      public static readonly EdgeLocationEnum Sydney = new EdgeLocationEnum("sydney");
+      public static readonly EdgeLocationEnum SaoPaulo = new EdgeLocationEnum("sao_paulo");
+      public static readonly EdgeLocationEnum Roaming = new EdgeLocationEnum("roaming");
+      public static readonly EdgeLocationEnum Umatilla = new EdgeLocationEnum("umatilla");
+      public static readonly EdgeLocationEnum Tokyo = new EdgeLocationEnum("tokyo");
+    }
+
+    private static Request BuildFetchRequest(FetchRoomOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Insights,
+          "/v1/Video/Rooms/" + options.PathRoomSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Get Video Log Analyzer data for a Room.
+    /// </summary>
+    /// <param name="options"> Fetch Room parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Room </returns>
+    public static RoomResource Fetch(FetchRoomOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Get Video Log Analyzer data for a Room.
+    /// </summary>
+    /// <param name="options"> Fetch Room parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Room </returns>
+    public static async System.Threading.Tasks.Task<RoomResource> FetchAsync(FetchRoomOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Get Video Log Analyzer data for a Room.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Room </returns>
+    public static RoomResource Fetch(string pathRoomSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRoomOptions(pathRoomSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Get Video Log Analyzer data for a Room.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Room </returns>
+    public static async System.Threading.Tasks.Task<RoomResource> FetchAsync(string pathRoomSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchRoomOptions(pathRoomSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRoomOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Insights,
+          "/v1/Video/Rooms",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Get a list of Programmable Video Rooms.
+    /// </summary>
+    /// <param name="options"> Read Room parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Room </returns>
+    public static ResourceSet<RoomResource> Read(ReadRoomOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RoomResource>.FromJson("rooms", response.Content);
+      return new ResourceSet<RoomResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Get a list of Programmable Video Rooms.
+    /// </summary>
+    /// <param name="options"> Read Room parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Room </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoomResource>> ReadAsync(ReadRoomOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RoomResource>.FromJson("rooms", response.Content);
+      return new ResourceSet<RoomResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Get a list of Programmable Video Rooms.
+    /// </summary>
+    /// <param name="roomType"> Type of room. </param>
+    /// <param name="codec"> Codecs used by participants in the room. </param>
+    /// <param name="roomName"> Room friendly name. </param>
+    /// <param name="createdAfter"> Only read rooms that started on or after this ISO 8601 timestamp. </param>
+    /// <param name="createdBefore"> Only read rooms that started before this ISO 8601 timestamp. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Room </returns>
+    public static ResourceSet<RoomResource> Read(List<RoomResource.RoomTypeEnum> roomType = null,
+                                                 List<RoomResource.CodecEnum> codec = null,
+                                                 string roomName = null,
+                                                 DateTime? createdAfter = null,
+                                                 DateTime? createdBefore = null,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadRoomOptions() { RoomType = roomType, Codec = codec, RoomName = roomName, CreatedAfter = createdAfter, CreatedBefore = createdBefore, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Get a list of Programmable Video Rooms.
+    /// </summary>
+    /// <param name="roomType"> Type of room. </param>
+    /// <param name="codec"> Codecs used by participants in the room. </param>
+    /// <param name="roomName"> Room friendly name. </param>
+    /// <param name="createdAfter"> Only read rooms that started on or after this ISO 8601 timestamp. </param>
+    /// <param name="createdBefore"> Only read rooms that started before this ISO 8601 timestamp. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Room </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoomResource>> ReadAsync(List<RoomResource.RoomTypeEnum> roomType = null,
+                                                                                         List<RoomResource.CodecEnum> codec = null,
+                                                                                         string roomName = null,
+                                                                                         DateTime? createdAfter = null,
+                                                                                         DateTime? createdBefore = null,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadRoomOptions() { RoomType = roomType, Codec = codec, RoomName = roomName, CreatedAfter = createdAfter, CreatedBefore = createdBefore, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RoomResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RoomResource>.FromJson("rooms", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RoomResource> NextPage(Page<RoomResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Insights)
+      );
+
+      var response = client.Request(request);
+      return Page<RoomResource>.FromJson("rooms", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RoomResource> PreviousPage(Page<RoomResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Insights)
+      );
+
+      var response = client.Request(request);
+      return Page<RoomResource>.FromJson("rooms", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a RoomResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RoomResource object represented by the provided JSON </returns>
+    public static RoomResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RoomResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Account SID associated with this room.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Unique identifier for the room.
+    /// </summary>
+    [JsonProperty("room_sid")]
+    public string RoomSid { get; private set; }
+    /// <summary>
+    /// room friendly name.
+    /// </summary>
+    [JsonProperty("room_name")]
+    public string RoomName { get; private set; }
+    /// <summary>
+    /// Creation time of the room.
+    /// </summary>
+    [JsonProperty("create_time")]
+    public DateTime? CreateTime { get; private set; }
+    /// <summary>
+    /// End time for the room.
+    /// </summary>
+    [JsonProperty("end_time")]
+    public DateTime? EndTime { get; private set; }
+    /// <summary>
+    /// Type of room.
+    /// </summary>
+    [JsonProperty("room_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoomResource.RoomTypeEnum RoomType { get; private set; }
+    /// <summary>
+    /// Status of the room.
+    /// </summary>
+    [JsonProperty("room_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoomResource.RoomStatusEnum RoomStatus { get; private set; }
+    /// <summary>
+    /// Webhook provided for status callbacks.
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// HTTP method provided for status callback URL.
+    /// </summary>
+    [JsonProperty("status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// How the room was created.
+    /// </summary>
+    [JsonProperty("created_method")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoomResource.CreatedMethodEnum CreatedMethod { get; private set; }
+    /// <summary>
+    /// Reason the room ended.
+    /// </summary>
+    [JsonProperty("end_reason")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoomResource.EndReasonEnum EndReason { get; private set; }
+    /// <summary>
+    /// Max number of total participants allowed by the application settings.
+    /// </summary>
+    [JsonProperty("max_participants")]
+    public int? MaxParticipants { get; private set; }
+    /// <summary>
+    /// Number of participants. May include duplicate identities for participants who left and rejoined.
+    /// </summary>
+    [JsonProperty("unique_participants")]
+    public int? UniqueParticipants { get; private set; }
+    /// <summary>
+    /// Unique number of participant identities.
+    /// </summary>
+    [JsonProperty("unique_participant_identities")]
+    public int? UniqueParticipantIdentities { get; private set; }
+    /// <summary>
+    /// Actual number of concurrent participants.
+    /// </summary>
+    [JsonProperty("concurrent_participants")]
+    public int? ConcurrentParticipants { get; private set; }
+    /// <summary>
+    /// Maximum number of participants allowed in the room at the same time allowed by the application settings.
+    /// </summary>
+    [JsonProperty("max_concurrent_participants")]
+    public int? MaxConcurrentParticipants { get; private set; }
+    /// <summary>
+    /// Codecs used by participants in the room.
+    /// </summary>
+    [JsonProperty("codecs")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public List<RoomResource.CodecEnum> Codecs { get; private set; }
+    /// <summary>
+    /// Region of Twilio media servers for the room.
+    /// </summary>
+    [JsonProperty("media_region")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoomResource.TwilioRealmEnum MediaRegion { get; private set; }
+    /// <summary>
+    /// Total room duration from create time to end time.
+    /// </summary>
+    [JsonProperty("duration_sec")]
+    public long? DurationSec { get; private set; }
+    /// <summary>
+    /// Combined amount of participant time in the room.
+    /// </summary>
+    [JsonProperty("total_participant_duration_sec")]
+    public long? TotalParticipantDurationSec { get; private set; }
+    /// <summary>
+    /// Combined amount of recorded seconds for participants in the room.
+    /// </summary>
+    [JsonProperty("total_recording_duration_sec")]
+    public long? TotalRecordingDurationSec { get; private set; }
+    /// <summary>
+    /// Video Log Analyzer resource state. Will be either `in-progress` or `complete`.
+    /// </summary>
+    [JsonProperty("processing_state")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoomResource.ProcessingStateEnum ProcessingState { get; private set; }
+    /// <summary>
+    /// Boolean indicating if recording is enabled for the room.
+    /// </summary>
+    [JsonProperty("recording_enabled")]
+    public bool? RecordingEnabled { get; private set; }
+    /// <summary>
+    /// Edge location of Twilio media servers for the room.
+    /// </summary>
+    [JsonProperty("edge_location")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoomResource.EdgeLocationEnum EdgeLocation { get; private set; }
+    /// <summary>
+    /// URL for the room resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Room subresources.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private RoomResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/SettingOptions.cs b/src/Twilio/Rest/Insights/V1/SettingOptions.cs
index 84acf5461..a37cd2dbe 100644
--- a/src/Twilio/Rest/Insights/V1/SettingOptions.cs
+++ b/src/Twilio/Rest/Insights/V1/SettingOptions.cs
@@ -9,74 +9,74 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Insights.V1
-{
-
+{
+
+  /// <summary>
+  /// FetchSettingOptions
+  /// </summary>
+  public class FetchSettingOptions : IOptions<SettingResource>
+  {
     /// <summary>
-    /// FetchSettingOptions
+    /// The subaccount_sid
     /// </summary>
-    public class FetchSettingOptions : IOptions<SettingResource>
-    {
-        /// <summary>
-        /// The subaccount_sid
-        /// </summary>
-        public string SubaccountSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (SubaccountSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SubaccountSid", SubaccountSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string SubaccountSid { get; set; }
+
     /// <summary>
-    /// UpdateSettingOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateSettingOptions : IOptions<SettingResource>
-    {
-        /// <summary>
-        /// The advanced_features
-        /// </summary>
-        public bool? AdvancedFeatures { get; set; }
-        /// <summary>
-        /// The voice_trace
-        /// </summary>
-        public bool? VoiceTrace { get; set; }
-        /// <summary>
-        /// The subaccount_sid
-        /// </summary>
-        public string SubaccountSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AdvancedFeatures != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AdvancedFeatures", AdvancedFeatures.Value.ToString().ToLower()));
-            }
-
-            if (VoiceTrace != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceTrace", VoiceTrace.Value.ToString().ToLower()));
-            }
-
-            if (SubaccountSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SubaccountSid", SubaccountSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (SubaccountSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SubaccountSid", SubaccountSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateSettingOptions
+  /// </summary>
+  public class UpdateSettingOptions : IOptions<SettingResource>
+  {
+    /// <summary>
+    /// The advanced_features
+    /// </summary>
+    public bool? AdvancedFeatures { get; set; }
+    /// <summary>
+    /// The voice_trace
+    /// </summary>
+    public bool? VoiceTrace { get; set; }
+    /// <summary>
+    /// The subaccount_sid
+    /// </summary>
+    public string SubaccountSid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AdvancedFeatures != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AdvancedFeatures", AdvancedFeatures.Value.ToString().ToLower()));
+      }
+
+      if (VoiceTrace != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceTrace", VoiceTrace.Value.ToString().ToLower()));
+      }
+
+      if (SubaccountSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SubaccountSid", SubaccountSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Insights/V1/SettingResource.cs b/src/Twilio/Rest/Insights/V1/SettingResource.cs
index 8c11b4394..b6e483046 100644
--- a/src/Twilio/Rest/Insights/V1/SettingResource.cs
+++ b/src/Twilio/Rest/Insights/V1/SettingResource.cs
@@ -16,196 +16,196 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Insights.V1
-{
-
-    public class SettingResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSettingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Insights,
-                "/v1/Voice/Settings",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Setting parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Setting </returns>
-        public static SettingResource Fetch(FetchSettingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Setting parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Setting </returns>
-        public static async System.Threading.Tasks.Task<SettingResource> FetchAsync(FetchSettingOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="subaccountSid"> The subaccount_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Setting </returns>
-        public static SettingResource Fetch(string subaccountSid = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchSettingOptions(){SubaccountSid = subaccountSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="subaccountSid"> The subaccount_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Setting </returns>
-        public static async System.Threading.Tasks.Task<SettingResource> FetchAsync(string subaccountSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchSettingOptions(){SubaccountSid = subaccountSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSettingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Insights,
-                "/v1/Voice/Settings",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Setting parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Setting </returns>
-        public static SettingResource Update(UpdateSettingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Setting parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Setting </returns>
-        public static async System.Threading.Tasks.Task<SettingResource> UpdateAsync(UpdateSettingOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="advancedFeatures"> The advanced_features </param>
-        /// <param name="voiceTrace"> The voice_trace </param>
-        /// <param name="subaccountSid"> The subaccount_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Setting </returns>
-        public static SettingResource Update(bool? advancedFeatures = null,
-                                             bool? voiceTrace = null,
-                                             string subaccountSid = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateSettingOptions(){AdvancedFeatures = advancedFeatures, VoiceTrace = voiceTrace, SubaccountSid = subaccountSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="advancedFeatures"> The advanced_features </param>
-        /// <param name="voiceTrace"> The voice_trace </param>
-        /// <param name="subaccountSid"> The subaccount_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Setting </returns>
-        public static async System.Threading.Tasks.Task<SettingResource> UpdateAsync(bool? advancedFeatures = null,
-                                                                                     bool? voiceTrace = null,
-                                                                                     string subaccountSid = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateSettingOptions(){AdvancedFeatures = advancedFeatures, VoiceTrace = voiceTrace, SubaccountSid = subaccountSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SettingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SettingResource object represented by the provided JSON </returns>
-        public static SettingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SettingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The advanced_features
-        /// </summary>
-        [JsonProperty("advanced_features")]
-        public bool? AdvancedFeatures { get; private set; }
-        /// <summary>
-        /// The voice_trace
-        /// </summary>
-        [JsonProperty("voice_trace")]
-        public bool? VoiceTrace { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SettingResource()
-        {
-
-        }
-    }
+{
+
+  public class SettingResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSettingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Insights,
+          "/v1/Voice/Settings",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Setting parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Setting </returns>
+    public static SettingResource Fetch(FetchSettingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Setting parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Setting </returns>
+    public static async System.Threading.Tasks.Task<SettingResource> FetchAsync(FetchSettingOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="subaccountSid"> The subaccount_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Setting </returns>
+    public static SettingResource Fetch(string subaccountSid = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchSettingOptions() { SubaccountSid = subaccountSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="subaccountSid"> The subaccount_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Setting </returns>
+    public static async System.Threading.Tasks.Task<SettingResource> FetchAsync(string subaccountSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchSettingOptions() { SubaccountSid = subaccountSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSettingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Insights,
+          "/v1/Voice/Settings",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Setting parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Setting </returns>
+    public static SettingResource Update(UpdateSettingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Setting parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Setting </returns>
+    public static async System.Threading.Tasks.Task<SettingResource> UpdateAsync(UpdateSettingOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="advancedFeatures"> The advanced_features </param>
+    /// <param name="voiceTrace"> The voice_trace </param>
+    /// <param name="subaccountSid"> The subaccount_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Setting </returns>
+    public static SettingResource Update(bool? advancedFeatures = null,
+                                         bool? voiceTrace = null,
+                                         string subaccountSid = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateSettingOptions() { AdvancedFeatures = advancedFeatures, VoiceTrace = voiceTrace, SubaccountSid = subaccountSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="advancedFeatures"> The advanced_features </param>
+    /// <param name="voiceTrace"> The voice_trace </param>
+    /// <param name="subaccountSid"> The subaccount_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Setting </returns>
+    public static async System.Threading.Tasks.Task<SettingResource> UpdateAsync(bool? advancedFeatures = null,
+                                                                                 bool? voiceTrace = null,
+                                                                                 string subaccountSid = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateSettingOptions() { AdvancedFeatures = advancedFeatures, VoiceTrace = voiceTrace, SubaccountSid = subaccountSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SettingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SettingResource object represented by the provided JSON </returns>
+    public static SettingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SettingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The advanced_features
+    /// </summary>
+    [JsonProperty("advanced_features")]
+    public bool? AdvancedFeatures { get; private set; }
+    /// <summary>
+    /// The voice_trace
+    /// </summary>
+    [JsonProperty("voice_trace")]
+    public bool? VoiceTrace { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SettingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/CredentialOptions.cs b/src/Twilio/Rest/IpMessaging/V1/CredentialOptions.cs
index d6a85723b..42cbe7a26 100644
--- a/src/Twilio/Rest/IpMessaging/V1/CredentialOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/CredentialOptions.cs
@@ -9,255 +9,255 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V1
-{
-
+{
+
+  /// <summary>
+  /// ReadCredentialOptions
+  /// </summary>
+  public class ReadCredentialOptions : ReadOptions<CredentialResource>
+  {
     /// <summary>
-    /// ReadCredentialOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadCredentialOptions : ReadOptions<CredentialResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateCredentialOptions
+  /// </summary>
+  public class CreateCredentialOptions : IOptions<CredentialResource>
+  {
     /// <summary>
-    /// CreateCredentialOptions
+    /// The type
     /// </summary>
-    public class CreateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The type
-        /// </summary>
-        public CredentialResource.PushServiceEnum Type { get; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The certificate
-        /// </summary>
-        public string Certificate { get; set; }
-        /// <summary>
-        /// The private_key
-        /// </summary>
-        public string PrivateKey { get; set; }
-        /// <summary>
-        /// The sandbox
-        /// </summary>
-        public bool? Sandbox { get; set; }
-        /// <summary>
-        /// The api_key
-        /// </summary>
-        public string ApiKey { get; set; }
-        /// <summary>
-        /// The secret
-        /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCredentialOptions
-        /// </summary>
-        /// <param name="type"> The type </param>
-        public CreateCredentialOptions(CredentialResource.PushServiceEnum type)
-        {
-            Type = type;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Certificate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
-            }
-
-            if (PrivateKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
-            }
-
-            if (Sandbox != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
-            }
-
-            if (ApiKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
-            }
-
-            if (Secret != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secret", Secret));
-            }
-
-            return p;
-        }
-    }
-
+    public CredentialResource.PushServiceEnum Type { get; }
     /// <summary>
-    /// FetchCredentialOptions
+    /// The friendly_name
     /// </summary>
-    public class FetchCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public FetchCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// UpdateCredentialOptions
+    /// The certificate
     /// </summary>
-    public class UpdateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The certificate
-        /// </summary>
-        public string Certificate { get; set; }
-        /// <summary>
-        /// The private_key
-        /// </summary>
-        public string PrivateKey { get; set; }
-        /// <summary>
-        /// The sandbox
-        /// </summary>
-        public bool? Sandbox { get; set; }
-        /// <summary>
-        /// The api_key
-        /// </summary>
-        public string ApiKey { get; set; }
-        /// <summary>
-        /// The secret
-        /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Certificate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
-            }
-
-            if (PrivateKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
-            }
-
-            if (Sandbox != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
-            }
-
-            if (ApiKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
-            }
-
-            if (Secret != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secret", Secret));
-            }
-
-            return p;
-        }
-    }
-
+    public string Certificate { get; set; }
     /// <summary>
-    /// DeleteCredentialOptions
+    /// The private_key
     /// </summary>
-    public class DeleteCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PrivateKey { get; set; }
+    /// <summary>
+    /// The sandbox
+    /// </summary>
+    public bool? Sandbox { get; set; }
+    /// <summary>
+    /// The api_key
+    /// </summary>
+    public string ApiKey { get; set; }
+    /// <summary>
+    /// The secret
+    /// </summary>
+    public string Secret { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCredentialOptions
+    /// </summary>
+    /// <param name="type"> The type </param>
+    public CreateCredentialOptions(CredentialResource.PushServiceEnum type)
+    {
+      Type = type;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Certificate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
+      }
+
+      if (PrivateKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
+      }
+
+      if (Sandbox != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
+      }
+
+      if (ApiKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
+      }
+
+      if (Secret != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secret", Secret));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchCredentialOptions
+  /// </summary>
+  public class FetchCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public FetchCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateCredentialOptions
+  /// </summary>
+  public class UpdateCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The certificate
+    /// </summary>
+    public string Certificate { get; set; }
+    /// <summary>
+    /// The private_key
+    /// </summary>
+    public string PrivateKey { get; set; }
+    /// <summary>
+    /// The sandbox
+    /// </summary>
+    public bool? Sandbox { get; set; }
+    /// <summary>
+    /// The api_key
+    /// </summary>
+    public string ApiKey { get; set; }
+    /// <summary>
+    /// The secret
+    /// </summary>
+    public string Secret { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Certificate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
+      }
+
+      if (PrivateKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
+      }
+
+      if (Sandbox != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
+      }
+
+      if (ApiKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
+      }
+
+      if (Secret != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secret", Secret));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteCredentialOptions
+  /// </summary>
+  public class DeleteCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/CredentialResource.cs b/src/Twilio/Rest/IpMessaging/V1/CredentialResource.cs
index 84eed309f..b6e06e27d 100644
--- a/src/Twilio/Rest/IpMessaging/V1/CredentialResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/CredentialResource.cs
@@ -17,534 +17,534 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V1
-{
-
-    public class CredentialResource : Resource
-    {
-        public sealed class PushServiceEnum : StringEnum
-        {
-            private PushServiceEnum(string value) : base(value) {}
-            public PushServiceEnum() {}
-            public static implicit operator PushServiceEnum(string value)
-            {
-                return new PushServiceEnum(value);
-            }
-
-            public static readonly PushServiceEnum Gcm = new PushServiceEnum("gcm");
-            public static readonly PushServiceEnum Apn = new PushServiceEnum("apn");
-            public static readonly PushServiceEnum Fcm = new PushServiceEnum("fcm");
-        }
-
-        private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Credentials",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Credentials",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="type"> The type </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="certificate"> The certificate </param>
-        /// <param name="privateKey"> The private_key </param>
-        /// <param name="sandbox"> The sandbox </param>
-        /// <param name="apiKey"> The api_key </param>
-        /// <param name="secret"> The secret </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(CredentialResource.PushServiceEnum type,
-                                                string friendlyName = null,
-                                                string certificate = null,
-                                                string privateKey = null,
-                                                bool? sandbox = null,
-                                                string apiKey = null,
-                                                string secret = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(type){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="type"> The type </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="certificate"> The certificate </param>
-        /// <param name="privateKey"> The private_key </param>
-        /// <param name="sandbox"> The sandbox </param>
-        /// <param name="apiKey"> The api_key </param>
-        /// <param name="secret"> The secret </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CredentialResource.PushServiceEnum type,
-                                                                                        string friendlyName = null,
-                                                                                        string certificate = null,
-                                                                                        string privateKey = null,
-                                                                                        bool? sandbox = null,
-                                                                                        string apiKey = null,
-                                                                                        string secret = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(type){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Credentials/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Credentials/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="certificate"> The certificate </param>
-        /// <param name="privateKey"> The private_key </param>
-        /// <param name="sandbox"> The sandbox </param>
-        /// <param name="apiKey"> The api_key </param>
-        /// <param name="secret"> The secret </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(string pathSid,
-                                                string friendlyName = null,
-                                                string certificate = null,
-                                                string privateKey = null,
-                                                bool? sandbox = null,
-                                                string apiKey = null,
-                                                string secret = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathSid){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="certificate"> The certificate </param>
-        /// <param name="privateKey"> The private_key </param>
-        /// <param name="sandbox"> The sandbox </param>
-        /// <param name="apiKey"> The api_key </param>
-        /// <param name="secret"> The secret </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathSid,
-                                                                                        string friendlyName = null,
-                                                                                        string certificate = null,
-                                                                                        string privateKey = null,
-                                                                                        bool? sandbox = null,
-                                                                                        string apiKey = null,
-                                                                                        string secret = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathSid){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v1/Credentials/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CredentialResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CredentialResource object represented by the provided JSON </returns>
-        public static CredentialResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CredentialResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CredentialResource.PushServiceEnum Type { get; private set; }
-        /// <summary>
-        /// The sandbox
-        /// </summary>
-        [JsonProperty("sandbox")]
-        public string Sandbox { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CredentialResource()
-        {
-
-        }
-    }
+{
+
+  public class CredentialResource : Resource
+  {
+    public sealed class PushServiceEnum : StringEnum
+    {
+      private PushServiceEnum(string value) : base(value) { }
+      public PushServiceEnum() { }
+      public static implicit operator PushServiceEnum(string value)
+      {
+        return new PushServiceEnum(value);
+      }
+
+      public static readonly PushServiceEnum Gcm = new PushServiceEnum("gcm");
+      public static readonly PushServiceEnum Apn = new PushServiceEnum("apn");
+      public static readonly PushServiceEnum Fcm = new PushServiceEnum("fcm");
+    }
+
+    private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Credentials",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Credentials",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="type"> The type </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="certificate"> The certificate </param>
+    /// <param name="privateKey"> The private_key </param>
+    /// <param name="sandbox"> The sandbox </param>
+    /// <param name="apiKey"> The api_key </param>
+    /// <param name="secret"> The secret </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(CredentialResource.PushServiceEnum type,
+                                            string friendlyName = null,
+                                            string certificate = null,
+                                            string privateKey = null,
+                                            bool? sandbox = null,
+                                            string apiKey = null,
+                                            string secret = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(type) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="type"> The type </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="certificate"> The certificate </param>
+    /// <param name="privateKey"> The private_key </param>
+    /// <param name="sandbox"> The sandbox </param>
+    /// <param name="apiKey"> The api_key </param>
+    /// <param name="secret"> The secret </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CredentialResource.PushServiceEnum type,
+                                                                                    string friendlyName = null,
+                                                                                    string certificate = null,
+                                                                                    string privateKey = null,
+                                                                                    bool? sandbox = null,
+                                                                                    string apiKey = null,
+                                                                                    string secret = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(type) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Credentials/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Credentials/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="certificate"> The certificate </param>
+    /// <param name="privateKey"> The private_key </param>
+    /// <param name="sandbox"> The sandbox </param>
+    /// <param name="apiKey"> The api_key </param>
+    /// <param name="secret"> The secret </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(string pathSid,
+                                            string friendlyName = null,
+                                            string certificate = null,
+                                            string privateKey = null,
+                                            bool? sandbox = null,
+                                            string apiKey = null,
+                                            string secret = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathSid) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="certificate"> The certificate </param>
+    /// <param name="privateKey"> The private_key </param>
+    /// <param name="sandbox"> The sandbox </param>
+    /// <param name="apiKey"> The api_key </param>
+    /// <param name="secret"> The secret </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathSid,
+                                                                                    string friendlyName = null,
+                                                                                    string certificate = null,
+                                                                                    string privateKey = null,
+                                                                                    bool? sandbox = null,
+                                                                                    string apiKey = null,
+                                                                                    string secret = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathSid) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v1/Credentials/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CredentialResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CredentialResource object represented by the provided JSON </returns>
+    public static CredentialResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CredentialResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CredentialResource.PushServiceEnum Type { get; private set; }
+    /// <summary>
+    /// The sandbox
+    /// </summary>
+    [JsonProperty("sandbox")]
+    public string Sandbox { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CredentialResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/Channel/InviteOptions.cs b/src/Twilio/Rest/IpMessaging/V1/Service/Channel/InviteOptions.cs
index 5605a2cb0..a1c14fb0f 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/Channel/InviteOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/Channel/InviteOptions.cs
@@ -10,193 +10,193 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V1.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// FetchInviteOptions
+  /// </summary>
+  public class FetchInviteOptions : IOptions<InviteResource>
+  {
     /// <summary>
-    /// FetchInviteOptions
-    /// </summary>
-    public class FetchInviteOptions : IOptions<InviteResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// CreateInviteOptions
-    /// </summary>
-    public class CreateInviteOptions : IOptions<InviteResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        public string RoleSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        public CreateInviteOptions(string pathServiceSid, string pathChannelSid, string identity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
     /// <summary>
-    /// ReadInviteOptions
-    /// </summary>
-    public class ReadInviteOptions : ReadOptions<InviteResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        public List<string> Identity { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        public ReadInviteOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteInviteOptions
-    /// </summary>
-    public class DeleteInviteOptions : IOptions<InviteResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new FetchInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateInviteOptions
+  /// </summary>
+  public class CreateInviteOptions : IOptions<InviteResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    public string RoleSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    public CreateInviteOptions(string pathServiceSid, string pathChannelSid, string identity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadInviteOptions
+  /// </summary>
+  public class ReadInviteOptions : ReadOptions<InviteResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    public List<string> Identity { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    public ReadInviteOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteInviteOptions
+  /// </summary>
+  public class DeleteInviteOptions : IOptions<InviteResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/Channel/InviteResource.cs b/src/Twilio/Rest/IpMessaging/V1/Service/Channel/InviteResource.cs
index 16890102e..f7c8650ea 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/Channel/InviteResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/Channel/InviteResource.cs
@@ -16,456 +16,456 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.IpMessaging.V1.Service.Channel
-{
-
-    public class InviteResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Fetch(FetchInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(FetchInviteOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Fetch(string pathServiceSid,
-                                           string pathChannelSid,
-                                           string pathSid,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(string pathServiceSid,
-                                                                                   string pathChannelSid,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Create(CreateInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(CreateInviteOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Create(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string identity,
-                                            string roleSid = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string identity,
-                                                                                    string roleSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static ResourceSet<InviteResource> Read(ReadInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<InviteResource>.FromJson("invites", response.Content);
-            return new ResourceSet<InviteResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(ReadInviteOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<InviteResource>.FromJson("invites", response.Content);
-            return new ResourceSet<InviteResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static ResourceSet<InviteResource> Read(string pathServiceSid,
-                                                       string pathChannelSid,
-                                                       List<string> identity = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadInviteOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(string pathServiceSid,
-                                                                                               string pathChannelSid,
-                                                                                               List<string> identity = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadInviteOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<InviteResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<InviteResource>.FromJson("invites", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<InviteResource> NextPage(Page<InviteResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<InviteResource>.FromJson("invites", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<InviteResource> PreviousPage(Page<InviteResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<InviteResource>.FromJson("invites", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static bool Delete(DeleteInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteInviteOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a InviteResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> InviteResource object represented by the provided JSON </returns>
-        public static InviteResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<InviteResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The created_by
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private InviteResource()
-        {
-
-        }
-    }
+{
+
+  public class InviteResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Fetch(FetchInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(FetchInviteOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Fetch(string pathServiceSid,
+                                       string pathChannelSid,
+                                       string pathSid,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(string pathServiceSid,
+                                                                               string pathChannelSid,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Create(CreateInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(CreateInviteOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Create(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string identity,
+                                        string roleSid = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string identity,
+                                                                                string roleSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static ResourceSet<InviteResource> Read(ReadInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<InviteResource>.FromJson("invites", response.Content);
+      return new ResourceSet<InviteResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(ReadInviteOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<InviteResource>.FromJson("invites", response.Content);
+      return new ResourceSet<InviteResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static ResourceSet<InviteResource> Read(string pathServiceSid,
+                                                   string pathChannelSid,
+                                                   List<string> identity = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadInviteOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(string pathServiceSid,
+                                                                                           string pathChannelSid,
+                                                                                           List<string> identity = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadInviteOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<InviteResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<InviteResource>.FromJson("invites", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<InviteResource> NextPage(Page<InviteResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<InviteResource>.FromJson("invites", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<InviteResource> PreviousPage(Page<InviteResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<InviteResource>.FromJson("invites", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static bool Delete(DeleteInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteInviteOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a InviteResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> InviteResource object represented by the provided JSON </returns>
+    public static InviteResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<InviteResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The created_by
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private InviteResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MemberOptions.cs b/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MemberOptions.cs
index 3e0320713..32617a5e5 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MemberOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MemberOptions.cs
@@ -10,252 +10,252 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V1.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// FetchMemberOptions
+  /// </summary>
+  public class FetchMemberOptions : IOptions<MemberResource>
+  {
     /// <summary>
-    /// FetchMemberOptions
+    /// The service_sid
     /// </summary>
-    public class FetchMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// CreateMemberOptions
+    /// The channel_sid
     /// </summary>
-    public class CreateMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        public string RoleSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        public CreateMemberOptions(string pathServiceSid, string pathChannelSid, string identity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathChannelSid { get; }
     /// <summary>
-    /// ReadMemberOptions
+    /// The sid
     /// </summary>
-    public class ReadMemberOptions : ReadOptions<MemberResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        public List<string> Identity { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        public ReadMemberOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteMemberOptions
+    /// Construct a new FetchMemberOptions
     /// </summary>
-    public class DeleteMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// UpdateMemberOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The last_consumed_message_index
-        /// </summary>
-        public int? LastConsumedMessageIndex { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (LastConsumedMessageIndex != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateMemberOptions
+  /// </summary>
+  public class CreateMemberOptions : IOptions<MemberResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    public string RoleSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    public CreateMemberOptions(string pathServiceSid, string pathChannelSid, string identity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadMemberOptions
+  /// </summary>
+  public class ReadMemberOptions : ReadOptions<MemberResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    public List<string> Identity { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    public ReadMemberOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteMemberOptions
+  /// </summary>
+  public class DeleteMemberOptions : IOptions<MemberResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateMemberOptions
+  /// </summary>
+  public class UpdateMemberOptions : IOptions<MemberResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The last_consumed_message_index
+    /// </summary>
+    public int? LastConsumedMessageIndex { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (LastConsumedMessageIndex != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MemberResource.cs b/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MemberResource.cs
index 49e3dc61e..8d095b9ed 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MemberResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MemberResource.cs
@@ -16,545 +16,545 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.IpMessaging.V1.Service.Channel
-{
-
-    public class MemberResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Fetch(FetchMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(FetchMemberOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Fetch(string pathServiceSid,
-                                           string pathChannelSid,
-                                           string pathSid,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(string pathServiceSid,
-                                                                                   string pathChannelSid,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Create(CreateMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(CreateMemberOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Create(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string identity,
-                                            string roleSid = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string identity,
-                                                                                    string roleSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static ResourceSet<MemberResource> Read(ReadMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MemberResource>.FromJson("members", response.Content);
-            return new ResourceSet<MemberResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(ReadMemberOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MemberResource>.FromJson("members", response.Content);
-            return new ResourceSet<MemberResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static ResourceSet<MemberResource> Read(string pathServiceSid,
-                                                       string pathChannelSid,
-                                                       List<string> identity = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadMemberOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(string pathServiceSid,
-                                                                                               string pathChannelSid,
-                                                                                               List<string> identity = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadMemberOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MemberResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("members", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MemberResource> NextPage(Page<MemberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("members", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MemberResource> PreviousPage(Page<MemberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("members", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static bool Delete(DeleteMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMemberOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Update(UpdateMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(UpdateMemberOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Update(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string pathSid,
-                                            string roleSid = null,
-                                            int? lastConsumedMessageIndex = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid){RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string pathSid,
-                                                                                    string roleSid = null,
-                                                                                    int? lastConsumedMessageIndex = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid){RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a MemberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MemberResource object represented by the provided JSON </returns>
-        public static MemberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MemberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The last_consumed_message_index
-        /// </summary>
-        [JsonProperty("last_consumed_message_index")]
-        public int? LastConsumedMessageIndex { get; private set; }
-        /// <summary>
-        /// The last_consumption_timestamp
-        /// </summary>
-        [JsonProperty("last_consumption_timestamp")]
-        public DateTime? LastConsumptionTimestamp { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private MemberResource()
-        {
-
-        }
-    }
+{
+
+  public class MemberResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Fetch(FetchMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(FetchMemberOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Fetch(string pathServiceSid,
+                                       string pathChannelSid,
+                                       string pathSid,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(string pathServiceSid,
+                                                                               string pathChannelSid,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Create(CreateMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(CreateMemberOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Create(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string identity,
+                                        string roleSid = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string identity,
+                                                                                string roleSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static ResourceSet<MemberResource> Read(ReadMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MemberResource>.FromJson("members", response.Content);
+      return new ResourceSet<MemberResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(ReadMemberOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MemberResource>.FromJson("members", response.Content);
+      return new ResourceSet<MemberResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static ResourceSet<MemberResource> Read(string pathServiceSid,
+                                                   string pathChannelSid,
+                                                   List<string> identity = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadMemberOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(string pathServiceSid,
+                                                                                           string pathChannelSid,
+                                                                                           List<string> identity = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadMemberOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MemberResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("members", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MemberResource> NextPage(Page<MemberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("members", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MemberResource> PreviousPage(Page<MemberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("members", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static bool Delete(DeleteMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMemberOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Update(UpdateMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(UpdateMemberOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Update(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string pathSid,
+                                        string roleSid = null,
+                                        int? lastConsumedMessageIndex = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid) { RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string pathSid,
+                                                                                string roleSid = null,
+                                                                                int? lastConsumedMessageIndex = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid) { RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a MemberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MemberResource object represented by the provided JSON </returns>
+    public static MemberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MemberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The last_consumed_message_index
+    /// </summary>
+    [JsonProperty("last_consumed_message_index")]
+    public int? LastConsumedMessageIndex { get; private set; }
+    /// <summary>
+    /// The last_consumption_timestamp
+    /// </summary>
+    [JsonProperty("last_consumption_timestamp")]
+    public DateTime? LastConsumptionTimestamp { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private MemberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MessageOptions.cs b/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MessageOptions.cs
index f32c292b1..2fab09996 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MessageOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MessageOptions.cs
@@ -9,260 +9,260 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V1.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// FetchMessageOptions
+  /// </summary>
+  public class FetchMessageOptions : IOptions<MessageResource>
+  {
     /// <summary>
-    /// FetchMessageOptions
+    /// The service_sid
     /// </summary>
-    public class FetchMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// CreateMessageOptions
+    /// The channel_sid
     /// </summary>
-    public class CreateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The body
-        /// </summary>
-        public string Body { get; }
-        /// <summary>
-        /// The from
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="body"> The body </param>
-        public CreateMessageOptions(string pathServiceSid, string pathChannelSid, string body)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Body = body;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathChannelSid { get; }
     /// <summary>
-    /// ReadMessageOptions
+    /// The sid
     /// </summary>
-    public class ReadMessageOptions : ReadOptions<MessageResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The order
-        /// </summary>
-        public MessageResource.OrderTypeEnum Order { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        public ReadMessageOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Order != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteMessageOptions
+    /// Construct a new FetchMessageOptions
     /// </summary>
-    public class DeleteMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// UpdateMessageOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The body
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateMessageOptions
+  /// </summary>
+  public class CreateMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The body
+    /// </summary>
+    public string Body { get; }
+    /// <summary>
+    /// The from
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="body"> The body </param>
+    public CreateMessageOptions(string pathServiceSid, string pathChannelSid, string body)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Body = body;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadMessageOptions
+  /// </summary>
+  public class ReadMessageOptions : ReadOptions<MessageResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The order
+    /// </summary>
+    public MessageResource.OrderTypeEnum Order { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    public ReadMessageOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Order != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteMessageOptions
+  /// </summary>
+  public class DeleteMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateMessageOptions
+  /// </summary>
+  public class UpdateMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The body
+    /// </summary>
+    public string Body { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MessageResource.cs b/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MessageResource.cs
index 150256c8b..fe350c55c 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MessageResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/Channel/MessageResource.cs
@@ -17,572 +17,572 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V1.Service.Channel
-{
-
-    public class MessageResource : Resource
-    {
-        public sealed class OrderTypeEnum : StringEnum
-        {
-            private OrderTypeEnum(string value) : base(value) {}
-            public OrderTypeEnum() {}
-            public static implicit operator OrderTypeEnum(string value)
-            {
-                return new OrderTypeEnum(value);
-            }
-
-            public static readonly OrderTypeEnum Asc = new OrderTypeEnum("asc");
-            public static readonly OrderTypeEnum Desc = new OrderTypeEnum("desc");
-        }
-
-        private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string pathSid,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="body"> The body </param>
-        /// <param name="from"> The from </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(string pathServiceSid,
-                                             string pathChannelSid,
-                                             string body,
-                                             string from = null,
-                                             string attributes = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(pathServiceSid, pathChannelSid, body){From = from, Attributes = attributes};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="body"> The body </param>
-        /// <param name="from"> The from </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(string pathServiceSid,
-                                                                                     string pathChannelSid,
-                                                                                     string body,
-                                                                                     string from = null,
-                                                                                     string attributes = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(pathServiceSid, pathChannelSid, body){From = from, Attributes = attributes};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="order"> The order </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(string pathServiceSid,
-                                                        string pathChannelSid,
-                                                        MessageResource.OrderTypeEnum order = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(pathServiceSid, pathChannelSid){Order = order, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="order"> The order </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathServiceSid,
-                                                                                                string pathChannelSid,
-                                                                                                MessageResource.OrderTypeEnum order = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(pathServiceSid, pathChannelSid){Order = order, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="body"> The body </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(string pathServiceSid,
-                                             string pathChannelSid,
-                                             string pathSid,
-                                             string body = null,
-                                             string attributes = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid){Body = body, Attributes = attributes};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="body"> The body </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathServiceSid,
-                                                                                     string pathChannelSid,
-                                                                                     string pathSid,
-                                                                                     string body = null,
-                                                                                     string attributes = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid){Body = body, Attributes = attributes};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a MessageResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MessageResource object represented by the provided JSON </returns>
-        public static MessageResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MessageResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The to
-        /// </summary>
-        [JsonProperty("to")]
-        public string To { get; private set; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The was_edited
-        /// </summary>
-        [JsonProperty("was_edited")]
-        public bool? WasEdited { get; private set; }
-        /// <summary>
-        /// The from
-        /// </summary>
-        [JsonProperty("from")]
-        public string From { get; private set; }
-        /// <summary>
-        /// The body
-        /// </summary>
-        [JsonProperty("body")]
-        public string Body { get; private set; }
-        /// <summary>
-        /// The index
-        /// </summary>
-        [JsonProperty("index")]
-        public int? Index { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private MessageResource()
-        {
-
-        }
-    }
+{
+
+  public class MessageResource : Resource
+  {
+    public sealed class OrderTypeEnum : StringEnum
+    {
+      private OrderTypeEnum(string value) : base(value) { }
+      public OrderTypeEnum() { }
+      public static implicit operator OrderTypeEnum(string value)
+      {
+        return new OrderTypeEnum(value);
+      }
+
+      public static readonly OrderTypeEnum Asc = new OrderTypeEnum("asc");
+      public static readonly OrderTypeEnum Desc = new OrderTypeEnum("desc");
+    }
+
+    private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string pathSid,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="body"> The body </param>
+    /// <param name="from"> The from </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(string pathServiceSid,
+                                         string pathChannelSid,
+                                         string body,
+                                         string from = null,
+                                         string attributes = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(pathServiceSid, pathChannelSid, body) { From = from, Attributes = attributes };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="body"> The body </param>
+    /// <param name="from"> The from </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(string pathServiceSid,
+                                                                                 string pathChannelSid,
+                                                                                 string body,
+                                                                                 string from = null,
+                                                                                 string attributes = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(pathServiceSid, pathChannelSid, body) { From = from, Attributes = attributes };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="order"> The order </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(string pathServiceSid,
+                                                    string pathChannelSid,
+                                                    MessageResource.OrderTypeEnum order = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions(pathServiceSid, pathChannelSid) { Order = order, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="order"> The order </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathServiceSid,
+                                                                                            string pathChannelSid,
+                                                                                            MessageResource.OrderTypeEnum order = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions(pathServiceSid, pathChannelSid) { Order = order, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="body"> The body </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(string pathServiceSid,
+                                         string pathChannelSid,
+                                         string pathSid,
+                                         string body = null,
+                                         string attributes = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid) { Body = body, Attributes = attributes };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="body"> The body </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathServiceSid,
+                                                                                 string pathChannelSid,
+                                                                                 string pathSid,
+                                                                                 string body = null,
+                                                                                 string attributes = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid) { Body = body, Attributes = attributes };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a MessageResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MessageResource object represented by the provided JSON </returns>
+    public static MessageResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MessageResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The to
+    /// </summary>
+    [JsonProperty("to")]
+    public string To { get; private set; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The was_edited
+    /// </summary>
+    [JsonProperty("was_edited")]
+    public bool? WasEdited { get; private set; }
+    /// <summary>
+    /// The from
+    /// </summary>
+    [JsonProperty("from")]
+    public string From { get; private set; }
+    /// <summary>
+    /// The body
+    /// </summary>
+    [JsonProperty("body")]
+    public string Body { get; private set; }
+    /// <summary>
+    /// The index
+    /// </summary>
+    [JsonProperty("index")]
+    public int? Index { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private MessageResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/ChannelOptions.cs b/src/Twilio/Rest/IpMessaging/V1/Service/ChannelOptions.cs
index 831ea7932..2ce8e8dce 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/ChannelOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/ChannelOptions.cs
@@ -10,247 +10,247 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchChannelOptions
+  /// </summary>
+  public class FetchChannelOptions : IOptions<ChannelResource>
+  {
     /// <summary>
-    /// FetchChannelOptions
+    /// The service_sid
     /// </summary>
-    public class FetchChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchChannelOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteChannelOptions
+    /// The sid
     /// </summary>
-    public class DeleteChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteChannelOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateChannelOptions
+    /// Construct a new FetchChannelOptions
     /// </summary>
-    public class CreateChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        public ChannelResource.ChannelTypeEnum Type { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public CreateChannelOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchChannelOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadChannelOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadChannelOptions : ReadOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        public List<ChannelResource.ChannelTypeEnum> Type { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public ReadChannelOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-            Type = new List<ChannelResource.ChannelTypeEnum>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.AddRange(Type.Select(prop => new KeyValuePair<string, string>("Type", prop.ToString())));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteChannelOptions
+  /// </summary>
+  public class DeleteChannelOptions : IOptions<ChannelResource>
+  {
     /// <summary>
-    /// UpdateChannelOptions
+    /// The service_sid
     /// </summary>
-    public class UpdateChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateChannelOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteChannelOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateChannelOptions
+  /// </summary>
+  public class CreateChannelOptions : IOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    public ChannelResource.ChannelTypeEnum Type { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public CreateChannelOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadChannelOptions
+  /// </summary>
+  public class ReadChannelOptions : ReadOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    public List<ChannelResource.ChannelTypeEnum> Type { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public ReadChannelOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+      Type = new List<ChannelResource.ChannelTypeEnum>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.AddRange(Type.Select(prop => new KeyValuePair<string, string>("Type", prop.ToString())));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateChannelOptions
+  /// </summary>
+  public class UpdateChannelOptions : IOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateChannelOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/ChannelResource.cs b/src/Twilio/Rest/IpMessaging/V1/Service/ChannelResource.cs
index 39c2f1564..eac1ab6ad 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/ChannelResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/ChannelResource.cs
@@ -17,562 +17,562 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V1.Service
-{
-
-    public class ChannelResource : Resource
-    {
-        public sealed class ChannelTypeEnum : StringEnum
-        {
-            private ChannelTypeEnum(string value) : base(value) {}
-            public ChannelTypeEnum() {}
-            public static implicit operator ChannelTypeEnum(string value)
-            {
-                return new ChannelTypeEnum(value);
-            }
-
-            public static readonly ChannelTypeEnum Public = new ChannelTypeEnum("public");
-            public static readonly ChannelTypeEnum Private = new ChannelTypeEnum("private");
-        }
-
-        private static Request BuildFetchRequest(FetchChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Fetch(FetchChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(FetchChannelOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchChannelOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchChannelOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static bool Delete(DeleteChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteChannelOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteChannelOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteChannelOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Create(CreateChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(CreateChannelOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="type"> The type </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Create(string pathServiceSid,
-                                             string friendlyName = null,
-                                             string uniqueName = null,
-                                             string attributes = null,
-                                             ChannelResource.ChannelTypeEnum type = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateChannelOptions(pathServiceSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="type"> The type </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(string pathServiceSid,
-                                                                                     string friendlyName = null,
-                                                                                     string uniqueName = null,
-                                                                                     string attributes = null,
-                                                                                     ChannelResource.ChannelTypeEnum type = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateChannelOptions(pathServiceSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ResourceSet<ChannelResource> Read(ReadChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<ChannelResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(ReadChannelOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<ChannelResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="type"> The type </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ResourceSet<ChannelResource> Read(string pathServiceSid,
-                                                        List<ChannelResource.ChannelTypeEnum> type = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadChannelOptions(pathServiceSid){Type = type, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="type"> The type </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(string pathServiceSid,
-                                                                                                List<ChannelResource.ChannelTypeEnum> type = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadChannelOptions(pathServiceSid){Type = type, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ChannelResource> NextPage(Page<ChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ChannelResource> PreviousPage(Page<ChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("channels", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Update(UpdateChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(UpdateChannelOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Update(string pathServiceSid,
-                                             string pathSid,
-                                             string friendlyName = null,
-                                             string uniqueName = null,
-                                             string attributes = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateChannelOptions(pathServiceSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(string pathServiceSid,
-                                                                                     string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     string uniqueName = null,
-                                                                                     string attributes = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateChannelOptions(pathServiceSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ChannelResource object represented by the provided JSON </returns>
-        public static ChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ChannelResource.ChannelTypeEnum Type { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The created_by
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-        /// <summary>
-        /// The members_count
-        /// </summary>
-        [JsonProperty("members_count")]
-        public int? MembersCount { get; private set; }
-        /// <summary>
-        /// The messages_count
-        /// </summary>
-        [JsonProperty("messages_count")]
-        public int? MessagesCount { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class ChannelResource : Resource
+  {
+    public sealed class ChannelTypeEnum : StringEnum
+    {
+      private ChannelTypeEnum(string value) : base(value) { }
+      public ChannelTypeEnum() { }
+      public static implicit operator ChannelTypeEnum(string value)
+      {
+        return new ChannelTypeEnum(value);
+      }
+
+      public static readonly ChannelTypeEnum Public = new ChannelTypeEnum("public");
+      public static readonly ChannelTypeEnum Private = new ChannelTypeEnum("private");
+    }
+
+    private static Request BuildFetchRequest(FetchChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Fetch(FetchChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(FetchChannelOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchChannelOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(string pathServiceSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchChannelOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static bool Delete(DeleteChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteChannelOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteChannelOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteChannelOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Create(CreateChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(CreateChannelOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="type"> The type </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Create(string pathServiceSid,
+                                         string friendlyName = null,
+                                         string uniqueName = null,
+                                         string attributes = null,
+                                         ChannelResource.ChannelTypeEnum type = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateChannelOptions(pathServiceSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="type"> The type </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(string pathServiceSid,
+                                                                                 string friendlyName = null,
+                                                                                 string uniqueName = null,
+                                                                                 string attributes = null,
+                                                                                 ChannelResource.ChannelTypeEnum type = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateChannelOptions(pathServiceSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ResourceSet<ChannelResource> Read(ReadChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<ChannelResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(ReadChannelOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<ChannelResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="type"> The type </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ResourceSet<ChannelResource> Read(string pathServiceSid,
+                                                    List<ChannelResource.ChannelTypeEnum> type = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadChannelOptions(pathServiceSid) { Type = type, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="type"> The type </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(string pathServiceSid,
+                                                                                            List<ChannelResource.ChannelTypeEnum> type = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadChannelOptions(pathServiceSid) { Type = type, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ChannelResource> NextPage(Page<ChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ChannelResource> PreviousPage(Page<ChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("channels", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Update(UpdateChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(UpdateChannelOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Update(string pathServiceSid,
+                                         string pathSid,
+                                         string friendlyName = null,
+                                         string uniqueName = null,
+                                         string attributes = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateChannelOptions(pathServiceSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(string pathServiceSid,
+                                                                                 string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 string uniqueName = null,
+                                                                                 string attributes = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateChannelOptions(pathServiceSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ChannelResource object represented by the provided JSON </returns>
+    public static ChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ChannelResource.ChannelTypeEnum Type { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The created_by
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+    /// <summary>
+    /// The members_count
+    /// </summary>
+    [JsonProperty("members_count")]
+    public int? MembersCount { get; private set; }
+    /// <summary>
+    /// The messages_count
+    /// </summary>
+    [JsonProperty("messages_count")]
+    public int? MessagesCount { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/RoleOptions.cs b/src/Twilio/Rest/IpMessaging/V1/Service/RoleOptions.cs
index 42afd2aab..d249b6405 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/RoleOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/RoleOptions.cs
@@ -10,221 +10,221 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchRoleOptions
+  /// </summary>
+  public class FetchRoleOptions : IOptions<RoleResource>
+  {
     /// <summary>
-    /// FetchRoleOptions
-    /// </summary>
-    public class FetchRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchRoleOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteRoleOptions
-    /// </summary>
-    public class DeleteRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteRoleOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateRoleOptions
-    /// </summary>
-    public class CreateRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        public RoleResource.RoleTypeEnum Type { get; }
-        /// <summary>
-        /// The permission
-        /// </summary>
-        public List<string> Permission { get; }
-
-        /// <summary>
-        /// Construct a new CreateRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="type"> The type </param>
-        /// <param name="permission"> The permission </param>
-        public CreateRoleOptions(string pathServiceSid,
-                                 string friendlyName,
-                                 RoleResource.RoleTypeEnum type,
-                                 List<string> permission)
-        {
-            PathServiceSid = pathServiceSid;
-            FriendlyName = friendlyName;
-            Type = type;
-            Permission = permission;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (Permission != null)
-            {
-                p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchRoleOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadRoleOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadRoleOptions : ReadOptions<RoleResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public ReadRoleOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteRoleOptions
+  /// </summary>
+  public class DeleteRoleOptions : IOptions<RoleResource>
+  {
     /// <summary>
-    /// UpdateRoleOptions
-    /// </summary>
-    public class UpdateRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The permission
-        /// </summary>
-        public List<string> Permission { get; }
-
-        /// <summary>
-        /// Construct a new UpdateRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="permission"> The permission </param>
-        public UpdateRoleOptions(string pathServiceSid, string pathSid, List<string> permission)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-            Permission = permission;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Permission != null)
-            {
-                p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
-            }
-
-            return p;
-        }
-    }
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteRoleOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateRoleOptions
+  /// </summary>
+  public class CreateRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    public RoleResource.RoleTypeEnum Type { get; }
+    /// <summary>
+    /// The permission
+    /// </summary>
+    public List<string> Permission { get; }
+
+    /// <summary>
+    /// Construct a new CreateRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="type"> The type </param>
+    /// <param name="permission"> The permission </param>
+    public CreateRoleOptions(string pathServiceSid,
+                             string friendlyName,
+                             RoleResource.RoleTypeEnum type,
+                             List<string> permission)
+    {
+      PathServiceSid = pathServiceSid;
+      FriendlyName = friendlyName;
+      Type = type;
+      Permission = permission;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (Permission != null)
+      {
+        p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadRoleOptions
+  /// </summary>
+  public class ReadRoleOptions : ReadOptions<RoleResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public ReadRoleOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateRoleOptions
+  /// </summary>
+  public class UpdateRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The permission
+    /// </summary>
+    public List<string> Permission { get; }
+
+    /// <summary>
+    /// Construct a new UpdateRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="permission"> The permission </param>
+    public UpdateRoleOptions(string pathServiceSid, string pathSid, List<string> permission)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+      Permission = permission;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Permission != null)
+      {
+        p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/RoleResource.cs b/src/Twilio/Rest/IpMessaging/V1/Service/RoleResource.cs
index 8afad6e43..e6629bc60 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/RoleResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/RoleResource.cs
@@ -17,521 +17,521 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V1.Service
-{
-
-    public class RoleResource : Resource
-    {
-        public sealed class RoleTypeEnum : StringEnum
-        {
-            private RoleTypeEnum(string value) : base(value) {}
-            public RoleTypeEnum() {}
-            public static implicit operator RoleTypeEnum(string value)
-            {
-                return new RoleTypeEnum(value);
-            }
-
-            public static readonly RoleTypeEnum Channel = new RoleTypeEnum("channel");
-            public static readonly RoleTypeEnum Deployment = new RoleTypeEnum("deployment");
-        }
-
-        private static Request BuildFetchRequest(FetchRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Fetch(FetchRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(FetchRoleOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRoleOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(string pathServiceSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchRoleOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static bool Delete(DeleteRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoleOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoleOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoleOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Roles",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Create(CreateRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(CreateRoleOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="type"> The type </param>
-        /// <param name="permission"> The permission </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Create(string pathServiceSid,
-                                          string friendlyName,
-                                          RoleResource.RoleTypeEnum type,
-                                          List<string> permission,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="type"> The type </param>
-        /// <param name="permission"> The permission </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(string pathServiceSid,
-                                                                                  string friendlyName,
-                                                                                  RoleResource.RoleTypeEnum type,
-                                                                                  List<string> permission,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Roles",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static ResourceSet<RoleResource> Read(ReadRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RoleResource>.FromJson("roles", response.Content);
-            return new ResourceSet<RoleResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(ReadRoleOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RoleResource>.FromJson("roles", response.Content);
-            return new ResourceSet<RoleResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static ResourceSet<RoleResource> Read(string pathServiceSid,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadRoleOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(string pathServiceSid,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadRoleOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RoleResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RoleResource> NextPage(Page<RoleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RoleResource> PreviousPage(Page<RoleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Update(UpdateRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(UpdateRoleOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="permission"> The permission </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Update(string pathServiceSid,
-                                          string pathSid,
-                                          List<string> permission,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="permission"> The permission </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(string pathServiceSid,
-                                                                                  string pathSid,
-                                                                                  List<string> permission,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RoleResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RoleResource object represented by the provided JSON </returns>
-        public static RoleResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RoleResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoleResource.RoleTypeEnum Type { get; private set; }
-        /// <summary>
-        /// The permissions
-        /// </summary>
-        [JsonProperty("permissions")]
-        public List<string> Permissions { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private RoleResource()
-        {
-
-        }
-    }
+{
+
+  public class RoleResource : Resource
+  {
+    public sealed class RoleTypeEnum : StringEnum
+    {
+      private RoleTypeEnum(string value) : base(value) { }
+      public RoleTypeEnum() { }
+      public static implicit operator RoleTypeEnum(string value)
+      {
+        return new RoleTypeEnum(value);
+      }
+
+      public static readonly RoleTypeEnum Channel = new RoleTypeEnum("channel");
+      public static readonly RoleTypeEnum Deployment = new RoleTypeEnum("deployment");
+    }
+
+    private static Request BuildFetchRequest(FetchRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Fetch(FetchRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(FetchRoleOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRoleOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(string pathServiceSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchRoleOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static bool Delete(DeleteRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoleOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoleOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoleOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Roles",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Create(CreateRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(CreateRoleOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="type"> The type </param>
+    /// <param name="permission"> The permission </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Create(string pathServiceSid,
+                                      string friendlyName,
+                                      RoleResource.RoleTypeEnum type,
+                                      List<string> permission,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="type"> The type </param>
+    /// <param name="permission"> The permission </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(string pathServiceSid,
+                                                                              string friendlyName,
+                                                                              RoleResource.RoleTypeEnum type,
+                                                                              List<string> permission,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Roles",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static ResourceSet<RoleResource> Read(ReadRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RoleResource>.FromJson("roles", response.Content);
+      return new ResourceSet<RoleResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(ReadRoleOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RoleResource>.FromJson("roles", response.Content);
+      return new ResourceSet<RoleResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static ResourceSet<RoleResource> Read(string pathServiceSid,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadRoleOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(string pathServiceSid,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadRoleOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RoleResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RoleResource> NextPage(Page<RoleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RoleResource> PreviousPage(Page<RoleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Update(UpdateRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(UpdateRoleOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="permission"> The permission </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Update(string pathServiceSid,
+                                      string pathSid,
+                                      List<string> permission,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="permission"> The permission </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(string pathServiceSid,
+                                                                              string pathSid,
+                                                                              List<string> permission,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RoleResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RoleResource object represented by the provided JSON </returns>
+    public static RoleResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RoleResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoleResource.RoleTypeEnum Type { get; private set; }
+    /// <summary>
+    /// The permissions
+    /// </summary>
+    [JsonProperty("permissions")]
+    public List<string> Permissions { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private RoleResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/User/UserChannelOptions.cs b/src/Twilio/Rest/IpMessaging/V1/Service/User/UserChannelOptions.cs
index c0e7dc6a0..1e6af5475 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/User/UserChannelOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/User/UserChannelOptions.cs
@@ -9,46 +9,46 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V1.Service.User
-{
-
+{
+
+  /// <summary>
+  /// ReadUserChannelOptions
+  /// </summary>
+  public class ReadUserChannelOptions : ReadOptions<UserChannelResource>
+  {
     /// <summary>
-    /// ReadUserChannelOptions
+    /// The service_sid
     /// </summary>
-    public class ReadUserChannelOptions : ReadOptions<UserChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The user_sid
-        /// </summary>
-        public string PathUserSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadUserChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        public ReadUserChannelOptions(string pathServiceSid, string pathUserSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The user_sid
+    /// </summary>
+    public string PathUserSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadUserChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    public ReadUserChannelOptions(string pathServiceSid, string pathUserSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/User/UserChannelResource.cs b/src/Twilio/Rest/IpMessaging/V1/Service/User/UserChannelResource.cs
index 7bc13347d..22779cce6 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/User/UserChannelResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/User/UserChannelResource.cs
@@ -17,225 +17,225 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V1.Service.User
-{
-
-    public class UserChannelResource : Resource
-    {
-        public sealed class ChannelStatusEnum : StringEnum
-        {
-            private ChannelStatusEnum(string value) : base(value) {}
-            public ChannelStatusEnum() {}
-            public static implicit operator ChannelStatusEnum(string value)
-            {
-                return new ChannelStatusEnum(value);
-            }
-
-            public static readonly ChannelStatusEnum Joined = new ChannelStatusEnum("joined");
-            public static readonly ChannelStatusEnum Invited = new ChannelStatusEnum("invited");
-            public static readonly ChannelStatusEnum NotParticipating = new ChannelStatusEnum("not_participating");
-        }
-
-        private static Request BuildReadRequest(ReadUserChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static ResourceSet<UserChannelResource> Read(ReadUserChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<UserChannelResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(ReadUserChannelOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<UserChannelResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static ResourceSet<UserChannelResource> Read(string pathServiceSid,
-                                                            string pathUserSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(string pathServiceSid,
-                                                                                                    string pathUserSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserChannelResource> NextPage(Page<UserChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<UserChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserChannelResource> PreviousPage(Page<UserChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<UserChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a UserChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserChannelResource object represented by the provided JSON </returns>
-        public static UserChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The member_sid
-        /// </summary>
-        [JsonProperty("member_sid")]
-        public string MemberSid { get; private set; }
-        /// <summary>
-        /// The status
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public UserChannelResource.ChannelStatusEnum Status { get; private set; }
-        /// <summary>
-        /// The last_consumed_message_index
-        /// </summary>
-        [JsonProperty("last_consumed_message_index")]
-        public int? LastConsumedMessageIndex { get; private set; }
-        /// <summary>
-        /// The unread_messages_count
-        /// </summary>
-        [JsonProperty("unread_messages_count")]
-        public int? UnreadMessagesCount { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private UserChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class UserChannelResource : Resource
+  {
+    public sealed class ChannelStatusEnum : StringEnum
+    {
+      private ChannelStatusEnum(string value) : base(value) { }
+      public ChannelStatusEnum() { }
+      public static implicit operator ChannelStatusEnum(string value)
+      {
+        return new ChannelStatusEnum(value);
+      }
+
+      public static readonly ChannelStatusEnum Joined = new ChannelStatusEnum("joined");
+      public static readonly ChannelStatusEnum Invited = new ChannelStatusEnum("invited");
+      public static readonly ChannelStatusEnum NotParticipating = new ChannelStatusEnum("not_participating");
+    }
+
+    private static Request BuildReadRequest(ReadUserChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static ResourceSet<UserChannelResource> Read(ReadUserChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<UserChannelResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(ReadUserChannelOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<UserChannelResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static ResourceSet<UserChannelResource> Read(string pathServiceSid,
+                                                        string pathUserSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(string pathServiceSid,
+                                                                                                string pathUserSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserChannelResource> NextPage(Page<UserChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<UserChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserChannelResource> PreviousPage(Page<UserChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<UserChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a UserChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserChannelResource object represented by the provided JSON </returns>
+    public static UserChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The member_sid
+    /// </summary>
+    [JsonProperty("member_sid")]
+    public string MemberSid { get; private set; }
+    /// <summary>
+    /// The status
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public UserChannelResource.ChannelStatusEnum Status { get; private set; }
+    /// <summary>
+    /// The last_consumed_message_index
+    /// </summary>
+    [JsonProperty("last_consumed_message_index")]
+    public int? LastConsumedMessageIndex { get; private set; }
+    /// <summary>
+    /// The unread_messages_count
+    /// </summary>
+    [JsonProperty("unread_messages_count")]
+    public int? UnreadMessagesCount { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private UserChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/UserOptions.cs b/src/Twilio/Rest/IpMessaging/V1/Service/UserOptions.cs
index 23e88c5fa..5ab744222 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/UserOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/UserOptions.cs
@@ -9,239 +9,239 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchUserOptions
+  /// </summary>
+  public class FetchUserOptions : IOptions<UserResource>
+  {
     /// <summary>
-    /// FetchUserOptions
-    /// </summary>
-    public class FetchUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchUserOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteUserOptions
-    /// </summary>
-    public class DeleteUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteUserOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateUserOptions
-    /// </summary>
-    public class CreateUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="identity"> The identity </param>
-        public CreateUserOptions(string pathServiceSid, string identity)
-        {
-            PathServiceSid = pathServiceSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchUserOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadUserOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadUserOptions : ReadOptions<UserResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public ReadUserOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteUserOptions
+  /// </summary>
+  public class DeleteUserOptions : IOptions<UserResource>
+  {
     /// <summary>
-    /// UpdateUserOptions
-    /// </summary>
-    public class UpdateUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateUserOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteUserOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateUserOptions
+  /// </summary>
+  public class CreateUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="identity"> The identity </param>
+    public CreateUserOptions(string pathServiceSid, string identity)
+    {
+      PathServiceSid = pathServiceSid;
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadUserOptions
+  /// </summary>
+  public class ReadUserOptions : ReadOptions<UserResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public ReadUserOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateUserOptions
+  /// </summary>
+  public class UpdateUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateUserOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/Service/UserResource.cs b/src/Twilio/Rest/IpMessaging/V1/Service/UserResource.cs
index fbb79eedf..904945ccd 100644
--- a/src/Twilio/Rest/IpMessaging/V1/Service/UserResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/Service/UserResource.cs
@@ -16,544 +16,544 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.IpMessaging.V1.Service
-{
-
-    public class UserResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathServiceSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static bool Delete(DeleteUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Users",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Create(CreateUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> CreateAsync(CreateUserOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Create(string pathServiceSid,
-                                          string identity,
-                                          string roleSid = null,
-                                          string attributes = null,
-                                          string friendlyName = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateUserOptions(pathServiceSid, identity){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> CreateAsync(string pathServiceSid,
-                                                                                  string identity,
-                                                                                  string roleSid = null,
-                                                                                  string attributes = null,
-                                                                                  string friendlyName = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateUserOptions(pathServiceSid, identity){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Users",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static ResourceSet<UserResource> Read(ReadUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserResource>.FromJson("users", response.Content);
-            return new ResourceSet<UserResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(ReadUserOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserResource>.FromJson("users", response.Content);
-            return new ResourceSet<UserResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static ResourceSet<UserResource> Read(string pathServiceSid,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadUserOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(string pathServiceSid,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadUserOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserResource> NextPage(Page<UserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserResource> PreviousPage(Page<UserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(string pathServiceSid,
-                                          string pathSid,
-                                          string roleSid = null,
-                                          string attributes = null,
-                                          string friendlyName = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathServiceSid, pathSid){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathServiceSid,
-                                                                                  string pathSid,
-                                                                                  string roleSid = null,
-                                                                                  string attributes = null,
-                                                                                  string friendlyName = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathServiceSid, pathSid){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a UserResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserResource object represented by the provided JSON </returns>
-        public static UserResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The is_online
-        /// </summary>
-        [JsonProperty("is_online")]
-        public bool? IsOnline { get; private set; }
-        /// <summary>
-        /// The is_notifiable
-        /// </summary>
-        [JsonProperty("is_notifiable")]
-        public bool? IsNotifiable { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The joined_channels_count
-        /// </summary>
-        [JsonProperty("joined_channels_count")]
-        public int? JoinedChannelsCount { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private UserResource()
-        {
-
-        }
-    }
+{
+
+  public class UserResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathServiceSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static bool Delete(DeleteUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Users",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Create(CreateUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> CreateAsync(CreateUserOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Create(string pathServiceSid,
+                                      string identity,
+                                      string roleSid = null,
+                                      string attributes = null,
+                                      string friendlyName = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateUserOptions(pathServiceSid, identity) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> CreateAsync(string pathServiceSid,
+                                                                              string identity,
+                                                                              string roleSid = null,
+                                                                              string attributes = null,
+                                                                              string friendlyName = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateUserOptions(pathServiceSid, identity) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Users",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static ResourceSet<UserResource> Read(ReadUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserResource>.FromJson("users", response.Content);
+      return new ResourceSet<UserResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(ReadUserOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserResource>.FromJson("users", response.Content);
+      return new ResourceSet<UserResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static ResourceSet<UserResource> Read(string pathServiceSid,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadUserOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(string pathServiceSid,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadUserOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserResource> NextPage(Page<UserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserResource> PreviousPage(Page<UserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(string pathServiceSid,
+                                      string pathSid,
+                                      string roleSid = null,
+                                      string attributes = null,
+                                      string friendlyName = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathServiceSid, pathSid) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathServiceSid,
+                                                                              string pathSid,
+                                                                              string roleSid = null,
+                                                                              string attributes = null,
+                                                                              string friendlyName = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathServiceSid, pathSid) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a UserResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserResource object represented by the provided JSON </returns>
+    public static UserResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The is_online
+    /// </summary>
+    [JsonProperty("is_online")]
+    public bool? IsOnline { get; private set; }
+    /// <summary>
+    /// The is_notifiable
+    /// </summary>
+    [JsonProperty("is_notifiable")]
+    public bool? IsNotifiable { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The joined_channels_count
+    /// </summary>
+    [JsonProperty("joined_channels_count")]
+    public int? JoinedChannelsCount { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private UserResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/ServiceOptions.cs b/src/Twilio/Rest/IpMessaging/V1/ServiceOptions.cs
index 15c15c292..84f828f41 100644
--- a/src/Twilio/Rest/IpMessaging/V1/ServiceOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/ServiceOptions.cs
@@ -10,634 +10,634 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V1
-{
-
+{
+
+  /// <summary>
+  /// FetchServiceOptions
+  /// </summary>
+  public class FetchServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// FetchServiceOptions
+    /// The sid
     /// </summary>
-    public class FetchServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public FetchServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteServiceOptions
+    /// Construct a new FetchServiceOptions
     /// </summary>
-    public class DeleteServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The sid </param>
+    public FetchServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// CreateServiceOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Construct a new CreateServiceOptions
-        /// </summary>
-        /// <param name="friendlyName"> The friendly_name </param>
-        public CreateServiceOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteServiceOptions
+  /// </summary>
+  public class DeleteServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// ReadServiceOptions
-    /// </summary>
-    public class ReadServiceOptions : ReadOptions<ServiceResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// UpdateServiceOptions
-    /// </summary>
-    public class UpdateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The default_service_role_sid
-        /// </summary>
-        public string DefaultServiceRoleSid { get; set; }
-        /// <summary>
-        /// The default_channel_role_sid
-        /// </summary>
-        public string DefaultChannelRoleSid { get; set; }
-        /// <summary>
-        /// The default_channel_creator_role_sid
-        /// </summary>
-        public string DefaultChannelCreatorRoleSid { get; set; }
-        /// <summary>
-        /// The read_status_enabled
-        /// </summary>
-        public bool? ReadStatusEnabled { get; set; }
-        /// <summary>
-        /// The reachability_enabled
-        /// </summary>
-        public bool? ReachabilityEnabled { get; set; }
-        /// <summary>
-        /// The typing_indicator_timeout
-        /// </summary>
-        public int? TypingIndicatorTimeout { get; set; }
-        /// <summary>
-        /// The consumption_report_interval
-        /// </summary>
-        public int? ConsumptionReportInterval { get; set; }
-        /// <summary>
-        /// The notifications.new_message.enabled
-        /// </summary>
-        public bool? NotificationsNewMessageEnabled { get; set; }
-        /// <summary>
-        /// The notifications.new_message.template
-        /// </summary>
-        public string NotificationsNewMessageTemplate { get; set; }
-        /// <summary>
-        /// The notifications.added_to_channel.enabled
-        /// </summary>
-        public bool? NotificationsAddedToChannelEnabled { get; set; }
-        /// <summary>
-        /// The notifications.added_to_channel.template
-        /// </summary>
-        public string NotificationsAddedToChannelTemplate { get; set; }
-        /// <summary>
-        /// The notifications.removed_from_channel.enabled
-        /// </summary>
-        public bool? NotificationsRemovedFromChannelEnabled { get; set; }
-        /// <summary>
-        /// The notifications.removed_from_channel.template
-        /// </summary>
-        public string NotificationsRemovedFromChannelTemplate { get; set; }
-        /// <summary>
-        /// The notifications.invited_to_channel.enabled
-        /// </summary>
-        public bool? NotificationsInvitedToChannelEnabled { get; set; }
-        /// <summary>
-        /// The notifications.invited_to_channel.template
-        /// </summary>
-        public string NotificationsInvitedToChannelTemplate { get; set; }
-        /// <summary>
-        /// The pre_webhook_url
-        /// </summary>
-        public Uri PreWebhookUrl { get; set; }
-        /// <summary>
-        /// The post_webhook_url
-        /// </summary>
-        public Uri PostWebhookUrl { get; set; }
-        /// <summary>
-        /// The webhook_method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhookMethod { get; set; }
-        /// <summary>
-        /// The webhook_filters
-        /// </summary>
-        public List<string> WebhookFilters { get; set; }
-        /// <summary>
-        /// The webhooks.on_message_send.url
-        /// </summary>
-        public Uri WebhooksOnMessageSendUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_message_send.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMessageSendMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_message_update.url
-        /// </summary>
-        public Uri WebhooksOnMessageUpdateUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_message_update.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMessageUpdateMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_message_remove.url
-        /// </summary>
-        public Uri WebhooksOnMessageRemoveUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_message_remove.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMessageRemoveMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_channel_add.url
-        /// </summary>
-        public Uri WebhooksOnChannelAddUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_channel_add.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnChannelAddMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_channel_destroy.url
-        /// </summary>
-        public Uri WebhooksOnChannelDestroyUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_channel_destroy.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnChannelDestroyMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_channel_update.url
-        /// </summary>
-        public Uri WebhooksOnChannelUpdateUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_channel_update.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnChannelUpdateMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_member_add.url
-        /// </summary>
-        public Uri WebhooksOnMemberAddUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_member_add.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMemberAddMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_member_remove.url
-        /// </summary>
-        public Uri WebhooksOnMemberRemoveUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_member_remove.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMemberRemoveMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_message_sent.url
-        /// </summary>
-        public Uri WebhooksOnMessageSentUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_message_sent.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMessageSentMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_message_updated.url
-        /// </summary>
-        public Uri WebhooksOnMessageUpdatedUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_message_updated.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMessageUpdatedMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_message_removed.url
-        /// </summary>
-        public Uri WebhooksOnMessageRemovedUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_message_removed.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMessageRemovedMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_channel_added.url
-        /// </summary>
-        public Uri WebhooksOnChannelAddedUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_channel_added.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnChannelAddedMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_channel_destroyed.url
-        /// </summary>
-        public Uri WebhooksOnChannelDestroyedUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_channel_destroyed.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnChannelDestroyedMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_channel_updated.url
-        /// </summary>
-        public Uri WebhooksOnChannelUpdatedUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_channel_updated.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnChannelUpdatedMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_member_added.url
-        /// </summary>
-        public Uri WebhooksOnMemberAddedUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_member_added.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMemberAddedMethod { get; set; }
-        /// <summary>
-        /// The webhooks.on_member_removed.url
-        /// </summary>
-        public Uri WebhooksOnMemberRemovedUrl { get; set; }
-        /// <summary>
-        /// The webhooks.on_member_removed.method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhooksOnMemberRemovedMethod { get; set; }
-        /// <summary>
-        /// The limits.channel_members
-        /// </summary>
-        public int? LimitsChannelMembers { get; set; }
-        /// <summary>
-        /// The limits.user_channels
-        /// </summary>
-        public int? LimitsUserChannels { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-            WebhookFilters = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DefaultServiceRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultServiceRoleSid", DefaultServiceRoleSid.ToString()));
-            }
-
-            if (DefaultChannelRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultChannelRoleSid", DefaultChannelRoleSid.ToString()));
-            }
-
-            if (DefaultChannelCreatorRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultChannelCreatorRoleSid", DefaultChannelCreatorRoleSid.ToString()));
-            }
-
-            if (ReadStatusEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReadStatusEnabled", ReadStatusEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ReachabilityEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReachabilityEnabled", ReachabilityEnabled.Value.ToString().ToLower()));
-            }
-
-            if (TypingIndicatorTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TypingIndicatorTimeout", TypingIndicatorTimeout.ToString()));
-            }
-
-            if (ConsumptionReportInterval != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConsumptionReportInterval", ConsumptionReportInterval.ToString()));
-            }
-
-            if (NotificationsNewMessageEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Enabled", NotificationsNewMessageEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsNewMessageTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Template", NotificationsNewMessageTemplate));
-            }
-
-            if (NotificationsAddedToChannelEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Enabled", NotificationsAddedToChannelEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsAddedToChannelTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Template", NotificationsAddedToChannelTemplate));
-            }
-
-            if (NotificationsRemovedFromChannelEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Enabled", NotificationsRemovedFromChannelEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsRemovedFromChannelTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Template", NotificationsRemovedFromChannelTemplate));
-            }
-
-            if (NotificationsInvitedToChannelEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Enabled", NotificationsInvitedToChannelEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsInvitedToChannelTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Template", NotificationsInvitedToChannelTemplate));
-            }
-
-            if (PreWebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PreWebhookUrl", Serializers.Url(PreWebhookUrl)));
-            }
-
-            if (PostWebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostWebhookUrl", Serializers.Url(PostWebhookUrl)));
-            }
-
-            if (WebhookMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod.ToString()));
-            }
-
-            if (WebhookFilters != null)
-            {
-                p.AddRange(WebhookFilters.Select(prop => new KeyValuePair<string, string>("WebhookFilters", prop)));
-            }
-
-            if (WebhooksOnMessageSendUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSend.Url", Serializers.Url(WebhooksOnMessageSendUrl)));
-            }
-
-            if (WebhooksOnMessageSendMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSend.Method", WebhooksOnMessageSendMethod.ToString()));
-            }
-
-            if (WebhooksOnMessageUpdateUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdate.Url", Serializers.Url(WebhooksOnMessageUpdateUrl)));
-            }
-
-            if (WebhooksOnMessageUpdateMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdate.Method", WebhooksOnMessageUpdateMethod.ToString()));
-            }
-
-            if (WebhooksOnMessageRemoveUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemove.Url", Serializers.Url(WebhooksOnMessageRemoveUrl)));
-            }
-
-            if (WebhooksOnMessageRemoveMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemove.Method", WebhooksOnMessageRemoveMethod.ToString()));
-            }
-
-            if (WebhooksOnChannelAddUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdd.Url", Serializers.Url(WebhooksOnChannelAddUrl)));
-            }
-
-            if (WebhooksOnChannelAddMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdd.Method", WebhooksOnChannelAddMethod.ToString()));
-            }
-
-            if (WebhooksOnChannelDestroyUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroy.Url", Serializers.Url(WebhooksOnChannelDestroyUrl)));
-            }
-
-            if (WebhooksOnChannelDestroyMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroy.Method", WebhooksOnChannelDestroyMethod.ToString()));
-            }
-
-            if (WebhooksOnChannelUpdateUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdate.Url", Serializers.Url(WebhooksOnChannelUpdateUrl)));
-            }
-
-            if (WebhooksOnChannelUpdateMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdate.Method", WebhooksOnChannelUpdateMethod.ToString()));
-            }
-
-            if (WebhooksOnMemberAddUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdd.Url", Serializers.Url(WebhooksOnMemberAddUrl)));
-            }
-
-            if (WebhooksOnMemberAddMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdd.Method", WebhooksOnMemberAddMethod.ToString()));
-            }
-
-            if (WebhooksOnMemberRemoveUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemove.Url", Serializers.Url(WebhooksOnMemberRemoveUrl)));
-            }
-
-            if (WebhooksOnMemberRemoveMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemove.Method", WebhooksOnMemberRemoveMethod.ToString()));
-            }
-
-            if (WebhooksOnMessageSentUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSent.Url", Serializers.Url(WebhooksOnMessageSentUrl)));
-            }
-
-            if (WebhooksOnMessageSentMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSent.Method", WebhooksOnMessageSentMethod.ToString()));
-            }
-
-            if (WebhooksOnMessageUpdatedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdated.Url", Serializers.Url(WebhooksOnMessageUpdatedUrl)));
-            }
-
-            if (WebhooksOnMessageUpdatedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdated.Method", WebhooksOnMessageUpdatedMethod.ToString()));
-            }
-
-            if (WebhooksOnMessageRemovedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemoved.Url", Serializers.Url(WebhooksOnMessageRemovedUrl)));
-            }
-
-            if (WebhooksOnMessageRemovedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemoved.Method", WebhooksOnMessageRemovedMethod.ToString()));
-            }
-
-            if (WebhooksOnChannelAddedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdded.Url", Serializers.Url(WebhooksOnChannelAddedUrl)));
-            }
-
-            if (WebhooksOnChannelAddedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdded.Method", WebhooksOnChannelAddedMethod.ToString()));
-            }
-
-            if (WebhooksOnChannelDestroyedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroyed.Url", Serializers.Url(WebhooksOnChannelDestroyedUrl)));
-            }
-
-            if (WebhooksOnChannelDestroyedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroyed.Method", WebhooksOnChannelDestroyedMethod.ToString()));
-            }
-
-            if (WebhooksOnChannelUpdatedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdated.Url", Serializers.Url(WebhooksOnChannelUpdatedUrl)));
-            }
-
-            if (WebhooksOnChannelUpdatedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdated.Method", WebhooksOnChannelUpdatedMethod.ToString()));
-            }
-
-            if (WebhooksOnMemberAddedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdded.Url", Serializers.Url(WebhooksOnMemberAddedUrl)));
-            }
-
-            if (WebhooksOnMemberAddedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdded.Method", WebhooksOnMemberAddedMethod.ToString()));
-            }
-
-            if (WebhooksOnMemberRemovedUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemoved.Url", Serializers.Url(WebhooksOnMemberRemovedUrl)));
-            }
-
-            if (WebhooksOnMemberRemovedMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemoved.Method", WebhooksOnMemberRemovedMethod.ToString()));
-            }
-
-            if (LimitsChannelMembers != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Limits.ChannelMembers", LimitsChannelMembers.ToString()));
-            }
-
-            if (LimitsUserChannels != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Limits.UserChannels", LimitsUserChannels.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new DeleteServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateServiceOptions
+  /// </summary>
+  public class CreateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; }
+
+    /// <summary>
+    /// Construct a new CreateServiceOptions
+    /// </summary>
+    /// <param name="friendlyName"> The friendly_name </param>
+    public CreateServiceOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadServiceOptions
+  /// </summary>
+  public class ReadServiceOptions : ReadOptions<ServiceResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateServiceOptions
+  /// </summary>
+  public class UpdateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The default_service_role_sid
+    /// </summary>
+    public string DefaultServiceRoleSid { get; set; }
+    /// <summary>
+    /// The default_channel_role_sid
+    /// </summary>
+    public string DefaultChannelRoleSid { get; set; }
+    /// <summary>
+    /// The default_channel_creator_role_sid
+    /// </summary>
+    public string DefaultChannelCreatorRoleSid { get; set; }
+    /// <summary>
+    /// The read_status_enabled
+    /// </summary>
+    public bool? ReadStatusEnabled { get; set; }
+    /// <summary>
+    /// The reachability_enabled
+    /// </summary>
+    public bool? ReachabilityEnabled { get; set; }
+    /// <summary>
+    /// The typing_indicator_timeout
+    /// </summary>
+    public int? TypingIndicatorTimeout { get; set; }
+    /// <summary>
+    /// The consumption_report_interval
+    /// </summary>
+    public int? ConsumptionReportInterval { get; set; }
+    /// <summary>
+    /// The notifications.new_message.enabled
+    /// </summary>
+    public bool? NotificationsNewMessageEnabled { get; set; }
+    /// <summary>
+    /// The notifications.new_message.template
+    /// </summary>
+    public string NotificationsNewMessageTemplate { get; set; }
+    /// <summary>
+    /// The notifications.added_to_channel.enabled
+    /// </summary>
+    public bool? NotificationsAddedToChannelEnabled { get; set; }
+    /// <summary>
+    /// The notifications.added_to_channel.template
+    /// </summary>
+    public string NotificationsAddedToChannelTemplate { get; set; }
+    /// <summary>
+    /// The notifications.removed_from_channel.enabled
+    /// </summary>
+    public bool? NotificationsRemovedFromChannelEnabled { get; set; }
+    /// <summary>
+    /// The notifications.removed_from_channel.template
+    /// </summary>
+    public string NotificationsRemovedFromChannelTemplate { get; set; }
+    /// <summary>
+    /// The notifications.invited_to_channel.enabled
+    /// </summary>
+    public bool? NotificationsInvitedToChannelEnabled { get; set; }
+    /// <summary>
+    /// The notifications.invited_to_channel.template
+    /// </summary>
+    public string NotificationsInvitedToChannelTemplate { get; set; }
+    /// <summary>
+    /// The pre_webhook_url
+    /// </summary>
+    public Uri PreWebhookUrl { get; set; }
+    /// <summary>
+    /// The post_webhook_url
+    /// </summary>
+    public Uri PostWebhookUrl { get; set; }
+    /// <summary>
+    /// The webhook_method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhookMethod { get; set; }
+    /// <summary>
+    /// The webhook_filters
+    /// </summary>
+    public List<string> WebhookFilters { get; set; }
+    /// <summary>
+    /// The webhooks.on_message_send.url
+    /// </summary>
+    public Uri WebhooksOnMessageSendUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_message_send.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMessageSendMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_message_update.url
+    /// </summary>
+    public Uri WebhooksOnMessageUpdateUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_message_update.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMessageUpdateMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_message_remove.url
+    /// </summary>
+    public Uri WebhooksOnMessageRemoveUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_message_remove.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMessageRemoveMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_channel_add.url
+    /// </summary>
+    public Uri WebhooksOnChannelAddUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_channel_add.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnChannelAddMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_channel_destroy.url
+    /// </summary>
+    public Uri WebhooksOnChannelDestroyUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_channel_destroy.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnChannelDestroyMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_channel_update.url
+    /// </summary>
+    public Uri WebhooksOnChannelUpdateUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_channel_update.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnChannelUpdateMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_member_add.url
+    /// </summary>
+    public Uri WebhooksOnMemberAddUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_member_add.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMemberAddMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_member_remove.url
+    /// </summary>
+    public Uri WebhooksOnMemberRemoveUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_member_remove.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMemberRemoveMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_message_sent.url
+    /// </summary>
+    public Uri WebhooksOnMessageSentUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_message_sent.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMessageSentMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_message_updated.url
+    /// </summary>
+    public Uri WebhooksOnMessageUpdatedUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_message_updated.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMessageUpdatedMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_message_removed.url
+    /// </summary>
+    public Uri WebhooksOnMessageRemovedUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_message_removed.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMessageRemovedMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_channel_added.url
+    /// </summary>
+    public Uri WebhooksOnChannelAddedUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_channel_added.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnChannelAddedMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_channel_destroyed.url
+    /// </summary>
+    public Uri WebhooksOnChannelDestroyedUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_channel_destroyed.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnChannelDestroyedMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_channel_updated.url
+    /// </summary>
+    public Uri WebhooksOnChannelUpdatedUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_channel_updated.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnChannelUpdatedMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_member_added.url
+    /// </summary>
+    public Uri WebhooksOnMemberAddedUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_member_added.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMemberAddedMethod { get; set; }
+    /// <summary>
+    /// The webhooks.on_member_removed.url
+    /// </summary>
+    public Uri WebhooksOnMemberRemovedUrl { get; set; }
+    /// <summary>
+    /// The webhooks.on_member_removed.method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhooksOnMemberRemovedMethod { get; set; }
+    /// <summary>
+    /// The limits.channel_members
+    /// </summary>
+    public int? LimitsChannelMembers { get; set; }
+    /// <summary>
+    /// The limits.user_channels
+    /// </summary>
+    public int? LimitsUserChannels { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+      WebhookFilters = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DefaultServiceRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultServiceRoleSid", DefaultServiceRoleSid.ToString()));
+      }
+
+      if (DefaultChannelRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultChannelRoleSid", DefaultChannelRoleSid.ToString()));
+      }
+
+      if (DefaultChannelCreatorRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultChannelCreatorRoleSid", DefaultChannelCreatorRoleSid.ToString()));
+      }
+
+      if (ReadStatusEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReadStatusEnabled", ReadStatusEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ReachabilityEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReachabilityEnabled", ReachabilityEnabled.Value.ToString().ToLower()));
+      }
+
+      if (TypingIndicatorTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TypingIndicatorTimeout", TypingIndicatorTimeout.ToString()));
+      }
+
+      if (ConsumptionReportInterval != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConsumptionReportInterval", ConsumptionReportInterval.ToString()));
+      }
+
+      if (NotificationsNewMessageEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Enabled", NotificationsNewMessageEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsNewMessageTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Template", NotificationsNewMessageTemplate));
+      }
+
+      if (NotificationsAddedToChannelEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Enabled", NotificationsAddedToChannelEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsAddedToChannelTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Template", NotificationsAddedToChannelTemplate));
+      }
+
+      if (NotificationsRemovedFromChannelEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Enabled", NotificationsRemovedFromChannelEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsRemovedFromChannelTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Template", NotificationsRemovedFromChannelTemplate));
+      }
+
+      if (NotificationsInvitedToChannelEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Enabled", NotificationsInvitedToChannelEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsInvitedToChannelTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Template", NotificationsInvitedToChannelTemplate));
+      }
+
+      if (PreWebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PreWebhookUrl", Serializers.Url(PreWebhookUrl)));
+      }
+
+      if (PostWebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostWebhookUrl", Serializers.Url(PostWebhookUrl)));
+      }
+
+      if (WebhookMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod.ToString()));
+      }
+
+      if (WebhookFilters != null)
+      {
+        p.AddRange(WebhookFilters.Select(prop => new KeyValuePair<string, string>("WebhookFilters", prop)));
+      }
+
+      if (WebhooksOnMessageSendUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSend.Url", Serializers.Url(WebhooksOnMessageSendUrl)));
+      }
+
+      if (WebhooksOnMessageSendMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSend.Method", WebhooksOnMessageSendMethod.ToString()));
+      }
+
+      if (WebhooksOnMessageUpdateUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdate.Url", Serializers.Url(WebhooksOnMessageUpdateUrl)));
+      }
+
+      if (WebhooksOnMessageUpdateMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdate.Method", WebhooksOnMessageUpdateMethod.ToString()));
+      }
+
+      if (WebhooksOnMessageRemoveUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemove.Url", Serializers.Url(WebhooksOnMessageRemoveUrl)));
+      }
+
+      if (WebhooksOnMessageRemoveMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemove.Method", WebhooksOnMessageRemoveMethod.ToString()));
+      }
+
+      if (WebhooksOnChannelAddUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdd.Url", Serializers.Url(WebhooksOnChannelAddUrl)));
+      }
+
+      if (WebhooksOnChannelAddMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdd.Method", WebhooksOnChannelAddMethod.ToString()));
+      }
+
+      if (WebhooksOnChannelDestroyUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroy.Url", Serializers.Url(WebhooksOnChannelDestroyUrl)));
+      }
+
+      if (WebhooksOnChannelDestroyMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroy.Method", WebhooksOnChannelDestroyMethod.ToString()));
+      }
+
+      if (WebhooksOnChannelUpdateUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdate.Url", Serializers.Url(WebhooksOnChannelUpdateUrl)));
+      }
+
+      if (WebhooksOnChannelUpdateMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdate.Method", WebhooksOnChannelUpdateMethod.ToString()));
+      }
+
+      if (WebhooksOnMemberAddUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdd.Url", Serializers.Url(WebhooksOnMemberAddUrl)));
+      }
+
+      if (WebhooksOnMemberAddMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdd.Method", WebhooksOnMemberAddMethod.ToString()));
+      }
+
+      if (WebhooksOnMemberRemoveUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemove.Url", Serializers.Url(WebhooksOnMemberRemoveUrl)));
+      }
+
+      if (WebhooksOnMemberRemoveMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemove.Method", WebhooksOnMemberRemoveMethod.ToString()));
+      }
+
+      if (WebhooksOnMessageSentUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSent.Url", Serializers.Url(WebhooksOnMessageSentUrl)));
+      }
+
+      if (WebhooksOnMessageSentMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageSent.Method", WebhooksOnMessageSentMethod.ToString()));
+      }
+
+      if (WebhooksOnMessageUpdatedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdated.Url", Serializers.Url(WebhooksOnMessageUpdatedUrl)));
+      }
+
+      if (WebhooksOnMessageUpdatedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageUpdated.Method", WebhooksOnMessageUpdatedMethod.ToString()));
+      }
+
+      if (WebhooksOnMessageRemovedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemoved.Url", Serializers.Url(WebhooksOnMessageRemovedUrl)));
+      }
+
+      if (WebhooksOnMessageRemovedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMessageRemoved.Method", WebhooksOnMessageRemovedMethod.ToString()));
+      }
+
+      if (WebhooksOnChannelAddedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdded.Url", Serializers.Url(WebhooksOnChannelAddedUrl)));
+      }
+
+      if (WebhooksOnChannelAddedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelAdded.Method", WebhooksOnChannelAddedMethod.ToString()));
+      }
+
+      if (WebhooksOnChannelDestroyedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroyed.Url", Serializers.Url(WebhooksOnChannelDestroyedUrl)));
+      }
+
+      if (WebhooksOnChannelDestroyedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelDestroyed.Method", WebhooksOnChannelDestroyedMethod.ToString()));
+      }
+
+      if (WebhooksOnChannelUpdatedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdated.Url", Serializers.Url(WebhooksOnChannelUpdatedUrl)));
+      }
+
+      if (WebhooksOnChannelUpdatedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnChannelUpdated.Method", WebhooksOnChannelUpdatedMethod.ToString()));
+      }
+
+      if (WebhooksOnMemberAddedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdded.Url", Serializers.Url(WebhooksOnMemberAddedUrl)));
+      }
+
+      if (WebhooksOnMemberAddedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberAdded.Method", WebhooksOnMemberAddedMethod.ToString()));
+      }
+
+      if (WebhooksOnMemberRemovedUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemoved.Url", Serializers.Url(WebhooksOnMemberRemovedUrl)));
+      }
+
+      if (WebhooksOnMemberRemovedMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Webhooks.OnMemberRemoved.Method", WebhooksOnMemberRemovedMethod.ToString()));
+      }
+
+      if (LimitsChannelMembers != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Limits.ChannelMembers", LimitsChannelMembers.ToString()));
+      }
+
+      if (LimitsUserChannels != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Limits.UserChannels", LimitsUserChannels.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V1/ServiceResource.cs b/src/Twilio/Rest/IpMessaging/V1/ServiceResource.cs
index 16ef0036f..37485669e 100644
--- a/src/Twilio/Rest/IpMessaging/V1/ServiceResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V1/ServiceResource.cs
@@ -16,751 +16,751 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.IpMessaging.V1
-{
-
-    public class ServiceResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Services",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(string friendlyName, ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v1/Services",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v1/Services/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="defaultServiceRoleSid"> The default_service_role_sid </param>
-        /// <param name="defaultChannelRoleSid"> The default_channel_role_sid </param>
-        /// <param name="defaultChannelCreatorRoleSid"> The default_channel_creator_role_sid </param>
-        /// <param name="readStatusEnabled"> The read_status_enabled </param>
-        /// <param name="reachabilityEnabled"> The reachability_enabled </param>
-        /// <param name="typingIndicatorTimeout"> The typing_indicator_timeout </param>
-        /// <param name="consumptionReportInterval"> The consumption_report_interval </param>
-        /// <param name="notificationsNewMessageEnabled"> The notifications.new_message.enabled </param>
-        /// <param name="notificationsNewMessageTemplate"> The notifications.new_message.template </param>
-        /// <param name="notificationsAddedToChannelEnabled"> The notifications.added_to_channel.enabled </param>
-        /// <param name="notificationsAddedToChannelTemplate"> The notifications.added_to_channel.template </param>
-        /// <param name="notificationsRemovedFromChannelEnabled"> The notifications.removed_from_channel.enabled </param>
-        /// <param name="notificationsRemovedFromChannelTemplate"> The notifications.removed_from_channel.template </param>
-        /// <param name="notificationsInvitedToChannelEnabled"> The notifications.invited_to_channel.enabled </param>
-        /// <param name="notificationsInvitedToChannelTemplate"> The notifications.invited_to_channel.template </param>
-        /// <param name="preWebhookUrl"> The pre_webhook_url </param>
-        /// <param name="postWebhookUrl"> The post_webhook_url </param>
-        /// <param name="webhookMethod"> The webhook_method </param>
-        /// <param name="webhookFilters"> The webhook_filters </param>
-        /// <param name="webhooksOnMessageSendUrl"> The webhooks.on_message_send.url </param>
-        /// <param name="webhooksOnMessageSendMethod"> The webhooks.on_message_send.method </param>
-        /// <param name="webhooksOnMessageUpdateUrl"> The webhooks.on_message_update.url </param>
-        /// <param name="webhooksOnMessageUpdateMethod"> The webhooks.on_message_update.method </param>
-        /// <param name="webhooksOnMessageRemoveUrl"> The webhooks.on_message_remove.url </param>
-        /// <param name="webhooksOnMessageRemoveMethod"> The webhooks.on_message_remove.method </param>
-        /// <param name="webhooksOnChannelAddUrl"> The webhooks.on_channel_add.url </param>
-        /// <param name="webhooksOnChannelAddMethod"> The webhooks.on_channel_add.method </param>
-        /// <param name="webhooksOnChannelDestroyUrl"> The webhooks.on_channel_destroy.url </param>
-        /// <param name="webhooksOnChannelDestroyMethod"> The webhooks.on_channel_destroy.method </param>
-        /// <param name="webhooksOnChannelUpdateUrl"> The webhooks.on_channel_update.url </param>
-        /// <param name="webhooksOnChannelUpdateMethod"> The webhooks.on_channel_update.method </param>
-        /// <param name="webhooksOnMemberAddUrl"> The webhooks.on_member_add.url </param>
-        /// <param name="webhooksOnMemberAddMethod"> The webhooks.on_member_add.method </param>
-        /// <param name="webhooksOnMemberRemoveUrl"> The webhooks.on_member_remove.url </param>
-        /// <param name="webhooksOnMemberRemoveMethod"> The webhooks.on_member_remove.method </param>
-        /// <param name="webhooksOnMessageSentUrl"> The webhooks.on_message_sent.url </param>
-        /// <param name="webhooksOnMessageSentMethod"> The webhooks.on_message_sent.method </param>
-        /// <param name="webhooksOnMessageUpdatedUrl"> The webhooks.on_message_updated.url </param>
-        /// <param name="webhooksOnMessageUpdatedMethod"> The webhooks.on_message_updated.method </param>
-        /// <param name="webhooksOnMessageRemovedUrl"> The webhooks.on_message_removed.url </param>
-        /// <param name="webhooksOnMessageRemovedMethod"> The webhooks.on_message_removed.method </param>
-        /// <param name="webhooksOnChannelAddedUrl"> The webhooks.on_channel_added.url </param>
-        /// <param name="webhooksOnChannelAddedMethod"> The webhooks.on_channel_added.method </param>
-        /// <param name="webhooksOnChannelDestroyedUrl"> The webhooks.on_channel_destroyed.url </param>
-        /// <param name="webhooksOnChannelDestroyedMethod"> The webhooks.on_channel_destroyed.method </param>
-        /// <param name="webhooksOnChannelUpdatedUrl"> The webhooks.on_channel_updated.url </param>
-        /// <param name="webhooksOnChannelUpdatedMethod"> The webhooks.on_channel_updated.method </param>
-        /// <param name="webhooksOnMemberAddedUrl"> The webhooks.on_member_added.url </param>
-        /// <param name="webhooksOnMemberAddedMethod"> The webhooks.on_member_added.method </param>
-        /// <param name="webhooksOnMemberRemovedUrl"> The webhooks.on_member_removed.url </param>
-        /// <param name="webhooksOnMemberRemovedMethod"> The webhooks.on_member_removed.method </param>
-        /// <param name="limitsChannelMembers"> The limits.channel_members </param>
-        /// <param name="limitsUserChannels"> The limits.user_channels </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(string pathSid,
-                                             string friendlyName = null,
-                                             string defaultServiceRoleSid = null,
-                                             string defaultChannelRoleSid = null,
-                                             string defaultChannelCreatorRoleSid = null,
-                                             bool? readStatusEnabled = null,
-                                             bool? reachabilityEnabled = null,
-                                             int? typingIndicatorTimeout = null,
-                                             int? consumptionReportInterval = null,
-                                             bool? notificationsNewMessageEnabled = null,
-                                             string notificationsNewMessageTemplate = null,
-                                             bool? notificationsAddedToChannelEnabled = null,
-                                             string notificationsAddedToChannelTemplate = null,
-                                             bool? notificationsRemovedFromChannelEnabled = null,
-                                             string notificationsRemovedFromChannelTemplate = null,
-                                             bool? notificationsInvitedToChannelEnabled = null,
-                                             string notificationsInvitedToChannelTemplate = null,
-                                             Uri preWebhookUrl = null,
-                                             Uri postWebhookUrl = null,
-                                             Twilio.Http.HttpMethod webhookMethod = null,
-                                             List<string> webhookFilters = null,
-                                             Uri webhooksOnMessageSendUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMessageSendMethod = null,
-                                             Uri webhooksOnMessageUpdateUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMessageUpdateMethod = null,
-                                             Uri webhooksOnMessageRemoveUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMessageRemoveMethod = null,
-                                             Uri webhooksOnChannelAddUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnChannelAddMethod = null,
-                                             Uri webhooksOnChannelDestroyUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnChannelDestroyMethod = null,
-                                             Uri webhooksOnChannelUpdateUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnChannelUpdateMethod = null,
-                                             Uri webhooksOnMemberAddUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMemberAddMethod = null,
-                                             Uri webhooksOnMemberRemoveUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMemberRemoveMethod = null,
-                                             Uri webhooksOnMessageSentUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMessageSentMethod = null,
-                                             Uri webhooksOnMessageUpdatedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMessageUpdatedMethod = null,
-                                             Uri webhooksOnMessageRemovedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMessageRemovedMethod = null,
-                                             Uri webhooksOnChannelAddedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnChannelAddedMethod = null,
-                                             Uri webhooksOnChannelDestroyedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnChannelDestroyedMethod = null,
-                                             Uri webhooksOnChannelUpdatedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnChannelUpdatedMethod = null,
-                                             Uri webhooksOnMemberAddedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMemberAddedMethod = null,
-                                             Uri webhooksOnMemberRemovedUrl = null,
-                                             Twilio.Http.HttpMethod webhooksOnMemberRemovedMethod = null,
-                                             int? limitsChannelMembers = null,
-                                             int? limitsUserChannels = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, WebhooksOnMessageSendUrl = webhooksOnMessageSendUrl, WebhooksOnMessageSendMethod = webhooksOnMessageSendMethod, WebhooksOnMessageUpdateUrl = webhooksOnMessageUpdateUrl, WebhooksOnMessageUpdateMethod = webhooksOnMessageUpdateMethod, WebhooksOnMessageRemoveUrl = webhooksOnMessageRemoveUrl, WebhooksOnMessageRemoveMethod = webhooksOnMessageRemoveMethod, WebhooksOnChannelAddUrl = webhooksOnChannelAddUrl, WebhooksOnChannelAddMethod = webhooksOnChannelAddMethod, WebhooksOnChannelDestroyUrl = webhooksOnChannelDestroyUrl, WebhooksOnChannelDestroyMethod = webhooksOnChannelDestroyMethod, WebhooksOnChannelUpdateUrl = webhooksOnChannelUpdateUrl, WebhooksOnChannelUpdateMethod = webhooksOnChannelUpdateMethod, WebhooksOnMemberAddUrl = webhooksOnMemberAddUrl, WebhooksOnMemberAddMethod = webhooksOnMemberAddMethod, WebhooksOnMemberRemoveUrl = webhooksOnMemberRemoveUrl, WebhooksOnMemberRemoveMethod = webhooksOnMemberRemoveMethod, WebhooksOnMessageSentUrl = webhooksOnMessageSentUrl, WebhooksOnMessageSentMethod = webhooksOnMessageSentMethod, WebhooksOnMessageUpdatedUrl = webhooksOnMessageUpdatedUrl, WebhooksOnMessageUpdatedMethod = webhooksOnMessageUpdatedMethod, WebhooksOnMessageRemovedUrl = webhooksOnMessageRemovedUrl, WebhooksOnMessageRemovedMethod = webhooksOnMessageRemovedMethod, WebhooksOnChannelAddedUrl = webhooksOnChannelAddedUrl, WebhooksOnChannelAddedMethod = webhooksOnChannelAddedMethod, WebhooksOnChannelDestroyedUrl = webhooksOnChannelDestroyedUrl, WebhooksOnChannelDestroyedMethod = webhooksOnChannelDestroyedMethod, WebhooksOnChannelUpdatedUrl = webhooksOnChannelUpdatedUrl, WebhooksOnChannelUpdatedMethod = webhooksOnChannelUpdatedMethod, WebhooksOnMemberAddedUrl = webhooksOnMemberAddedUrl, WebhooksOnMemberAddedMethod = webhooksOnMemberAddedMethod, WebhooksOnMemberRemovedUrl = webhooksOnMemberRemovedUrl, WebhooksOnMemberRemovedMethod = webhooksOnMemberRemovedMethod, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="defaultServiceRoleSid"> The default_service_role_sid </param>
-        /// <param name="defaultChannelRoleSid"> The default_channel_role_sid </param>
-        /// <param name="defaultChannelCreatorRoleSid"> The default_channel_creator_role_sid </param>
-        /// <param name="readStatusEnabled"> The read_status_enabled </param>
-        /// <param name="reachabilityEnabled"> The reachability_enabled </param>
-        /// <param name="typingIndicatorTimeout"> The typing_indicator_timeout </param>
-        /// <param name="consumptionReportInterval"> The consumption_report_interval </param>
-        /// <param name="notificationsNewMessageEnabled"> The notifications.new_message.enabled </param>
-        /// <param name="notificationsNewMessageTemplate"> The notifications.new_message.template </param>
-        /// <param name="notificationsAddedToChannelEnabled"> The notifications.added_to_channel.enabled </param>
-        /// <param name="notificationsAddedToChannelTemplate"> The notifications.added_to_channel.template </param>
-        /// <param name="notificationsRemovedFromChannelEnabled"> The notifications.removed_from_channel.enabled </param>
-        /// <param name="notificationsRemovedFromChannelTemplate"> The notifications.removed_from_channel.template </param>
-        /// <param name="notificationsInvitedToChannelEnabled"> The notifications.invited_to_channel.enabled </param>
-        /// <param name="notificationsInvitedToChannelTemplate"> The notifications.invited_to_channel.template </param>
-        /// <param name="preWebhookUrl"> The pre_webhook_url </param>
-        /// <param name="postWebhookUrl"> The post_webhook_url </param>
-        /// <param name="webhookMethod"> The webhook_method </param>
-        /// <param name="webhookFilters"> The webhook_filters </param>
-        /// <param name="webhooksOnMessageSendUrl"> The webhooks.on_message_send.url </param>
-        /// <param name="webhooksOnMessageSendMethod"> The webhooks.on_message_send.method </param>
-        /// <param name="webhooksOnMessageUpdateUrl"> The webhooks.on_message_update.url </param>
-        /// <param name="webhooksOnMessageUpdateMethod"> The webhooks.on_message_update.method </param>
-        /// <param name="webhooksOnMessageRemoveUrl"> The webhooks.on_message_remove.url </param>
-        /// <param name="webhooksOnMessageRemoveMethod"> The webhooks.on_message_remove.method </param>
-        /// <param name="webhooksOnChannelAddUrl"> The webhooks.on_channel_add.url </param>
-        /// <param name="webhooksOnChannelAddMethod"> The webhooks.on_channel_add.method </param>
-        /// <param name="webhooksOnChannelDestroyUrl"> The webhooks.on_channel_destroy.url </param>
-        /// <param name="webhooksOnChannelDestroyMethod"> The webhooks.on_channel_destroy.method </param>
-        /// <param name="webhooksOnChannelUpdateUrl"> The webhooks.on_channel_update.url </param>
-        /// <param name="webhooksOnChannelUpdateMethod"> The webhooks.on_channel_update.method </param>
-        /// <param name="webhooksOnMemberAddUrl"> The webhooks.on_member_add.url </param>
-        /// <param name="webhooksOnMemberAddMethod"> The webhooks.on_member_add.method </param>
-        /// <param name="webhooksOnMemberRemoveUrl"> The webhooks.on_member_remove.url </param>
-        /// <param name="webhooksOnMemberRemoveMethod"> The webhooks.on_member_remove.method </param>
-        /// <param name="webhooksOnMessageSentUrl"> The webhooks.on_message_sent.url </param>
-        /// <param name="webhooksOnMessageSentMethod"> The webhooks.on_message_sent.method </param>
-        /// <param name="webhooksOnMessageUpdatedUrl"> The webhooks.on_message_updated.url </param>
-        /// <param name="webhooksOnMessageUpdatedMethod"> The webhooks.on_message_updated.method </param>
-        /// <param name="webhooksOnMessageRemovedUrl"> The webhooks.on_message_removed.url </param>
-        /// <param name="webhooksOnMessageRemovedMethod"> The webhooks.on_message_removed.method </param>
-        /// <param name="webhooksOnChannelAddedUrl"> The webhooks.on_channel_added.url </param>
-        /// <param name="webhooksOnChannelAddedMethod"> The webhooks.on_channel_added.method </param>
-        /// <param name="webhooksOnChannelDestroyedUrl"> The webhooks.on_channel_destroyed.url </param>
-        /// <param name="webhooksOnChannelDestroyedMethod"> The webhooks.on_channel_destroyed.method </param>
-        /// <param name="webhooksOnChannelUpdatedUrl"> The webhooks.on_channel_updated.url </param>
-        /// <param name="webhooksOnChannelUpdatedMethod"> The webhooks.on_channel_updated.method </param>
-        /// <param name="webhooksOnMemberAddedUrl"> The webhooks.on_member_added.url </param>
-        /// <param name="webhooksOnMemberAddedMethod"> The webhooks.on_member_added.method </param>
-        /// <param name="webhooksOnMemberRemovedUrl"> The webhooks.on_member_removed.url </param>
-        /// <param name="webhooksOnMemberRemovedMethod"> The webhooks.on_member_removed.method </param>
-        /// <param name="limitsChannelMembers"> The limits.channel_members </param>
-        /// <param name="limitsUserChannels"> The limits.user_channels </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     string defaultServiceRoleSid = null,
-                                                                                     string defaultChannelRoleSid = null,
-                                                                                     string defaultChannelCreatorRoleSid = null,
-                                                                                     bool? readStatusEnabled = null,
-                                                                                     bool? reachabilityEnabled = null,
-                                                                                     int? typingIndicatorTimeout = null,
-                                                                                     int? consumptionReportInterval = null,
-                                                                                     bool? notificationsNewMessageEnabled = null,
-                                                                                     string notificationsNewMessageTemplate = null,
-                                                                                     bool? notificationsAddedToChannelEnabled = null,
-                                                                                     string notificationsAddedToChannelTemplate = null,
-                                                                                     bool? notificationsRemovedFromChannelEnabled = null,
-                                                                                     string notificationsRemovedFromChannelTemplate = null,
-                                                                                     bool? notificationsInvitedToChannelEnabled = null,
-                                                                                     string notificationsInvitedToChannelTemplate = null,
-                                                                                     Uri preWebhookUrl = null,
-                                                                                     Uri postWebhookUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhookMethod = null,
-                                                                                     List<string> webhookFilters = null,
-                                                                                     Uri webhooksOnMessageSendUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMessageSendMethod = null,
-                                                                                     Uri webhooksOnMessageUpdateUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMessageUpdateMethod = null,
-                                                                                     Uri webhooksOnMessageRemoveUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMessageRemoveMethod = null,
-                                                                                     Uri webhooksOnChannelAddUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnChannelAddMethod = null,
-                                                                                     Uri webhooksOnChannelDestroyUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnChannelDestroyMethod = null,
-                                                                                     Uri webhooksOnChannelUpdateUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnChannelUpdateMethod = null,
-                                                                                     Uri webhooksOnMemberAddUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMemberAddMethod = null,
-                                                                                     Uri webhooksOnMemberRemoveUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMemberRemoveMethod = null,
-                                                                                     Uri webhooksOnMessageSentUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMessageSentMethod = null,
-                                                                                     Uri webhooksOnMessageUpdatedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMessageUpdatedMethod = null,
-                                                                                     Uri webhooksOnMessageRemovedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMessageRemovedMethod = null,
-                                                                                     Uri webhooksOnChannelAddedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnChannelAddedMethod = null,
-                                                                                     Uri webhooksOnChannelDestroyedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnChannelDestroyedMethod = null,
-                                                                                     Uri webhooksOnChannelUpdatedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnChannelUpdatedMethod = null,
-                                                                                     Uri webhooksOnMemberAddedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMemberAddedMethod = null,
-                                                                                     Uri webhooksOnMemberRemovedUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhooksOnMemberRemovedMethod = null,
-                                                                                     int? limitsChannelMembers = null,
-                                                                                     int? limitsUserChannels = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, WebhooksOnMessageSendUrl = webhooksOnMessageSendUrl, WebhooksOnMessageSendMethod = webhooksOnMessageSendMethod, WebhooksOnMessageUpdateUrl = webhooksOnMessageUpdateUrl, WebhooksOnMessageUpdateMethod = webhooksOnMessageUpdateMethod, WebhooksOnMessageRemoveUrl = webhooksOnMessageRemoveUrl, WebhooksOnMessageRemoveMethod = webhooksOnMessageRemoveMethod, WebhooksOnChannelAddUrl = webhooksOnChannelAddUrl, WebhooksOnChannelAddMethod = webhooksOnChannelAddMethod, WebhooksOnChannelDestroyUrl = webhooksOnChannelDestroyUrl, WebhooksOnChannelDestroyMethod = webhooksOnChannelDestroyMethod, WebhooksOnChannelUpdateUrl = webhooksOnChannelUpdateUrl, WebhooksOnChannelUpdateMethod = webhooksOnChannelUpdateMethod, WebhooksOnMemberAddUrl = webhooksOnMemberAddUrl, WebhooksOnMemberAddMethod = webhooksOnMemberAddMethod, WebhooksOnMemberRemoveUrl = webhooksOnMemberRemoveUrl, WebhooksOnMemberRemoveMethod = webhooksOnMemberRemoveMethod, WebhooksOnMessageSentUrl = webhooksOnMessageSentUrl, WebhooksOnMessageSentMethod = webhooksOnMessageSentMethod, WebhooksOnMessageUpdatedUrl = webhooksOnMessageUpdatedUrl, WebhooksOnMessageUpdatedMethod = webhooksOnMessageUpdatedMethod, WebhooksOnMessageRemovedUrl = webhooksOnMessageRemovedUrl, WebhooksOnMessageRemovedMethod = webhooksOnMessageRemovedMethod, WebhooksOnChannelAddedUrl = webhooksOnChannelAddedUrl, WebhooksOnChannelAddedMethod = webhooksOnChannelAddedMethod, WebhooksOnChannelDestroyedUrl = webhooksOnChannelDestroyedUrl, WebhooksOnChannelDestroyedMethod = webhooksOnChannelDestroyedMethod, WebhooksOnChannelUpdatedUrl = webhooksOnChannelUpdatedUrl, WebhooksOnChannelUpdatedMethod = webhooksOnChannelUpdatedMethod, WebhooksOnMemberAddedUrl = webhooksOnMemberAddedUrl, WebhooksOnMemberAddedMethod = webhooksOnMemberAddedMethod, WebhooksOnMemberRemovedUrl = webhooksOnMemberRemovedUrl, WebhooksOnMemberRemovedMethod = webhooksOnMemberRemovedMethod, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ServiceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ServiceResource object represented by the provided JSON </returns>
-        public static ServiceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ServiceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The default_service_role_sid
-        /// </summary>
-        [JsonProperty("default_service_role_sid")]
-        public string DefaultServiceRoleSid { get; private set; }
-        /// <summary>
-        /// The default_channel_role_sid
-        /// </summary>
-        [JsonProperty("default_channel_role_sid")]
-        public string DefaultChannelRoleSid { get; private set; }
-        /// <summary>
-        /// The default_channel_creator_role_sid
-        /// </summary>
-        [JsonProperty("default_channel_creator_role_sid")]
-        public string DefaultChannelCreatorRoleSid { get; private set; }
-        /// <summary>
-        /// The read_status_enabled
-        /// </summary>
-        [JsonProperty("read_status_enabled")]
-        public bool? ReadStatusEnabled { get; private set; }
-        /// <summary>
-        /// The reachability_enabled
-        /// </summary>
-        [JsonProperty("reachability_enabled")]
-        public bool? ReachabilityEnabled { get; private set; }
-        /// <summary>
-        /// The typing_indicator_timeout
-        /// </summary>
-        [JsonProperty("typing_indicator_timeout")]
-        public int? TypingIndicatorTimeout { get; private set; }
-        /// <summary>
-        /// The consumption_report_interval
-        /// </summary>
-        [JsonProperty("consumption_report_interval")]
-        public int? ConsumptionReportInterval { get; private set; }
-        /// <summary>
-        /// The limits
-        /// </summary>
-        [JsonProperty("limits")]
-        public object Limits { get; private set; }
-        /// <summary>
-        /// The webhooks
-        /// </summary>
-        [JsonProperty("webhooks")]
-        public object Webhooks { get; private set; }
-        /// <summary>
-        /// The pre_webhook_url
-        /// </summary>
-        [JsonProperty("pre_webhook_url")]
-        public string PreWebhookUrl { get; private set; }
-        /// <summary>
-        /// The post_webhook_url
-        /// </summary>
-        [JsonProperty("post_webhook_url")]
-        public string PostWebhookUrl { get; private set; }
-        /// <summary>
-        /// The webhook_method
-        /// </summary>
-        [JsonProperty("webhook_method")]
-        public string WebhookMethod { get; private set; }
-        /// <summary>
-        /// The webhook_filters
-        /// </summary>
-        [JsonProperty("webhook_filters")]
-        public List<string> WebhookFilters { get; private set; }
-        /// <summary>
-        /// The notifications
-        /// </summary>
-        [JsonProperty("notifications")]
-        public object Notifications { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ServiceResource()
-        {
-
-        }
-    }
+{
+
+  public class ServiceResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Services",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(string friendlyName, ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v1/Services",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v1/Services/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="defaultServiceRoleSid"> The default_service_role_sid </param>
+    /// <param name="defaultChannelRoleSid"> The default_channel_role_sid </param>
+    /// <param name="defaultChannelCreatorRoleSid"> The default_channel_creator_role_sid </param>
+    /// <param name="readStatusEnabled"> The read_status_enabled </param>
+    /// <param name="reachabilityEnabled"> The reachability_enabled </param>
+    /// <param name="typingIndicatorTimeout"> The typing_indicator_timeout </param>
+    /// <param name="consumptionReportInterval"> The consumption_report_interval </param>
+    /// <param name="notificationsNewMessageEnabled"> The notifications.new_message.enabled </param>
+    /// <param name="notificationsNewMessageTemplate"> The notifications.new_message.template </param>
+    /// <param name="notificationsAddedToChannelEnabled"> The notifications.added_to_channel.enabled </param>
+    /// <param name="notificationsAddedToChannelTemplate"> The notifications.added_to_channel.template </param>
+    /// <param name="notificationsRemovedFromChannelEnabled"> The notifications.removed_from_channel.enabled </param>
+    /// <param name="notificationsRemovedFromChannelTemplate"> The notifications.removed_from_channel.template </param>
+    /// <param name="notificationsInvitedToChannelEnabled"> The notifications.invited_to_channel.enabled </param>
+    /// <param name="notificationsInvitedToChannelTemplate"> The notifications.invited_to_channel.template </param>
+    /// <param name="preWebhookUrl"> The pre_webhook_url </param>
+    /// <param name="postWebhookUrl"> The post_webhook_url </param>
+    /// <param name="webhookMethod"> The webhook_method </param>
+    /// <param name="webhookFilters"> The webhook_filters </param>
+    /// <param name="webhooksOnMessageSendUrl"> The webhooks.on_message_send.url </param>
+    /// <param name="webhooksOnMessageSendMethod"> The webhooks.on_message_send.method </param>
+    /// <param name="webhooksOnMessageUpdateUrl"> The webhooks.on_message_update.url </param>
+    /// <param name="webhooksOnMessageUpdateMethod"> The webhooks.on_message_update.method </param>
+    /// <param name="webhooksOnMessageRemoveUrl"> The webhooks.on_message_remove.url </param>
+    /// <param name="webhooksOnMessageRemoveMethod"> The webhooks.on_message_remove.method </param>
+    /// <param name="webhooksOnChannelAddUrl"> The webhooks.on_channel_add.url </param>
+    /// <param name="webhooksOnChannelAddMethod"> The webhooks.on_channel_add.method </param>
+    /// <param name="webhooksOnChannelDestroyUrl"> The webhooks.on_channel_destroy.url </param>
+    /// <param name="webhooksOnChannelDestroyMethod"> The webhooks.on_channel_destroy.method </param>
+    /// <param name="webhooksOnChannelUpdateUrl"> The webhooks.on_channel_update.url </param>
+    /// <param name="webhooksOnChannelUpdateMethod"> The webhooks.on_channel_update.method </param>
+    /// <param name="webhooksOnMemberAddUrl"> The webhooks.on_member_add.url </param>
+    /// <param name="webhooksOnMemberAddMethod"> The webhooks.on_member_add.method </param>
+    /// <param name="webhooksOnMemberRemoveUrl"> The webhooks.on_member_remove.url </param>
+    /// <param name="webhooksOnMemberRemoveMethod"> The webhooks.on_member_remove.method </param>
+    /// <param name="webhooksOnMessageSentUrl"> The webhooks.on_message_sent.url </param>
+    /// <param name="webhooksOnMessageSentMethod"> The webhooks.on_message_sent.method </param>
+    /// <param name="webhooksOnMessageUpdatedUrl"> The webhooks.on_message_updated.url </param>
+    /// <param name="webhooksOnMessageUpdatedMethod"> The webhooks.on_message_updated.method </param>
+    /// <param name="webhooksOnMessageRemovedUrl"> The webhooks.on_message_removed.url </param>
+    /// <param name="webhooksOnMessageRemovedMethod"> The webhooks.on_message_removed.method </param>
+    /// <param name="webhooksOnChannelAddedUrl"> The webhooks.on_channel_added.url </param>
+    /// <param name="webhooksOnChannelAddedMethod"> The webhooks.on_channel_added.method </param>
+    /// <param name="webhooksOnChannelDestroyedUrl"> The webhooks.on_channel_destroyed.url </param>
+    /// <param name="webhooksOnChannelDestroyedMethod"> The webhooks.on_channel_destroyed.method </param>
+    /// <param name="webhooksOnChannelUpdatedUrl"> The webhooks.on_channel_updated.url </param>
+    /// <param name="webhooksOnChannelUpdatedMethod"> The webhooks.on_channel_updated.method </param>
+    /// <param name="webhooksOnMemberAddedUrl"> The webhooks.on_member_added.url </param>
+    /// <param name="webhooksOnMemberAddedMethod"> The webhooks.on_member_added.method </param>
+    /// <param name="webhooksOnMemberRemovedUrl"> The webhooks.on_member_removed.url </param>
+    /// <param name="webhooksOnMemberRemovedMethod"> The webhooks.on_member_removed.method </param>
+    /// <param name="limitsChannelMembers"> The limits.channel_members </param>
+    /// <param name="limitsUserChannels"> The limits.user_channels </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(string pathSid,
+                                         string friendlyName = null,
+                                         string defaultServiceRoleSid = null,
+                                         string defaultChannelRoleSid = null,
+                                         string defaultChannelCreatorRoleSid = null,
+                                         bool? readStatusEnabled = null,
+                                         bool? reachabilityEnabled = null,
+                                         int? typingIndicatorTimeout = null,
+                                         int? consumptionReportInterval = null,
+                                         bool? notificationsNewMessageEnabled = null,
+                                         string notificationsNewMessageTemplate = null,
+                                         bool? notificationsAddedToChannelEnabled = null,
+                                         string notificationsAddedToChannelTemplate = null,
+                                         bool? notificationsRemovedFromChannelEnabled = null,
+                                         string notificationsRemovedFromChannelTemplate = null,
+                                         bool? notificationsInvitedToChannelEnabled = null,
+                                         string notificationsInvitedToChannelTemplate = null,
+                                         Uri preWebhookUrl = null,
+                                         Uri postWebhookUrl = null,
+                                         Twilio.Http.HttpMethod webhookMethod = null,
+                                         List<string> webhookFilters = null,
+                                         Uri webhooksOnMessageSendUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMessageSendMethod = null,
+                                         Uri webhooksOnMessageUpdateUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMessageUpdateMethod = null,
+                                         Uri webhooksOnMessageRemoveUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMessageRemoveMethod = null,
+                                         Uri webhooksOnChannelAddUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnChannelAddMethod = null,
+                                         Uri webhooksOnChannelDestroyUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnChannelDestroyMethod = null,
+                                         Uri webhooksOnChannelUpdateUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnChannelUpdateMethod = null,
+                                         Uri webhooksOnMemberAddUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMemberAddMethod = null,
+                                         Uri webhooksOnMemberRemoveUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMemberRemoveMethod = null,
+                                         Uri webhooksOnMessageSentUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMessageSentMethod = null,
+                                         Uri webhooksOnMessageUpdatedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMessageUpdatedMethod = null,
+                                         Uri webhooksOnMessageRemovedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMessageRemovedMethod = null,
+                                         Uri webhooksOnChannelAddedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnChannelAddedMethod = null,
+                                         Uri webhooksOnChannelDestroyedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnChannelDestroyedMethod = null,
+                                         Uri webhooksOnChannelUpdatedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnChannelUpdatedMethod = null,
+                                         Uri webhooksOnMemberAddedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMemberAddedMethod = null,
+                                         Uri webhooksOnMemberRemovedUrl = null,
+                                         Twilio.Http.HttpMethod webhooksOnMemberRemovedMethod = null,
+                                         int? limitsChannelMembers = null,
+                                         int? limitsUserChannels = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, WebhooksOnMessageSendUrl = webhooksOnMessageSendUrl, WebhooksOnMessageSendMethod = webhooksOnMessageSendMethod, WebhooksOnMessageUpdateUrl = webhooksOnMessageUpdateUrl, WebhooksOnMessageUpdateMethod = webhooksOnMessageUpdateMethod, WebhooksOnMessageRemoveUrl = webhooksOnMessageRemoveUrl, WebhooksOnMessageRemoveMethod = webhooksOnMessageRemoveMethod, WebhooksOnChannelAddUrl = webhooksOnChannelAddUrl, WebhooksOnChannelAddMethod = webhooksOnChannelAddMethod, WebhooksOnChannelDestroyUrl = webhooksOnChannelDestroyUrl, WebhooksOnChannelDestroyMethod = webhooksOnChannelDestroyMethod, WebhooksOnChannelUpdateUrl = webhooksOnChannelUpdateUrl, WebhooksOnChannelUpdateMethod = webhooksOnChannelUpdateMethod, WebhooksOnMemberAddUrl = webhooksOnMemberAddUrl, WebhooksOnMemberAddMethod = webhooksOnMemberAddMethod, WebhooksOnMemberRemoveUrl = webhooksOnMemberRemoveUrl, WebhooksOnMemberRemoveMethod = webhooksOnMemberRemoveMethod, WebhooksOnMessageSentUrl = webhooksOnMessageSentUrl, WebhooksOnMessageSentMethod = webhooksOnMessageSentMethod, WebhooksOnMessageUpdatedUrl = webhooksOnMessageUpdatedUrl, WebhooksOnMessageUpdatedMethod = webhooksOnMessageUpdatedMethod, WebhooksOnMessageRemovedUrl = webhooksOnMessageRemovedUrl, WebhooksOnMessageRemovedMethod = webhooksOnMessageRemovedMethod, WebhooksOnChannelAddedUrl = webhooksOnChannelAddedUrl, WebhooksOnChannelAddedMethod = webhooksOnChannelAddedMethod, WebhooksOnChannelDestroyedUrl = webhooksOnChannelDestroyedUrl, WebhooksOnChannelDestroyedMethod = webhooksOnChannelDestroyedMethod, WebhooksOnChannelUpdatedUrl = webhooksOnChannelUpdatedUrl, WebhooksOnChannelUpdatedMethod = webhooksOnChannelUpdatedMethod, WebhooksOnMemberAddedUrl = webhooksOnMemberAddedUrl, WebhooksOnMemberAddedMethod = webhooksOnMemberAddedMethod, WebhooksOnMemberRemovedUrl = webhooksOnMemberRemovedUrl, WebhooksOnMemberRemovedMethod = webhooksOnMemberRemovedMethod, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="defaultServiceRoleSid"> The default_service_role_sid </param>
+    /// <param name="defaultChannelRoleSid"> The default_channel_role_sid </param>
+    /// <param name="defaultChannelCreatorRoleSid"> The default_channel_creator_role_sid </param>
+    /// <param name="readStatusEnabled"> The read_status_enabled </param>
+    /// <param name="reachabilityEnabled"> The reachability_enabled </param>
+    /// <param name="typingIndicatorTimeout"> The typing_indicator_timeout </param>
+    /// <param name="consumptionReportInterval"> The consumption_report_interval </param>
+    /// <param name="notificationsNewMessageEnabled"> The notifications.new_message.enabled </param>
+    /// <param name="notificationsNewMessageTemplate"> The notifications.new_message.template </param>
+    /// <param name="notificationsAddedToChannelEnabled"> The notifications.added_to_channel.enabled </param>
+    /// <param name="notificationsAddedToChannelTemplate"> The notifications.added_to_channel.template </param>
+    /// <param name="notificationsRemovedFromChannelEnabled"> The notifications.removed_from_channel.enabled </param>
+    /// <param name="notificationsRemovedFromChannelTemplate"> The notifications.removed_from_channel.template </param>
+    /// <param name="notificationsInvitedToChannelEnabled"> The notifications.invited_to_channel.enabled </param>
+    /// <param name="notificationsInvitedToChannelTemplate"> The notifications.invited_to_channel.template </param>
+    /// <param name="preWebhookUrl"> The pre_webhook_url </param>
+    /// <param name="postWebhookUrl"> The post_webhook_url </param>
+    /// <param name="webhookMethod"> The webhook_method </param>
+    /// <param name="webhookFilters"> The webhook_filters </param>
+    /// <param name="webhooksOnMessageSendUrl"> The webhooks.on_message_send.url </param>
+    /// <param name="webhooksOnMessageSendMethod"> The webhooks.on_message_send.method </param>
+    /// <param name="webhooksOnMessageUpdateUrl"> The webhooks.on_message_update.url </param>
+    /// <param name="webhooksOnMessageUpdateMethod"> The webhooks.on_message_update.method </param>
+    /// <param name="webhooksOnMessageRemoveUrl"> The webhooks.on_message_remove.url </param>
+    /// <param name="webhooksOnMessageRemoveMethod"> The webhooks.on_message_remove.method </param>
+    /// <param name="webhooksOnChannelAddUrl"> The webhooks.on_channel_add.url </param>
+    /// <param name="webhooksOnChannelAddMethod"> The webhooks.on_channel_add.method </param>
+    /// <param name="webhooksOnChannelDestroyUrl"> The webhooks.on_channel_destroy.url </param>
+    /// <param name="webhooksOnChannelDestroyMethod"> The webhooks.on_channel_destroy.method </param>
+    /// <param name="webhooksOnChannelUpdateUrl"> The webhooks.on_channel_update.url </param>
+    /// <param name="webhooksOnChannelUpdateMethod"> The webhooks.on_channel_update.method </param>
+    /// <param name="webhooksOnMemberAddUrl"> The webhooks.on_member_add.url </param>
+    /// <param name="webhooksOnMemberAddMethod"> The webhooks.on_member_add.method </param>
+    /// <param name="webhooksOnMemberRemoveUrl"> The webhooks.on_member_remove.url </param>
+    /// <param name="webhooksOnMemberRemoveMethod"> The webhooks.on_member_remove.method </param>
+    /// <param name="webhooksOnMessageSentUrl"> The webhooks.on_message_sent.url </param>
+    /// <param name="webhooksOnMessageSentMethod"> The webhooks.on_message_sent.method </param>
+    /// <param name="webhooksOnMessageUpdatedUrl"> The webhooks.on_message_updated.url </param>
+    /// <param name="webhooksOnMessageUpdatedMethod"> The webhooks.on_message_updated.method </param>
+    /// <param name="webhooksOnMessageRemovedUrl"> The webhooks.on_message_removed.url </param>
+    /// <param name="webhooksOnMessageRemovedMethod"> The webhooks.on_message_removed.method </param>
+    /// <param name="webhooksOnChannelAddedUrl"> The webhooks.on_channel_added.url </param>
+    /// <param name="webhooksOnChannelAddedMethod"> The webhooks.on_channel_added.method </param>
+    /// <param name="webhooksOnChannelDestroyedUrl"> The webhooks.on_channel_destroyed.url </param>
+    /// <param name="webhooksOnChannelDestroyedMethod"> The webhooks.on_channel_destroyed.method </param>
+    /// <param name="webhooksOnChannelUpdatedUrl"> The webhooks.on_channel_updated.url </param>
+    /// <param name="webhooksOnChannelUpdatedMethod"> The webhooks.on_channel_updated.method </param>
+    /// <param name="webhooksOnMemberAddedUrl"> The webhooks.on_member_added.url </param>
+    /// <param name="webhooksOnMemberAddedMethod"> The webhooks.on_member_added.method </param>
+    /// <param name="webhooksOnMemberRemovedUrl"> The webhooks.on_member_removed.url </param>
+    /// <param name="webhooksOnMemberRemovedMethod"> The webhooks.on_member_removed.method </param>
+    /// <param name="limitsChannelMembers"> The limits.channel_members </param>
+    /// <param name="limitsUserChannels"> The limits.user_channels </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 string defaultServiceRoleSid = null,
+                                                                                 string defaultChannelRoleSid = null,
+                                                                                 string defaultChannelCreatorRoleSid = null,
+                                                                                 bool? readStatusEnabled = null,
+                                                                                 bool? reachabilityEnabled = null,
+                                                                                 int? typingIndicatorTimeout = null,
+                                                                                 int? consumptionReportInterval = null,
+                                                                                 bool? notificationsNewMessageEnabled = null,
+                                                                                 string notificationsNewMessageTemplate = null,
+                                                                                 bool? notificationsAddedToChannelEnabled = null,
+                                                                                 string notificationsAddedToChannelTemplate = null,
+                                                                                 bool? notificationsRemovedFromChannelEnabled = null,
+                                                                                 string notificationsRemovedFromChannelTemplate = null,
+                                                                                 bool? notificationsInvitedToChannelEnabled = null,
+                                                                                 string notificationsInvitedToChannelTemplate = null,
+                                                                                 Uri preWebhookUrl = null,
+                                                                                 Uri postWebhookUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhookMethod = null,
+                                                                                 List<string> webhookFilters = null,
+                                                                                 Uri webhooksOnMessageSendUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMessageSendMethod = null,
+                                                                                 Uri webhooksOnMessageUpdateUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMessageUpdateMethod = null,
+                                                                                 Uri webhooksOnMessageRemoveUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMessageRemoveMethod = null,
+                                                                                 Uri webhooksOnChannelAddUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnChannelAddMethod = null,
+                                                                                 Uri webhooksOnChannelDestroyUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnChannelDestroyMethod = null,
+                                                                                 Uri webhooksOnChannelUpdateUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnChannelUpdateMethod = null,
+                                                                                 Uri webhooksOnMemberAddUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMemberAddMethod = null,
+                                                                                 Uri webhooksOnMemberRemoveUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMemberRemoveMethod = null,
+                                                                                 Uri webhooksOnMessageSentUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMessageSentMethod = null,
+                                                                                 Uri webhooksOnMessageUpdatedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMessageUpdatedMethod = null,
+                                                                                 Uri webhooksOnMessageRemovedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMessageRemovedMethod = null,
+                                                                                 Uri webhooksOnChannelAddedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnChannelAddedMethod = null,
+                                                                                 Uri webhooksOnChannelDestroyedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnChannelDestroyedMethod = null,
+                                                                                 Uri webhooksOnChannelUpdatedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnChannelUpdatedMethod = null,
+                                                                                 Uri webhooksOnMemberAddedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMemberAddedMethod = null,
+                                                                                 Uri webhooksOnMemberRemovedUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhooksOnMemberRemovedMethod = null,
+                                                                                 int? limitsChannelMembers = null,
+                                                                                 int? limitsUserChannels = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, WebhooksOnMessageSendUrl = webhooksOnMessageSendUrl, WebhooksOnMessageSendMethod = webhooksOnMessageSendMethod, WebhooksOnMessageUpdateUrl = webhooksOnMessageUpdateUrl, WebhooksOnMessageUpdateMethod = webhooksOnMessageUpdateMethod, WebhooksOnMessageRemoveUrl = webhooksOnMessageRemoveUrl, WebhooksOnMessageRemoveMethod = webhooksOnMessageRemoveMethod, WebhooksOnChannelAddUrl = webhooksOnChannelAddUrl, WebhooksOnChannelAddMethod = webhooksOnChannelAddMethod, WebhooksOnChannelDestroyUrl = webhooksOnChannelDestroyUrl, WebhooksOnChannelDestroyMethod = webhooksOnChannelDestroyMethod, WebhooksOnChannelUpdateUrl = webhooksOnChannelUpdateUrl, WebhooksOnChannelUpdateMethod = webhooksOnChannelUpdateMethod, WebhooksOnMemberAddUrl = webhooksOnMemberAddUrl, WebhooksOnMemberAddMethod = webhooksOnMemberAddMethod, WebhooksOnMemberRemoveUrl = webhooksOnMemberRemoveUrl, WebhooksOnMemberRemoveMethod = webhooksOnMemberRemoveMethod, WebhooksOnMessageSentUrl = webhooksOnMessageSentUrl, WebhooksOnMessageSentMethod = webhooksOnMessageSentMethod, WebhooksOnMessageUpdatedUrl = webhooksOnMessageUpdatedUrl, WebhooksOnMessageUpdatedMethod = webhooksOnMessageUpdatedMethod, WebhooksOnMessageRemovedUrl = webhooksOnMessageRemovedUrl, WebhooksOnMessageRemovedMethod = webhooksOnMessageRemovedMethod, WebhooksOnChannelAddedUrl = webhooksOnChannelAddedUrl, WebhooksOnChannelAddedMethod = webhooksOnChannelAddedMethod, WebhooksOnChannelDestroyedUrl = webhooksOnChannelDestroyedUrl, WebhooksOnChannelDestroyedMethod = webhooksOnChannelDestroyedMethod, WebhooksOnChannelUpdatedUrl = webhooksOnChannelUpdatedUrl, WebhooksOnChannelUpdatedMethod = webhooksOnChannelUpdatedMethod, WebhooksOnMemberAddedUrl = webhooksOnMemberAddedUrl, WebhooksOnMemberAddedMethod = webhooksOnMemberAddedMethod, WebhooksOnMemberRemovedUrl = webhooksOnMemberRemovedUrl, WebhooksOnMemberRemovedMethod = webhooksOnMemberRemovedMethod, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ServiceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ServiceResource object represented by the provided JSON </returns>
+    public static ServiceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ServiceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The default_service_role_sid
+    /// </summary>
+    [JsonProperty("default_service_role_sid")]
+    public string DefaultServiceRoleSid { get; private set; }
+    /// <summary>
+    /// The default_channel_role_sid
+    /// </summary>
+    [JsonProperty("default_channel_role_sid")]
+    public string DefaultChannelRoleSid { get; private set; }
+    /// <summary>
+    /// The default_channel_creator_role_sid
+    /// </summary>
+    [JsonProperty("default_channel_creator_role_sid")]
+    public string DefaultChannelCreatorRoleSid { get; private set; }
+    /// <summary>
+    /// The read_status_enabled
+    /// </summary>
+    [JsonProperty("read_status_enabled")]
+    public bool? ReadStatusEnabled { get; private set; }
+    /// <summary>
+    /// The reachability_enabled
+    /// </summary>
+    [JsonProperty("reachability_enabled")]
+    public bool? ReachabilityEnabled { get; private set; }
+    /// <summary>
+    /// The typing_indicator_timeout
+    /// </summary>
+    [JsonProperty("typing_indicator_timeout")]
+    public int? TypingIndicatorTimeout { get; private set; }
+    /// <summary>
+    /// The consumption_report_interval
+    /// </summary>
+    [JsonProperty("consumption_report_interval")]
+    public int? ConsumptionReportInterval { get; private set; }
+    /// <summary>
+    /// The limits
+    /// </summary>
+    [JsonProperty("limits")]
+    public object Limits { get; private set; }
+    /// <summary>
+    /// The webhooks
+    /// </summary>
+    [JsonProperty("webhooks")]
+    public object Webhooks { get; private set; }
+    /// <summary>
+    /// The pre_webhook_url
+    /// </summary>
+    [JsonProperty("pre_webhook_url")]
+    public string PreWebhookUrl { get; private set; }
+    /// <summary>
+    /// The post_webhook_url
+    /// </summary>
+    [JsonProperty("post_webhook_url")]
+    public string PostWebhookUrl { get; private set; }
+    /// <summary>
+    /// The webhook_method
+    /// </summary>
+    [JsonProperty("webhook_method")]
+    public string WebhookMethod { get; private set; }
+    /// <summary>
+    /// The webhook_filters
+    /// </summary>
+    [JsonProperty("webhook_filters")]
+    public List<string> WebhookFilters { get; private set; }
+    /// <summary>
+    /// The notifications
+    /// </summary>
+    [JsonProperty("notifications")]
+    public object Notifications { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ServiceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/CredentialOptions.cs b/src/Twilio/Rest/IpMessaging/V2/CredentialOptions.cs
index 23d963ee5..31b7fddf3 100644
--- a/src/Twilio/Rest/IpMessaging/V2/CredentialOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/CredentialOptions.cs
@@ -9,255 +9,255 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V2
-{
-
+{
+
+  /// <summary>
+  /// ReadCredentialOptions
+  /// </summary>
+  public class ReadCredentialOptions : ReadOptions<CredentialResource>
+  {
     /// <summary>
-    /// ReadCredentialOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadCredentialOptions : ReadOptions<CredentialResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateCredentialOptions
+  /// </summary>
+  public class CreateCredentialOptions : IOptions<CredentialResource>
+  {
     /// <summary>
-    /// CreateCredentialOptions
+    /// The type
     /// </summary>
-    public class CreateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The type
-        /// </summary>
-        public CredentialResource.PushServiceEnum Type { get; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The certificate
-        /// </summary>
-        public string Certificate { get; set; }
-        /// <summary>
-        /// The private_key
-        /// </summary>
-        public string PrivateKey { get; set; }
-        /// <summary>
-        /// The sandbox
-        /// </summary>
-        public bool? Sandbox { get; set; }
-        /// <summary>
-        /// The api_key
-        /// </summary>
-        public string ApiKey { get; set; }
-        /// <summary>
-        /// The secret
-        /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCredentialOptions
-        /// </summary>
-        /// <param name="type"> The type </param>
-        public CreateCredentialOptions(CredentialResource.PushServiceEnum type)
-        {
-            Type = type;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Certificate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
-            }
-
-            if (PrivateKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
-            }
-
-            if (Sandbox != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
-            }
-
-            if (ApiKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
-            }
-
-            if (Secret != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secret", Secret));
-            }
-
-            return p;
-        }
-    }
-
+    public CredentialResource.PushServiceEnum Type { get; }
     /// <summary>
-    /// FetchCredentialOptions
+    /// The friendly_name
     /// </summary>
-    public class FetchCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public FetchCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// UpdateCredentialOptions
+    /// The certificate
     /// </summary>
-    public class UpdateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The certificate
-        /// </summary>
-        public string Certificate { get; set; }
-        /// <summary>
-        /// The private_key
-        /// </summary>
-        public string PrivateKey { get; set; }
-        /// <summary>
-        /// The sandbox
-        /// </summary>
-        public bool? Sandbox { get; set; }
-        /// <summary>
-        /// The api_key
-        /// </summary>
-        public string ApiKey { get; set; }
-        /// <summary>
-        /// The secret
-        /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Certificate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
-            }
-
-            if (PrivateKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
-            }
-
-            if (Sandbox != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
-            }
-
-            if (ApiKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
-            }
-
-            if (Secret != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secret", Secret));
-            }
-
-            return p;
-        }
-    }
-
+    public string Certificate { get; set; }
     /// <summary>
-    /// DeleteCredentialOptions
+    /// The private_key
     /// </summary>
-    public class DeleteCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PrivateKey { get; set; }
+    /// <summary>
+    /// The sandbox
+    /// </summary>
+    public bool? Sandbox { get; set; }
+    /// <summary>
+    /// The api_key
+    /// </summary>
+    public string ApiKey { get; set; }
+    /// <summary>
+    /// The secret
+    /// </summary>
+    public string Secret { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCredentialOptions
+    /// </summary>
+    /// <param name="type"> The type </param>
+    public CreateCredentialOptions(CredentialResource.PushServiceEnum type)
+    {
+      Type = type;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Certificate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
+      }
+
+      if (PrivateKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
+      }
+
+      if (Sandbox != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
+      }
+
+      if (ApiKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
+      }
+
+      if (Secret != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secret", Secret));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchCredentialOptions
+  /// </summary>
+  public class FetchCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public FetchCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateCredentialOptions
+  /// </summary>
+  public class UpdateCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The certificate
+    /// </summary>
+    public string Certificate { get; set; }
+    /// <summary>
+    /// The private_key
+    /// </summary>
+    public string PrivateKey { get; set; }
+    /// <summary>
+    /// The sandbox
+    /// </summary>
+    public bool? Sandbox { get; set; }
+    /// <summary>
+    /// The api_key
+    /// </summary>
+    public string ApiKey { get; set; }
+    /// <summary>
+    /// The secret
+    /// </summary>
+    public string Secret { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Certificate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
+      }
+
+      if (PrivateKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
+      }
+
+      if (Sandbox != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
+      }
+
+      if (ApiKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
+      }
+
+      if (Secret != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secret", Secret));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteCredentialOptions
+  /// </summary>
+  public class DeleteCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/CredentialResource.cs b/src/Twilio/Rest/IpMessaging/V2/CredentialResource.cs
index 156dfadd0..5c0322e86 100644
--- a/src/Twilio/Rest/IpMessaging/V2/CredentialResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/CredentialResource.cs
@@ -17,534 +17,534 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V2
-{
-
-    public class CredentialResource : Resource
-    {
-        public sealed class PushServiceEnum : StringEnum
-        {
-            private PushServiceEnum(string value) : base(value) {}
-            public PushServiceEnum() {}
-            public static implicit operator PushServiceEnum(string value)
-            {
-                return new PushServiceEnum(value);
-            }
-
-            public static readonly PushServiceEnum Gcm = new PushServiceEnum("gcm");
-            public static readonly PushServiceEnum Apn = new PushServiceEnum("apn");
-            public static readonly PushServiceEnum Fcm = new PushServiceEnum("fcm");
-        }
-
-        private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Credentials",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Credentials",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="type"> The type </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="certificate"> The certificate </param>
-        /// <param name="privateKey"> The private_key </param>
-        /// <param name="sandbox"> The sandbox </param>
-        /// <param name="apiKey"> The api_key </param>
-        /// <param name="secret"> The secret </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(CredentialResource.PushServiceEnum type,
-                                                string friendlyName = null,
-                                                string certificate = null,
-                                                string privateKey = null,
-                                                bool? sandbox = null,
-                                                string apiKey = null,
-                                                string secret = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(type){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="type"> The type </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="certificate"> The certificate </param>
-        /// <param name="privateKey"> The private_key </param>
-        /// <param name="sandbox"> The sandbox </param>
-        /// <param name="apiKey"> The api_key </param>
-        /// <param name="secret"> The secret </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CredentialResource.PushServiceEnum type,
-                                                                                        string friendlyName = null,
-                                                                                        string certificate = null,
-                                                                                        string privateKey = null,
-                                                                                        bool? sandbox = null,
-                                                                                        string apiKey = null,
-                                                                                        string secret = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(type){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Credentials/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Credentials/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="certificate"> The certificate </param>
-        /// <param name="privateKey"> The private_key </param>
-        /// <param name="sandbox"> The sandbox </param>
-        /// <param name="apiKey"> The api_key </param>
-        /// <param name="secret"> The secret </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(string pathSid,
-                                                string friendlyName = null,
-                                                string certificate = null,
-                                                string privateKey = null,
-                                                bool? sandbox = null,
-                                                string apiKey = null,
-                                                string secret = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathSid){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="certificate"> The certificate </param>
-        /// <param name="privateKey"> The private_key </param>
-        /// <param name="sandbox"> The sandbox </param>
-        /// <param name="apiKey"> The api_key </param>
-        /// <param name="secret"> The secret </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathSid,
-                                                                                        string friendlyName = null,
-                                                                                        string certificate = null,
-                                                                                        string privateKey = null,
-                                                                                        bool? sandbox = null,
-                                                                                        string apiKey = null,
-                                                                                        string secret = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathSid){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v2/Credentials/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CredentialResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CredentialResource object represented by the provided JSON </returns>
-        public static CredentialResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CredentialResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CredentialResource.PushServiceEnum Type { get; private set; }
-        /// <summary>
-        /// The sandbox
-        /// </summary>
-        [JsonProperty("sandbox")]
-        public string Sandbox { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CredentialResource()
-        {
-
-        }
-    }
+{
+
+  public class CredentialResource : Resource
+  {
+    public sealed class PushServiceEnum : StringEnum
+    {
+      private PushServiceEnum(string value) : base(value) { }
+      public PushServiceEnum() { }
+      public static implicit operator PushServiceEnum(string value)
+      {
+        return new PushServiceEnum(value);
+      }
+
+      public static readonly PushServiceEnum Gcm = new PushServiceEnum("gcm");
+      public static readonly PushServiceEnum Apn = new PushServiceEnum("apn");
+      public static readonly PushServiceEnum Fcm = new PushServiceEnum("fcm");
+    }
+
+    private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Credentials",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Credentials",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="type"> The type </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="certificate"> The certificate </param>
+    /// <param name="privateKey"> The private_key </param>
+    /// <param name="sandbox"> The sandbox </param>
+    /// <param name="apiKey"> The api_key </param>
+    /// <param name="secret"> The secret </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(CredentialResource.PushServiceEnum type,
+                                            string friendlyName = null,
+                                            string certificate = null,
+                                            string privateKey = null,
+                                            bool? sandbox = null,
+                                            string apiKey = null,
+                                            string secret = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(type) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="type"> The type </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="certificate"> The certificate </param>
+    /// <param name="privateKey"> The private_key </param>
+    /// <param name="sandbox"> The sandbox </param>
+    /// <param name="apiKey"> The api_key </param>
+    /// <param name="secret"> The secret </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CredentialResource.PushServiceEnum type,
+                                                                                    string friendlyName = null,
+                                                                                    string certificate = null,
+                                                                                    string privateKey = null,
+                                                                                    bool? sandbox = null,
+                                                                                    string apiKey = null,
+                                                                                    string secret = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(type) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Credentials/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Credentials/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="certificate"> The certificate </param>
+    /// <param name="privateKey"> The private_key </param>
+    /// <param name="sandbox"> The sandbox </param>
+    /// <param name="apiKey"> The api_key </param>
+    /// <param name="secret"> The secret </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(string pathSid,
+                                            string friendlyName = null,
+                                            string certificate = null,
+                                            string privateKey = null,
+                                            bool? sandbox = null,
+                                            string apiKey = null,
+                                            string secret = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathSid) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="certificate"> The certificate </param>
+    /// <param name="privateKey"> The private_key </param>
+    /// <param name="sandbox"> The sandbox </param>
+    /// <param name="apiKey"> The api_key </param>
+    /// <param name="secret"> The secret </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathSid,
+                                                                                    string friendlyName = null,
+                                                                                    string certificate = null,
+                                                                                    string privateKey = null,
+                                                                                    bool? sandbox = null,
+                                                                                    string apiKey = null,
+                                                                                    string secret = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathSid) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v2/Credentials/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CredentialResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CredentialResource object represented by the provided JSON </returns>
+    public static CredentialResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CredentialResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CredentialResource.PushServiceEnum Type { get; private set; }
+    /// <summary>
+    /// The sandbox
+    /// </summary>
+    [JsonProperty("sandbox")]
+    public string Sandbox { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CredentialResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/BindingOptions.cs b/src/Twilio/Rest/IpMessaging/V2/Service/BindingOptions.cs
index 1e978ee27..be30f44d4 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/BindingOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/BindingOptions.cs
@@ -10,130 +10,130 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// ReadBindingOptions
+  /// </summary>
+  public class ReadBindingOptions : ReadOptions<BindingResource>
+  {
     /// <summary>
-    /// ReadBindingOptions
+    /// The service_sid
     /// </summary>
-    public class ReadBindingOptions : ReadOptions<BindingResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The binding_type
-        /// </summary>
-        public List<BindingResource.BindingTypeEnum> BindingType { get; set; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        public List<string> Identity { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public ReadBindingOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-            BindingType = new List<BindingResource.BindingTypeEnum>();
-            Identity = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (BindingType != null)
-            {
-                p.AddRange(BindingType.Select(prop => new KeyValuePair<string, string>("BindingType", prop.ToString())));
-            }
-
-            if (Identity != null)
-            {
-                p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// FetchBindingOptions
+    /// The binding_type
     /// </summary>
-    public class FetchBindingOptions : IOptions<BindingResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchBindingOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<BindingResource.BindingTypeEnum> BindingType { get; set; }
     /// <summary>
-    /// DeleteBindingOptions
+    /// The identity
     /// </summary>
-    public class DeleteBindingOptions : IOptions<BindingResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteBindingOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<string> Identity { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public ReadBindingOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+      BindingType = new List<BindingResource.BindingTypeEnum>();
+      Identity = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (BindingType != null)
+      {
+        p.AddRange(BindingType.Select(prop => new KeyValuePair<string, string>("BindingType", prop.ToString())));
+      }
+
+      if (Identity != null)
+      {
+        p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchBindingOptions
+  /// </summary>
+  public class FetchBindingOptions : IOptions<BindingResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchBindingOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteBindingOptions
+  /// </summary>
+  public class DeleteBindingOptions : IOptions<BindingResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteBindingOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/BindingResource.cs b/src/Twilio/Rest/IpMessaging/V2/Service/BindingResource.cs
index 65811ce62..ab0775384 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/BindingResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/BindingResource.cs
@@ -17,389 +17,389 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V2.Service
-{
-
-    public class BindingResource : Resource
-    {
-        public sealed class BindingTypeEnum : StringEnum
-        {
-            private BindingTypeEnum(string value) : base(value) {}
-            public BindingTypeEnum() {}
-            public static implicit operator BindingTypeEnum(string value)
-            {
-                return new BindingTypeEnum(value);
-            }
-
-            public static readonly BindingTypeEnum Gcm = new BindingTypeEnum("gcm");
-            public static readonly BindingTypeEnum Apn = new BindingTypeEnum("apn");
-            public static readonly BindingTypeEnum Fcm = new BindingTypeEnum("fcm");
-        }
-
-        private static Request BuildReadRequest(ReadBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Bindings",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static ResourceSet<BindingResource> Read(ReadBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<BindingResource>.FromJson("bindings", response.Content);
-            return new ResourceSet<BindingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(ReadBindingOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<BindingResource>.FromJson("bindings", response.Content);
-            return new ResourceSet<BindingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="bindingType"> The binding_type </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static ResourceSet<BindingResource> Read(string pathServiceSid,
-                                                        List<BindingResource.BindingTypeEnum> bindingType = null,
-                                                        List<string> identity = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadBindingOptions(pathServiceSid){BindingType = bindingType, Identity = identity, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="bindingType"> The binding_type </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(string pathServiceSid,
-                                                                                                List<BindingResource.BindingTypeEnum> bindingType = null,
-                                                                                                List<string> identity = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadBindingOptions(pathServiceSid){BindingType = bindingType, Identity = identity, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<BindingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<BindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<BindingResource> NextPage(Page<BindingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<BindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<BindingResource> PreviousPage(Page<BindingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<BindingResource>.FromJson("bindings", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Bindings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static BindingResource Fetch(FetchBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(FetchBindingOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static BindingResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchBindingOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchBindingOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Bindings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static bool Delete(DeleteBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBindingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteBindingOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteBindingOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a BindingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BindingResource object represented by the provided JSON </returns>
-        public static BindingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BindingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The endpoint
-        /// </summary>
-        [JsonProperty("endpoint")]
-        public string Endpoint { get; private set; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The credential_sid
-        /// </summary>
-        [JsonProperty("credential_sid")]
-        public string CredentialSid { get; private set; }
-        /// <summary>
-        /// The binding_type
-        /// </summary>
-        [JsonProperty("binding_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public BindingResource.BindingTypeEnum BindingType { get; private set; }
-        /// <summary>
-        /// The message_types
-        /// </summary>
-        [JsonProperty("message_types")]
-        public List<string> MessageTypes { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private BindingResource()
-        {
-
-        }
-    }
+{
+
+  public class BindingResource : Resource
+  {
+    public sealed class BindingTypeEnum : StringEnum
+    {
+      private BindingTypeEnum(string value) : base(value) { }
+      public BindingTypeEnum() { }
+      public static implicit operator BindingTypeEnum(string value)
+      {
+        return new BindingTypeEnum(value);
+      }
+
+      public static readonly BindingTypeEnum Gcm = new BindingTypeEnum("gcm");
+      public static readonly BindingTypeEnum Apn = new BindingTypeEnum("apn");
+      public static readonly BindingTypeEnum Fcm = new BindingTypeEnum("fcm");
+    }
+
+    private static Request BuildReadRequest(ReadBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Bindings",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static ResourceSet<BindingResource> Read(ReadBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<BindingResource>.FromJson("bindings", response.Content);
+      return new ResourceSet<BindingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(ReadBindingOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<BindingResource>.FromJson("bindings", response.Content);
+      return new ResourceSet<BindingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="bindingType"> The binding_type </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static ResourceSet<BindingResource> Read(string pathServiceSid,
+                                                    List<BindingResource.BindingTypeEnum> bindingType = null,
+                                                    List<string> identity = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadBindingOptions(pathServiceSid) { BindingType = bindingType, Identity = identity, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="bindingType"> The binding_type </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(string pathServiceSid,
+                                                                                            List<BindingResource.BindingTypeEnum> bindingType = null,
+                                                                                            List<string> identity = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadBindingOptions(pathServiceSid) { BindingType = bindingType, Identity = identity, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<BindingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<BindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<BindingResource> NextPage(Page<BindingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<BindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<BindingResource> PreviousPage(Page<BindingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<BindingResource>.FromJson("bindings", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Bindings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static BindingResource Fetch(FetchBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(FetchBindingOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static BindingResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchBindingOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(string pathServiceSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchBindingOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Bindings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static bool Delete(DeleteBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBindingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteBindingOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteBindingOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a BindingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BindingResource object represented by the provided JSON </returns>
+    public static BindingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BindingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The endpoint
+    /// </summary>
+    [JsonProperty("endpoint")]
+    public string Endpoint { get; private set; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The credential_sid
+    /// </summary>
+    [JsonProperty("credential_sid")]
+    public string CredentialSid { get; private set; }
+    /// <summary>
+    /// The binding_type
+    /// </summary>
+    [JsonProperty("binding_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public BindingResource.BindingTypeEnum BindingType { get; private set; }
+    /// <summary>
+    /// The message_types
+    /// </summary>
+    [JsonProperty("message_types")]
+    public List<string> MessageTypes { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private BindingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/InviteOptions.cs b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/InviteOptions.cs
index 3e43515b8..46e2412f9 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/InviteOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/InviteOptions.cs
@@ -10,193 +10,193 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V2.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// FetchInviteOptions
+  /// </summary>
+  public class FetchInviteOptions : IOptions<InviteResource>
+  {
     /// <summary>
-    /// FetchInviteOptions
-    /// </summary>
-    public class FetchInviteOptions : IOptions<InviteResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// CreateInviteOptions
-    /// </summary>
-    public class CreateInviteOptions : IOptions<InviteResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        public string RoleSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        public CreateInviteOptions(string pathServiceSid, string pathChannelSid, string identity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
     /// <summary>
-    /// ReadInviteOptions
-    /// </summary>
-    public class ReadInviteOptions : ReadOptions<InviteResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        public List<string> Identity { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        public ReadInviteOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteInviteOptions
-    /// </summary>
-    public class DeleteInviteOptions : IOptions<InviteResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteInviteOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new FetchInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateInviteOptions
+  /// </summary>
+  public class CreateInviteOptions : IOptions<InviteResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    public string RoleSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    public CreateInviteOptions(string pathServiceSid, string pathChannelSid, string identity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadInviteOptions
+  /// </summary>
+  public class ReadInviteOptions : ReadOptions<InviteResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    public List<string> Identity { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    public ReadInviteOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteInviteOptions
+  /// </summary>
+  public class DeleteInviteOptions : IOptions<InviteResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteInviteOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteInviteOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/InviteResource.cs b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/InviteResource.cs
index e2b262eea..78a8b8e51 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/InviteResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/InviteResource.cs
@@ -16,456 +16,456 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.IpMessaging.V2.Service.Channel
-{
-
-    public class InviteResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Fetch(FetchInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(FetchInviteOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Fetch(string pathServiceSid,
-                                           string pathChannelSid,
-                                           string pathSid,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(string pathServiceSid,
-                                                                                   string pathChannelSid,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Create(CreateInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(CreateInviteOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static InviteResource Create(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string identity,
-                                            string roleSid = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string identity,
-                                                                                    string roleSid = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static ResourceSet<InviteResource> Read(ReadInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<InviteResource>.FromJson("invites", response.Content);
-            return new ResourceSet<InviteResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(ReadInviteOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<InviteResource>.FromJson("invites", response.Content);
-            return new ResourceSet<InviteResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static ResourceSet<InviteResource> Read(string pathServiceSid,
-                                                       string pathChannelSid,
-                                                       List<string> identity = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadInviteOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(string pathServiceSid,
-                                                                                               string pathChannelSid,
-                                                                                               List<string> identity = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadInviteOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<InviteResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<InviteResource>.FromJson("invites", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<InviteResource> NextPage(Page<InviteResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<InviteResource>.FromJson("invites", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<InviteResource> PreviousPage(Page<InviteResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<InviteResource>.FromJson("invites", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteInviteOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static bool Delete(DeleteInviteOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Invite parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteInviteOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Invite </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Invite </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a InviteResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> InviteResource object represented by the provided JSON </returns>
-        public static InviteResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<InviteResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The created_by
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private InviteResource()
-        {
-
-        }
-    }
+{
+
+  public class InviteResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Fetch(FetchInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(FetchInviteOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Fetch(string pathServiceSid,
+                                       string pathChannelSid,
+                                       string pathSid,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> FetchAsync(string pathServiceSid,
+                                                                               string pathChannelSid,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Create(CreateInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(CreateInviteOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static InviteResource Create(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string identity,
+                                        string roleSid = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<InviteResource> CreateAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string identity,
+                                                                                string roleSid = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateInviteOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static ResourceSet<InviteResource> Read(ReadInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<InviteResource>.FromJson("invites", response.Content);
+      return new ResourceSet<InviteResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(ReadInviteOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<InviteResource>.FromJson("invites", response.Content);
+      return new ResourceSet<InviteResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static ResourceSet<InviteResource> Read(string pathServiceSid,
+                                                   string pathChannelSid,
+                                                   List<string> identity = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadInviteOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InviteResource>> ReadAsync(string pathServiceSid,
+                                                                                           string pathChannelSid,
+                                                                                           List<string> identity = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadInviteOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<InviteResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<InviteResource>.FromJson("invites", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<InviteResource> NextPage(Page<InviteResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<InviteResource>.FromJson("invites", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<InviteResource> PreviousPage(Page<InviteResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<InviteResource>.FromJson("invites", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteInviteOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Invites/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static bool Delete(DeleteInviteOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Invite parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteInviteOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Invite </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Invite </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteInviteOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a InviteResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> InviteResource object represented by the provided JSON </returns>
+    public static InviteResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<InviteResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The created_by
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private InviteResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MemberOptions.cs b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MemberOptions.cs
index eeca6d9ba..3478f8f53 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MemberOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MemberOptions.cs
@@ -10,387 +10,387 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V2.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// FetchMemberOptions
+  /// </summary>
+  public class FetchMemberOptions : IOptions<MemberResource>
+  {
     /// <summary>
-    /// FetchMemberOptions
-    /// </summary>
-    public class FetchMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// CreateMemberOptions
-    /// </summary>
-    public class CreateMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The last_consumed_message_index
-        /// </summary>
-        public int? LastConsumedMessageIndex { get; set; }
-        /// <summary>
-        /// The last_consumption_timestamp
-        /// </summary>
-        public DateTime? LastConsumptionTimestamp { get; set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MemberResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        public CreateMemberOptions(string pathServiceSid, string pathChannelSid, string identity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (LastConsumedMessageIndex != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
-            }
-
-            if (LastConsumptionTimestamp != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumptionTimestamp", Serializers.DateTimeIso8601(LastConsumptionTimestamp)));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
     /// <summary>
-    /// ReadMemberOptions
-    /// </summary>
-    public class ReadMemberOptions : ReadOptions<MemberResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        public List<string> Identity { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        public ReadMemberOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Identity = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteMemberOptions
-    /// </summary>
-    public class DeleteMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MemberResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// UpdateMemberOptions
-    /// </summary>
-    public class UpdateMemberOptions : IOptions<MemberResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The last_consumed_message_index
-        /// </summary>
-        public int? LastConsumedMessageIndex { get; set; }
-        /// <summary>
-        /// The last_consumption_timestamp
-        /// </summary>
-        public DateTime? LastConsumptionTimestamp { get; set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MemberResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateMemberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (LastConsumedMessageIndex != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
-            }
-
-            if (LastConsumptionTimestamp != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumptionTimestamp", Serializers.DateTimeIso8601(LastConsumptionTimestamp)));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateMemberOptions
+  /// </summary>
+  public class CreateMemberOptions : IOptions<MemberResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The last_consumed_message_index
+    /// </summary>
+    public int? LastConsumedMessageIndex { get; set; }
+    /// <summary>
+    /// The last_consumption_timestamp
+    /// </summary>
+    public DateTime? LastConsumptionTimestamp { get; set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MemberResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    public CreateMemberOptions(string pathServiceSid, string pathChannelSid, string identity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (LastConsumedMessageIndex != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
+      }
+
+      if (LastConsumptionTimestamp != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumptionTimestamp", Serializers.DateTimeIso8601(LastConsumptionTimestamp)));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadMemberOptions
+  /// </summary>
+  public class ReadMemberOptions : ReadOptions<MemberResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    public List<string> Identity { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    public ReadMemberOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Identity = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteMemberOptions
+  /// </summary>
+  public class DeleteMemberOptions : IOptions<MemberResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MemberResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateMemberOptions
+  /// </summary>
+  public class UpdateMemberOptions : IOptions<MemberResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The last_consumed_message_index
+    /// </summary>
+    public int? LastConsumedMessageIndex { get; set; }
+    /// <summary>
+    /// The last_consumption_timestamp
+    /// </summary>
+    public DateTime? LastConsumptionTimestamp { get; set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MemberResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateMemberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateMemberOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (LastConsumedMessageIndex != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
+      }
+
+      if (LastConsumptionTimestamp != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumptionTimestamp", Serializers.DateTimeIso8601(LastConsumptionTimestamp)));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MemberResource.cs b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MemberResource.cs
index 03c1f58d9..a847e5019 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MemberResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MemberResource.cs
@@ -17,611 +17,611 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V2.Service.Channel
-{
-
-    public class MemberResource : Resource
-    {
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildFetchRequest(FetchMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Fetch(FetchMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(FetchMemberOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Fetch(string pathServiceSid,
-                                           string pathChannelSid,
-                                           string pathSid,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(string pathServiceSid,
-                                                                                   string pathChannelSid,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Create(CreateMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(CreateMemberOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
-        /// <param name="lastConsumptionTimestamp"> The last_consumption_timestamp </param>
-        /// <param name="dateCreated"> The date_created </param>
-        /// <param name="dateUpdated"> The date_updated </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Create(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string identity,
-                                            string roleSid = null,
-                                            int? lastConsumedMessageIndex = null,
-                                            DateTime? lastConsumptionTimestamp = null,
-                                            DateTime? dateCreated = null,
-                                            DateTime? dateUpdated = null,
-                                            string attributes = null,
-                                            MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
-        /// <param name="lastConsumptionTimestamp"> The last_consumption_timestamp </param>
-        /// <param name="dateCreated"> The date_created </param>
-        /// <param name="dateUpdated"> The date_updated </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string identity,
-                                                                                    string roleSid = null,
-                                                                                    int? lastConsumedMessageIndex = null,
-                                                                                    DateTime? lastConsumptionTimestamp = null,
-                                                                                    DateTime? dateCreated = null,
-                                                                                    DateTime? dateUpdated = null,
-                                                                                    string attributes = null,
-                                                                                    MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity){RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static ResourceSet<MemberResource> Read(ReadMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MemberResource>.FromJson("members", response.Content);
-            return new ResourceSet<MemberResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(ReadMemberOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MemberResource>.FromJson("members", response.Content);
-            return new ResourceSet<MemberResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static ResourceSet<MemberResource> Read(string pathServiceSid,
-                                                       string pathChannelSid,
-                                                       List<string> identity = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadMemberOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(string pathServiceSid,
-                                                                                               string pathChannelSid,
-                                                                                               List<string> identity = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadMemberOptions(pathServiceSid, pathChannelSid){Identity = identity, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MemberResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("members", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MemberResource> NextPage(Page<MemberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("members", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MemberResource> PreviousPage(Page<MemberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<MemberResource>.FromJson("members", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static bool Delete(DeleteMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMemberOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateMemberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Update(UpdateMemberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Member parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(UpdateMemberOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
-        /// <param name="lastConsumptionTimestamp"> The last_consumption_timestamp </param>
-        /// <param name="dateCreated"> The date_created </param>
-        /// <param name="dateUpdated"> The date_updated </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Member </returns>
-        public static MemberResource Update(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string pathSid,
-                                            string roleSid = null,
-                                            int? lastConsumedMessageIndex = null,
-                                            DateTime? lastConsumptionTimestamp = null,
-                                            DateTime? dateCreated = null,
-                                            DateTime? dateUpdated = null,
-                                            string attributes = null,
-                                            MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid){RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
-        /// <param name="lastConsumptionTimestamp"> The last_consumption_timestamp </param>
-        /// <param name="dateCreated"> The date_created </param>
-        /// <param name="dateUpdated"> The date_updated </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Member </returns>
-        public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string pathSid,
-                                                                                    string roleSid = null,
-                                                                                    int? lastConsumedMessageIndex = null,
-                                                                                    DateTime? lastConsumptionTimestamp = null,
-                                                                                    DateTime? dateCreated = null,
-                                                                                    DateTime? dateUpdated = null,
-                                                                                    string attributes = null,
-                                                                                    MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid){RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a MemberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MemberResource object represented by the provided JSON </returns>
-        public static MemberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MemberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The last_consumed_message_index
-        /// </summary>
-        [JsonProperty("last_consumed_message_index")]
-        public int? LastConsumedMessageIndex { get; private set; }
-        /// <summary>
-        /// The last_consumption_timestamp
-        /// </summary>
-        [JsonProperty("last_consumption_timestamp")]
-        public DateTime? LastConsumptionTimestamp { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-
-        private MemberResource()
-        {
-
-        }
-    }
+{
+
+  public class MemberResource : Resource
+  {
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildFetchRequest(FetchMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Fetch(FetchMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(FetchMemberOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Fetch(string pathServiceSid,
+                                       string pathChannelSid,
+                                       string pathSid,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> FetchAsync(string pathServiceSid,
+                                                                               string pathChannelSid,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchMemberOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Create(CreateMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(CreateMemberOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
+    /// <param name="lastConsumptionTimestamp"> The last_consumption_timestamp </param>
+    /// <param name="dateCreated"> The date_created </param>
+    /// <param name="dateUpdated"> The date_updated </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Create(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string identity,
+                                        string roleSid = null,
+                                        int? lastConsumedMessageIndex = null,
+                                        DateTime? lastConsumptionTimestamp = null,
+                                        DateTime? dateCreated = null,
+                                        DateTime? dateUpdated = null,
+                                        string attributes = null,
+                                        MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
+    /// <param name="lastConsumptionTimestamp"> The last_consumption_timestamp </param>
+    /// <param name="dateCreated"> The date_created </param>
+    /// <param name="dateUpdated"> The date_updated </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> CreateAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string identity,
+                                                                                string roleSid = null,
+                                                                                int? lastConsumedMessageIndex = null,
+                                                                                DateTime? lastConsumptionTimestamp = null,
+                                                                                DateTime? dateCreated = null,
+                                                                                DateTime? dateUpdated = null,
+                                                                                string attributes = null,
+                                                                                MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateMemberOptions(pathServiceSid, pathChannelSid, identity) { RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static ResourceSet<MemberResource> Read(ReadMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MemberResource>.FromJson("members", response.Content);
+      return new ResourceSet<MemberResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(ReadMemberOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MemberResource>.FromJson("members", response.Content);
+      return new ResourceSet<MemberResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static ResourceSet<MemberResource> Read(string pathServiceSid,
+                                                   string pathChannelSid,
+                                                   List<string> identity = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadMemberOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MemberResource>> ReadAsync(string pathServiceSid,
+                                                                                           string pathChannelSid,
+                                                                                           List<string> identity = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadMemberOptions(pathServiceSid, pathChannelSid) { Identity = identity, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MemberResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("members", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MemberResource> NextPage(Page<MemberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("members", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MemberResource> PreviousPage(Page<MemberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<MemberResource>.FromJson("members", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static bool Delete(DeleteMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMemberOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteMemberOptions(pathServiceSid, pathChannelSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateMemberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Members/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Update(UpdateMemberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Member parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(UpdateMemberOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
+    /// <param name="lastConsumptionTimestamp"> The last_consumption_timestamp </param>
+    /// <param name="dateCreated"> The date_created </param>
+    /// <param name="dateUpdated"> The date_updated </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Member </returns>
+    public static MemberResource Update(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string pathSid,
+                                        string roleSid = null,
+                                        int? lastConsumedMessageIndex = null,
+                                        DateTime? lastConsumptionTimestamp = null,
+                                        DateTime? dateCreated = null,
+                                        DateTime? dateUpdated = null,
+                                        string attributes = null,
+                                        MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid) { RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
+    /// <param name="lastConsumptionTimestamp"> The last_consumption_timestamp </param>
+    /// <param name="dateCreated"> The date_created </param>
+    /// <param name="dateUpdated"> The date_updated </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Member </returns>
+    public static async System.Threading.Tasks.Task<MemberResource> UpdateAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string pathSid,
+                                                                                string roleSid = null,
+                                                                                int? lastConsumedMessageIndex = null,
+                                                                                DateTime? lastConsumptionTimestamp = null,
+                                                                                DateTime? dateCreated = null,
+                                                                                DateTime? dateUpdated = null,
+                                                                                string attributes = null,
+                                                                                MemberResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateMemberOptions(pathServiceSid, pathChannelSid, pathSid) { RoleSid = roleSid, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp, DateCreated = dateCreated, DateUpdated = dateUpdated, Attributes = attributes, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a MemberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MemberResource object represented by the provided JSON </returns>
+    public static MemberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MemberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The last_consumed_message_index
+    /// </summary>
+    [JsonProperty("last_consumed_message_index")]
+    public int? LastConsumedMessageIndex { get; private set; }
+    /// <summary>
+    /// The last_consumption_timestamp
+    /// </summary>
+    [JsonProperty("last_consumption_timestamp")]
+    public DateTime? LastConsumptionTimestamp { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+
+    private MemberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MessageOptions.cs b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MessageOptions.cs
index 7cc37cd2a..088b02c00 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MessageOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MessageOptions.cs
@@ -9,384 +9,384 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V2.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// FetchMessageOptions
+  /// </summary>
+  public class FetchMessageOptions : IOptions<MessageResource>
+  {
     /// <summary>
-    /// FetchMessageOptions
-    /// </summary>
-    public class FetchMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// CreateMessageOptions
-    /// </summary>
-    public class CreateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The from
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// The last_updated_by
-        /// </summary>
-        public string LastUpdatedBy { get; set; }
-        /// <summary>
-        /// The body
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        /// The media_sid
-        /// </summary>
-        public string MediaSid { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        public CreateMessageOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (LastUpdatedBy != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastUpdatedBy", LastUpdatedBy));
-            }
-
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (MediaSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MediaSid", MediaSid.ToString()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
     /// <summary>
-    /// ReadMessageOptions
-    /// </summary>
-    public class ReadMessageOptions : ReadOptions<MessageResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The order
-        /// </summary>
-        public MessageResource.OrderTypeEnum Order { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        public ReadMessageOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Order != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteMessageOptions
-    /// </summary>
-    public class DeleteMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// UpdateMessageOptions
-    /// </summary>
-    public class UpdateMessageOptions : IOptions<MessageResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The body
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// The last_updated_by
-        /// </summary>
-        public string LastUpdatedBy { get; set; }
-        /// <summary>
-        /// The from
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (LastUpdatedBy != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastUpdatedBy", LastUpdatedBy));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateMessageOptions
+  /// </summary>
+  public class CreateMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The from
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// The last_updated_by
+    /// </summary>
+    public string LastUpdatedBy { get; set; }
+    /// <summary>
+    /// The body
+    /// </summary>
+    public string Body { get; set; }
+    /// <summary>
+    /// The media_sid
+    /// </summary>
+    public string MediaSid { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    public CreateMessageOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (LastUpdatedBy != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastUpdatedBy", LastUpdatedBy));
+      }
+
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (MediaSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MediaSid", MediaSid.ToString()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadMessageOptions
+  /// </summary>
+  public class ReadMessageOptions : ReadOptions<MessageResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The order
+    /// </summary>
+    public MessageResource.OrderTypeEnum Order { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    public ReadMessageOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Order != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteMessageOptions
+  /// </summary>
+  public class DeleteMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateMessageOptions
+  /// </summary>
+  public class UpdateMessageOptions : IOptions<MessageResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The body
+    /// </summary>
+    public string Body { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// The last_updated_by
+    /// </summary>
+    public string LastUpdatedBy { get; set; }
+    /// <summary>
+    /// The from
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public MessageResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateMessageOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (LastUpdatedBy != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastUpdatedBy", LastUpdatedBy));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MessageResource.cs b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MessageResource.cs
index 1519d93c3..e6a668ba7 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MessageResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/MessageResource.cs
@@ -17,644 +17,644 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V2.Service.Channel
-{
-
-    public class MessageResource : Resource
-    {
-        public sealed class OrderTypeEnum : StringEnum
-        {
-            private OrderTypeEnum(string value) : base(value) {}
-            public OrderTypeEnum() {}
-            public static implicit operator OrderTypeEnum(string value)
-            {
-                return new OrderTypeEnum(value);
-            }
-
-            public static readonly OrderTypeEnum Asc = new OrderTypeEnum("asc");
-            public static readonly OrderTypeEnum Desc = new OrderTypeEnum("desc");
-        }
-
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Fetch(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string pathSid,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="from"> The from </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="dateCreated"> The date_created </param>
-        /// <param name="dateUpdated"> The date_updated </param>
-        /// <param name="lastUpdatedBy"> The last_updated_by </param>
-        /// <param name="body"> The body </param>
-        /// <param name="mediaSid"> The media_sid </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Create(string pathServiceSid,
-                                             string pathChannelSid,
-                                             string from = null,
-                                             string attributes = null,
-                                             DateTime? dateCreated = null,
-                                             DateTime? dateUpdated = null,
-                                             string lastUpdatedBy = null,
-                                             string body = null,
-                                             string mediaSid = null,
-                                             MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(pathServiceSid, pathChannelSid){From = from, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, Body = body, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="from"> The from </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="dateCreated"> The date_created </param>
-        /// <param name="dateUpdated"> The date_updated </param>
-        /// <param name="lastUpdatedBy"> The last_updated_by </param>
-        /// <param name="body"> The body </param>
-        /// <param name="mediaSid"> The media_sid </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(string pathServiceSid,
-                                                                                     string pathChannelSid,
-                                                                                     string from = null,
-                                                                                     string attributes = null,
-                                                                                     DateTime? dateCreated = null,
-                                                                                     DateTime? dateUpdated = null,
-                                                                                     string lastUpdatedBy = null,
-                                                                                     string body = null,
-                                                                                     string mediaSid = null,
-                                                                                     MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageOptions(pathServiceSid, pathChannelSid){From = from, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, Body = body, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MessageResource>.FromJson("messages", response.Content);
-            return new ResourceSet<MessageResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="order"> The order </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static ResourceSet<MessageResource> Read(string pathServiceSid,
-                                                        string pathChannelSid,
-                                                        MessageResource.OrderTypeEnum order = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(pathServiceSid, pathChannelSid){Order = order, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="order"> The order </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathServiceSid,
-                                                                                                string pathChannelSid,
-                                                                                                MessageResource.OrderTypeEnum order = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageOptions(pathServiceSid, pathChannelSid){Order = order, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageResource>.FromJson("messages", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Message parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="body"> The body </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="dateCreated"> The date_created </param>
-        /// <param name="dateUpdated"> The date_updated </param>
-        /// <param name="lastUpdatedBy"> The last_updated_by </param>
-        /// <param name="from"> The from </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Message </returns>
-        public static MessageResource Update(string pathServiceSid,
-                                             string pathChannelSid,
-                                             string pathSid,
-                                             string body = null,
-                                             string attributes = null,
-                                             DateTime? dateCreated = null,
-                                             DateTime? dateUpdated = null,
-                                             string lastUpdatedBy = null,
-                                             string from = null,
-                                             MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid){Body = body, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, From = from, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="body"> The body </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="dateCreated"> The date_created </param>
-        /// <param name="dateUpdated"> The date_updated </param>
-        /// <param name="lastUpdatedBy"> The last_updated_by </param>
-        /// <param name="from"> The from </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Message </returns>
-        public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathServiceSid,
-                                                                                     string pathChannelSid,
-                                                                                     string pathSid,
-                                                                                     string body = null,
-                                                                                     string attributes = null,
-                                                                                     DateTime? dateCreated = null,
-                                                                                     DateTime? dateUpdated = null,
-                                                                                     string lastUpdatedBy = null,
-                                                                                     string from = null,
-                                                                                     MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid){Body = body, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, From = from, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a MessageResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MessageResource object represented by the provided JSON </returns>
-        public static MessageResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MessageResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The to
-        /// </summary>
-        [JsonProperty("to")]
-        public string To { get; private set; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The last_updated_by
-        /// </summary>
-        [JsonProperty("last_updated_by")]
-        public string LastUpdatedBy { get; private set; }
-        /// <summary>
-        /// The was_edited
-        /// </summary>
-        [JsonProperty("was_edited")]
-        public bool? WasEdited { get; private set; }
-        /// <summary>
-        /// The from
-        /// </summary>
-        [JsonProperty("from")]
-        public string From { get; private set; }
-        /// <summary>
-        /// The body
-        /// </summary>
-        [JsonProperty("body")]
-        public string Body { get; private set; }
-        /// <summary>
-        /// The index
-        /// </summary>
-        [JsonProperty("index")]
-        public int? Index { get; private set; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        [JsonProperty("type")]
-        public string Type { get; private set; }
-        /// <summary>
-        /// The media
-        /// </summary>
-        [JsonProperty("media")]
-        public object Media { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private MessageResource()
-        {
-
-        }
-    }
+{
+
+  public class MessageResource : Resource
+  {
+    public sealed class OrderTypeEnum : StringEnum
+    {
+      private OrderTypeEnum(string value) : base(value) { }
+      public OrderTypeEnum() { }
+      public static implicit operator OrderTypeEnum(string value)
+      {
+        return new OrderTypeEnum(value);
+      }
+
+      public static readonly OrderTypeEnum Asc = new OrderTypeEnum("asc");
+      public static readonly OrderTypeEnum Desc = new OrderTypeEnum("desc");
+    }
+
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildFetchRequest(FetchMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(FetchMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(FetchMessageOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Fetch(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string pathSid,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> FetchAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(CreateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(CreateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="from"> The from </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="dateCreated"> The date_created </param>
+    /// <param name="dateUpdated"> The date_updated </param>
+    /// <param name="lastUpdatedBy"> The last_updated_by </param>
+    /// <param name="body"> The body </param>
+    /// <param name="mediaSid"> The media_sid </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Create(string pathServiceSid,
+                                         string pathChannelSid,
+                                         string from = null,
+                                         string attributes = null,
+                                         DateTime? dateCreated = null,
+                                         DateTime? dateUpdated = null,
+                                         string lastUpdatedBy = null,
+                                         string body = null,
+                                         string mediaSid = null,
+                                         MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(pathServiceSid, pathChannelSid) { From = from, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, Body = body, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="from"> The from </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="dateCreated"> The date_created </param>
+    /// <param name="dateUpdated"> The date_updated </param>
+    /// <param name="lastUpdatedBy"> The last_updated_by </param>
+    /// <param name="body"> The body </param>
+    /// <param name="mediaSid"> The media_sid </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> CreateAsync(string pathServiceSid,
+                                                                                 string pathChannelSid,
+                                                                                 string from = null,
+                                                                                 string attributes = null,
+                                                                                 DateTime? dateCreated = null,
+                                                                                 DateTime? dateUpdated = null,
+                                                                                 string lastUpdatedBy = null,
+                                                                                 string body = null,
+                                                                                 string mediaSid = null,
+                                                                                 MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageOptions(pathServiceSid, pathChannelSid) { From = from, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, Body = body, MediaSid = mediaSid, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(ReadMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(ReadMessageOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MessageResource>.FromJson("messages", response.Content);
+      return new ResourceSet<MessageResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="order"> The order </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static ResourceSet<MessageResource> Read(string pathServiceSid,
+                                                    string pathChannelSid,
+                                                    MessageResource.OrderTypeEnum order = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions(pathServiceSid, pathChannelSid) { Order = order, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="order"> The order </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageResource>> ReadAsync(string pathServiceSid,
+                                                                                            string pathChannelSid,
+                                                                                            MessageResource.OrderTypeEnum order = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageOptions(pathServiceSid, pathChannelSid) { Order = order, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MessageResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MessageResource> NextPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MessageResource> PreviousPage(Page<MessageResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageResource>.FromJson("messages", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(DeleteMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessageOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessageOptions(pathServiceSid, pathChannelSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Messages/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(UpdateMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Message parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(UpdateMessageOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="body"> The body </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="dateCreated"> The date_created </param>
+    /// <param name="dateUpdated"> The date_updated </param>
+    /// <param name="lastUpdatedBy"> The last_updated_by </param>
+    /// <param name="from"> The from </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Message </returns>
+    public static MessageResource Update(string pathServiceSid,
+                                         string pathChannelSid,
+                                         string pathSid,
+                                         string body = null,
+                                         string attributes = null,
+                                         DateTime? dateCreated = null,
+                                         DateTime? dateUpdated = null,
+                                         string lastUpdatedBy = null,
+                                         string from = null,
+                                         MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid) { Body = body, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, From = from, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="body"> The body </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="dateCreated"> The date_created </param>
+    /// <param name="dateUpdated"> The date_updated </param>
+    /// <param name="lastUpdatedBy"> The last_updated_by </param>
+    /// <param name="from"> The from </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Message </returns>
+    public static async System.Threading.Tasks.Task<MessageResource> UpdateAsync(string pathServiceSid,
+                                                                                 string pathChannelSid,
+                                                                                 string pathSid,
+                                                                                 string body = null,
+                                                                                 string attributes = null,
+                                                                                 DateTime? dateCreated = null,
+                                                                                 DateTime? dateUpdated = null,
+                                                                                 string lastUpdatedBy = null,
+                                                                                 string from = null,
+                                                                                 MessageResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessageOptions(pathServiceSid, pathChannelSid, pathSid) { Body = body, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, LastUpdatedBy = lastUpdatedBy, From = from, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a MessageResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MessageResource object represented by the provided JSON </returns>
+    public static MessageResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MessageResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The to
+    /// </summary>
+    [JsonProperty("to")]
+    public string To { get; private set; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The last_updated_by
+    /// </summary>
+    [JsonProperty("last_updated_by")]
+    public string LastUpdatedBy { get; private set; }
+    /// <summary>
+    /// The was_edited
+    /// </summary>
+    [JsonProperty("was_edited")]
+    public bool? WasEdited { get; private set; }
+    /// <summary>
+    /// The from
+    /// </summary>
+    [JsonProperty("from")]
+    public string From { get; private set; }
+    /// <summary>
+    /// The body
+    /// </summary>
+    [JsonProperty("body")]
+    public string Body { get; private set; }
+    /// <summary>
+    /// The index
+    /// </summary>
+    [JsonProperty("index")]
+    public int? Index { get; private set; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    [JsonProperty("type")]
+    public string Type { get; private set; }
+    /// <summary>
+    /// The media
+    /// </summary>
+    [JsonProperty("media")]
+    public object Media { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private MessageResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/WebhookOptions.cs b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/WebhookOptions.cs
index 285961423..a2de4e3bd 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/WebhookOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/WebhookOptions.cs
@@ -10,327 +10,327 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V2.Service.Channel
-{
-
+{
+
+  /// <summary>
+  /// ReadWebhookOptions
+  /// </summary>
+  public class ReadWebhookOptions : ReadOptions<WebhookResource>
+  {
     /// <summary>
-    /// ReadWebhookOptions
-    /// </summary>
-    public class ReadWebhookOptions : ReadOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        public ReadWebhookOptions(string pathServiceSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// FetchWebhookOptions
-    /// </summary>
-    public class FetchWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchWebhookOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+
     /// <summary>
-    /// CreateWebhookOptions
-    /// </summary>
-    public class CreateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        public WebhookResource.TypeEnum Type { get; }
-        /// <summary>
-        /// The configuration.url
-        /// </summary>
-        public string ConfigurationUrl { get; set; }
-        /// <summary>
-        /// The configuration.method
-        /// </summary>
-        public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
-        /// <summary>
-        /// The configuration.filters
-        /// </summary>
-        public List<string> ConfigurationFilters { get; set; }
-        /// <summary>
-        /// The configuration.triggers
-        /// </summary>
-        public List<string> ConfigurationTriggers { get; set; }
-        /// <summary>
-        /// The configuration.flow_sid
-        /// </summary>
-        public string ConfigurationFlowSid { get; set; }
-        /// <summary>
-        /// The configuration.retry_count
-        /// </summary>
-        public int? ConfigurationRetryCount { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="type"> The type </param>
-        public CreateWebhookOptions(string pathServiceSid, string pathChannelSid, WebhookResource.TypeEnum type)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            Type = type;
-            ConfigurationFilters = new List<string>();
-            ConfigurationTriggers = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (ConfigurationUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
-            }
-
-            if (ConfigurationMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
-            }
-
-            if (ConfigurationFilters != null)
-            {
-                p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
-            }
-
-            if (ConfigurationTriggers != null)
-            {
-                p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
-            }
-
-            if (ConfigurationFlowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
-            }
-
-            if (ConfigurationRetryCount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.RetryCount", ConfigurationRetryCount.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new ReadWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    public ReadWebhookOptions(string pathServiceSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+    }
+
     /// <summary>
-    /// UpdateWebhookOptions
-    /// </summary>
-    public class UpdateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The configuration.url
-        /// </summary>
-        public string ConfigurationUrl { get; set; }
-        /// <summary>
-        /// The configuration.method
-        /// </summary>
-        public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
-        /// <summary>
-        /// The configuration.filters
-        /// </summary>
-        public List<string> ConfigurationFilters { get; set; }
-        /// <summary>
-        /// The configuration.triggers
-        /// </summary>
-        public List<string> ConfigurationTriggers { get; set; }
-        /// <summary>
-        /// The configuration.flow_sid
-        /// </summary>
-        public string ConfigurationFlowSid { get; set; }
-        /// <summary>
-        /// The configuration.retry_count
-        /// </summary>
-        public int? ConfigurationRetryCount { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateWebhookOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-            ConfigurationFilters = new List<string>();
-            ConfigurationTriggers = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ConfigurationUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
-            }
-
-            if (ConfigurationMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
-            }
-
-            if (ConfigurationFilters != null)
-            {
-                p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
-            }
-
-            if (ConfigurationTriggers != null)
-            {
-                p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
-            }
-
-            if (ConfigurationFlowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
-            }
-
-            if (ConfigurationRetryCount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration.RetryCount", ConfigurationRetryCount.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchWebhookOptions
+  /// </summary>
+  public class FetchWebhookOptions : IOptions<WebhookResource>
+  {
     /// <summary>
-    /// DeleteWebhookOptions
-    /// </summary>
-    public class DeleteWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteWebhookOptions(string pathServiceSid, string pathChannelSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathChannelSid = pathChannelSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchWebhookOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateWebhookOptions
+  /// </summary>
+  public class CreateWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    public WebhookResource.TypeEnum Type { get; }
+    /// <summary>
+    /// The configuration.url
+    /// </summary>
+    public string ConfigurationUrl { get; set; }
+    /// <summary>
+    /// The configuration.method
+    /// </summary>
+    public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
+    /// <summary>
+    /// The configuration.filters
+    /// </summary>
+    public List<string> ConfigurationFilters { get; set; }
+    /// <summary>
+    /// The configuration.triggers
+    /// </summary>
+    public List<string> ConfigurationTriggers { get; set; }
+    /// <summary>
+    /// The configuration.flow_sid
+    /// </summary>
+    public string ConfigurationFlowSid { get; set; }
+    /// <summary>
+    /// The configuration.retry_count
+    /// </summary>
+    public int? ConfigurationRetryCount { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="type"> The type </param>
+    public CreateWebhookOptions(string pathServiceSid, string pathChannelSid, WebhookResource.TypeEnum type)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      Type = type;
+      ConfigurationFilters = new List<string>();
+      ConfigurationTriggers = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (ConfigurationUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
+      }
+
+      if (ConfigurationMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
+      }
+
+      if (ConfigurationFilters != null)
+      {
+        p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
+      }
+
+      if (ConfigurationTriggers != null)
+      {
+        p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
+      }
+
+      if (ConfigurationFlowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
+      }
+
+      if (ConfigurationRetryCount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.RetryCount", ConfigurationRetryCount.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateWebhookOptions
+  /// </summary>
+  public class UpdateWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The configuration.url
+    /// </summary>
+    public string ConfigurationUrl { get; set; }
+    /// <summary>
+    /// The configuration.method
+    /// </summary>
+    public WebhookResource.MethodEnum ConfigurationMethod { get; set; }
+    /// <summary>
+    /// The configuration.filters
+    /// </summary>
+    public List<string> ConfigurationFilters { get; set; }
+    /// <summary>
+    /// The configuration.triggers
+    /// </summary>
+    public List<string> ConfigurationTriggers { get; set; }
+    /// <summary>
+    /// The configuration.flow_sid
+    /// </summary>
+    public string ConfigurationFlowSid { get; set; }
+    /// <summary>
+    /// The configuration.retry_count
+    /// </summary>
+    public int? ConfigurationRetryCount { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateWebhookOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+      ConfigurationFilters = new List<string>();
+      ConfigurationTriggers = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ConfigurationUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Url", ConfigurationUrl));
+      }
+
+      if (ConfigurationMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.Method", ConfigurationMethod.ToString()));
+      }
+
+      if (ConfigurationFilters != null)
+      {
+        p.AddRange(ConfigurationFilters.Select(prop => new KeyValuePair<string, string>("Configuration.Filters", prop)));
+      }
+
+      if (ConfigurationTriggers != null)
+      {
+        p.AddRange(ConfigurationTriggers.Select(prop => new KeyValuePair<string, string>("Configuration.Triggers", prop)));
+      }
+
+      if (ConfigurationFlowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.FlowSid", ConfigurationFlowSid.ToString()));
+      }
+
+      if (ConfigurationRetryCount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration.RetryCount", ConfigurationRetryCount.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteWebhookOptions
+  /// </summary>
+  public class DeleteWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteWebhookOptions(string pathServiceSid, string pathChannelSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathChannelSid = pathChannelSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/WebhookResource.cs b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/WebhookResource.cs
index ad98559df..ac41ea09e 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/Channel/WebhookResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/Channel/WebhookResource.cs
@@ -17,594 +17,594 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V2.Service.Channel
-{
-
-    public class WebhookResource : Resource
-    {
-        public sealed class TypeEnum : StringEnum
-        {
-            private TypeEnum(string value) : base(value) {}
-            public TypeEnum() {}
-            public static implicit operator TypeEnum(string value)
-            {
-                return new TypeEnum(value);
-            }
-
-            public static readonly TypeEnum Webhook = new TypeEnum("webhook");
-            public static readonly TypeEnum Trigger = new TypeEnum("trigger");
-            public static readonly TypeEnum Studio = new TypeEnum("studio");
-        }
-
-        public sealed class MethodEnum : StringEnum
-        {
-            private MethodEnum(string value) : base(value) {}
-            public MethodEnum() {}
-            public static implicit operator MethodEnum(string value)
-            {
-                return new MethodEnum(value);
-            }
-
-            public static readonly MethodEnum Get = new MethodEnum("GET");
-            public static readonly MethodEnum Post = new MethodEnum("POST");
-        }
-
-        private static Request BuildReadRequest(ReadWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static ResourceSet<WebhookResource> Read(ReadWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
-            return new ResourceSet<WebhookResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(ReadWebhookOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
-            return new ResourceSet<WebhookResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static ResourceSet<WebhookResource> Read(string pathServiceSid,
-                                                        string pathChannelSid,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadWebhookOptions(pathServiceSid, pathChannelSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(string pathServiceSid,
-                                                                                                string pathChannelSid,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadWebhookOptions(pathServiceSid, pathChannelSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<WebhookResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<WebhookResource> NextPage(Page<WebhookResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<WebhookResource> PreviousPage(Page<WebhookResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(string pathServiceSid,
-                                            string pathChannelSid,
-                                            string pathSid,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathChannelSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Create(CreateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(CreateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="type"> The type </param>
-        /// <param name="configurationUrl"> The configuration.url </param>
-        /// <param name="configurationMethod"> The configuration.method </param>
-        /// <param name="configurationFilters"> The configuration.filters </param>
-        /// <param name="configurationTriggers"> The configuration.triggers </param>
-        /// <param name="configurationFlowSid"> The configuration.flow_sid </param>
-        /// <param name="configurationRetryCount"> The configuration.retry_count </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Create(string pathServiceSid,
-                                             string pathChannelSid,
-                                             WebhookResource.TypeEnum type,
-                                             string configurationUrl = null,
-                                             WebhookResource.MethodEnum configurationMethod = null,
-                                             List<string> configurationFilters = null,
-                                             List<string> configurationTriggers = null,
-                                             string configurationFlowSid = null,
-                                             int? configurationRetryCount = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateWebhookOptions(pathServiceSid, pathChannelSid, type){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="type"> The type </param>
-        /// <param name="configurationUrl"> The configuration.url </param>
-        /// <param name="configurationMethod"> The configuration.method </param>
-        /// <param name="configurationFilters"> The configuration.filters </param>
-        /// <param name="configurationTriggers"> The configuration.triggers </param>
-        /// <param name="configurationFlowSid"> The configuration.flow_sid </param>
-        /// <param name="configurationRetryCount"> The configuration.retry_count </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(string pathServiceSid,
-                                                                                     string pathChannelSid,
-                                                                                     WebhookResource.TypeEnum type,
-                                                                                     string configurationUrl = null,
-                                                                                     WebhookResource.MethodEnum configurationMethod = null,
-                                                                                     List<string> configurationFilters = null,
-                                                                                     List<string> configurationTriggers = null,
-                                                                                     string configurationFlowSid = null,
-                                                                                     int? configurationRetryCount = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateWebhookOptions(pathServiceSid, pathChannelSid, type){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="configurationUrl"> The configuration.url </param>
-        /// <param name="configurationMethod"> The configuration.method </param>
-        /// <param name="configurationFilters"> The configuration.filters </param>
-        /// <param name="configurationTriggers"> The configuration.triggers </param>
-        /// <param name="configurationFlowSid"> The configuration.flow_sid </param>
-        /// <param name="configurationRetryCount"> The configuration.retry_count </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(string pathServiceSid,
-                                             string pathChannelSid,
-                                             string pathSid,
-                                             string configurationUrl = null,
-                                             WebhookResource.MethodEnum configurationMethod = null,
-                                             List<string> configurationFilters = null,
-                                             List<string> configurationTriggers = null,
-                                             string configurationFlowSid = null,
-                                             int? configurationRetryCount = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathServiceSid, pathChannelSid, pathSid){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="configurationUrl"> The configuration.url </param>
-        /// <param name="configurationMethod"> The configuration.method </param>
-        /// <param name="configurationFilters"> The configuration.filters </param>
-        /// <param name="configurationTriggers"> The configuration.triggers </param>
-        /// <param name="configurationFlowSid"> The configuration.flow_sid </param>
-        /// <param name="configurationRetryCount"> The configuration.retry_count </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathServiceSid,
-                                                                                     string pathChannelSid,
-                                                                                     string pathSid,
-                                                                                     string configurationUrl = null,
-                                                                                     WebhookResource.MethodEnum configurationMethod = null,
-                                                                                     List<string> configurationFilters = null,
-                                                                                     List<string> configurationTriggers = null,
-                                                                                     string configurationFlowSid = null,
-                                                                                     int? configurationRetryCount = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathServiceSid, pathChannelSid, pathSid){ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static bool Delete(DeleteWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebhookOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathChannelSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathChannelSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WebhookResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WebhookResource object represented by the provided JSON </returns>
-        public static WebhookResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WebhookResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        [JsonProperty("type")]
-        public string Type { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The configuration
-        /// </summary>
-        [JsonProperty("configuration")]
-        public object Configuration { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private WebhookResource()
-        {
-
-        }
-    }
+{
+
+  public class WebhookResource : Resource
+  {
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+      public TypeEnum() { }
+      public static implicit operator TypeEnum(string value)
+      {
+        return new TypeEnum(value);
+      }
+
+      public static readonly TypeEnum Webhook = new TypeEnum("webhook");
+      public static readonly TypeEnum Trigger = new TypeEnum("trigger");
+      public static readonly TypeEnum Studio = new TypeEnum("studio");
+    }
+
+    public sealed class MethodEnum : StringEnum
+    {
+      private MethodEnum(string value) : base(value) { }
+      public MethodEnum() { }
+      public static implicit operator MethodEnum(string value)
+      {
+        return new MethodEnum(value);
+      }
+
+      public static readonly MethodEnum Get = new MethodEnum("GET");
+      public static readonly MethodEnum Post = new MethodEnum("POST");
+    }
+
+    private static Request BuildReadRequest(ReadWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static ResourceSet<WebhookResource> Read(ReadWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
+      return new ResourceSet<WebhookResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(ReadWebhookOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
+      return new ResourceSet<WebhookResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static ResourceSet<WebhookResource> Read(string pathServiceSid,
+                                                    string pathChannelSid,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadWebhookOptions(pathServiceSid, pathChannelSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(string pathServiceSid,
+                                                                                            string pathChannelSid,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadWebhookOptions(pathServiceSid, pathChannelSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<WebhookResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<WebhookResource> NextPage(Page<WebhookResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<WebhookResource> PreviousPage(Page<WebhookResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(string pathServiceSid,
+                                        string pathChannelSid,
+                                        string pathSid,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathServiceSid,
+                                                                                string pathChannelSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Create(CreateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(CreateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="type"> The type </param>
+    /// <param name="configurationUrl"> The configuration.url </param>
+    /// <param name="configurationMethod"> The configuration.method </param>
+    /// <param name="configurationFilters"> The configuration.filters </param>
+    /// <param name="configurationTriggers"> The configuration.triggers </param>
+    /// <param name="configurationFlowSid"> The configuration.flow_sid </param>
+    /// <param name="configurationRetryCount"> The configuration.retry_count </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Create(string pathServiceSid,
+                                         string pathChannelSid,
+                                         WebhookResource.TypeEnum type,
+                                         string configurationUrl = null,
+                                         WebhookResource.MethodEnum configurationMethod = null,
+                                         List<string> configurationFilters = null,
+                                         List<string> configurationTriggers = null,
+                                         string configurationFlowSid = null,
+                                         int? configurationRetryCount = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateWebhookOptions(pathServiceSid, pathChannelSid, type) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="type"> The type </param>
+    /// <param name="configurationUrl"> The configuration.url </param>
+    /// <param name="configurationMethod"> The configuration.method </param>
+    /// <param name="configurationFilters"> The configuration.filters </param>
+    /// <param name="configurationTriggers"> The configuration.triggers </param>
+    /// <param name="configurationFlowSid"> The configuration.flow_sid </param>
+    /// <param name="configurationRetryCount"> The configuration.retry_count </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(string pathServiceSid,
+                                                                                 string pathChannelSid,
+                                                                                 WebhookResource.TypeEnum type,
+                                                                                 string configurationUrl = null,
+                                                                                 WebhookResource.MethodEnum configurationMethod = null,
+                                                                                 List<string> configurationFilters = null,
+                                                                                 List<string> configurationTriggers = null,
+                                                                                 string configurationFlowSid = null,
+                                                                                 int? configurationRetryCount = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateWebhookOptions(pathServiceSid, pathChannelSid, type) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="configurationUrl"> The configuration.url </param>
+    /// <param name="configurationMethod"> The configuration.method </param>
+    /// <param name="configurationFilters"> The configuration.filters </param>
+    /// <param name="configurationTriggers"> The configuration.triggers </param>
+    /// <param name="configurationFlowSid"> The configuration.flow_sid </param>
+    /// <param name="configurationRetryCount"> The configuration.retry_count </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(string pathServiceSid,
+                                         string pathChannelSid,
+                                         string pathSid,
+                                         string configurationUrl = null,
+                                         WebhookResource.MethodEnum configurationMethod = null,
+                                         List<string> configurationFilters = null,
+                                         List<string> configurationTriggers = null,
+                                         string configurationFlowSid = null,
+                                         int? configurationRetryCount = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathServiceSid, pathChannelSid, pathSid) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="configurationUrl"> The configuration.url </param>
+    /// <param name="configurationMethod"> The configuration.method </param>
+    /// <param name="configurationFilters"> The configuration.filters </param>
+    /// <param name="configurationTriggers"> The configuration.triggers </param>
+    /// <param name="configurationFlowSid"> The configuration.flow_sid </param>
+    /// <param name="configurationRetryCount"> The configuration.retry_count </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathServiceSid,
+                                                                                 string pathChannelSid,
+                                                                                 string pathSid,
+                                                                                 string configurationUrl = null,
+                                                                                 WebhookResource.MethodEnum configurationMethod = null,
+                                                                                 List<string> configurationFilters = null,
+                                                                                 List<string> configurationTriggers = null,
+                                                                                 string configurationFlowSid = null,
+                                                                                 int? configurationRetryCount = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathServiceSid, pathChannelSid, pathSid) { ConfigurationUrl = configurationUrl, ConfigurationMethod = configurationMethod, ConfigurationFilters = configurationFilters, ConfigurationTriggers = configurationTriggers, ConfigurationFlowSid = configurationFlowSid, ConfigurationRetryCount = configurationRetryCount };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathChannelSid + "/Webhooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static bool Delete(DeleteWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebhookOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathChannelSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathChannelSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebhookOptions(pathServiceSid, pathChannelSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WebhookResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WebhookResource object represented by the provided JSON </returns>
+    public static WebhookResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WebhookResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    [JsonProperty("type")]
+    public string Type { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The configuration
+    /// </summary>
+    [JsonProperty("configuration")]
+    public object Configuration { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private WebhookResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/ChannelOptions.cs b/src/Twilio/Rest/IpMessaging/V2/Service/ChannelOptions.cs
index 3f6f4db61..e15afcf7e 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/ChannelOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/ChannelOptions.cs
@@ -10,355 +10,355 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchChannelOptions
+  /// </summary>
+  public class FetchChannelOptions : IOptions<ChannelResource>
+  {
     /// <summary>
-    /// FetchChannelOptions
-    /// </summary>
-    public class FetchChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchChannelOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteChannelOptions
-    /// </summary>
-    public class DeleteChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ChannelResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteChannelOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateChannelOptions
-    /// </summary>
-    public class CreateChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        public ChannelResource.ChannelTypeEnum Type { get; set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// The created_by
-        /// </summary>
-        public string CreatedBy { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ChannelResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public CreateChannelOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (CreatedBy != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CreatedBy", CreatedBy));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchChannelOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadChannelOptions
-    /// </summary>
-    public class ReadChannelOptions : ReadOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        public List<ChannelResource.ChannelTypeEnum> Type { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public ReadChannelOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-            Type = new List<ChannelResource.ChannelTypeEnum>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.AddRange(Type.Select(prop => new KeyValuePair<string, string>("Type", prop.ToString())));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteChannelOptions
+  /// </summary>
+  public class DeleteChannelOptions : IOptions<ChannelResource>
+  {
     /// <summary>
-    /// UpdateChannelOptions
-    /// </summary>
-    public class UpdateChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        public DateTime? DateCreated { get; set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        public DateTime? DateUpdated { get; set; }
-        /// <summary>
-        /// The created_by
-        /// </summary>
-        public string CreatedBy { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public ChannelResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateChannelOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (DateCreated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
-            }
-
-            if (DateUpdated != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
-            }
-
-            if (CreatedBy != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CreatedBy", CreatedBy));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ChannelResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteChannelOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateChannelOptions
+  /// </summary>
+  public class CreateChannelOptions : IOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    public ChannelResource.ChannelTypeEnum Type { get; set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// The created_by
+    /// </summary>
+    public string CreatedBy { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ChannelResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public CreateChannelOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (CreatedBy != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CreatedBy", CreatedBy));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadChannelOptions
+  /// </summary>
+  public class ReadChannelOptions : ReadOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    public List<ChannelResource.ChannelTypeEnum> Type { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public ReadChannelOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+      Type = new List<ChannelResource.ChannelTypeEnum>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.AddRange(Type.Select(prop => new KeyValuePair<string, string>("Type", prop.ToString())));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateChannelOptions
+  /// </summary>
+  public class UpdateChannelOptions : IOptions<ChannelResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    public DateTime? DateCreated { get; set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    public DateTime? DateUpdated { get; set; }
+    /// <summary>
+    /// The created_by
+    /// </summary>
+    public string CreatedBy { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public ChannelResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateChannelOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (DateCreated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreated", Serializers.DateTimeIso8601(DateCreated)));
+      }
+
+      if (DateUpdated != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateUpdated", Serializers.DateTimeIso8601(DateUpdated)));
+      }
+
+      if (CreatedBy != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CreatedBy", CreatedBy));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/ChannelResource.cs b/src/Twilio/Rest/IpMessaging/V2/Service/ChannelResource.cs
index a1fd3c843..ace403061 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/ChannelResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/ChannelResource.cs
@@ -17,613 +17,613 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V2.Service
-{
-
-    public class ChannelResource : Resource
-    {
-        public sealed class ChannelTypeEnum : StringEnum
-        {
-            private ChannelTypeEnum(string value) : base(value) {}
-            public ChannelTypeEnum() {}
-            public static implicit operator ChannelTypeEnum(string value)
-            {
-                return new ChannelTypeEnum(value);
-            }
-
-            public static readonly ChannelTypeEnum Public = new ChannelTypeEnum("public");
-            public static readonly ChannelTypeEnum Private = new ChannelTypeEnum("private");
-        }
-
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildFetchRequest(FetchChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Fetch(FetchChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(FetchChannelOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchChannelOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchChannelOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static bool Delete(DeleteChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteChannelOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathSid,
-                                  ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteChannelOptions(pathServiceSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteChannelOptions(pathServiceSid, pathSid){XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Create(CreateChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(CreateChannelOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="type"> The type </param>
-        /// <param name="dateCreated"> The date_created </param>
-        /// <param name="dateUpdated"> The date_updated </param>
-        /// <param name="createdBy"> The created_by </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Create(string pathServiceSid,
-                                             string friendlyName = null,
-                                             string uniqueName = null,
-                                             string attributes = null,
-                                             ChannelResource.ChannelTypeEnum type = null,
-                                             DateTime? dateCreated = null,
-                                             DateTime? dateUpdated = null,
-                                             string createdBy = null,
-                                             ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateChannelOptions(pathServiceSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="type"> The type </param>
-        /// <param name="dateCreated"> The date_created </param>
-        /// <param name="dateUpdated"> The date_updated </param>
-        /// <param name="createdBy"> The created_by </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(string pathServiceSid,
-                                                                                     string friendlyName = null,
-                                                                                     string uniqueName = null,
-                                                                                     string attributes = null,
-                                                                                     ChannelResource.ChannelTypeEnum type = null,
-                                                                                     DateTime? dateCreated = null,
-                                                                                     DateTime? dateUpdated = null,
-                                                                                     string createdBy = null,
-                                                                                     ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateChannelOptions(pathServiceSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ResourceSet<ChannelResource> Read(ReadChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<ChannelResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(ReadChannelOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<ChannelResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="type"> The type </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ResourceSet<ChannelResource> Read(string pathServiceSid,
-                                                        List<ChannelResource.ChannelTypeEnum> type = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadChannelOptions(pathServiceSid){Type = type, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="type"> The type </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(string pathServiceSid,
-                                                                                                List<ChannelResource.ChannelTypeEnum> type = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadChannelOptions(pathServiceSid){Type = type, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ChannelResource> NextPage(Page<ChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ChannelResource> PreviousPage(Page<ChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<ChannelResource>.FromJson("channels", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Update(UpdateChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(UpdateChannelOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="dateCreated"> The date_created </param>
-        /// <param name="dateUpdated"> The date_updated </param>
-        /// <param name="createdBy"> The created_by </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Update(string pathServiceSid,
-                                             string pathSid,
-                                             string friendlyName = null,
-                                             string uniqueName = null,
-                                             string attributes = null,
-                                             DateTime? dateCreated = null,
-                                             DateTime? dateUpdated = null,
-                                             string createdBy = null,
-                                             ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateChannelOptions(pathServiceSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="dateCreated"> The date_created </param>
-        /// <param name="dateUpdated"> The date_updated </param>
-        /// <param name="createdBy"> The created_by </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(string pathServiceSid,
-                                                                                     string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     string uniqueName = null,
-                                                                                     string attributes = null,
-                                                                                     DateTime? dateCreated = null,
-                                                                                     DateTime? dateUpdated = null,
-                                                                                     string createdBy = null,
-                                                                                     ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateChannelOptions(pathServiceSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ChannelResource object represented by the provided JSON </returns>
-        public static ChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ChannelResource.ChannelTypeEnum Type { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The created_by
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-        /// <summary>
-        /// The members_count
-        /// </summary>
-        [JsonProperty("members_count")]
-        public int? MembersCount { get; private set; }
-        /// <summary>
-        /// The messages_count
-        /// </summary>
-        [JsonProperty("messages_count")]
-        public int? MessagesCount { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class ChannelResource : Resource
+  {
+    public sealed class ChannelTypeEnum : StringEnum
+    {
+      private ChannelTypeEnum(string value) : base(value) { }
+      public ChannelTypeEnum() { }
+      public static implicit operator ChannelTypeEnum(string value)
+      {
+        return new ChannelTypeEnum(value);
+      }
+
+      public static readonly ChannelTypeEnum Public = new ChannelTypeEnum("public");
+      public static readonly ChannelTypeEnum Private = new ChannelTypeEnum("private");
+    }
+
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildFetchRequest(FetchChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Fetch(FetchChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(FetchChannelOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchChannelOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> FetchAsync(string pathServiceSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchChannelOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static bool Delete(DeleteChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteChannelOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathSid,
+                              ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteChannelOptions(pathServiceSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteChannelOptions(pathServiceSid, pathSid) { XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Create(CreateChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(CreateChannelOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="type"> The type </param>
+    /// <param name="dateCreated"> The date_created </param>
+    /// <param name="dateUpdated"> The date_updated </param>
+    /// <param name="createdBy"> The created_by </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Create(string pathServiceSid,
+                                         string friendlyName = null,
+                                         string uniqueName = null,
+                                         string attributes = null,
+                                         ChannelResource.ChannelTypeEnum type = null,
+                                         DateTime? dateCreated = null,
+                                         DateTime? dateUpdated = null,
+                                         string createdBy = null,
+                                         ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateChannelOptions(pathServiceSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="type"> The type </param>
+    /// <param name="dateCreated"> The date_created </param>
+    /// <param name="dateUpdated"> The date_updated </param>
+    /// <param name="createdBy"> The created_by </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(string pathServiceSid,
+                                                                                 string friendlyName = null,
+                                                                                 string uniqueName = null,
+                                                                                 string attributes = null,
+                                                                                 ChannelResource.ChannelTypeEnum type = null,
+                                                                                 DateTime? dateCreated = null,
+                                                                                 DateTime? dateUpdated = null,
+                                                                                 string createdBy = null,
+                                                                                 ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateChannelOptions(pathServiceSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, Type = type, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ResourceSet<ChannelResource> Read(ReadChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<ChannelResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(ReadChannelOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<ChannelResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="type"> The type </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ResourceSet<ChannelResource> Read(string pathServiceSid,
+                                                    List<ChannelResource.ChannelTypeEnum> type = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadChannelOptions(pathServiceSid) { Type = type, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="type"> The type </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ChannelResource>> ReadAsync(string pathServiceSid,
+                                                                                            List<ChannelResource.ChannelTypeEnum> type = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadChannelOptions(pathServiceSid) { Type = type, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ChannelResource> NextPage(Page<ChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ChannelResource> PreviousPage(Page<ChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<ChannelResource>.FromJson("channels", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Channels/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Update(UpdateChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(UpdateChannelOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="dateCreated"> The date_created </param>
+    /// <param name="dateUpdated"> The date_updated </param>
+    /// <param name="createdBy"> The created_by </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Update(string pathServiceSid,
+                                         string pathSid,
+                                         string friendlyName = null,
+                                         string uniqueName = null,
+                                         string attributes = null,
+                                         DateTime? dateCreated = null,
+                                         DateTime? dateUpdated = null,
+                                         string createdBy = null,
+                                         ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateChannelOptions(pathServiceSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="dateCreated"> The date_created </param>
+    /// <param name="dateUpdated"> The date_updated </param>
+    /// <param name="createdBy"> The created_by </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> UpdateAsync(string pathServiceSid,
+                                                                                 string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 string uniqueName = null,
+                                                                                 string attributes = null,
+                                                                                 DateTime? dateCreated = null,
+                                                                                 DateTime? dateUpdated = null,
+                                                                                 string createdBy = null,
+                                                                                 ChannelResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateChannelOptions(pathServiceSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Attributes = attributes, DateCreated = dateCreated, DateUpdated = dateUpdated, CreatedBy = createdBy, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ChannelResource object represented by the provided JSON </returns>
+    public static ChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ChannelResource.ChannelTypeEnum Type { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The created_by
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+    /// <summary>
+    /// The members_count
+    /// </summary>
+    [JsonProperty("members_count")]
+    public int? MembersCount { get; private set; }
+    /// <summary>
+    /// The messages_count
+    /// </summary>
+    [JsonProperty("messages_count")]
+    public int? MessagesCount { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/RoleOptions.cs b/src/Twilio/Rest/IpMessaging/V2/Service/RoleOptions.cs
index 040b999f1..a860ee16e 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/RoleOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/RoleOptions.cs
@@ -10,221 +10,221 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchRoleOptions
+  /// </summary>
+  public class FetchRoleOptions : IOptions<RoleResource>
+  {
     /// <summary>
-    /// FetchRoleOptions
-    /// </summary>
-    public class FetchRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchRoleOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteRoleOptions
-    /// </summary>
-    public class DeleteRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteRoleOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateRoleOptions
-    /// </summary>
-    public class CreateRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        public RoleResource.RoleTypeEnum Type { get; }
-        /// <summary>
-        /// The permission
-        /// </summary>
-        public List<string> Permission { get; }
-
-        /// <summary>
-        /// Construct a new CreateRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="type"> The type </param>
-        /// <param name="permission"> The permission </param>
-        public CreateRoleOptions(string pathServiceSid,
-                                 string friendlyName,
-                                 RoleResource.RoleTypeEnum type,
-                                 List<string> permission)
-        {
-            PathServiceSid = pathServiceSid;
-            FriendlyName = friendlyName;
-            Type = type;
-            Permission = permission;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (Permission != null)
-            {
-                p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchRoleOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadRoleOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadRoleOptions : ReadOptions<RoleResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public ReadRoleOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteRoleOptions
+  /// </summary>
+  public class DeleteRoleOptions : IOptions<RoleResource>
+  {
     /// <summary>
-    /// UpdateRoleOptions
-    /// </summary>
-    public class UpdateRoleOptions : IOptions<RoleResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The permission
-        /// </summary>
-        public List<string> Permission { get; }
-
-        /// <summary>
-        /// Construct a new UpdateRoleOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="permission"> The permission </param>
-        public UpdateRoleOptions(string pathServiceSid, string pathSid, List<string> permission)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-            Permission = permission;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Permission != null)
-            {
-                p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
-            }
-
-            return p;
-        }
-    }
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteRoleOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateRoleOptions
+  /// </summary>
+  public class CreateRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    public RoleResource.RoleTypeEnum Type { get; }
+    /// <summary>
+    /// The permission
+    /// </summary>
+    public List<string> Permission { get; }
+
+    /// <summary>
+    /// Construct a new CreateRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="type"> The type </param>
+    /// <param name="permission"> The permission </param>
+    public CreateRoleOptions(string pathServiceSid,
+                             string friendlyName,
+                             RoleResource.RoleTypeEnum type,
+                             List<string> permission)
+    {
+      PathServiceSid = pathServiceSid;
+      FriendlyName = friendlyName;
+      Type = type;
+      Permission = permission;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (Permission != null)
+      {
+        p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadRoleOptions
+  /// </summary>
+  public class ReadRoleOptions : ReadOptions<RoleResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public ReadRoleOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateRoleOptions
+  /// </summary>
+  public class UpdateRoleOptions : IOptions<RoleResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The permission
+    /// </summary>
+    public List<string> Permission { get; }
+
+    /// <summary>
+    /// Construct a new UpdateRoleOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="permission"> The permission </param>
+    public UpdateRoleOptions(string pathServiceSid, string pathSid, List<string> permission)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+      Permission = permission;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Permission != null)
+      {
+        p.AddRange(Permission.Select(prop => new KeyValuePair<string, string>("Permission", prop)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/RoleResource.cs b/src/Twilio/Rest/IpMessaging/V2/Service/RoleResource.cs
index 63571b644..b06602631 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/RoleResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/RoleResource.cs
@@ -17,521 +17,521 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V2.Service
-{
-
-    public class RoleResource : Resource
-    {
-        public sealed class RoleTypeEnum : StringEnum
-        {
-            private RoleTypeEnum(string value) : base(value) {}
-            public RoleTypeEnum() {}
-            public static implicit operator RoleTypeEnum(string value)
-            {
-                return new RoleTypeEnum(value);
-            }
-
-            public static readonly RoleTypeEnum Channel = new RoleTypeEnum("channel");
-            public static readonly RoleTypeEnum Deployment = new RoleTypeEnum("deployment");
-        }
-
-        private static Request BuildFetchRequest(FetchRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Fetch(FetchRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(FetchRoleOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRoleOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(string pathServiceSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchRoleOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static bool Delete(DeleteRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoleOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoleOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoleOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Roles",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Create(CreateRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(CreateRoleOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="type"> The type </param>
-        /// <param name="permission"> The permission </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Create(string pathServiceSid,
-                                          string friendlyName,
-                                          RoleResource.RoleTypeEnum type,
-                                          List<string> permission,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="type"> The type </param>
-        /// <param name="permission"> The permission </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(string pathServiceSid,
-                                                                                  string friendlyName,
-                                                                                  RoleResource.RoleTypeEnum type,
-                                                                                  List<string> permission,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Roles",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static ResourceSet<RoleResource> Read(ReadRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RoleResource>.FromJson("roles", response.Content);
-            return new ResourceSet<RoleResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(ReadRoleOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RoleResource>.FromJson("roles", response.Content);
-            return new ResourceSet<RoleResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static ResourceSet<RoleResource> Read(string pathServiceSid,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadRoleOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(string pathServiceSid,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadRoleOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RoleResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RoleResource> NextPage(Page<RoleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RoleResource> PreviousPage(Page<RoleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<RoleResource>.FromJson("roles", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateRoleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Update(UpdateRoleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Role parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(UpdateRoleOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="permission"> The permission </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Role </returns>
-        public static RoleResource Update(string pathServiceSid,
-                                          string pathSid,
-                                          List<string> permission,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="permission"> The permission </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Role </returns>
-        public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(string pathServiceSid,
-                                                                                  string pathSid,
-                                                                                  List<string> permission,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RoleResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RoleResource object represented by the provided JSON </returns>
-        public static RoleResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RoleResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoleResource.RoleTypeEnum Type { get; private set; }
-        /// <summary>
-        /// The permissions
-        /// </summary>
-        [JsonProperty("permissions")]
-        public List<string> Permissions { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private RoleResource()
-        {
-
-        }
-    }
+{
+
+  public class RoleResource : Resource
+  {
+    public sealed class RoleTypeEnum : StringEnum
+    {
+      private RoleTypeEnum(string value) : base(value) { }
+      public RoleTypeEnum() { }
+      public static implicit operator RoleTypeEnum(string value)
+      {
+        return new RoleTypeEnum(value);
+      }
+
+      public static readonly RoleTypeEnum Channel = new RoleTypeEnum("channel");
+      public static readonly RoleTypeEnum Deployment = new RoleTypeEnum("deployment");
+    }
+
+    private static Request BuildFetchRequest(FetchRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Fetch(FetchRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(FetchRoleOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRoleOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> FetchAsync(string pathServiceSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchRoleOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static bool Delete(DeleteRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoleOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoleOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoleOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Roles",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Create(CreateRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(CreateRoleOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="type"> The type </param>
+    /// <param name="permission"> The permission </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Create(string pathServiceSid,
+                                      string friendlyName,
+                                      RoleResource.RoleTypeEnum type,
+                                      List<string> permission,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="type"> The type </param>
+    /// <param name="permission"> The permission </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> CreateAsync(string pathServiceSid,
+                                                                              string friendlyName,
+                                                                              RoleResource.RoleTypeEnum type,
+                                                                              List<string> permission,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateRoleOptions(pathServiceSid, friendlyName, type, permission);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Roles",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static ResourceSet<RoleResource> Read(ReadRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RoleResource>.FromJson("roles", response.Content);
+      return new ResourceSet<RoleResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(ReadRoleOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RoleResource>.FromJson("roles", response.Content);
+      return new ResourceSet<RoleResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static ResourceSet<RoleResource> Read(string pathServiceSid,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadRoleOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoleResource>> ReadAsync(string pathServiceSid,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadRoleOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RoleResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RoleResource> NextPage(Page<RoleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RoleResource> PreviousPage(Page<RoleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<RoleResource>.FromJson("roles", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateRoleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Roles/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Update(UpdateRoleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Role parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(UpdateRoleOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="permission"> The permission </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Role </returns>
+    public static RoleResource Update(string pathServiceSid,
+                                      string pathSid,
+                                      List<string> permission,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="permission"> The permission </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Role </returns>
+    public static async System.Threading.Tasks.Task<RoleResource> UpdateAsync(string pathServiceSid,
+                                                                              string pathSid,
+                                                                              List<string> permission,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoleOptions(pathServiceSid, pathSid, permission);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RoleResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RoleResource object represented by the provided JSON </returns>
+    public static RoleResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RoleResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoleResource.RoleTypeEnum Type { get; private set; }
+    /// <summary>
+    /// The permissions
+    /// </summary>
+    [JsonProperty("permissions")]
+    public List<string> Permissions { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private RoleResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/User/UserBindingOptions.cs b/src/Twilio/Rest/IpMessaging/V2/Service/User/UserBindingOptions.cs
index 98bf3f0f6..5530e0f6e 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/User/UserBindingOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/User/UserBindingOptions.cs
@@ -10,138 +10,138 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V2.Service.User
-{
-
+{
+
+  /// <summary>
+  /// ReadUserBindingOptions
+  /// </summary>
+  public class ReadUserBindingOptions : ReadOptions<UserBindingResource>
+  {
     /// <summary>
-    /// ReadUserBindingOptions
+    /// The service_sid
     /// </summary>
-    public class ReadUserBindingOptions : ReadOptions<UserBindingResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The user_sid
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The binding_type
-        /// </summary>
-        public List<UserBindingResource.BindingTypeEnum> BindingType { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadUserBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        public ReadUserBindingOptions(string pathServiceSid, string pathUserSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-            BindingType = new List<UserBindingResource.BindingTypeEnum>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (BindingType != null)
-            {
-                p.AddRange(BindingType.Select(prop => new KeyValuePair<string, string>("BindingType", prop.ToString())));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// FetchUserBindingOptions
+    /// The user_sid
     /// </summary>
-    public class FetchUserBindingOptions : IOptions<UserBindingResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The user_sid
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUserBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchUserBindingOptions(string pathServiceSid, string pathUserSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathUserSid { get; }
     /// <summary>
-    /// DeleteUserBindingOptions
+    /// The binding_type
     /// </summary>
-    public class DeleteUserBindingOptions : IOptions<UserBindingResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The user_sid
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteUserBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteUserBindingOptions(string pathServiceSid, string pathUserSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<UserBindingResource.BindingTypeEnum> BindingType { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadUserBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    public ReadUserBindingOptions(string pathServiceSid, string pathUserSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+      BindingType = new List<UserBindingResource.BindingTypeEnum>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (BindingType != null)
+      {
+        p.AddRange(BindingType.Select(prop => new KeyValuePair<string, string>("BindingType", prop.ToString())));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchUserBindingOptions
+  /// </summary>
+  public class FetchUserBindingOptions : IOptions<UserBindingResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The user_sid
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchUserBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchUserBindingOptions(string pathServiceSid, string pathUserSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteUserBindingOptions
+  /// </summary>
+  public class DeleteUserBindingOptions : IOptions<UserBindingResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The user_sid
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteUserBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteUserBindingOptions(string pathServiceSid, string pathUserSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/User/UserBindingResource.cs b/src/Twilio/Rest/IpMessaging/V2/Service/User/UserBindingResource.cs
index 5ceafb141..ad753d397 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/User/UserBindingResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/User/UserBindingResource.cs
@@ -17,398 +17,398 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V2.Service.User
-{
-
-    public class UserBindingResource : Resource
-    {
-        public sealed class BindingTypeEnum : StringEnum
-        {
-            private BindingTypeEnum(string value) : base(value) {}
-            public BindingTypeEnum() {}
-            public static implicit operator BindingTypeEnum(string value)
-            {
-                return new BindingTypeEnum(value);
-            }
-
-            public static readonly BindingTypeEnum Gcm = new BindingTypeEnum("gcm");
-            public static readonly BindingTypeEnum Apn = new BindingTypeEnum("apn");
-            public static readonly BindingTypeEnum Fcm = new BindingTypeEnum("fcm");
-        }
-
-        private static Request BuildReadRequest(ReadUserBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Bindings",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UserBinding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserBinding </returns>
-        public static ResourceSet<UserBindingResource> Read(ReadUserBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserBindingResource>.FromJson("bindings", response.Content);
-            return new ResourceSet<UserBindingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UserBinding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserBinding </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserBindingResource>> ReadAsync(ReadUserBindingOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserBindingResource>.FromJson("bindings", response.Content);
-            return new ResourceSet<UserBindingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="bindingType"> The binding_type </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserBinding </returns>
-        public static ResourceSet<UserBindingResource> Read(string pathServiceSid,
-                                                            string pathUserSid,
-                                                            List<UserBindingResource.BindingTypeEnum> bindingType = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadUserBindingOptions(pathServiceSid, pathUserSid){BindingType = bindingType, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="bindingType"> The binding_type </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserBinding </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserBindingResource>> ReadAsync(string pathServiceSid,
-                                                                                                    string pathUserSid,
-                                                                                                    List<UserBindingResource.BindingTypeEnum> bindingType = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadUserBindingOptions(pathServiceSid, pathUserSid){BindingType = bindingType, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserBindingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserBindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserBindingResource> NextPage(Page<UserBindingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<UserBindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserBindingResource> PreviousPage(Page<UserBindingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<UserBindingResource>.FromJson("bindings", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchUserBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Bindings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch UserBinding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserBinding </returns>
-        public static UserBindingResource Fetch(FetchUserBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch UserBinding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserBinding </returns>
-        public static async System.Threading.Tasks.Task<UserBindingResource> FetchAsync(FetchUserBindingOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserBinding </returns>
-        public static UserBindingResource Fetch(string pathServiceSid,
-                                                string pathUserSid,
-                                                string pathSid,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserBinding </returns>
-        public static async System.Threading.Tasks.Task<UserBindingResource> FetchAsync(string pathServiceSid,
-                                                                                        string pathUserSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteUserBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Bindings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete UserBinding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserBinding </returns>
-        public static bool Delete(DeleteUserBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete UserBinding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserBinding </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserBindingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserBinding </returns>
-        public static bool Delete(string pathServiceSid, string pathUserSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserBinding </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathUserSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a UserBindingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserBindingResource object represented by the provided JSON </returns>
-        public static UserBindingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserBindingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The endpoint
-        /// </summary>
-        [JsonProperty("endpoint")]
-        public string Endpoint { get; private set; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The user_sid
-        /// </summary>
-        [JsonProperty("user_sid")]
-        public string UserSid { get; private set; }
-        /// <summary>
-        /// The credential_sid
-        /// </summary>
-        [JsonProperty("credential_sid")]
-        public string CredentialSid { get; private set; }
-        /// <summary>
-        /// The binding_type
-        /// </summary>
-        [JsonProperty("binding_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public UserBindingResource.BindingTypeEnum BindingType { get; private set; }
-        /// <summary>
-        /// The message_types
-        /// </summary>
-        [JsonProperty("message_types")]
-        public List<string> MessageTypes { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private UserBindingResource()
-        {
-
-        }
-    }
+{
+
+  public class UserBindingResource : Resource
+  {
+    public sealed class BindingTypeEnum : StringEnum
+    {
+      private BindingTypeEnum(string value) : base(value) { }
+      public BindingTypeEnum() { }
+      public static implicit operator BindingTypeEnum(string value)
+      {
+        return new BindingTypeEnum(value);
+      }
+
+      public static readonly BindingTypeEnum Gcm = new BindingTypeEnum("gcm");
+      public static readonly BindingTypeEnum Apn = new BindingTypeEnum("apn");
+      public static readonly BindingTypeEnum Fcm = new BindingTypeEnum("fcm");
+    }
+
+    private static Request BuildReadRequest(ReadUserBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Bindings",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UserBinding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserBinding </returns>
+    public static ResourceSet<UserBindingResource> Read(ReadUserBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserBindingResource>.FromJson("bindings", response.Content);
+      return new ResourceSet<UserBindingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UserBinding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserBinding </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserBindingResource>> ReadAsync(ReadUserBindingOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserBindingResource>.FromJson("bindings", response.Content);
+      return new ResourceSet<UserBindingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="bindingType"> The binding_type </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserBinding </returns>
+    public static ResourceSet<UserBindingResource> Read(string pathServiceSid,
+                                                        string pathUserSid,
+                                                        List<UserBindingResource.BindingTypeEnum> bindingType = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadUserBindingOptions(pathServiceSid, pathUserSid) { BindingType = bindingType, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="bindingType"> The binding_type </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserBinding </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserBindingResource>> ReadAsync(string pathServiceSid,
+                                                                                                string pathUserSid,
+                                                                                                List<UserBindingResource.BindingTypeEnum> bindingType = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadUserBindingOptions(pathServiceSid, pathUserSid) { BindingType = bindingType, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserBindingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserBindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserBindingResource> NextPage(Page<UserBindingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<UserBindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserBindingResource> PreviousPage(Page<UserBindingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<UserBindingResource>.FromJson("bindings", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchUserBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Bindings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch UserBinding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserBinding </returns>
+    public static UserBindingResource Fetch(FetchUserBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch UserBinding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserBinding </returns>
+    public static async System.Threading.Tasks.Task<UserBindingResource> FetchAsync(FetchUserBindingOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserBinding </returns>
+    public static UserBindingResource Fetch(string pathServiceSid,
+                                            string pathUserSid,
+                                            string pathSid,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserBinding </returns>
+    public static async System.Threading.Tasks.Task<UserBindingResource> FetchAsync(string pathServiceSid,
+                                                                                    string pathUserSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteUserBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Bindings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete UserBinding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserBinding </returns>
+    public static bool Delete(DeleteUserBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete UserBinding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserBinding </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserBindingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserBinding </returns>
+    public static bool Delete(string pathServiceSid, string pathUserSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserBinding </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathUserSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserBindingOptions(pathServiceSid, pathUserSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a UserBindingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserBindingResource object represented by the provided JSON </returns>
+    public static UserBindingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserBindingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The endpoint
+    /// </summary>
+    [JsonProperty("endpoint")]
+    public string Endpoint { get; private set; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The user_sid
+    /// </summary>
+    [JsonProperty("user_sid")]
+    public string UserSid { get; private set; }
+    /// <summary>
+    /// The credential_sid
+    /// </summary>
+    [JsonProperty("credential_sid")]
+    public string CredentialSid { get; private set; }
+    /// <summary>
+    /// The binding_type
+    /// </summary>
+    [JsonProperty("binding_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public UserBindingResource.BindingTypeEnum BindingType { get; private set; }
+    /// <summary>
+    /// The message_types
+    /// </summary>
+    [JsonProperty("message_types")]
+    public List<string> MessageTypes { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private UserBindingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/User/UserChannelOptions.cs b/src/Twilio/Rest/IpMessaging/V2/Service/User/UserChannelOptions.cs
index a97ab39fa..7afcac94d 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/User/UserChannelOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/User/UserChannelOptions.cs
@@ -9,196 +9,196 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V2.Service.User
-{
-
+{
+
+  /// <summary>
+  /// ReadUserChannelOptions
+  /// </summary>
+  public class ReadUserChannelOptions : ReadOptions<UserChannelResource>
+  {
     /// <summary>
-    /// ReadUserChannelOptions
-    /// </summary>
-    public class ReadUserChannelOptions : ReadOptions<UserChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The user_sid
-        /// </summary>
-        public string PathUserSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadUserChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        public ReadUserChannelOptions(string pathServiceSid, string pathUserSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// FetchUserChannelOptions
-    /// </summary>
-    public class FetchUserChannelOptions : IOptions<UserChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The user_sid
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUserChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        public FetchUserChannelOptions(string pathServiceSid, string pathUserSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The user_sid
+    /// </summary>
+    public string PathUserSid { get; }
+
     /// <summary>
-    /// DeleteUserChannelOptions
-    /// </summary>
-    public class DeleteUserChannelOptions : IOptions<UserChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The user_sid
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteUserChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        public DeleteUserChannelOptions(string pathServiceSid, string pathUserSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new ReadUserChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    public ReadUserChannelOptions(string pathServiceSid, string pathUserSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+    }
+
     /// <summary>
-    /// UpdateUserChannelOptions
-    /// </summary>
-    public class UpdateUserChannelOptions : IOptions<UserChannelResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The user_sid
-        /// </summary>
-        public string PathUserSid { get; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        public string PathChannelSid { get; }
-        /// <summary>
-        /// The notification_level
-        /// </summary>
-        public UserChannelResource.NotificationLevelEnum NotificationLevel { get; set; }
-        /// <summary>
-        /// The last_consumed_message_index
-        /// </summary>
-        public int? LastConsumedMessageIndex { get; set; }
-        /// <summary>
-        /// The last_consumption_timestamp
-        /// </summary>
-        public DateTime? LastConsumptionTimestamp { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateUserChannelOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        public UpdateUserChannelOptions(string pathServiceSid, string pathUserSid, string pathChannelSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathUserSid = pathUserSid;
-            PathChannelSid = pathChannelSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (NotificationLevel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NotificationLevel", NotificationLevel.ToString()));
-            }
-
-            if (LastConsumedMessageIndex != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
-            }
-
-            if (LastConsumptionTimestamp != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LastConsumptionTimestamp", Serializers.DateTimeIso8601(LastConsumptionTimestamp)));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchUserChannelOptions
+  /// </summary>
+  public class FetchUserChannelOptions : IOptions<UserChannelResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The user_sid
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchUserChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    public FetchUserChannelOptions(string pathServiceSid, string pathUserSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+      PathChannelSid = pathChannelSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteUserChannelOptions
+  /// </summary>
+  public class DeleteUserChannelOptions : IOptions<UserChannelResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The user_sid
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteUserChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    public DeleteUserChannelOptions(string pathServiceSid, string pathUserSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+      PathChannelSid = pathChannelSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateUserChannelOptions
+  /// </summary>
+  public class UpdateUserChannelOptions : IOptions<UserChannelResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The user_sid
+    /// </summary>
+    public string PathUserSid { get; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    public string PathChannelSid { get; }
+    /// <summary>
+    /// The notification_level
+    /// </summary>
+    public UserChannelResource.NotificationLevelEnum NotificationLevel { get; set; }
+    /// <summary>
+    /// The last_consumed_message_index
+    /// </summary>
+    public int? LastConsumedMessageIndex { get; set; }
+    /// <summary>
+    /// The last_consumption_timestamp
+    /// </summary>
+    public DateTime? LastConsumptionTimestamp { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateUserChannelOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    public UpdateUserChannelOptions(string pathServiceSid, string pathUserSid, string pathChannelSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathUserSid = pathUserSid;
+      PathChannelSid = pathChannelSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (NotificationLevel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NotificationLevel", NotificationLevel.ToString()));
+      }
+
+      if (LastConsumedMessageIndex != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumedMessageIndex", LastConsumedMessageIndex.ToString()));
+      }
+
+      if (LastConsumptionTimestamp != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LastConsumptionTimestamp", Serializers.DateTimeIso8601(LastConsumptionTimestamp)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/User/UserChannelResource.cs b/src/Twilio/Rest/IpMessaging/V2/Service/User/UserChannelResource.cs
index d13fb1912..e3a188789 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/User/UserChannelResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/User/UserChannelResource.cs
@@ -17,494 +17,494 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V2.Service.User
-{
-
-    public class UserChannelResource : Resource
-    {
-        public sealed class ChannelStatusEnum : StringEnum
-        {
-            private ChannelStatusEnum(string value) : base(value) {}
-            public ChannelStatusEnum() {}
-            public static implicit operator ChannelStatusEnum(string value)
-            {
-                return new ChannelStatusEnum(value);
-            }
-
-            public static readonly ChannelStatusEnum Joined = new ChannelStatusEnum("joined");
-            public static readonly ChannelStatusEnum Invited = new ChannelStatusEnum("invited");
-            public static readonly ChannelStatusEnum NotParticipating = new ChannelStatusEnum("not_participating");
-        }
-
-        public sealed class NotificationLevelEnum : StringEnum
-        {
-            private NotificationLevelEnum(string value) : base(value) {}
-            public NotificationLevelEnum() {}
-            public static implicit operator NotificationLevelEnum(string value)
-            {
-                return new NotificationLevelEnum(value);
-            }
-
-            public static readonly NotificationLevelEnum Default = new NotificationLevelEnum("default");
-            public static readonly NotificationLevelEnum Muted = new NotificationLevelEnum("muted");
-        }
-
-        private static Request BuildReadRequest(ReadUserChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static ResourceSet<UserChannelResource> Read(ReadUserChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<UserChannelResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(ReadUserChannelOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<UserChannelResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static ResourceSet<UserChannelResource> Read(string pathServiceSid,
-                                                            string pathUserSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(string pathServiceSid,
-                                                                                                    string pathUserSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserChannelResource> NextPage(Page<UserChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<UserChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserChannelResource> PreviousPage(Page<UserChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<UserChannelResource>.FromJson("channels", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchUserChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels/" + options.PathChannelSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static UserChannelResource Fetch(FetchUserChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<UserChannelResource> FetchAsync(FetchUserChannelOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static UserChannelResource Fetch(string pathServiceSid,
-                                                string pathUserSid,
-                                                string pathChannelSid,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<UserChannelResource> FetchAsync(string pathServiceSid,
-                                                                                        string pathUserSid,
-                                                                                        string pathChannelSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteUserChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels/" + options.PathChannelSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static bool Delete(DeleteUserChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserChannelOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathUserSid,
-                                  string pathChannelSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathUserSid,
-                                                                          string pathChannelSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateUserChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels/" + options.PathChannelSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static UserChannelResource Update(UpdateUserChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update UserChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<UserChannelResource> UpdateAsync(UpdateUserChannelOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="notificationLevel"> The notification_level </param>
-        /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
-        /// <param name="lastConsumptionTimestamp"> The last_consumption_timestamp </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UserChannel </returns>
-        public static UserChannelResource Update(string pathServiceSid,
-                                                 string pathUserSid,
-                                                 string pathChannelSid,
-                                                 UserChannelResource.NotificationLevelEnum notificationLevel = null,
-                                                 int? lastConsumedMessageIndex = null,
-                                                 DateTime? lastConsumptionTimestamp = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid){NotificationLevel = notificationLevel, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathUserSid"> The user_sid </param>
-        /// <param name="pathChannelSid"> The channel_sid </param>
-        /// <param name="notificationLevel"> The notification_level </param>
-        /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
-        /// <param name="lastConsumptionTimestamp"> The last_consumption_timestamp </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UserChannel </returns>
-        public static async System.Threading.Tasks.Task<UserChannelResource> UpdateAsync(string pathServiceSid,
-                                                                                         string pathUserSid,
-                                                                                         string pathChannelSid,
-                                                                                         UserChannelResource.NotificationLevelEnum notificationLevel = null,
-                                                                                         int? lastConsumedMessageIndex = null,
-                                                                                         DateTime? lastConsumptionTimestamp = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid){NotificationLevel = notificationLevel, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a UserChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserChannelResource object represented by the provided JSON </returns>
-        public static UserChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The channel_sid
-        /// </summary>
-        [JsonProperty("channel_sid")]
-        public string ChannelSid { get; private set; }
-        /// <summary>
-        /// The user_sid
-        /// </summary>
-        [JsonProperty("user_sid")]
-        public string UserSid { get; private set; }
-        /// <summary>
-        /// The member_sid
-        /// </summary>
-        [JsonProperty("member_sid")]
-        public string MemberSid { get; private set; }
-        /// <summary>
-        /// The status
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public UserChannelResource.ChannelStatusEnum Status { get; private set; }
-        /// <summary>
-        /// The last_consumed_message_index
-        /// </summary>
-        [JsonProperty("last_consumed_message_index")]
-        public int? LastConsumedMessageIndex { get; private set; }
-        /// <summary>
-        /// The unread_messages_count
-        /// </summary>
-        [JsonProperty("unread_messages_count")]
-        public int? UnreadMessagesCount { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The notification_level
-        /// </summary>
-        [JsonProperty("notification_level")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public UserChannelResource.NotificationLevelEnum NotificationLevel { get; private set; }
-
-        private UserChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class UserChannelResource : Resource
+  {
+    public sealed class ChannelStatusEnum : StringEnum
+    {
+      private ChannelStatusEnum(string value) : base(value) { }
+      public ChannelStatusEnum() { }
+      public static implicit operator ChannelStatusEnum(string value)
+      {
+        return new ChannelStatusEnum(value);
+      }
+
+      public static readonly ChannelStatusEnum Joined = new ChannelStatusEnum("joined");
+      public static readonly ChannelStatusEnum Invited = new ChannelStatusEnum("invited");
+      public static readonly ChannelStatusEnum NotParticipating = new ChannelStatusEnum("not_participating");
+    }
+
+    public sealed class NotificationLevelEnum : StringEnum
+    {
+      private NotificationLevelEnum(string value) : base(value) { }
+      public NotificationLevelEnum() { }
+      public static implicit operator NotificationLevelEnum(string value)
+      {
+        return new NotificationLevelEnum(value);
+      }
+
+      public static readonly NotificationLevelEnum Default = new NotificationLevelEnum("default");
+      public static readonly NotificationLevelEnum Muted = new NotificationLevelEnum("muted");
+    }
+
+    private static Request BuildReadRequest(ReadUserChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static ResourceSet<UserChannelResource> Read(ReadUserChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<UserChannelResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(ReadUserChannelOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<UserChannelResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static ResourceSet<UserChannelResource> Read(string pathServiceSid,
+                                                        string pathUserSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserChannelResource>> ReadAsync(string pathServiceSid,
+                                                                                                string pathUserSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadUserChannelOptions(pathServiceSid, pathUserSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserChannelResource> NextPage(Page<UserChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<UserChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserChannelResource> PreviousPage(Page<UserChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<UserChannelResource>.FromJson("channels", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchUserChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels/" + options.PathChannelSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static UserChannelResource Fetch(FetchUserChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<UserChannelResource> FetchAsync(FetchUserChannelOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static UserChannelResource Fetch(string pathServiceSid,
+                                            string pathUserSid,
+                                            string pathChannelSid,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<UserChannelResource> FetchAsync(string pathServiceSid,
+                                                                                    string pathUserSid,
+                                                                                    string pathChannelSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteUserChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels/" + options.PathChannelSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static bool Delete(DeleteUserChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserChannelOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathUserSid,
+                              string pathChannelSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathUserSid,
+                                                                      string pathChannelSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateUserChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathUserSid + "/Channels/" + options.PathChannelSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static UserChannelResource Update(UpdateUserChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update UserChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<UserChannelResource> UpdateAsync(UpdateUserChannelOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="notificationLevel"> The notification_level </param>
+    /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
+    /// <param name="lastConsumptionTimestamp"> The last_consumption_timestamp </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UserChannel </returns>
+    public static UserChannelResource Update(string pathServiceSid,
+                                             string pathUserSid,
+                                             string pathChannelSid,
+                                             UserChannelResource.NotificationLevelEnum notificationLevel = null,
+                                             int? lastConsumedMessageIndex = null,
+                                             DateTime? lastConsumptionTimestamp = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid) { NotificationLevel = notificationLevel, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathUserSid"> The user_sid </param>
+    /// <param name="pathChannelSid"> The channel_sid </param>
+    /// <param name="notificationLevel"> The notification_level </param>
+    /// <param name="lastConsumedMessageIndex"> The last_consumed_message_index </param>
+    /// <param name="lastConsumptionTimestamp"> The last_consumption_timestamp </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UserChannel </returns>
+    public static async System.Threading.Tasks.Task<UserChannelResource> UpdateAsync(string pathServiceSid,
+                                                                                     string pathUserSid,
+                                                                                     string pathChannelSid,
+                                                                                     UserChannelResource.NotificationLevelEnum notificationLevel = null,
+                                                                                     int? lastConsumedMessageIndex = null,
+                                                                                     DateTime? lastConsumptionTimestamp = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserChannelOptions(pathServiceSid, pathUserSid, pathChannelSid) { NotificationLevel = notificationLevel, LastConsumedMessageIndex = lastConsumedMessageIndex, LastConsumptionTimestamp = lastConsumptionTimestamp };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a UserChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserChannelResource object represented by the provided JSON </returns>
+    public static UserChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The channel_sid
+    /// </summary>
+    [JsonProperty("channel_sid")]
+    public string ChannelSid { get; private set; }
+    /// <summary>
+    /// The user_sid
+    /// </summary>
+    [JsonProperty("user_sid")]
+    public string UserSid { get; private set; }
+    /// <summary>
+    /// The member_sid
+    /// </summary>
+    [JsonProperty("member_sid")]
+    public string MemberSid { get; private set; }
+    /// <summary>
+    /// The status
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public UserChannelResource.ChannelStatusEnum Status { get; private set; }
+    /// <summary>
+    /// The last_consumed_message_index
+    /// </summary>
+    [JsonProperty("last_consumed_message_index")]
+    public int? LastConsumedMessageIndex { get; private set; }
+    /// <summary>
+    /// The unread_messages_count
+    /// </summary>
+    [JsonProperty("unread_messages_count")]
+    public int? UnreadMessagesCount { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The notification_level
+    /// </summary>
+    [JsonProperty("notification_level")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public UserChannelResource.NotificationLevelEnum NotificationLevel { get; private set; }
+
+    private UserChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/UserOptions.cs b/src/Twilio/Rest/IpMessaging/V2/Service/UserOptions.cs
index 23cefdf76..6cb164b7d 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/UserOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/UserOptions.cs
@@ -9,275 +9,275 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchUserOptions
+  /// </summary>
+  public class FetchUserOptions : IOptions<UserResource>
+  {
     /// <summary>
-    /// FetchUserOptions
+    /// The service_sid
     /// </summary>
-    public class FetchUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchUserOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteUserOptions
+    /// The sid
     /// </summary>
-    public class DeleteUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteUserOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateUserOptions
+    /// Construct a new FetchUserOptions
     /// </summary>
-    public class CreateUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="identity"> The identity </param>
-        public CreateUserOptions(string pathServiceSid, string identity)
-        {
-            PathServiceSid = pathServiceSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchUserOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadUserOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadUserOptions : ReadOptions<UserResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public ReadUserOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteUserOptions
+  /// </summary>
+  public class DeleteUserOptions : IOptions<UserResource>
+  {
     /// <summary>
-    /// UpdateUserOptions
+    /// The service_sid
     /// </summary>
-    public class UpdateUserOptions : IOptions<UserResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        public string RoleSid { get; set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The X-Twilio-Webhook-Enabled HTTP request header
-        /// </summary>
-        public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateUserOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateUserOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (RoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XTwilioWebhookEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteUserOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateUserOptions
+  /// </summary>
+  public class CreateUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="identity"> The identity </param>
+    public CreateUserOptions(string pathServiceSid, string identity)
+    {
+      PathServiceSid = pathServiceSid;
+      Identity = identity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadUserOptions
+  /// </summary>
+  public class ReadUserOptions : ReadOptions<UserResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public ReadUserOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateUserOptions
+  /// </summary>
+  public class UpdateUserOptions : IOptions<UserResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    public string RoleSid { get; set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The X-Twilio-Webhook-Enabled HTTP request header
+    /// </summary>
+    public UserResource.WebhookEnabledTypeEnum XTwilioWebhookEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateUserOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateUserOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (RoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoleSid", RoleSid.ToString()));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XTwilioWebhookEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Twilio-Webhook-Enabled", XTwilioWebhookEnabled.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/Service/UserResource.cs b/src/Twilio/Rest/IpMessaging/V2/Service/UserResource.cs
index 3aa09733b..44cb4df62 100644
--- a/src/Twilio/Rest/IpMessaging/V2/Service/UserResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/Service/UserResource.cs
@@ -17,565 +17,565 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.IpMessaging.V2.Service
-{
-
-    public class UserResource : Resource
-    {
-        public sealed class WebhookEnabledTypeEnum : StringEnum
-        {
-            private WebhookEnabledTypeEnum(string value) : base(value) {}
-            public WebhookEnabledTypeEnum() {}
-            public static implicit operator WebhookEnabledTypeEnum(string value)
-            {
-                return new WebhookEnabledTypeEnum(value);
-            }
-
-            public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
-            public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
-        }
-
-        private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathServiceSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchUserOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static bool Delete(DeleteUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteUserOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Users",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Create(CreateUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> CreateAsync(CreateUserOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Create(string pathServiceSid,
-                                          string identity,
-                                          string roleSid = null,
-                                          string attributes = null,
-                                          string friendlyName = null,
-                                          UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateUserOptions(pathServiceSid, identity){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="identity"> The identity </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> CreateAsync(string pathServiceSid,
-                                                                                  string identity,
-                                                                                  string roleSid = null,
-                                                                                  string attributes = null,
-                                                                                  string friendlyName = null,
-                                                                                  UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateUserOptions(pathServiceSid, identity){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Users",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static ResourceSet<UserResource> Read(ReadUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UserResource>.FromJson("users", response.Content);
-            return new ResourceSet<UserResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(ReadUserOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UserResource>.FromJson("users", response.Content);
-            return new ResourceSet<UserResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static ResourceSet<UserResource> Read(string pathServiceSid,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadUserOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(string pathServiceSid,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadUserOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UserResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UserResource> NextPage(Page<UserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UserResource> PreviousPage(Page<UserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<UserResource>.FromJson("users", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update User parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of User </returns>
-        public static UserResource Update(string pathServiceSid,
-                                          string pathSid,
-                                          string roleSid = null,
-                                          string attributes = null,
-                                          string friendlyName = null,
-                                          UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathServiceSid, pathSid){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="roleSid"> The role_sid </param>
-        /// <param name="attributes"> The attributes </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of User </returns>
-        public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathServiceSid,
-                                                                                  string pathSid,
-                                                                                  string roleSid = null,
-                                                                                  string attributes = null,
-                                                                                  string friendlyName = null,
-                                                                                  UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateUserOptions(pathServiceSid, pathSid){RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a UserResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UserResource object represented by the provided JSON </returns>
-        public static UserResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UserResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The attributes
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The role_sid
-        /// </summary>
-        [JsonProperty("role_sid")]
-        public string RoleSid { get; private set; }
-        /// <summary>
-        /// The identity
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The is_online
-        /// </summary>
-        [JsonProperty("is_online")]
-        public bool? IsOnline { get; private set; }
-        /// <summary>
-        /// The is_notifiable
-        /// </summary>
-        [JsonProperty("is_notifiable")]
-        public bool? IsNotifiable { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The joined_channels_count
-        /// </summary>
-        [JsonProperty("joined_channels_count")]
-        public int? JoinedChannelsCount { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private UserResource()
-        {
-
-        }
-    }
+{
+
+  public class UserResource : Resource
+  {
+    public sealed class WebhookEnabledTypeEnum : StringEnum
+    {
+      private WebhookEnabledTypeEnum(string value) : base(value) { }
+      public WebhookEnabledTypeEnum() { }
+      public static implicit operator WebhookEnabledTypeEnum(string value)
+      {
+        return new WebhookEnabledTypeEnum(value);
+      }
+
+      public static readonly WebhookEnabledTypeEnum True = new WebhookEnabledTypeEnum("true");
+      public static readonly WebhookEnabledTypeEnum False = new WebhookEnabledTypeEnum("false");
+    }
+
+    private static Request BuildFetchRequest(FetchUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(FetchUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(FetchUserOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> FetchAsync(string pathServiceSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchUserOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static bool Delete(DeleteUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUserOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteUserOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Users",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Create(CreateUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> CreateAsync(CreateUserOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Create(string pathServiceSid,
+                                      string identity,
+                                      string roleSid = null,
+                                      string attributes = null,
+                                      string friendlyName = null,
+                                      UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateUserOptions(pathServiceSid, identity) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="identity"> The identity </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> CreateAsync(string pathServiceSid,
+                                                                              string identity,
+                                                                              string roleSid = null,
+                                                                              string attributes = null,
+                                                                              string friendlyName = null,
+                                                                              UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateUserOptions(pathServiceSid, identity) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Users",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static ResourceSet<UserResource> Read(ReadUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UserResource>.FromJson("users", response.Content);
+      return new ResourceSet<UserResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(ReadUserOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UserResource>.FromJson("users", response.Content);
+      return new ResourceSet<UserResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static ResourceSet<UserResource> Read(string pathServiceSid,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadUserOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UserResource>> ReadAsync(string pathServiceSid,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadUserOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UserResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UserResource> NextPage(Page<UserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UserResource> PreviousPage(Page<UserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<UserResource>.FromJson("users", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathServiceSid + "/Users/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(UpdateUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update User parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(UpdateUserOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of User </returns>
+    public static UserResource Update(string pathServiceSid,
+                                      string pathSid,
+                                      string roleSid = null,
+                                      string attributes = null,
+                                      string friendlyName = null,
+                                      UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathServiceSid, pathSid) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="roleSid"> The role_sid </param>
+    /// <param name="attributes"> The attributes </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="xTwilioWebhookEnabled"> The X-Twilio-Webhook-Enabled HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of User </returns>
+    public static async System.Threading.Tasks.Task<UserResource> UpdateAsync(string pathServiceSid,
+                                                                              string pathSid,
+                                                                              string roleSid = null,
+                                                                              string attributes = null,
+                                                                              string friendlyName = null,
+                                                                              UserResource.WebhookEnabledTypeEnum xTwilioWebhookEnabled = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateUserOptions(pathServiceSid, pathSid) { RoleSid = roleSid, Attributes = attributes, FriendlyName = friendlyName, XTwilioWebhookEnabled = xTwilioWebhookEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a UserResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UserResource object represented by the provided JSON </returns>
+    public static UserResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UserResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The attributes
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The role_sid
+    /// </summary>
+    [JsonProperty("role_sid")]
+    public string RoleSid { get; private set; }
+    /// <summary>
+    /// The identity
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The is_online
+    /// </summary>
+    [JsonProperty("is_online")]
+    public bool? IsOnline { get; private set; }
+    /// <summary>
+    /// The is_notifiable
+    /// </summary>
+    [JsonProperty("is_notifiable")]
+    public bool? IsNotifiable { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The joined_channels_count
+    /// </summary>
+    [JsonProperty("joined_channels_count")]
+    public int? JoinedChannelsCount { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private UserResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/ServiceOptions.cs b/src/Twilio/Rest/IpMessaging/V2/ServiceOptions.cs
index e6ae62a60..c7d452d64 100644
--- a/src/Twilio/Rest/IpMessaging/V2/ServiceOptions.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/ServiceOptions.cs
@@ -10,427 +10,427 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.IpMessaging.V2
-{
-
+{
+
+  /// <summary>
+  /// FetchServiceOptions
+  /// </summary>
+  public class FetchServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// FetchServiceOptions
+    /// The sid
     /// </summary>
-    public class FetchServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public FetchServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteServiceOptions
+    /// Construct a new FetchServiceOptions
     /// </summary>
-    public class DeleteServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The sid </param>
+    public FetchServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// CreateServiceOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Construct a new CreateServiceOptions
-        /// </summary>
-        /// <param name="friendlyName"> The friendly_name </param>
-        public CreateServiceOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteServiceOptions
+  /// </summary>
+  public class DeleteServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// ReadServiceOptions
-    /// </summary>
-    public class ReadServiceOptions : ReadOptions<ServiceResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// UpdateServiceOptions
-    /// </summary>
-    public class UpdateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The default_service_role_sid
-        /// </summary>
-        public string DefaultServiceRoleSid { get; set; }
-        /// <summary>
-        /// The default_channel_role_sid
-        /// </summary>
-        public string DefaultChannelRoleSid { get; set; }
-        /// <summary>
-        /// The default_channel_creator_role_sid
-        /// </summary>
-        public string DefaultChannelCreatorRoleSid { get; set; }
-        /// <summary>
-        /// The read_status_enabled
-        /// </summary>
-        public bool? ReadStatusEnabled { get; set; }
-        /// <summary>
-        /// The reachability_enabled
-        /// </summary>
-        public bool? ReachabilityEnabled { get; set; }
-        /// <summary>
-        /// The typing_indicator_timeout
-        /// </summary>
-        public int? TypingIndicatorTimeout { get; set; }
-        /// <summary>
-        /// The consumption_report_interval
-        /// </summary>
-        public int? ConsumptionReportInterval { get; set; }
-        /// <summary>
-        /// The notifications.new_message.enabled
-        /// </summary>
-        public bool? NotificationsNewMessageEnabled { get; set; }
-        /// <summary>
-        /// The notifications.new_message.template
-        /// </summary>
-        public string NotificationsNewMessageTemplate { get; set; }
-        /// <summary>
-        /// The notifications.new_message.sound
-        /// </summary>
-        public string NotificationsNewMessageSound { get; set; }
-        /// <summary>
-        /// The notifications.new_message.badge_count_enabled
-        /// </summary>
-        public bool? NotificationsNewMessageBadgeCountEnabled { get; set; }
-        /// <summary>
-        /// The notifications.added_to_channel.enabled
-        /// </summary>
-        public bool? NotificationsAddedToChannelEnabled { get; set; }
-        /// <summary>
-        /// The notifications.added_to_channel.template
-        /// </summary>
-        public string NotificationsAddedToChannelTemplate { get; set; }
-        /// <summary>
-        /// The notifications.added_to_channel.sound
-        /// </summary>
-        public string NotificationsAddedToChannelSound { get; set; }
-        /// <summary>
-        /// The notifications.removed_from_channel.enabled
-        /// </summary>
-        public bool? NotificationsRemovedFromChannelEnabled { get; set; }
-        /// <summary>
-        /// The notifications.removed_from_channel.template
-        /// </summary>
-        public string NotificationsRemovedFromChannelTemplate { get; set; }
-        /// <summary>
-        /// The notifications.removed_from_channel.sound
-        /// </summary>
-        public string NotificationsRemovedFromChannelSound { get; set; }
-        /// <summary>
-        /// The notifications.invited_to_channel.enabled
-        /// </summary>
-        public bool? NotificationsInvitedToChannelEnabled { get; set; }
-        /// <summary>
-        /// The notifications.invited_to_channel.template
-        /// </summary>
-        public string NotificationsInvitedToChannelTemplate { get; set; }
-        /// <summary>
-        /// The notifications.invited_to_channel.sound
-        /// </summary>
-        public string NotificationsInvitedToChannelSound { get; set; }
-        /// <summary>
-        /// The pre_webhook_url
-        /// </summary>
-        public Uri PreWebhookUrl { get; set; }
-        /// <summary>
-        /// The post_webhook_url
-        /// </summary>
-        public Uri PostWebhookUrl { get; set; }
-        /// <summary>
-        /// The webhook_method
-        /// </summary>
-        public Twilio.Http.HttpMethod WebhookMethod { get; set; }
-        /// <summary>
-        /// The webhook_filters
-        /// </summary>
-        public List<string> WebhookFilters { get; set; }
-        /// <summary>
-        /// The limits.channel_members
-        /// </summary>
-        public int? LimitsChannelMembers { get; set; }
-        /// <summary>
-        /// The limits.user_channels
-        /// </summary>
-        public int? LimitsUserChannels { get; set; }
-        /// <summary>
-        /// The media.compatibility_message
-        /// </summary>
-        public string MediaCompatibilityMessage { get; set; }
-        /// <summary>
-        /// The pre_webhook_retry_count
-        /// </summary>
-        public int? PreWebhookRetryCount { get; set; }
-        /// <summary>
-        /// The post_webhook_retry_count
-        /// </summary>
-        public int? PostWebhookRetryCount { get; set; }
-        /// <summary>
-        /// The notifications.log_enabled
-        /// </summary>
-        public bool? NotificationsLogEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-            WebhookFilters = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DefaultServiceRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultServiceRoleSid", DefaultServiceRoleSid.ToString()));
-            }
-
-            if (DefaultChannelRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultChannelRoleSid", DefaultChannelRoleSid.ToString()));
-            }
-
-            if (DefaultChannelCreatorRoleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultChannelCreatorRoleSid", DefaultChannelCreatorRoleSid.ToString()));
-            }
-
-            if (ReadStatusEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReadStatusEnabled", ReadStatusEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ReachabilityEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReachabilityEnabled", ReachabilityEnabled.Value.ToString().ToLower()));
-            }
-
-            if (TypingIndicatorTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TypingIndicatorTimeout", TypingIndicatorTimeout.ToString()));
-            }
-
-            if (ConsumptionReportInterval != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConsumptionReportInterval", ConsumptionReportInterval.ToString()));
-            }
-
-            if (NotificationsNewMessageEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Enabled", NotificationsNewMessageEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsNewMessageTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Template", NotificationsNewMessageTemplate));
-            }
-
-            if (NotificationsNewMessageSound != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Sound", NotificationsNewMessageSound));
-            }
-
-            if (NotificationsNewMessageBadgeCountEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.BadgeCountEnabled", NotificationsNewMessageBadgeCountEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsAddedToChannelEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Enabled", NotificationsAddedToChannelEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsAddedToChannelTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Template", NotificationsAddedToChannelTemplate));
-            }
-
-            if (NotificationsAddedToChannelSound != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Sound", NotificationsAddedToChannelSound));
-            }
-
-            if (NotificationsRemovedFromChannelEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Enabled", NotificationsRemovedFromChannelEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsRemovedFromChannelTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Template", NotificationsRemovedFromChannelTemplate));
-            }
-
-            if (NotificationsRemovedFromChannelSound != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Sound", NotificationsRemovedFromChannelSound));
-            }
-
-            if (NotificationsInvitedToChannelEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Enabled", NotificationsInvitedToChannelEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NotificationsInvitedToChannelTemplate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Template", NotificationsInvitedToChannelTemplate));
-            }
-
-            if (NotificationsInvitedToChannelSound != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Sound", NotificationsInvitedToChannelSound));
-            }
-
-            if (PreWebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PreWebhookUrl", Serializers.Url(PreWebhookUrl)));
-            }
-
-            if (PostWebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostWebhookUrl", Serializers.Url(PostWebhookUrl)));
-            }
-
-            if (WebhookMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod.ToString()));
-            }
-
-            if (WebhookFilters != null)
-            {
-                p.AddRange(WebhookFilters.Select(prop => new KeyValuePair<string, string>("WebhookFilters", prop)));
-            }
-
-            if (LimitsChannelMembers != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Limits.ChannelMembers", LimitsChannelMembers.ToString()));
-            }
-
-            if (LimitsUserChannels != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Limits.UserChannels", LimitsUserChannels.ToString()));
-            }
-
-            if (MediaCompatibilityMessage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Media.CompatibilityMessage", MediaCompatibilityMessage));
-            }
-
-            if (PreWebhookRetryCount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PreWebhookRetryCount", PreWebhookRetryCount.ToString()));
-            }
-
-            if (PostWebhookRetryCount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostWebhookRetryCount", PostWebhookRetryCount.ToString()));
-            }
-
-            if (NotificationsLogEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Notifications.LogEnabled", NotificationsLogEnabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new DeleteServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateServiceOptions
+  /// </summary>
+  public class CreateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; }
+
+    /// <summary>
+    /// Construct a new CreateServiceOptions
+    /// </summary>
+    /// <param name="friendlyName"> The friendly_name </param>
+    public CreateServiceOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadServiceOptions
+  /// </summary>
+  public class ReadServiceOptions : ReadOptions<ServiceResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateServiceOptions
+  /// </summary>
+  public class UpdateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The default_service_role_sid
+    /// </summary>
+    public string DefaultServiceRoleSid { get; set; }
+    /// <summary>
+    /// The default_channel_role_sid
+    /// </summary>
+    public string DefaultChannelRoleSid { get; set; }
+    /// <summary>
+    /// The default_channel_creator_role_sid
+    /// </summary>
+    public string DefaultChannelCreatorRoleSid { get; set; }
+    /// <summary>
+    /// The read_status_enabled
+    /// </summary>
+    public bool? ReadStatusEnabled { get; set; }
+    /// <summary>
+    /// The reachability_enabled
+    /// </summary>
+    public bool? ReachabilityEnabled { get; set; }
+    /// <summary>
+    /// The typing_indicator_timeout
+    /// </summary>
+    public int? TypingIndicatorTimeout { get; set; }
+    /// <summary>
+    /// The consumption_report_interval
+    /// </summary>
+    public int? ConsumptionReportInterval { get; set; }
+    /// <summary>
+    /// The notifications.new_message.enabled
+    /// </summary>
+    public bool? NotificationsNewMessageEnabled { get; set; }
+    /// <summary>
+    /// The notifications.new_message.template
+    /// </summary>
+    public string NotificationsNewMessageTemplate { get; set; }
+    /// <summary>
+    /// The notifications.new_message.sound
+    /// </summary>
+    public string NotificationsNewMessageSound { get; set; }
+    /// <summary>
+    /// The notifications.new_message.badge_count_enabled
+    /// </summary>
+    public bool? NotificationsNewMessageBadgeCountEnabled { get; set; }
+    /// <summary>
+    /// The notifications.added_to_channel.enabled
+    /// </summary>
+    public bool? NotificationsAddedToChannelEnabled { get; set; }
+    /// <summary>
+    /// The notifications.added_to_channel.template
+    /// </summary>
+    public string NotificationsAddedToChannelTemplate { get; set; }
+    /// <summary>
+    /// The notifications.added_to_channel.sound
+    /// </summary>
+    public string NotificationsAddedToChannelSound { get; set; }
+    /// <summary>
+    /// The notifications.removed_from_channel.enabled
+    /// </summary>
+    public bool? NotificationsRemovedFromChannelEnabled { get; set; }
+    /// <summary>
+    /// The notifications.removed_from_channel.template
+    /// </summary>
+    public string NotificationsRemovedFromChannelTemplate { get; set; }
+    /// <summary>
+    /// The notifications.removed_from_channel.sound
+    /// </summary>
+    public string NotificationsRemovedFromChannelSound { get; set; }
+    /// <summary>
+    /// The notifications.invited_to_channel.enabled
+    /// </summary>
+    public bool? NotificationsInvitedToChannelEnabled { get; set; }
+    /// <summary>
+    /// The notifications.invited_to_channel.template
+    /// </summary>
+    public string NotificationsInvitedToChannelTemplate { get; set; }
+    /// <summary>
+    /// The notifications.invited_to_channel.sound
+    /// </summary>
+    public string NotificationsInvitedToChannelSound { get; set; }
+    /// <summary>
+    /// The pre_webhook_url
+    /// </summary>
+    public Uri PreWebhookUrl { get; set; }
+    /// <summary>
+    /// The post_webhook_url
+    /// </summary>
+    public Uri PostWebhookUrl { get; set; }
+    /// <summary>
+    /// The webhook_method
+    /// </summary>
+    public Twilio.Http.HttpMethod WebhookMethod { get; set; }
+    /// <summary>
+    /// The webhook_filters
+    /// </summary>
+    public List<string> WebhookFilters { get; set; }
+    /// <summary>
+    /// The limits.channel_members
+    /// </summary>
+    public int? LimitsChannelMembers { get; set; }
+    /// <summary>
+    /// The limits.user_channels
+    /// </summary>
+    public int? LimitsUserChannels { get; set; }
+    /// <summary>
+    /// The media.compatibility_message
+    /// </summary>
+    public string MediaCompatibilityMessage { get; set; }
+    /// <summary>
+    /// The pre_webhook_retry_count
+    /// </summary>
+    public int? PreWebhookRetryCount { get; set; }
+    /// <summary>
+    /// The post_webhook_retry_count
+    /// </summary>
+    public int? PostWebhookRetryCount { get; set; }
+    /// <summary>
+    /// The notifications.log_enabled
+    /// </summary>
+    public bool? NotificationsLogEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+      WebhookFilters = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DefaultServiceRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultServiceRoleSid", DefaultServiceRoleSid.ToString()));
+      }
+
+      if (DefaultChannelRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultChannelRoleSid", DefaultChannelRoleSid.ToString()));
+      }
+
+      if (DefaultChannelCreatorRoleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultChannelCreatorRoleSid", DefaultChannelCreatorRoleSid.ToString()));
+      }
+
+      if (ReadStatusEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReadStatusEnabled", ReadStatusEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ReachabilityEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReachabilityEnabled", ReachabilityEnabled.Value.ToString().ToLower()));
+      }
+
+      if (TypingIndicatorTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TypingIndicatorTimeout", TypingIndicatorTimeout.ToString()));
+      }
+
+      if (ConsumptionReportInterval != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConsumptionReportInterval", ConsumptionReportInterval.ToString()));
+      }
+
+      if (NotificationsNewMessageEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Enabled", NotificationsNewMessageEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsNewMessageTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Template", NotificationsNewMessageTemplate));
+      }
+
+      if (NotificationsNewMessageSound != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.Sound", NotificationsNewMessageSound));
+      }
+
+      if (NotificationsNewMessageBadgeCountEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.NewMessage.BadgeCountEnabled", NotificationsNewMessageBadgeCountEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsAddedToChannelEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Enabled", NotificationsAddedToChannelEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsAddedToChannelTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Template", NotificationsAddedToChannelTemplate));
+      }
+
+      if (NotificationsAddedToChannelSound != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.AddedToChannel.Sound", NotificationsAddedToChannelSound));
+      }
+
+      if (NotificationsRemovedFromChannelEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Enabled", NotificationsRemovedFromChannelEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsRemovedFromChannelTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Template", NotificationsRemovedFromChannelTemplate));
+      }
+
+      if (NotificationsRemovedFromChannelSound != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.RemovedFromChannel.Sound", NotificationsRemovedFromChannelSound));
+      }
+
+      if (NotificationsInvitedToChannelEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Enabled", NotificationsInvitedToChannelEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NotificationsInvitedToChannelTemplate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Template", NotificationsInvitedToChannelTemplate));
+      }
+
+      if (NotificationsInvitedToChannelSound != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.InvitedToChannel.Sound", NotificationsInvitedToChannelSound));
+      }
+
+      if (PreWebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PreWebhookUrl", Serializers.Url(PreWebhookUrl)));
+      }
+
+      if (PostWebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostWebhookUrl", Serializers.Url(PostWebhookUrl)));
+      }
+
+      if (WebhookMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod.ToString()));
+      }
+
+      if (WebhookFilters != null)
+      {
+        p.AddRange(WebhookFilters.Select(prop => new KeyValuePair<string, string>("WebhookFilters", prop)));
+      }
+
+      if (LimitsChannelMembers != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Limits.ChannelMembers", LimitsChannelMembers.ToString()));
+      }
+
+      if (LimitsUserChannels != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Limits.UserChannels", LimitsUserChannels.ToString()));
+      }
+
+      if (MediaCompatibilityMessage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Media.CompatibilityMessage", MediaCompatibilityMessage));
+      }
+
+      if (PreWebhookRetryCount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PreWebhookRetryCount", PreWebhookRetryCount.ToString()));
+      }
+
+      if (PostWebhookRetryCount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostWebhookRetryCount", PostWebhookRetryCount.ToString()));
+      }
+
+      if (NotificationsLogEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Notifications.LogEnabled", NotificationsLogEnabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/IpMessaging/V2/ServiceResource.cs b/src/Twilio/Rest/IpMessaging/V2/ServiceResource.cs
index 0e334c6ca..d20ecdcd7 100644
--- a/src/Twilio/Rest/IpMessaging/V2/ServiceResource.cs
+++ b/src/Twilio/Rest/IpMessaging/V2/ServiceResource.cs
@@ -16,669 +16,669 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.IpMessaging.V2
-{
-
-    public class ServiceResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(string friendlyName, ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.IpMessaging,
-                "/v2/Services",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.IpMessaging,
-                "/v2/Services/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="defaultServiceRoleSid"> The default_service_role_sid </param>
-        /// <param name="defaultChannelRoleSid"> The default_channel_role_sid </param>
-        /// <param name="defaultChannelCreatorRoleSid"> The default_channel_creator_role_sid </param>
-        /// <param name="readStatusEnabled"> The read_status_enabled </param>
-        /// <param name="reachabilityEnabled"> The reachability_enabled </param>
-        /// <param name="typingIndicatorTimeout"> The typing_indicator_timeout </param>
-        /// <param name="consumptionReportInterval"> The consumption_report_interval </param>
-        /// <param name="notificationsNewMessageEnabled"> The notifications.new_message.enabled </param>
-        /// <param name="notificationsNewMessageTemplate"> The notifications.new_message.template </param>
-        /// <param name="notificationsNewMessageSound"> The notifications.new_message.sound </param>
-        /// <param name="notificationsNewMessageBadgeCountEnabled"> The notifications.new_message.badge_count_enabled </param>
-        /// <param name="notificationsAddedToChannelEnabled"> The notifications.added_to_channel.enabled </param>
-        /// <param name="notificationsAddedToChannelTemplate"> The notifications.added_to_channel.template </param>
-        /// <param name="notificationsAddedToChannelSound"> The notifications.added_to_channel.sound </param>
-        /// <param name="notificationsRemovedFromChannelEnabled"> The notifications.removed_from_channel.enabled </param>
-        /// <param name="notificationsRemovedFromChannelTemplate"> The notifications.removed_from_channel.template </param>
-        /// <param name="notificationsRemovedFromChannelSound"> The notifications.removed_from_channel.sound </param>
-        /// <param name="notificationsInvitedToChannelEnabled"> The notifications.invited_to_channel.enabled </param>
-        /// <param name="notificationsInvitedToChannelTemplate"> The notifications.invited_to_channel.template </param>
-        /// <param name="notificationsInvitedToChannelSound"> The notifications.invited_to_channel.sound </param>
-        /// <param name="preWebhookUrl"> The pre_webhook_url </param>
-        /// <param name="postWebhookUrl"> The post_webhook_url </param>
-        /// <param name="webhookMethod"> The webhook_method </param>
-        /// <param name="webhookFilters"> The webhook_filters </param>
-        /// <param name="limitsChannelMembers"> The limits.channel_members </param>
-        /// <param name="limitsUserChannels"> The limits.user_channels </param>
-        /// <param name="mediaCompatibilityMessage"> The media.compatibility_message </param>
-        /// <param name="preWebhookRetryCount"> The pre_webhook_retry_count </param>
-        /// <param name="postWebhookRetryCount"> The post_webhook_retry_count </param>
-        /// <param name="notificationsLogEnabled"> The notifications.log_enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(string pathSid,
-                                             string friendlyName = null,
-                                             string defaultServiceRoleSid = null,
-                                             string defaultChannelRoleSid = null,
-                                             string defaultChannelCreatorRoleSid = null,
-                                             bool? readStatusEnabled = null,
-                                             bool? reachabilityEnabled = null,
-                                             int? typingIndicatorTimeout = null,
-                                             int? consumptionReportInterval = null,
-                                             bool? notificationsNewMessageEnabled = null,
-                                             string notificationsNewMessageTemplate = null,
-                                             string notificationsNewMessageSound = null,
-                                             bool? notificationsNewMessageBadgeCountEnabled = null,
-                                             bool? notificationsAddedToChannelEnabled = null,
-                                             string notificationsAddedToChannelTemplate = null,
-                                             string notificationsAddedToChannelSound = null,
-                                             bool? notificationsRemovedFromChannelEnabled = null,
-                                             string notificationsRemovedFromChannelTemplate = null,
-                                             string notificationsRemovedFromChannelSound = null,
-                                             bool? notificationsInvitedToChannelEnabled = null,
-                                             string notificationsInvitedToChannelTemplate = null,
-                                             string notificationsInvitedToChannelSound = null,
-                                             Uri preWebhookUrl = null,
-                                             Uri postWebhookUrl = null,
-                                             Twilio.Http.HttpMethod webhookMethod = null,
-                                             List<string> webhookFilters = null,
-                                             int? limitsChannelMembers = null,
-                                             int? limitsUserChannels = null,
-                                             string mediaCompatibilityMessage = null,
-                                             int? preWebhookRetryCount = null,
-                                             int? postWebhookRetryCount = null,
-                                             bool? notificationsLogEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsNewMessageSound = notificationsNewMessageSound, NotificationsNewMessageBadgeCountEnabled = notificationsNewMessageBadgeCountEnabled, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsAddedToChannelSound = notificationsAddedToChannelSound, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsRemovedFromChannelSound = notificationsRemovedFromChannelSound, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, NotificationsInvitedToChannelSound = notificationsInvitedToChannelSound, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels, MediaCompatibilityMessage = mediaCompatibilityMessage, PreWebhookRetryCount = preWebhookRetryCount, PostWebhookRetryCount = postWebhookRetryCount, NotificationsLogEnabled = notificationsLogEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="defaultServiceRoleSid"> The default_service_role_sid </param>
-        /// <param name="defaultChannelRoleSid"> The default_channel_role_sid </param>
-        /// <param name="defaultChannelCreatorRoleSid"> The default_channel_creator_role_sid </param>
-        /// <param name="readStatusEnabled"> The read_status_enabled </param>
-        /// <param name="reachabilityEnabled"> The reachability_enabled </param>
-        /// <param name="typingIndicatorTimeout"> The typing_indicator_timeout </param>
-        /// <param name="consumptionReportInterval"> The consumption_report_interval </param>
-        /// <param name="notificationsNewMessageEnabled"> The notifications.new_message.enabled </param>
-        /// <param name="notificationsNewMessageTemplate"> The notifications.new_message.template </param>
-        /// <param name="notificationsNewMessageSound"> The notifications.new_message.sound </param>
-        /// <param name="notificationsNewMessageBadgeCountEnabled"> The notifications.new_message.badge_count_enabled </param>
-        /// <param name="notificationsAddedToChannelEnabled"> The notifications.added_to_channel.enabled </param>
-        /// <param name="notificationsAddedToChannelTemplate"> The notifications.added_to_channel.template </param>
-        /// <param name="notificationsAddedToChannelSound"> The notifications.added_to_channel.sound </param>
-        /// <param name="notificationsRemovedFromChannelEnabled"> The notifications.removed_from_channel.enabled </param>
-        /// <param name="notificationsRemovedFromChannelTemplate"> The notifications.removed_from_channel.template </param>
-        /// <param name="notificationsRemovedFromChannelSound"> The notifications.removed_from_channel.sound </param>
-        /// <param name="notificationsInvitedToChannelEnabled"> The notifications.invited_to_channel.enabled </param>
-        /// <param name="notificationsInvitedToChannelTemplate"> The notifications.invited_to_channel.template </param>
-        /// <param name="notificationsInvitedToChannelSound"> The notifications.invited_to_channel.sound </param>
-        /// <param name="preWebhookUrl"> The pre_webhook_url </param>
-        /// <param name="postWebhookUrl"> The post_webhook_url </param>
-        /// <param name="webhookMethod"> The webhook_method </param>
-        /// <param name="webhookFilters"> The webhook_filters </param>
-        /// <param name="limitsChannelMembers"> The limits.channel_members </param>
-        /// <param name="limitsUserChannels"> The limits.user_channels </param>
-        /// <param name="mediaCompatibilityMessage"> The media.compatibility_message </param>
-        /// <param name="preWebhookRetryCount"> The pre_webhook_retry_count </param>
-        /// <param name="postWebhookRetryCount"> The post_webhook_retry_count </param>
-        /// <param name="notificationsLogEnabled"> The notifications.log_enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     string defaultServiceRoleSid = null,
-                                                                                     string defaultChannelRoleSid = null,
-                                                                                     string defaultChannelCreatorRoleSid = null,
-                                                                                     bool? readStatusEnabled = null,
-                                                                                     bool? reachabilityEnabled = null,
-                                                                                     int? typingIndicatorTimeout = null,
-                                                                                     int? consumptionReportInterval = null,
-                                                                                     bool? notificationsNewMessageEnabled = null,
-                                                                                     string notificationsNewMessageTemplate = null,
-                                                                                     string notificationsNewMessageSound = null,
-                                                                                     bool? notificationsNewMessageBadgeCountEnabled = null,
-                                                                                     bool? notificationsAddedToChannelEnabled = null,
-                                                                                     string notificationsAddedToChannelTemplate = null,
-                                                                                     string notificationsAddedToChannelSound = null,
-                                                                                     bool? notificationsRemovedFromChannelEnabled = null,
-                                                                                     string notificationsRemovedFromChannelTemplate = null,
-                                                                                     string notificationsRemovedFromChannelSound = null,
-                                                                                     bool? notificationsInvitedToChannelEnabled = null,
-                                                                                     string notificationsInvitedToChannelTemplate = null,
-                                                                                     string notificationsInvitedToChannelSound = null,
-                                                                                     Uri preWebhookUrl = null,
-                                                                                     Uri postWebhookUrl = null,
-                                                                                     Twilio.Http.HttpMethod webhookMethod = null,
-                                                                                     List<string> webhookFilters = null,
-                                                                                     int? limitsChannelMembers = null,
-                                                                                     int? limitsUserChannels = null,
-                                                                                     string mediaCompatibilityMessage = null,
-                                                                                     int? preWebhookRetryCount = null,
-                                                                                     int? postWebhookRetryCount = null,
-                                                                                     bool? notificationsLogEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsNewMessageSound = notificationsNewMessageSound, NotificationsNewMessageBadgeCountEnabled = notificationsNewMessageBadgeCountEnabled, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsAddedToChannelSound = notificationsAddedToChannelSound, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsRemovedFromChannelSound = notificationsRemovedFromChannelSound, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, NotificationsInvitedToChannelSound = notificationsInvitedToChannelSound, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels, MediaCompatibilityMessage = mediaCompatibilityMessage, PreWebhookRetryCount = preWebhookRetryCount, PostWebhookRetryCount = postWebhookRetryCount, NotificationsLogEnabled = notificationsLogEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ServiceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ServiceResource object represented by the provided JSON </returns>
-        public static ServiceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ServiceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The default_service_role_sid
-        /// </summary>
-        [JsonProperty("default_service_role_sid")]
-        public string DefaultServiceRoleSid { get; private set; }
-        /// <summary>
-        /// The default_channel_role_sid
-        /// </summary>
-        [JsonProperty("default_channel_role_sid")]
-        public string DefaultChannelRoleSid { get; private set; }
-        /// <summary>
-        /// The default_channel_creator_role_sid
-        /// </summary>
-        [JsonProperty("default_channel_creator_role_sid")]
-        public string DefaultChannelCreatorRoleSid { get; private set; }
-        /// <summary>
-        /// The read_status_enabled
-        /// </summary>
-        [JsonProperty("read_status_enabled")]
-        public bool? ReadStatusEnabled { get; private set; }
-        /// <summary>
-        /// The reachability_enabled
-        /// </summary>
-        [JsonProperty("reachability_enabled")]
-        public bool? ReachabilityEnabled { get; private set; }
-        /// <summary>
-        /// The typing_indicator_timeout
-        /// </summary>
-        [JsonProperty("typing_indicator_timeout")]
-        public int? TypingIndicatorTimeout { get; private set; }
-        /// <summary>
-        /// The consumption_report_interval
-        /// </summary>
-        [JsonProperty("consumption_report_interval")]
-        public int? ConsumptionReportInterval { get; private set; }
-        /// <summary>
-        /// The limits
-        /// </summary>
-        [JsonProperty("limits")]
-        public object Limits { get; private set; }
-        /// <summary>
-        /// The pre_webhook_url
-        /// </summary>
-        [JsonProperty("pre_webhook_url")]
-        public string PreWebhookUrl { get; private set; }
-        /// <summary>
-        /// The post_webhook_url
-        /// </summary>
-        [JsonProperty("post_webhook_url")]
-        public string PostWebhookUrl { get; private set; }
-        /// <summary>
-        /// The webhook_method
-        /// </summary>
-        [JsonProperty("webhook_method")]
-        public string WebhookMethod { get; private set; }
-        /// <summary>
-        /// The webhook_filters
-        /// </summary>
-        [JsonProperty("webhook_filters")]
-        public List<string> WebhookFilters { get; private set; }
-        /// <summary>
-        /// The pre_webhook_retry_count
-        /// </summary>
-        [JsonProperty("pre_webhook_retry_count")]
-        public int? PreWebhookRetryCount { get; private set; }
-        /// <summary>
-        /// The post_webhook_retry_count
-        /// </summary>
-        [JsonProperty("post_webhook_retry_count")]
-        public int? PostWebhookRetryCount { get; private set; }
-        /// <summary>
-        /// The notifications
-        /// </summary>
-        [JsonProperty("notifications")]
-        public object Notifications { get; private set; }
-        /// <summary>
-        /// The media
-        /// </summary>
-        [JsonProperty("media")]
-        public object Media { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ServiceResource()
-        {
-
-        }
-    }
+{
+
+  public class ServiceResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(string friendlyName, ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.IpMessaging,
+          "/v2/Services",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.IpMessaging)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.IpMessaging,
+          "/v2/Services/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="defaultServiceRoleSid"> The default_service_role_sid </param>
+    /// <param name="defaultChannelRoleSid"> The default_channel_role_sid </param>
+    /// <param name="defaultChannelCreatorRoleSid"> The default_channel_creator_role_sid </param>
+    /// <param name="readStatusEnabled"> The read_status_enabled </param>
+    /// <param name="reachabilityEnabled"> The reachability_enabled </param>
+    /// <param name="typingIndicatorTimeout"> The typing_indicator_timeout </param>
+    /// <param name="consumptionReportInterval"> The consumption_report_interval </param>
+    /// <param name="notificationsNewMessageEnabled"> The notifications.new_message.enabled </param>
+    /// <param name="notificationsNewMessageTemplate"> The notifications.new_message.template </param>
+    /// <param name="notificationsNewMessageSound"> The notifications.new_message.sound </param>
+    /// <param name="notificationsNewMessageBadgeCountEnabled"> The notifications.new_message.badge_count_enabled </param>
+    /// <param name="notificationsAddedToChannelEnabled"> The notifications.added_to_channel.enabled </param>
+    /// <param name="notificationsAddedToChannelTemplate"> The notifications.added_to_channel.template </param>
+    /// <param name="notificationsAddedToChannelSound"> The notifications.added_to_channel.sound </param>
+    /// <param name="notificationsRemovedFromChannelEnabled"> The notifications.removed_from_channel.enabled </param>
+    /// <param name="notificationsRemovedFromChannelTemplate"> The notifications.removed_from_channel.template </param>
+    /// <param name="notificationsRemovedFromChannelSound"> The notifications.removed_from_channel.sound </param>
+    /// <param name="notificationsInvitedToChannelEnabled"> The notifications.invited_to_channel.enabled </param>
+    /// <param name="notificationsInvitedToChannelTemplate"> The notifications.invited_to_channel.template </param>
+    /// <param name="notificationsInvitedToChannelSound"> The notifications.invited_to_channel.sound </param>
+    /// <param name="preWebhookUrl"> The pre_webhook_url </param>
+    /// <param name="postWebhookUrl"> The post_webhook_url </param>
+    /// <param name="webhookMethod"> The webhook_method </param>
+    /// <param name="webhookFilters"> The webhook_filters </param>
+    /// <param name="limitsChannelMembers"> The limits.channel_members </param>
+    /// <param name="limitsUserChannels"> The limits.user_channels </param>
+    /// <param name="mediaCompatibilityMessage"> The media.compatibility_message </param>
+    /// <param name="preWebhookRetryCount"> The pre_webhook_retry_count </param>
+    /// <param name="postWebhookRetryCount"> The post_webhook_retry_count </param>
+    /// <param name="notificationsLogEnabled"> The notifications.log_enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(string pathSid,
+                                         string friendlyName = null,
+                                         string defaultServiceRoleSid = null,
+                                         string defaultChannelRoleSid = null,
+                                         string defaultChannelCreatorRoleSid = null,
+                                         bool? readStatusEnabled = null,
+                                         bool? reachabilityEnabled = null,
+                                         int? typingIndicatorTimeout = null,
+                                         int? consumptionReportInterval = null,
+                                         bool? notificationsNewMessageEnabled = null,
+                                         string notificationsNewMessageTemplate = null,
+                                         string notificationsNewMessageSound = null,
+                                         bool? notificationsNewMessageBadgeCountEnabled = null,
+                                         bool? notificationsAddedToChannelEnabled = null,
+                                         string notificationsAddedToChannelTemplate = null,
+                                         string notificationsAddedToChannelSound = null,
+                                         bool? notificationsRemovedFromChannelEnabled = null,
+                                         string notificationsRemovedFromChannelTemplate = null,
+                                         string notificationsRemovedFromChannelSound = null,
+                                         bool? notificationsInvitedToChannelEnabled = null,
+                                         string notificationsInvitedToChannelTemplate = null,
+                                         string notificationsInvitedToChannelSound = null,
+                                         Uri preWebhookUrl = null,
+                                         Uri postWebhookUrl = null,
+                                         Twilio.Http.HttpMethod webhookMethod = null,
+                                         List<string> webhookFilters = null,
+                                         int? limitsChannelMembers = null,
+                                         int? limitsUserChannels = null,
+                                         string mediaCompatibilityMessage = null,
+                                         int? preWebhookRetryCount = null,
+                                         int? postWebhookRetryCount = null,
+                                         bool? notificationsLogEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsNewMessageSound = notificationsNewMessageSound, NotificationsNewMessageBadgeCountEnabled = notificationsNewMessageBadgeCountEnabled, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsAddedToChannelSound = notificationsAddedToChannelSound, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsRemovedFromChannelSound = notificationsRemovedFromChannelSound, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, NotificationsInvitedToChannelSound = notificationsInvitedToChannelSound, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels, MediaCompatibilityMessage = mediaCompatibilityMessage, PreWebhookRetryCount = preWebhookRetryCount, PostWebhookRetryCount = postWebhookRetryCount, NotificationsLogEnabled = notificationsLogEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="defaultServiceRoleSid"> The default_service_role_sid </param>
+    /// <param name="defaultChannelRoleSid"> The default_channel_role_sid </param>
+    /// <param name="defaultChannelCreatorRoleSid"> The default_channel_creator_role_sid </param>
+    /// <param name="readStatusEnabled"> The read_status_enabled </param>
+    /// <param name="reachabilityEnabled"> The reachability_enabled </param>
+    /// <param name="typingIndicatorTimeout"> The typing_indicator_timeout </param>
+    /// <param name="consumptionReportInterval"> The consumption_report_interval </param>
+    /// <param name="notificationsNewMessageEnabled"> The notifications.new_message.enabled </param>
+    /// <param name="notificationsNewMessageTemplate"> The notifications.new_message.template </param>
+    /// <param name="notificationsNewMessageSound"> The notifications.new_message.sound </param>
+    /// <param name="notificationsNewMessageBadgeCountEnabled"> The notifications.new_message.badge_count_enabled </param>
+    /// <param name="notificationsAddedToChannelEnabled"> The notifications.added_to_channel.enabled </param>
+    /// <param name="notificationsAddedToChannelTemplate"> The notifications.added_to_channel.template </param>
+    /// <param name="notificationsAddedToChannelSound"> The notifications.added_to_channel.sound </param>
+    /// <param name="notificationsRemovedFromChannelEnabled"> The notifications.removed_from_channel.enabled </param>
+    /// <param name="notificationsRemovedFromChannelTemplate"> The notifications.removed_from_channel.template </param>
+    /// <param name="notificationsRemovedFromChannelSound"> The notifications.removed_from_channel.sound </param>
+    /// <param name="notificationsInvitedToChannelEnabled"> The notifications.invited_to_channel.enabled </param>
+    /// <param name="notificationsInvitedToChannelTemplate"> The notifications.invited_to_channel.template </param>
+    /// <param name="notificationsInvitedToChannelSound"> The notifications.invited_to_channel.sound </param>
+    /// <param name="preWebhookUrl"> The pre_webhook_url </param>
+    /// <param name="postWebhookUrl"> The post_webhook_url </param>
+    /// <param name="webhookMethod"> The webhook_method </param>
+    /// <param name="webhookFilters"> The webhook_filters </param>
+    /// <param name="limitsChannelMembers"> The limits.channel_members </param>
+    /// <param name="limitsUserChannels"> The limits.user_channels </param>
+    /// <param name="mediaCompatibilityMessage"> The media.compatibility_message </param>
+    /// <param name="preWebhookRetryCount"> The pre_webhook_retry_count </param>
+    /// <param name="postWebhookRetryCount"> The post_webhook_retry_count </param>
+    /// <param name="notificationsLogEnabled"> The notifications.log_enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 string defaultServiceRoleSid = null,
+                                                                                 string defaultChannelRoleSid = null,
+                                                                                 string defaultChannelCreatorRoleSid = null,
+                                                                                 bool? readStatusEnabled = null,
+                                                                                 bool? reachabilityEnabled = null,
+                                                                                 int? typingIndicatorTimeout = null,
+                                                                                 int? consumptionReportInterval = null,
+                                                                                 bool? notificationsNewMessageEnabled = null,
+                                                                                 string notificationsNewMessageTemplate = null,
+                                                                                 string notificationsNewMessageSound = null,
+                                                                                 bool? notificationsNewMessageBadgeCountEnabled = null,
+                                                                                 bool? notificationsAddedToChannelEnabled = null,
+                                                                                 string notificationsAddedToChannelTemplate = null,
+                                                                                 string notificationsAddedToChannelSound = null,
+                                                                                 bool? notificationsRemovedFromChannelEnabled = null,
+                                                                                 string notificationsRemovedFromChannelTemplate = null,
+                                                                                 string notificationsRemovedFromChannelSound = null,
+                                                                                 bool? notificationsInvitedToChannelEnabled = null,
+                                                                                 string notificationsInvitedToChannelTemplate = null,
+                                                                                 string notificationsInvitedToChannelSound = null,
+                                                                                 Uri preWebhookUrl = null,
+                                                                                 Uri postWebhookUrl = null,
+                                                                                 Twilio.Http.HttpMethod webhookMethod = null,
+                                                                                 List<string> webhookFilters = null,
+                                                                                 int? limitsChannelMembers = null,
+                                                                                 int? limitsUserChannels = null,
+                                                                                 string mediaCompatibilityMessage = null,
+                                                                                 int? preWebhookRetryCount = null,
+                                                                                 int? postWebhookRetryCount = null,
+                                                                                 bool? notificationsLogEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, DefaultServiceRoleSid = defaultServiceRoleSid, DefaultChannelRoleSid = defaultChannelRoleSid, DefaultChannelCreatorRoleSid = defaultChannelCreatorRoleSid, ReadStatusEnabled = readStatusEnabled, ReachabilityEnabled = reachabilityEnabled, TypingIndicatorTimeout = typingIndicatorTimeout, ConsumptionReportInterval = consumptionReportInterval, NotificationsNewMessageEnabled = notificationsNewMessageEnabled, NotificationsNewMessageTemplate = notificationsNewMessageTemplate, NotificationsNewMessageSound = notificationsNewMessageSound, NotificationsNewMessageBadgeCountEnabled = notificationsNewMessageBadgeCountEnabled, NotificationsAddedToChannelEnabled = notificationsAddedToChannelEnabled, NotificationsAddedToChannelTemplate = notificationsAddedToChannelTemplate, NotificationsAddedToChannelSound = notificationsAddedToChannelSound, NotificationsRemovedFromChannelEnabled = notificationsRemovedFromChannelEnabled, NotificationsRemovedFromChannelTemplate = notificationsRemovedFromChannelTemplate, NotificationsRemovedFromChannelSound = notificationsRemovedFromChannelSound, NotificationsInvitedToChannelEnabled = notificationsInvitedToChannelEnabled, NotificationsInvitedToChannelTemplate = notificationsInvitedToChannelTemplate, NotificationsInvitedToChannelSound = notificationsInvitedToChannelSound, PreWebhookUrl = preWebhookUrl, PostWebhookUrl = postWebhookUrl, WebhookMethod = webhookMethod, WebhookFilters = webhookFilters, LimitsChannelMembers = limitsChannelMembers, LimitsUserChannels = limitsUserChannels, MediaCompatibilityMessage = mediaCompatibilityMessage, PreWebhookRetryCount = preWebhookRetryCount, PostWebhookRetryCount = postWebhookRetryCount, NotificationsLogEnabled = notificationsLogEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ServiceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ServiceResource object represented by the provided JSON </returns>
+    public static ServiceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ServiceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The default_service_role_sid
+    /// </summary>
+    [JsonProperty("default_service_role_sid")]
+    public string DefaultServiceRoleSid { get; private set; }
+    /// <summary>
+    /// The default_channel_role_sid
+    /// </summary>
+    [JsonProperty("default_channel_role_sid")]
+    public string DefaultChannelRoleSid { get; private set; }
+    /// <summary>
+    /// The default_channel_creator_role_sid
+    /// </summary>
+    [JsonProperty("default_channel_creator_role_sid")]
+    public string DefaultChannelCreatorRoleSid { get; private set; }
+    /// <summary>
+    /// The read_status_enabled
+    /// </summary>
+    [JsonProperty("read_status_enabled")]
+    public bool? ReadStatusEnabled { get; private set; }
+    /// <summary>
+    /// The reachability_enabled
+    /// </summary>
+    [JsonProperty("reachability_enabled")]
+    public bool? ReachabilityEnabled { get; private set; }
+    /// <summary>
+    /// The typing_indicator_timeout
+    /// </summary>
+    [JsonProperty("typing_indicator_timeout")]
+    public int? TypingIndicatorTimeout { get; private set; }
+    /// <summary>
+    /// The consumption_report_interval
+    /// </summary>
+    [JsonProperty("consumption_report_interval")]
+    public int? ConsumptionReportInterval { get; private set; }
+    /// <summary>
+    /// The limits
+    /// </summary>
+    [JsonProperty("limits")]
+    public object Limits { get; private set; }
+    /// <summary>
+    /// The pre_webhook_url
+    /// </summary>
+    [JsonProperty("pre_webhook_url")]
+    public string PreWebhookUrl { get; private set; }
+    /// <summary>
+    /// The post_webhook_url
+    /// </summary>
+    [JsonProperty("post_webhook_url")]
+    public string PostWebhookUrl { get; private set; }
+    /// <summary>
+    /// The webhook_method
+    /// </summary>
+    [JsonProperty("webhook_method")]
+    public string WebhookMethod { get; private set; }
+    /// <summary>
+    /// The webhook_filters
+    /// </summary>
+    [JsonProperty("webhook_filters")]
+    public List<string> WebhookFilters { get; private set; }
+    /// <summary>
+    /// The pre_webhook_retry_count
+    /// </summary>
+    [JsonProperty("pre_webhook_retry_count")]
+    public int? PreWebhookRetryCount { get; private set; }
+    /// <summary>
+    /// The post_webhook_retry_count
+    /// </summary>
+    [JsonProperty("post_webhook_retry_count")]
+    public int? PostWebhookRetryCount { get; private set; }
+    /// <summary>
+    /// The notifications
+    /// </summary>
+    [JsonProperty("notifications")]
+    public object Notifications { get; private set; }
+    /// <summary>
+    /// The media
+    /// </summary>
+    [JsonProperty("media")]
+    public object Media { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ServiceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Lookups/V1/PhoneNumberOptions.cs b/src/Twilio/Rest/Lookups/V1/PhoneNumberOptions.cs
index 21c13d411..eb4c7d07d 100644
--- a/src/Twilio/Rest/Lookups/V1/PhoneNumberOptions.cs
+++ b/src/Twilio/Rest/Lookups/V1/PhoneNumberOptions.cs
@@ -10,73 +10,73 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Lookups.V1
-{
-
+{
+
+  /// <summary>
+  /// FetchPhoneNumberOptions
+  /// </summary>
+  public class FetchPhoneNumberOptions : IOptions<PhoneNumberResource>
+  {
     /// <summary>
-    /// FetchPhoneNumberOptions
+    /// The phone number to fetch in E.164 format
     /// </summary>
-    public class FetchPhoneNumberOptions : IOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The phone number to fetch in E.164 format
-        /// </summary>
-        public Types.PhoneNumber PathPhoneNumber { get; }
-        /// <summary>
-        /// The ISO country code of the phone number
-        /// </summary>
-        public string CountryCode { get; set; }
-        /// <summary>
-        /// The type of information to return
-        /// </summary>
-        public List<string> Type { get; set; }
-        /// <summary>
-        /// The unique_name of an Add-on you would like to invoke
-        /// </summary>
-        public List<string> AddOns { get; set; }
-        /// <summary>
-        /// Data specific to the add-on you would like to invoke
-        /// </summary>
-        public Dictionary<string, object> AddOnsData { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchPhoneNumberOptions
-        /// </summary>
-        /// <param name="pathPhoneNumber"> The phone number to fetch in E.164 format </param>
-        public FetchPhoneNumberOptions(Types.PhoneNumber pathPhoneNumber)
-        {
-            PathPhoneNumber = pathPhoneNumber;
-            Type = new List<string>();
-            AddOns = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (CountryCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CountryCode", CountryCode));
-            }
-
-            if (Type != null)
-            {
-                p.AddRange(Type.Select(prop => new KeyValuePair<string, string>("Type", prop)));
-            }
-
-            if (AddOns != null)
-            {
-                p.AddRange(AddOns.Select(prop => new KeyValuePair<string, string>("AddOns", prop)));
-            }
-
-            if (AddOnsData != null)
-            {
-                p.AddRange(PrefixedCollapsibleMap.Serialize(AddOnsData, "AddOns"));
-            }
-
-            return p;
-        }
-    }
+    public Types.PhoneNumber PathPhoneNumber { get; }
+    /// <summary>
+    /// The ISO country code of the phone number
+    /// </summary>
+    public string CountryCode { get; set; }
+    /// <summary>
+    /// The type of information to return
+    /// </summary>
+    public List<string> Type { get; set; }
+    /// <summary>
+    /// The unique_name of an Add-on you would like to invoke
+    /// </summary>
+    public List<string> AddOns { get; set; }
+    /// <summary>
+    /// Data specific to the add-on you would like to invoke
+    /// </summary>
+    public Dictionary<string, object> AddOnsData { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchPhoneNumberOptions
+    /// </summary>
+    /// <param name="pathPhoneNumber"> The phone number to fetch in E.164 format </param>
+    public FetchPhoneNumberOptions(Types.PhoneNumber pathPhoneNumber)
+    {
+      PathPhoneNumber = pathPhoneNumber;
+      Type = new List<string>();
+      AddOns = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (CountryCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CountryCode", CountryCode));
+      }
+
+      if (Type != null)
+      {
+        p.AddRange(Type.Select(prop => new KeyValuePair<string, string>("Type", prop)));
+      }
+
+      if (AddOns != null)
+      {
+        p.AddRange(AddOns.Select(prop => new KeyValuePair<string, string>("AddOns", prop)));
+      }
+
+      if (AddOnsData != null)
+      {
+        p.AddRange(PrefixedCollapsibleMap.Serialize(AddOnsData, "AddOns"));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Lookups/V1/PhoneNumberResource.cs b/src/Twilio/Rest/Lookups/V1/PhoneNumberResource.cs
index 5c85cf3df..17eafcff9 100644
--- a/src/Twilio/Rest/Lookups/V1/PhoneNumberResource.cs
+++ b/src/Twilio/Rest/Lookups/V1/PhoneNumberResource.cs
@@ -17,167 +17,167 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Lookups.V1
-{
-
-    public class PhoneNumberResource : Resource
-    {
-        public sealed class TypeEnum : StringEnum
-        {
-            private TypeEnum(string value) : base(value) {}
-            public TypeEnum() {}
-            public static implicit operator TypeEnum(string value)
-            {
-                return new TypeEnum(value);
-            }
-
-            public static readonly TypeEnum Landline = new TypeEnum("landline");
-            public static readonly TypeEnum Mobile = new TypeEnum("mobile");
-            public static readonly TypeEnum Voip = new TypeEnum("voip");
-        }
-
-        private static Request BuildFetchRequest(FetchPhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Lookups,
-                "/v1/PhoneNumbers/" + options.PathPhoneNumber + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Fetch(FetchPhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(FetchPhoneNumberOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathPhoneNumber"> The phone number to fetch in E.164 format </param>
-        /// <param name="countryCode"> The ISO country code of the phone number </param>
-        /// <param name="type"> The type of information to return </param>
-        /// <param name="addOns"> The unique_name of an Add-on you would like to invoke </param>
-        /// <param name="addOnsData"> Data specific to the add-on you would like to invoke </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Fetch(Types.PhoneNumber pathPhoneNumber,
-                                                string countryCode = null,
-                                                List<string> type = null,
-                                                List<string> addOns = null,
-                                                Dictionary<string, object> addOnsData = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchPhoneNumberOptions(pathPhoneNumber){CountryCode = countryCode, Type = type, AddOns = addOns, AddOnsData = addOnsData};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathPhoneNumber"> The phone number to fetch in E.164 format </param>
-        /// <param name="countryCode"> The ISO country code of the phone number </param>
-        /// <param name="type"> The type of information to return </param>
-        /// <param name="addOns"> The unique_name of an Add-on you would like to invoke </param>
-        /// <param name="addOnsData"> Data specific to the add-on you would like to invoke </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(Types.PhoneNumber pathPhoneNumber,
-                                                                                        string countryCode = null,
-                                                                                        List<string> type = null,
-                                                                                        List<string> addOns = null,
-                                                                                        Dictionary<string, object> addOnsData = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchPhoneNumberOptions(pathPhoneNumber){CountryCode = countryCode, Type = type, AddOns = addOns, AddOnsData = addOnsData};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a PhoneNumberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> PhoneNumberResource object represented by the provided JSON </returns>
-        public static PhoneNumberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<PhoneNumberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The name of the phone number's owner
-        /// </summary>
-        [JsonProperty("caller_name")]
-        public object CallerName { get; private set; }
-        /// <summary>
-        /// The ISO country code for the phone number
-        /// </summary>
-        [JsonProperty("country_code")]
-        public string CountryCode { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The phone number, in national format
-        /// </summary>
-        [JsonProperty("national_format")]
-        public string NationalFormat { get; private set; }
-        /// <summary>
-        /// The telecom company that provides the phone number
-        /// </summary>
-        [JsonProperty("carrier")]
-        public object Carrier { get; private set; }
-        /// <summary>
-        /// A JSON string with the results of the Add-ons you specified
-        /// </summary>
-        [JsonProperty("add_ons")]
-        public object AddOns { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private PhoneNumberResource()
-        {
-
-        }
-    }
+{
+
+  public class PhoneNumberResource : Resource
+  {
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+      public TypeEnum() { }
+      public static implicit operator TypeEnum(string value)
+      {
+        return new TypeEnum(value);
+      }
+
+      public static readonly TypeEnum Landline = new TypeEnum("landline");
+      public static readonly TypeEnum Mobile = new TypeEnum("mobile");
+      public static readonly TypeEnum Voip = new TypeEnum("voip");
+    }
+
+    private static Request BuildFetchRequest(FetchPhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Lookups,
+          "/v1/PhoneNumbers/" + options.PathPhoneNumber + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Fetch(FetchPhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(FetchPhoneNumberOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathPhoneNumber"> The phone number to fetch in E.164 format </param>
+    /// <param name="countryCode"> The ISO country code of the phone number </param>
+    /// <param name="type"> The type of information to return </param>
+    /// <param name="addOns"> The unique_name of an Add-on you would like to invoke </param>
+    /// <param name="addOnsData"> Data specific to the add-on you would like to invoke </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Fetch(Types.PhoneNumber pathPhoneNumber,
+                                            string countryCode = null,
+                                            List<string> type = null,
+                                            List<string> addOns = null,
+                                            Dictionary<string, object> addOnsData = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchPhoneNumberOptions(pathPhoneNumber) { CountryCode = countryCode, Type = type, AddOns = addOns, AddOnsData = addOnsData };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathPhoneNumber"> The phone number to fetch in E.164 format </param>
+    /// <param name="countryCode"> The ISO country code of the phone number </param>
+    /// <param name="type"> The type of information to return </param>
+    /// <param name="addOns"> The unique_name of an Add-on you would like to invoke </param>
+    /// <param name="addOnsData"> Data specific to the add-on you would like to invoke </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(Types.PhoneNumber pathPhoneNumber,
+                                                                                    string countryCode = null,
+                                                                                    List<string> type = null,
+                                                                                    List<string> addOns = null,
+                                                                                    Dictionary<string, object> addOnsData = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchPhoneNumberOptions(pathPhoneNumber) { CountryCode = countryCode, Type = type, AddOns = addOns, AddOnsData = addOnsData };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a PhoneNumberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> PhoneNumberResource object represented by the provided JSON </returns>
+    public static PhoneNumberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<PhoneNumberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The name of the phone number's owner
+    /// </summary>
+    [JsonProperty("caller_name")]
+    public object CallerName { get; private set; }
+    /// <summary>
+    /// The ISO country code for the phone number
+    /// </summary>
+    [JsonProperty("country_code")]
+    public string CountryCode { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The phone number, in national format
+    /// </summary>
+    [JsonProperty("national_format")]
+    public string NationalFormat { get; private set; }
+    /// <summary>
+    /// The telecom company that provides the phone number
+    /// </summary>
+    [JsonProperty("carrier")]
+    public object Carrier { get; private set; }
+    /// <summary>
+    /// A JSON string with the results of the Add-ons you specified
+    /// </summary>
+    [JsonProperty("add_ons")]
+    public object AddOns { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private PhoneNumberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Media/V1/MediaProcessorOptions.cs b/src/Twilio/Rest/Media/V1/MediaProcessorOptions.cs
index 94c99fdf5..31d74fba4 100644
--- a/src/Twilio/Rest/Media/V1/MediaProcessorOptions.cs
+++ b/src/Twilio/Rest/Media/V1/MediaProcessorOptions.cs
@@ -9,195 +9,195 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Media.V1
-{
-
+{
+
+  /// <summary>
+  /// CreateMediaProcessorOptions
+  /// </summary>
+  public class CreateMediaProcessorOptions : IOptions<MediaProcessorResource>
+  {
     /// <summary>
-    /// CreateMediaProcessorOptions
-    /// </summary>
-    public class CreateMediaProcessorOptions : IOptions<MediaProcessorResource>
-    {
-        /// <summary>
-        /// The Media Extension name or URL
-        /// </summary>
-        public string Extension { get; }
-        /// <summary>
-        /// The Media Extension context
-        /// </summary>
-        public string ExtensionContext { get; }
-        /// <summary>
-        /// The Media Extension environment
-        /// </summary>
-        public object ExtensionEnvironment { get; set; }
-        /// <summary>
-        /// The URL to send MediaProcessor event updates to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method Twilio should use to call the `status_callback` URL
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Maximum MediaProcessor duration in minutes
-        /// </summary>
-        public int? MaxDuration { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMediaProcessorOptions
-        /// </summary>
-        /// <param name="extension"> The Media Extension name or URL </param>
-        /// <param name="extensionContext"> The Media Extension context </param>
-        public CreateMediaProcessorOptions(string extension, string extensionContext)
-        {
-            Extension = extension;
-            ExtensionContext = extensionContext;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Extension != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Extension", Extension));
-            }
-
-            if (ExtensionContext != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExtensionContext", ExtensionContext));
-            }
-
-            if (ExtensionEnvironment != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExtensionEnvironment", Serializers.JsonObject(ExtensionEnvironment)));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (MaxDuration != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MaxDuration", MaxDuration.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The Media Extension name or URL
+    /// </summary>
+    public string Extension { get; }
     /// <summary>
-    /// Returns a single MediaProcessor resource identified by a SID.
+    /// The Media Extension context
     /// </summary>
-    public class FetchMediaProcessorOptions : IOptions<MediaProcessorResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMediaProcessorOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchMediaProcessorOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string ExtensionContext { get; }
     /// <summary>
-    /// Updates a MediaProcessor resource identified by a SID.
-    /// </summary>
-    public class UpdateMediaProcessorOptions : IOptions<MediaProcessorResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The status of the MediaProcessor
-        /// </summary>
-        public MediaProcessorResource.UpdateStatusEnum Status { get; }
-
-        /// <summary>
-        /// Construct a new UpdateMediaProcessorOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="status"> The status of the MediaProcessor </param>
-        public UpdateMediaProcessorOptions(string pathSid, MediaProcessorResource.UpdateStatusEnum status)
-        {
-            PathSid = pathSid;
-            Status = status;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The Media Extension environment
+    /// </summary>
+    public object ExtensionEnvironment { get; set; }
     /// <summary>
-    /// Returns a list of MediaProcessors.
-    /// </summary>
-    public class ReadMediaProcessorOptions : ReadOptions<MediaProcessorResource>
-    {
-        /// <summary>
-        /// The sort order of the list
-        /// </summary>
-        public MediaProcessorResource.OrderEnum Order { get; set; }
-        /// <summary>
-        /// Status to filter by
-        /// </summary>
-        public MediaProcessorResource.StatusEnum Status { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Order != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The URL to send MediaProcessor event updates to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method Twilio should use to call the `status_callback` URL
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Maximum MediaProcessor duration in minutes
+    /// </summary>
+    public int? MaxDuration { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMediaProcessorOptions
+    /// </summary>
+    /// <param name="extension"> The Media Extension name or URL </param>
+    /// <param name="extensionContext"> The Media Extension context </param>
+    public CreateMediaProcessorOptions(string extension, string extensionContext)
+    {
+      Extension = extension;
+      ExtensionContext = extensionContext;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Extension != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Extension", Extension));
+      }
+
+      if (ExtensionContext != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExtensionContext", ExtensionContext));
+      }
+
+      if (ExtensionEnvironment != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExtensionEnvironment", Serializers.JsonObject(ExtensionEnvironment)));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (MaxDuration != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MaxDuration", MaxDuration.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Returns a single MediaProcessor resource identified by a SID.
+  /// </summary>
+  public class FetchMediaProcessorOptions : IOptions<MediaProcessorResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchMediaProcessorOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchMediaProcessorOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Updates a MediaProcessor resource identified by a SID.
+  /// </summary>
+  public class UpdateMediaProcessorOptions : IOptions<MediaProcessorResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The status of the MediaProcessor
+    /// </summary>
+    public MediaProcessorResource.UpdateStatusEnum Status { get; }
+
+    /// <summary>
+    /// Construct a new UpdateMediaProcessorOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="status"> The status of the MediaProcessor </param>
+    public UpdateMediaProcessorOptions(string pathSid, MediaProcessorResource.UpdateStatusEnum status)
+    {
+      PathSid = pathSid;
+      Status = status;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Returns a list of MediaProcessors.
+  /// </summary>
+  public class ReadMediaProcessorOptions : ReadOptions<MediaProcessorResource>
+  {
+    /// <summary>
+    /// The sort order of the list
+    /// </summary>
+    public MediaProcessorResource.OrderEnum Order { get; set; }
+    /// <summary>
+    /// Status to filter by
+    /// </summary>
+    public MediaProcessorResource.StatusEnum Status { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Order != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Media/V1/MediaProcessorResource.cs b/src/Twilio/Rest/Media/V1/MediaProcessorResource.cs
index 0bec9d4be..1b47c9a0c 100644
--- a/src/Twilio/Rest/Media/V1/MediaProcessorResource.cs
+++ b/src/Twilio/Rest/Media/V1/MediaProcessorResource.cs
@@ -17,499 +17,499 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Media.V1
-{
-
-    public class MediaProcessorResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-            public static readonly StatusEnum Started = new StatusEnum("started");
-            public static readonly StatusEnum Ended = new StatusEnum("ended");
-        }
-
-        public sealed class UpdateStatusEnum : StringEnum
-        {
-            private UpdateStatusEnum(string value) : base(value) {}
-            public UpdateStatusEnum() {}
-            public static implicit operator UpdateStatusEnum(string value)
-            {
-                return new UpdateStatusEnum(value);
-            }
-
-            public static readonly UpdateStatusEnum Ended = new UpdateStatusEnum("ended");
-        }
-
-        public sealed class OrderEnum : StringEnum
-        {
-            private OrderEnum(string value) : base(value) {}
-            public OrderEnum() {}
-            public static implicit operator OrderEnum(string value)
-            {
-                return new OrderEnum(value);
-            }
-
-            public static readonly OrderEnum Asc = new OrderEnum("asc");
-            public static readonly OrderEnum Desc = new OrderEnum("desc");
-        }
-
-        private static Request BuildCreateRequest(CreateMediaProcessorOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Media,
-                "/v1/MediaProcessors",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create MediaProcessor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MediaProcessor </returns>
-        public static MediaProcessorResource Create(CreateMediaProcessorOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create MediaProcessor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
-        public static async System.Threading.Tasks.Task<MediaProcessorResource> CreateAsync(CreateMediaProcessorOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="extension"> The Media Extension name or URL </param>
-        /// <param name="extensionContext"> The Media Extension context </param>
-        /// <param name="extensionEnvironment"> The Media Extension environment </param>
-        /// <param name="statusCallback"> The URL to send MediaProcessor event updates to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method Twilio should use to call the `status_callback` URL </param>
-        /// <param name="maxDuration"> Maximum MediaProcessor duration in minutes </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MediaProcessor </returns>
-        public static MediaProcessorResource Create(string extension,
-                                                    string extensionContext,
-                                                    object extensionEnvironment = null,
-                                                    Uri statusCallback = null,
-                                                    Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                    int? maxDuration = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateMediaProcessorOptions(extension, extensionContext){ExtensionEnvironment = extensionEnvironment, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, MaxDuration = maxDuration};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="extension"> The Media Extension name or URL </param>
-        /// <param name="extensionContext"> The Media Extension context </param>
-        /// <param name="extensionEnvironment"> The Media Extension environment </param>
-        /// <param name="statusCallback"> The URL to send MediaProcessor event updates to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method Twilio should use to call the `status_callback` URL </param>
-        /// <param name="maxDuration"> Maximum MediaProcessor duration in minutes </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
-        public static async System.Threading.Tasks.Task<MediaProcessorResource> CreateAsync(string extension,
-                                                                                            string extensionContext,
-                                                                                            object extensionEnvironment = null,
-                                                                                            Uri statusCallback = null,
-                                                                                            Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                            int? maxDuration = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateMediaProcessorOptions(extension, extensionContext){ExtensionEnvironment = extensionEnvironment, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, MaxDuration = maxDuration};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchMediaProcessorOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Media,
-                "/v1/MediaProcessors/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a single MediaProcessor resource identified by a SID.
-        /// </summary>
-        /// <param name="options"> Fetch MediaProcessor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MediaProcessor </returns>
-        public static MediaProcessorResource Fetch(FetchMediaProcessorOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single MediaProcessor resource identified by a SID.
-        /// </summary>
-        /// <param name="options"> Fetch MediaProcessor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
-        public static async System.Threading.Tasks.Task<MediaProcessorResource> FetchAsync(FetchMediaProcessorOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a single MediaProcessor resource identified by a SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MediaProcessor </returns>
-        public static MediaProcessorResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchMediaProcessorOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single MediaProcessor resource identified by a SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
-        public static async System.Threading.Tasks.Task<MediaProcessorResource> FetchAsync(string pathSid,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchMediaProcessorOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateMediaProcessorOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Media,
-                "/v1/MediaProcessors/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates a MediaProcessor resource identified by a SID.
-        /// </summary>
-        /// <param name="options"> Update MediaProcessor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MediaProcessor </returns>
-        public static MediaProcessorResource Update(UpdateMediaProcessorOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a MediaProcessor resource identified by a SID.
-        /// </summary>
-        /// <param name="options"> Update MediaProcessor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
-        public static async System.Threading.Tasks.Task<MediaProcessorResource> UpdateAsync(UpdateMediaProcessorOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates a MediaProcessor resource identified by a SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="status"> The status of the MediaProcessor </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MediaProcessor </returns>
-        public static MediaProcessorResource Update(string pathSid,
-                                                    MediaProcessorResource.UpdateStatusEnum status,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateMediaProcessorOptions(pathSid, status);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a MediaProcessor resource identified by a SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="status"> The status of the MediaProcessor </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
-        public static async System.Threading.Tasks.Task<MediaProcessorResource> UpdateAsync(string pathSid,
-                                                                                            MediaProcessorResource.UpdateStatusEnum status,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateMediaProcessorOptions(pathSid, status);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMediaProcessorOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Media,
-                "/v1/MediaProcessors",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a list of MediaProcessors.
-        /// </summary>
-        /// <param name="options"> Read MediaProcessor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MediaProcessor </returns>
-        public static ResourceSet<MediaProcessorResource> Read(ReadMediaProcessorOptions options,
-                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MediaProcessorResource>.FromJson("media_processors", response.Content);
-            return new ResourceSet<MediaProcessorResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of MediaProcessors.
-        /// </summary>
-        /// <param name="options"> Read MediaProcessor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MediaProcessorResource>> ReadAsync(ReadMediaProcessorOptions options,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MediaProcessorResource>.FromJson("media_processors", response.Content);
-            return new ResourceSet<MediaProcessorResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a list of MediaProcessors.
-        /// </summary>
-        /// <param name="order"> The sort order of the list </param>
-        /// <param name="status"> Status to filter by </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MediaProcessor </returns>
-        public static ResourceSet<MediaProcessorResource> Read(MediaProcessorResource.OrderEnum order = null,
-                                                               MediaProcessorResource.StatusEnum status = null,
-                                                               int? pageSize = null,
-                                                               long? limit = null,
-                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadMediaProcessorOptions(){Order = order, Status = status, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of MediaProcessors.
-        /// </summary>
-        /// <param name="order"> The sort order of the list </param>
-        /// <param name="status"> Status to filter by </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MediaProcessorResource>> ReadAsync(MediaProcessorResource.OrderEnum order = null,
-                                                                                                       MediaProcessorResource.StatusEnum status = null,
-                                                                                                       int? pageSize = null,
-                                                                                                       long? limit = null,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadMediaProcessorOptions(){Order = order, Status = status, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MediaProcessorResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MediaProcessorResource>.FromJson("media_processors", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MediaProcessorResource> NextPage(Page<MediaProcessorResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Media)
-            );
-
-            var response = client.Request(request);
-            return Page<MediaProcessorResource>.FromJson("media_processors", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MediaProcessorResource> PreviousPage(Page<MediaProcessorResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Media)
-            );
-
-            var response = client.Request(request);
-            return Page<MediaProcessorResource>.FromJson("media_processors", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a MediaProcessorResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MediaProcessorResource object represented by the provided JSON </returns>
-        public static MediaProcessorResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MediaProcessorResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The Media Extension name or URL
-        /// </summary>
-        [JsonProperty("extension")]
-        public string Extension { get; private set; }
-        /// <summary>
-        /// The Media Extension context
-        /// </summary>
-        [JsonProperty("extension_context")]
-        public string ExtensionContext { get; private set; }
-        /// <summary>
-        /// The status of the MediaProcessor
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public MediaProcessorResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The reason why a MediaProcessor ended
-        /// </summary>
-        [JsonProperty("ended_reason")]
-        public string EndedReason { get; private set; }
-        /// <summary>
-        /// The URL to which Twilio will send MediaProcessor event updates
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The HTTP method Twilio should use to call the `status_callback` URL
-        /// </summary>
-        [JsonProperty("status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// Maximum MediaProcessor duration in minutes
-        /// </summary>
-        [JsonProperty("max_duration")]
-        public int? MaxDuration { get; private set; }
-
-        private MediaProcessorResource()
-        {
-
-        }
-    }
+{
+
+  public class MediaProcessorResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+      public static readonly StatusEnum Started = new StatusEnum("started");
+      public static readonly StatusEnum Ended = new StatusEnum("ended");
+    }
+
+    public sealed class UpdateStatusEnum : StringEnum
+    {
+      private UpdateStatusEnum(string value) : base(value) { }
+      public UpdateStatusEnum() { }
+      public static implicit operator UpdateStatusEnum(string value)
+      {
+        return new UpdateStatusEnum(value);
+      }
+
+      public static readonly UpdateStatusEnum Ended = new UpdateStatusEnum("ended");
+    }
+
+    public sealed class OrderEnum : StringEnum
+    {
+      private OrderEnum(string value) : base(value) { }
+      public OrderEnum() { }
+      public static implicit operator OrderEnum(string value)
+      {
+        return new OrderEnum(value);
+      }
+
+      public static readonly OrderEnum Asc = new OrderEnum("asc");
+      public static readonly OrderEnum Desc = new OrderEnum("desc");
+    }
+
+    private static Request BuildCreateRequest(CreateMediaProcessorOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Media,
+          "/v1/MediaProcessors",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create MediaProcessor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MediaProcessor </returns>
+    public static MediaProcessorResource Create(CreateMediaProcessorOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create MediaProcessor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
+    public static async System.Threading.Tasks.Task<MediaProcessorResource> CreateAsync(CreateMediaProcessorOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="extension"> The Media Extension name or URL </param>
+    /// <param name="extensionContext"> The Media Extension context </param>
+    /// <param name="extensionEnvironment"> The Media Extension environment </param>
+    /// <param name="statusCallback"> The URL to send MediaProcessor event updates to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method Twilio should use to call the `status_callback` URL </param>
+    /// <param name="maxDuration"> Maximum MediaProcessor duration in minutes </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MediaProcessor </returns>
+    public static MediaProcessorResource Create(string extension,
+                                                string extensionContext,
+                                                object extensionEnvironment = null,
+                                                Uri statusCallback = null,
+                                                Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                int? maxDuration = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateMediaProcessorOptions(extension, extensionContext) { ExtensionEnvironment = extensionEnvironment, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, MaxDuration = maxDuration };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="extension"> The Media Extension name or URL </param>
+    /// <param name="extensionContext"> The Media Extension context </param>
+    /// <param name="extensionEnvironment"> The Media Extension environment </param>
+    /// <param name="statusCallback"> The URL to send MediaProcessor event updates to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method Twilio should use to call the `status_callback` URL </param>
+    /// <param name="maxDuration"> Maximum MediaProcessor duration in minutes </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
+    public static async System.Threading.Tasks.Task<MediaProcessorResource> CreateAsync(string extension,
+                                                                                        string extensionContext,
+                                                                                        object extensionEnvironment = null,
+                                                                                        Uri statusCallback = null,
+                                                                                        Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                        int? maxDuration = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateMediaProcessorOptions(extension, extensionContext) { ExtensionEnvironment = extensionEnvironment, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, MaxDuration = maxDuration };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchMediaProcessorOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Media,
+          "/v1/MediaProcessors/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a single MediaProcessor resource identified by a SID.
+    /// </summary>
+    /// <param name="options"> Fetch MediaProcessor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MediaProcessor </returns>
+    public static MediaProcessorResource Fetch(FetchMediaProcessorOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single MediaProcessor resource identified by a SID.
+    /// </summary>
+    /// <param name="options"> Fetch MediaProcessor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
+    public static async System.Threading.Tasks.Task<MediaProcessorResource> FetchAsync(FetchMediaProcessorOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a single MediaProcessor resource identified by a SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MediaProcessor </returns>
+    public static MediaProcessorResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchMediaProcessorOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single MediaProcessor resource identified by a SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
+    public static async System.Threading.Tasks.Task<MediaProcessorResource> FetchAsync(string pathSid,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchMediaProcessorOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateMediaProcessorOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Media,
+          "/v1/MediaProcessors/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates a MediaProcessor resource identified by a SID.
+    /// </summary>
+    /// <param name="options"> Update MediaProcessor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MediaProcessor </returns>
+    public static MediaProcessorResource Update(UpdateMediaProcessorOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a MediaProcessor resource identified by a SID.
+    /// </summary>
+    /// <param name="options"> Update MediaProcessor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
+    public static async System.Threading.Tasks.Task<MediaProcessorResource> UpdateAsync(UpdateMediaProcessorOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates a MediaProcessor resource identified by a SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="status"> The status of the MediaProcessor </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MediaProcessor </returns>
+    public static MediaProcessorResource Update(string pathSid,
+                                                MediaProcessorResource.UpdateStatusEnum status,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateMediaProcessorOptions(pathSid, status);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a MediaProcessor resource identified by a SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="status"> The status of the MediaProcessor </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
+    public static async System.Threading.Tasks.Task<MediaProcessorResource> UpdateAsync(string pathSid,
+                                                                                        MediaProcessorResource.UpdateStatusEnum status,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateMediaProcessorOptions(pathSid, status);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMediaProcessorOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Media,
+          "/v1/MediaProcessors",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a list of MediaProcessors.
+    /// </summary>
+    /// <param name="options"> Read MediaProcessor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MediaProcessor </returns>
+    public static ResourceSet<MediaProcessorResource> Read(ReadMediaProcessorOptions options,
+                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MediaProcessorResource>.FromJson("media_processors", response.Content);
+      return new ResourceSet<MediaProcessorResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of MediaProcessors.
+    /// </summary>
+    /// <param name="options"> Read MediaProcessor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MediaProcessorResource>> ReadAsync(ReadMediaProcessorOptions options,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MediaProcessorResource>.FromJson("media_processors", response.Content);
+      return new ResourceSet<MediaProcessorResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a list of MediaProcessors.
+    /// </summary>
+    /// <param name="order"> The sort order of the list </param>
+    /// <param name="status"> Status to filter by </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MediaProcessor </returns>
+    public static ResourceSet<MediaProcessorResource> Read(MediaProcessorResource.OrderEnum order = null,
+                                                           MediaProcessorResource.StatusEnum status = null,
+                                                           int? pageSize = null,
+                                                           long? limit = null,
+                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadMediaProcessorOptions() { Order = order, Status = status, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of MediaProcessors.
+    /// </summary>
+    /// <param name="order"> The sort order of the list </param>
+    /// <param name="status"> Status to filter by </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MediaProcessor </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MediaProcessorResource>> ReadAsync(MediaProcessorResource.OrderEnum order = null,
+                                                                                                   MediaProcessorResource.StatusEnum status = null,
+                                                                                                   int? pageSize = null,
+                                                                                                   long? limit = null,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadMediaProcessorOptions() { Order = order, Status = status, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MediaProcessorResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MediaProcessorResource>.FromJson("media_processors", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MediaProcessorResource> NextPage(Page<MediaProcessorResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Media)
+      );
+
+      var response = client.Request(request);
+      return Page<MediaProcessorResource>.FromJson("media_processors", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MediaProcessorResource> PreviousPage(Page<MediaProcessorResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Media)
+      );
+
+      var response = client.Request(request);
+      return Page<MediaProcessorResource>.FromJson("media_processors", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a MediaProcessorResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MediaProcessorResource object represented by the provided JSON </returns>
+    public static MediaProcessorResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MediaProcessorResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The Media Extension name or URL
+    /// </summary>
+    [JsonProperty("extension")]
+    public string Extension { get; private set; }
+    /// <summary>
+    /// The Media Extension context
+    /// </summary>
+    [JsonProperty("extension_context")]
+    public string ExtensionContext { get; private set; }
+    /// <summary>
+    /// The status of the MediaProcessor
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public MediaProcessorResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The reason why a MediaProcessor ended
+    /// </summary>
+    [JsonProperty("ended_reason")]
+    public string EndedReason { get; private set; }
+    /// <summary>
+    /// The URL to which Twilio will send MediaProcessor event updates
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The HTTP method Twilio should use to call the `status_callback` URL
+    /// </summary>
+    [JsonProperty("status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// Maximum MediaProcessor duration in minutes
+    /// </summary>
+    [JsonProperty("max_duration")]
+    public int? MaxDuration { get; private set; }
+
+    private MediaProcessorResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Media/V1/PlayerStreamer/PlaybackGrantOptions.cs b/src/Twilio/Rest/Media/V1/PlayerStreamer/PlaybackGrantOptions.cs
index 4554c4e48..212170fc2 100644
--- a/src/Twilio/Rest/Media/V1/PlayerStreamer/PlaybackGrantOptions.cs
+++ b/src/Twilio/Rest/Media/V1/PlayerStreamer/PlaybackGrantOptions.cs
@@ -9,83 +9,83 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Media.V1.PlayerStreamer
-{
-
+{
+
+  /// <summary>
+  /// CreatePlaybackGrantOptions
+  /// </summary>
+  public class CreatePlaybackGrantOptions : IOptions<PlaybackGrantResource>
+  {
     /// <summary>
-    /// CreatePlaybackGrantOptions
+    /// The unique string that identifies the PlayerStreamer associated with this PlaybackGrant.
     /// </summary>
-    public class CreatePlaybackGrantOptions : IOptions<PlaybackGrantResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the PlayerStreamer associated with this PlaybackGrant.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The time to live of the PlaybackGrant
-        /// </summary>
-        public int? Ttl { get; set; }
-        /// <summary>
-        /// The full URL that is authorized to play back the livestream
-        /// </summary>
-        public string AccessControlAllowOrigin { get; set; }
-
-        /// <summary>
-        /// Construct a new CreatePlaybackGrantOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the PlayerStreamer associated with this PlaybackGrant.
-        ///               </param>
-        public CreatePlaybackGrantOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            if (AccessControlAllowOrigin != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AccessControlAllowOrigin", AccessControlAllowOrigin));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
     /// <summary>
-    /// **This method is not enabled.** Returns a single PlaybackGrant resource identified by a SID.
+    /// The time to live of the PlaybackGrant
     /// </summary>
-    public class FetchPlaybackGrantOptions : IOptions<PlaybackGrantResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchPlaybackGrantOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchPlaybackGrantOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public int? Ttl { get; set; }
+    /// <summary>
+    /// The full URL that is authorized to play back the livestream
+    /// </summary>
+    public string AccessControlAllowOrigin { get; set; }
+
+    /// <summary>
+    /// Construct a new CreatePlaybackGrantOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the PlayerStreamer associated with this PlaybackGrant.
+    ///               </param>
+    public CreatePlaybackGrantOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      if (AccessControlAllowOrigin != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AccessControlAllowOrigin", AccessControlAllowOrigin));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// **This method is not enabled.** Returns a single PlaybackGrant resource identified by a SID.
+  /// </summary>
+  public class FetchPlaybackGrantOptions : IOptions<PlaybackGrantResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchPlaybackGrantOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchPlaybackGrantOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Media/V1/PlayerStreamer/PlaybackGrantResource.cs b/src/Twilio/Rest/Media/V1/PlayerStreamer/PlaybackGrantResource.cs
index 16b89547a..78e326059 100644
--- a/src/Twilio/Rest/Media/V1/PlayerStreamer/PlaybackGrantResource.cs
+++ b/src/Twilio/Rest/Media/V1/PlayerStreamer/PlaybackGrantResource.cs
@@ -16,203 +16,203 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Media.V1.PlayerStreamer
-{
-
-    public class PlaybackGrantResource : Resource
-    {
-        private static Request BuildCreateRequest(CreatePlaybackGrantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Media,
-                "/v1/PlayerStreamers/" + options.PathSid + "/PlaybackGrant",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create PlaybackGrant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PlaybackGrant </returns>
-        public static PlaybackGrantResource Create(CreatePlaybackGrantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create PlaybackGrant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PlaybackGrant </returns>
-        public static async System.Threading.Tasks.Task<PlaybackGrantResource> CreateAsync(CreatePlaybackGrantOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the PlayerStreamer associated with this PlaybackGrant.
-        ///               </param>
-        /// <param name="ttl"> The time to live of the PlaybackGrant </param>
-        /// <param name="accessControlAllowOrigin"> The full URL that is authorized to play back the livestream </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PlaybackGrant </returns>
-        public static PlaybackGrantResource Create(string pathSid,
-                                                   int? ttl = null,
-                                                   string accessControlAllowOrigin = null,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreatePlaybackGrantOptions(pathSid){Ttl = ttl, AccessControlAllowOrigin = accessControlAllowOrigin};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the PlayerStreamer associated with this PlaybackGrant.
-        ///               </param>
-        /// <param name="ttl"> The time to live of the PlaybackGrant </param>
-        /// <param name="accessControlAllowOrigin"> The full URL that is authorized to play back the livestream </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PlaybackGrant </returns>
-        public static async System.Threading.Tasks.Task<PlaybackGrantResource> CreateAsync(string pathSid,
-                                                                                           int? ttl = null,
-                                                                                           string accessControlAllowOrigin = null,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new CreatePlaybackGrantOptions(pathSid){Ttl = ttl, AccessControlAllowOrigin = accessControlAllowOrigin};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchPlaybackGrantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Media,
-                "/v1/PlayerStreamers/" + options.PathSid + "/PlaybackGrant",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// **This method is not enabled.** Returns a single PlaybackGrant resource identified by a SID.
-        /// </summary>
-        /// <param name="options"> Fetch PlaybackGrant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PlaybackGrant </returns>
-        public static PlaybackGrantResource Fetch(FetchPlaybackGrantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// **This method is not enabled.** Returns a single PlaybackGrant resource identified by a SID.
-        /// </summary>
-        /// <param name="options"> Fetch PlaybackGrant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PlaybackGrant </returns>
-        public static async System.Threading.Tasks.Task<PlaybackGrantResource> FetchAsync(FetchPlaybackGrantOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// **This method is not enabled.** Returns a single PlaybackGrant resource identified by a SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PlaybackGrant </returns>
-        public static PlaybackGrantResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchPlaybackGrantOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// **This method is not enabled.** Returns a single PlaybackGrant resource identified by a SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PlaybackGrant </returns>
-        public static async System.Threading.Tasks.Task<PlaybackGrantResource> FetchAsync(string pathSid,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchPlaybackGrantOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a PlaybackGrantResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> PlaybackGrantResource object represented by the provided JSON </returns>
-        public static PlaybackGrantResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<PlaybackGrantResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the PlayerStreamer associated with this PlaybackGrant.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The grant that authorizes the player sdk to connect to the livestream
-        /// </summary>
-        [JsonProperty("grant")]
-        public object Grant { get; private set; }
-
-        private PlaybackGrantResource()
-        {
-
-        }
-    }
+{
+
+  public class PlaybackGrantResource : Resource
+  {
+    private static Request BuildCreateRequest(CreatePlaybackGrantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Media,
+          "/v1/PlayerStreamers/" + options.PathSid + "/PlaybackGrant",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create PlaybackGrant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PlaybackGrant </returns>
+    public static PlaybackGrantResource Create(CreatePlaybackGrantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create PlaybackGrant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PlaybackGrant </returns>
+    public static async System.Threading.Tasks.Task<PlaybackGrantResource> CreateAsync(CreatePlaybackGrantOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the PlayerStreamer associated with this PlaybackGrant.
+    ///               </param>
+    /// <param name="ttl"> The time to live of the PlaybackGrant </param>
+    /// <param name="accessControlAllowOrigin"> The full URL that is authorized to play back the livestream </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PlaybackGrant </returns>
+    public static PlaybackGrantResource Create(string pathSid,
+                                               int? ttl = null,
+                                               string accessControlAllowOrigin = null,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new CreatePlaybackGrantOptions(pathSid) { Ttl = ttl, AccessControlAllowOrigin = accessControlAllowOrigin };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the PlayerStreamer associated with this PlaybackGrant.
+    ///               </param>
+    /// <param name="ttl"> The time to live of the PlaybackGrant </param>
+    /// <param name="accessControlAllowOrigin"> The full URL that is authorized to play back the livestream </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PlaybackGrant </returns>
+    public static async System.Threading.Tasks.Task<PlaybackGrantResource> CreateAsync(string pathSid,
+                                                                                       int? ttl = null,
+                                                                                       string accessControlAllowOrigin = null,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new CreatePlaybackGrantOptions(pathSid) { Ttl = ttl, AccessControlAllowOrigin = accessControlAllowOrigin };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchPlaybackGrantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Media,
+          "/v1/PlayerStreamers/" + options.PathSid + "/PlaybackGrant",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// **This method is not enabled.** Returns a single PlaybackGrant resource identified by a SID.
+    /// </summary>
+    /// <param name="options"> Fetch PlaybackGrant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PlaybackGrant </returns>
+    public static PlaybackGrantResource Fetch(FetchPlaybackGrantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// **This method is not enabled.** Returns a single PlaybackGrant resource identified by a SID.
+    /// </summary>
+    /// <param name="options"> Fetch PlaybackGrant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PlaybackGrant </returns>
+    public static async System.Threading.Tasks.Task<PlaybackGrantResource> FetchAsync(FetchPlaybackGrantOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// **This method is not enabled.** Returns a single PlaybackGrant resource identified by a SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PlaybackGrant </returns>
+    public static PlaybackGrantResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchPlaybackGrantOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// **This method is not enabled.** Returns a single PlaybackGrant resource identified by a SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PlaybackGrant </returns>
+    public static async System.Threading.Tasks.Task<PlaybackGrantResource> FetchAsync(string pathSid,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchPlaybackGrantOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a PlaybackGrantResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> PlaybackGrantResource object represented by the provided JSON </returns>
+    public static PlaybackGrantResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<PlaybackGrantResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the PlayerStreamer associated with this PlaybackGrant.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The grant that authorizes the player sdk to connect to the livestream
+    /// </summary>
+    [JsonProperty("grant")]
+    public object Grant { get; private set; }
+
+    private PlaybackGrantResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Media/V1/PlayerStreamerOptions.cs b/src/Twilio/Rest/Media/V1/PlayerStreamerOptions.cs
index 948836538..17a1923d4 100644
--- a/src/Twilio/Rest/Media/V1/PlayerStreamerOptions.cs
+++ b/src/Twilio/Rest/Media/V1/PlayerStreamerOptions.cs
@@ -9,157 +9,157 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Media.V1
-{
-
+{
+
+  /// <summary>
+  /// Returns a single PlayerStreamer resource identified by a SID.
+  /// </summary>
+  public class FetchPlayerStreamerOptions : IOptions<PlayerStreamerResource>
+  {
     /// <summary>
-    /// Returns a single PlayerStreamer resource identified by a SID.
+    /// The SID that identifies the resource to fetch
     /// </summary>
-    public class FetchPlayerStreamerOptions : IOptions<PlayerStreamerResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchPlayerStreamerOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchPlayerStreamerOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreatePlayerStreamerOptions
+    /// Construct a new FetchPlayerStreamerOptions
     /// </summary>
-    public class CreatePlayerStreamerOptions : IOptions<PlayerStreamerResource>
-    {
-        /// <summary>
-        /// Whether the PlayerStreamer is configured to stream video
-        /// </summary>
-        public bool? Video { get; set; }
-        /// <summary>
-        /// The URL to which Twilio will send PlayerStreamer event updates
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method Twilio should use to call the `status_callback` URL
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Video != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Video", Video.Value.ToString().ToLower()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchPlayerStreamerOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// Updates a PlayerStreamer resource identified by a SID.
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdatePlayerStreamerOptions : IOptions<PlayerStreamerResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The status the PlayerStreamer should be transitioned to
-        /// </summary>
-        public PlayerStreamerResource.UpdateStatusEnum Status { get; }
-
-        /// <summary>
-        /// Construct a new UpdatePlayerStreamerOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="status"> The status the PlayerStreamer should be transitioned to </param>
-        public UpdatePlayerStreamerOptions(string pathSid, PlayerStreamerResource.UpdateStatusEnum status)
-        {
-            PathSid = pathSid;
-            Status = status;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreatePlayerStreamerOptions
+  /// </summary>
+  public class CreatePlayerStreamerOptions : IOptions<PlayerStreamerResource>
+  {
     /// <summary>
-    /// Returns a list of PlayerStreamers.
+    /// Whether the PlayerStreamer is configured to stream video
     /// </summary>
-    public class ReadPlayerStreamerOptions : ReadOptions<PlayerStreamerResource>
-    {
-        /// <summary>
-        /// The sort order of the list
-        /// </summary>
-        public PlayerStreamerResource.OrderEnum Order { get; set; }
-        /// <summary>
-        /// Status to filter by
-        /// </summary>
-        public PlayerStreamerResource.StatusEnum Status { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Order != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public bool? Video { get; set; }
+    /// <summary>
+    /// The URL to which Twilio will send PlayerStreamer event updates
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method Twilio should use to call the `status_callback` URL
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Video != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Video", Video.Value.ToString().ToLower()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Updates a PlayerStreamer resource identified by a SID.
+  /// </summary>
+  public class UpdatePlayerStreamerOptions : IOptions<PlayerStreamerResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The status the PlayerStreamer should be transitioned to
+    /// </summary>
+    public PlayerStreamerResource.UpdateStatusEnum Status { get; }
+
+    /// <summary>
+    /// Construct a new UpdatePlayerStreamerOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="status"> The status the PlayerStreamer should be transitioned to </param>
+    public UpdatePlayerStreamerOptions(string pathSid, PlayerStreamerResource.UpdateStatusEnum status)
+    {
+      PathSid = pathSid;
+      Status = status;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Returns a list of PlayerStreamers.
+  /// </summary>
+  public class ReadPlayerStreamerOptions : ReadOptions<PlayerStreamerResource>
+  {
+    /// <summary>
+    /// The sort order of the list
+    /// </summary>
+    public PlayerStreamerResource.OrderEnum Order { get; set; }
+    /// <summary>
+    /// Status to filter by
+    /// </summary>
+    public PlayerStreamerResource.StatusEnum Status { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Order != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Media/V1/PlayerStreamerResource.cs b/src/Twilio/Rest/Media/V1/PlayerStreamerResource.cs
index a730536e1..b4054bc59 100644
--- a/src/Twilio/Rest/Media/V1/PlayerStreamerResource.cs
+++ b/src/Twilio/Rest/Media/V1/PlayerStreamerResource.cs
@@ -17,499 +17,499 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Media.V1
-{
-
-    public class PlayerStreamerResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Created = new StatusEnum("created");
-            public static readonly StatusEnum Started = new StatusEnum("started");
-            public static readonly StatusEnum Ended = new StatusEnum("ended");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        public sealed class UpdateStatusEnum : StringEnum
-        {
-            private UpdateStatusEnum(string value) : base(value) {}
-            public UpdateStatusEnum() {}
-            public static implicit operator UpdateStatusEnum(string value)
-            {
-                return new UpdateStatusEnum(value);
-            }
-
-            public static readonly UpdateStatusEnum Ended = new UpdateStatusEnum("ended");
-        }
-
-        public sealed class OrderEnum : StringEnum
-        {
-            private OrderEnum(string value) : base(value) {}
-            public OrderEnum() {}
-            public static implicit operator OrderEnum(string value)
-            {
-                return new OrderEnum(value);
-            }
-
-            public static readonly OrderEnum Asc = new OrderEnum("asc");
-            public static readonly OrderEnum Desc = new OrderEnum("desc");
-        }
-
-        public sealed class EndedReasonEnum : StringEnum
-        {
-            private EndedReasonEnum(string value) : base(value) {}
-            public EndedReasonEnum() {}
-            public static implicit operator EndedReasonEnum(string value)
-            {
-                return new EndedReasonEnum(value);
-            }
-
-            public static readonly EndedReasonEnum EndedViaApi = new EndedReasonEnum("ended-via-api");
-            public static readonly EndedReasonEnum MaxDurationExceeded = new EndedReasonEnum("max-duration-exceeded");
-            public static readonly EndedReasonEnum StreamDisconnectedBySource = new EndedReasonEnum("stream-disconnected-by-source");
-            public static readonly EndedReasonEnum UnexpectedFailure = new EndedReasonEnum("unexpected-failure");
-        }
-
-        private static Request BuildFetchRequest(FetchPlayerStreamerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Media,
-                "/v1/PlayerStreamers/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a single PlayerStreamer resource identified by a SID.
-        /// </summary>
-        /// <param name="options"> Fetch PlayerStreamer parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PlayerStreamer </returns>
-        public static PlayerStreamerResource Fetch(FetchPlayerStreamerOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single PlayerStreamer resource identified by a SID.
-        /// </summary>
-        /// <param name="options"> Fetch PlayerStreamer parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
-        public static async System.Threading.Tasks.Task<PlayerStreamerResource> FetchAsync(FetchPlayerStreamerOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a single PlayerStreamer resource identified by a SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PlayerStreamer </returns>
-        public static PlayerStreamerResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchPlayerStreamerOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single PlayerStreamer resource identified by a SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
-        public static async System.Threading.Tasks.Task<PlayerStreamerResource> FetchAsync(string pathSid,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchPlayerStreamerOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreatePlayerStreamerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Media,
-                "/v1/PlayerStreamers",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create PlayerStreamer parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PlayerStreamer </returns>
-        public static PlayerStreamerResource Create(CreatePlayerStreamerOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create PlayerStreamer parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
-        public static async System.Threading.Tasks.Task<PlayerStreamerResource> CreateAsync(CreatePlayerStreamerOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="video"> Whether the PlayerStreamer is configured to stream video </param>
-        /// <param name="statusCallback"> The URL to which Twilio will send PlayerStreamer event updates </param>
-        /// <param name="statusCallbackMethod"> The HTTP method Twilio should use to call the `status_callback` URL </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PlayerStreamer </returns>
-        public static PlayerStreamerResource Create(bool? video = null,
-                                                    Uri statusCallback = null,
-                                                    Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreatePlayerStreamerOptions(){Video = video, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="video"> Whether the PlayerStreamer is configured to stream video </param>
-        /// <param name="statusCallback"> The URL to which Twilio will send PlayerStreamer event updates </param>
-        /// <param name="statusCallbackMethod"> The HTTP method Twilio should use to call the `status_callback` URL </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
-        public static async System.Threading.Tasks.Task<PlayerStreamerResource> CreateAsync(bool? video = null,
-                                                                                            Uri statusCallback = null,
-                                                                                            Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new CreatePlayerStreamerOptions(){Video = video, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdatePlayerStreamerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Media,
-                "/v1/PlayerStreamers/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates a PlayerStreamer resource identified by a SID.
-        /// </summary>
-        /// <param name="options"> Update PlayerStreamer parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PlayerStreamer </returns>
-        public static PlayerStreamerResource Update(UpdatePlayerStreamerOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a PlayerStreamer resource identified by a SID.
-        /// </summary>
-        /// <param name="options"> Update PlayerStreamer parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
-        public static async System.Threading.Tasks.Task<PlayerStreamerResource> UpdateAsync(UpdatePlayerStreamerOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates a PlayerStreamer resource identified by a SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="status"> The status the PlayerStreamer should be transitioned to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PlayerStreamer </returns>
-        public static PlayerStreamerResource Update(string pathSid,
-                                                    PlayerStreamerResource.UpdateStatusEnum status,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdatePlayerStreamerOptions(pathSid, status);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a PlayerStreamer resource identified by a SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="status"> The status the PlayerStreamer should be transitioned to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
-        public static async System.Threading.Tasks.Task<PlayerStreamerResource> UpdateAsync(string pathSid,
-                                                                                            PlayerStreamerResource.UpdateStatusEnum status,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdatePlayerStreamerOptions(pathSid, status);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadPlayerStreamerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Media,
-                "/v1/PlayerStreamers",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a list of PlayerStreamers.
-        /// </summary>
-        /// <param name="options"> Read PlayerStreamer parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PlayerStreamer </returns>
-        public static ResourceSet<PlayerStreamerResource> Read(ReadPlayerStreamerOptions options,
-                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<PlayerStreamerResource>.FromJson("player_streamers", response.Content);
-            return new ResourceSet<PlayerStreamerResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of PlayerStreamers.
-        /// </summary>
-        /// <param name="options"> Read PlayerStreamer parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PlayerStreamerResource>> ReadAsync(ReadPlayerStreamerOptions options,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<PlayerStreamerResource>.FromJson("player_streamers", response.Content);
-            return new ResourceSet<PlayerStreamerResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a list of PlayerStreamers.
-        /// </summary>
-        /// <param name="order"> The sort order of the list </param>
-        /// <param name="status"> Status to filter by </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PlayerStreamer </returns>
-        public static ResourceSet<PlayerStreamerResource> Read(PlayerStreamerResource.OrderEnum order = null,
-                                                               PlayerStreamerResource.StatusEnum status = null,
-                                                               int? pageSize = null,
-                                                               long? limit = null,
-                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadPlayerStreamerOptions(){Order = order, Status = status, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of PlayerStreamers.
-        /// </summary>
-        /// <param name="order"> The sort order of the list </param>
-        /// <param name="status"> Status to filter by </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PlayerStreamerResource>> ReadAsync(PlayerStreamerResource.OrderEnum order = null,
-                                                                                                       PlayerStreamerResource.StatusEnum status = null,
-                                                                                                       int? pageSize = null,
-                                                                                                       long? limit = null,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadPlayerStreamerOptions(){Order = order, Status = status, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<PlayerStreamerResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<PlayerStreamerResource>.FromJson("player_streamers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<PlayerStreamerResource> NextPage(Page<PlayerStreamerResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Media)
-            );
-
-            var response = client.Request(request);
-            return Page<PlayerStreamerResource>.FromJson("player_streamers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<PlayerStreamerResource> PreviousPage(Page<PlayerStreamerResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Media)
-            );
-
-            var response = client.Request(request);
-            return Page<PlayerStreamerResource>.FromJson("player_streamers", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a PlayerStreamerResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> PlayerStreamerResource object represented by the provided JSON </returns>
-        public static PlayerStreamerResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<PlayerStreamerResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Whether the PlayerStreamer is configured to stream video
-        /// </summary>
-        [JsonProperty("video")]
-        public bool? Video { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The status of the PlayerStreamer
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public PlayerStreamerResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URL to which Twilio will send PlayerStreamer event updates
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The HTTP method Twilio should use to call the `status_callback` URL
-        /// </summary>
-        [JsonProperty("status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// The reason why a PlayerStreamer ended
-        /// </summary>
-        [JsonProperty("ended_reason")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public PlayerStreamerResource.EndedReasonEnum EndedReason { get; private set; }
-
-        private PlayerStreamerResource()
-        {
-
-        }
-    }
+{
+
+  public class PlayerStreamerResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Created = new StatusEnum("created");
+      public static readonly StatusEnum Started = new StatusEnum("started");
+      public static readonly StatusEnum Ended = new StatusEnum("ended");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    public sealed class UpdateStatusEnum : StringEnum
+    {
+      private UpdateStatusEnum(string value) : base(value) { }
+      public UpdateStatusEnum() { }
+      public static implicit operator UpdateStatusEnum(string value)
+      {
+        return new UpdateStatusEnum(value);
+      }
+
+      public static readonly UpdateStatusEnum Ended = new UpdateStatusEnum("ended");
+    }
+
+    public sealed class OrderEnum : StringEnum
+    {
+      private OrderEnum(string value) : base(value) { }
+      public OrderEnum() { }
+      public static implicit operator OrderEnum(string value)
+      {
+        return new OrderEnum(value);
+      }
+
+      public static readonly OrderEnum Asc = new OrderEnum("asc");
+      public static readonly OrderEnum Desc = new OrderEnum("desc");
+    }
+
+    public sealed class EndedReasonEnum : StringEnum
+    {
+      private EndedReasonEnum(string value) : base(value) { }
+      public EndedReasonEnum() { }
+      public static implicit operator EndedReasonEnum(string value)
+      {
+        return new EndedReasonEnum(value);
+      }
+
+      public static readonly EndedReasonEnum EndedViaApi = new EndedReasonEnum("ended-via-api");
+      public static readonly EndedReasonEnum MaxDurationExceeded = new EndedReasonEnum("max-duration-exceeded");
+      public static readonly EndedReasonEnum StreamDisconnectedBySource = new EndedReasonEnum("stream-disconnected-by-source");
+      public static readonly EndedReasonEnum UnexpectedFailure = new EndedReasonEnum("unexpected-failure");
+    }
+
+    private static Request BuildFetchRequest(FetchPlayerStreamerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Media,
+          "/v1/PlayerStreamers/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a single PlayerStreamer resource identified by a SID.
+    /// </summary>
+    /// <param name="options"> Fetch PlayerStreamer parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PlayerStreamer </returns>
+    public static PlayerStreamerResource Fetch(FetchPlayerStreamerOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single PlayerStreamer resource identified by a SID.
+    /// </summary>
+    /// <param name="options"> Fetch PlayerStreamer parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
+    public static async System.Threading.Tasks.Task<PlayerStreamerResource> FetchAsync(FetchPlayerStreamerOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a single PlayerStreamer resource identified by a SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PlayerStreamer </returns>
+    public static PlayerStreamerResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchPlayerStreamerOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single PlayerStreamer resource identified by a SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
+    public static async System.Threading.Tasks.Task<PlayerStreamerResource> FetchAsync(string pathSid,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchPlayerStreamerOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreatePlayerStreamerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Media,
+          "/v1/PlayerStreamers",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create PlayerStreamer parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PlayerStreamer </returns>
+    public static PlayerStreamerResource Create(CreatePlayerStreamerOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create PlayerStreamer parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
+    public static async System.Threading.Tasks.Task<PlayerStreamerResource> CreateAsync(CreatePlayerStreamerOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="video"> Whether the PlayerStreamer is configured to stream video </param>
+    /// <param name="statusCallback"> The URL to which Twilio will send PlayerStreamer event updates </param>
+    /// <param name="statusCallbackMethod"> The HTTP method Twilio should use to call the `status_callback` URL </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PlayerStreamer </returns>
+    public static PlayerStreamerResource Create(bool? video = null,
+                                                Uri statusCallback = null,
+                                                Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new CreatePlayerStreamerOptions() { Video = video, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="video"> Whether the PlayerStreamer is configured to stream video </param>
+    /// <param name="statusCallback"> The URL to which Twilio will send PlayerStreamer event updates </param>
+    /// <param name="statusCallbackMethod"> The HTTP method Twilio should use to call the `status_callback` URL </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
+    public static async System.Threading.Tasks.Task<PlayerStreamerResource> CreateAsync(bool? video = null,
+                                                                                        Uri statusCallback = null,
+                                                                                        Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new CreatePlayerStreamerOptions() { Video = video, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdatePlayerStreamerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Media,
+          "/v1/PlayerStreamers/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates a PlayerStreamer resource identified by a SID.
+    /// </summary>
+    /// <param name="options"> Update PlayerStreamer parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PlayerStreamer </returns>
+    public static PlayerStreamerResource Update(UpdatePlayerStreamerOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a PlayerStreamer resource identified by a SID.
+    /// </summary>
+    /// <param name="options"> Update PlayerStreamer parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
+    public static async System.Threading.Tasks.Task<PlayerStreamerResource> UpdateAsync(UpdatePlayerStreamerOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates a PlayerStreamer resource identified by a SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="status"> The status the PlayerStreamer should be transitioned to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PlayerStreamer </returns>
+    public static PlayerStreamerResource Update(string pathSid,
+                                                PlayerStreamerResource.UpdateStatusEnum status,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdatePlayerStreamerOptions(pathSid, status);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a PlayerStreamer resource identified by a SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="status"> The status the PlayerStreamer should be transitioned to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
+    public static async System.Threading.Tasks.Task<PlayerStreamerResource> UpdateAsync(string pathSid,
+                                                                                        PlayerStreamerResource.UpdateStatusEnum status,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdatePlayerStreamerOptions(pathSid, status);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadPlayerStreamerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Media,
+          "/v1/PlayerStreamers",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a list of PlayerStreamers.
+    /// </summary>
+    /// <param name="options"> Read PlayerStreamer parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PlayerStreamer </returns>
+    public static ResourceSet<PlayerStreamerResource> Read(ReadPlayerStreamerOptions options,
+                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<PlayerStreamerResource>.FromJson("player_streamers", response.Content);
+      return new ResourceSet<PlayerStreamerResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of PlayerStreamers.
+    /// </summary>
+    /// <param name="options"> Read PlayerStreamer parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PlayerStreamerResource>> ReadAsync(ReadPlayerStreamerOptions options,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<PlayerStreamerResource>.FromJson("player_streamers", response.Content);
+      return new ResourceSet<PlayerStreamerResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a list of PlayerStreamers.
+    /// </summary>
+    /// <param name="order"> The sort order of the list </param>
+    /// <param name="status"> Status to filter by </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PlayerStreamer </returns>
+    public static ResourceSet<PlayerStreamerResource> Read(PlayerStreamerResource.OrderEnum order = null,
+                                                           PlayerStreamerResource.StatusEnum status = null,
+                                                           int? pageSize = null,
+                                                           long? limit = null,
+                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadPlayerStreamerOptions() { Order = order, Status = status, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of PlayerStreamers.
+    /// </summary>
+    /// <param name="order"> The sort order of the list </param>
+    /// <param name="status"> Status to filter by </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PlayerStreamer </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PlayerStreamerResource>> ReadAsync(PlayerStreamerResource.OrderEnum order = null,
+                                                                                                   PlayerStreamerResource.StatusEnum status = null,
+                                                                                                   int? pageSize = null,
+                                                                                                   long? limit = null,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadPlayerStreamerOptions() { Order = order, Status = status, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<PlayerStreamerResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<PlayerStreamerResource>.FromJson("player_streamers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<PlayerStreamerResource> NextPage(Page<PlayerStreamerResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Media)
+      );
+
+      var response = client.Request(request);
+      return Page<PlayerStreamerResource>.FromJson("player_streamers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<PlayerStreamerResource> PreviousPage(Page<PlayerStreamerResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Media)
+      );
+
+      var response = client.Request(request);
+      return Page<PlayerStreamerResource>.FromJson("player_streamers", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a PlayerStreamerResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> PlayerStreamerResource object represented by the provided JSON </returns>
+    public static PlayerStreamerResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<PlayerStreamerResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Whether the PlayerStreamer is configured to stream video
+    /// </summary>
+    [JsonProperty("video")]
+    public bool? Video { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The status of the PlayerStreamer
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public PlayerStreamerResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URL to which Twilio will send PlayerStreamer event updates
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The HTTP method Twilio should use to call the `status_callback` URL
+    /// </summary>
+    [JsonProperty("status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// The reason why a PlayerStreamer ended
+    /// </summary>
+    [JsonProperty("ended_reason")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public PlayerStreamerResource.EndedReasonEnum EndedReason { get; private set; }
+
+    private PlayerStreamerResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/BrandRegistration/BrandVettingOptions.cs b/src/Twilio/Rest/Messaging/V1/BrandRegistration/BrandVettingOptions.cs
index 335bf0225..9913d3f9a 100644
--- a/src/Twilio/Rest/Messaging/V1/BrandRegistration/BrandVettingOptions.cs
+++ b/src/Twilio/Rest/Messaging/V1/BrandRegistration/BrandVettingOptions.cs
@@ -9,139 +9,139 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Messaging.V1.BrandRegistration
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// CreateBrandVettingOptions
+  /// </summary>
+  public class CreateBrandVettingOptions : IOptions<BrandVettingResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// CreateBrandVettingOptions
+    /// A2P BrandRegistration Sid
     /// </summary>
-    public class CreateBrandVettingOptions : IOptions<BrandVettingResource>
-    {
-        /// <summary>
-        /// A2P BrandRegistration Sid
-        /// </summary>
-        public string PathBrandSid { get; }
-        /// <summary>
-        /// Third-party provider of the vettings to create
-        /// </summary>
-        public BrandVettingResource.VettingProviderEnum VettingProvider { get; }
-        /// <summary>
-        /// The unique ID of the vetting
-        /// </summary>
-        public string VettingId { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateBrandVettingOptions
-        /// </summary>
-        /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
-        /// <param name="vettingProvider"> Third-party provider of the vettings to create </param>
-        public CreateBrandVettingOptions(string pathBrandSid, BrandVettingResource.VettingProviderEnum vettingProvider)
-        {
-            PathBrandSid = pathBrandSid;
-            VettingProvider = vettingProvider;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (VettingProvider != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VettingProvider", VettingProvider.ToString()));
-            }
-
-            if (VettingId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VettingId", VettingId));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathBrandSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// ReadBrandVettingOptions
+    /// Third-party provider of the vettings to create
     /// </summary>
-    public class ReadBrandVettingOptions : ReadOptions<BrandVettingResource>
-    {
-        /// <summary>
-        /// A2P BrandRegistration Sid
-        /// </summary>
-        public string PathBrandSid { get; }
-        /// <summary>
-        /// Third-party provider of the vettings to create
-        /// </summary>
-        public BrandVettingResource.VettingProviderEnum VettingProvider { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadBrandVettingOptions
-        /// </summary>
-        /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
-        public ReadBrandVettingOptions(string pathBrandSid)
-        {
-            PathBrandSid = pathBrandSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (VettingProvider != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VettingProvider", VettingProvider.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public BrandVettingResource.VettingProviderEnum VettingProvider { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// FetchBrandVettingOptions
+    /// The unique ID of the vetting
     /// </summary>
-    public class FetchBrandVettingOptions : IOptions<BrandVettingResource>
-    {
-        /// <summary>
-        /// A2P BrandRegistration Sid
-        /// </summary>
-        public string PathBrandSid { get; }
-        /// <summary>
-        /// SID for third-party vetting record
-        /// </summary>
-        public string PathBrandVettingSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchBrandVettingOptions
-        /// </summary>
-        /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
-        /// <param name="pathBrandVettingSid"> SID for third-party vetting record </param>
-        public FetchBrandVettingOptions(string pathBrandSid, string pathBrandVettingSid)
-        {
-            PathBrandSid = pathBrandSid;
-            PathBrandVettingSid = pathBrandVettingSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string VettingId { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateBrandVettingOptions
+    /// </summary>
+    /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
+    /// <param name="vettingProvider"> Third-party provider of the vettings to create </param>
+    public CreateBrandVettingOptions(string pathBrandSid, BrandVettingResource.VettingProviderEnum vettingProvider)
+    {
+      PathBrandSid = pathBrandSid;
+      VettingProvider = vettingProvider;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (VettingProvider != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VettingProvider", VettingProvider.ToString()));
+      }
+
+      if (VettingId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VettingId", VettingId));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// ReadBrandVettingOptions
+  /// </summary>
+  public class ReadBrandVettingOptions : ReadOptions<BrandVettingResource>
+  {
+    /// <summary>
+    /// A2P BrandRegistration Sid
+    /// </summary>
+    public string PathBrandSid { get; }
+    /// <summary>
+    /// Third-party provider of the vettings to create
+    /// </summary>
+    public BrandVettingResource.VettingProviderEnum VettingProvider { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadBrandVettingOptions
+    /// </summary>
+    /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
+    public ReadBrandVettingOptions(string pathBrandSid)
+    {
+      PathBrandSid = pathBrandSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (VettingProvider != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VettingProvider", VettingProvider.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// FetchBrandVettingOptions
+  /// </summary>
+  public class FetchBrandVettingOptions : IOptions<BrandVettingResource>
+  {
+    /// <summary>
+    /// A2P BrandRegistration Sid
+    /// </summary>
+    public string PathBrandSid { get; }
+    /// <summary>
+    /// SID for third-party vetting record
+    /// </summary>
+    public string PathBrandVettingSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchBrandVettingOptions
+    /// </summary>
+    /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
+    /// <param name="pathBrandVettingSid"> SID for third-party vetting record </param>
+    public FetchBrandVettingOptions(string pathBrandSid, string pathBrandVettingSid)
+    {
+      PathBrandSid = pathBrandSid;
+      PathBrandVettingSid = pathBrandVettingSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/BrandRegistration/BrandVettingResource.cs b/src/Twilio/Rest/Messaging/V1/BrandRegistration/BrandVettingResource.cs
index 25e680912..b40ba68b2 100644
--- a/src/Twilio/Rest/Messaging/V1/BrandRegistration/BrandVettingResource.cs
+++ b/src/Twilio/Rest/Messaging/V1/BrandRegistration/BrandVettingResource.cs
@@ -19,382 +19,382 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Messaging.V1.BrandRegistration
-{
-
-    public class BrandVettingResource : Resource
-    {
-        public sealed class VettingProviderEnum : StringEnum
-        {
-            private VettingProviderEnum(string value) : base(value) {}
-            public VettingProviderEnum() {}
-            public static implicit operator VettingProviderEnum(string value)
-            {
-                return new VettingProviderEnum(value);
-            }
-
-            public static readonly VettingProviderEnum CampaignVerify = new VettingProviderEnum("campaign-verify");
-        }
-
-        private static Request BuildCreateRequest(CreateBrandVettingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Messaging,
-                "/v1/a2p/BrandRegistrations/" + options.PathBrandSid + "/Vettings",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create BrandVetting parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandVetting </returns>
-        public static BrandVettingResource Create(CreateBrandVettingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create BrandVetting parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandVetting </returns>
-        public static async System.Threading.Tasks.Task<BrandVettingResource> CreateAsync(CreateBrandVettingOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
-        /// <param name="vettingProvider"> Third-party provider of the vettings to create </param>
-        /// <param name="vettingId"> The unique ID of the vetting </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandVetting </returns>
-        public static BrandVettingResource Create(string pathBrandSid,
-                                                  BrandVettingResource.VettingProviderEnum vettingProvider,
-                                                  string vettingId = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateBrandVettingOptions(pathBrandSid, vettingProvider){VettingId = vettingId};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
-        /// <param name="vettingProvider"> Third-party provider of the vettings to create </param>
-        /// <param name="vettingId"> The unique ID of the vetting </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandVetting </returns>
-        public static async System.Threading.Tasks.Task<BrandVettingResource> CreateAsync(string pathBrandSid,
-                                                                                          BrandVettingResource.VettingProviderEnum vettingProvider,
-                                                                                          string vettingId = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateBrandVettingOptions(pathBrandSid, vettingProvider){VettingId = vettingId};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadBrandVettingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/a2p/BrandRegistrations/" + options.PathBrandSid + "/Vettings",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read BrandVetting parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandVetting </returns>
-        public static ResourceSet<BrandVettingResource> Read(ReadBrandVettingOptions options,
-                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<BrandVettingResource>.FromJson("data", response.Content);
-            return new ResourceSet<BrandVettingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read BrandVetting parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandVetting </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BrandVettingResource>> ReadAsync(ReadBrandVettingOptions options,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<BrandVettingResource>.FromJson("data", response.Content);
-            return new ResourceSet<BrandVettingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
-        /// <param name="vettingProvider"> Third-party provider of the vettings to create </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandVetting </returns>
-        public static ResourceSet<BrandVettingResource> Read(string pathBrandSid,
-                                                             BrandVettingResource.VettingProviderEnum vettingProvider = null,
-                                                             int? pageSize = null,
-                                                             long? limit = null,
-                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadBrandVettingOptions(pathBrandSid){VettingProvider = vettingProvider, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
-        /// <param name="vettingProvider"> Third-party provider of the vettings to create </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandVetting </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BrandVettingResource>> ReadAsync(string pathBrandSid,
-                                                                                                     BrandVettingResource.VettingProviderEnum vettingProvider = null,
-                                                                                                     int? pageSize = null,
-                                                                                                     long? limit = null,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadBrandVettingOptions(pathBrandSid){VettingProvider = vettingProvider, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<BrandVettingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<BrandVettingResource>.FromJson("data", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<BrandVettingResource> NextPage(Page<BrandVettingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<BrandVettingResource>.FromJson("data", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<BrandVettingResource> PreviousPage(Page<BrandVettingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<BrandVettingResource>.FromJson("data", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchBrandVettingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/a2p/BrandRegistrations/" + options.PathBrandSid + "/Vettings/" + options.PathBrandVettingSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch BrandVetting parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandVetting </returns>
-        public static BrandVettingResource Fetch(FetchBrandVettingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch BrandVetting parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandVetting </returns>
-        public static async System.Threading.Tasks.Task<BrandVettingResource> FetchAsync(FetchBrandVettingOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
-        /// <param name="pathBrandVettingSid"> SID for third-party vetting record </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandVetting </returns>
-        public static BrandVettingResource Fetch(string pathBrandSid,
-                                                 string pathBrandVettingSid,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchBrandVettingOptions(pathBrandSid, pathBrandVettingSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
-        /// <param name="pathBrandVettingSid"> SID for third-party vetting record </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandVetting </returns>
-        public static async System.Threading.Tasks.Task<BrandVettingResource> FetchAsync(string pathBrandSid,
-                                                                                         string pathBrandVettingSid,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchBrandVettingOptions(pathBrandSid, pathBrandVettingSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a BrandVettingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BrandVettingResource object represented by the provided JSON </returns>
-        public static BrandVettingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BrandVettingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the vetting
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// A2P BrandRegistration Sid
-        /// </summary>
-        [JsonProperty("brand_sid")]
-        public string BrandSid { get; private set; }
-        /// <summary>
-        /// SID for third-party vetting record
-        /// </summary>
-        [JsonProperty("brand_vetting_sid")]
-        public string BrandVettingSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The unique ID of the vetting
-        /// </summary>
-        [JsonProperty("vetting_id")]
-        public string VettingId { get; private set; }
-        /// <summary>
-        /// The type of vetting
-        /// </summary>
-        [JsonProperty("vetting_class")]
-        public string VettingClass { get; private set; }
-        /// <summary>
-        /// Status of vetting attempt
-        /// </summary>
-        [JsonProperty("vetting_status")]
-        public string VettingStatus { get; private set; }
-        /// <summary>
-        /// Third-party provider that has conducted the vetting
-        /// </summary>
-        [JsonProperty("vetting_provider")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public BrandVettingResource.VettingProviderEnum VettingProvider { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Brand Vetting
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private BrandVettingResource()
-        {
-
-        }
-    }
+{
+
+  public class BrandVettingResource : Resource
+  {
+    public sealed class VettingProviderEnum : StringEnum
+    {
+      private VettingProviderEnum(string value) : base(value) { }
+      public VettingProviderEnum() { }
+      public static implicit operator VettingProviderEnum(string value)
+      {
+        return new VettingProviderEnum(value);
+      }
+
+      public static readonly VettingProviderEnum CampaignVerify = new VettingProviderEnum("campaign-verify");
+    }
+
+    private static Request BuildCreateRequest(CreateBrandVettingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Messaging,
+          "/v1/a2p/BrandRegistrations/" + options.PathBrandSid + "/Vettings",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create BrandVetting parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandVetting </returns>
+    public static BrandVettingResource Create(CreateBrandVettingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create BrandVetting parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandVetting </returns>
+    public static async System.Threading.Tasks.Task<BrandVettingResource> CreateAsync(CreateBrandVettingOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
+    /// <param name="vettingProvider"> Third-party provider of the vettings to create </param>
+    /// <param name="vettingId"> The unique ID of the vetting </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandVetting </returns>
+    public static BrandVettingResource Create(string pathBrandSid,
+                                              BrandVettingResource.VettingProviderEnum vettingProvider,
+                                              string vettingId = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateBrandVettingOptions(pathBrandSid, vettingProvider) { VettingId = vettingId };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
+    /// <param name="vettingProvider"> Third-party provider of the vettings to create </param>
+    /// <param name="vettingId"> The unique ID of the vetting </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandVetting </returns>
+    public static async System.Threading.Tasks.Task<BrandVettingResource> CreateAsync(string pathBrandSid,
+                                                                                      BrandVettingResource.VettingProviderEnum vettingProvider,
+                                                                                      string vettingId = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateBrandVettingOptions(pathBrandSid, vettingProvider) { VettingId = vettingId };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadBrandVettingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/a2p/BrandRegistrations/" + options.PathBrandSid + "/Vettings",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read BrandVetting parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandVetting </returns>
+    public static ResourceSet<BrandVettingResource> Read(ReadBrandVettingOptions options,
+                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<BrandVettingResource>.FromJson("data", response.Content);
+      return new ResourceSet<BrandVettingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read BrandVetting parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandVetting </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BrandVettingResource>> ReadAsync(ReadBrandVettingOptions options,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<BrandVettingResource>.FromJson("data", response.Content);
+      return new ResourceSet<BrandVettingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
+    /// <param name="vettingProvider"> Third-party provider of the vettings to create </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandVetting </returns>
+    public static ResourceSet<BrandVettingResource> Read(string pathBrandSid,
+                                                         BrandVettingResource.VettingProviderEnum vettingProvider = null,
+                                                         int? pageSize = null,
+                                                         long? limit = null,
+                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadBrandVettingOptions(pathBrandSid) { VettingProvider = vettingProvider, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
+    /// <param name="vettingProvider"> Third-party provider of the vettings to create </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandVetting </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BrandVettingResource>> ReadAsync(string pathBrandSid,
+                                                                                                 BrandVettingResource.VettingProviderEnum vettingProvider = null,
+                                                                                                 int? pageSize = null,
+                                                                                                 long? limit = null,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadBrandVettingOptions(pathBrandSid) { VettingProvider = vettingProvider, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<BrandVettingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<BrandVettingResource>.FromJson("data", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<BrandVettingResource> NextPage(Page<BrandVettingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<BrandVettingResource>.FromJson("data", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<BrandVettingResource> PreviousPage(Page<BrandVettingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<BrandVettingResource>.FromJson("data", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchBrandVettingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/a2p/BrandRegistrations/" + options.PathBrandSid + "/Vettings/" + options.PathBrandVettingSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch BrandVetting parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandVetting </returns>
+    public static BrandVettingResource Fetch(FetchBrandVettingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch BrandVetting parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandVetting </returns>
+    public static async System.Threading.Tasks.Task<BrandVettingResource> FetchAsync(FetchBrandVettingOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
+    /// <param name="pathBrandVettingSid"> SID for third-party vetting record </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandVetting </returns>
+    public static BrandVettingResource Fetch(string pathBrandSid,
+                                             string pathBrandVettingSid,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchBrandVettingOptions(pathBrandSid, pathBrandVettingSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathBrandSid"> A2P BrandRegistration Sid </param>
+    /// <param name="pathBrandVettingSid"> SID for third-party vetting record </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandVetting </returns>
+    public static async System.Threading.Tasks.Task<BrandVettingResource> FetchAsync(string pathBrandSid,
+                                                                                     string pathBrandVettingSid,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchBrandVettingOptions(pathBrandSid, pathBrandVettingSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a BrandVettingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BrandVettingResource object represented by the provided JSON </returns>
+    public static BrandVettingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BrandVettingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the vetting
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// A2P BrandRegistration Sid
+    /// </summary>
+    [JsonProperty("brand_sid")]
+    public string BrandSid { get; private set; }
+    /// <summary>
+    /// SID for third-party vetting record
+    /// </summary>
+    [JsonProperty("brand_vetting_sid")]
+    public string BrandVettingSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The unique ID of the vetting
+    /// </summary>
+    [JsonProperty("vetting_id")]
+    public string VettingId { get; private set; }
+    /// <summary>
+    /// The type of vetting
+    /// </summary>
+    [JsonProperty("vetting_class")]
+    public string VettingClass { get; private set; }
+    /// <summary>
+    /// Status of vetting attempt
+    /// </summary>
+    [JsonProperty("vetting_status")]
+    public string VettingStatus { get; private set; }
+    /// <summary>
+    /// Third-party provider that has conducted the vetting
+    /// </summary>
+    [JsonProperty("vetting_provider")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public BrandVettingResource.VettingProviderEnum VettingProvider { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Brand Vetting
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private BrandVettingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/BrandRegistrationOptions.cs b/src/Twilio/Rest/Messaging/V1/BrandRegistrationOptions.cs
index c873f3102..a0a1e226f 100644
--- a/src/Twilio/Rest/Messaging/V1/BrandRegistrationOptions.cs
+++ b/src/Twilio/Rest/Messaging/V1/BrandRegistrationOptions.cs
@@ -9,133 +9,133 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Messaging.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// FetchBrandRegistrationOptions
+  /// </summary>
+  public class FetchBrandRegistrationOptions : IOptions<BrandRegistrationResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// FetchBrandRegistrationOptions
+    /// The SID that identifies the resource to fetch
     /// </summary>
-    public class FetchBrandRegistrationOptions : IOptions<BrandRegistrationResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchBrandRegistrationOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchBrandRegistrationOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// ReadBrandRegistrationOptions
+    /// Construct a new FetchBrandRegistrationOptions
     /// </summary>
-    public class ReadBrandRegistrationOptions : ReadOptions<BrandRegistrationResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchBrandRegistrationOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// CreateBrandRegistrationOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateBrandRegistrationOptions : IOptions<BrandRegistrationResource>
-    {
-        /// <summary>
-        /// Customer Profile Bundle Sid
-        /// </summary>
-        public string CustomerProfileBundleSid { get; }
-        /// <summary>
-        /// A2P Messaging Profile Bundle Sid
-        /// </summary>
-        public string A2PProfileBundleSid { get; }
-        /// <summary>
-        /// Type of brand being created. One of: "STANDARD", "STARTER".
-        /// </summary>
-        public string BrandType { get; set; }
-        /// <summary>
-        /// A boolean that specifies whether brand should be a mock or not. If true, brand will be registered as a mock brand. Defaults to false if no value is provided.
-        /// </summary>
-        public bool? Mock { get; set; }
-        /// <summary>
-        /// Skip Automatic Secondary Vetting
-        /// </summary>
-        public bool? SkipAutomaticSecVet { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateBrandRegistrationOptions
-        /// </summary>
-        /// <param name="customerProfileBundleSid"> Customer Profile Bundle Sid </param>
-        /// <param name="a2PProfileBundleSid"> A2P Messaging Profile Bundle Sid </param>
-        public CreateBrandRegistrationOptions(string customerProfileBundleSid, string a2PProfileBundleSid)
-        {
-            CustomerProfileBundleSid = customerProfileBundleSid;
-            A2PProfileBundleSid = a2PProfileBundleSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (CustomerProfileBundleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CustomerProfileBundleSid", CustomerProfileBundleSid.ToString()));
-            }
-
-            if (A2PProfileBundleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("A2PProfileBundleSid", A2PProfileBundleSid.ToString()));
-            }
-
-            if (BrandType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BrandType", BrandType));
-            }
-
-            if (Mock != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Mock", Mock.Value.ToString().ToLower()));
-            }
-
-            if (SkipAutomaticSecVet != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SkipAutomaticSecVet", SkipAutomaticSecVet.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// ReadBrandRegistrationOptions
+  /// </summary>
+  public class ReadBrandRegistrationOptions : ReadOptions<BrandRegistrationResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// CreateBrandRegistrationOptions
+  /// </summary>
+  public class CreateBrandRegistrationOptions : IOptions<BrandRegistrationResource>
+  {
+    /// <summary>
+    /// Customer Profile Bundle Sid
+    /// </summary>
+    public string CustomerProfileBundleSid { get; }
+    /// <summary>
+    /// A2P Messaging Profile Bundle Sid
+    /// </summary>
+    public string A2PProfileBundleSid { get; }
+    /// <summary>
+    /// Type of brand being created. One of: "STANDARD", "STARTER".
+    /// </summary>
+    public string BrandType { get; set; }
+    /// <summary>
+    /// A boolean that specifies whether brand should be a mock or not. If true, brand will be registered as a mock brand. Defaults to false if no value is provided.
+    /// </summary>
+    public bool? Mock { get; set; }
+    /// <summary>
+    /// Skip Automatic Secondary Vetting
+    /// </summary>
+    public bool? SkipAutomaticSecVet { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateBrandRegistrationOptions
+    /// </summary>
+    /// <param name="customerProfileBundleSid"> Customer Profile Bundle Sid </param>
+    /// <param name="a2PProfileBundleSid"> A2P Messaging Profile Bundle Sid </param>
+    public CreateBrandRegistrationOptions(string customerProfileBundleSid, string a2PProfileBundleSid)
+    {
+      CustomerProfileBundleSid = customerProfileBundleSid;
+      A2PProfileBundleSid = a2PProfileBundleSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (CustomerProfileBundleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CustomerProfileBundleSid", CustomerProfileBundleSid.ToString()));
+      }
+
+      if (A2PProfileBundleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("A2PProfileBundleSid", A2PProfileBundleSid.ToString()));
+      }
+
+      if (BrandType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BrandType", BrandType));
+      }
+
+      if (Mock != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Mock", Mock.Value.ToString().ToLower()));
+      }
+
+      if (SkipAutomaticSecVet != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SkipAutomaticSecVet", SkipAutomaticSecVet.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/BrandRegistrationResource.cs b/src/Twilio/Rest/Messaging/V1/BrandRegistrationResource.cs
index 5ff183184..6e7445d49 100644
--- a/src/Twilio/Rest/Messaging/V1/BrandRegistrationResource.cs
+++ b/src/Twilio/Rest/Messaging/V1/BrandRegistrationResource.cs
@@ -19,464 +19,464 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Messaging.V1
-{
-
-    public class BrandRegistrationResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Pending = new StatusEnum("PENDING");
-            public static readonly StatusEnum Approved = new StatusEnum("APPROVED");
-            public static readonly StatusEnum Failed = new StatusEnum("FAILED");
-            public static readonly StatusEnum InReview = new StatusEnum("IN_REVIEW");
-            public static readonly StatusEnum Deleted = new StatusEnum("DELETED");
-        }
-
-        public sealed class IdentityStatusEnum : StringEnum
-        {
-            private IdentityStatusEnum(string value) : base(value) {}
-            public IdentityStatusEnum() {}
-            public static implicit operator IdentityStatusEnum(string value)
-            {
-                return new IdentityStatusEnum(value);
-            }
-
-            public static readonly IdentityStatusEnum SelfDeclared = new IdentityStatusEnum("SELF_DECLARED");
-            public static readonly IdentityStatusEnum Unverified = new IdentityStatusEnum("UNVERIFIED");
-            public static readonly IdentityStatusEnum Verified = new IdentityStatusEnum("VERIFIED");
-            public static readonly IdentityStatusEnum VettedVerified = new IdentityStatusEnum("VETTED_VERIFIED");
-        }
-
-        public sealed class BrandFeedbackEnum : StringEnum
-        {
-            private BrandFeedbackEnum(string value) : base(value) {}
-            public BrandFeedbackEnum() {}
-            public static implicit operator BrandFeedbackEnum(string value)
-            {
-                return new BrandFeedbackEnum(value);
-            }
-
-            public static readonly BrandFeedbackEnum TaxId = new BrandFeedbackEnum("TAX_ID");
-            public static readonly BrandFeedbackEnum StockSymbol = new BrandFeedbackEnum("STOCK_SYMBOL");
-            public static readonly BrandFeedbackEnum Nonprofit = new BrandFeedbackEnum("NONPROFIT");
-            public static readonly BrandFeedbackEnum GovernmentEntity = new BrandFeedbackEnum("GOVERNMENT_ENTITY");
-            public static readonly BrandFeedbackEnum Others = new BrandFeedbackEnum("OTHERS");
-        }
-
-        private static Request BuildFetchRequest(FetchBrandRegistrationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/a2p/BrandRegistrations/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch BrandRegistration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandRegistration </returns>
-        public static BrandRegistrationResource Fetch(FetchBrandRegistrationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch BrandRegistration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandRegistration </returns>
-        public static async System.Threading.Tasks.Task<BrandRegistrationResource> FetchAsync(FetchBrandRegistrationOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandRegistration </returns>
-        public static BrandRegistrationResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchBrandRegistrationOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandRegistration </returns>
-        public static async System.Threading.Tasks.Task<BrandRegistrationResource> FetchAsync(string pathSid,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchBrandRegistrationOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadBrandRegistrationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/a2p/BrandRegistrations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read BrandRegistration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandRegistration </returns>
-        public static ResourceSet<BrandRegistrationResource> Read(ReadBrandRegistrationOptions options,
-                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<BrandRegistrationResource>.FromJson("data", response.Content);
-            return new ResourceSet<BrandRegistrationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read BrandRegistration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandRegistration </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BrandRegistrationResource>> ReadAsync(ReadBrandRegistrationOptions options,
-                                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<BrandRegistrationResource>.FromJson("data", response.Content);
-            return new ResourceSet<BrandRegistrationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandRegistration </returns>
-        public static ResourceSet<BrandRegistrationResource> Read(int? pageSize = null,
-                                                                  long? limit = null,
-                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadBrandRegistrationOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandRegistration </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BrandRegistrationResource>> ReadAsync(int? pageSize = null,
-                                                                                                          long? limit = null,
-                                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadBrandRegistrationOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<BrandRegistrationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<BrandRegistrationResource>.FromJson("data", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<BrandRegistrationResource> NextPage(Page<BrandRegistrationResource> page,
-                                                               ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<BrandRegistrationResource>.FromJson("data", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<BrandRegistrationResource> PreviousPage(Page<BrandRegistrationResource> page,
-                                                                   ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<BrandRegistrationResource>.FromJson("data", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateBrandRegistrationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Messaging,
-                "/v1/a2p/BrandRegistrations",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create BrandRegistration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandRegistration </returns>
-        public static BrandRegistrationResource Create(CreateBrandRegistrationOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create BrandRegistration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandRegistration </returns>
-        public static async System.Threading.Tasks.Task<BrandRegistrationResource> CreateAsync(CreateBrandRegistrationOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="customerProfileBundleSid"> Customer Profile Bundle Sid </param>
-        /// <param name="a2PProfileBundleSid"> A2P Messaging Profile Bundle Sid </param>
-        /// <param name="brandType"> Type of brand being created. One of: "STANDARD", "STARTER". </param>
-        /// <param name="mock"> A boolean that specifies whether brand should be a mock or not. If true, brand will be
-        ///            registered as a mock brand. Defaults to false if no value is provided. </param>
-        /// <param name="skipAutomaticSecVet"> Skip Automatic Secondary Vetting </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandRegistration </returns>
-        public static BrandRegistrationResource Create(string customerProfileBundleSid,
-                                                       string a2PProfileBundleSid,
-                                                       string brandType = null,
-                                                       bool? mock = null,
-                                                       bool? skipAutomaticSecVet = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateBrandRegistrationOptions(customerProfileBundleSid, a2PProfileBundleSid){BrandType = brandType, Mock = mock, SkipAutomaticSecVet = skipAutomaticSecVet};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="customerProfileBundleSid"> Customer Profile Bundle Sid </param>
-        /// <param name="a2PProfileBundleSid"> A2P Messaging Profile Bundle Sid </param>
-        /// <param name="brandType"> Type of brand being created. One of: "STANDARD", "STARTER". </param>
-        /// <param name="mock"> A boolean that specifies whether brand should be a mock or not. If true, brand will be
-        ///            registered as a mock brand. Defaults to false if no value is provided. </param>
-        /// <param name="skipAutomaticSecVet"> Skip Automatic Secondary Vetting </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandRegistration </returns>
-        public static async System.Threading.Tasks.Task<BrandRegistrationResource> CreateAsync(string customerProfileBundleSid,
-                                                                                               string a2PProfileBundleSid,
-                                                                                               string brandType = null,
-                                                                                               bool? mock = null,
-                                                                                               bool? skipAutomaticSecVet = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateBrandRegistrationOptions(customerProfileBundleSid, a2PProfileBundleSid){BrandType = brandType, Mock = mock, SkipAutomaticSecVet = skipAutomaticSecVet};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a BrandRegistrationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BrandRegistrationResource object represented by the provided JSON </returns>
-        public static BrandRegistrationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BrandRegistrationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A2P BrandRegistration Sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// A2P Messaging Profile Bundle BundleSid
-        /// </summary>
-        [JsonProperty("customer_profile_bundle_sid")]
-        public string CustomerProfileBundleSid { get; private set; }
-        /// <summary>
-        /// A2P Messaging Profile Bundle BundleSid
-        /// </summary>
-        [JsonProperty("a2p_profile_bundle_sid")]
-        public string A2PProfileBundleSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Type of brand. One of: "STANDARD", "STARTER".
-        /// </summary>
-        [JsonProperty("brand_type")]
-        public string BrandType { get; private set; }
-        /// <summary>
-        /// Brand Registration status.
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public BrandRegistrationResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// Campaign Registry (TCR) Brand ID
-        /// </summary>
-        [JsonProperty("tcr_id")]
-        public string TcrId { get; private set; }
-        /// <summary>
-        /// A reason why brand registration has failed
-        /// </summary>
-        [JsonProperty("failure_reason")]
-        public string FailureReason { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Brand Registration
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Brand score
-        /// </summary>
-        [JsonProperty("brand_score")]
-        public int? BrandScore { get; private set; }
-        /// <summary>
-        /// Brand feedback
-        /// </summary>
-        [JsonProperty("brand_feedback")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public List<BrandRegistrationResource.BrandFeedbackEnum> BrandFeedback { get; private set; }
-        /// <summary>
-        /// Identity Status
-        /// </summary>
-        [JsonProperty("identity_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public BrandRegistrationResource.IdentityStatusEnum IdentityStatus { get; private set; }
-        /// <summary>
-        /// Russell 3000
-        /// </summary>
-        [JsonProperty("russell_3000")]
-        public bool? Russell3000 { get; private set; }
-        /// <summary>
-        /// Tax Exempt Status
-        /// </summary>
-        [JsonProperty("tax_exempt_status")]
-        public string TaxExemptStatus { get; private set; }
-        /// <summary>
-        /// Skip Automatic Secondary Vetting
-        /// </summary>
-        [JsonProperty("skip_automatic_sec_vet")]
-        public bool? SkipAutomaticSecVet { get; private set; }
-        /// <summary>
-        /// A boolean that specifies whether brand should be a mock or not. If true, brand will be registered as a mock brand. Defaults to false if no value is provided.
-        /// </summary>
-        [JsonProperty("mock")]
-        public bool? Mock { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private BrandRegistrationResource()
-        {
-
-        }
-    }
+{
+
+  public class BrandRegistrationResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Pending = new StatusEnum("PENDING");
+      public static readonly StatusEnum Approved = new StatusEnum("APPROVED");
+      public static readonly StatusEnum Failed = new StatusEnum("FAILED");
+      public static readonly StatusEnum InReview = new StatusEnum("IN_REVIEW");
+      public static readonly StatusEnum Deleted = new StatusEnum("DELETED");
+    }
+
+    public sealed class IdentityStatusEnum : StringEnum
+    {
+      private IdentityStatusEnum(string value) : base(value) { }
+      public IdentityStatusEnum() { }
+      public static implicit operator IdentityStatusEnum(string value)
+      {
+        return new IdentityStatusEnum(value);
+      }
+
+      public static readonly IdentityStatusEnum SelfDeclared = new IdentityStatusEnum("SELF_DECLARED");
+      public static readonly IdentityStatusEnum Unverified = new IdentityStatusEnum("UNVERIFIED");
+      public static readonly IdentityStatusEnum Verified = new IdentityStatusEnum("VERIFIED");
+      public static readonly IdentityStatusEnum VettedVerified = new IdentityStatusEnum("VETTED_VERIFIED");
+    }
+
+    public sealed class BrandFeedbackEnum : StringEnum
+    {
+      private BrandFeedbackEnum(string value) : base(value) { }
+      public BrandFeedbackEnum() { }
+      public static implicit operator BrandFeedbackEnum(string value)
+      {
+        return new BrandFeedbackEnum(value);
+      }
+
+      public static readonly BrandFeedbackEnum TaxId = new BrandFeedbackEnum("TAX_ID");
+      public static readonly BrandFeedbackEnum StockSymbol = new BrandFeedbackEnum("STOCK_SYMBOL");
+      public static readonly BrandFeedbackEnum Nonprofit = new BrandFeedbackEnum("NONPROFIT");
+      public static readonly BrandFeedbackEnum GovernmentEntity = new BrandFeedbackEnum("GOVERNMENT_ENTITY");
+      public static readonly BrandFeedbackEnum Others = new BrandFeedbackEnum("OTHERS");
+    }
+
+    private static Request BuildFetchRequest(FetchBrandRegistrationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/a2p/BrandRegistrations/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch BrandRegistration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandRegistration </returns>
+    public static BrandRegistrationResource Fetch(FetchBrandRegistrationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch BrandRegistration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandRegistration </returns>
+    public static async System.Threading.Tasks.Task<BrandRegistrationResource> FetchAsync(FetchBrandRegistrationOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandRegistration </returns>
+    public static BrandRegistrationResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchBrandRegistrationOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandRegistration </returns>
+    public static async System.Threading.Tasks.Task<BrandRegistrationResource> FetchAsync(string pathSid,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchBrandRegistrationOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadBrandRegistrationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/a2p/BrandRegistrations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read BrandRegistration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandRegistration </returns>
+    public static ResourceSet<BrandRegistrationResource> Read(ReadBrandRegistrationOptions options,
+                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<BrandRegistrationResource>.FromJson("data", response.Content);
+      return new ResourceSet<BrandRegistrationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read BrandRegistration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandRegistration </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BrandRegistrationResource>> ReadAsync(ReadBrandRegistrationOptions options,
+                                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<BrandRegistrationResource>.FromJson("data", response.Content);
+      return new ResourceSet<BrandRegistrationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandRegistration </returns>
+    public static ResourceSet<BrandRegistrationResource> Read(int? pageSize = null,
+                                                              long? limit = null,
+                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadBrandRegistrationOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandRegistration </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BrandRegistrationResource>> ReadAsync(int? pageSize = null,
+                                                                                                      long? limit = null,
+                                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadBrandRegistrationOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<BrandRegistrationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<BrandRegistrationResource>.FromJson("data", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<BrandRegistrationResource> NextPage(Page<BrandRegistrationResource> page,
+                                                           ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<BrandRegistrationResource>.FromJson("data", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<BrandRegistrationResource> PreviousPage(Page<BrandRegistrationResource> page,
+                                                               ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<BrandRegistrationResource>.FromJson("data", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateBrandRegistrationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Messaging,
+          "/v1/a2p/BrandRegistrations",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create BrandRegistration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandRegistration </returns>
+    public static BrandRegistrationResource Create(CreateBrandRegistrationOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create BrandRegistration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandRegistration </returns>
+    public static async System.Threading.Tasks.Task<BrandRegistrationResource> CreateAsync(CreateBrandRegistrationOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="customerProfileBundleSid"> Customer Profile Bundle Sid </param>
+    /// <param name="a2PProfileBundleSid"> A2P Messaging Profile Bundle Sid </param>
+    /// <param name="brandType"> Type of brand being created. One of: "STANDARD", "STARTER". </param>
+    /// <param name="mock"> A boolean that specifies whether brand should be a mock or not. If true, brand will be
+    ///            registered as a mock brand. Defaults to false if no value is provided. </param>
+    /// <param name="skipAutomaticSecVet"> Skip Automatic Secondary Vetting </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandRegistration </returns>
+    public static BrandRegistrationResource Create(string customerProfileBundleSid,
+                                                   string a2PProfileBundleSid,
+                                                   string brandType = null,
+                                                   bool? mock = null,
+                                                   bool? skipAutomaticSecVet = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateBrandRegistrationOptions(customerProfileBundleSid, a2PProfileBundleSid) { BrandType = brandType, Mock = mock, SkipAutomaticSecVet = skipAutomaticSecVet };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="customerProfileBundleSid"> Customer Profile Bundle Sid </param>
+    /// <param name="a2PProfileBundleSid"> A2P Messaging Profile Bundle Sid </param>
+    /// <param name="brandType"> Type of brand being created. One of: "STANDARD", "STARTER". </param>
+    /// <param name="mock"> A boolean that specifies whether brand should be a mock or not. If true, brand will be
+    ///            registered as a mock brand. Defaults to false if no value is provided. </param>
+    /// <param name="skipAutomaticSecVet"> Skip Automatic Secondary Vetting </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandRegistration </returns>
+    public static async System.Threading.Tasks.Task<BrandRegistrationResource> CreateAsync(string customerProfileBundleSid,
+                                                                                           string a2PProfileBundleSid,
+                                                                                           string brandType = null,
+                                                                                           bool? mock = null,
+                                                                                           bool? skipAutomaticSecVet = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateBrandRegistrationOptions(customerProfileBundleSid, a2PProfileBundleSid) { BrandType = brandType, Mock = mock, SkipAutomaticSecVet = skipAutomaticSecVet };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a BrandRegistrationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BrandRegistrationResource object represented by the provided JSON </returns>
+    public static BrandRegistrationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BrandRegistrationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A2P BrandRegistration Sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// A2P Messaging Profile Bundle BundleSid
+    /// </summary>
+    [JsonProperty("customer_profile_bundle_sid")]
+    public string CustomerProfileBundleSid { get; private set; }
+    /// <summary>
+    /// A2P Messaging Profile Bundle BundleSid
+    /// </summary>
+    [JsonProperty("a2p_profile_bundle_sid")]
+    public string A2PProfileBundleSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Type of brand. One of: "STANDARD", "STARTER".
+    /// </summary>
+    [JsonProperty("brand_type")]
+    public string BrandType { get; private set; }
+    /// <summary>
+    /// Brand Registration status.
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public BrandRegistrationResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// Campaign Registry (TCR) Brand ID
+    /// </summary>
+    [JsonProperty("tcr_id")]
+    public string TcrId { get; private set; }
+    /// <summary>
+    /// A reason why brand registration has failed
+    /// </summary>
+    [JsonProperty("failure_reason")]
+    public string FailureReason { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Brand Registration
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Brand score
+    /// </summary>
+    [JsonProperty("brand_score")]
+    public int? BrandScore { get; private set; }
+    /// <summary>
+    /// Brand feedback
+    /// </summary>
+    [JsonProperty("brand_feedback")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public List<BrandRegistrationResource.BrandFeedbackEnum> BrandFeedback { get; private set; }
+    /// <summary>
+    /// Identity Status
+    /// </summary>
+    [JsonProperty("identity_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public BrandRegistrationResource.IdentityStatusEnum IdentityStatus { get; private set; }
+    /// <summary>
+    /// Russell 3000
+    /// </summary>
+    [JsonProperty("russell_3000")]
+    public bool? Russell3000 { get; private set; }
+    /// <summary>
+    /// Tax Exempt Status
+    /// </summary>
+    [JsonProperty("tax_exempt_status")]
+    public string TaxExemptStatus { get; private set; }
+    /// <summary>
+    /// Skip Automatic Secondary Vetting
+    /// </summary>
+    [JsonProperty("skip_automatic_sec_vet")]
+    public bool? SkipAutomaticSecVet { get; private set; }
+    /// <summary>
+    /// A boolean that specifies whether brand should be a mock or not. If true, brand will be registered as a mock brand. Defaults to false if no value is provided.
+    /// </summary>
+    [JsonProperty("mock")]
+    public bool? Mock { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private BrandRegistrationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/DeactivationsOptions.cs b/src/Twilio/Rest/Messaging/V1/DeactivationsOptions.cs
index 84d3c54ea..8f7eb1dd2 100644
--- a/src/Twilio/Rest/Messaging/V1/DeactivationsOptions.cs
+++ b/src/Twilio/Rest/Messaging/V1/DeactivationsOptions.cs
@@ -9,31 +9,31 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Messaging.V1
-{
-
+{
+
+  /// <summary>
+  /// Fetch a list of all United States numbers that have been deactivated on a specific date.
+  /// </summary>
+  public class FetchDeactivationsOptions : IOptions<DeactivationsResource>
+  {
     /// <summary>
-    /// Fetch a list of all United States numbers that have been deactivated on a specific date.
+    /// The date to retrieve deactivated numbers for.
     /// </summary>
-    public class FetchDeactivationsOptions : IOptions<DeactivationsResource>
-    {
-        /// <summary>
-        /// The date to retrieve deactivated numbers for.
-        /// </summary>
-        public DateTime? Date { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Date != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Date", Date.Value.ToString("yyyy-MM-dd")));
-            }
-
-            return p;
-        }
-    }
+    public DateTime? Date { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Date != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Date", Date.Value.ToString("yyyy-MM-dd")));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/DeactivationsResource.cs b/src/Twilio/Rest/Messaging/V1/DeactivationsResource.cs
index 59707bc4b..3c67ee689 100644
--- a/src/Twilio/Rest/Messaging/V1/DeactivationsResource.cs
+++ b/src/Twilio/Rest/Messaging/V1/DeactivationsResource.cs
@@ -16,105 +16,105 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Messaging.V1
-{
-
-    public class DeactivationsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchDeactivationsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/Deactivations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a list of all United States numbers that have been deactivated on a specific date.
-        /// </summary>
-        /// <param name="options"> Fetch Deactivations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deactivations </returns>
-        public static DeactivationsResource Fetch(FetchDeactivationsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a list of all United States numbers that have been deactivated on a specific date.
-        /// </summary>
-        /// <param name="options"> Fetch Deactivations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deactivations </returns>
-        public static async System.Threading.Tasks.Task<DeactivationsResource> FetchAsync(FetchDeactivationsOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a list of all United States numbers that have been deactivated on a specific date.
-        /// </summary>
-        /// <param name="date"> The date to retrieve deactivated numbers for. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deactivations </returns>
-        public static DeactivationsResource Fetch(DateTime? date = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchDeactivationsOptions(){Date = date};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a list of all United States numbers that have been deactivated on a specific date.
-        /// </summary>
-        /// <param name="date"> The date to retrieve deactivated numbers for. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deactivations </returns>
-        public static async System.Threading.Tasks.Task<DeactivationsResource> FetchAsync(DateTime? date = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchDeactivationsOptions(){Date = date};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a DeactivationsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DeactivationsResource object represented by the provided JSON </returns>
-        public static DeactivationsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DeactivationsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Redirect url to the list of deactivated numbers.
-        /// </summary>
-        [JsonProperty("redirect_to")]
-        public Uri RedirectTo { get; private set; }
-
-        private DeactivationsResource()
-        {
-
-        }
-    }
+{
+
+  public class DeactivationsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchDeactivationsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/Deactivations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a list of all United States numbers that have been deactivated on a specific date.
+    /// </summary>
+    /// <param name="options"> Fetch Deactivations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deactivations </returns>
+    public static DeactivationsResource Fetch(FetchDeactivationsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a list of all United States numbers that have been deactivated on a specific date.
+    /// </summary>
+    /// <param name="options"> Fetch Deactivations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deactivations </returns>
+    public static async System.Threading.Tasks.Task<DeactivationsResource> FetchAsync(FetchDeactivationsOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a list of all United States numbers that have been deactivated on a specific date.
+    /// </summary>
+    /// <param name="date"> The date to retrieve deactivated numbers for. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deactivations </returns>
+    public static DeactivationsResource Fetch(DateTime? date = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchDeactivationsOptions() { Date = date };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a list of all United States numbers that have been deactivated on a specific date.
+    /// </summary>
+    /// <param name="date"> The date to retrieve deactivated numbers for. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deactivations </returns>
+    public static async System.Threading.Tasks.Task<DeactivationsResource> FetchAsync(DateTime? date = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchDeactivationsOptions() { Date = date };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a DeactivationsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DeactivationsResource object represented by the provided JSON </returns>
+    public static DeactivationsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DeactivationsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Redirect url to the list of deactivated numbers.
+    /// </summary>
+    [JsonProperty("redirect_to")]
+    public Uri RedirectTo { get; private set; }
+
+    private DeactivationsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/ExternalCampaignOptions.cs b/src/Twilio/Rest/Messaging/V1/ExternalCampaignOptions.cs
index 881e90ca0..5bab964da 100644
--- a/src/Twilio/Rest/Messaging/V1/ExternalCampaignOptions.cs
+++ b/src/Twilio/Rest/Messaging/V1/ExternalCampaignOptions.cs
@@ -9,53 +9,53 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Messaging.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// CreateExternalCampaignOptions
+  /// </summary>
+  public class CreateExternalCampaignOptions : IOptions<ExternalCampaignResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// CreateExternalCampaignOptions
+    /// ID of the preregistered campaign.
     /// </summary>
-    public class CreateExternalCampaignOptions : IOptions<ExternalCampaignResource>
-    {
-        /// <summary>
-        /// ID of the preregistered campaign.
-        /// </summary>
-        public string CampaignId { get; }
-        /// <summary>
-        /// The SID of the Messaging Service the resource is associated with
-        /// </summary>
-        public string MessagingServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateExternalCampaignOptions
-        /// </summary>
-        /// <param name="campaignId"> ID of the preregistered campaign. </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service the resource is associated with </param>
-        public CreateExternalCampaignOptions(string campaignId, string messagingServiceSid)
-        {
-            CampaignId = campaignId;
-            MessagingServiceSid = messagingServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (CampaignId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CampaignId", CampaignId));
-            }
-
-            if (MessagingServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string CampaignId { get; }
+    /// <summary>
+    /// The SID of the Messaging Service the resource is associated with
+    /// </summary>
+    public string MessagingServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new CreateExternalCampaignOptions
+    /// </summary>
+    /// <param name="campaignId"> ID of the preregistered campaign. </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service the resource is associated with </param>
+    public CreateExternalCampaignOptions(string campaignId, string messagingServiceSid)
+    {
+      CampaignId = campaignId;
+      MessagingServiceSid = messagingServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (CampaignId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CampaignId", CampaignId));
+      }
+
+      if (MessagingServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/ExternalCampaignResource.cs b/src/Twilio/Rest/Messaging/V1/ExternalCampaignResource.cs
index c8d63dfef..424e35ed9 100644
--- a/src/Twilio/Rest/Messaging/V1/ExternalCampaignResource.cs
+++ b/src/Twilio/Rest/Messaging/V1/ExternalCampaignResource.cs
@@ -18,130 +18,130 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Messaging.V1
-{
-
-    public class ExternalCampaignResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateExternalCampaignOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Messaging,
-                "/v1/Services/PreregisteredUsa2p",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ExternalCampaign parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExternalCampaign </returns>
-        public static ExternalCampaignResource Create(CreateExternalCampaignOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ExternalCampaign parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExternalCampaign </returns>
-        public static async System.Threading.Tasks.Task<ExternalCampaignResource> CreateAsync(CreateExternalCampaignOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="campaignId"> ID of the preregistered campaign. </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service the resource is associated with </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExternalCampaign </returns>
-        public static ExternalCampaignResource Create(string campaignId,
-                                                      string messagingServiceSid,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateExternalCampaignOptions(campaignId, messagingServiceSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="campaignId"> ID of the preregistered campaign. </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service the resource is associated with </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExternalCampaign </returns>
-        public static async System.Threading.Tasks.Task<ExternalCampaignResource> CreateAsync(string campaignId,
-                                                                                              string messagingServiceSid,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateExternalCampaignOptions(campaignId, messagingServiceSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExternalCampaignResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExternalCampaignResource object represented by the provided JSON </returns>
-        public static ExternalCampaignResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExternalCampaignResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies a US A2P Compliance resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// ID of the preregistered campaign.
-        /// </summary>
-        [JsonProperty("campaign_id")]
-        public string CampaignId { get; private set; }
-        /// <summary>
-        /// The SID of the Messaging Service the resource is associated with
-        /// </summary>
-        [JsonProperty("messaging_service_sid")]
-        public string MessagingServiceSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-
-        private ExternalCampaignResource()
-        {
-
-        }
-    }
+{
+
+  public class ExternalCampaignResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateExternalCampaignOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Messaging,
+          "/v1/Services/PreregisteredUsa2p",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ExternalCampaign parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExternalCampaign </returns>
+    public static ExternalCampaignResource Create(CreateExternalCampaignOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ExternalCampaign parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExternalCampaign </returns>
+    public static async System.Threading.Tasks.Task<ExternalCampaignResource> CreateAsync(CreateExternalCampaignOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="campaignId"> ID of the preregistered campaign. </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service the resource is associated with </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExternalCampaign </returns>
+    public static ExternalCampaignResource Create(string campaignId,
+                                                  string messagingServiceSid,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateExternalCampaignOptions(campaignId, messagingServiceSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="campaignId"> ID of the preregistered campaign. </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service the resource is associated with </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExternalCampaign </returns>
+    public static async System.Threading.Tasks.Task<ExternalCampaignResource> CreateAsync(string campaignId,
+                                                                                          string messagingServiceSid,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateExternalCampaignOptions(campaignId, messagingServiceSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExternalCampaignResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExternalCampaignResource object represented by the provided JSON </returns>
+    public static ExternalCampaignResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExternalCampaignResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies a US A2P Compliance resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// ID of the preregistered campaign.
+    /// </summary>
+    [JsonProperty("campaign_id")]
+    public string CampaignId { get; private set; }
+    /// <summary>
+    /// The SID of the Messaging Service the resource is associated with
+    /// </summary>
+    [JsonProperty("messaging_service_sid")]
+    public string MessagingServiceSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+
+    private ExternalCampaignResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/Service/AlphaSenderOptions.cs b/src/Twilio/Rest/Messaging/V1/Service/AlphaSenderOptions.cs
index 8241863d0..ff4159ef5 100644
--- a/src/Twilio/Rest/Messaging/V1/Service/AlphaSenderOptions.cs
+++ b/src/Twilio/Rest/Messaging/V1/Service/AlphaSenderOptions.cs
@@ -9,158 +9,158 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Messaging.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// CreateAlphaSenderOptions
+  /// </summary>
+  public class CreateAlphaSenderOptions : IOptions<AlphaSenderResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// CreateAlphaSenderOptions
+    /// The SID of the Service to create the resource under
     /// </summary>
-    public class CreateAlphaSenderOptions : IOptions<AlphaSenderResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The Alphanumeric Sender ID string
-        /// </summary>
-        public string AlphaSender { get; }
-
-        /// <summary>
-        /// Construct a new CreateAlphaSenderOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="alphaSender"> The Alphanumeric Sender ID string </param>
-        public CreateAlphaSenderOptions(string pathServiceSid, string alphaSender)
-        {
-            PathServiceSid = pathServiceSid;
-            AlphaSender = alphaSender;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AlphaSender != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AlphaSender", AlphaSender));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// ReadAlphaSenderOptions
+    /// The Alphanumeric Sender ID string
     /// </summary>
-    public class ReadAlphaSenderOptions : ReadOptions<AlphaSenderResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadAlphaSenderOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        public ReadAlphaSenderOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string AlphaSender { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// FetchAlphaSenderOptions
+    /// Construct a new CreateAlphaSenderOptions
     /// </summary>
-    public class FetchAlphaSenderOptions : IOptions<AlphaSenderResource>
-    {
-        /// <summary>
-        /// The SID of the Messaging Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAlphaSenderOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchAlphaSenderOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="alphaSender"> The Alphanumeric Sender ID string </param>
+    public CreateAlphaSenderOptions(string pathServiceSid, string alphaSender)
+    {
+      PathServiceSid = pathServiceSid;
+      AlphaSender = alphaSender;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// DeleteAlphaSenderOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteAlphaSenderOptions : IOptions<AlphaSenderResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteAlphaSenderOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeleteAlphaSenderOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AlphaSender != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AlphaSender", AlphaSender));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// ReadAlphaSenderOptions
+  /// </summary>
+  public class ReadAlphaSenderOptions : ReadOptions<AlphaSenderResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadAlphaSenderOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    public ReadAlphaSenderOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// FetchAlphaSenderOptions
+  /// </summary>
+  public class FetchAlphaSenderOptions : IOptions<AlphaSenderResource>
+  {
+    /// <summary>
+    /// The SID of the Messaging Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchAlphaSenderOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchAlphaSenderOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// DeleteAlphaSenderOptions
+  /// </summary>
+  public class DeleteAlphaSenderOptions : IOptions<AlphaSenderResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteAlphaSenderOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeleteAlphaSenderOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/Service/AlphaSenderResource.cs b/src/Twilio/Rest/Messaging/V1/Service/AlphaSenderResource.cs
index a50d10604..c4178bfa8 100644
--- a/src/Twilio/Rest/Messaging/V1/Service/AlphaSenderResource.cs
+++ b/src/Twilio/Rest/Messaging/V1/Service/AlphaSenderResource.cs
@@ -18,416 +18,416 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Messaging.V1.Service
-{
-
-    public class AlphaSenderResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateAlphaSenderOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathServiceSid + "/AlphaSenders",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create AlphaSender parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AlphaSender </returns>
-        public static AlphaSenderResource Create(CreateAlphaSenderOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create AlphaSender parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AlphaSender </returns>
-        public static async System.Threading.Tasks.Task<AlphaSenderResource> CreateAsync(CreateAlphaSenderOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="alphaSender"> The Alphanumeric Sender ID string </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AlphaSender </returns>
-        public static AlphaSenderResource Create(string pathServiceSid, string alphaSender, ITwilioRestClient client = null)
-        {
-            var options = new CreateAlphaSenderOptions(pathServiceSid, alphaSender);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="alphaSender"> The Alphanumeric Sender ID string </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AlphaSender </returns>
-        public static async System.Threading.Tasks.Task<AlphaSenderResource> CreateAsync(string pathServiceSid,
-                                                                                         string alphaSender,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateAlphaSenderOptions(pathServiceSid, alphaSender);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAlphaSenderOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathServiceSid + "/AlphaSenders",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read AlphaSender parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AlphaSender </returns>
-        public static ResourceSet<AlphaSenderResource> Read(ReadAlphaSenderOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AlphaSenderResource>.FromJson("alpha_senders", response.Content);
-            return new ResourceSet<AlphaSenderResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read AlphaSender parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AlphaSender </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AlphaSenderResource>> ReadAsync(ReadAlphaSenderOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AlphaSenderResource>.FromJson("alpha_senders", response.Content);
-            return new ResourceSet<AlphaSenderResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AlphaSender </returns>
-        public static ResourceSet<AlphaSenderResource> Read(string pathServiceSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadAlphaSenderOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AlphaSender </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AlphaSenderResource>> ReadAsync(string pathServiceSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadAlphaSenderOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AlphaSenderResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AlphaSenderResource>.FromJson("alpha_senders", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AlphaSenderResource> NextPage(Page<AlphaSenderResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<AlphaSenderResource>.FromJson("alpha_senders", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AlphaSenderResource> PreviousPage(Page<AlphaSenderResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<AlphaSenderResource>.FromJson("alpha_senders", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchAlphaSenderOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathServiceSid + "/AlphaSenders/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch AlphaSender parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AlphaSender </returns>
-        public static AlphaSenderResource Fetch(FetchAlphaSenderOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch AlphaSender parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AlphaSender </returns>
-        public static async System.Threading.Tasks.Task<AlphaSenderResource> FetchAsync(FetchAlphaSenderOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AlphaSender </returns>
-        public static AlphaSenderResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchAlphaSenderOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AlphaSender </returns>
-        public static async System.Threading.Tasks.Task<AlphaSenderResource> FetchAsync(string pathServiceSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchAlphaSenderOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteAlphaSenderOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathServiceSid + "/AlphaSenders/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete AlphaSender parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AlphaSender </returns>
-        public static bool Delete(DeleteAlphaSenderOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete AlphaSender parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AlphaSender </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAlphaSenderOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AlphaSender </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteAlphaSenderOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AlphaSender </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteAlphaSenderOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AlphaSenderResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AlphaSenderResource object represented by the provided JSON </returns>
-        public static AlphaSenderResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AlphaSenderResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The Alphanumeric Sender ID string
-        /// </summary>
-        [JsonProperty("alpha_sender")]
-        public string AlphaSender { get; private set; }
-        /// <summary>
-        /// An array of values that describe whether the number can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public List<string> Capabilities { get; private set; }
-        /// <summary>
-        /// The absolute URL of the AlphaSender resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private AlphaSenderResource()
-        {
-
-        }
-    }
+{
+
+  public class AlphaSenderResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateAlphaSenderOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathServiceSid + "/AlphaSenders",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create AlphaSender parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AlphaSender </returns>
+    public static AlphaSenderResource Create(CreateAlphaSenderOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create AlphaSender parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AlphaSender </returns>
+    public static async System.Threading.Tasks.Task<AlphaSenderResource> CreateAsync(CreateAlphaSenderOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="alphaSender"> The Alphanumeric Sender ID string </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AlphaSender </returns>
+    public static AlphaSenderResource Create(string pathServiceSid, string alphaSender, ITwilioRestClient client = null)
+    {
+      var options = new CreateAlphaSenderOptions(pathServiceSid, alphaSender);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="alphaSender"> The Alphanumeric Sender ID string </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AlphaSender </returns>
+    public static async System.Threading.Tasks.Task<AlphaSenderResource> CreateAsync(string pathServiceSid,
+                                                                                     string alphaSender,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateAlphaSenderOptions(pathServiceSid, alphaSender);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAlphaSenderOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathServiceSid + "/AlphaSenders",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read AlphaSender parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AlphaSender </returns>
+    public static ResourceSet<AlphaSenderResource> Read(ReadAlphaSenderOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AlphaSenderResource>.FromJson("alpha_senders", response.Content);
+      return new ResourceSet<AlphaSenderResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read AlphaSender parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AlphaSender </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AlphaSenderResource>> ReadAsync(ReadAlphaSenderOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AlphaSenderResource>.FromJson("alpha_senders", response.Content);
+      return new ResourceSet<AlphaSenderResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AlphaSender </returns>
+    public static ResourceSet<AlphaSenderResource> Read(string pathServiceSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadAlphaSenderOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AlphaSender </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AlphaSenderResource>> ReadAsync(string pathServiceSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadAlphaSenderOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AlphaSenderResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AlphaSenderResource>.FromJson("alpha_senders", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AlphaSenderResource> NextPage(Page<AlphaSenderResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<AlphaSenderResource>.FromJson("alpha_senders", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AlphaSenderResource> PreviousPage(Page<AlphaSenderResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<AlphaSenderResource>.FromJson("alpha_senders", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchAlphaSenderOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathServiceSid + "/AlphaSenders/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch AlphaSender parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AlphaSender </returns>
+    public static AlphaSenderResource Fetch(FetchAlphaSenderOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch AlphaSender parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AlphaSender </returns>
+    public static async System.Threading.Tasks.Task<AlphaSenderResource> FetchAsync(FetchAlphaSenderOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AlphaSender </returns>
+    public static AlphaSenderResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchAlphaSenderOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AlphaSender </returns>
+    public static async System.Threading.Tasks.Task<AlphaSenderResource> FetchAsync(string pathServiceSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchAlphaSenderOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteAlphaSenderOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathServiceSid + "/AlphaSenders/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete AlphaSender parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AlphaSender </returns>
+    public static bool Delete(DeleteAlphaSenderOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete AlphaSender parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AlphaSender </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAlphaSenderOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AlphaSender </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteAlphaSenderOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AlphaSender </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteAlphaSenderOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AlphaSenderResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AlphaSenderResource object represented by the provided JSON </returns>
+    public static AlphaSenderResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AlphaSenderResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The Alphanumeric Sender ID string
+    /// </summary>
+    [JsonProperty("alpha_sender")]
+    public string AlphaSender { get; private set; }
+    /// <summary>
+    /// An array of values that describe whether the number can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public List<string> Capabilities { get; private set; }
+    /// <summary>
+    /// The absolute URL of the AlphaSender resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private AlphaSenderResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/Service/PhoneNumberOptions.cs b/src/Twilio/Rest/Messaging/V1/Service/PhoneNumberOptions.cs
index 6d8edc445..27935e4d8 100644
--- a/src/Twilio/Rest/Messaging/V1/Service/PhoneNumberOptions.cs
+++ b/src/Twilio/Rest/Messaging/V1/Service/PhoneNumberOptions.cs
@@ -9,158 +9,158 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Messaging.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// CreatePhoneNumberOptions
+  /// </summary>
+  public class CreatePhoneNumberOptions : IOptions<PhoneNumberResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// CreatePhoneNumberOptions
+    /// The SID of the Service to create the resource under
     /// </summary>
-    public class CreatePhoneNumberOptions : IOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Phone Number being added to the Service
-        /// </summary>
-        public string PhoneNumberSid { get; }
-
-        /// <summary>
-        /// Construct a new CreatePhoneNumberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="phoneNumberSid"> The SID of the Phone Number being added to the Service </param>
-        public CreatePhoneNumberOptions(string pathServiceSid, string phoneNumberSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PhoneNumberSid = phoneNumberSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PhoneNumberSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumberSid", PhoneNumberSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// DeletePhoneNumberOptions
+    /// The SID of the Phone Number being added to the Service
     /// </summary>
-    public class DeletePhoneNumberOptions : IOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeletePhoneNumberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeletePhoneNumberOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PhoneNumberSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// ReadPhoneNumberOptions
+    /// Construct a new CreatePhoneNumberOptions
     /// </summary>
-    public class ReadPhoneNumberOptions : ReadOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadPhoneNumberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        public ReadPhoneNumberOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="phoneNumberSid"> The SID of the Phone Number being added to the Service </param>
+    public CreatePhoneNumberOptions(string pathServiceSid, string phoneNumberSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PhoneNumberSid = phoneNumberSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// FetchPhoneNumberOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchPhoneNumberOptions : IOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchPhoneNumberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchPhoneNumberOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PhoneNumberSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumberSid", PhoneNumberSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// DeletePhoneNumberOptions
+  /// </summary>
+  public class DeletePhoneNumberOptions : IOptions<PhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeletePhoneNumberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeletePhoneNumberOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// ReadPhoneNumberOptions
+  /// </summary>
+  public class ReadPhoneNumberOptions : ReadOptions<PhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadPhoneNumberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    public ReadPhoneNumberOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// FetchPhoneNumberOptions
+  /// </summary>
+  public class FetchPhoneNumberOptions : IOptions<PhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchPhoneNumberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchPhoneNumberOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/Service/PhoneNumberResource.cs b/src/Twilio/Rest/Messaging/V1/Service/PhoneNumberResource.cs
index 98dbe53ed..9cf55d364 100644
--- a/src/Twilio/Rest/Messaging/V1/Service/PhoneNumberResource.cs
+++ b/src/Twilio/Rest/Messaging/V1/Service/PhoneNumberResource.cs
@@ -18,424 +18,424 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Messaging.V1.Service
-{
-
-    public class PhoneNumberResource : Resource
-    {
-        private static Request BuildCreateRequest(CreatePhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Create(CreatePhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> CreateAsync(CreatePhoneNumberOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="phoneNumberSid"> The SID of the Phone Number being added to the Service </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Create(string pathServiceSid,
-                                                 string phoneNumberSid,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreatePhoneNumberOptions(pathServiceSid, phoneNumberSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="phoneNumberSid"> The SID of the Phone Number being added to the Service </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> CreateAsync(string pathServiceSid,
-                                                                                         string phoneNumberSid,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreatePhoneNumberOptions(pathServiceSid, phoneNumberSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeletePhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static bool Delete(DeletePhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeletePhoneNumberOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeletePhoneNumberOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeletePhoneNumberOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadPhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static ResourceSet<PhoneNumberResource> Read(ReadPhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-            return new ResourceSet<PhoneNumberResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PhoneNumberResource>> ReadAsync(ReadPhoneNumberOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-            return new ResourceSet<PhoneNumberResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static ResourceSet<PhoneNumberResource> Read(string pathServiceSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadPhoneNumberOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PhoneNumberResource>> ReadAsync(string pathServiceSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadPhoneNumberOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<PhoneNumberResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<PhoneNumberResource> NextPage(Page<PhoneNumberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<PhoneNumberResource> PreviousPage(Page<PhoneNumberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchPhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Fetch(FetchPhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(FetchPhoneNumberOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchPhoneNumberOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(string pathServiceSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchPhoneNumberOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a PhoneNumberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> PhoneNumberResource object represented by the provided JSON </returns>
-        public static PhoneNumberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<PhoneNumberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The 2-character ISO Country Code of the number
-        /// </summary>
-        [JsonProperty("country_code")]
-        public string CountryCode { get; private set; }
-        /// <summary>
-        /// An array of values that describe whether the number can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public List<string> Capabilities { get; private set; }
-        /// <summary>
-        /// The absolute URL of the PhoneNumber resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private PhoneNumberResource()
-        {
-
-        }
-    }
+{
+
+  public class PhoneNumberResource : Resource
+  {
+    private static Request BuildCreateRequest(CreatePhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Create(CreatePhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> CreateAsync(CreatePhoneNumberOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="phoneNumberSid"> The SID of the Phone Number being added to the Service </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Create(string pathServiceSid,
+                                             string phoneNumberSid,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreatePhoneNumberOptions(pathServiceSid, phoneNumberSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="phoneNumberSid"> The SID of the Phone Number being added to the Service </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> CreateAsync(string pathServiceSid,
+                                                                                     string phoneNumberSid,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreatePhoneNumberOptions(pathServiceSid, phoneNumberSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeletePhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static bool Delete(DeletePhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeletePhoneNumberOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeletePhoneNumberOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeletePhoneNumberOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadPhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static ResourceSet<PhoneNumberResource> Read(ReadPhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+      return new ResourceSet<PhoneNumberResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PhoneNumberResource>> ReadAsync(ReadPhoneNumberOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+      return new ResourceSet<PhoneNumberResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static ResourceSet<PhoneNumberResource> Read(string pathServiceSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadPhoneNumberOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PhoneNumberResource>> ReadAsync(string pathServiceSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadPhoneNumberOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<PhoneNumberResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<PhoneNumberResource> NextPage(Page<PhoneNumberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<PhoneNumberResource> PreviousPage(Page<PhoneNumberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchPhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Fetch(FetchPhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(FetchPhoneNumberOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchPhoneNumberOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(string pathServiceSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchPhoneNumberOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a PhoneNumberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> PhoneNumberResource object represented by the provided JSON </returns>
+    public static PhoneNumberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<PhoneNumberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The 2-character ISO Country Code of the number
+    /// </summary>
+    [JsonProperty("country_code")]
+    public string CountryCode { get; private set; }
+    /// <summary>
+    /// An array of values that describe whether the number can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public List<string> Capabilities { get; private set; }
+    /// <summary>
+    /// The absolute URL of the PhoneNumber resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private PhoneNumberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/Service/ShortCodeOptions.cs b/src/Twilio/Rest/Messaging/V1/Service/ShortCodeOptions.cs
index 9279e10ac..9842018a8 100644
--- a/src/Twilio/Rest/Messaging/V1/Service/ShortCodeOptions.cs
+++ b/src/Twilio/Rest/Messaging/V1/Service/ShortCodeOptions.cs
@@ -9,158 +9,158 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Messaging.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// CreateShortCodeOptions
+  /// </summary>
+  public class CreateShortCodeOptions : IOptions<ShortCodeResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// CreateShortCodeOptions
+    /// The SID of the Service to create the resource under
     /// </summary>
-    public class CreateShortCodeOptions : IOptions<ShortCodeResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the ShortCode being added to the Service
-        /// </summary>
-        public string ShortCodeSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateShortCodeOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="shortCodeSid"> The SID of the ShortCode being added to the Service </param>
-        public CreateShortCodeOptions(string pathServiceSid, string shortCodeSid)
-        {
-            PathServiceSid = pathServiceSid;
-            ShortCodeSid = shortCodeSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ShortCodeSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ShortCodeSid", ShortCodeSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// DeleteShortCodeOptions
+    /// The SID of the ShortCode being added to the Service
     /// </summary>
-    public class DeleteShortCodeOptions : IOptions<ShortCodeResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteShortCodeOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeleteShortCodeOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string ShortCodeSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// ReadShortCodeOptions
+    /// Construct a new CreateShortCodeOptions
     /// </summary>
-    public class ReadShortCodeOptions : ReadOptions<ShortCodeResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadShortCodeOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        public ReadShortCodeOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="shortCodeSid"> The SID of the ShortCode being added to the Service </param>
+    public CreateShortCodeOptions(string pathServiceSid, string shortCodeSid)
+    {
+      PathServiceSid = pathServiceSid;
+      ShortCodeSid = shortCodeSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// FetchShortCodeOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchShortCodeOptions : IOptions<ShortCodeResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchShortCodeOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchShortCodeOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ShortCodeSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ShortCodeSid", ShortCodeSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// DeleteShortCodeOptions
+  /// </summary>
+  public class DeleteShortCodeOptions : IOptions<ShortCodeResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteShortCodeOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeleteShortCodeOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// ReadShortCodeOptions
+  /// </summary>
+  public class ReadShortCodeOptions : ReadOptions<ShortCodeResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resources from
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadShortCodeOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    public ReadShortCodeOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// FetchShortCodeOptions
+  /// </summary>
+  public class FetchShortCodeOptions : IOptions<ShortCodeResource>
+  {
+    /// <summary>
+    /// The SID of the Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchShortCodeOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchShortCodeOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/Service/ShortCodeResource.cs b/src/Twilio/Rest/Messaging/V1/Service/ShortCodeResource.cs
index 806492fa3..111d9464b 100644
--- a/src/Twilio/Rest/Messaging/V1/Service/ShortCodeResource.cs
+++ b/src/Twilio/Rest/Messaging/V1/Service/ShortCodeResource.cs
@@ -18,421 +18,421 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Messaging.V1.Service
-{
-
-    public class ShortCodeResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateShortCodeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathServiceSid + "/ShortCodes",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Create(CreateShortCodeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> CreateAsync(CreateShortCodeOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="shortCodeSid"> The SID of the ShortCode being added to the Service </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Create(string pathServiceSid, string shortCodeSid, ITwilioRestClient client = null)
-        {
-            var options = new CreateShortCodeOptions(pathServiceSid, shortCodeSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="shortCodeSid"> The SID of the ShortCode being added to the Service </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> CreateAsync(string pathServiceSid,
-                                                                                       string shortCodeSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateShortCodeOptions(pathServiceSid, shortCodeSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteShortCodeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathServiceSid + "/ShortCodes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static bool Delete(DeleteShortCodeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteShortCodeOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteShortCodeOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteShortCodeOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadShortCodeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathServiceSid + "/ShortCodes",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ResourceSet<ShortCodeResource> Read(ReadShortCodeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-            return new ResourceSet<ShortCodeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ShortCodeResource>> ReadAsync(ReadShortCodeOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-            return new ResourceSet<ShortCodeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ResourceSet<ShortCodeResource> Read(string pathServiceSid,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadShortCodeOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ShortCodeResource>> ReadAsync(string pathServiceSid,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadShortCodeOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ShortCodeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ShortCodeResource> NextPage(Page<ShortCodeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ShortCodeResource> PreviousPage(Page<ShortCodeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchShortCodeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathServiceSid + "/ShortCodes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Fetch(FetchShortCodeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> FetchAsync(FetchShortCodeOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchShortCodeOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> FetchAsync(string pathServiceSid,
-                                                                                      string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchShortCodeOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ShortCodeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ShortCodeResource object represented by the provided JSON </returns>
-        public static ShortCodeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ShortCodeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The E.164 format of the short code
-        /// </summary>
-        [JsonProperty("short_code")]
-        public string ShortCode { get; private set; }
-        /// <summary>
-        /// The 2-character ISO Country Code of the number
-        /// </summary>
-        [JsonProperty("country_code")]
-        public string CountryCode { get; private set; }
-        /// <summary>
-        /// An array of values that describe whether the number can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public List<string> Capabilities { get; private set; }
-        /// <summary>
-        /// The absolute URL of the ShortCode resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private ShortCodeResource()
-        {
-
-        }
-    }
+{
+
+  public class ShortCodeResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateShortCodeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathServiceSid + "/ShortCodes",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Create(CreateShortCodeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> CreateAsync(CreateShortCodeOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="shortCodeSid"> The SID of the ShortCode being added to the Service </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Create(string pathServiceSid, string shortCodeSid, ITwilioRestClient client = null)
+    {
+      var options = new CreateShortCodeOptions(pathServiceSid, shortCodeSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="shortCodeSid"> The SID of the ShortCode being added to the Service </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> CreateAsync(string pathServiceSid,
+                                                                                   string shortCodeSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateShortCodeOptions(pathServiceSid, shortCodeSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteShortCodeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathServiceSid + "/ShortCodes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static bool Delete(DeleteShortCodeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteShortCodeOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteShortCodeOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteShortCodeOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadShortCodeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathServiceSid + "/ShortCodes",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ResourceSet<ShortCodeResource> Read(ReadShortCodeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+      return new ResourceSet<ShortCodeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ShortCodeResource>> ReadAsync(ReadShortCodeOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+      return new ResourceSet<ShortCodeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ResourceSet<ShortCodeResource> Read(string pathServiceSid,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadShortCodeOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ShortCodeResource>> ReadAsync(string pathServiceSid,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadShortCodeOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ShortCodeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ShortCodeResource> NextPage(Page<ShortCodeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ShortCodeResource> PreviousPage(Page<ShortCodeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchShortCodeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathServiceSid + "/ShortCodes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Fetch(FetchShortCodeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> FetchAsync(FetchShortCodeOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchShortCodeOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> FetchAsync(string pathServiceSid,
+                                                                                  string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchShortCodeOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ShortCodeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ShortCodeResource object represented by the provided JSON </returns>
+    public static ShortCodeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ShortCodeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The E.164 format of the short code
+    /// </summary>
+    [JsonProperty("short_code")]
+    public string ShortCode { get; private set; }
+    /// <summary>
+    /// The 2-character ISO Country Code of the number
+    /// </summary>
+    [JsonProperty("country_code")]
+    public string CountryCode { get; private set; }
+    /// <summary>
+    /// An array of values that describe whether the number can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public List<string> Capabilities { get; private set; }
+    /// <summary>
+    /// The absolute URL of the ShortCode resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private ShortCodeResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonOptions.cs b/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonOptions.cs
index b31aebd26..a3945e935 100644
--- a/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonOptions.cs
+++ b/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonOptions.cs
@@ -10,220 +10,220 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Messaging.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// CreateUsAppToPersonOptions
+  /// </summary>
+  public class CreateUsAppToPersonOptions : IOptions<UsAppToPersonResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// CreateUsAppToPersonOptions
-    /// </summary>
-    public class CreateUsAppToPersonOptions : IOptions<UsAppToPersonResource>
-    {
-        /// <summary>
-        /// The SID of the Messaging Service to create the resource from
-        /// </summary>
-        public string PathMessagingServiceSid { get; }
-        /// <summary>
-        /// A2P Brand Registration SID
-        /// </summary>
-        public string BrandRegistrationSid { get; }
-        /// <summary>
-        /// A short description of what this SMS campaign does
-        /// </summary>
-        public string Description { get; }
-        /// <summary>
-        /// Message samples
-        /// </summary>
-        public List<string> MessageSamples { get; }
-        /// <summary>
-        /// A2P Campaign Use Case.
-        /// </summary>
-        public string UsAppToPersonUsecase { get; }
-        /// <summary>
-        /// Indicates that this SMS campaign will send messages that contain links
-        /// </summary>
-        public bool? HasEmbeddedLinks { get; }
-        /// <summary>
-        /// Indicates that this SMS campaign will send messages that contain phone numbers
-        /// </summary>
-        public bool? HasEmbeddedPhone { get; }
-
-        /// <summary>
-        /// Construct a new CreateUsAppToPersonOptions
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to create the resource from </param>
-        /// <param name="brandRegistrationSid"> A2P Brand Registration SID </param>
-        /// <param name="description"> A short description of what this SMS campaign does </param>
-        /// <param name="messageSamples"> Message samples </param>
-        /// <param name="usAppToPersonUsecase"> A2P Campaign Use Case. </param>
-        /// <param name="hasEmbeddedLinks"> Indicates that this SMS campaign will send messages that contain links </param>
-        /// <param name="hasEmbeddedPhone"> Indicates that this SMS campaign will send messages that contain phone numbers
-        ///                        </param>
-        public CreateUsAppToPersonOptions(string pathMessagingServiceSid,
-                                          string brandRegistrationSid,
-                                          string description,
-                                          List<string> messageSamples,
-                                          string usAppToPersonUsecase,
-                                          bool? hasEmbeddedLinks,
-                                          bool? hasEmbeddedPhone)
-        {
-            PathMessagingServiceSid = pathMessagingServiceSid;
-            BrandRegistrationSid = brandRegistrationSid;
-            Description = description;
-            MessageSamples = messageSamples;
-            UsAppToPersonUsecase = usAppToPersonUsecase;
-            HasEmbeddedLinks = hasEmbeddedLinks;
-            HasEmbeddedPhone = hasEmbeddedPhone;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (BrandRegistrationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BrandRegistrationSid", BrandRegistrationSid.ToString()));
-            }
-
-            if (Description != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Description", Description));
-            }
-
-            if (MessageSamples != null)
-            {
-                p.AddRange(MessageSamples.Select(prop => new KeyValuePair<string, string>("MessageSamples", prop)));
-            }
-
-            if (UsAppToPersonUsecase != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UsAppToPersonUsecase", UsAppToPersonUsecase));
-            }
-
-            if (HasEmbeddedLinks != null)
-            {
-                p.Add(new KeyValuePair<string, string>("HasEmbeddedLinks", HasEmbeddedLinks.Value.ToString().ToLower()));
-            }
-
-            if (HasEmbeddedPhone != null)
-            {
-                p.Add(new KeyValuePair<string, string>("HasEmbeddedPhone", HasEmbeddedPhone.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Messaging Service to create the resource from
+    /// </summary>
+    public string PathMessagingServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// DeleteUsAppToPersonOptions
-    /// </summary>
-    public class DeleteUsAppToPersonOptions : IOptions<UsAppToPersonResource>
-    {
-        /// <summary>
-        /// The SID of the Messaging Service to delete the resource from
-        /// </summary>
-        public string PathMessagingServiceSid { get; }
-        /// <summary>
-        /// The SID that identifies the US A2P Compliance resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteUsAppToPersonOptions
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the US A2P Compliance resource to delete </param>
-        public DeleteUsAppToPersonOptions(string pathMessagingServiceSid, string pathSid)
-        {
-            PathMessagingServiceSid = pathMessagingServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// A2P Brand Registration SID
+    /// </summary>
+    public string BrandRegistrationSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// ReadUsAppToPersonOptions
+    /// A short description of what this SMS campaign does
     /// </summary>
-    public class ReadUsAppToPersonOptions : ReadOptions<UsAppToPersonResource>
-    {
-        /// <summary>
-        /// The SID of the Messaging Service to fetch the resource from
-        /// </summary>
-        public string PathMessagingServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadUsAppToPersonOptions
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
-        public ReadUsAppToPersonOptions(string pathMessagingServiceSid)
-        {
-            PathMessagingServiceSid = pathMessagingServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string Description { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// FetchUsAppToPersonOptions
-    /// </summary>
-    public class FetchUsAppToPersonOptions : IOptions<UsAppToPersonResource>
-    {
-        /// <summary>
-        /// The SID of the Messaging Service to fetch the resource from
-        /// </summary>
-        public string PathMessagingServiceSid { get; }
-        /// <summary>
-        /// The SID that identifies the US A2P Compliance resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchUsAppToPersonOptions
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the US A2P Compliance resource to fetch </param>
-        public FetchUsAppToPersonOptions(string pathMessagingServiceSid, string pathSid)
-        {
-            PathMessagingServiceSid = pathMessagingServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Message samples
+    /// </summary>
+    public List<string> MessageSamples { get; }
+    /// <summary>
+    /// A2P Campaign Use Case.
+    /// </summary>
+    public string UsAppToPersonUsecase { get; }
+    /// <summary>
+    /// Indicates that this SMS campaign will send messages that contain links
+    /// </summary>
+    public bool? HasEmbeddedLinks { get; }
+    /// <summary>
+    /// Indicates that this SMS campaign will send messages that contain phone numbers
+    /// </summary>
+    public bool? HasEmbeddedPhone { get; }
+
+    /// <summary>
+    /// Construct a new CreateUsAppToPersonOptions
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to create the resource from </param>
+    /// <param name="brandRegistrationSid"> A2P Brand Registration SID </param>
+    /// <param name="description"> A short description of what this SMS campaign does </param>
+    /// <param name="messageSamples"> Message samples </param>
+    /// <param name="usAppToPersonUsecase"> A2P Campaign Use Case. </param>
+    /// <param name="hasEmbeddedLinks"> Indicates that this SMS campaign will send messages that contain links </param>
+    /// <param name="hasEmbeddedPhone"> Indicates that this SMS campaign will send messages that contain phone numbers
+    ///                        </param>
+    public CreateUsAppToPersonOptions(string pathMessagingServiceSid,
+                                      string brandRegistrationSid,
+                                      string description,
+                                      List<string> messageSamples,
+                                      string usAppToPersonUsecase,
+                                      bool? hasEmbeddedLinks,
+                                      bool? hasEmbeddedPhone)
+    {
+      PathMessagingServiceSid = pathMessagingServiceSid;
+      BrandRegistrationSid = brandRegistrationSid;
+      Description = description;
+      MessageSamples = messageSamples;
+      UsAppToPersonUsecase = usAppToPersonUsecase;
+      HasEmbeddedLinks = hasEmbeddedLinks;
+      HasEmbeddedPhone = hasEmbeddedPhone;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (BrandRegistrationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BrandRegistrationSid", BrandRegistrationSid.ToString()));
+      }
+
+      if (Description != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Description", Description));
+      }
+
+      if (MessageSamples != null)
+      {
+        p.AddRange(MessageSamples.Select(prop => new KeyValuePair<string, string>("MessageSamples", prop)));
+      }
+
+      if (UsAppToPersonUsecase != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UsAppToPersonUsecase", UsAppToPersonUsecase));
+      }
+
+      if (HasEmbeddedLinks != null)
+      {
+        p.Add(new KeyValuePair<string, string>("HasEmbeddedLinks", HasEmbeddedLinks.Value.ToString().ToLower()));
+      }
+
+      if (HasEmbeddedPhone != null)
+      {
+        p.Add(new KeyValuePair<string, string>("HasEmbeddedPhone", HasEmbeddedPhone.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// DeleteUsAppToPersonOptions
+  /// </summary>
+  public class DeleteUsAppToPersonOptions : IOptions<UsAppToPersonResource>
+  {
+    /// <summary>
+    /// The SID of the Messaging Service to delete the resource from
+    /// </summary>
+    public string PathMessagingServiceSid { get; }
+    /// <summary>
+    /// The SID that identifies the US A2P Compliance resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteUsAppToPersonOptions
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the US A2P Compliance resource to delete </param>
+    public DeleteUsAppToPersonOptions(string pathMessagingServiceSid, string pathSid)
+    {
+      PathMessagingServiceSid = pathMessagingServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// ReadUsAppToPersonOptions
+  /// </summary>
+  public class ReadUsAppToPersonOptions : ReadOptions<UsAppToPersonResource>
+  {
+    /// <summary>
+    /// The SID of the Messaging Service to fetch the resource from
+    /// </summary>
+    public string PathMessagingServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadUsAppToPersonOptions
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
+    public ReadUsAppToPersonOptions(string pathMessagingServiceSid)
+    {
+      PathMessagingServiceSid = pathMessagingServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// FetchUsAppToPersonOptions
+  /// </summary>
+  public class FetchUsAppToPersonOptions : IOptions<UsAppToPersonResource>
+  {
+    /// <summary>
+    /// The SID of the Messaging Service to fetch the resource from
+    /// </summary>
+    public string PathMessagingServiceSid { get; }
+    /// <summary>
+    /// The SID that identifies the US A2P Compliance resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchUsAppToPersonOptions
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the US A2P Compliance resource to fetch </param>
+    public FetchUsAppToPersonOptions(string pathMessagingServiceSid, string pathSid)
+    {
+      PathMessagingServiceSid = pathMessagingServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonResource.cs b/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonResource.cs
index 09c4b6750..cd48bf507 100644
--- a/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonResource.cs
+++ b/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonResource.cs
@@ -18,488 +18,488 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Messaging.V1.Service
-{
-
-    public class UsAppToPersonResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateUsAppToPersonOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathMessagingServiceSid + "/Compliance/Usa2p",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create UsAppToPerson parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsAppToPerson </returns>
-        public static UsAppToPersonResource Create(CreateUsAppToPersonOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create UsAppToPerson parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
-        public static async System.Threading.Tasks.Task<UsAppToPersonResource> CreateAsync(CreateUsAppToPersonOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to create the resource from </param>
-        /// <param name="brandRegistrationSid"> A2P Brand Registration SID </param>
-        /// <param name="description"> A short description of what this SMS campaign does </param>
-        /// <param name="messageSamples"> Message samples </param>
-        /// <param name="usAppToPersonUsecase"> A2P Campaign Use Case. </param>
-        /// <param name="hasEmbeddedLinks"> Indicates that this SMS campaign will send messages that contain links </param>
-        /// <param name="hasEmbeddedPhone"> Indicates that this SMS campaign will send messages that contain phone numbers
-        ///                        </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsAppToPerson </returns>
-        public static UsAppToPersonResource Create(string pathMessagingServiceSid,
-                                                   string brandRegistrationSid,
-                                                   string description,
-                                                   List<string> messageSamples,
-                                                   string usAppToPersonUsecase,
-                                                   bool? hasEmbeddedLinks,
-                                                   bool? hasEmbeddedPhone,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateUsAppToPersonOptions(pathMessagingServiceSid, brandRegistrationSid, description, messageSamples, usAppToPersonUsecase, hasEmbeddedLinks, hasEmbeddedPhone);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to create the resource from </param>
-        /// <param name="brandRegistrationSid"> A2P Brand Registration SID </param>
-        /// <param name="description"> A short description of what this SMS campaign does </param>
-        /// <param name="messageSamples"> Message samples </param>
-        /// <param name="usAppToPersonUsecase"> A2P Campaign Use Case. </param>
-        /// <param name="hasEmbeddedLinks"> Indicates that this SMS campaign will send messages that contain links </param>
-        /// <param name="hasEmbeddedPhone"> Indicates that this SMS campaign will send messages that contain phone numbers
-        ///                        </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
-        public static async System.Threading.Tasks.Task<UsAppToPersonResource> CreateAsync(string pathMessagingServiceSid,
-                                                                                           string brandRegistrationSid,
-                                                                                           string description,
-                                                                                           List<string> messageSamples,
-                                                                                           string usAppToPersonUsecase,
-                                                                                           bool? hasEmbeddedLinks,
-                                                                                           bool? hasEmbeddedPhone,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateUsAppToPersonOptions(pathMessagingServiceSid, brandRegistrationSid, description, messageSamples, usAppToPersonUsecase, hasEmbeddedLinks, hasEmbeddedPhone);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteUsAppToPersonOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathMessagingServiceSid + "/Compliance/Usa2p/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete UsAppToPerson parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsAppToPerson </returns>
-        public static bool Delete(DeleteUsAppToPersonOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete UsAppToPerson parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUsAppToPersonOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the US A2P Compliance resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsAppToPerson </returns>
-        public static bool Delete(string pathMessagingServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteUsAppToPersonOptions(pathMessagingServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to delete the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the US A2P Compliance resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathMessagingServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteUsAppToPersonOptions(pathMessagingServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadUsAppToPersonOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathMessagingServiceSid + "/Compliance/Usa2p",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UsAppToPerson parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsAppToPerson </returns>
-        public static ResourceSet<UsAppToPersonResource> Read(ReadUsAppToPersonOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UsAppToPersonResource>.FromJson("compliance", response.Content);
-            return new ResourceSet<UsAppToPersonResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UsAppToPerson parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UsAppToPersonResource>> ReadAsync(ReadUsAppToPersonOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UsAppToPersonResource>.FromJson("compliance", response.Content);
-            return new ResourceSet<UsAppToPersonResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsAppToPerson </returns>
-        public static ResourceSet<UsAppToPersonResource> Read(string pathMessagingServiceSid,
-                                                              int? pageSize = null,
-                                                              long? limit = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadUsAppToPersonOptions(pathMessagingServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UsAppToPersonResource>> ReadAsync(string pathMessagingServiceSid,
-                                                                                                      int? pageSize = null,
-                                                                                                      long? limit = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadUsAppToPersonOptions(pathMessagingServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UsAppToPersonResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UsAppToPersonResource>.FromJson("compliance", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UsAppToPersonResource> NextPage(Page<UsAppToPersonResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<UsAppToPersonResource>.FromJson("compliance", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UsAppToPersonResource> PreviousPage(Page<UsAppToPersonResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<UsAppToPersonResource>.FromJson("compliance", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchUsAppToPersonOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathMessagingServiceSid + "/Compliance/Usa2p/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch UsAppToPerson parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsAppToPerson </returns>
-        public static UsAppToPersonResource Fetch(FetchUsAppToPersonOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch UsAppToPerson parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
-        public static async System.Threading.Tasks.Task<UsAppToPersonResource> FetchAsync(FetchUsAppToPersonOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the US A2P Compliance resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsAppToPerson </returns>
-        public static UsAppToPersonResource Fetch(string pathMessagingServiceSid,
-                                                  string pathSid,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchUsAppToPersonOptions(pathMessagingServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
-        /// <param name="pathSid"> The SID that identifies the US A2P Compliance resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
-        public static async System.Threading.Tasks.Task<UsAppToPersonResource> FetchAsync(string pathMessagingServiceSid,
-                                                                                          string pathSid,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchUsAppToPersonOptions(pathMessagingServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a UsAppToPersonResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UsAppToPersonResource object represented by the provided JSON </returns>
-        public static UsAppToPersonResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UsAppToPersonResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies a US A2P Compliance resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// A2P Brand Registration SID
-        /// </summary>
-        [JsonProperty("brand_registration_sid")]
-        public string BrandRegistrationSid { get; private set; }
-        /// <summary>
-        /// The SID of the Messaging Service the resource is associated with
-        /// </summary>
-        [JsonProperty("messaging_service_sid")]
-        public string MessagingServiceSid { get; private set; }
-        /// <summary>
-        /// A short description of what this SMS campaign does
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// Message samples
-        /// </summary>
-        [JsonProperty("message_samples")]
-        public List<string> MessageSamples { get; private set; }
-        /// <summary>
-        /// A2P Campaign Use Case.
-        /// </summary>
-        [JsonProperty("us_app_to_person_usecase")]
-        public string UsAppToPersonUsecase { get; private set; }
-        /// <summary>
-        /// Indicate that this SMS campaign will send messages that contain links
-        /// </summary>
-        [JsonProperty("has_embedded_links")]
-        public bool? HasEmbeddedLinks { get; private set; }
-        /// <summary>
-        /// Indicates that this SMS campaign will send messages that contain phone numbers
-        /// </summary>
-        [JsonProperty("has_embedded_phone")]
-        public bool? HasEmbeddedPhone { get; private set; }
-        /// <summary>
-        /// Campaign status
-        /// </summary>
-        [JsonProperty("campaign_status")]
-        public string CampaignStatus { get; private set; }
-        /// <summary>
-        /// The Campaign Registry (TCR) Campaign ID.
-        /// </summary>
-        [JsonProperty("campaign_id")]
-        public string CampaignId { get; private set; }
-        /// <summary>
-        /// Indicates whether the campaign was registered externally or not
-        /// </summary>
-        [JsonProperty("is_externally_registered")]
-        public bool? IsExternallyRegistered { get; private set; }
-        /// <summary>
-        /// Rate limit and/or classification set by each carrier
-        /// </summary>
-        [JsonProperty("rate_limits")]
-        public object RateLimits { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the US App to Person resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// A boolean that specifies whether campaign is a mock or not.
-        /// </summary>
-        [JsonProperty("mock")]
-        public bool? Mock { get; private set; }
-
-        private UsAppToPersonResource()
-        {
-
-        }
-    }
+{
+
+  public class UsAppToPersonResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateUsAppToPersonOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathMessagingServiceSid + "/Compliance/Usa2p",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create UsAppToPerson parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsAppToPerson </returns>
+    public static UsAppToPersonResource Create(CreateUsAppToPersonOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create UsAppToPerson parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
+    public static async System.Threading.Tasks.Task<UsAppToPersonResource> CreateAsync(CreateUsAppToPersonOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to create the resource from </param>
+    /// <param name="brandRegistrationSid"> A2P Brand Registration SID </param>
+    /// <param name="description"> A short description of what this SMS campaign does </param>
+    /// <param name="messageSamples"> Message samples </param>
+    /// <param name="usAppToPersonUsecase"> A2P Campaign Use Case. </param>
+    /// <param name="hasEmbeddedLinks"> Indicates that this SMS campaign will send messages that contain links </param>
+    /// <param name="hasEmbeddedPhone"> Indicates that this SMS campaign will send messages that contain phone numbers
+    ///                        </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsAppToPerson </returns>
+    public static UsAppToPersonResource Create(string pathMessagingServiceSid,
+                                               string brandRegistrationSid,
+                                               string description,
+                                               List<string> messageSamples,
+                                               string usAppToPersonUsecase,
+                                               bool? hasEmbeddedLinks,
+                                               bool? hasEmbeddedPhone,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateUsAppToPersonOptions(pathMessagingServiceSid, brandRegistrationSid, description, messageSamples, usAppToPersonUsecase, hasEmbeddedLinks, hasEmbeddedPhone);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to create the resource from </param>
+    /// <param name="brandRegistrationSid"> A2P Brand Registration SID </param>
+    /// <param name="description"> A short description of what this SMS campaign does </param>
+    /// <param name="messageSamples"> Message samples </param>
+    /// <param name="usAppToPersonUsecase"> A2P Campaign Use Case. </param>
+    /// <param name="hasEmbeddedLinks"> Indicates that this SMS campaign will send messages that contain links </param>
+    /// <param name="hasEmbeddedPhone"> Indicates that this SMS campaign will send messages that contain phone numbers
+    ///                        </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
+    public static async System.Threading.Tasks.Task<UsAppToPersonResource> CreateAsync(string pathMessagingServiceSid,
+                                                                                       string brandRegistrationSid,
+                                                                                       string description,
+                                                                                       List<string> messageSamples,
+                                                                                       string usAppToPersonUsecase,
+                                                                                       bool? hasEmbeddedLinks,
+                                                                                       bool? hasEmbeddedPhone,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateUsAppToPersonOptions(pathMessagingServiceSid, brandRegistrationSid, description, messageSamples, usAppToPersonUsecase, hasEmbeddedLinks, hasEmbeddedPhone);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteUsAppToPersonOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathMessagingServiceSid + "/Compliance/Usa2p/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete UsAppToPerson parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsAppToPerson </returns>
+    public static bool Delete(DeleteUsAppToPersonOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete UsAppToPerson parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteUsAppToPersonOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the US A2P Compliance resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsAppToPerson </returns>
+    public static bool Delete(string pathMessagingServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteUsAppToPersonOptions(pathMessagingServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to delete the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the US A2P Compliance resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathMessagingServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteUsAppToPersonOptions(pathMessagingServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadUsAppToPersonOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathMessagingServiceSid + "/Compliance/Usa2p",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UsAppToPerson parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsAppToPerson </returns>
+    public static ResourceSet<UsAppToPersonResource> Read(ReadUsAppToPersonOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UsAppToPersonResource>.FromJson("compliance", response.Content);
+      return new ResourceSet<UsAppToPersonResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UsAppToPerson parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UsAppToPersonResource>> ReadAsync(ReadUsAppToPersonOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UsAppToPersonResource>.FromJson("compliance", response.Content);
+      return new ResourceSet<UsAppToPersonResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsAppToPerson </returns>
+    public static ResourceSet<UsAppToPersonResource> Read(string pathMessagingServiceSid,
+                                                          int? pageSize = null,
+                                                          long? limit = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadUsAppToPersonOptions(pathMessagingServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UsAppToPersonResource>> ReadAsync(string pathMessagingServiceSid,
+                                                                                                  int? pageSize = null,
+                                                                                                  long? limit = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadUsAppToPersonOptions(pathMessagingServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UsAppToPersonResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UsAppToPersonResource>.FromJson("compliance", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UsAppToPersonResource> NextPage(Page<UsAppToPersonResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<UsAppToPersonResource>.FromJson("compliance", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UsAppToPersonResource> PreviousPage(Page<UsAppToPersonResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<UsAppToPersonResource>.FromJson("compliance", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchUsAppToPersonOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathMessagingServiceSid + "/Compliance/Usa2p/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch UsAppToPerson parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsAppToPerson </returns>
+    public static UsAppToPersonResource Fetch(FetchUsAppToPersonOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch UsAppToPerson parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
+    public static async System.Threading.Tasks.Task<UsAppToPersonResource> FetchAsync(FetchUsAppToPersonOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the US A2P Compliance resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsAppToPerson </returns>
+    public static UsAppToPersonResource Fetch(string pathMessagingServiceSid,
+                                              string pathSid,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchUsAppToPersonOptions(pathMessagingServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
+    /// <param name="pathSid"> The SID that identifies the US A2P Compliance resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsAppToPerson </returns>
+    public static async System.Threading.Tasks.Task<UsAppToPersonResource> FetchAsync(string pathMessagingServiceSid,
+                                                                                      string pathSid,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchUsAppToPersonOptions(pathMessagingServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a UsAppToPersonResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UsAppToPersonResource object represented by the provided JSON </returns>
+    public static UsAppToPersonResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UsAppToPersonResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies a US A2P Compliance resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// A2P Brand Registration SID
+    /// </summary>
+    [JsonProperty("brand_registration_sid")]
+    public string BrandRegistrationSid { get; private set; }
+    /// <summary>
+    /// The SID of the Messaging Service the resource is associated with
+    /// </summary>
+    [JsonProperty("messaging_service_sid")]
+    public string MessagingServiceSid { get; private set; }
+    /// <summary>
+    /// A short description of what this SMS campaign does
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// Message samples
+    /// </summary>
+    [JsonProperty("message_samples")]
+    public List<string> MessageSamples { get; private set; }
+    /// <summary>
+    /// A2P Campaign Use Case.
+    /// </summary>
+    [JsonProperty("us_app_to_person_usecase")]
+    public string UsAppToPersonUsecase { get; private set; }
+    /// <summary>
+    /// Indicate that this SMS campaign will send messages that contain links
+    /// </summary>
+    [JsonProperty("has_embedded_links")]
+    public bool? HasEmbeddedLinks { get; private set; }
+    /// <summary>
+    /// Indicates that this SMS campaign will send messages that contain phone numbers
+    /// </summary>
+    [JsonProperty("has_embedded_phone")]
+    public bool? HasEmbeddedPhone { get; private set; }
+    /// <summary>
+    /// Campaign status
+    /// </summary>
+    [JsonProperty("campaign_status")]
+    public string CampaignStatus { get; private set; }
+    /// <summary>
+    /// The Campaign Registry (TCR) Campaign ID.
+    /// </summary>
+    [JsonProperty("campaign_id")]
+    public string CampaignId { get; private set; }
+    /// <summary>
+    /// Indicates whether the campaign was registered externally or not
+    /// </summary>
+    [JsonProperty("is_externally_registered")]
+    public bool? IsExternallyRegistered { get; private set; }
+    /// <summary>
+    /// Rate limit and/or classification set by each carrier
+    /// </summary>
+    [JsonProperty("rate_limits")]
+    public object RateLimits { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the US App to Person resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// A boolean that specifies whether campaign is a mock or not.
+    /// </summary>
+    [JsonProperty("mock")]
+    public bool? Mock { get; private set; }
+
+    private UsAppToPersonResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonUsecaseOptions.cs b/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonUsecaseOptions.cs
index 9d56be807..33c15d068 100644
--- a/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonUsecaseOptions.cs
+++ b/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonUsecaseOptions.cs
@@ -9,46 +9,46 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Messaging.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// FetchUsAppToPersonUsecaseOptions
+  /// </summary>
+  public class FetchUsAppToPersonUsecaseOptions : IOptions<UsAppToPersonUsecaseResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// FetchUsAppToPersonUsecaseOptions
+    /// The SID of the Messaging Service to fetch the resource from
     /// </summary>
-    public class FetchUsAppToPersonUsecaseOptions : IOptions<UsAppToPersonUsecaseResource>
-    {
-        /// <summary>
-        /// The SID of the Messaging Service to fetch the resource from
-        /// </summary>
-        public string PathMessagingServiceSid { get; }
-        /// <summary>
-        /// A2P Brand Registration SID
-        /// </summary>
-        public string BrandRegistrationSid { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchUsAppToPersonUsecaseOptions
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
-        public FetchUsAppToPersonUsecaseOptions(string pathMessagingServiceSid)
-        {
-            PathMessagingServiceSid = pathMessagingServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (BrandRegistrationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BrandRegistrationSid", BrandRegistrationSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathMessagingServiceSid { get; }
+    /// <summary>
+    /// A2P Brand Registration SID
+    /// </summary>
+    public string BrandRegistrationSid { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchUsAppToPersonUsecaseOptions
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
+    public FetchUsAppToPersonUsecaseOptions(string pathMessagingServiceSid)
+    {
+      PathMessagingServiceSid = pathMessagingServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (BrandRegistrationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BrandRegistrationSid", BrandRegistrationSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonUsecaseResource.cs b/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonUsecaseResource.cs
index a6533ee9c..be9b1db56 100644
--- a/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonUsecaseResource.cs
+++ b/src/Twilio/Rest/Messaging/V1/Service/UsAppToPersonUsecaseResource.cs
@@ -18,111 +18,111 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Messaging.V1.Service
-{
-
-    public class UsAppToPersonUsecaseResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchUsAppToPersonUsecaseOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathMessagingServiceSid + "/Compliance/Usa2p/Usecases",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch UsAppToPersonUsecase parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsAppToPersonUsecase </returns>
-        public static UsAppToPersonUsecaseResource Fetch(FetchUsAppToPersonUsecaseOptions options,
-                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch UsAppToPersonUsecase parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsAppToPersonUsecase </returns>
-        public static async System.Threading.Tasks.Task<UsAppToPersonUsecaseResource> FetchAsync(FetchUsAppToPersonUsecaseOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
-        /// <param name="brandRegistrationSid"> A2P Brand Registration SID </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsAppToPersonUsecase </returns>
-        public static UsAppToPersonUsecaseResource Fetch(string pathMessagingServiceSid,
-                                                         string brandRegistrationSid = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchUsAppToPersonUsecaseOptions(pathMessagingServiceSid){BrandRegistrationSid = brandRegistrationSid};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
-        /// <param name="brandRegistrationSid"> A2P Brand Registration SID </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsAppToPersonUsecase </returns>
-        public static async System.Threading.Tasks.Task<UsAppToPersonUsecaseResource> FetchAsync(string pathMessagingServiceSid,
-                                                                                                 string brandRegistrationSid = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchUsAppToPersonUsecaseOptions(pathMessagingServiceSid){BrandRegistrationSid = brandRegistrationSid};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a UsAppToPersonUsecaseResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UsAppToPersonUsecaseResource object represented by the provided JSON </returns>
-        public static UsAppToPersonUsecaseResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UsAppToPersonUsecaseResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Human readable A2P Use Case details
-        /// </summary>
-        [JsonProperty("us_app_to_person_usecases")]
-        public List<object> UsAppToPersonUsecases { get; private set; }
-
-        private UsAppToPersonUsecaseResource()
-        {
-
-        }
-    }
+{
+
+  public class UsAppToPersonUsecaseResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchUsAppToPersonUsecaseOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathMessagingServiceSid + "/Compliance/Usa2p/Usecases",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch UsAppToPersonUsecase parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsAppToPersonUsecase </returns>
+    public static UsAppToPersonUsecaseResource Fetch(FetchUsAppToPersonUsecaseOptions options,
+                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch UsAppToPersonUsecase parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsAppToPersonUsecase </returns>
+    public static async System.Threading.Tasks.Task<UsAppToPersonUsecaseResource> FetchAsync(FetchUsAppToPersonUsecaseOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
+    /// <param name="brandRegistrationSid"> A2P Brand Registration SID </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsAppToPersonUsecase </returns>
+    public static UsAppToPersonUsecaseResource Fetch(string pathMessagingServiceSid,
+                                                     string brandRegistrationSid = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchUsAppToPersonUsecaseOptions(pathMessagingServiceSid) { BrandRegistrationSid = brandRegistrationSid };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathMessagingServiceSid"> The SID of the Messaging Service to fetch the resource from </param>
+    /// <param name="brandRegistrationSid"> A2P Brand Registration SID </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsAppToPersonUsecase </returns>
+    public static async System.Threading.Tasks.Task<UsAppToPersonUsecaseResource> FetchAsync(string pathMessagingServiceSid,
+                                                                                             string brandRegistrationSid = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchUsAppToPersonUsecaseOptions(pathMessagingServiceSid) { BrandRegistrationSid = brandRegistrationSid };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a UsAppToPersonUsecaseResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UsAppToPersonUsecaseResource object represented by the provided JSON </returns>
+    public static UsAppToPersonUsecaseResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UsAppToPersonUsecaseResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Human readable A2P Use Case details
+    /// </summary>
+    [JsonProperty("us_app_to_person_usecases")]
+    public List<object> UsAppToPersonUsecases { get; private set; }
+
+    private UsAppToPersonUsecaseResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/ServiceOptions.cs b/src/Twilio/Rest/Messaging/V1/ServiceOptions.cs
index b65127693..de555ea13 100644
--- a/src/Twilio/Rest/Messaging/V1/ServiceOptions.cs
+++ b/src/Twilio/Rest/Messaging/V1/ServiceOptions.cs
@@ -9,436 +9,436 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Messaging.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// CreateServiceOptions
+  /// </summary>
+  public class CreateServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// CreateServiceOptions
-    /// </summary>
-    public class CreateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The URL we call using inbound_method when a message is received by any phone number or short code in the Service. This field will be overridden if the `use_inbound_webhook_on_number` field is enabled.
-        /// </summary>
-        public Uri InboundRequestUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call inbound_request_url
-        /// </summary>
-        public Twilio.Http.HttpMethod InboundMethod { get; set; }
-        /// <summary>
-        /// The URL that we call using fallback_method if an error occurs while retrieving or executing the TwiML from the Inbound Request URL. This field will be overridden if the `use_inbound_webhook_on_number` field is enabled.
-        /// </summary>
-        public Uri FallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod FallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we should call to pass status updates about message delivery
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// Whether to enable Sticky Sender on the Service instance
-        /// </summary>
-        public bool? StickySender { get; set; }
-        /// <summary>
-        /// Whether to enable the MMS Converter for messages sent through the Service instance
-        /// </summary>
-        public bool? MmsConverter { get; set; }
-        /// <summary>
-        /// Whether to enable Encoding for messages sent through the Service instance
-        /// </summary>
-        public bool? SmartEncoding { get; set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        public ServiceResource.ScanMessageContentEnum ScanMessageContent { get; set; }
-        /// <summary>
-        /// Whether to enable Fallback to Long Code for messages sent through the Service instance
-        /// </summary>
-        public bool? FallbackToLongCode { get; set; }
-        /// <summary>
-        /// Whether to enable Area Code Geomatch on the Service Instance
-        /// </summary>
-        public bool? AreaCodeGeomatch { get; set; }
-        /// <summary>
-        /// How long, in seconds, messages sent from the Service are valid
-        /// </summary>
-        public int? ValidityPeriod { get; set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        public bool? SynchronousValidation { get; set; }
-        /// <summary>
-        /// A string describing the scenario in which the Messaging Service will be used
-        /// </summary>
-        public string Usecase { get; set; }
-        /// <summary>
-        /// If enabled, the webhook url configured on the phone number will be used and will override the `inbound_request_url`/`fallback_url` url called when an inbound message is received.
-        /// </summary>
-        public bool? UseInboundWebhookOnNumber { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateServiceOptions
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        public CreateServiceOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (InboundRequestUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InboundRequestUrl", Serializers.Url(InboundRequestUrl)));
-            }
-
-            if (InboundMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InboundMethod", InboundMethod.ToString()));
-            }
-
-            if (FallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackUrl", Serializers.Url(FallbackUrl)));
-            }
-
-            if (FallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackMethod", FallbackMethod.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StickySender != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StickySender", StickySender.Value.ToString().ToLower()));
-            }
-
-            if (MmsConverter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MmsConverter", MmsConverter.Value.ToString().ToLower()));
-            }
-
-            if (SmartEncoding != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmartEncoding", SmartEncoding.Value.ToString().ToLower()));
-            }
-
-            if (ScanMessageContent != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ScanMessageContent", ScanMessageContent.ToString()));
-            }
-
-            if (FallbackToLongCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackToLongCode", FallbackToLongCode.Value.ToString().ToLower()));
-            }
-
-            if (AreaCodeGeomatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AreaCodeGeomatch", AreaCodeGeomatch.Value.ToString().ToLower()));
-            }
-
-            if (ValidityPeriod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ValidityPeriod", ValidityPeriod.ToString()));
-            }
-
-            if (SynchronousValidation != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SynchronousValidation", SynchronousValidation.Value.ToString().ToLower()));
-            }
-
-            if (Usecase != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Usecase", Usecase));
-            }
-
-            if (UseInboundWebhookOnNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UseInboundWebhookOnNumber", UseInboundWebhookOnNumber.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// UpdateServiceOptions
-    /// </summary>
-    public class UpdateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The URL we call using inbound_method when a message is received by any phone number or short code in the Service. This field will be overridden if the `use_inbound_webhook_on_number` field is enabled.
-        /// </summary>
-        public Uri InboundRequestUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call inbound_request_url
-        /// </summary>
-        public Twilio.Http.HttpMethod InboundMethod { get; set; }
-        /// <summary>
-        /// The URL that we call using fallback_method if an error occurs while retrieving or executing the TwiML from the Inbound Request URL. This field will be overridden if the `use_inbound_webhook_on_number` field is enabled.
-        /// </summary>
-        public Uri FallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod FallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we should call to pass status updates about message delivery
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// Whether to enable Sticky Sender on the Service instance
-        /// </summary>
-        public bool? StickySender { get; set; }
-        /// <summary>
-        /// Whether to enable the MMS Converter for messages sent through the Service instance
-        /// </summary>
-        public bool? MmsConverter { get; set; }
-        /// <summary>
-        /// Whether to enable Encoding for messages sent through the Service instance
-        /// </summary>
-        public bool? SmartEncoding { get; set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        public ServiceResource.ScanMessageContentEnum ScanMessageContent { get; set; }
-        /// <summary>
-        /// Whether to enable Fallback to Long Code for messages sent through the Service instance
-        /// </summary>
-        public bool? FallbackToLongCode { get; set; }
-        /// <summary>
-        /// Whether to enable Area Code Geomatch on the Service Instance
-        /// </summary>
-        public bool? AreaCodeGeomatch { get; set; }
-        /// <summary>
-        /// How long, in seconds, messages sent from the Service are valid
-        /// </summary>
-        public int? ValidityPeriod { get; set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        public bool? SynchronousValidation { get; set; }
-        /// <summary>
-        /// A string describing the scenario in which the Messaging Service will be used
-        /// </summary>
-        public string Usecase { get; set; }
-        /// <summary>
-        /// If enabled, the webhook url configured on the phone number will be used and will override the `inbound_request_url`/`fallback_url` url called when an inbound message is received.
-        /// </summary>
-        public bool? UseInboundWebhookOnNumber { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        public UpdateServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (InboundRequestUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InboundRequestUrl", Serializers.Url(InboundRequestUrl)));
-            }
-
-            if (InboundMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InboundMethod", InboundMethod.ToString()));
-            }
-
-            if (FallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackUrl", Serializers.Url(FallbackUrl)));
-            }
-
-            if (FallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackMethod", FallbackMethod.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StickySender != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StickySender", StickySender.Value.ToString().ToLower()));
-            }
-
-            if (MmsConverter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MmsConverter", MmsConverter.Value.ToString().ToLower()));
-            }
-
-            if (SmartEncoding != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmartEncoding", SmartEncoding.Value.ToString().ToLower()));
-            }
-
-            if (ScanMessageContent != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ScanMessageContent", ScanMessageContent.ToString()));
-            }
-
-            if (FallbackToLongCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackToLongCode", FallbackToLongCode.Value.ToString().ToLower()));
-            }
-
-            if (AreaCodeGeomatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AreaCodeGeomatch", AreaCodeGeomatch.Value.ToString().ToLower()));
-            }
-
-            if (ValidityPeriod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ValidityPeriod", ValidityPeriod.ToString()));
-            }
-
-            if (SynchronousValidation != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SynchronousValidation", SynchronousValidation.Value.ToString().ToLower()));
-            }
-
-            if (Usecase != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Usecase", Usecase));
-            }
-
-            if (UseInboundWebhookOnNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UseInboundWebhookOnNumber", UseInboundWebhookOnNumber.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The URL we call using inbound_method when a message is received by any phone number or short code in the Service. This field will be overridden if the `use_inbound_webhook_on_number` field is enabled.
+    /// </summary>
+    public Uri InboundRequestUrl { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// ReadServiceOptions
-    /// </summary>
-    public class ReadServiceOptions : ReadOptions<ServiceResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The HTTP method we should use to call inbound_request_url
+    /// </summary>
+    public Twilio.Http.HttpMethod InboundMethod { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// FetchServiceOptions
+    /// The URL that we call using fallback_method if an error occurs while retrieving or executing the TwiML from the Inbound Request URL. This field will be overridden if the `use_inbound_webhook_on_number` field is enabled.
     /// </summary>
-    public class FetchServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public Uri FallbackUrl { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// DeleteServiceOptions
+    /// The HTTP method we should use to call fallback_url
     /// </summary>
-    public class DeleteServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeleteServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public Twilio.Http.HttpMethod FallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we should call to pass status updates about message delivery
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// Whether to enable Sticky Sender on the Service instance
+    /// </summary>
+    public bool? StickySender { get; set; }
+    /// <summary>
+    /// Whether to enable the MMS Converter for messages sent through the Service instance
+    /// </summary>
+    public bool? MmsConverter { get; set; }
+    /// <summary>
+    /// Whether to enable Encoding for messages sent through the Service instance
+    /// </summary>
+    public bool? SmartEncoding { get; set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    public ServiceResource.ScanMessageContentEnum ScanMessageContent { get; set; }
+    /// <summary>
+    /// Whether to enable Fallback to Long Code for messages sent through the Service instance
+    /// </summary>
+    public bool? FallbackToLongCode { get; set; }
+    /// <summary>
+    /// Whether to enable Area Code Geomatch on the Service Instance
+    /// </summary>
+    public bool? AreaCodeGeomatch { get; set; }
+    /// <summary>
+    /// How long, in seconds, messages sent from the Service are valid
+    /// </summary>
+    public int? ValidityPeriod { get; set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    public bool? SynchronousValidation { get; set; }
+    /// <summary>
+    /// A string describing the scenario in which the Messaging Service will be used
+    /// </summary>
+    public string Usecase { get; set; }
+    /// <summary>
+    /// If enabled, the webhook url configured on the phone number will be used and will override the `inbound_request_url`/`fallback_url` url called when an inbound message is received.
+    /// </summary>
+    public bool? UseInboundWebhookOnNumber { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateServiceOptions
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    public CreateServiceOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (InboundRequestUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InboundRequestUrl", Serializers.Url(InboundRequestUrl)));
+      }
+
+      if (InboundMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InboundMethod", InboundMethod.ToString()));
+      }
+
+      if (FallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackUrl", Serializers.Url(FallbackUrl)));
+      }
+
+      if (FallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackMethod", FallbackMethod.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StickySender != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StickySender", StickySender.Value.ToString().ToLower()));
+      }
+
+      if (MmsConverter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MmsConverter", MmsConverter.Value.ToString().ToLower()));
+      }
+
+      if (SmartEncoding != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmartEncoding", SmartEncoding.Value.ToString().ToLower()));
+      }
+
+      if (ScanMessageContent != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ScanMessageContent", ScanMessageContent.ToString()));
+      }
+
+      if (FallbackToLongCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackToLongCode", FallbackToLongCode.Value.ToString().ToLower()));
+      }
+
+      if (AreaCodeGeomatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AreaCodeGeomatch", AreaCodeGeomatch.Value.ToString().ToLower()));
+      }
+
+      if (ValidityPeriod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ValidityPeriod", ValidityPeriod.ToString()));
+      }
+
+      if (SynchronousValidation != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SynchronousValidation", SynchronousValidation.Value.ToString().ToLower()));
+      }
+
+      if (Usecase != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Usecase", Usecase));
+      }
+
+      if (UseInboundWebhookOnNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UseInboundWebhookOnNumber", UseInboundWebhookOnNumber.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// UpdateServiceOptions
+  /// </summary>
+  public class UpdateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The URL we call using inbound_method when a message is received by any phone number or short code in the Service. This field will be overridden if the `use_inbound_webhook_on_number` field is enabled.
+    /// </summary>
+    public Uri InboundRequestUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call inbound_request_url
+    /// </summary>
+    public Twilio.Http.HttpMethod InboundMethod { get; set; }
+    /// <summary>
+    /// The URL that we call using fallback_method if an error occurs while retrieving or executing the TwiML from the Inbound Request URL. This field will be overridden if the `use_inbound_webhook_on_number` field is enabled.
+    /// </summary>
+    public Uri FallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod FallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we should call to pass status updates about message delivery
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// Whether to enable Sticky Sender on the Service instance
+    /// </summary>
+    public bool? StickySender { get; set; }
+    /// <summary>
+    /// Whether to enable the MMS Converter for messages sent through the Service instance
+    /// </summary>
+    public bool? MmsConverter { get; set; }
+    /// <summary>
+    /// Whether to enable Encoding for messages sent through the Service instance
+    /// </summary>
+    public bool? SmartEncoding { get; set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    public ServiceResource.ScanMessageContentEnum ScanMessageContent { get; set; }
+    /// <summary>
+    /// Whether to enable Fallback to Long Code for messages sent through the Service instance
+    /// </summary>
+    public bool? FallbackToLongCode { get; set; }
+    /// <summary>
+    /// Whether to enable Area Code Geomatch on the Service Instance
+    /// </summary>
+    public bool? AreaCodeGeomatch { get; set; }
+    /// <summary>
+    /// How long, in seconds, messages sent from the Service are valid
+    /// </summary>
+    public int? ValidityPeriod { get; set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    public bool? SynchronousValidation { get; set; }
+    /// <summary>
+    /// A string describing the scenario in which the Messaging Service will be used
+    /// </summary>
+    public string Usecase { get; set; }
+    /// <summary>
+    /// If enabled, the webhook url configured on the phone number will be used and will override the `inbound_request_url`/`fallback_url` url called when an inbound message is received.
+    /// </summary>
+    public bool? UseInboundWebhookOnNumber { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    public UpdateServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (InboundRequestUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InboundRequestUrl", Serializers.Url(InboundRequestUrl)));
+      }
+
+      if (InboundMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InboundMethod", InboundMethod.ToString()));
+      }
+
+      if (FallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackUrl", Serializers.Url(FallbackUrl)));
+      }
+
+      if (FallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackMethod", FallbackMethod.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StickySender != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StickySender", StickySender.Value.ToString().ToLower()));
+      }
+
+      if (MmsConverter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MmsConverter", MmsConverter.Value.ToString().ToLower()));
+      }
+
+      if (SmartEncoding != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmartEncoding", SmartEncoding.Value.ToString().ToLower()));
+      }
+
+      if (ScanMessageContent != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ScanMessageContent", ScanMessageContent.ToString()));
+      }
+
+      if (FallbackToLongCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackToLongCode", FallbackToLongCode.Value.ToString().ToLower()));
+      }
+
+      if (AreaCodeGeomatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AreaCodeGeomatch", AreaCodeGeomatch.Value.ToString().ToLower()));
+      }
+
+      if (ValidityPeriod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ValidityPeriod", ValidityPeriod.ToString()));
+      }
+
+      if (SynchronousValidation != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SynchronousValidation", SynchronousValidation.Value.ToString().ToLower()));
+      }
+
+      if (Usecase != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Usecase", Usecase));
+      }
+
+      if (UseInboundWebhookOnNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UseInboundWebhookOnNumber", UseInboundWebhookOnNumber.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// ReadServiceOptions
+  /// </summary>
+  public class ReadServiceOptions : ReadOptions<ServiceResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// FetchServiceOptions
+  /// </summary>
+  public class FetchServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// DeleteServiceOptions
+  /// </summary>
+  public class DeleteServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeleteServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/ServiceResource.cs b/src/Twilio/Rest/Messaging/V1/ServiceResource.cs
index 6f469370b..f3e681768 100644
--- a/src/Twilio/Rest/Messaging/V1/ServiceResource.cs
+++ b/src/Twilio/Rest/Messaging/V1/ServiceResource.cs
@@ -19,719 +19,719 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Messaging.V1
-{
-
-    public class ServiceResource : Resource
-    {
-        public sealed class ScanMessageContentEnum : StringEnum
-        {
-            private ScanMessageContentEnum(string value) : base(value) {}
-            public ScanMessageContentEnum() {}
-            public static implicit operator ScanMessageContentEnum(string value)
-            {
-                return new ScanMessageContentEnum(value);
-            }
-
-            public static readonly ScanMessageContentEnum Inherit = new ScanMessageContentEnum("inherit");
-            public static readonly ScanMessageContentEnum Enable = new ScanMessageContentEnum("enable");
-            public static readonly ScanMessageContentEnum Disable = new ScanMessageContentEnum("disable");
-        }
-
-        private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Messaging,
-                "/v1/Services",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="inboundRequestUrl"> The URL we call using inbound_method when a message is received by any phone
-        ///                         number or short code in the Service. This field will be overridden if the
-        ///                         `use_inbound_webhook_on_number` field is enabled. </param>
-        /// <param name="inboundMethod"> The HTTP method we should use to call inbound_request_url </param>
-        /// <param name="fallbackUrl"> The URL that we call using fallback_method if an error occurs while retrieving or
-        ///                   executing the TwiML from the Inbound Request URL. This field will be overridden if the
-        ///                   `use_inbound_webhook_on_number` field is enabled. </param>
-        /// <param name="fallbackMethod"> The HTTP method we should use to call fallback_url </param>
-        /// <param name="statusCallback"> The URL we should call to pass status updates about message delivery </param>
-        /// <param name="stickySender"> Whether to enable Sticky Sender on the Service instance </param>
-        /// <param name="mmsConverter"> Whether to enable the MMS Converter for messages sent through the Service instance
-        ///                    </param>
-        /// <param name="smartEncoding"> Whether to enable Encoding for messages sent through the Service instance </param>
-        /// <param name="scanMessageContent"> Reserved </param>
-        /// <param name="fallbackToLongCode"> Whether to enable Fallback to Long Code for messages sent through the Service
-        ///                          instance </param>
-        /// <param name="areaCodeGeomatch"> Whether to enable Area Code Geomatch on the Service Instance </param>
-        /// <param name="validityPeriod"> How long, in seconds, messages sent from the Service are valid </param>
-        /// <param name="synchronousValidation"> Reserved </param>
-        /// <param name="usecase"> A string describing the scenario in which the Messaging Service will be used </param>
-        /// <param name="useInboundWebhookOnNumber"> If enabled, the webhook url configured on the phone number will be used
-        ///                                 and will override the `inbound_request_url`/`fallback_url` url called when an
-        ///                                 inbound message is received. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(string friendlyName,
-                                             Uri inboundRequestUrl = null,
-                                             Twilio.Http.HttpMethod inboundMethod = null,
-                                             Uri fallbackUrl = null,
-                                             Twilio.Http.HttpMethod fallbackMethod = null,
-                                             Uri statusCallback = null,
-                                             bool? stickySender = null,
-                                             bool? mmsConverter = null,
-                                             bool? smartEncoding = null,
-                                             ServiceResource.ScanMessageContentEnum scanMessageContent = null,
-                                             bool? fallbackToLongCode = null,
-                                             bool? areaCodeGeomatch = null,
-                                             int? validityPeriod = null,
-                                             bool? synchronousValidation = null,
-                                             string usecase = null,
-                                             bool? useInboundWebhookOnNumber = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName){InboundRequestUrl = inboundRequestUrl, InboundMethod = inboundMethod, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StickySender = stickySender, MmsConverter = mmsConverter, SmartEncoding = smartEncoding, ScanMessageContent = scanMessageContent, FallbackToLongCode = fallbackToLongCode, AreaCodeGeomatch = areaCodeGeomatch, ValidityPeriod = validityPeriod, SynchronousValidation = synchronousValidation, Usecase = usecase, UseInboundWebhookOnNumber = useInboundWebhookOnNumber};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="inboundRequestUrl"> The URL we call using inbound_method when a message is received by any phone
-        ///                         number or short code in the Service. This field will be overridden if the
-        ///                         `use_inbound_webhook_on_number` field is enabled. </param>
-        /// <param name="inboundMethod"> The HTTP method we should use to call inbound_request_url </param>
-        /// <param name="fallbackUrl"> The URL that we call using fallback_method if an error occurs while retrieving or
-        ///                   executing the TwiML from the Inbound Request URL. This field will be overridden if the
-        ///                   `use_inbound_webhook_on_number` field is enabled. </param>
-        /// <param name="fallbackMethod"> The HTTP method we should use to call fallback_url </param>
-        /// <param name="statusCallback"> The URL we should call to pass status updates about message delivery </param>
-        /// <param name="stickySender"> Whether to enable Sticky Sender on the Service instance </param>
-        /// <param name="mmsConverter"> Whether to enable the MMS Converter for messages sent through the Service instance
-        ///                    </param>
-        /// <param name="smartEncoding"> Whether to enable Encoding for messages sent through the Service instance </param>
-        /// <param name="scanMessageContent"> Reserved </param>
-        /// <param name="fallbackToLongCode"> Whether to enable Fallback to Long Code for messages sent through the Service
-        ///                          instance </param>
-        /// <param name="areaCodeGeomatch"> Whether to enable Area Code Geomatch on the Service Instance </param>
-        /// <param name="validityPeriod"> How long, in seconds, messages sent from the Service are valid </param>
-        /// <param name="synchronousValidation"> Reserved </param>
-        /// <param name="usecase"> A string describing the scenario in which the Messaging Service will be used </param>
-        /// <param name="useInboundWebhookOnNumber"> If enabled, the webhook url configured on the phone number will be used
-        ///                                 and will override the `inbound_request_url`/`fallback_url` url called when an
-        ///                                 inbound message is received. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
-                                                                                     Uri inboundRequestUrl = null,
-                                                                                     Twilio.Http.HttpMethod inboundMethod = null,
-                                                                                     Uri fallbackUrl = null,
-                                                                                     Twilio.Http.HttpMethod fallbackMethod = null,
-                                                                                     Uri statusCallback = null,
-                                                                                     bool? stickySender = null,
-                                                                                     bool? mmsConverter = null,
-                                                                                     bool? smartEncoding = null,
-                                                                                     ServiceResource.ScanMessageContentEnum scanMessageContent = null,
-                                                                                     bool? fallbackToLongCode = null,
-                                                                                     bool? areaCodeGeomatch = null,
-                                                                                     int? validityPeriod = null,
-                                                                                     bool? synchronousValidation = null,
-                                                                                     string usecase = null,
-                                                                                     bool? useInboundWebhookOnNumber = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName){InboundRequestUrl = inboundRequestUrl, InboundMethod = inboundMethod, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StickySender = stickySender, MmsConverter = mmsConverter, SmartEncoding = smartEncoding, ScanMessageContent = scanMessageContent, FallbackToLongCode = fallbackToLongCode, AreaCodeGeomatch = areaCodeGeomatch, ValidityPeriod = validityPeriod, SynchronousValidation = synchronousValidation, Usecase = usecase, UseInboundWebhookOnNumber = useInboundWebhookOnNumber};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="inboundRequestUrl"> The URL we call using inbound_method when a message is received by any phone
-        ///                         number or short code in the Service. This field will be overridden if the
-        ///                         `use_inbound_webhook_on_number` field is enabled. </param>
-        /// <param name="inboundMethod"> The HTTP method we should use to call inbound_request_url </param>
-        /// <param name="fallbackUrl"> The URL that we call using fallback_method if an error occurs while retrieving or
-        ///                   executing the TwiML from the Inbound Request URL. This field will be overridden if the
-        ///                   `use_inbound_webhook_on_number` field is enabled. </param>
-        /// <param name="fallbackMethod"> The HTTP method we should use to call fallback_url </param>
-        /// <param name="statusCallback"> The URL we should call to pass status updates about message delivery </param>
-        /// <param name="stickySender"> Whether to enable Sticky Sender on the Service instance </param>
-        /// <param name="mmsConverter"> Whether to enable the MMS Converter for messages sent through the Service instance
-        ///                    </param>
-        /// <param name="smartEncoding"> Whether to enable Encoding for messages sent through the Service instance </param>
-        /// <param name="scanMessageContent"> Reserved </param>
-        /// <param name="fallbackToLongCode"> Whether to enable Fallback to Long Code for messages sent through the Service
-        ///                          instance </param>
-        /// <param name="areaCodeGeomatch"> Whether to enable Area Code Geomatch on the Service Instance </param>
-        /// <param name="validityPeriod"> How long, in seconds, messages sent from the Service are valid </param>
-        /// <param name="synchronousValidation"> Reserved </param>
-        /// <param name="usecase"> A string describing the scenario in which the Messaging Service will be used </param>
-        /// <param name="useInboundWebhookOnNumber"> If enabled, the webhook url configured on the phone number will be used
-        ///                                 and will override the `inbound_request_url`/`fallback_url` url called when an
-        ///                                 inbound message is received. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(string pathSid,
-                                             string friendlyName = null,
-                                             Uri inboundRequestUrl = null,
-                                             Twilio.Http.HttpMethod inboundMethod = null,
-                                             Uri fallbackUrl = null,
-                                             Twilio.Http.HttpMethod fallbackMethod = null,
-                                             Uri statusCallback = null,
-                                             bool? stickySender = null,
-                                             bool? mmsConverter = null,
-                                             bool? smartEncoding = null,
-                                             ServiceResource.ScanMessageContentEnum scanMessageContent = null,
-                                             bool? fallbackToLongCode = null,
-                                             bool? areaCodeGeomatch = null,
-                                             int? validityPeriod = null,
-                                             bool? synchronousValidation = null,
-                                             string usecase = null,
-                                             bool? useInboundWebhookOnNumber = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, InboundRequestUrl = inboundRequestUrl, InboundMethod = inboundMethod, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StickySender = stickySender, MmsConverter = mmsConverter, SmartEncoding = smartEncoding, ScanMessageContent = scanMessageContent, FallbackToLongCode = fallbackToLongCode, AreaCodeGeomatch = areaCodeGeomatch, ValidityPeriod = validityPeriod, SynchronousValidation = synchronousValidation, Usecase = usecase, UseInboundWebhookOnNumber = useInboundWebhookOnNumber};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="inboundRequestUrl"> The URL we call using inbound_method when a message is received by any phone
-        ///                         number or short code in the Service. This field will be overridden if the
-        ///                         `use_inbound_webhook_on_number` field is enabled. </param>
-        /// <param name="inboundMethod"> The HTTP method we should use to call inbound_request_url </param>
-        /// <param name="fallbackUrl"> The URL that we call using fallback_method if an error occurs while retrieving or
-        ///                   executing the TwiML from the Inbound Request URL. This field will be overridden if the
-        ///                   `use_inbound_webhook_on_number` field is enabled. </param>
-        /// <param name="fallbackMethod"> The HTTP method we should use to call fallback_url </param>
-        /// <param name="statusCallback"> The URL we should call to pass status updates about message delivery </param>
-        /// <param name="stickySender"> Whether to enable Sticky Sender on the Service instance </param>
-        /// <param name="mmsConverter"> Whether to enable the MMS Converter for messages sent through the Service instance
-        ///                    </param>
-        /// <param name="smartEncoding"> Whether to enable Encoding for messages sent through the Service instance </param>
-        /// <param name="scanMessageContent"> Reserved </param>
-        /// <param name="fallbackToLongCode"> Whether to enable Fallback to Long Code for messages sent through the Service
-        ///                          instance </param>
-        /// <param name="areaCodeGeomatch"> Whether to enable Area Code Geomatch on the Service Instance </param>
-        /// <param name="validityPeriod"> How long, in seconds, messages sent from the Service are valid </param>
-        /// <param name="synchronousValidation"> Reserved </param>
-        /// <param name="usecase"> A string describing the scenario in which the Messaging Service will be used </param>
-        /// <param name="useInboundWebhookOnNumber"> If enabled, the webhook url configured on the phone number will be used
-        ///                                 and will override the `inbound_request_url`/`fallback_url` url called when an
-        ///                                 inbound message is received. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     Uri inboundRequestUrl = null,
-                                                                                     Twilio.Http.HttpMethod inboundMethod = null,
-                                                                                     Uri fallbackUrl = null,
-                                                                                     Twilio.Http.HttpMethod fallbackMethod = null,
-                                                                                     Uri statusCallback = null,
-                                                                                     bool? stickySender = null,
-                                                                                     bool? mmsConverter = null,
-                                                                                     bool? smartEncoding = null,
-                                                                                     ServiceResource.ScanMessageContentEnum scanMessageContent = null,
-                                                                                     bool? fallbackToLongCode = null,
-                                                                                     bool? areaCodeGeomatch = null,
-                                                                                     int? validityPeriod = null,
-                                                                                     bool? synchronousValidation = null,
-                                                                                     string usecase = null,
-                                                                                     bool? useInboundWebhookOnNumber = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, InboundRequestUrl = inboundRequestUrl, InboundMethod = inboundMethod, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StickySender = stickySender, MmsConverter = mmsConverter, SmartEncoding = smartEncoding, ScanMessageContent = scanMessageContent, FallbackToLongCode = fallbackToLongCode, AreaCodeGeomatch = areaCodeGeomatch, ValidityPeriod = validityPeriod, SynchronousValidation = synchronousValidation, Usecase = usecase, UseInboundWebhookOnNumber = useInboundWebhookOnNumber};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/Services",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Messaging)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Messaging,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ServiceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ServiceResource object represented by the provided JSON </returns>
-        public static ServiceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ServiceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URL we call using inbound_method when a message is received by any phone number or short code in the Service. This field will be overridden if the `use_inbound_webhook_on_number` field is enabled.
-        /// </summary>
-        [JsonProperty("inbound_request_url")]
-        public Uri InboundRequestUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call inbound_request_url
-        /// </summary>
-        [JsonProperty("inbound_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod InboundMethod { get; private set; }
-        /// <summary>
-        /// The URL that we call using fallback_method if an error occurs while retrieving or executing the TwiML from the Inbound Request URL. This field will be overridden if the `use_inbound_webhook_on_number` field is enabled.
-        /// </summary>
-        [JsonProperty("fallback_url")]
-        public Uri FallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call fallback_url
-        /// </summary>
-        [JsonProperty("fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod FallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL we call to pass status updates about message delivery
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// Whether to enable Sticky Sender on the Service instance
-        /// </summary>
-        [JsonProperty("sticky_sender")]
-        public bool? StickySender { get; private set; }
-        /// <summary>
-        /// Whether to enable the MMS Converter for messages sent through the Service instance
-        /// </summary>
-        [JsonProperty("mms_converter")]
-        public bool? MmsConverter { get; private set; }
-        /// <summary>
-        /// Whether to enable Encoding for messages sent through the Service instance
-        /// </summary>
-        [JsonProperty("smart_encoding")]
-        public bool? SmartEncoding { get; private set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        [JsonProperty("scan_message_content")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ServiceResource.ScanMessageContentEnum ScanMessageContent { get; private set; }
-        /// <summary>
-        /// Whether to enable Fallback to Long Code for messages sent through the Service instance
-        /// </summary>
-        [JsonProperty("fallback_to_long_code")]
-        public bool? FallbackToLongCode { get; private set; }
-        /// <summary>
-        /// Whether to enable Area Code Geomatch on the Service Instance
-        /// </summary>
-        [JsonProperty("area_code_geomatch")]
-        public bool? AreaCodeGeomatch { get; private set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        [JsonProperty("synchronous_validation")]
-        public bool? SynchronousValidation { get; private set; }
-        /// <summary>
-        /// How long, in seconds, messages sent from the Service are valid
-        /// </summary>
-        [JsonProperty("validity_period")]
-        public int? ValidityPeriod { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Service resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The absolute URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// A string describing the scenario in which the Messaging Service will be used
-        /// </summary>
-        [JsonProperty("usecase")]
-        public string Usecase { get; private set; }
-        /// <summary>
-        /// Whether US A2P campaign is registered for this Service.
-        /// </summary>
-        [JsonProperty("us_app_to_person_registered")]
-        public bool? UsAppToPersonRegistered { get; private set; }
-        /// <summary>
-        /// If enabled, the webhook url configured on the phone number will be used and will override the `inbound_request_url`/`fallback_url` url called when an inbound message is received.
-        /// </summary>
-        [JsonProperty("use_inbound_webhook_on_number")]
-        public bool? UseInboundWebhookOnNumber { get; private set; }
-
-        private ServiceResource()
-        {
-
-        }
-    }
+{
+
+  public class ServiceResource : Resource
+  {
+    public sealed class ScanMessageContentEnum : StringEnum
+    {
+      private ScanMessageContentEnum(string value) : base(value) { }
+      public ScanMessageContentEnum() { }
+      public static implicit operator ScanMessageContentEnum(string value)
+      {
+        return new ScanMessageContentEnum(value);
+      }
+
+      public static readonly ScanMessageContentEnum Inherit = new ScanMessageContentEnum("inherit");
+      public static readonly ScanMessageContentEnum Enable = new ScanMessageContentEnum("enable");
+      public static readonly ScanMessageContentEnum Disable = new ScanMessageContentEnum("disable");
+    }
+
+    private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Messaging,
+          "/v1/Services",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="inboundRequestUrl"> The URL we call using inbound_method when a message is received by any phone
+    ///                         number or short code in the Service. This field will be overridden if the
+    ///                         `use_inbound_webhook_on_number` field is enabled. </param>
+    /// <param name="inboundMethod"> The HTTP method we should use to call inbound_request_url </param>
+    /// <param name="fallbackUrl"> The URL that we call using fallback_method if an error occurs while retrieving or
+    ///                   executing the TwiML from the Inbound Request URL. This field will be overridden if the
+    ///                   `use_inbound_webhook_on_number` field is enabled. </param>
+    /// <param name="fallbackMethod"> The HTTP method we should use to call fallback_url </param>
+    /// <param name="statusCallback"> The URL we should call to pass status updates about message delivery </param>
+    /// <param name="stickySender"> Whether to enable Sticky Sender on the Service instance </param>
+    /// <param name="mmsConverter"> Whether to enable the MMS Converter for messages sent through the Service instance
+    ///                    </param>
+    /// <param name="smartEncoding"> Whether to enable Encoding for messages sent through the Service instance </param>
+    /// <param name="scanMessageContent"> Reserved </param>
+    /// <param name="fallbackToLongCode"> Whether to enable Fallback to Long Code for messages sent through the Service
+    ///                          instance </param>
+    /// <param name="areaCodeGeomatch"> Whether to enable Area Code Geomatch on the Service Instance </param>
+    /// <param name="validityPeriod"> How long, in seconds, messages sent from the Service are valid </param>
+    /// <param name="synchronousValidation"> Reserved </param>
+    /// <param name="usecase"> A string describing the scenario in which the Messaging Service will be used </param>
+    /// <param name="useInboundWebhookOnNumber"> If enabled, the webhook url configured on the phone number will be used
+    ///                                 and will override the `inbound_request_url`/`fallback_url` url called when an
+    ///                                 inbound message is received. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(string friendlyName,
+                                         Uri inboundRequestUrl = null,
+                                         Twilio.Http.HttpMethod inboundMethod = null,
+                                         Uri fallbackUrl = null,
+                                         Twilio.Http.HttpMethod fallbackMethod = null,
+                                         Uri statusCallback = null,
+                                         bool? stickySender = null,
+                                         bool? mmsConverter = null,
+                                         bool? smartEncoding = null,
+                                         ServiceResource.ScanMessageContentEnum scanMessageContent = null,
+                                         bool? fallbackToLongCode = null,
+                                         bool? areaCodeGeomatch = null,
+                                         int? validityPeriod = null,
+                                         bool? synchronousValidation = null,
+                                         string usecase = null,
+                                         bool? useInboundWebhookOnNumber = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName) { InboundRequestUrl = inboundRequestUrl, InboundMethod = inboundMethod, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StickySender = stickySender, MmsConverter = mmsConverter, SmartEncoding = smartEncoding, ScanMessageContent = scanMessageContent, FallbackToLongCode = fallbackToLongCode, AreaCodeGeomatch = areaCodeGeomatch, ValidityPeriod = validityPeriod, SynchronousValidation = synchronousValidation, Usecase = usecase, UseInboundWebhookOnNumber = useInboundWebhookOnNumber };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="inboundRequestUrl"> The URL we call using inbound_method when a message is received by any phone
+    ///                         number or short code in the Service. This field will be overridden if the
+    ///                         `use_inbound_webhook_on_number` field is enabled. </param>
+    /// <param name="inboundMethod"> The HTTP method we should use to call inbound_request_url </param>
+    /// <param name="fallbackUrl"> The URL that we call using fallback_method if an error occurs while retrieving or
+    ///                   executing the TwiML from the Inbound Request URL. This field will be overridden if the
+    ///                   `use_inbound_webhook_on_number` field is enabled. </param>
+    /// <param name="fallbackMethod"> The HTTP method we should use to call fallback_url </param>
+    /// <param name="statusCallback"> The URL we should call to pass status updates about message delivery </param>
+    /// <param name="stickySender"> Whether to enable Sticky Sender on the Service instance </param>
+    /// <param name="mmsConverter"> Whether to enable the MMS Converter for messages sent through the Service instance
+    ///                    </param>
+    /// <param name="smartEncoding"> Whether to enable Encoding for messages sent through the Service instance </param>
+    /// <param name="scanMessageContent"> Reserved </param>
+    /// <param name="fallbackToLongCode"> Whether to enable Fallback to Long Code for messages sent through the Service
+    ///                          instance </param>
+    /// <param name="areaCodeGeomatch"> Whether to enable Area Code Geomatch on the Service Instance </param>
+    /// <param name="validityPeriod"> How long, in seconds, messages sent from the Service are valid </param>
+    /// <param name="synchronousValidation"> Reserved </param>
+    /// <param name="usecase"> A string describing the scenario in which the Messaging Service will be used </param>
+    /// <param name="useInboundWebhookOnNumber"> If enabled, the webhook url configured on the phone number will be used
+    ///                                 and will override the `inbound_request_url`/`fallback_url` url called when an
+    ///                                 inbound message is received. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
+                                                                                 Uri inboundRequestUrl = null,
+                                                                                 Twilio.Http.HttpMethod inboundMethod = null,
+                                                                                 Uri fallbackUrl = null,
+                                                                                 Twilio.Http.HttpMethod fallbackMethod = null,
+                                                                                 Uri statusCallback = null,
+                                                                                 bool? stickySender = null,
+                                                                                 bool? mmsConverter = null,
+                                                                                 bool? smartEncoding = null,
+                                                                                 ServiceResource.ScanMessageContentEnum scanMessageContent = null,
+                                                                                 bool? fallbackToLongCode = null,
+                                                                                 bool? areaCodeGeomatch = null,
+                                                                                 int? validityPeriod = null,
+                                                                                 bool? synchronousValidation = null,
+                                                                                 string usecase = null,
+                                                                                 bool? useInboundWebhookOnNumber = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName) { InboundRequestUrl = inboundRequestUrl, InboundMethod = inboundMethod, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StickySender = stickySender, MmsConverter = mmsConverter, SmartEncoding = smartEncoding, ScanMessageContent = scanMessageContent, FallbackToLongCode = fallbackToLongCode, AreaCodeGeomatch = areaCodeGeomatch, ValidityPeriod = validityPeriod, SynchronousValidation = synchronousValidation, Usecase = usecase, UseInboundWebhookOnNumber = useInboundWebhookOnNumber };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="inboundRequestUrl"> The URL we call using inbound_method when a message is received by any phone
+    ///                         number or short code in the Service. This field will be overridden if the
+    ///                         `use_inbound_webhook_on_number` field is enabled. </param>
+    /// <param name="inboundMethod"> The HTTP method we should use to call inbound_request_url </param>
+    /// <param name="fallbackUrl"> The URL that we call using fallback_method if an error occurs while retrieving or
+    ///                   executing the TwiML from the Inbound Request URL. This field will be overridden if the
+    ///                   `use_inbound_webhook_on_number` field is enabled. </param>
+    /// <param name="fallbackMethod"> The HTTP method we should use to call fallback_url </param>
+    /// <param name="statusCallback"> The URL we should call to pass status updates about message delivery </param>
+    /// <param name="stickySender"> Whether to enable Sticky Sender on the Service instance </param>
+    /// <param name="mmsConverter"> Whether to enable the MMS Converter for messages sent through the Service instance
+    ///                    </param>
+    /// <param name="smartEncoding"> Whether to enable Encoding for messages sent through the Service instance </param>
+    /// <param name="scanMessageContent"> Reserved </param>
+    /// <param name="fallbackToLongCode"> Whether to enable Fallback to Long Code for messages sent through the Service
+    ///                          instance </param>
+    /// <param name="areaCodeGeomatch"> Whether to enable Area Code Geomatch on the Service Instance </param>
+    /// <param name="validityPeriod"> How long, in seconds, messages sent from the Service are valid </param>
+    /// <param name="synchronousValidation"> Reserved </param>
+    /// <param name="usecase"> A string describing the scenario in which the Messaging Service will be used </param>
+    /// <param name="useInboundWebhookOnNumber"> If enabled, the webhook url configured on the phone number will be used
+    ///                                 and will override the `inbound_request_url`/`fallback_url` url called when an
+    ///                                 inbound message is received. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(string pathSid,
+                                         string friendlyName = null,
+                                         Uri inboundRequestUrl = null,
+                                         Twilio.Http.HttpMethod inboundMethod = null,
+                                         Uri fallbackUrl = null,
+                                         Twilio.Http.HttpMethod fallbackMethod = null,
+                                         Uri statusCallback = null,
+                                         bool? stickySender = null,
+                                         bool? mmsConverter = null,
+                                         bool? smartEncoding = null,
+                                         ServiceResource.ScanMessageContentEnum scanMessageContent = null,
+                                         bool? fallbackToLongCode = null,
+                                         bool? areaCodeGeomatch = null,
+                                         int? validityPeriod = null,
+                                         bool? synchronousValidation = null,
+                                         string usecase = null,
+                                         bool? useInboundWebhookOnNumber = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, InboundRequestUrl = inboundRequestUrl, InboundMethod = inboundMethod, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StickySender = stickySender, MmsConverter = mmsConverter, SmartEncoding = smartEncoding, ScanMessageContent = scanMessageContent, FallbackToLongCode = fallbackToLongCode, AreaCodeGeomatch = areaCodeGeomatch, ValidityPeriod = validityPeriod, SynchronousValidation = synchronousValidation, Usecase = usecase, UseInboundWebhookOnNumber = useInboundWebhookOnNumber };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="inboundRequestUrl"> The URL we call using inbound_method when a message is received by any phone
+    ///                         number or short code in the Service. This field will be overridden if the
+    ///                         `use_inbound_webhook_on_number` field is enabled. </param>
+    /// <param name="inboundMethod"> The HTTP method we should use to call inbound_request_url </param>
+    /// <param name="fallbackUrl"> The URL that we call using fallback_method if an error occurs while retrieving or
+    ///                   executing the TwiML from the Inbound Request URL. This field will be overridden if the
+    ///                   `use_inbound_webhook_on_number` field is enabled. </param>
+    /// <param name="fallbackMethod"> The HTTP method we should use to call fallback_url </param>
+    /// <param name="statusCallback"> The URL we should call to pass status updates about message delivery </param>
+    /// <param name="stickySender"> Whether to enable Sticky Sender on the Service instance </param>
+    /// <param name="mmsConverter"> Whether to enable the MMS Converter for messages sent through the Service instance
+    ///                    </param>
+    /// <param name="smartEncoding"> Whether to enable Encoding for messages sent through the Service instance </param>
+    /// <param name="scanMessageContent"> Reserved </param>
+    /// <param name="fallbackToLongCode"> Whether to enable Fallback to Long Code for messages sent through the Service
+    ///                          instance </param>
+    /// <param name="areaCodeGeomatch"> Whether to enable Area Code Geomatch on the Service Instance </param>
+    /// <param name="validityPeriod"> How long, in seconds, messages sent from the Service are valid </param>
+    /// <param name="synchronousValidation"> Reserved </param>
+    /// <param name="usecase"> A string describing the scenario in which the Messaging Service will be used </param>
+    /// <param name="useInboundWebhookOnNumber"> If enabled, the webhook url configured on the phone number will be used
+    ///                                 and will override the `inbound_request_url`/`fallback_url` url called when an
+    ///                                 inbound message is received. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 Uri inboundRequestUrl = null,
+                                                                                 Twilio.Http.HttpMethod inboundMethod = null,
+                                                                                 Uri fallbackUrl = null,
+                                                                                 Twilio.Http.HttpMethod fallbackMethod = null,
+                                                                                 Uri statusCallback = null,
+                                                                                 bool? stickySender = null,
+                                                                                 bool? mmsConverter = null,
+                                                                                 bool? smartEncoding = null,
+                                                                                 ServiceResource.ScanMessageContentEnum scanMessageContent = null,
+                                                                                 bool? fallbackToLongCode = null,
+                                                                                 bool? areaCodeGeomatch = null,
+                                                                                 int? validityPeriod = null,
+                                                                                 bool? synchronousValidation = null,
+                                                                                 string usecase = null,
+                                                                                 bool? useInboundWebhookOnNumber = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, InboundRequestUrl = inboundRequestUrl, InboundMethod = inboundMethod, FallbackUrl = fallbackUrl, FallbackMethod = fallbackMethod, StatusCallback = statusCallback, StickySender = stickySender, MmsConverter = mmsConverter, SmartEncoding = smartEncoding, ScanMessageContent = scanMessageContent, FallbackToLongCode = fallbackToLongCode, AreaCodeGeomatch = areaCodeGeomatch, ValidityPeriod = validityPeriod, SynchronousValidation = synchronousValidation, Usecase = usecase, UseInboundWebhookOnNumber = useInboundWebhookOnNumber };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/Services",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Messaging)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Messaging,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ServiceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ServiceResource object represented by the provided JSON </returns>
+    public static ServiceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ServiceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URL we call using inbound_method when a message is received by any phone number or short code in the Service. This field will be overridden if the `use_inbound_webhook_on_number` field is enabled.
+    /// </summary>
+    [JsonProperty("inbound_request_url")]
+    public Uri InboundRequestUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call inbound_request_url
+    /// </summary>
+    [JsonProperty("inbound_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod InboundMethod { get; private set; }
+    /// <summary>
+    /// The URL that we call using fallback_method if an error occurs while retrieving or executing the TwiML from the Inbound Request URL. This field will be overridden if the `use_inbound_webhook_on_number` field is enabled.
+    /// </summary>
+    [JsonProperty("fallback_url")]
+    public Uri FallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call fallback_url
+    /// </summary>
+    [JsonProperty("fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod FallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL we call to pass status updates about message delivery
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// Whether to enable Sticky Sender on the Service instance
+    /// </summary>
+    [JsonProperty("sticky_sender")]
+    public bool? StickySender { get; private set; }
+    /// <summary>
+    /// Whether to enable the MMS Converter for messages sent through the Service instance
+    /// </summary>
+    [JsonProperty("mms_converter")]
+    public bool? MmsConverter { get; private set; }
+    /// <summary>
+    /// Whether to enable Encoding for messages sent through the Service instance
+    /// </summary>
+    [JsonProperty("smart_encoding")]
+    public bool? SmartEncoding { get; private set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    [JsonProperty("scan_message_content")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ServiceResource.ScanMessageContentEnum ScanMessageContent { get; private set; }
+    /// <summary>
+    /// Whether to enable Fallback to Long Code for messages sent through the Service instance
+    /// </summary>
+    [JsonProperty("fallback_to_long_code")]
+    public bool? FallbackToLongCode { get; private set; }
+    /// <summary>
+    /// Whether to enable Area Code Geomatch on the Service Instance
+    /// </summary>
+    [JsonProperty("area_code_geomatch")]
+    public bool? AreaCodeGeomatch { get; private set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    [JsonProperty("synchronous_validation")]
+    public bool? SynchronousValidation { get; private set; }
+    /// <summary>
+    /// How long, in seconds, messages sent from the Service are valid
+    /// </summary>
+    [JsonProperty("validity_period")]
+    public int? ValidityPeriod { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Service resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The absolute URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// A string describing the scenario in which the Messaging Service will be used
+    /// </summary>
+    [JsonProperty("usecase")]
+    public string Usecase { get; private set; }
+    /// <summary>
+    /// Whether US A2P campaign is registered for this Service.
+    /// </summary>
+    [JsonProperty("us_app_to_person_registered")]
+    public bool? UsAppToPersonRegistered { get; private set; }
+    /// <summary>
+    /// If enabled, the webhook url configured on the phone number will be used and will override the `inbound_request_url`/`fallback_url` url called when an inbound message is received.
+    /// </summary>
+    [JsonProperty("use_inbound_webhook_on_number")]
+    public bool? UseInboundWebhookOnNumber { get; private set; }
+
+    private ServiceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/UsecaseOptions.cs b/src/Twilio/Rest/Messaging/V1/UsecaseOptions.cs
index ed4ec695e..d58799843 100644
--- a/src/Twilio/Rest/Messaging/V1/UsecaseOptions.cs
+++ b/src/Twilio/Rest/Messaging/V1/UsecaseOptions.cs
@@ -9,23 +9,23 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Messaging.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// FetchUsecaseOptions
+  /// </summary>
+  public class FetchUsecaseOptions : IOptions<UsecaseResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// FetchUsecaseOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchUsecaseOptions : IOptions<UsecaseResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Messaging/V1/UsecaseResource.cs b/src/Twilio/Rest/Messaging/V1/UsecaseResource.cs
index 843fc8521..7099cbbf7 100644
--- a/src/Twilio/Rest/Messaging/V1/UsecaseResource.cs
+++ b/src/Twilio/Rest/Messaging/V1/UsecaseResource.cs
@@ -18,102 +18,102 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Messaging.V1
-{
-
-    public class UsecaseResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchUsecaseOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Messaging,
-                "/v1/Services/Usecases",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Usecase parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Usecase </returns>
-        public static UsecaseResource Fetch(FetchUsecaseOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Usecase parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Usecase </returns>
-        public static async System.Threading.Tasks.Task<UsecaseResource> FetchAsync(FetchUsecaseOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Usecase </returns>
-        public static UsecaseResource Fetch(ITwilioRestClient client = null)
-        {
-            var options = new FetchUsecaseOptions();
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Usecase </returns>
-        public static async System.Threading.Tasks.Task<UsecaseResource> FetchAsync(ITwilioRestClient client = null)
-        {
-            var options = new FetchUsecaseOptions();
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a UsecaseResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UsecaseResource object represented by the provided JSON </returns>
-        public static UsecaseResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UsecaseResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Human readable Messaging Service Use Case details
-        /// </summary>
-        [JsonProperty("usecases")]
-        public List<object> Usecases { get; private set; }
-
-        private UsecaseResource()
-        {
-
-        }
-    }
+{
+
+  public class UsecaseResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchUsecaseOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Messaging,
+          "/v1/Services/Usecases",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Usecase parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Usecase </returns>
+    public static UsecaseResource Fetch(FetchUsecaseOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Usecase parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Usecase </returns>
+    public static async System.Threading.Tasks.Task<UsecaseResource> FetchAsync(FetchUsecaseOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Usecase </returns>
+    public static UsecaseResource Fetch(ITwilioRestClient client = null)
+    {
+      var options = new FetchUsecaseOptions();
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Usecase </returns>
+    public static async System.Threading.Tasks.Task<UsecaseResource> FetchAsync(ITwilioRestClient client = null)
+    {
+      var options = new FetchUsecaseOptions();
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a UsecaseResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UsecaseResource object represented by the provided JSON </returns>
+    public static UsecaseResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UsecaseResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Human readable Messaging Service Use Case details
+    /// </summary>
+    [JsonProperty("usecases")]
+    public List<object> Usecases { get; private set; }
+
+    private UsecaseResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Monitor/V1/AlertOptions.cs b/src/Twilio/Rest/Monitor/V1/AlertOptions.cs
index 294a1d154..21281d0e9 100644
--- a/src/Twilio/Rest/Monitor/V1/AlertOptions.cs
+++ b/src/Twilio/Rest/Monitor/V1/AlertOptions.cs
@@ -9,83 +9,83 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Monitor.V1
-{
-
+{
+
+  /// <summary>
+  /// FetchAlertOptions
+  /// </summary>
+  public class FetchAlertOptions : IOptions<AlertResource>
+  {
     /// <summary>
-    /// FetchAlertOptions
+    /// The SID that identifies the resource to fetch
     /// </summary>
-    public class FetchAlertOptions : IOptions<AlertResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAlertOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchAlertOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// ReadAlertOptions
+    /// Construct a new FetchAlertOptions
     /// </summary>
-    public class ReadAlertOptions : ReadOptions<AlertResource>
-    {
-        /// <summary>
-        /// Only show alerts for this log-level
-        /// </summary>
-        public string LogLevel { get; set; }
-        /// <summary>
-        /// Only include alerts that occurred on or after this date and time
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only include alerts that occurred on or before this date and time
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (LogLevel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LogLevel", LogLevel));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchAlertOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadAlertOptions
+  /// </summary>
+  public class ReadAlertOptions : ReadOptions<AlertResource>
+  {
+    /// <summary>
+    /// Only show alerts for this log-level
+    /// </summary>
+    public string LogLevel { get; set; }
+    /// <summary>
+    /// Only include alerts that occurred on or after this date and time
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only include alerts that occurred on or before this date and time
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (LogLevel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LogLevel", LogLevel));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Monitor/V1/AlertResource.cs b/src/Twilio/Rest/Monitor/V1/AlertResource.cs
index 6fa7ddc6d..711305c3c 100644
--- a/src/Twilio/Rest/Monitor/V1/AlertResource.cs
+++ b/src/Twilio/Rest/Monitor/V1/AlertResource.cs
@@ -16,337 +16,337 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Monitor.V1
-{
-
-    public class AlertResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchAlertOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Monitor,
-                "/v1/Alerts/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Alert parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Alert </returns>
-        public static AlertResource Fetch(FetchAlertOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Alert parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Alert </returns>
-        public static async System.Threading.Tasks.Task<AlertResource> FetchAsync(FetchAlertOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Alert </returns>
-        public static AlertResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchAlertOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Alert </returns>
-        public static async System.Threading.Tasks.Task<AlertResource> FetchAsync(string pathSid,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchAlertOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAlertOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Monitor,
-                "/v1/Alerts",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Alert parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Alert </returns>
-        public static ResourceSet<AlertResource> Read(ReadAlertOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AlertResource>.FromJson("alerts", response.Content);
-            return new ResourceSet<AlertResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Alert parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Alert </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AlertResource>> ReadAsync(ReadAlertOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AlertResource>.FromJson("alerts", response.Content);
-            return new ResourceSet<AlertResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="logLevel"> Only show alerts for this log-level </param>
-        /// <param name="startDate"> Only include alerts that occurred on or after this date and time </param>
-        /// <param name="endDate"> Only include alerts that occurred on or before this date and time </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Alert </returns>
-        public static ResourceSet<AlertResource> Read(string logLevel = null,
-                                                      DateTime? startDate = null,
-                                                      DateTime? endDate = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadAlertOptions(){LogLevel = logLevel, StartDate = startDate, EndDate = endDate, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="logLevel"> Only show alerts for this log-level </param>
-        /// <param name="startDate"> Only include alerts that occurred on or after this date and time </param>
-        /// <param name="endDate"> Only include alerts that occurred on or before this date and time </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Alert </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AlertResource>> ReadAsync(string logLevel = null,
-                                                                                              DateTime? startDate = null,
-                                                                                              DateTime? endDate = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadAlertOptions(){LogLevel = logLevel, StartDate = startDate, EndDate = endDate, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AlertResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AlertResource>.FromJson("alerts", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AlertResource> NextPage(Page<AlertResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Monitor)
-            );
-
-            var response = client.Request(request);
-            return Page<AlertResource>.FromJson("alerts", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AlertResource> PreviousPage(Page<AlertResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Monitor)
-            );
-
-            var response = client.Request(request);
-            return Page<AlertResource>.FromJson("alerts", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a AlertResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AlertResource object represented by the provided JSON </returns>
-        public static AlertResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AlertResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The text of the alert
-        /// </summary>
-        [JsonProperty("alert_text")]
-        public string AlertText { get; private set; }
-        /// <summary>
-        /// The API version used when the alert was generated
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date and time when the alert was generated specified in ISO 8601 format
-        /// </summary>
-        [JsonProperty("date_generated")]
-        public DateTime? DateGenerated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The error code for the condition that generated the alert
-        /// </summary>
-        [JsonProperty("error_code")]
-        public string ErrorCode { get; private set; }
-        /// <summary>
-        /// The log level
-        /// </summary>
-        [JsonProperty("log_level")]
-        public string LogLevel { get; private set; }
-        /// <summary>
-        /// The URL of the page in our Error Dictionary with more information about the error condition
-        /// </summary>
-        [JsonProperty("more_info")]
-        public string MoreInfo { get; private set; }
-        /// <summary>
-        /// The method used by the request that generated the alert
-        /// </summary>
-        [JsonProperty("request_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod RequestMethod { get; private set; }
-        /// <summary>
-        /// The URL of the request that generated the alert
-        /// </summary>
-        [JsonProperty("request_url")]
-        public string RequestUrl { get; private set; }
-        /// <summary>
-        /// The variables passed in the request that generated the alert
-        /// </summary>
-        [JsonProperty("request_variables")]
-        public string RequestVariables { get; private set; }
-        /// <summary>
-        /// The SID of the resource for which the alert was generated
-        /// </summary>
-        [JsonProperty("resource_sid")]
-        public string ResourceSid { get; private set; }
-        /// <summary>
-        /// The response body of the request that generated the alert
-        /// </summary>
-        [JsonProperty("response_body")]
-        public string ResponseBody { get; private set; }
-        /// <summary>
-        /// The response headers of the request that generated the alert
-        /// </summary>
-        [JsonProperty("response_headers")]
-        public string ResponseHeaders { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Alert resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The request headers of the request that generated the alert
-        /// </summary>
-        [JsonProperty("request_headers")]
-        public string RequestHeaders { get; private set; }
-        /// <summary>
-        /// The SID of the service or resource that generated the alert
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-
-        private AlertResource()
-        {
-
-        }
-    }
+{
+
+  public class AlertResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchAlertOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Monitor,
+          "/v1/Alerts/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Alert parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Alert </returns>
+    public static AlertResource Fetch(FetchAlertOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Alert parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Alert </returns>
+    public static async System.Threading.Tasks.Task<AlertResource> FetchAsync(FetchAlertOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Alert </returns>
+    public static AlertResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchAlertOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Alert </returns>
+    public static async System.Threading.Tasks.Task<AlertResource> FetchAsync(string pathSid,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchAlertOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAlertOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Monitor,
+          "/v1/Alerts",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Alert parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Alert </returns>
+    public static ResourceSet<AlertResource> Read(ReadAlertOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AlertResource>.FromJson("alerts", response.Content);
+      return new ResourceSet<AlertResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Alert parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Alert </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AlertResource>> ReadAsync(ReadAlertOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AlertResource>.FromJson("alerts", response.Content);
+      return new ResourceSet<AlertResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="logLevel"> Only show alerts for this log-level </param>
+    /// <param name="startDate"> Only include alerts that occurred on or after this date and time </param>
+    /// <param name="endDate"> Only include alerts that occurred on or before this date and time </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Alert </returns>
+    public static ResourceSet<AlertResource> Read(string logLevel = null,
+                                                  DateTime? startDate = null,
+                                                  DateTime? endDate = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadAlertOptions() { LogLevel = logLevel, StartDate = startDate, EndDate = endDate, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="logLevel"> Only show alerts for this log-level </param>
+    /// <param name="startDate"> Only include alerts that occurred on or after this date and time </param>
+    /// <param name="endDate"> Only include alerts that occurred on or before this date and time </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Alert </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AlertResource>> ReadAsync(string logLevel = null,
+                                                                                          DateTime? startDate = null,
+                                                                                          DateTime? endDate = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadAlertOptions() { LogLevel = logLevel, StartDate = startDate, EndDate = endDate, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AlertResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AlertResource>.FromJson("alerts", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AlertResource> NextPage(Page<AlertResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Monitor)
+      );
+
+      var response = client.Request(request);
+      return Page<AlertResource>.FromJson("alerts", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AlertResource> PreviousPage(Page<AlertResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Monitor)
+      );
+
+      var response = client.Request(request);
+      return Page<AlertResource>.FromJson("alerts", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a AlertResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AlertResource object represented by the provided JSON </returns>
+    public static AlertResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AlertResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The text of the alert
+    /// </summary>
+    [JsonProperty("alert_text")]
+    public string AlertText { get; private set; }
+    /// <summary>
+    /// The API version used when the alert was generated
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date and time when the alert was generated specified in ISO 8601 format
+    /// </summary>
+    [JsonProperty("date_generated")]
+    public DateTime? DateGenerated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The error code for the condition that generated the alert
+    /// </summary>
+    [JsonProperty("error_code")]
+    public string ErrorCode { get; private set; }
+    /// <summary>
+    /// The log level
+    /// </summary>
+    [JsonProperty("log_level")]
+    public string LogLevel { get; private set; }
+    /// <summary>
+    /// The URL of the page in our Error Dictionary with more information about the error condition
+    /// </summary>
+    [JsonProperty("more_info")]
+    public string MoreInfo { get; private set; }
+    /// <summary>
+    /// The method used by the request that generated the alert
+    /// </summary>
+    [JsonProperty("request_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod RequestMethod { get; private set; }
+    /// <summary>
+    /// The URL of the request that generated the alert
+    /// </summary>
+    [JsonProperty("request_url")]
+    public string RequestUrl { get; private set; }
+    /// <summary>
+    /// The variables passed in the request that generated the alert
+    /// </summary>
+    [JsonProperty("request_variables")]
+    public string RequestVariables { get; private set; }
+    /// <summary>
+    /// The SID of the resource for which the alert was generated
+    /// </summary>
+    [JsonProperty("resource_sid")]
+    public string ResourceSid { get; private set; }
+    /// <summary>
+    /// The response body of the request that generated the alert
+    /// </summary>
+    [JsonProperty("response_body")]
+    public string ResponseBody { get; private set; }
+    /// <summary>
+    /// The response headers of the request that generated the alert
+    /// </summary>
+    [JsonProperty("response_headers")]
+    public string ResponseHeaders { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Alert resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The request headers of the request that generated the alert
+    /// </summary>
+    [JsonProperty("request_headers")]
+    public string RequestHeaders { get; private set; }
+    /// <summary>
+    /// The SID of the service or resource that generated the alert
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+
+    private AlertResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Monitor/V1/EventOptions.cs b/src/Twilio/Rest/Monitor/V1/EventOptions.cs
index 3f21c19d3..4a58a4b0a 100644
--- a/src/Twilio/Rest/Monitor/V1/EventOptions.cs
+++ b/src/Twilio/Rest/Monitor/V1/EventOptions.cs
@@ -9,110 +9,110 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Monitor.V1
-{
-
+{
+
+  /// <summary>
+  /// FetchEventOptions
+  /// </summary>
+  public class FetchEventOptions : IOptions<EventResource>
+  {
     /// <summary>
-    /// FetchEventOptions
+    /// The SID that identifies the resource to fetch
     /// </summary>
-    public class FetchEventOptions : IOptions<EventResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchEventOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchEventOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// Returns a list of events in the account, sorted by event-date.
+    /// Construct a new FetchEventOptions
     /// </summary>
-    public class ReadEventOptions : ReadOptions<EventResource>
-    {
-        /// <summary>
-        /// Only include events initiated by this Actor
-        /// </summary>
-        public string ActorSid { get; set; }
-        /// <summary>
-        /// Only include events of this Event Type
-        /// </summary>
-        public string EventType { get; set; }
-        /// <summary>
-        /// Only include events that refer to this resource
-        /// </summary>
-        public string ResourceSid { get; set; }
-        /// <summary>
-        /// Only include events that originated from this IP address
-        /// </summary>
-        public string SourceIpAddress { get; set; }
-        /// <summary>
-        /// Only include events that occurred on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only include events that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ActorSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ActorSid", ActorSid.ToString()));
-            }
-
-            if (EventType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EventType", EventType));
-            }
-
-            if (ResourceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ResourceSid", ResourceSid.ToString()));
-            }
-
-            if (SourceIpAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SourceIpAddress", SourceIpAddress));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchEventOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Returns a list of events in the account, sorted by event-date.
+  /// </summary>
+  public class ReadEventOptions : ReadOptions<EventResource>
+  {
+    /// <summary>
+    /// Only include events initiated by this Actor
+    /// </summary>
+    public string ActorSid { get; set; }
+    /// <summary>
+    /// Only include events of this Event Type
+    /// </summary>
+    public string EventType { get; set; }
+    /// <summary>
+    /// Only include events that refer to this resource
+    /// </summary>
+    public string ResourceSid { get; set; }
+    /// <summary>
+    /// Only include events that originated from this IP address
+    /// </summary>
+    public string SourceIpAddress { get; set; }
+    /// <summary>
+    /// Only include events that occurred on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only include events that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ActorSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ActorSid", ActorSid.ToString()));
+      }
+
+      if (EventType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EventType", EventType));
+      }
+
+      if (ResourceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ResourceSid", ResourceSid.ToString()));
+      }
+
+      if (SourceIpAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SourceIpAddress", SourceIpAddress));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Monitor/V1/EventResource.cs b/src/Twilio/Rest/Monitor/V1/EventResource.cs
index 7fd95aad2..33b29dfc5 100644
--- a/src/Twilio/Rest/Monitor/V1/EventResource.cs
+++ b/src/Twilio/Rest/Monitor/V1/EventResource.cs
@@ -16,323 +16,323 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Monitor.V1
-{
-
-    public class EventResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchEventOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Monitor,
-                "/v1/Events/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Event parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Event </returns>
-        public static EventResource Fetch(FetchEventOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Event parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Event </returns>
-        public static async System.Threading.Tasks.Task<EventResource> FetchAsync(FetchEventOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Event </returns>
-        public static EventResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchEventOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Event </returns>
-        public static async System.Threading.Tasks.Task<EventResource> FetchAsync(string pathSid,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchEventOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadEventOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Monitor,
-                "/v1/Events",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a list of events in the account, sorted by event-date.
-        /// </summary>
-        /// <param name="options"> Read Event parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Event </returns>
-        public static ResourceSet<EventResource> Read(ReadEventOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<EventResource>.FromJson("events", response.Content);
-            return new ResourceSet<EventResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of events in the account, sorted by event-date.
-        /// </summary>
-        /// <param name="options"> Read Event parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Event </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(ReadEventOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<EventResource>.FromJson("events", response.Content);
-            return new ResourceSet<EventResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a list of events in the account, sorted by event-date.
-        /// </summary>
-        /// <param name="actorSid"> Only include events initiated by this Actor </param>
-        /// <param name="eventType"> Only include events of this Event Type </param>
-        /// <param name="resourceSid"> Only include events that refer to this resource </param>
-        /// <param name="sourceIpAddress"> Only include events that originated from this IP address </param>
-        /// <param name="startDate"> Only include events that occurred on or after this date </param>
-        /// <param name="endDate"> Only include events that occurred on or before this date </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Event </returns>
-        public static ResourceSet<EventResource> Read(string actorSid = null,
-                                                      string eventType = null,
-                                                      string resourceSid = null,
-                                                      string sourceIpAddress = null,
-                                                      DateTime? startDate = null,
-                                                      DateTime? endDate = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadEventOptions(){ActorSid = actorSid, EventType = eventType, ResourceSid = resourceSid, SourceIpAddress = sourceIpAddress, StartDate = startDate, EndDate = endDate, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of events in the account, sorted by event-date.
-        /// </summary>
-        /// <param name="actorSid"> Only include events initiated by this Actor </param>
-        /// <param name="eventType"> Only include events of this Event Type </param>
-        /// <param name="resourceSid"> Only include events that refer to this resource </param>
-        /// <param name="sourceIpAddress"> Only include events that originated from this IP address </param>
-        /// <param name="startDate"> Only include events that occurred on or after this date </param>
-        /// <param name="endDate"> Only include events that occurred on or before this date </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Event </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(string actorSid = null,
-                                                                                              string eventType = null,
-                                                                                              string resourceSid = null,
-                                                                                              string sourceIpAddress = null,
-                                                                                              DateTime? startDate = null,
-                                                                                              DateTime? endDate = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadEventOptions(){ActorSid = actorSid, EventType = eventType, ResourceSid = resourceSid, SourceIpAddress = sourceIpAddress, StartDate = startDate, EndDate = endDate, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<EventResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<EventResource>.FromJson("events", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<EventResource> NextPage(Page<EventResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Monitor)
-            );
-
-            var response = client.Request(request);
-            return Page<EventResource>.FromJson("events", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<EventResource> PreviousPage(Page<EventResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Monitor)
-            );
-
-            var response = client.Request(request);
-            return Page<EventResource>.FromJson("events", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a EventResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EventResource object represented by the provided JSON </returns>
-        public static EventResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EventResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the actor that caused the event, if available
-        /// </summary>
-        [JsonProperty("actor_sid")]
-        public string ActorSid { get; private set; }
-        /// <summary>
-        /// The type of actor that caused the event
-        /// </summary>
-        [JsonProperty("actor_type")]
-        public string ActorType { get; private set; }
-        /// <summary>
-        /// A description of the event
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// A JSON string that represents an object with additional data about the event
-        /// </summary>
-        [JsonProperty("event_data")]
-        public object EventData { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the event was recorded
-        /// </summary>
-        [JsonProperty("event_date")]
-        public DateTime? EventDate { get; private set; }
-        /// <summary>
-        /// The event's type
-        /// </summary>
-        [JsonProperty("event_type")]
-        public string EventType { get; private set; }
-        /// <summary>
-        /// The SID of the resource that was affected
-        /// </summary>
-        [JsonProperty("resource_sid")]
-        public string ResourceSid { get; private set; }
-        /// <summary>
-        /// The type of resource that was affected
-        /// </summary>
-        [JsonProperty("resource_type")]
-        public string ResourceType { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The originating system or interface that caused the event
-        /// </summary>
-        [JsonProperty("source")]
-        public string Source { get; private set; }
-        /// <summary>
-        /// The IP address of the source
-        /// </summary>
-        [JsonProperty("source_ip_address")]
-        public string SourceIpAddress { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource that was affected
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The absolute URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private EventResource()
-        {
-
-        }
-    }
+{
+
+  public class EventResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchEventOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Monitor,
+          "/v1/Events/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Event parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Event </returns>
+    public static EventResource Fetch(FetchEventOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Event parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Event </returns>
+    public static async System.Threading.Tasks.Task<EventResource> FetchAsync(FetchEventOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Event </returns>
+    public static EventResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchEventOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Event </returns>
+    public static async System.Threading.Tasks.Task<EventResource> FetchAsync(string pathSid,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchEventOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadEventOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Monitor,
+          "/v1/Events",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a list of events in the account, sorted by event-date.
+    /// </summary>
+    /// <param name="options"> Read Event parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Event </returns>
+    public static ResourceSet<EventResource> Read(ReadEventOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<EventResource>.FromJson("events", response.Content);
+      return new ResourceSet<EventResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of events in the account, sorted by event-date.
+    /// </summary>
+    /// <param name="options"> Read Event parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Event </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(ReadEventOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<EventResource>.FromJson("events", response.Content);
+      return new ResourceSet<EventResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a list of events in the account, sorted by event-date.
+    /// </summary>
+    /// <param name="actorSid"> Only include events initiated by this Actor </param>
+    /// <param name="eventType"> Only include events of this Event Type </param>
+    /// <param name="resourceSid"> Only include events that refer to this resource </param>
+    /// <param name="sourceIpAddress"> Only include events that originated from this IP address </param>
+    /// <param name="startDate"> Only include events that occurred on or after this date </param>
+    /// <param name="endDate"> Only include events that occurred on or before this date </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Event </returns>
+    public static ResourceSet<EventResource> Read(string actorSid = null,
+                                                  string eventType = null,
+                                                  string resourceSid = null,
+                                                  string sourceIpAddress = null,
+                                                  DateTime? startDate = null,
+                                                  DateTime? endDate = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadEventOptions() { ActorSid = actorSid, EventType = eventType, ResourceSid = resourceSid, SourceIpAddress = sourceIpAddress, StartDate = startDate, EndDate = endDate, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of events in the account, sorted by event-date.
+    /// </summary>
+    /// <param name="actorSid"> Only include events initiated by this Actor </param>
+    /// <param name="eventType"> Only include events of this Event Type </param>
+    /// <param name="resourceSid"> Only include events that refer to this resource </param>
+    /// <param name="sourceIpAddress"> Only include events that originated from this IP address </param>
+    /// <param name="startDate"> Only include events that occurred on or after this date </param>
+    /// <param name="endDate"> Only include events that occurred on or before this date </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Event </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(string actorSid = null,
+                                                                                          string eventType = null,
+                                                                                          string resourceSid = null,
+                                                                                          string sourceIpAddress = null,
+                                                                                          DateTime? startDate = null,
+                                                                                          DateTime? endDate = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadEventOptions() { ActorSid = actorSid, EventType = eventType, ResourceSid = resourceSid, SourceIpAddress = sourceIpAddress, StartDate = startDate, EndDate = endDate, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<EventResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<EventResource>.FromJson("events", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<EventResource> NextPage(Page<EventResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Monitor)
+      );
+
+      var response = client.Request(request);
+      return Page<EventResource>.FromJson("events", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<EventResource> PreviousPage(Page<EventResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Monitor)
+      );
+
+      var response = client.Request(request);
+      return Page<EventResource>.FromJson("events", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a EventResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EventResource object represented by the provided JSON </returns>
+    public static EventResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EventResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the actor that caused the event, if available
+    /// </summary>
+    [JsonProperty("actor_sid")]
+    public string ActorSid { get; private set; }
+    /// <summary>
+    /// The type of actor that caused the event
+    /// </summary>
+    [JsonProperty("actor_type")]
+    public string ActorType { get; private set; }
+    /// <summary>
+    /// A description of the event
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// A JSON string that represents an object with additional data about the event
+    /// </summary>
+    [JsonProperty("event_data")]
+    public object EventData { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the event was recorded
+    /// </summary>
+    [JsonProperty("event_date")]
+    public DateTime? EventDate { get; private set; }
+    /// <summary>
+    /// The event's type
+    /// </summary>
+    [JsonProperty("event_type")]
+    public string EventType { get; private set; }
+    /// <summary>
+    /// The SID of the resource that was affected
+    /// </summary>
+    [JsonProperty("resource_sid")]
+    public string ResourceSid { get; private set; }
+    /// <summary>
+    /// The type of resource that was affected
+    /// </summary>
+    [JsonProperty("resource_type")]
+    public string ResourceType { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The originating system or interface that caused the event
+    /// </summary>
+    [JsonProperty("source")]
+    public string Source { get; private set; }
+    /// <summary>
+    /// The IP address of the source
+    /// </summary>
+    [JsonProperty("source_ip_address")]
+    public string SourceIpAddress { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource that was affected
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The absolute URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private EventResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Notify/V1/CredentialOptions.cs b/src/Twilio/Rest/Notify/V1/CredentialOptions.cs
index b03c1ebb2..7207ea303 100644
--- a/src/Twilio/Rest/Notify/V1/CredentialOptions.cs
+++ b/src/Twilio/Rest/Notify/V1/CredentialOptions.cs
@@ -9,265 +9,265 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Notify.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// ReadCredentialOptions
+  /// </summary>
+  public class ReadCredentialOptions : ReadOptions<CredentialResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// ReadCredentialOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadCredentialOptions : ReadOptions<CredentialResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// CreateCredentialOptions
+  /// </summary>
+  public class CreateCredentialOptions : IOptions<CredentialResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// CreateCredentialOptions
+    /// The Credential type
     /// </summary>
-    public class CreateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The Credential type
-        /// </summary>
-        public CredentialResource.PushServiceEnum Type { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// [APN only] The URL-encoded representation of the certificate
-        /// </summary>
-        public string Certificate { get; set; }
-        /// <summary>
-        /// [APN only] URL-encoded representation of the private key
-        /// </summary>
-        public string PrivateKey { get; set; }
-        /// <summary>
-        /// [APN only] Whether to send the credential to sandbox APNs
-        /// </summary>
-        public bool? Sandbox { get; set; }
-        /// <summary>
-        /// [GCM only] The `Server key` of your project from Firebase console under Settings / Cloud messaging
-        /// </summary>
-        public string ApiKey { get; set; }
-        /// <summary>
-        /// [FCM only] The `Server key` of your project from Firebase console under Settings / Cloud messaging
-        /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCredentialOptions
-        /// </summary>
-        /// <param name="type"> The Credential type </param>
-        public CreateCredentialOptions(CredentialResource.PushServiceEnum type)
-        {
-            Type = type;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Certificate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
-            }
-
-            if (PrivateKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
-            }
-
-            if (Sandbox != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
-            }
-
-            if (ApiKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
-            }
-
-            if (Secret != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secret", Secret));
-            }
-
-            return p;
-        }
-    }
-
+    public CredentialResource.PushServiceEnum Type { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// FetchCredentialOptions
+    /// A string to describe the resource
     /// </summary>
-    public class FetchCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// UpdateCredentialOptions
+    /// [APN only] The URL-encoded representation of the certificate
     /// </summary>
-    public class UpdateCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// [APN only] The URL-encoded representation of the certificate
-        /// </summary>
-        public string Certificate { get; set; }
-        /// <summary>
-        /// [APN only] URL-encoded representation of the private key
-        /// </summary>
-        public string PrivateKey { get; set; }
-        /// <summary>
-        /// [APN only] Whether to send the credential to sandbox APNs
-        /// </summary>
-        public bool? Sandbox { get; set; }
-        /// <summary>
-        /// [GCM only] The `Server key` of your project from Firebase console under Settings / Cloud messaging
-        /// </summary>
-        public string ApiKey { get; set; }
-        /// <summary>
-        /// [FCM only] The `Server key` of your project from Firebase console under Settings / Cloud messaging
-        /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Certificate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
-            }
-
-            if (PrivateKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
-            }
-
-            if (Sandbox != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
-            }
-
-            if (ApiKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
-            }
-
-            if (Secret != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secret", Secret));
-            }
-
-            return p;
-        }
-    }
-
+    public string Certificate { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// DeleteCredentialOptions
+    /// [APN only] URL-encoded representation of the private key
     /// </summary>
-    public class DeleteCredentialOptions : IOptions<CredentialResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCredentialOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteCredentialOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PrivateKey { get; set; }
+    /// <summary>
+    /// [APN only] Whether to send the credential to sandbox APNs
+    /// </summary>
+    public bool? Sandbox { get; set; }
+    /// <summary>
+    /// [GCM only] The `Server key` of your project from Firebase console under Settings / Cloud messaging
+    /// </summary>
+    public string ApiKey { get; set; }
+    /// <summary>
+    /// [FCM only] The `Server key` of your project from Firebase console under Settings / Cloud messaging
+    /// </summary>
+    public string Secret { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCredentialOptions
+    /// </summary>
+    /// <param name="type"> The Credential type </param>
+    public CreateCredentialOptions(CredentialResource.PushServiceEnum type)
+    {
+      Type = type;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Certificate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
+      }
+
+      if (PrivateKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
+      }
+
+      if (Sandbox != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
+      }
+
+      if (ApiKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
+      }
+
+      if (Secret != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secret", Secret));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// FetchCredentialOptions
+  /// </summary>
+  public class FetchCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// UpdateCredentialOptions
+  /// </summary>
+  public class UpdateCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// [APN only] The URL-encoded representation of the certificate
+    /// </summary>
+    public string Certificate { get; set; }
+    /// <summary>
+    /// [APN only] URL-encoded representation of the private key
+    /// </summary>
+    public string PrivateKey { get; set; }
+    /// <summary>
+    /// [APN only] Whether to send the credential to sandbox APNs
+    /// </summary>
+    public bool? Sandbox { get; set; }
+    /// <summary>
+    /// [GCM only] The `Server key` of your project from Firebase console under Settings / Cloud messaging
+    /// </summary>
+    public string ApiKey { get; set; }
+    /// <summary>
+    /// [FCM only] The `Server key` of your project from Firebase console under Settings / Cloud messaging
+    /// </summary>
+    public string Secret { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Certificate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Certificate", Certificate));
+      }
+
+      if (PrivateKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrivateKey", PrivateKey));
+      }
+
+      if (Sandbox != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sandbox", Sandbox.Value.ToString().ToLower()));
+      }
+
+      if (ApiKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApiKey", ApiKey));
+      }
+
+      if (Secret != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secret", Secret));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// DeleteCredentialOptions
+  /// </summary>
+  public class DeleteCredentialOptions : IOptions<CredentialResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCredentialOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteCredentialOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Notify/V1/CredentialResource.cs b/src/Twilio/Rest/Notify/V1/CredentialResource.cs
index 4c3a8625e..bbd166a54 100644
--- a/src/Twilio/Rest/Notify/V1/CredentialResource.cs
+++ b/src/Twilio/Rest/Notify/V1/CredentialResource.cs
@@ -19,542 +19,542 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Notify.V1
-{
-
-    public class CredentialResource : Resource
-    {
-        public sealed class PushServiceEnum : StringEnum
-        {
-            private PushServiceEnum(string value) : base(value) {}
-            public PushServiceEnum() {}
-            public static implicit operator PushServiceEnum(string value)
-            {
-                return new PushServiceEnum(value);
-            }
-
-            public static readonly PushServiceEnum Gcm = new PushServiceEnum("gcm");
-            public static readonly PushServiceEnum Apn = new PushServiceEnum("apn");
-            public static readonly PushServiceEnum Fcm = new PushServiceEnum("fcm");
-        }
-
-        private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Notify,
-                "/v1/Credentials",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CredentialResource>.FromJson("credentials", response.Content);
-            return new ResourceSet<CredentialResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static ResourceSet<CredentialResource> Read(int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Notify)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Notify)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialResource>.FromJson("credentials", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Notify,
-                "/v1/Credentials",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="type"> The Credential type </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL-encoded representation of the certificate </param>
-        /// <param name="privateKey"> [APN only] URL-encoded representation of the private key </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
-        /// <param name="apiKey"> [GCM only] The `Server key` of your project from Firebase console under Settings / Cloud
-        ///              messaging </param>
-        /// <param name="secret"> [FCM only] The `Server key` of your project from Firebase console under Settings / Cloud
-        ///              messaging </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Create(CredentialResource.PushServiceEnum type,
-                                                string friendlyName = null,
-                                                string certificate = null,
-                                                string privateKey = null,
-                                                bool? sandbox = null,
-                                                string apiKey = null,
-                                                string secret = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(type){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="type"> The Credential type </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL-encoded representation of the certificate </param>
-        /// <param name="privateKey"> [APN only] URL-encoded representation of the private key </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
-        /// <param name="apiKey"> [GCM only] The `Server key` of your project from Firebase console under Settings / Cloud
-        ///              messaging </param>
-        /// <param name="secret"> [FCM only] The `Server key` of your project from Firebase console under Settings / Cloud
-        ///              messaging </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CredentialResource.PushServiceEnum type,
-                                                                                        string friendlyName = null,
-                                                                                        string certificate = null,
-                                                                                        string privateKey = null,
-                                                                                        bool? sandbox = null,
-                                                                                        string apiKey = null,
-                                                                                        string secret = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialOptions(type){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Notify,
-                "/v1/Credentials/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Notify,
-                "/v1/Credentials/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL-encoded representation of the certificate </param>
-        /// <param name="privateKey"> [APN only] URL-encoded representation of the private key </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
-        /// <param name="apiKey"> [GCM only] The `Server key` of your project from Firebase console under Settings / Cloud
-        ///              messaging </param>
-        /// <param name="secret"> [FCM only] The `Server key` of your project from Firebase console under Settings / Cloud
-        ///              messaging </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static CredentialResource Update(string pathSid,
-                                                string friendlyName = null,
-                                                string certificate = null,
-                                                string privateKey = null,
-                                                bool? sandbox = null,
-                                                string apiKey = null,
-                                                string secret = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathSid){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="certificate"> [APN only] The URL-encoded representation of the certificate </param>
-        /// <param name="privateKey"> [APN only] URL-encoded representation of the private key </param>
-        /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
-        /// <param name="apiKey"> [GCM only] The `Server key` of your project from Firebase console under Settings / Cloud
-        ///              messaging </param>
-        /// <param name="secret"> [FCM only] The `Server key` of your project from Firebase console under Settings / Cloud
-        ///              messaging </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathSid,
-                                                                                        string friendlyName = null,
-                                                                                        string certificate = null,
-                                                                                        string privateKey = null,
-                                                                                        bool? sandbox = null,
-                                                                                        string apiKey = null,
-                                                                                        string secret = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateCredentialOptions(pathSid){FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Notify,
-                "/v1/Credentials/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Credential parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Credential </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Credential </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CredentialResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CredentialResource object represented by the provided JSON </returns>
-        public static CredentialResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CredentialResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The Credential type, one of `gcm`, `fcm`, or `apn`
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CredentialResource.PushServiceEnum Type { get; private set; }
-        /// <summary>
-        /// [APN only] Whether to send the credential to sandbox APNs
-        /// </summary>
-        [JsonProperty("sandbox")]
-        public string Sandbox { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Credential resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CredentialResource()
-        {
-
-        }
-    }
+{
+
+  public class CredentialResource : Resource
+  {
+    public sealed class PushServiceEnum : StringEnum
+    {
+      private PushServiceEnum(string value) : base(value) { }
+      public PushServiceEnum() { }
+      public static implicit operator PushServiceEnum(string value)
+      {
+        return new PushServiceEnum(value);
+      }
+
+      public static readonly PushServiceEnum Gcm = new PushServiceEnum("gcm");
+      public static readonly PushServiceEnum Apn = new PushServiceEnum("apn");
+      public static readonly PushServiceEnum Fcm = new PushServiceEnum("fcm");
+    }
+
+    private static Request BuildReadRequest(ReadCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Notify,
+          "/v1/Credentials",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(ReadCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(ReadCredentialOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CredentialResource>.FromJson("credentials", response.Content);
+      return new ResourceSet<CredentialResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static ResourceSet<CredentialResource> Read(int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialResource>> ReadAsync(int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CredentialResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CredentialResource> NextPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Notify)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CredentialResource> PreviousPage(Page<CredentialResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Notify)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialResource>.FromJson("credentials", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Notify,
+          "/v1/Credentials",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(CreateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CreateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="type"> The Credential type </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL-encoded representation of the certificate </param>
+    /// <param name="privateKey"> [APN only] URL-encoded representation of the private key </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
+    /// <param name="apiKey"> [GCM only] The `Server key` of your project from Firebase console under Settings / Cloud
+    ///              messaging </param>
+    /// <param name="secret"> [FCM only] The `Server key` of your project from Firebase console under Settings / Cloud
+    ///              messaging </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Create(CredentialResource.PushServiceEnum type,
+                                            string friendlyName = null,
+                                            string certificate = null,
+                                            string privateKey = null,
+                                            bool? sandbox = null,
+                                            string apiKey = null,
+                                            string secret = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(type) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="type"> The Credential type </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL-encoded representation of the certificate </param>
+    /// <param name="privateKey"> [APN only] URL-encoded representation of the private key </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
+    /// <param name="apiKey"> [GCM only] The `Server key` of your project from Firebase console under Settings / Cloud
+    ///              messaging </param>
+    /// <param name="secret"> [FCM only] The `Server key` of your project from Firebase console under Settings / Cloud
+    ///              messaging </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> CreateAsync(CredentialResource.PushServiceEnum type,
+                                                                                    string friendlyName = null,
+                                                                                    string certificate = null,
+                                                                                    string privateKey = null,
+                                                                                    bool? sandbox = null,
+                                                                                    string apiKey = null,
+                                                                                    string secret = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialOptions(type) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Notify,
+          "/v1/Credentials/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(FetchCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(FetchCredentialOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> FetchAsync(string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Notify,
+          "/v1/Credentials/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(UpdateCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(UpdateCredentialOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL-encoded representation of the certificate </param>
+    /// <param name="privateKey"> [APN only] URL-encoded representation of the private key </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
+    /// <param name="apiKey"> [GCM only] The `Server key` of your project from Firebase console under Settings / Cloud
+    ///              messaging </param>
+    /// <param name="secret"> [FCM only] The `Server key` of your project from Firebase console under Settings / Cloud
+    ///              messaging </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static CredentialResource Update(string pathSid,
+                                            string friendlyName = null,
+                                            string certificate = null,
+                                            string privateKey = null,
+                                            bool? sandbox = null,
+                                            string apiKey = null,
+                                            string secret = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathSid) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="certificate"> [APN only] The URL-encoded representation of the certificate </param>
+    /// <param name="privateKey"> [APN only] URL-encoded representation of the private key </param>
+    /// <param name="sandbox"> [APN only] Whether to send the credential to sandbox APNs </param>
+    /// <param name="apiKey"> [GCM only] The `Server key` of your project from Firebase console under Settings / Cloud
+    ///              messaging </param>
+    /// <param name="secret"> [FCM only] The `Server key` of your project from Firebase console under Settings / Cloud
+    ///              messaging </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<CredentialResource> UpdateAsync(string pathSid,
+                                                                                    string friendlyName = null,
+                                                                                    string certificate = null,
+                                                                                    string privateKey = null,
+                                                                                    bool? sandbox = null,
+                                                                                    string apiKey = null,
+                                                                                    string secret = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateCredentialOptions(pathSid) { FriendlyName = friendlyName, Certificate = certificate, PrivateKey = privateKey, Sandbox = sandbox, ApiKey = apiKey, Secret = secret };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCredentialOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Notify,
+          "/v1/Credentials/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(DeleteCredentialOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Credential parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Credential </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Credential </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CredentialResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CredentialResource object represented by the provided JSON </returns>
+    public static CredentialResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CredentialResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The Credential type, one of `gcm`, `fcm`, or `apn`
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CredentialResource.PushServiceEnum Type { get; private set; }
+    /// <summary>
+    /// [APN only] Whether to send the credential to sandbox APNs
+    /// </summary>
+    [JsonProperty("sandbox")]
+    public string Sandbox { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Credential resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CredentialResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Notify/V1/Service/BindingOptions.cs b/src/Twilio/Rest/Notify/V1/Service/BindingOptions.cs
index b597e9b41..76201cd11 100644
--- a/src/Twilio/Rest/Notify/V1/Service/BindingOptions.cs
+++ b/src/Twilio/Rest/Notify/V1/Service/BindingOptions.cs
@@ -10,258 +10,258 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Notify.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// FetchBindingOptions
+  /// </summary>
+  public class FetchBindingOptions : IOptions<BindingResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// FetchBindingOptions
+    /// The SID of the Service to fetch the resource from
     /// </summary>
-    public class FetchBindingOptions : IOptions<BindingResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchBindingOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// DeleteBindingOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class DeleteBindingOptions : IOptions<BindingResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteBindingOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// CreateBindingOptions
+    /// Construct a new FetchBindingOptions
     /// </summary>
-    public class CreateBindingOptions : IOptions<BindingResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The `identity` value that identifies the new resource's User
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The type of the Binding
-        /// </summary>
-        public BindingResource.BindingTypeEnum BindingType { get; }
-        /// <summary>
-        /// The channel-specific address
-        /// </summary>
-        public string Address { get; }
-        /// <summary>
-        /// A tag that can be used to select the Bindings to notify
-        /// </summary>
-        public List<string> Tag { get; set; }
-        /// <summary>
-        /// The protocol version to use to send the notification
-        /// </summary>
-        public string NotificationProtocolVersion { get; set; }
-        /// <summary>
-        /// The SID of the Credential resource to be used to send notifications to this Binding
-        /// </summary>
-        public string CredentialSid { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public string Endpoint { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="bindingType"> The type of the Binding </param>
-        /// <param name="address"> The channel-specific address </param>
-        public CreateBindingOptions(string pathServiceSid,
-                                    string identity,
-                                    BindingResource.BindingTypeEnum bindingType,
-                                    string address)
-        {
-            PathServiceSid = pathServiceSid;
-            Identity = identity;
-            BindingType = bindingType;
-            Address = address;
-            Tag = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (BindingType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BindingType", BindingType.ToString()));
-            }
-
-            if (Address != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Address", Address));
-            }
-
-            if (Tag != null)
-            {
-                p.AddRange(Tag.Select(prop => new KeyValuePair<string, string>("Tag", prop)));
-            }
-
-            if (NotificationProtocolVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NotificationProtocolVersion", NotificationProtocolVersion));
-            }
-
-            if (CredentialSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CredentialSid", CredentialSid.ToString()));
-            }
-
-            if (Endpoint != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Endpoint", Endpoint));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchBindingOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// ReadBindingOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadBindingOptions : ReadOptions<BindingResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Only include usage that has occurred on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// The `identity` value of the resources to read
-        /// </summary>
-        public List<string> Identity { get; set; }
-        /// <summary>
-        /// Only list Bindings that have all of the specified Tags
-        /// </summary>
-        public List<string> Tag { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadBindingOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
-        public ReadBindingOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-            Identity = new List<string>();
-            Tag = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
-            }
-
-            if (Identity != null)
-            {
-                p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
-            }
-
-            if (Tag != null)
-            {
-                p.AddRange(Tag.Select(prop => new KeyValuePair<string, string>("Tag", prop)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// DeleteBindingOptions
+  /// </summary>
+  public class DeleteBindingOptions : IOptions<BindingResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteBindingOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// CreateBindingOptions
+  /// </summary>
+  public class CreateBindingOptions : IOptions<BindingResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The `identity` value that identifies the new resource's User
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The type of the Binding
+    /// </summary>
+    public BindingResource.BindingTypeEnum BindingType { get; }
+    /// <summary>
+    /// The channel-specific address
+    /// </summary>
+    public string Address { get; }
+    /// <summary>
+    /// A tag that can be used to select the Bindings to notify
+    /// </summary>
+    public List<string> Tag { get; set; }
+    /// <summary>
+    /// The protocol version to use to send the notification
+    /// </summary>
+    public string NotificationProtocolVersion { get; set; }
+    /// <summary>
+    /// The SID of the Credential resource to be used to send notifications to this Binding
+    /// </summary>
+    public string CredentialSid { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public string Endpoint { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="bindingType"> The type of the Binding </param>
+    /// <param name="address"> The channel-specific address </param>
+    public CreateBindingOptions(string pathServiceSid,
+                                string identity,
+                                BindingResource.BindingTypeEnum bindingType,
+                                string address)
+    {
+      PathServiceSid = pathServiceSid;
+      Identity = identity;
+      BindingType = bindingType;
+      Address = address;
+      Tag = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (BindingType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BindingType", BindingType.ToString()));
+      }
+
+      if (Address != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Address", Address));
+      }
+
+      if (Tag != null)
+      {
+        p.AddRange(Tag.Select(prop => new KeyValuePair<string, string>("Tag", prop)));
+      }
+
+      if (NotificationProtocolVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NotificationProtocolVersion", NotificationProtocolVersion));
+      }
+
+      if (CredentialSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CredentialSid", CredentialSid.ToString()));
+      }
+
+      if (Endpoint != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Endpoint", Endpoint));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// ReadBindingOptions
+  /// </summary>
+  public class ReadBindingOptions : ReadOptions<BindingResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Only include usage that has occurred on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// The `identity` value of the resources to read
+    /// </summary>
+    public List<string> Identity { get; set; }
+    /// <summary>
+    /// Only list Bindings that have all of the specified Tags
+    /// </summary>
+    public List<string> Tag { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadBindingOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
+    public ReadBindingOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+      Identity = new List<string>();
+      Tag = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", StartDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", EndDate.Value.ToString("yyyy-MM-dd")));
+      }
+
+      if (Identity != null)
+      {
+        p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
+      }
+
+      if (Tag != null)
+      {
+        p.AddRange(Tag.Select(prop => new KeyValuePair<string, string>("Tag", prop)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Notify/V1/Service/BindingResource.cs b/src/Twilio/Rest/Notify/V1/Service/BindingResource.cs
index 8ab1eb8ee..0358305ee 100644
--- a/src/Twilio/Rest/Notify/V1/Service/BindingResource.cs
+++ b/src/Twilio/Rest/Notify/V1/Service/BindingResource.cs
@@ -19,507 +19,507 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Notify.V1.Service
-{
-
-    public class BindingResource : Resource
-    {
-        public sealed class BindingTypeEnum : StringEnum
-        {
-            private BindingTypeEnum(string value) : base(value) {}
-            public BindingTypeEnum() {}
-            public static implicit operator BindingTypeEnum(string value)
-            {
-                return new BindingTypeEnum(value);
-            }
-
-            public static readonly BindingTypeEnum Apn = new BindingTypeEnum("apn");
-            public static readonly BindingTypeEnum Gcm = new BindingTypeEnum("gcm");
-            public static readonly BindingTypeEnum Sms = new BindingTypeEnum("sms");
-            public static readonly BindingTypeEnum Fcm = new BindingTypeEnum("fcm");
-            public static readonly BindingTypeEnum FacebookMessenger = new BindingTypeEnum("facebook-messenger");
-            public static readonly BindingTypeEnum Alexa = new BindingTypeEnum("alexa");
-        }
-
-        private static Request BuildFetchRequest(FetchBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Notify,
-                "/v1/Services/" + options.PathServiceSid + "/Bindings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static BindingResource Fetch(FetchBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(FetchBindingOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static BindingResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchBindingOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchBindingOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Notify,
-                "/v1/Services/" + options.PathServiceSid + "/Bindings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static bool Delete(DeleteBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBindingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteBindingOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteBindingOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Notify,
-                "/v1/Services/" + options.PathServiceSid + "/Bindings",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static BindingResource Create(CreateBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<BindingResource> CreateAsync(CreateBindingOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="bindingType"> The type of the Binding </param>
-        /// <param name="address"> The channel-specific address </param>
-        /// <param name="tag"> A tag that can be used to select the Bindings to notify </param>
-        /// <param name="notificationProtocolVersion"> The protocol version to use to send the notification </param>
-        /// <param name="credentialSid"> The SID of the Credential resource to be used to send notifications to this Binding
-        ///                     </param>
-        /// <param name="endpoint"> Deprecated </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static BindingResource Create(string pathServiceSid,
-                                             string identity,
-                                             BindingResource.BindingTypeEnum bindingType,
-                                             string address,
-                                             List<string> tag = null,
-                                             string notificationProtocolVersion = null,
-                                             string credentialSid = null,
-                                             string endpoint = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateBindingOptions(pathServiceSid, identity, bindingType, address){Tag = tag, NotificationProtocolVersion = notificationProtocolVersion, CredentialSid = credentialSid, Endpoint = endpoint};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="bindingType"> The type of the Binding </param>
-        /// <param name="address"> The channel-specific address </param>
-        /// <param name="tag"> A tag that can be used to select the Bindings to notify </param>
-        /// <param name="notificationProtocolVersion"> The protocol version to use to send the notification </param>
-        /// <param name="credentialSid"> The SID of the Credential resource to be used to send notifications to this Binding
-        ///                     </param>
-        /// <param name="endpoint"> Deprecated </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<BindingResource> CreateAsync(string pathServiceSid,
-                                                                                     string identity,
-                                                                                     BindingResource.BindingTypeEnum bindingType,
-                                                                                     string address,
-                                                                                     List<string> tag = null,
-                                                                                     string notificationProtocolVersion = null,
-                                                                                     string credentialSid = null,
-                                                                                     string endpoint = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateBindingOptions(pathServiceSid, identity, bindingType, address){Tag = tag, NotificationProtocolVersion = notificationProtocolVersion, CredentialSid = credentialSid, Endpoint = endpoint};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadBindingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Notify,
-                "/v1/Services/" + options.PathServiceSid + "/Bindings",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static ResourceSet<BindingResource> Read(ReadBindingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<BindingResource>.FromJson("bindings", response.Content);
-            return new ResourceSet<BindingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Binding parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(ReadBindingOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<BindingResource>.FromJson("bindings", response.Content);
-            return new ResourceSet<BindingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="identity"> The `identity` value of the resources to read </param>
-        /// <param name="tag"> Only list Bindings that have all of the specified Tags </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Binding </returns>
-        public static ResourceSet<BindingResource> Read(string pathServiceSid,
-                                                        DateTime? startDate = null,
-                                                        DateTime? endDate = null,
-                                                        List<string> identity = null,
-                                                        List<string> tag = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadBindingOptions(pathServiceSid){StartDate = startDate, EndDate = endDate, Identity = identity, Tag = tag, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
-        /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="identity"> The `identity` value of the resources to read </param>
-        /// <param name="tag"> Only list Bindings that have all of the specified Tags </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Binding </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(string pathServiceSid,
-                                                                                                DateTime? startDate = null,
-                                                                                                DateTime? endDate = null,
-                                                                                                List<string> identity = null,
-                                                                                                List<string> tag = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadBindingOptions(pathServiceSid){StartDate = startDate, EndDate = endDate, Identity = identity, Tag = tag, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<BindingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<BindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<BindingResource> NextPage(Page<BindingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Notify)
-            );
-
-            var response = client.Request(request);
-            return Page<BindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<BindingResource> PreviousPage(Page<BindingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Notify)
-            );
-
-            var response = client.Request(request);
-            return Page<BindingResource>.FromJson("bindings", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a BindingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BindingResource object represented by the provided JSON </returns>
-        public static BindingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BindingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Credential resource to be used to send notifications to this Binding
-        /// </summary>
-        [JsonProperty("credential_sid")]
-        public string CredentialSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The protocol version to use to send the notification
-        /// </summary>
-        [JsonProperty("notification_protocol_version")]
-        public string NotificationProtocolVersion { get; private set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        [JsonProperty("endpoint")]
-        public string Endpoint { get; private set; }
-        /// <summary>
-        /// The `identity` value that identifies the new resource's User
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The type of the Binding
-        /// </summary>
-        [JsonProperty("binding_type")]
-        public string BindingType { get; private set; }
-        /// <summary>
-        /// The channel-specific address
-        /// </summary>
-        [JsonProperty("address")]
-        public string Address { get; private set; }
-        /// <summary>
-        /// The list of tags associated with this Binding
-        /// </summary>
-        [JsonProperty("tags")]
-        public List<string> Tags { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Binding resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private BindingResource()
-        {
-
-        }
-    }
+{
+
+  public class BindingResource : Resource
+  {
+    public sealed class BindingTypeEnum : StringEnum
+    {
+      private BindingTypeEnum(string value) : base(value) { }
+      public BindingTypeEnum() { }
+      public static implicit operator BindingTypeEnum(string value)
+      {
+        return new BindingTypeEnum(value);
+      }
+
+      public static readonly BindingTypeEnum Apn = new BindingTypeEnum("apn");
+      public static readonly BindingTypeEnum Gcm = new BindingTypeEnum("gcm");
+      public static readonly BindingTypeEnum Sms = new BindingTypeEnum("sms");
+      public static readonly BindingTypeEnum Fcm = new BindingTypeEnum("fcm");
+      public static readonly BindingTypeEnum FacebookMessenger = new BindingTypeEnum("facebook-messenger");
+      public static readonly BindingTypeEnum Alexa = new BindingTypeEnum("alexa");
+    }
+
+    private static Request BuildFetchRequest(FetchBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Notify,
+          "/v1/Services/" + options.PathServiceSid + "/Bindings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static BindingResource Fetch(FetchBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(FetchBindingOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static BindingResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchBindingOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<BindingResource> FetchAsync(string pathServiceSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchBindingOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Notify,
+          "/v1/Services/" + options.PathServiceSid + "/Bindings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static bool Delete(DeleteBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBindingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteBindingOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteBindingOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Notify,
+          "/v1/Services/" + options.PathServiceSid + "/Bindings",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static BindingResource Create(CreateBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<BindingResource> CreateAsync(CreateBindingOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="bindingType"> The type of the Binding </param>
+    /// <param name="address"> The channel-specific address </param>
+    /// <param name="tag"> A tag that can be used to select the Bindings to notify </param>
+    /// <param name="notificationProtocolVersion"> The protocol version to use to send the notification </param>
+    /// <param name="credentialSid"> The SID of the Credential resource to be used to send notifications to this Binding
+    ///                     </param>
+    /// <param name="endpoint"> Deprecated </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static BindingResource Create(string pathServiceSid,
+                                         string identity,
+                                         BindingResource.BindingTypeEnum bindingType,
+                                         string address,
+                                         List<string> tag = null,
+                                         string notificationProtocolVersion = null,
+                                         string credentialSid = null,
+                                         string endpoint = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateBindingOptions(pathServiceSid, identity, bindingType, address) { Tag = tag, NotificationProtocolVersion = notificationProtocolVersion, CredentialSid = credentialSid, Endpoint = endpoint };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="bindingType"> The type of the Binding </param>
+    /// <param name="address"> The channel-specific address </param>
+    /// <param name="tag"> A tag that can be used to select the Bindings to notify </param>
+    /// <param name="notificationProtocolVersion"> The protocol version to use to send the notification </param>
+    /// <param name="credentialSid"> The SID of the Credential resource to be used to send notifications to this Binding
+    ///                     </param>
+    /// <param name="endpoint"> Deprecated </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<BindingResource> CreateAsync(string pathServiceSid,
+                                                                                 string identity,
+                                                                                 BindingResource.BindingTypeEnum bindingType,
+                                                                                 string address,
+                                                                                 List<string> tag = null,
+                                                                                 string notificationProtocolVersion = null,
+                                                                                 string credentialSid = null,
+                                                                                 string endpoint = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateBindingOptions(pathServiceSid, identity, bindingType, address) { Tag = tag, NotificationProtocolVersion = notificationProtocolVersion, CredentialSid = credentialSid, Endpoint = endpoint };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadBindingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Notify,
+          "/v1/Services/" + options.PathServiceSid + "/Bindings",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static ResourceSet<BindingResource> Read(ReadBindingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<BindingResource>.FromJson("bindings", response.Content);
+      return new ResourceSet<BindingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Binding parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(ReadBindingOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<BindingResource>.FromJson("bindings", response.Content);
+      return new ResourceSet<BindingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="identity"> The `identity` value of the resources to read </param>
+    /// <param name="tag"> Only list Bindings that have all of the specified Tags </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Binding </returns>
+    public static ResourceSet<BindingResource> Read(string pathServiceSid,
+                                                    DateTime? startDate = null,
+                                                    DateTime? endDate = null,
+                                                    List<string> identity = null,
+                                                    List<string> tag = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadBindingOptions(pathServiceSid) { StartDate = startDate, EndDate = endDate, Identity = identity, Tag = tag, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
+    /// <param name="startDate"> Only include usage that has occurred on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="identity"> The `identity` value of the resources to read </param>
+    /// <param name="tag"> Only list Bindings that have all of the specified Tags </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Binding </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BindingResource>> ReadAsync(string pathServiceSid,
+                                                                                            DateTime? startDate = null,
+                                                                                            DateTime? endDate = null,
+                                                                                            List<string> identity = null,
+                                                                                            List<string> tag = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadBindingOptions(pathServiceSid) { StartDate = startDate, EndDate = endDate, Identity = identity, Tag = tag, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<BindingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<BindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<BindingResource> NextPage(Page<BindingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Notify)
+      );
+
+      var response = client.Request(request);
+      return Page<BindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<BindingResource> PreviousPage(Page<BindingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Notify)
+      );
+
+      var response = client.Request(request);
+      return Page<BindingResource>.FromJson("bindings", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a BindingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BindingResource object represented by the provided JSON </returns>
+    public static BindingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BindingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Credential resource to be used to send notifications to this Binding
+    /// </summary>
+    [JsonProperty("credential_sid")]
+    public string CredentialSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The protocol version to use to send the notification
+    /// </summary>
+    [JsonProperty("notification_protocol_version")]
+    public string NotificationProtocolVersion { get; private set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    [JsonProperty("endpoint")]
+    public string Endpoint { get; private set; }
+    /// <summary>
+    /// The `identity` value that identifies the new resource's User
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The type of the Binding
+    /// </summary>
+    [JsonProperty("binding_type")]
+    public string BindingType { get; private set; }
+    /// <summary>
+    /// The channel-specific address
+    /// </summary>
+    [JsonProperty("address")]
+    public string Address { get; private set; }
+    /// <summary>
+    /// The list of tags associated with this Binding
+    /// </summary>
+    [JsonProperty("tags")]
+    public List<string> Tags { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Binding resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private BindingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Notify/V1/Service/NotificationOptions.cs b/src/Twilio/Rest/Notify/V1/Service/NotificationOptions.cs
index a9b22f596..03d86ebe9 100644
--- a/src/Twilio/Rest/Notify/V1/Service/NotificationOptions.cs
+++ b/src/Twilio/Rest/Notify/V1/Service/NotificationOptions.cs
@@ -10,203 +10,203 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Notify.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// CreateNotificationOptions
+  /// </summary>
+  public class CreateNotificationOptions : IOptions<NotificationResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// CreateNotificationOptions
-    /// </summary>
-    public class CreateNotificationOptions : IOptions<NotificationResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The `identity` value that identifies the new resource's User
-        /// </summary>
-        public List<string> Identity { get; set; }
-        /// <summary>
-        /// A tag that selects the Bindings to notify
-        /// </summary>
-        public List<string> Tag { get; set; }
-        /// <summary>
-        /// The notification body text
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        /// The priority of the notification
-        /// </summary>
-        public NotificationResource.PriorityEnum Priority { get; set; }
-        /// <summary>
-        /// How long, in seconds, the notification is valid
-        /// </summary>
-        public int? Ttl { get; set; }
-        /// <summary>
-        /// The notification title
-        /// </summary>
-        public string Title { get; set; }
-        /// <summary>
-        /// The name of the sound to be played for the notification
-        /// </summary>
-        public string Sound { get; set; }
-        /// <summary>
-        /// The actions to display for the notification
-        /// </summary>
-        public string Action { get; set; }
-        /// <summary>
-        /// The custom key-value pairs of the notification's payload
-        /// </summary>
-        public object Data { get; set; }
-        /// <summary>
-        /// The APNS-specific payload that overrides corresponding attributes in a generic payload for APNS Bindings
-        /// </summary>
-        public object Apn { get; set; }
-        /// <summary>
-        /// The GCM-specific payload that overrides corresponding attributes in generic payload for GCM Bindings
-        /// </summary>
-        public object Gcm { get; set; }
-        /// <summary>
-        /// The SMS-specific payload that overrides corresponding attributes in generic payload for SMS Bindings
-        /// </summary>
-        public object Sms { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public object FacebookMessenger { get; set; }
-        /// <summary>
-        /// The FCM-specific payload that overrides corresponding attributes in generic payload for FCM Bindings
-        /// </summary>
-        public object Fcm { get; set; }
-        /// <summary>
-        /// A Segment to notify
-        /// </summary>
-        public List<string> Segment { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public object Alexa { get; set; }
-        /// <summary>
-        /// The destination address specified as a JSON string
-        /// </summary>
-        public List<string> ToBinding { get; set; }
-        /// <summary>
-        /// URL to send webhooks
-        /// </summary>
-        public string DeliveryCallbackUrl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateNotificationOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        public CreateNotificationOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-            Identity = new List<string>();
-            Tag = new List<string>();
-            Segment = new List<string>();
-            ToBinding = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
-            }
-
-            if (Tag != null)
-            {
-                p.AddRange(Tag.Select(prop => new KeyValuePair<string, string>("Tag", prop)));
-            }
-
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (Priority != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
-            }
-
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            if (Title != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Title", Title));
-            }
-
-            if (Sound != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sound", Sound));
-            }
-
-            if (Action != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Action", Action));
-            }
-
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            if (Apn != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Apn", Serializers.JsonObject(Apn)));
-            }
-
-            if (Gcm != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Gcm", Serializers.JsonObject(Gcm)));
-            }
-
-            if (Sms != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sms", Serializers.JsonObject(Sms)));
-            }
-
-            if (FacebookMessenger != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FacebookMessenger", Serializers.JsonObject(FacebookMessenger)));
-            }
-
-            if (Fcm != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Fcm", Serializers.JsonObject(Fcm)));
-            }
-
-            if (Segment != null)
-            {
-                p.AddRange(Segment.Select(prop => new KeyValuePair<string, string>("Segment", prop)));
-            }
-
-            if (Alexa != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Alexa", Serializers.JsonObject(Alexa)));
-            }
-
-            if (ToBinding != null)
-            {
-                p.AddRange(ToBinding.Select(prop => new KeyValuePair<string, string>("ToBinding", prop)));
-            }
-
-            if (DeliveryCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeliveryCallbackUrl", DeliveryCallbackUrl));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The `identity` value that identifies the new resource's User
+    /// </summary>
+    public List<string> Identity { get; set; }
+    /// <summary>
+    /// A tag that selects the Bindings to notify
+    /// </summary>
+    public List<string> Tag { get; set; }
+    /// <summary>
+    /// The notification body text
+    /// </summary>
+    public string Body { get; set; }
+    /// <summary>
+    /// The priority of the notification
+    /// </summary>
+    public NotificationResource.PriorityEnum Priority { get; set; }
+    /// <summary>
+    /// How long, in seconds, the notification is valid
+    /// </summary>
+    public int? Ttl { get; set; }
+    /// <summary>
+    /// The notification title
+    /// </summary>
+    public string Title { get; set; }
+    /// <summary>
+    /// The name of the sound to be played for the notification
+    /// </summary>
+    public string Sound { get; set; }
+    /// <summary>
+    /// The actions to display for the notification
+    /// </summary>
+    public string Action { get; set; }
+    /// <summary>
+    /// The custom key-value pairs of the notification's payload
+    /// </summary>
+    public object Data { get; set; }
+    /// <summary>
+    /// The APNS-specific payload that overrides corresponding attributes in a generic payload for APNS Bindings
+    /// </summary>
+    public object Apn { get; set; }
+    /// <summary>
+    /// The GCM-specific payload that overrides corresponding attributes in generic payload for GCM Bindings
+    /// </summary>
+    public object Gcm { get; set; }
+    /// <summary>
+    /// The SMS-specific payload that overrides corresponding attributes in generic payload for SMS Bindings
+    /// </summary>
+    public object Sms { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public object FacebookMessenger { get; set; }
+    /// <summary>
+    /// The FCM-specific payload that overrides corresponding attributes in generic payload for FCM Bindings
+    /// </summary>
+    public object Fcm { get; set; }
+    /// <summary>
+    /// A Segment to notify
+    /// </summary>
+    public List<string> Segment { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public object Alexa { get; set; }
+    /// <summary>
+    /// The destination address specified as a JSON string
+    /// </summary>
+    public List<string> ToBinding { get; set; }
+    /// <summary>
+    /// URL to send webhooks
+    /// </summary>
+    public string DeliveryCallbackUrl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateNotificationOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    public CreateNotificationOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+      Identity = new List<string>();
+      Tag = new List<string>();
+      Segment = new List<string>();
+      ToBinding = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.AddRange(Identity.Select(prop => new KeyValuePair<string, string>("Identity", prop)));
+      }
+
+      if (Tag != null)
+      {
+        p.AddRange(Tag.Select(prop => new KeyValuePair<string, string>("Tag", prop)));
+      }
+
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (Priority != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
+      }
+
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      if (Title != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Title", Title));
+      }
+
+      if (Sound != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sound", Sound));
+      }
+
+      if (Action != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Action", Action));
+      }
+
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      if (Apn != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Apn", Serializers.JsonObject(Apn)));
+      }
+
+      if (Gcm != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Gcm", Serializers.JsonObject(Gcm)));
+      }
+
+      if (Sms != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sms", Serializers.JsonObject(Sms)));
+      }
+
+      if (FacebookMessenger != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FacebookMessenger", Serializers.JsonObject(FacebookMessenger)));
+      }
+
+      if (Fcm != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Fcm", Serializers.JsonObject(Fcm)));
+      }
+
+      if (Segment != null)
+      {
+        p.AddRange(Segment.Select(prop => new KeyValuePair<string, string>("Segment", prop)));
+      }
+
+      if (Alexa != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Alexa", Serializers.JsonObject(Alexa)));
+      }
+
+      if (ToBinding != null)
+      {
+        p.AddRange(ToBinding.Select(prop => new KeyValuePair<string, string>("ToBinding", prop)));
+      }
+
+      if (DeliveryCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeliveryCallbackUrl", DeliveryCallbackUrl));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Notify/V1/Service/NotificationResource.cs b/src/Twilio/Rest/Notify/V1/Service/NotificationResource.cs
index 9e0941965..32188faa3 100644
--- a/src/Twilio/Rest/Notify/V1/Service/NotificationResource.cs
+++ b/src/Twilio/Rest/Notify/V1/Service/NotificationResource.cs
@@ -19,295 +19,295 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Notify.V1.Service
-{
-
-    public class NotificationResource : Resource
-    {
-        public sealed class PriorityEnum : StringEnum
-        {
-            private PriorityEnum(string value) : base(value) {}
-            public PriorityEnum() {}
-            public static implicit operator PriorityEnum(string value)
-            {
-                return new PriorityEnum(value);
-            }
-
-            public static readonly PriorityEnum High = new PriorityEnum("high");
-            public static readonly PriorityEnum Low = new PriorityEnum("low");
-        }
-
-        private static Request BuildCreateRequest(CreateNotificationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Notify,
-                "/v1/Services/" + options.PathServiceSid + "/Notifications",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static NotificationResource Create(CreateNotificationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<NotificationResource> CreateAsync(CreateNotificationOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="tag"> A tag that selects the Bindings to notify </param>
-        /// <param name="body"> The notification body text </param>
-        /// <param name="priority"> The priority of the notification </param>
-        /// <param name="ttl"> How long, in seconds, the notification is valid </param>
-        /// <param name="title"> The notification title </param>
-        /// <param name="sound"> The name of the sound to be played for the notification </param>
-        /// <param name="action"> The actions to display for the notification </param>
-        /// <param name="data"> The custom key-value pairs of the notification's payload </param>
-        /// <param name="apn"> The APNS-specific payload that overrides corresponding attributes in a generic payload for APNS
-        ///           Bindings </param>
-        /// <param name="gcm"> The GCM-specific payload that overrides corresponding attributes in generic payload for GCM
-        ///           Bindings </param>
-        /// <param name="sms"> The SMS-specific payload that overrides corresponding attributes in generic payload for SMS
-        ///           Bindings </param>
-        /// <param name="facebookMessenger"> Deprecated </param>
-        /// <param name="fcm"> The FCM-specific payload that overrides corresponding attributes in generic payload for FCM
-        ///           Bindings </param>
-        /// <param name="segment"> A Segment to notify </param>
-        /// <param name="alexa"> Deprecated </param>
-        /// <param name="toBinding"> The destination address specified as a JSON string </param>
-        /// <param name="deliveryCallbackUrl"> URL to send webhooks </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static NotificationResource Create(string pathServiceSid,
-                                                  List<string> identity = null,
-                                                  List<string> tag = null,
-                                                  string body = null,
-                                                  NotificationResource.PriorityEnum priority = null,
-                                                  int? ttl = null,
-                                                  string title = null,
-                                                  string sound = null,
-                                                  string action = null,
-                                                  object data = null,
-                                                  object apn = null,
-                                                  object gcm = null,
-                                                  object sms = null,
-                                                  object facebookMessenger = null,
-                                                  object fcm = null,
-                                                  List<string> segment = null,
-                                                  object alexa = null,
-                                                  List<string> toBinding = null,
-                                                  string deliveryCallbackUrl = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateNotificationOptions(pathServiceSid){Identity = identity, Tag = tag, Body = body, Priority = priority, Ttl = ttl, Title = title, Sound = sound, Action = action, Data = data, Apn = apn, Gcm = gcm, Sms = sms, FacebookMessenger = facebookMessenger, Fcm = fcm, Segment = segment, Alexa = alexa, ToBinding = toBinding, DeliveryCallbackUrl = deliveryCallbackUrl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
-        /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
-        /// <param name="tag"> A tag that selects the Bindings to notify </param>
-        /// <param name="body"> The notification body text </param>
-        /// <param name="priority"> The priority of the notification </param>
-        /// <param name="ttl"> How long, in seconds, the notification is valid </param>
-        /// <param name="title"> The notification title </param>
-        /// <param name="sound"> The name of the sound to be played for the notification </param>
-        /// <param name="action"> The actions to display for the notification </param>
-        /// <param name="data"> The custom key-value pairs of the notification's payload </param>
-        /// <param name="apn"> The APNS-specific payload that overrides corresponding attributes in a generic payload for APNS
-        ///           Bindings </param>
-        /// <param name="gcm"> The GCM-specific payload that overrides corresponding attributes in generic payload for GCM
-        ///           Bindings </param>
-        /// <param name="sms"> The SMS-specific payload that overrides corresponding attributes in generic payload for SMS
-        ///           Bindings </param>
-        /// <param name="facebookMessenger"> Deprecated </param>
-        /// <param name="fcm"> The FCM-specific payload that overrides corresponding attributes in generic payload for FCM
-        ///           Bindings </param>
-        /// <param name="segment"> A Segment to notify </param>
-        /// <param name="alexa"> Deprecated </param>
-        /// <param name="toBinding"> The destination address specified as a JSON string </param>
-        /// <param name="deliveryCallbackUrl"> URL to send webhooks </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<NotificationResource> CreateAsync(string pathServiceSid,
-                                                                                          List<string> identity = null,
-                                                                                          List<string> tag = null,
-                                                                                          string body = null,
-                                                                                          NotificationResource.PriorityEnum priority = null,
-                                                                                          int? ttl = null,
-                                                                                          string title = null,
-                                                                                          string sound = null,
-                                                                                          string action = null,
-                                                                                          object data = null,
-                                                                                          object apn = null,
-                                                                                          object gcm = null,
-                                                                                          object sms = null,
-                                                                                          object facebookMessenger = null,
-                                                                                          object fcm = null,
-                                                                                          List<string> segment = null,
-                                                                                          object alexa = null,
-                                                                                          List<string> toBinding = null,
-                                                                                          string deliveryCallbackUrl = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateNotificationOptions(pathServiceSid){Identity = identity, Tag = tag, Body = body, Priority = priority, Ttl = ttl, Title = title, Sound = sound, Action = action, Data = data, Apn = apn, Gcm = gcm, Sms = sms, FacebookMessenger = facebookMessenger, Fcm = fcm, Segment = segment, Alexa = alexa, ToBinding = toBinding, DeliveryCallbackUrl = deliveryCallbackUrl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a NotificationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NotificationResource object represented by the provided JSON </returns>
-        public static NotificationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NotificationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The list of identity values of the Users to notify
-        /// </summary>
-        [JsonProperty("identities")]
-        public List<string> Identities { get; private set; }
-        /// <summary>
-        /// The tags that select the Bindings to notify
-        /// </summary>
-        [JsonProperty("tags")]
-        public List<string> Tags { get; private set; }
-        /// <summary>
-        /// The list of Segments to notify
-        /// </summary>
-        [JsonProperty("segments")]
-        public List<string> Segments { get; private set; }
-        /// <summary>
-        /// The priority of the notification
-        /// </summary>
-        [JsonProperty("priority")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public NotificationResource.PriorityEnum Priority { get; private set; }
-        /// <summary>
-        /// How long, in seconds, the notification is valid
-        /// </summary>
-        [JsonProperty("ttl")]
-        public int? Ttl { get; private set; }
-        /// <summary>
-        /// The notification title
-        /// </summary>
-        [JsonProperty("title")]
-        public string Title { get; private set; }
-        /// <summary>
-        /// The notification body text
-        /// </summary>
-        [JsonProperty("body")]
-        public string Body { get; private set; }
-        /// <summary>
-        /// The name of the sound to be played for the notification
-        /// </summary>
-        [JsonProperty("sound")]
-        public string Sound { get; private set; }
-        /// <summary>
-        /// The actions to display for the notification
-        /// </summary>
-        [JsonProperty("action")]
-        public string Action { get; private set; }
-        /// <summary>
-        /// The custom key-value pairs of the notification's payload
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-        /// <summary>
-        /// The APNS-specific payload that overrides corresponding attributes in a generic payload for APNS Bindings
-        /// </summary>
-        [JsonProperty("apn")]
-        public object Apn { get; private set; }
-        /// <summary>
-        /// The GCM-specific payload that overrides corresponding attributes in generic payload for GCM Bindings
-        /// </summary>
-        [JsonProperty("gcm")]
-        public object Gcm { get; private set; }
-        /// <summary>
-        /// The FCM-specific payload that overrides corresponding attributes in generic payload for FCM Bindings
-        /// </summary>
-        [JsonProperty("fcm")]
-        public object Fcm { get; private set; }
-        /// <summary>
-        /// The SMS-specific payload that overrides corresponding attributes in generic payload for SMS Bindings
-        /// </summary>
-        [JsonProperty("sms")]
-        public object Sms { get; private set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        [JsonProperty("facebook_messenger")]
-        public object FacebookMessenger { get; private set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        [JsonProperty("alexa")]
-        public object Alexa { get; private set; }
-
-        private NotificationResource()
-        {
-
-        }
-    }
+{
+
+  public class NotificationResource : Resource
+  {
+    public sealed class PriorityEnum : StringEnum
+    {
+      private PriorityEnum(string value) : base(value) { }
+      public PriorityEnum() { }
+      public static implicit operator PriorityEnum(string value)
+      {
+        return new PriorityEnum(value);
+      }
+
+      public static readonly PriorityEnum High = new PriorityEnum("high");
+      public static readonly PriorityEnum Low = new PriorityEnum("low");
+    }
+
+    private static Request BuildCreateRequest(CreateNotificationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Notify,
+          "/v1/Services/" + options.PathServiceSid + "/Notifications",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static NotificationResource Create(CreateNotificationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<NotificationResource> CreateAsync(CreateNotificationOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="tag"> A tag that selects the Bindings to notify </param>
+    /// <param name="body"> The notification body text </param>
+    /// <param name="priority"> The priority of the notification </param>
+    /// <param name="ttl"> How long, in seconds, the notification is valid </param>
+    /// <param name="title"> The notification title </param>
+    /// <param name="sound"> The name of the sound to be played for the notification </param>
+    /// <param name="action"> The actions to display for the notification </param>
+    /// <param name="data"> The custom key-value pairs of the notification's payload </param>
+    /// <param name="apn"> The APNS-specific payload that overrides corresponding attributes in a generic payload for APNS
+    ///           Bindings </param>
+    /// <param name="gcm"> The GCM-specific payload that overrides corresponding attributes in generic payload for GCM
+    ///           Bindings </param>
+    /// <param name="sms"> The SMS-specific payload that overrides corresponding attributes in generic payload for SMS
+    ///           Bindings </param>
+    /// <param name="facebookMessenger"> Deprecated </param>
+    /// <param name="fcm"> The FCM-specific payload that overrides corresponding attributes in generic payload for FCM
+    ///           Bindings </param>
+    /// <param name="segment"> A Segment to notify </param>
+    /// <param name="alexa"> Deprecated </param>
+    /// <param name="toBinding"> The destination address specified as a JSON string </param>
+    /// <param name="deliveryCallbackUrl"> URL to send webhooks </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static NotificationResource Create(string pathServiceSid,
+                                              List<string> identity = null,
+                                              List<string> tag = null,
+                                              string body = null,
+                                              NotificationResource.PriorityEnum priority = null,
+                                              int? ttl = null,
+                                              string title = null,
+                                              string sound = null,
+                                              string action = null,
+                                              object data = null,
+                                              object apn = null,
+                                              object gcm = null,
+                                              object sms = null,
+                                              object facebookMessenger = null,
+                                              object fcm = null,
+                                              List<string> segment = null,
+                                              object alexa = null,
+                                              List<string> toBinding = null,
+                                              string deliveryCallbackUrl = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateNotificationOptions(pathServiceSid) { Identity = identity, Tag = tag, Body = body, Priority = priority, Ttl = ttl, Title = title, Sound = sound, Action = action, Data = data, Apn = apn, Gcm = gcm, Sms = sms, FacebookMessenger = facebookMessenger, Fcm = fcm, Segment = segment, Alexa = alexa, ToBinding = toBinding, DeliveryCallbackUrl = deliveryCallbackUrl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the resource under </param>
+    /// <param name="identity"> The `identity` value that identifies the new resource's User </param>
+    /// <param name="tag"> A tag that selects the Bindings to notify </param>
+    /// <param name="body"> The notification body text </param>
+    /// <param name="priority"> The priority of the notification </param>
+    /// <param name="ttl"> How long, in seconds, the notification is valid </param>
+    /// <param name="title"> The notification title </param>
+    /// <param name="sound"> The name of the sound to be played for the notification </param>
+    /// <param name="action"> The actions to display for the notification </param>
+    /// <param name="data"> The custom key-value pairs of the notification's payload </param>
+    /// <param name="apn"> The APNS-specific payload that overrides corresponding attributes in a generic payload for APNS
+    ///           Bindings </param>
+    /// <param name="gcm"> The GCM-specific payload that overrides corresponding attributes in generic payload for GCM
+    ///           Bindings </param>
+    /// <param name="sms"> The SMS-specific payload that overrides corresponding attributes in generic payload for SMS
+    ///           Bindings </param>
+    /// <param name="facebookMessenger"> Deprecated </param>
+    /// <param name="fcm"> The FCM-specific payload that overrides corresponding attributes in generic payload for FCM
+    ///           Bindings </param>
+    /// <param name="segment"> A Segment to notify </param>
+    /// <param name="alexa"> Deprecated </param>
+    /// <param name="toBinding"> The destination address specified as a JSON string </param>
+    /// <param name="deliveryCallbackUrl"> URL to send webhooks </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<NotificationResource> CreateAsync(string pathServiceSid,
+                                                                                      List<string> identity = null,
+                                                                                      List<string> tag = null,
+                                                                                      string body = null,
+                                                                                      NotificationResource.PriorityEnum priority = null,
+                                                                                      int? ttl = null,
+                                                                                      string title = null,
+                                                                                      string sound = null,
+                                                                                      string action = null,
+                                                                                      object data = null,
+                                                                                      object apn = null,
+                                                                                      object gcm = null,
+                                                                                      object sms = null,
+                                                                                      object facebookMessenger = null,
+                                                                                      object fcm = null,
+                                                                                      List<string> segment = null,
+                                                                                      object alexa = null,
+                                                                                      List<string> toBinding = null,
+                                                                                      string deliveryCallbackUrl = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateNotificationOptions(pathServiceSid) { Identity = identity, Tag = tag, Body = body, Priority = priority, Ttl = ttl, Title = title, Sound = sound, Action = action, Data = data, Apn = apn, Gcm = gcm, Sms = sms, FacebookMessenger = facebookMessenger, Fcm = fcm, Segment = segment, Alexa = alexa, ToBinding = toBinding, DeliveryCallbackUrl = deliveryCallbackUrl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a NotificationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NotificationResource object represented by the provided JSON </returns>
+    public static NotificationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NotificationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The list of identity values of the Users to notify
+    /// </summary>
+    [JsonProperty("identities")]
+    public List<string> Identities { get; private set; }
+    /// <summary>
+    /// The tags that select the Bindings to notify
+    /// </summary>
+    [JsonProperty("tags")]
+    public List<string> Tags { get; private set; }
+    /// <summary>
+    /// The list of Segments to notify
+    /// </summary>
+    [JsonProperty("segments")]
+    public List<string> Segments { get; private set; }
+    /// <summary>
+    /// The priority of the notification
+    /// </summary>
+    [JsonProperty("priority")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public NotificationResource.PriorityEnum Priority { get; private set; }
+    /// <summary>
+    /// How long, in seconds, the notification is valid
+    /// </summary>
+    [JsonProperty("ttl")]
+    public int? Ttl { get; private set; }
+    /// <summary>
+    /// The notification title
+    /// </summary>
+    [JsonProperty("title")]
+    public string Title { get; private set; }
+    /// <summary>
+    /// The notification body text
+    /// </summary>
+    [JsonProperty("body")]
+    public string Body { get; private set; }
+    /// <summary>
+    /// The name of the sound to be played for the notification
+    /// </summary>
+    [JsonProperty("sound")]
+    public string Sound { get; private set; }
+    /// <summary>
+    /// The actions to display for the notification
+    /// </summary>
+    [JsonProperty("action")]
+    public string Action { get; private set; }
+    /// <summary>
+    /// The custom key-value pairs of the notification's payload
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+    /// <summary>
+    /// The APNS-specific payload that overrides corresponding attributes in a generic payload for APNS Bindings
+    /// </summary>
+    [JsonProperty("apn")]
+    public object Apn { get; private set; }
+    /// <summary>
+    /// The GCM-specific payload that overrides corresponding attributes in generic payload for GCM Bindings
+    /// </summary>
+    [JsonProperty("gcm")]
+    public object Gcm { get; private set; }
+    /// <summary>
+    /// The FCM-specific payload that overrides corresponding attributes in generic payload for FCM Bindings
+    /// </summary>
+    [JsonProperty("fcm")]
+    public object Fcm { get; private set; }
+    /// <summary>
+    /// The SMS-specific payload that overrides corresponding attributes in generic payload for SMS Bindings
+    /// </summary>
+    [JsonProperty("sms")]
+    public object Sms { get; private set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    [JsonProperty("facebook_messenger")]
+    public object FacebookMessenger { get; private set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    [JsonProperty("alexa")]
+    public object Alexa { get; private set; }
+
+    private NotificationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Notify/V1/ServiceOptions.cs b/src/Twilio/Rest/Notify/V1/ServiceOptions.cs
index 765faec1a..504ca6e4e 100644
--- a/src/Twilio/Rest/Notify/V1/ServiceOptions.cs
+++ b/src/Twilio/Rest/Notify/V1/ServiceOptions.cs
@@ -9,401 +9,401 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Notify.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// CreateServiceOptions
+  /// </summary>
+  public class CreateServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// CreateServiceOptions
-    /// </summary>
-    public class CreateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The SID of the Credential to use for APN Bindings
-        /// </summary>
-        public string ApnCredentialSid { get; set; }
-        /// <summary>
-        /// The SID of the Credential to use for GCM Bindings
-        /// </summary>
-        public string GcmCredentialSid { get; set; }
-        /// <summary>
-        /// The SID of the Messaging Service to use for SMS Bindings
-        /// </summary>
-        public string MessagingServiceSid { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public string FacebookMessengerPageId { get; set; }
-        /// <summary>
-        /// The protocol version to use for sending APNS notifications
-        /// </summary>
-        public string DefaultApnNotificationProtocolVersion { get; set; }
-        /// <summary>
-        /// The protocol version to use for sending GCM notifications
-        /// </summary>
-        public string DefaultGcmNotificationProtocolVersion { get; set; }
-        /// <summary>
-        /// The SID of the Credential to use for FCM Bindings
-        /// </summary>
-        public string FcmCredentialSid { get; set; }
-        /// <summary>
-        /// The protocol version to use for sending FCM notifications
-        /// </summary>
-        public string DefaultFcmNotificationProtocolVersion { get; set; }
-        /// <summary>
-        /// Whether to log notifications
-        /// </summary>
-        public bool? LogEnabled { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public string AlexaSkillId { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public string DefaultAlexaNotificationProtocolVersion { get; set; }
-        /// <summary>
-        /// Webhook URL
-        /// </summary>
-        public string DeliveryCallbackUrl { get; set; }
-        /// <summary>
-        /// Enable delivery callbacks
-        /// </summary>
-        public bool? DeliveryCallbackEnabled { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (ApnCredentialSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApnCredentialSid", ApnCredentialSid.ToString()));
-            }
-
-            if (GcmCredentialSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("GcmCredentialSid", GcmCredentialSid.ToString()));
-            }
-
-            if (MessagingServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
-            }
-
-            if (FacebookMessengerPageId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FacebookMessengerPageId", FacebookMessengerPageId));
-            }
-
-            if (DefaultApnNotificationProtocolVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultApnNotificationProtocolVersion", DefaultApnNotificationProtocolVersion));
-            }
-
-            if (DefaultGcmNotificationProtocolVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultGcmNotificationProtocolVersion", DefaultGcmNotificationProtocolVersion));
-            }
-
-            if (FcmCredentialSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FcmCredentialSid", FcmCredentialSid.ToString()));
-            }
-
-            if (DefaultFcmNotificationProtocolVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultFcmNotificationProtocolVersion", DefaultFcmNotificationProtocolVersion));
-            }
-
-            if (LogEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LogEnabled", LogEnabled.Value.ToString().ToLower()));
-            }
-
-            if (AlexaSkillId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AlexaSkillId", AlexaSkillId));
-            }
-
-            if (DefaultAlexaNotificationProtocolVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultAlexaNotificationProtocolVersion", DefaultAlexaNotificationProtocolVersion));
-            }
-
-            if (DeliveryCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeliveryCallbackUrl", DeliveryCallbackUrl));
-            }
-
-            if (DeliveryCallbackEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeliveryCallbackEnabled", DeliveryCallbackEnabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// DeleteServiceOptions
+    /// The SID of the Credential to use for APN Bindings
     /// </summary>
-    public class DeleteServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string ApnCredentialSid { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// FetchServiceOptions
+    /// The SID of the Credential to use for GCM Bindings
     /// </summary>
-    public class FetchServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string GcmCredentialSid { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// ReadServiceOptions
+    /// The SID of the Messaging Service to use for SMS Bindings
     /// </summary>
-    public class ReadServiceOptions : ReadOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The string that identifies the Service resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string MessagingServiceSid { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// UpdateServiceOptions
-    /// </summary>
-    public class UpdateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The SID of the Credential to use for APN Bindings
-        /// </summary>
-        public string ApnCredentialSid { get; set; }
-        /// <summary>
-        /// The SID of the Credential to use for GCM Bindings
-        /// </summary>
-        public string GcmCredentialSid { get; set; }
-        /// <summary>
-        /// The SID of the Messaging Service to use for SMS Bindings
-        /// </summary>
-        public string MessagingServiceSid { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public string FacebookMessengerPageId { get; set; }
-        /// <summary>
-        /// The protocol version to use for sending APNS notifications
-        /// </summary>
-        public string DefaultApnNotificationProtocolVersion { get; set; }
-        /// <summary>
-        /// The protocol version to use for sending GCM notifications
-        /// </summary>
-        public string DefaultGcmNotificationProtocolVersion { get; set; }
-        /// <summary>
-        /// The SID of the Credential to use for FCM Bindings
-        /// </summary>
-        public string FcmCredentialSid { get; set; }
-        /// <summary>
-        /// The protocol version to use for sending FCM notifications
-        /// </summary>
-        public string DefaultFcmNotificationProtocolVersion { get; set; }
-        /// <summary>
-        /// Whether to log notifications
-        /// </summary>
-        public bool? LogEnabled { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public string AlexaSkillId { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public string DefaultAlexaNotificationProtocolVersion { get; set; }
-        /// <summary>
-        /// Webhook URL
-        /// </summary>
-        public string DeliveryCallbackUrl { get; set; }
-        /// <summary>
-        /// Enable delivery callbacks
-        /// </summary>
-        public bool? DeliveryCallbackEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (ApnCredentialSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ApnCredentialSid", ApnCredentialSid.ToString()));
-            }
-
-            if (GcmCredentialSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("GcmCredentialSid", GcmCredentialSid.ToString()));
-            }
-
-            if (MessagingServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
-            }
-
-            if (FacebookMessengerPageId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FacebookMessengerPageId", FacebookMessengerPageId));
-            }
-
-            if (DefaultApnNotificationProtocolVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultApnNotificationProtocolVersion", DefaultApnNotificationProtocolVersion));
-            }
-
-            if (DefaultGcmNotificationProtocolVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultGcmNotificationProtocolVersion", DefaultGcmNotificationProtocolVersion));
-            }
-
-            if (FcmCredentialSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FcmCredentialSid", FcmCredentialSid.ToString()));
-            }
-
-            if (DefaultFcmNotificationProtocolVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultFcmNotificationProtocolVersion", DefaultFcmNotificationProtocolVersion));
-            }
-
-            if (LogEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LogEnabled", LogEnabled.Value.ToString().ToLower()));
-            }
-
-            if (AlexaSkillId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AlexaSkillId", AlexaSkillId));
-            }
-
-            if (DefaultAlexaNotificationProtocolVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultAlexaNotificationProtocolVersion", DefaultAlexaNotificationProtocolVersion));
-            }
-
-            if (DeliveryCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeliveryCallbackUrl", DeliveryCallbackUrl));
-            }
-
-            if (DeliveryCallbackEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeliveryCallbackEnabled", DeliveryCallbackEnabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// Deprecated
+    /// </summary>
+    public string FacebookMessengerPageId { get; set; }
+    /// <summary>
+    /// The protocol version to use for sending APNS notifications
+    /// </summary>
+    public string DefaultApnNotificationProtocolVersion { get; set; }
+    /// <summary>
+    /// The protocol version to use for sending GCM notifications
+    /// </summary>
+    public string DefaultGcmNotificationProtocolVersion { get; set; }
+    /// <summary>
+    /// The SID of the Credential to use for FCM Bindings
+    /// </summary>
+    public string FcmCredentialSid { get; set; }
+    /// <summary>
+    /// The protocol version to use for sending FCM notifications
+    /// </summary>
+    public string DefaultFcmNotificationProtocolVersion { get; set; }
+    /// <summary>
+    /// Whether to log notifications
+    /// </summary>
+    public bool? LogEnabled { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public string AlexaSkillId { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public string DefaultAlexaNotificationProtocolVersion { get; set; }
+    /// <summary>
+    /// Webhook URL
+    /// </summary>
+    public string DeliveryCallbackUrl { get; set; }
+    /// <summary>
+    /// Enable delivery callbacks
+    /// </summary>
+    public bool? DeliveryCallbackEnabled { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (ApnCredentialSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApnCredentialSid", ApnCredentialSid.ToString()));
+      }
+
+      if (GcmCredentialSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("GcmCredentialSid", GcmCredentialSid.ToString()));
+      }
+
+      if (MessagingServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
+      }
+
+      if (FacebookMessengerPageId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FacebookMessengerPageId", FacebookMessengerPageId));
+      }
+
+      if (DefaultApnNotificationProtocolVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultApnNotificationProtocolVersion", DefaultApnNotificationProtocolVersion));
+      }
+
+      if (DefaultGcmNotificationProtocolVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultGcmNotificationProtocolVersion", DefaultGcmNotificationProtocolVersion));
+      }
+
+      if (FcmCredentialSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FcmCredentialSid", FcmCredentialSid.ToString()));
+      }
+
+      if (DefaultFcmNotificationProtocolVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultFcmNotificationProtocolVersion", DefaultFcmNotificationProtocolVersion));
+      }
+
+      if (LogEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LogEnabled", LogEnabled.Value.ToString().ToLower()));
+      }
+
+      if (AlexaSkillId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AlexaSkillId", AlexaSkillId));
+      }
+
+      if (DefaultAlexaNotificationProtocolVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultAlexaNotificationProtocolVersion", DefaultAlexaNotificationProtocolVersion));
+      }
+
+      if (DeliveryCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeliveryCallbackUrl", DeliveryCallbackUrl));
+      }
+
+      if (DeliveryCallbackEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeliveryCallbackEnabled", DeliveryCallbackEnabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// DeleteServiceOptions
+  /// </summary>
+  public class DeleteServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// FetchServiceOptions
+  /// </summary>
+  public class FetchServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// ReadServiceOptions
+  /// </summary>
+  public class ReadServiceOptions : ReadOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The string that identifies the Service resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// UpdateServiceOptions
+  /// </summary>
+  public class UpdateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The SID of the Credential to use for APN Bindings
+    /// </summary>
+    public string ApnCredentialSid { get; set; }
+    /// <summary>
+    /// The SID of the Credential to use for GCM Bindings
+    /// </summary>
+    public string GcmCredentialSid { get; set; }
+    /// <summary>
+    /// The SID of the Messaging Service to use for SMS Bindings
+    /// </summary>
+    public string MessagingServiceSid { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public string FacebookMessengerPageId { get; set; }
+    /// <summary>
+    /// The protocol version to use for sending APNS notifications
+    /// </summary>
+    public string DefaultApnNotificationProtocolVersion { get; set; }
+    /// <summary>
+    /// The protocol version to use for sending GCM notifications
+    /// </summary>
+    public string DefaultGcmNotificationProtocolVersion { get; set; }
+    /// <summary>
+    /// The SID of the Credential to use for FCM Bindings
+    /// </summary>
+    public string FcmCredentialSid { get; set; }
+    /// <summary>
+    /// The protocol version to use for sending FCM notifications
+    /// </summary>
+    public string DefaultFcmNotificationProtocolVersion { get; set; }
+    /// <summary>
+    /// Whether to log notifications
+    /// </summary>
+    public bool? LogEnabled { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public string AlexaSkillId { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public string DefaultAlexaNotificationProtocolVersion { get; set; }
+    /// <summary>
+    /// Webhook URL
+    /// </summary>
+    public string DeliveryCallbackUrl { get; set; }
+    /// <summary>
+    /// Enable delivery callbacks
+    /// </summary>
+    public bool? DeliveryCallbackEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (ApnCredentialSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ApnCredentialSid", ApnCredentialSid.ToString()));
+      }
+
+      if (GcmCredentialSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("GcmCredentialSid", GcmCredentialSid.ToString()));
+      }
+
+      if (MessagingServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
+      }
+
+      if (FacebookMessengerPageId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FacebookMessengerPageId", FacebookMessengerPageId));
+      }
+
+      if (DefaultApnNotificationProtocolVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultApnNotificationProtocolVersion", DefaultApnNotificationProtocolVersion));
+      }
+
+      if (DefaultGcmNotificationProtocolVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultGcmNotificationProtocolVersion", DefaultGcmNotificationProtocolVersion));
+      }
+
+      if (FcmCredentialSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FcmCredentialSid", FcmCredentialSid.ToString()));
+      }
+
+      if (DefaultFcmNotificationProtocolVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultFcmNotificationProtocolVersion", DefaultFcmNotificationProtocolVersion));
+      }
+
+      if (LogEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LogEnabled", LogEnabled.Value.ToString().ToLower()));
+      }
+
+      if (AlexaSkillId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AlexaSkillId", AlexaSkillId));
+      }
+
+      if (DefaultAlexaNotificationProtocolVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultAlexaNotificationProtocolVersion", DefaultAlexaNotificationProtocolVersion));
+      }
+
+      if (DeliveryCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeliveryCallbackUrl", DeliveryCallbackUrl));
+      }
+
+      if (DeliveryCallbackEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeliveryCallbackEnabled", DeliveryCallbackEnabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Notify/V1/ServiceResource.cs b/src/Twilio/Rest/Notify/V1/ServiceResource.cs
index c15fc03d0..d4af7549a 100644
--- a/src/Twilio/Rest/Notify/V1/ServiceResource.cs
+++ b/src/Twilio/Rest/Notify/V1/ServiceResource.cs
@@ -18,655 +18,655 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Notify.V1
-{
-
-    public class ServiceResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Notify,
-                "/v1/Services",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="apnCredentialSid"> The SID of the Credential to use for APN Bindings </param>
-        /// <param name="gcmCredentialSid"> The SID of the Credential to use for GCM Bindings </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service to use for SMS Bindings </param>
-        /// <param name="facebookMessengerPageId"> Deprecated </param>
-        /// <param name="defaultApnNotificationProtocolVersion"> The protocol version to use for sending APNS notifications
-        ///                                             </param>
-        /// <param name="defaultGcmNotificationProtocolVersion"> The protocol version to use for sending GCM notifications
-        ///                                             </param>
-        /// <param name="fcmCredentialSid"> The SID of the Credential to use for FCM Bindings </param>
-        /// <param name="defaultFcmNotificationProtocolVersion"> The protocol version to use for sending FCM notifications
-        ///                                             </param>
-        /// <param name="logEnabled"> Whether to log notifications </param>
-        /// <param name="alexaSkillId"> Deprecated </param>
-        /// <param name="defaultAlexaNotificationProtocolVersion"> Deprecated </param>
-        /// <param name="deliveryCallbackUrl"> Webhook URL </param>
-        /// <param name="deliveryCallbackEnabled"> Enable delivery callbacks </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(string friendlyName = null,
-                                             string apnCredentialSid = null,
-                                             string gcmCredentialSid = null,
-                                             string messagingServiceSid = null,
-                                             string facebookMessengerPageId = null,
-                                             string defaultApnNotificationProtocolVersion = null,
-                                             string defaultGcmNotificationProtocolVersion = null,
-                                             string fcmCredentialSid = null,
-                                             string defaultFcmNotificationProtocolVersion = null,
-                                             bool? logEnabled = null,
-                                             string alexaSkillId = null,
-                                             string defaultAlexaNotificationProtocolVersion = null,
-                                             string deliveryCallbackUrl = null,
-                                             bool? deliveryCallbackEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(){FriendlyName = friendlyName, ApnCredentialSid = apnCredentialSid, GcmCredentialSid = gcmCredentialSid, MessagingServiceSid = messagingServiceSid, FacebookMessengerPageId = facebookMessengerPageId, DefaultApnNotificationProtocolVersion = defaultApnNotificationProtocolVersion, DefaultGcmNotificationProtocolVersion = defaultGcmNotificationProtocolVersion, FcmCredentialSid = fcmCredentialSid, DefaultFcmNotificationProtocolVersion = defaultFcmNotificationProtocolVersion, LogEnabled = logEnabled, AlexaSkillId = alexaSkillId, DefaultAlexaNotificationProtocolVersion = defaultAlexaNotificationProtocolVersion, DeliveryCallbackUrl = deliveryCallbackUrl, DeliveryCallbackEnabled = deliveryCallbackEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="apnCredentialSid"> The SID of the Credential to use for APN Bindings </param>
-        /// <param name="gcmCredentialSid"> The SID of the Credential to use for GCM Bindings </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service to use for SMS Bindings </param>
-        /// <param name="facebookMessengerPageId"> Deprecated </param>
-        /// <param name="defaultApnNotificationProtocolVersion"> The protocol version to use for sending APNS notifications
-        ///                                             </param>
-        /// <param name="defaultGcmNotificationProtocolVersion"> The protocol version to use for sending GCM notifications
-        ///                                             </param>
-        /// <param name="fcmCredentialSid"> The SID of the Credential to use for FCM Bindings </param>
-        /// <param name="defaultFcmNotificationProtocolVersion"> The protocol version to use for sending FCM notifications
-        ///                                             </param>
-        /// <param name="logEnabled"> Whether to log notifications </param>
-        /// <param name="alexaSkillId"> Deprecated </param>
-        /// <param name="defaultAlexaNotificationProtocolVersion"> Deprecated </param>
-        /// <param name="deliveryCallbackUrl"> Webhook URL </param>
-        /// <param name="deliveryCallbackEnabled"> Enable delivery callbacks </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName = null,
-                                                                                     string apnCredentialSid = null,
-                                                                                     string gcmCredentialSid = null,
-                                                                                     string messagingServiceSid = null,
-                                                                                     string facebookMessengerPageId = null,
-                                                                                     string defaultApnNotificationProtocolVersion = null,
-                                                                                     string defaultGcmNotificationProtocolVersion = null,
-                                                                                     string fcmCredentialSid = null,
-                                                                                     string defaultFcmNotificationProtocolVersion = null,
-                                                                                     bool? logEnabled = null,
-                                                                                     string alexaSkillId = null,
-                                                                                     string defaultAlexaNotificationProtocolVersion = null,
-                                                                                     string deliveryCallbackUrl = null,
-                                                                                     bool? deliveryCallbackEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(){FriendlyName = friendlyName, ApnCredentialSid = apnCredentialSid, GcmCredentialSid = gcmCredentialSid, MessagingServiceSid = messagingServiceSid, FacebookMessengerPageId = facebookMessengerPageId, DefaultApnNotificationProtocolVersion = defaultApnNotificationProtocolVersion, DefaultGcmNotificationProtocolVersion = defaultGcmNotificationProtocolVersion, FcmCredentialSid = fcmCredentialSid, DefaultFcmNotificationProtocolVersion = defaultFcmNotificationProtocolVersion, LogEnabled = logEnabled, AlexaSkillId = alexaSkillId, DefaultAlexaNotificationProtocolVersion = defaultAlexaNotificationProtocolVersion, DeliveryCallbackUrl = deliveryCallbackUrl, DeliveryCallbackEnabled = deliveryCallbackEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Notify,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Notify,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Notify,
-                "/v1/Services",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="friendlyName"> The string that identifies the Service resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(string friendlyName = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="friendlyName"> The string that identifies the Service resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(string friendlyName = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Notify)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Notify)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Notify,
-                "/v1/Services/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="apnCredentialSid"> The SID of the Credential to use for APN Bindings </param>
-        /// <param name="gcmCredentialSid"> The SID of the Credential to use for GCM Bindings </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service to use for SMS Bindings </param>
-        /// <param name="facebookMessengerPageId"> Deprecated </param>
-        /// <param name="defaultApnNotificationProtocolVersion"> The protocol version to use for sending APNS notifications
-        ///                                             </param>
-        /// <param name="defaultGcmNotificationProtocolVersion"> The protocol version to use for sending GCM notifications
-        ///                                             </param>
-        /// <param name="fcmCredentialSid"> The SID of the Credential to use for FCM Bindings </param>
-        /// <param name="defaultFcmNotificationProtocolVersion"> The protocol version to use for sending FCM notifications
-        ///                                             </param>
-        /// <param name="logEnabled"> Whether to log notifications </param>
-        /// <param name="alexaSkillId"> Deprecated </param>
-        /// <param name="defaultAlexaNotificationProtocolVersion"> Deprecated </param>
-        /// <param name="deliveryCallbackUrl"> Webhook URL </param>
-        /// <param name="deliveryCallbackEnabled"> Enable delivery callbacks </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(string pathSid,
-                                             string friendlyName = null,
-                                             string apnCredentialSid = null,
-                                             string gcmCredentialSid = null,
-                                             string messagingServiceSid = null,
-                                             string facebookMessengerPageId = null,
-                                             string defaultApnNotificationProtocolVersion = null,
-                                             string defaultGcmNotificationProtocolVersion = null,
-                                             string fcmCredentialSid = null,
-                                             string defaultFcmNotificationProtocolVersion = null,
-                                             bool? logEnabled = null,
-                                             string alexaSkillId = null,
-                                             string defaultAlexaNotificationProtocolVersion = null,
-                                             string deliveryCallbackUrl = null,
-                                             bool? deliveryCallbackEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, ApnCredentialSid = apnCredentialSid, GcmCredentialSid = gcmCredentialSid, MessagingServiceSid = messagingServiceSid, FacebookMessengerPageId = facebookMessengerPageId, DefaultApnNotificationProtocolVersion = defaultApnNotificationProtocolVersion, DefaultGcmNotificationProtocolVersion = defaultGcmNotificationProtocolVersion, FcmCredentialSid = fcmCredentialSid, DefaultFcmNotificationProtocolVersion = defaultFcmNotificationProtocolVersion, LogEnabled = logEnabled, AlexaSkillId = alexaSkillId, DefaultAlexaNotificationProtocolVersion = defaultAlexaNotificationProtocolVersion, DeliveryCallbackUrl = deliveryCallbackUrl, DeliveryCallbackEnabled = deliveryCallbackEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="apnCredentialSid"> The SID of the Credential to use for APN Bindings </param>
-        /// <param name="gcmCredentialSid"> The SID of the Credential to use for GCM Bindings </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service to use for SMS Bindings </param>
-        /// <param name="facebookMessengerPageId"> Deprecated </param>
-        /// <param name="defaultApnNotificationProtocolVersion"> The protocol version to use for sending APNS notifications
-        ///                                             </param>
-        /// <param name="defaultGcmNotificationProtocolVersion"> The protocol version to use for sending GCM notifications
-        ///                                             </param>
-        /// <param name="fcmCredentialSid"> The SID of the Credential to use for FCM Bindings </param>
-        /// <param name="defaultFcmNotificationProtocolVersion"> The protocol version to use for sending FCM notifications
-        ///                                             </param>
-        /// <param name="logEnabled"> Whether to log notifications </param>
-        /// <param name="alexaSkillId"> Deprecated </param>
-        /// <param name="defaultAlexaNotificationProtocolVersion"> Deprecated </param>
-        /// <param name="deliveryCallbackUrl"> Webhook URL </param>
-        /// <param name="deliveryCallbackEnabled"> Enable delivery callbacks </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     string apnCredentialSid = null,
-                                                                                     string gcmCredentialSid = null,
-                                                                                     string messagingServiceSid = null,
-                                                                                     string facebookMessengerPageId = null,
-                                                                                     string defaultApnNotificationProtocolVersion = null,
-                                                                                     string defaultGcmNotificationProtocolVersion = null,
-                                                                                     string fcmCredentialSid = null,
-                                                                                     string defaultFcmNotificationProtocolVersion = null,
-                                                                                     bool? logEnabled = null,
-                                                                                     string alexaSkillId = null,
-                                                                                     string defaultAlexaNotificationProtocolVersion = null,
-                                                                                     string deliveryCallbackUrl = null,
-                                                                                     bool? deliveryCallbackEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, ApnCredentialSid = apnCredentialSid, GcmCredentialSid = gcmCredentialSid, MessagingServiceSid = messagingServiceSid, FacebookMessengerPageId = facebookMessengerPageId, DefaultApnNotificationProtocolVersion = defaultApnNotificationProtocolVersion, DefaultGcmNotificationProtocolVersion = defaultGcmNotificationProtocolVersion, FcmCredentialSid = fcmCredentialSid, DefaultFcmNotificationProtocolVersion = defaultFcmNotificationProtocolVersion, LogEnabled = logEnabled, AlexaSkillId = alexaSkillId, DefaultAlexaNotificationProtocolVersion = defaultAlexaNotificationProtocolVersion, DeliveryCallbackUrl = deliveryCallbackUrl, DeliveryCallbackEnabled = deliveryCallbackEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ServiceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ServiceResource object represented by the provided JSON </returns>
-        public static ServiceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ServiceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The SID of the Credential to use for APN Bindings
-        /// </summary>
-        [JsonProperty("apn_credential_sid")]
-        public string ApnCredentialSid { get; private set; }
-        /// <summary>
-        /// The SID of the Credential to use for GCM Bindings
-        /// </summary>
-        [JsonProperty("gcm_credential_sid")]
-        public string GcmCredentialSid { get; private set; }
-        /// <summary>
-        /// The SID of the Credential to use for FCM Bindings
-        /// </summary>
-        [JsonProperty("fcm_credential_sid")]
-        public string FcmCredentialSid { get; private set; }
-        /// <summary>
-        /// The SID of the Messaging Service to use for SMS Bindings
-        /// </summary>
-        [JsonProperty("messaging_service_sid")]
-        public string MessagingServiceSid { get; private set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        [JsonProperty("facebook_messenger_page_id")]
-        public string FacebookMessengerPageId { get; private set; }
-        /// <summary>
-        /// The protocol version to use for sending APNS notifications
-        /// </summary>
-        [JsonProperty("default_apn_notification_protocol_version")]
-        public string DefaultApnNotificationProtocolVersion { get; private set; }
-        /// <summary>
-        /// The protocol version to use for sending GCM notifications
-        /// </summary>
-        [JsonProperty("default_gcm_notification_protocol_version")]
-        public string DefaultGcmNotificationProtocolVersion { get; private set; }
-        /// <summary>
-        /// The protocol version to use for sending FCM notifications
-        /// </summary>
-        [JsonProperty("default_fcm_notification_protocol_version")]
-        public string DefaultFcmNotificationProtocolVersion { get; private set; }
-        /// <summary>
-        /// Whether to log notifications
-        /// </summary>
-        [JsonProperty("log_enabled")]
-        public bool? LogEnabled { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Service resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of the resources related to the service
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        [JsonProperty("alexa_skill_id")]
-        public string AlexaSkillId { get; private set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        [JsonProperty("default_alexa_notification_protocol_version")]
-        public string DefaultAlexaNotificationProtocolVersion { get; private set; }
-        /// <summary>
-        /// Webhook URL
-        /// </summary>
-        [JsonProperty("delivery_callback_url")]
-        public string DeliveryCallbackUrl { get; private set; }
-        /// <summary>
-        /// Enable delivery callbacks
-        /// </summary>
-        [JsonProperty("delivery_callback_enabled")]
-        public bool? DeliveryCallbackEnabled { get; private set; }
-
-        private ServiceResource()
-        {
-
-        }
-    }
+{
+
+  public class ServiceResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Notify,
+          "/v1/Services",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="apnCredentialSid"> The SID of the Credential to use for APN Bindings </param>
+    /// <param name="gcmCredentialSid"> The SID of the Credential to use for GCM Bindings </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service to use for SMS Bindings </param>
+    /// <param name="facebookMessengerPageId"> Deprecated </param>
+    /// <param name="defaultApnNotificationProtocolVersion"> The protocol version to use for sending APNS notifications
+    ///                                             </param>
+    /// <param name="defaultGcmNotificationProtocolVersion"> The protocol version to use for sending GCM notifications
+    ///                                             </param>
+    /// <param name="fcmCredentialSid"> The SID of the Credential to use for FCM Bindings </param>
+    /// <param name="defaultFcmNotificationProtocolVersion"> The protocol version to use for sending FCM notifications
+    ///                                             </param>
+    /// <param name="logEnabled"> Whether to log notifications </param>
+    /// <param name="alexaSkillId"> Deprecated </param>
+    /// <param name="defaultAlexaNotificationProtocolVersion"> Deprecated </param>
+    /// <param name="deliveryCallbackUrl"> Webhook URL </param>
+    /// <param name="deliveryCallbackEnabled"> Enable delivery callbacks </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(string friendlyName = null,
+                                         string apnCredentialSid = null,
+                                         string gcmCredentialSid = null,
+                                         string messagingServiceSid = null,
+                                         string facebookMessengerPageId = null,
+                                         string defaultApnNotificationProtocolVersion = null,
+                                         string defaultGcmNotificationProtocolVersion = null,
+                                         string fcmCredentialSid = null,
+                                         string defaultFcmNotificationProtocolVersion = null,
+                                         bool? logEnabled = null,
+                                         string alexaSkillId = null,
+                                         string defaultAlexaNotificationProtocolVersion = null,
+                                         string deliveryCallbackUrl = null,
+                                         bool? deliveryCallbackEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions() { FriendlyName = friendlyName, ApnCredentialSid = apnCredentialSid, GcmCredentialSid = gcmCredentialSid, MessagingServiceSid = messagingServiceSid, FacebookMessengerPageId = facebookMessengerPageId, DefaultApnNotificationProtocolVersion = defaultApnNotificationProtocolVersion, DefaultGcmNotificationProtocolVersion = defaultGcmNotificationProtocolVersion, FcmCredentialSid = fcmCredentialSid, DefaultFcmNotificationProtocolVersion = defaultFcmNotificationProtocolVersion, LogEnabled = logEnabled, AlexaSkillId = alexaSkillId, DefaultAlexaNotificationProtocolVersion = defaultAlexaNotificationProtocolVersion, DeliveryCallbackUrl = deliveryCallbackUrl, DeliveryCallbackEnabled = deliveryCallbackEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="apnCredentialSid"> The SID of the Credential to use for APN Bindings </param>
+    /// <param name="gcmCredentialSid"> The SID of the Credential to use for GCM Bindings </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service to use for SMS Bindings </param>
+    /// <param name="facebookMessengerPageId"> Deprecated </param>
+    /// <param name="defaultApnNotificationProtocolVersion"> The protocol version to use for sending APNS notifications
+    ///                                             </param>
+    /// <param name="defaultGcmNotificationProtocolVersion"> The protocol version to use for sending GCM notifications
+    ///                                             </param>
+    /// <param name="fcmCredentialSid"> The SID of the Credential to use for FCM Bindings </param>
+    /// <param name="defaultFcmNotificationProtocolVersion"> The protocol version to use for sending FCM notifications
+    ///                                             </param>
+    /// <param name="logEnabled"> Whether to log notifications </param>
+    /// <param name="alexaSkillId"> Deprecated </param>
+    /// <param name="defaultAlexaNotificationProtocolVersion"> Deprecated </param>
+    /// <param name="deliveryCallbackUrl"> Webhook URL </param>
+    /// <param name="deliveryCallbackEnabled"> Enable delivery callbacks </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName = null,
+                                                                                 string apnCredentialSid = null,
+                                                                                 string gcmCredentialSid = null,
+                                                                                 string messagingServiceSid = null,
+                                                                                 string facebookMessengerPageId = null,
+                                                                                 string defaultApnNotificationProtocolVersion = null,
+                                                                                 string defaultGcmNotificationProtocolVersion = null,
+                                                                                 string fcmCredentialSid = null,
+                                                                                 string defaultFcmNotificationProtocolVersion = null,
+                                                                                 bool? logEnabled = null,
+                                                                                 string alexaSkillId = null,
+                                                                                 string defaultAlexaNotificationProtocolVersion = null,
+                                                                                 string deliveryCallbackUrl = null,
+                                                                                 bool? deliveryCallbackEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions() { FriendlyName = friendlyName, ApnCredentialSid = apnCredentialSid, GcmCredentialSid = gcmCredentialSid, MessagingServiceSid = messagingServiceSid, FacebookMessengerPageId = facebookMessengerPageId, DefaultApnNotificationProtocolVersion = defaultApnNotificationProtocolVersion, DefaultGcmNotificationProtocolVersion = defaultGcmNotificationProtocolVersion, FcmCredentialSid = fcmCredentialSid, DefaultFcmNotificationProtocolVersion = defaultFcmNotificationProtocolVersion, LogEnabled = logEnabled, AlexaSkillId = alexaSkillId, DefaultAlexaNotificationProtocolVersion = defaultAlexaNotificationProtocolVersion, DeliveryCallbackUrl = deliveryCallbackUrl, DeliveryCallbackEnabled = deliveryCallbackEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Notify,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Notify,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Notify,
+          "/v1/Services",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="friendlyName"> The string that identifies the Service resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(string friendlyName = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="friendlyName"> The string that identifies the Service resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(string friendlyName = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Notify)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Notify)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Notify,
+          "/v1/Services/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="apnCredentialSid"> The SID of the Credential to use for APN Bindings </param>
+    /// <param name="gcmCredentialSid"> The SID of the Credential to use for GCM Bindings </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service to use for SMS Bindings </param>
+    /// <param name="facebookMessengerPageId"> Deprecated </param>
+    /// <param name="defaultApnNotificationProtocolVersion"> The protocol version to use for sending APNS notifications
+    ///                                             </param>
+    /// <param name="defaultGcmNotificationProtocolVersion"> The protocol version to use for sending GCM notifications
+    ///                                             </param>
+    /// <param name="fcmCredentialSid"> The SID of the Credential to use for FCM Bindings </param>
+    /// <param name="defaultFcmNotificationProtocolVersion"> The protocol version to use for sending FCM notifications
+    ///                                             </param>
+    /// <param name="logEnabled"> Whether to log notifications </param>
+    /// <param name="alexaSkillId"> Deprecated </param>
+    /// <param name="defaultAlexaNotificationProtocolVersion"> Deprecated </param>
+    /// <param name="deliveryCallbackUrl"> Webhook URL </param>
+    /// <param name="deliveryCallbackEnabled"> Enable delivery callbacks </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(string pathSid,
+                                         string friendlyName = null,
+                                         string apnCredentialSid = null,
+                                         string gcmCredentialSid = null,
+                                         string messagingServiceSid = null,
+                                         string facebookMessengerPageId = null,
+                                         string defaultApnNotificationProtocolVersion = null,
+                                         string defaultGcmNotificationProtocolVersion = null,
+                                         string fcmCredentialSid = null,
+                                         string defaultFcmNotificationProtocolVersion = null,
+                                         bool? logEnabled = null,
+                                         string alexaSkillId = null,
+                                         string defaultAlexaNotificationProtocolVersion = null,
+                                         string deliveryCallbackUrl = null,
+                                         bool? deliveryCallbackEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, ApnCredentialSid = apnCredentialSid, GcmCredentialSid = gcmCredentialSid, MessagingServiceSid = messagingServiceSid, FacebookMessengerPageId = facebookMessengerPageId, DefaultApnNotificationProtocolVersion = defaultApnNotificationProtocolVersion, DefaultGcmNotificationProtocolVersion = defaultGcmNotificationProtocolVersion, FcmCredentialSid = fcmCredentialSid, DefaultFcmNotificationProtocolVersion = defaultFcmNotificationProtocolVersion, LogEnabled = logEnabled, AlexaSkillId = alexaSkillId, DefaultAlexaNotificationProtocolVersion = defaultAlexaNotificationProtocolVersion, DeliveryCallbackUrl = deliveryCallbackUrl, DeliveryCallbackEnabled = deliveryCallbackEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="apnCredentialSid"> The SID of the Credential to use for APN Bindings </param>
+    /// <param name="gcmCredentialSid"> The SID of the Credential to use for GCM Bindings </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service to use for SMS Bindings </param>
+    /// <param name="facebookMessengerPageId"> Deprecated </param>
+    /// <param name="defaultApnNotificationProtocolVersion"> The protocol version to use for sending APNS notifications
+    ///                                             </param>
+    /// <param name="defaultGcmNotificationProtocolVersion"> The protocol version to use for sending GCM notifications
+    ///                                             </param>
+    /// <param name="fcmCredentialSid"> The SID of the Credential to use for FCM Bindings </param>
+    /// <param name="defaultFcmNotificationProtocolVersion"> The protocol version to use for sending FCM notifications
+    ///                                             </param>
+    /// <param name="logEnabled"> Whether to log notifications </param>
+    /// <param name="alexaSkillId"> Deprecated </param>
+    /// <param name="defaultAlexaNotificationProtocolVersion"> Deprecated </param>
+    /// <param name="deliveryCallbackUrl"> Webhook URL </param>
+    /// <param name="deliveryCallbackEnabled"> Enable delivery callbacks </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 string apnCredentialSid = null,
+                                                                                 string gcmCredentialSid = null,
+                                                                                 string messagingServiceSid = null,
+                                                                                 string facebookMessengerPageId = null,
+                                                                                 string defaultApnNotificationProtocolVersion = null,
+                                                                                 string defaultGcmNotificationProtocolVersion = null,
+                                                                                 string fcmCredentialSid = null,
+                                                                                 string defaultFcmNotificationProtocolVersion = null,
+                                                                                 bool? logEnabled = null,
+                                                                                 string alexaSkillId = null,
+                                                                                 string defaultAlexaNotificationProtocolVersion = null,
+                                                                                 string deliveryCallbackUrl = null,
+                                                                                 bool? deliveryCallbackEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, ApnCredentialSid = apnCredentialSid, GcmCredentialSid = gcmCredentialSid, MessagingServiceSid = messagingServiceSid, FacebookMessengerPageId = facebookMessengerPageId, DefaultApnNotificationProtocolVersion = defaultApnNotificationProtocolVersion, DefaultGcmNotificationProtocolVersion = defaultGcmNotificationProtocolVersion, FcmCredentialSid = fcmCredentialSid, DefaultFcmNotificationProtocolVersion = defaultFcmNotificationProtocolVersion, LogEnabled = logEnabled, AlexaSkillId = alexaSkillId, DefaultAlexaNotificationProtocolVersion = defaultAlexaNotificationProtocolVersion, DeliveryCallbackUrl = deliveryCallbackUrl, DeliveryCallbackEnabled = deliveryCallbackEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ServiceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ServiceResource object represented by the provided JSON </returns>
+    public static ServiceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ServiceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The SID of the Credential to use for APN Bindings
+    /// </summary>
+    [JsonProperty("apn_credential_sid")]
+    public string ApnCredentialSid { get; private set; }
+    /// <summary>
+    /// The SID of the Credential to use for GCM Bindings
+    /// </summary>
+    [JsonProperty("gcm_credential_sid")]
+    public string GcmCredentialSid { get; private set; }
+    /// <summary>
+    /// The SID of the Credential to use for FCM Bindings
+    /// </summary>
+    [JsonProperty("fcm_credential_sid")]
+    public string FcmCredentialSid { get; private set; }
+    /// <summary>
+    /// The SID of the Messaging Service to use for SMS Bindings
+    /// </summary>
+    [JsonProperty("messaging_service_sid")]
+    public string MessagingServiceSid { get; private set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    [JsonProperty("facebook_messenger_page_id")]
+    public string FacebookMessengerPageId { get; private set; }
+    /// <summary>
+    /// The protocol version to use for sending APNS notifications
+    /// </summary>
+    [JsonProperty("default_apn_notification_protocol_version")]
+    public string DefaultApnNotificationProtocolVersion { get; private set; }
+    /// <summary>
+    /// The protocol version to use for sending GCM notifications
+    /// </summary>
+    [JsonProperty("default_gcm_notification_protocol_version")]
+    public string DefaultGcmNotificationProtocolVersion { get; private set; }
+    /// <summary>
+    /// The protocol version to use for sending FCM notifications
+    /// </summary>
+    [JsonProperty("default_fcm_notification_protocol_version")]
+    public string DefaultFcmNotificationProtocolVersion { get; private set; }
+    /// <summary>
+    /// Whether to log notifications
+    /// </summary>
+    [JsonProperty("log_enabled")]
+    public bool? LogEnabled { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Service resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of the resources related to the service
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    [JsonProperty("alexa_skill_id")]
+    public string AlexaSkillId { get; private set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    [JsonProperty("default_alexa_notification_protocol_version")]
+    public string DefaultAlexaNotificationProtocolVersion { get; private set; }
+    /// <summary>
+    /// Webhook URL
+    /// </summary>
+    [JsonProperty("delivery_callback_url")]
+    public string DeliveryCallbackUrl { get; private set; }
+    /// <summary>
+    /// Enable delivery callbacks
+    /// </summary>
+    [JsonProperty("delivery_callback_enabled")]
+    public bool? DeliveryCallbackEnabled { get; private set; }
+
+    private ServiceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/BundleCopyOptions.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/BundleCopyOptions.cs
index 2c12a5be5..54cf66c44 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/BundleCopyOptions.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/BundleCopyOptions.cs
@@ -9,47 +9,47 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance.Bundle
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Creates a new copy of a Bundle. It will internally create copies of all the bundle items (identities and documents)
+  /// of the original bundle
+  /// </summary>
+  public class CreateBundleCopyOptions : IOptions<BundleCopyResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Creates a new copy of a Bundle. It will internally create copies of all the bundle items (identities and documents)
-    /// of the original bundle
+    /// The unique string that identifies the Bundle to be copied
     /// </summary>
-    public class CreateBundleCopyOptions : IOptions<BundleCopyResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the Bundle to be copied
-        /// </summary>
-        public string PathBundleSid { get; }
-        /// <summary>
-        /// The string that you assigned to describe the copied bundle
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateBundleCopyOptions
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the Bundle to be copied </param>
-        public CreateBundleCopyOptions(string pathBundleSid)
-        {
-            PathBundleSid = pathBundleSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
+    public string PathBundleSid { get; }
+    /// <summary>
+    /// The string that you assigned to describe the copied bundle
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateBundleCopyOptions
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the Bundle to be copied </param>
+    public CreateBundleCopyOptions(string pathBundleSid)
+    {
+      PathBundleSid = pathBundleSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/BundleCopyResource.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/BundleCopyResource.cs
index 5d742a61d..912e879ac 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/BundleCopyResource.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/BundleCopyResource.cs
@@ -19,190 +19,190 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance.Bundle
-{
-
-    public class BundleCopyResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Draft = new StatusEnum("draft");
-            public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
-            public static readonly StatusEnum InReview = new StatusEnum("in-review");
-            public static readonly StatusEnum TwilioRejected = new StatusEnum("twilio-rejected");
-            public static readonly StatusEnum TwilioApproved = new StatusEnum("twilio-approved");
-            public static readonly StatusEnum ProvisionallyApproved = new StatusEnum("provisionally-approved");
-        }
-
-        public sealed class EndUserTypeEnum : StringEnum
-        {
-            private EndUserTypeEnum(string value) : base(value) {}
-            public EndUserTypeEnum() {}
-            public static implicit operator EndUserTypeEnum(string value)
-            {
-                return new EndUserTypeEnum(value);
-            }
-
-            public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
-            public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
-        }
-
-        private static Request BuildCreateRequest(CreateBundleCopyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/Copies",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Creates a new copy of a Bundle. It will internally create copies of all the bundle items (identities and documents)
-        /// of the original bundle
-        /// </summary>
-        /// <param name="options"> Create BundleCopy parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BundleCopy </returns>
-        public static BundleCopyResource Create(CreateBundleCopyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Creates a new copy of a Bundle. It will internally create copies of all the bundle items (identities and documents)
-        /// of the original bundle
-        /// </summary>
-        /// <param name="options"> Create BundleCopy parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BundleCopy </returns>
-        public static async System.Threading.Tasks.Task<BundleCopyResource> CreateAsync(CreateBundleCopyOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Creates a new copy of a Bundle. It will internally create copies of all the bundle items (identities and documents)
-        /// of the original bundle
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the Bundle to be copied </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the copied bundle </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BundleCopy </returns>
-        public static BundleCopyResource Create(string pathBundleSid,
-                                                string friendlyName = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateBundleCopyOptions(pathBundleSid){FriendlyName = friendlyName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Creates a new copy of a Bundle. It will internally create copies of all the bundle items (identities and documents)
-        /// of the original bundle
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the Bundle to be copied </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the copied bundle </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BundleCopy </returns>
-        public static async System.Threading.Tasks.Task<BundleCopyResource> CreateAsync(string pathBundleSid,
-                                                                                        string friendlyName = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateBundleCopyOptions(pathBundleSid){FriendlyName = friendlyName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a BundleCopyResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BundleCopyResource object represented by the provided JSON </returns>
-        public static BundleCopyResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BundleCopyResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string of a regulation
-        /// </summary>
-        [JsonProperty("regulation_sid")]
-        public string RegulationSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The verification status of the Bundle resource
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public BundleCopyResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource will be valid until
-        /// </summary>
-        [JsonProperty("valid_until")]
-        public DateTime? ValidUntil { get; private set; }
-        /// <summary>
-        /// The email address
-        /// </summary>
-        [JsonProperty("email")]
-        public string Email { get; private set; }
-        /// <summary>
-        /// The URL we call to inform your application of status changes
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private BundleCopyResource()
-        {
-
-        }
-    }
+{
+
+  public class BundleCopyResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Draft = new StatusEnum("draft");
+      public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
+      public static readonly StatusEnum InReview = new StatusEnum("in-review");
+      public static readonly StatusEnum TwilioRejected = new StatusEnum("twilio-rejected");
+      public static readonly StatusEnum TwilioApproved = new StatusEnum("twilio-approved");
+      public static readonly StatusEnum ProvisionallyApproved = new StatusEnum("provisionally-approved");
+    }
+
+    public sealed class EndUserTypeEnum : StringEnum
+    {
+      private EndUserTypeEnum(string value) : base(value) { }
+      public EndUserTypeEnum() { }
+      public static implicit operator EndUserTypeEnum(string value)
+      {
+        return new EndUserTypeEnum(value);
+      }
+
+      public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
+      public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
+    }
+
+    private static Request BuildCreateRequest(CreateBundleCopyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/Copies",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Creates a new copy of a Bundle. It will internally create copies of all the bundle items (identities and documents)
+    /// of the original bundle
+    /// </summary>
+    /// <param name="options"> Create BundleCopy parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BundleCopy </returns>
+    public static BundleCopyResource Create(CreateBundleCopyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Creates a new copy of a Bundle. It will internally create copies of all the bundle items (identities and documents)
+    /// of the original bundle
+    /// </summary>
+    /// <param name="options"> Create BundleCopy parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BundleCopy </returns>
+    public static async System.Threading.Tasks.Task<BundleCopyResource> CreateAsync(CreateBundleCopyOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Creates a new copy of a Bundle. It will internally create copies of all the bundle items (identities and documents)
+    /// of the original bundle
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the Bundle to be copied </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the copied bundle </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BundleCopy </returns>
+    public static BundleCopyResource Create(string pathBundleSid,
+                                            string friendlyName = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateBundleCopyOptions(pathBundleSid) { FriendlyName = friendlyName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Creates a new copy of a Bundle. It will internally create copies of all the bundle items (identities and documents)
+    /// of the original bundle
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the Bundle to be copied </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the copied bundle </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BundleCopy </returns>
+    public static async System.Threading.Tasks.Task<BundleCopyResource> CreateAsync(string pathBundleSid,
+                                                                                    string friendlyName = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateBundleCopyOptions(pathBundleSid) { FriendlyName = friendlyName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a BundleCopyResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BundleCopyResource object represented by the provided JSON </returns>
+    public static BundleCopyResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BundleCopyResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string of a regulation
+    /// </summary>
+    [JsonProperty("regulation_sid")]
+    public string RegulationSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The verification status of the Bundle resource
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public BundleCopyResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource will be valid until
+    /// </summary>
+    [JsonProperty("valid_until")]
+    public DateTime? ValidUntil { get; private set; }
+    /// <summary>
+    /// The email address
+    /// </summary>
+    [JsonProperty("email")]
+    public string Email { get; private set; }
+    /// <summary>
+    /// The URL we call to inform your application of status changes
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private BundleCopyResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/EvaluationOptions.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/EvaluationOptions.cs
index bd9519cd8..e781d7149 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/EvaluationOptions.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/EvaluationOptions.cs
@@ -9,104 +9,104 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance.Bundle
-{
-
+{
+
+  /// <summary>
+  /// Creates an evaluation for a bundle
+  /// </summary>
+  public class CreateEvaluationOptions : IOptions<EvaluationResource>
+  {
     /// <summary>
-    /// Creates an evaluation for a bundle
+    /// The unique string that identifies the resource
     /// </summary>
-    public class CreateEvaluationOptions : IOptions<EvaluationResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathBundleSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateEvaluationOptions
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
-        public CreateEvaluationOptions(string pathBundleSid)
-        {
-            PathBundleSid = pathBundleSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathBundleSid { get; }
+
     /// <summary>
-    /// Retrieve a list of Evaluations associated to the Bundle resource.
+    /// Construct a new CreateEvaluationOptions
     /// </summary>
-    public class ReadEvaluationOptions : ReadOptions<EvaluationResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathBundleSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadEvaluationOptions
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
-        public ReadEvaluationOptions(string pathBundleSid)
-        {
-            PathBundleSid = pathBundleSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
+    public CreateEvaluationOptions(string pathBundleSid)
+    {
+      PathBundleSid = pathBundleSid;
+    }
+
     /// <summary>
-    /// Fetch specific Evaluation Instance.
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchEvaluationOptions : IOptions<EvaluationResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathBundleSid { get; }
-        /// <summary>
-        /// The unique string that identifies the Evaluation resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchEvaluationOptions
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
-        /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
-        public FetchEvaluationOptions(string pathBundleSid, string pathSid)
-        {
-            PathBundleSid = pathBundleSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of Evaluations associated to the Bundle resource.
+  /// </summary>
+  public class ReadEvaluationOptions : ReadOptions<EvaluationResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathBundleSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadEvaluationOptions
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
+    public ReadEvaluationOptions(string pathBundleSid)
+    {
+      PathBundleSid = pathBundleSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific Evaluation Instance.
+  /// </summary>
+  public class FetchEvaluationOptions : IOptions<EvaluationResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathBundleSid { get; }
+    /// <summary>
+    /// The unique string that identifies the Evaluation resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchEvaluationOptions
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
+    /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
+    public FetchEvaluationOptions(string pathBundleSid, string pathSid)
+    {
+      PathBundleSid = pathBundleSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/EvaluationResource.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/EvaluationResource.cs
index 2424cdcba..705279388 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/EvaluationResource.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/EvaluationResource.cs
@@ -17,357 +17,357 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance.Bundle
-{
-
-    public class EvaluationResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Compliant = new StatusEnum("compliant");
-            public static readonly StatusEnum Noncompliant = new StatusEnum("noncompliant");
-        }
-
-        private static Request BuildCreateRequest(CreateEvaluationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/Evaluations",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Creates an evaluation for a bundle
-        /// </summary>
-        /// <param name="options"> Create Evaluation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Evaluation </returns>
-        public static EvaluationResource Create(CreateEvaluationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Creates an evaluation for a bundle
-        /// </summary>
-        /// <param name="options"> Create Evaluation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Evaluation </returns>
-        public static async System.Threading.Tasks.Task<EvaluationResource> CreateAsync(CreateEvaluationOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Creates an evaluation for a bundle
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Evaluation </returns>
-        public static EvaluationResource Create(string pathBundleSid, ITwilioRestClient client = null)
-        {
-            var options = new CreateEvaluationOptions(pathBundleSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Creates an evaluation for a bundle
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Evaluation </returns>
-        public static async System.Threading.Tasks.Task<EvaluationResource> CreateAsync(string pathBundleSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateEvaluationOptions(pathBundleSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadEvaluationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/Evaluations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Evaluations associated to the Bundle resource.
-        /// </summary>
-        /// <param name="options"> Read Evaluation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Evaluation </returns>
-        public static ResourceSet<EvaluationResource> Read(ReadEvaluationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<EvaluationResource>.FromJson("results", response.Content);
-            return new ResourceSet<EvaluationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Evaluations associated to the Bundle resource.
-        /// </summary>
-        /// <param name="options"> Read Evaluation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Evaluation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EvaluationResource>> ReadAsync(ReadEvaluationOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<EvaluationResource>.FromJson("results", response.Content);
-            return new ResourceSet<EvaluationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Evaluations associated to the Bundle resource.
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Evaluation </returns>
-        public static ResourceSet<EvaluationResource> Read(string pathBundleSid,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadEvaluationOptions(pathBundleSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Evaluations associated to the Bundle resource.
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Evaluation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EvaluationResource>> ReadAsync(string pathBundleSid,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadEvaluationOptions(pathBundleSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<EvaluationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<EvaluationResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<EvaluationResource> NextPage(Page<EvaluationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<EvaluationResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<EvaluationResource> PreviousPage(Page<EvaluationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<EvaluationResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchEvaluationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/Evaluations/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific Evaluation Instance.
-        /// </summary>
-        /// <param name="options"> Fetch Evaluation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Evaluation </returns>
-        public static EvaluationResource Fetch(FetchEvaluationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Evaluation Instance.
-        /// </summary>
-        /// <param name="options"> Fetch Evaluation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Evaluation </returns>
-        public static async System.Threading.Tasks.Task<EvaluationResource> FetchAsync(FetchEvaluationOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific Evaluation Instance.
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
-        /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Evaluation </returns>
-        public static EvaluationResource Fetch(string pathBundleSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchEvaluationOptions(pathBundleSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Evaluation Instance.
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
-        /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Evaluation </returns>
-        public static async System.Threading.Tasks.Task<EvaluationResource> FetchAsync(string pathBundleSid,
-                                                                                       string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchEvaluationOptions(pathBundleSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a EvaluationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EvaluationResource object represented by the provided JSON </returns>
-        public static EvaluationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EvaluationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Evaluation resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string of a regulation
-        /// </summary>
-        [JsonProperty("regulation_sid")]
-        public string RegulationSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("bundle_sid")]
-        public string BundleSid { get; private set; }
-        /// <summary>
-        /// The compliance status of the Evaluation resource
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public EvaluationResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The results of the Evaluation resource
-        /// </summary>
-        [JsonProperty("results")]
-        public List<object> Results { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private EvaluationResource()
-        {
-
-        }
-    }
+{
+
+  public class EvaluationResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Compliant = new StatusEnum("compliant");
+      public static readonly StatusEnum Noncompliant = new StatusEnum("noncompliant");
+    }
+
+    private static Request BuildCreateRequest(CreateEvaluationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/Evaluations",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Creates an evaluation for a bundle
+    /// </summary>
+    /// <param name="options"> Create Evaluation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Evaluation </returns>
+    public static EvaluationResource Create(CreateEvaluationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Creates an evaluation for a bundle
+    /// </summary>
+    /// <param name="options"> Create Evaluation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Evaluation </returns>
+    public static async System.Threading.Tasks.Task<EvaluationResource> CreateAsync(CreateEvaluationOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Creates an evaluation for a bundle
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Evaluation </returns>
+    public static EvaluationResource Create(string pathBundleSid, ITwilioRestClient client = null)
+    {
+      var options = new CreateEvaluationOptions(pathBundleSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Creates an evaluation for a bundle
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Evaluation </returns>
+    public static async System.Threading.Tasks.Task<EvaluationResource> CreateAsync(string pathBundleSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateEvaluationOptions(pathBundleSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadEvaluationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/Evaluations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Evaluations associated to the Bundle resource.
+    /// </summary>
+    /// <param name="options"> Read Evaluation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Evaluation </returns>
+    public static ResourceSet<EvaluationResource> Read(ReadEvaluationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<EvaluationResource>.FromJson("results", response.Content);
+      return new ResourceSet<EvaluationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Evaluations associated to the Bundle resource.
+    /// </summary>
+    /// <param name="options"> Read Evaluation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Evaluation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EvaluationResource>> ReadAsync(ReadEvaluationOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<EvaluationResource>.FromJson("results", response.Content);
+      return new ResourceSet<EvaluationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Evaluations associated to the Bundle resource.
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Evaluation </returns>
+    public static ResourceSet<EvaluationResource> Read(string pathBundleSid,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadEvaluationOptions(pathBundleSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Evaluations associated to the Bundle resource.
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Evaluation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EvaluationResource>> ReadAsync(string pathBundleSid,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadEvaluationOptions(pathBundleSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<EvaluationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<EvaluationResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<EvaluationResource> NextPage(Page<EvaluationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<EvaluationResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<EvaluationResource> PreviousPage(Page<EvaluationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<EvaluationResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchEvaluationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/Evaluations/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific Evaluation Instance.
+    /// </summary>
+    /// <param name="options"> Fetch Evaluation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Evaluation </returns>
+    public static EvaluationResource Fetch(FetchEvaluationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Evaluation Instance.
+    /// </summary>
+    /// <param name="options"> Fetch Evaluation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Evaluation </returns>
+    public static async System.Threading.Tasks.Task<EvaluationResource> FetchAsync(FetchEvaluationOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific Evaluation Instance.
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
+    /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Evaluation </returns>
+    public static EvaluationResource Fetch(string pathBundleSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchEvaluationOptions(pathBundleSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Evaluation Instance.
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource </param>
+    /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Evaluation </returns>
+    public static async System.Threading.Tasks.Task<EvaluationResource> FetchAsync(string pathBundleSid,
+                                                                                   string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchEvaluationOptions(pathBundleSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a EvaluationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EvaluationResource object represented by the provided JSON </returns>
+    public static EvaluationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EvaluationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Evaluation resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string of a regulation
+    /// </summary>
+    [JsonProperty("regulation_sid")]
+    public string RegulationSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("bundle_sid")]
+    public string BundleSid { get; private set; }
+    /// <summary>
+    /// The compliance status of the Evaluation resource
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public EvaluationResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The results of the Evaluation resource
+    /// </summary>
+    [JsonProperty("results")]
+    public List<object> Results { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private EvaluationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ItemAssignmentOptions.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ItemAssignmentOptions.cs
index ead2e913d..56c65ffda 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ItemAssignmentOptions.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ItemAssignmentOptions.cs
@@ -9,150 +9,150 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance.Bundle
-{
-
+{
+
+  /// <summary>
+  /// Create a new Assigned Item.
+  /// </summary>
+  public class CreateItemAssignmentOptions : IOptions<ItemAssignmentResource>
+  {
     /// <summary>
-    /// Create a new Assigned Item.
+    /// The unique string that identifies the resource.
     /// </summary>
-    public class CreateItemAssignmentOptions : IOptions<ItemAssignmentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathBundleSid { get; }
-        /// <summary>
-        /// The sid of an object bag
-        /// </summary>
-        public string ObjectSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateItemAssignmentOptions
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
-        /// <param name="objectSid"> The sid of an object bag </param>
-        public CreateItemAssignmentOptions(string pathBundleSid, string objectSid)
-        {
-            PathBundleSid = pathBundleSid;
-            ObjectSid = objectSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ObjectSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ObjectSid", ObjectSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathBundleSid { get; }
     /// <summary>
-    /// Retrieve a list of all Assigned Items for an account.
+    /// The sid of an object bag
     /// </summary>
-    public class ReadItemAssignmentOptions : ReadOptions<ItemAssignmentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathBundleSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadItemAssignmentOptions
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
-        public ReadItemAssignmentOptions(string pathBundleSid)
-        {
-            PathBundleSid = pathBundleSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string ObjectSid { get; }
+
     /// <summary>
-    /// Fetch specific Assigned Item Instance.
+    /// Construct a new CreateItemAssignmentOptions
     /// </summary>
-    public class FetchItemAssignmentOptions : IOptions<ItemAssignmentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathBundleSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchItemAssignmentOptions
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchItemAssignmentOptions(string pathBundleSid, string pathSid)
-        {
-            PathBundleSid = pathBundleSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
+    /// <param name="objectSid"> The sid of an object bag </param>
+    public CreateItemAssignmentOptions(string pathBundleSid, string objectSid)
+    {
+      PathBundleSid = pathBundleSid;
+      ObjectSid = objectSid;
+    }
+
     /// <summary>
-    /// Remove an Assignment Item Instance.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteItemAssignmentOptions : IOptions<ItemAssignmentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathBundleSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteItemAssignmentOptions
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteItemAssignmentOptions(string pathBundleSid, string pathSid)
-        {
-            PathBundleSid = pathBundleSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ObjectSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ObjectSid", ObjectSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Assigned Items for an account.
+  /// </summary>
+  public class ReadItemAssignmentOptions : ReadOptions<ItemAssignmentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathBundleSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadItemAssignmentOptions
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
+    public ReadItemAssignmentOptions(string pathBundleSid)
+    {
+      PathBundleSid = pathBundleSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific Assigned Item Instance.
+  /// </summary>
+  public class FetchItemAssignmentOptions : IOptions<ItemAssignmentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathBundleSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchItemAssignmentOptions
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchItemAssignmentOptions(string pathBundleSid, string pathSid)
+    {
+      PathBundleSid = pathBundleSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove an Assignment Item Instance.
+  /// </summary>
+  public class DeleteItemAssignmentOptions : IOptions<ItemAssignmentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathBundleSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteItemAssignmentOptions
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteItemAssignmentOptions(string pathBundleSid, string pathSid)
+    {
+      PathBundleSid = pathBundleSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ItemAssignmentResource.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ItemAssignmentResource.cs
index 8507770b1..b2c513b29 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ItemAssignmentResource.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ItemAssignmentResource.cs
@@ -16,407 +16,407 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance.Bundle
-{
-
-    public class ItemAssignmentResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateItemAssignmentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/ItemAssignments",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="options"> Create ItemAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ItemAssignment </returns>
-        public static ItemAssignmentResource Create(CreateItemAssignmentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="options"> Create ItemAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
-        public static async System.Threading.Tasks.Task<ItemAssignmentResource> CreateAsync(CreateItemAssignmentOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
-        /// <param name="objectSid"> The sid of an object bag </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ItemAssignment </returns>
-        public static ItemAssignmentResource Create(string pathBundleSid, string objectSid, ITwilioRestClient client = null)
-        {
-            var options = new CreateItemAssignmentOptions(pathBundleSid, objectSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
-        /// <param name="objectSid"> The sid of an object bag </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
-        public static async System.Threading.Tasks.Task<ItemAssignmentResource> CreateAsync(string pathBundleSid,
-                                                                                            string objectSid,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateItemAssignmentOptions(pathBundleSid, objectSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadItemAssignmentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/ItemAssignments",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="options"> Read ItemAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ItemAssignment </returns>
-        public static ResourceSet<ItemAssignmentResource> Read(ReadItemAssignmentOptions options,
-                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ItemAssignmentResource>.FromJson("results", response.Content);
-            return new ResourceSet<ItemAssignmentResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="options"> Read ItemAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ItemAssignmentResource>> ReadAsync(ReadItemAssignmentOptions options,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ItemAssignmentResource>.FromJson("results", response.Content);
-            return new ResourceSet<ItemAssignmentResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ItemAssignment </returns>
-        public static ResourceSet<ItemAssignmentResource> Read(string pathBundleSid,
-                                                               int? pageSize = null,
-                                                               long? limit = null,
-                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadItemAssignmentOptions(pathBundleSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ItemAssignmentResource>> ReadAsync(string pathBundleSid,
-                                                                                                       int? pageSize = null,
-                                                                                                       long? limit = null,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadItemAssignmentOptions(pathBundleSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ItemAssignmentResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ItemAssignmentResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ItemAssignmentResource> NextPage(Page<ItemAssignmentResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<ItemAssignmentResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ItemAssignmentResource> PreviousPage(Page<ItemAssignmentResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<ItemAssignmentResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchItemAssignmentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/ItemAssignments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="options"> Fetch ItemAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ItemAssignment </returns>
-        public static ItemAssignmentResource Fetch(FetchItemAssignmentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="options"> Fetch ItemAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
-        public static async System.Threading.Tasks.Task<ItemAssignmentResource> FetchAsync(FetchItemAssignmentOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ItemAssignment </returns>
-        public static ItemAssignmentResource Fetch(string pathBundleSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchItemAssignmentOptions(pathBundleSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
-        public static async System.Threading.Tasks.Task<ItemAssignmentResource> FetchAsync(string pathBundleSid,
-                                                                                           string pathSid,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchItemAssignmentOptions(pathBundleSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteItemAssignmentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/ItemAssignments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="options"> Delete ItemAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ItemAssignment </returns>
-        public static bool Delete(DeleteItemAssignmentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="options"> Delete ItemAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteItemAssignmentOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ItemAssignment </returns>
-        public static bool Delete(string pathBundleSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteItemAssignmentOptions(pathBundleSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathBundleSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteItemAssignmentOptions(pathBundleSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ItemAssignmentResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ItemAssignmentResource object represented by the provided JSON </returns>
-        public static ItemAssignmentResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ItemAssignmentResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the Bundle resource.
-        /// </summary>
-        [JsonProperty("bundle_sid")]
-        public string BundleSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The sid of an object bag
-        /// </summary>
-        [JsonProperty("object_sid")]
-        public string ObjectSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Identity resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private ItemAssignmentResource()
-        {
-
-        }
-    }
+{
+
+  public class ItemAssignmentResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateItemAssignmentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/ItemAssignments",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="options"> Create ItemAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ItemAssignment </returns>
+    public static ItemAssignmentResource Create(CreateItemAssignmentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="options"> Create ItemAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
+    public static async System.Threading.Tasks.Task<ItemAssignmentResource> CreateAsync(CreateItemAssignmentOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
+    /// <param name="objectSid"> The sid of an object bag </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ItemAssignment </returns>
+    public static ItemAssignmentResource Create(string pathBundleSid, string objectSid, ITwilioRestClient client = null)
+    {
+      var options = new CreateItemAssignmentOptions(pathBundleSid, objectSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
+    /// <param name="objectSid"> The sid of an object bag </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
+    public static async System.Threading.Tasks.Task<ItemAssignmentResource> CreateAsync(string pathBundleSid,
+                                                                                        string objectSid,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateItemAssignmentOptions(pathBundleSid, objectSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadItemAssignmentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/ItemAssignments",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="options"> Read ItemAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ItemAssignment </returns>
+    public static ResourceSet<ItemAssignmentResource> Read(ReadItemAssignmentOptions options,
+                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ItemAssignmentResource>.FromJson("results", response.Content);
+      return new ResourceSet<ItemAssignmentResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="options"> Read ItemAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ItemAssignmentResource>> ReadAsync(ReadItemAssignmentOptions options,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ItemAssignmentResource>.FromJson("results", response.Content);
+      return new ResourceSet<ItemAssignmentResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ItemAssignment </returns>
+    public static ResourceSet<ItemAssignmentResource> Read(string pathBundleSid,
+                                                           int? pageSize = null,
+                                                           long? limit = null,
+                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadItemAssignmentOptions(pathBundleSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ItemAssignmentResource>> ReadAsync(string pathBundleSid,
+                                                                                                   int? pageSize = null,
+                                                                                                   long? limit = null,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadItemAssignmentOptions(pathBundleSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ItemAssignmentResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ItemAssignmentResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ItemAssignmentResource> NextPage(Page<ItemAssignmentResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<ItemAssignmentResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ItemAssignmentResource> PreviousPage(Page<ItemAssignmentResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<ItemAssignmentResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchItemAssignmentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/ItemAssignments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="options"> Fetch ItemAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ItemAssignment </returns>
+    public static ItemAssignmentResource Fetch(FetchItemAssignmentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="options"> Fetch ItemAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
+    public static async System.Threading.Tasks.Task<ItemAssignmentResource> FetchAsync(FetchItemAssignmentOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ItemAssignment </returns>
+    public static ItemAssignmentResource Fetch(string pathBundleSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchItemAssignmentOptions(pathBundleSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
+    public static async System.Threading.Tasks.Task<ItemAssignmentResource> FetchAsync(string pathBundleSid,
+                                                                                       string pathSid,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchItemAssignmentOptions(pathBundleSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteItemAssignmentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/ItemAssignments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="options"> Delete ItemAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ItemAssignment </returns>
+    public static bool Delete(DeleteItemAssignmentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="options"> Delete ItemAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteItemAssignmentOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ItemAssignment </returns>
+    public static bool Delete(string pathBundleSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteItemAssignmentOptions(pathBundleSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ItemAssignment </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathBundleSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteItemAssignmentOptions(pathBundleSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ItemAssignmentResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ItemAssignmentResource object represented by the provided JSON </returns>
+    public static ItemAssignmentResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ItemAssignmentResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the Bundle resource.
+    /// </summary>
+    [JsonProperty("bundle_sid")]
+    public string BundleSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The sid of an object bag
+    /// </summary>
+    [JsonProperty("object_sid")]
+    public string ObjectSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Identity resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private ItemAssignmentResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ReplaceItemsOptions.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ReplaceItemsOptions.cs
index a67c5cd7c..8fc002ada 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ReplaceItemsOptions.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ReplaceItemsOptions.cs
@@ -9,50 +9,50 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance.Bundle
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Replaces all bundle items in the target bundle (specified in the path) with all the bundle items of the source
+  /// bundle (specified by the from_bundle_sid body param)
+  /// </summary>
+  public class CreateReplaceItemsOptions : IOptions<ReplaceItemsResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Replaces all bundle items in the target bundle (specified in the path) with all the bundle items of the source
-    /// bundle (specified by the from_bundle_sid body param)
+    /// The unique string that identifies the Bundle where the item assignments are going to be replaced
     /// </summary>
-    public class CreateReplaceItemsOptions : IOptions<ReplaceItemsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the Bundle where the item assignments are going to be replaced
-        /// </summary>
-        public string PathBundleSid { get; }
-        /// <summary>
-        /// The source bundle sid to copy the item assignments from
-        /// </summary>
-        public string FromBundleSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateReplaceItemsOptions
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the Bundle where the item assignments are going to
-        ///                     be replaced </param>
-        /// <param name="fromBundleSid"> The source bundle sid to copy the item assignments from </param>
-        public CreateReplaceItemsOptions(string pathBundleSid, string fromBundleSid)
-        {
-            PathBundleSid = pathBundleSid;
-            FromBundleSid = fromBundleSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FromBundleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FromBundleSid", FromBundleSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathBundleSid { get; }
+    /// <summary>
+    /// The source bundle sid to copy the item assignments from
+    /// </summary>
+    public string FromBundleSid { get; }
+
+    /// <summary>
+    /// Construct a new CreateReplaceItemsOptions
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the Bundle where the item assignments are going to
+    ///                     be replaced </param>
+    /// <param name="fromBundleSid"> The source bundle sid to copy the item assignments from </param>
+    public CreateReplaceItemsOptions(string pathBundleSid, string fromBundleSid)
+    {
+      PathBundleSid = pathBundleSid;
+      FromBundleSid = fromBundleSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FromBundleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FromBundleSid", FromBundleSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ReplaceItemsResource.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ReplaceItemsResource.cs
index 484543deb..43c59a8e2 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ReplaceItemsResource.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/Bundle/ReplaceItemsResource.cs
@@ -19,192 +19,192 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance.Bundle
-{
-
-    public class ReplaceItemsResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Draft = new StatusEnum("draft");
-            public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
-            public static readonly StatusEnum InReview = new StatusEnum("in-review");
-            public static readonly StatusEnum TwilioRejected = new StatusEnum("twilio-rejected");
-            public static readonly StatusEnum TwilioApproved = new StatusEnum("twilio-approved");
-            public static readonly StatusEnum ProvisionallyApproved = new StatusEnum("provisionally-approved");
-        }
-
-        public sealed class EndUserTypeEnum : StringEnum
-        {
-            private EndUserTypeEnum(string value) : base(value) {}
-            public EndUserTypeEnum() {}
-            public static implicit operator EndUserTypeEnum(string value)
-            {
-                return new EndUserTypeEnum(value);
-            }
-
-            public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
-            public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
-        }
-
-        private static Request BuildCreateRequest(CreateReplaceItemsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/ReplaceItems",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Replaces all bundle items in the target bundle (specified in the path) with all the bundle items of the source
-        /// bundle (specified by the from_bundle_sid body param)
-        /// </summary>
-        /// <param name="options"> Create ReplaceItems parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ReplaceItems </returns>
-        public static ReplaceItemsResource Create(CreateReplaceItemsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Replaces all bundle items in the target bundle (specified in the path) with all the bundle items of the source
-        /// bundle (specified by the from_bundle_sid body param)
-        /// </summary>
-        /// <param name="options"> Create ReplaceItems parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ReplaceItems </returns>
-        public static async System.Threading.Tasks.Task<ReplaceItemsResource> CreateAsync(CreateReplaceItemsOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Replaces all bundle items in the target bundle (specified in the path) with all the bundle items of the source
-        /// bundle (specified by the from_bundle_sid body param)
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the Bundle where the item assignments are going to
-        ///                     be replaced </param>
-        /// <param name="fromBundleSid"> The source bundle sid to copy the item assignments from </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ReplaceItems </returns>
-        public static ReplaceItemsResource Create(string pathBundleSid,
-                                                  string fromBundleSid,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateReplaceItemsOptions(pathBundleSid, fromBundleSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Replaces all bundle items in the target bundle (specified in the path) with all the bundle items of the source
-        /// bundle (specified by the from_bundle_sid body param)
-        /// </summary>
-        /// <param name="pathBundleSid"> The unique string that identifies the Bundle where the item assignments are going to
-        ///                     be replaced </param>
-        /// <param name="fromBundleSid"> The source bundle sid to copy the item assignments from </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ReplaceItems </returns>
-        public static async System.Threading.Tasks.Task<ReplaceItemsResource> CreateAsync(string pathBundleSid,
-                                                                                          string fromBundleSid,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateReplaceItemsOptions(pathBundleSid, fromBundleSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ReplaceItemsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ReplaceItemsResource object represented by the provided JSON </returns>
-        public static ReplaceItemsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ReplaceItemsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string of a regulation
-        /// </summary>
-        [JsonProperty("regulation_sid")]
-        public string RegulationSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The verification status of the Bundle resource
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ReplaceItemsResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource will be valid until
-        /// </summary>
-        [JsonProperty("valid_until")]
-        public DateTime? ValidUntil { get; private set; }
-        /// <summary>
-        /// The email address
-        /// </summary>
-        [JsonProperty("email")]
-        public string Email { get; private set; }
-        /// <summary>
-        /// The URL we call to inform your application of status changes
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private ReplaceItemsResource()
-        {
-
-        }
-    }
+{
+
+  public class ReplaceItemsResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Draft = new StatusEnum("draft");
+      public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
+      public static readonly StatusEnum InReview = new StatusEnum("in-review");
+      public static readonly StatusEnum TwilioRejected = new StatusEnum("twilio-rejected");
+      public static readonly StatusEnum TwilioApproved = new StatusEnum("twilio-approved");
+      public static readonly StatusEnum ProvisionallyApproved = new StatusEnum("provisionally-approved");
+    }
+
+    public sealed class EndUserTypeEnum : StringEnum
+    {
+      private EndUserTypeEnum(string value) : base(value) { }
+      public EndUserTypeEnum() { }
+      public static implicit operator EndUserTypeEnum(string value)
+      {
+        return new EndUserTypeEnum(value);
+      }
+
+      public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
+      public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
+    }
+
+    private static Request BuildCreateRequest(CreateReplaceItemsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles/" + options.PathBundleSid + "/ReplaceItems",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Replaces all bundle items in the target bundle (specified in the path) with all the bundle items of the source
+    /// bundle (specified by the from_bundle_sid body param)
+    /// </summary>
+    /// <param name="options"> Create ReplaceItems parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ReplaceItems </returns>
+    public static ReplaceItemsResource Create(CreateReplaceItemsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Replaces all bundle items in the target bundle (specified in the path) with all the bundle items of the source
+    /// bundle (specified by the from_bundle_sid body param)
+    /// </summary>
+    /// <param name="options"> Create ReplaceItems parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ReplaceItems </returns>
+    public static async System.Threading.Tasks.Task<ReplaceItemsResource> CreateAsync(CreateReplaceItemsOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Replaces all bundle items in the target bundle (specified in the path) with all the bundle items of the source
+    /// bundle (specified by the from_bundle_sid body param)
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the Bundle where the item assignments are going to
+    ///                     be replaced </param>
+    /// <param name="fromBundleSid"> The source bundle sid to copy the item assignments from </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ReplaceItems </returns>
+    public static ReplaceItemsResource Create(string pathBundleSid,
+                                              string fromBundleSid,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateReplaceItemsOptions(pathBundleSid, fromBundleSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Replaces all bundle items in the target bundle (specified in the path) with all the bundle items of the source
+    /// bundle (specified by the from_bundle_sid body param)
+    /// </summary>
+    /// <param name="pathBundleSid"> The unique string that identifies the Bundle where the item assignments are going to
+    ///                     be replaced </param>
+    /// <param name="fromBundleSid"> The source bundle sid to copy the item assignments from </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ReplaceItems </returns>
+    public static async System.Threading.Tasks.Task<ReplaceItemsResource> CreateAsync(string pathBundleSid,
+                                                                                      string fromBundleSid,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateReplaceItemsOptions(pathBundleSid, fromBundleSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ReplaceItemsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ReplaceItemsResource object represented by the provided JSON </returns>
+    public static ReplaceItemsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ReplaceItemsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string of a regulation
+    /// </summary>
+    [JsonProperty("regulation_sid")]
+    public string RegulationSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The verification status of the Bundle resource
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ReplaceItemsResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource will be valid until
+    /// </summary>
+    [JsonProperty("valid_until")]
+    public DateTime? ValidUntil { get; private set; }
+    /// <summary>
+    /// The email address
+    /// </summary>
+    [JsonProperty("email")]
+    public string Email { get; private set; }
+    /// <summary>
+    /// The URL we call to inform your application of status changes
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private ReplaceItemsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/BundleOptions.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/BundleOptions.cs
index 6098f2edf..06a1bb1fa 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/BundleOptions.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/BundleOptions.cs
@@ -9,285 +9,285 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance
-{
-
+{
+
+  /// <summary>
+  /// Create a new Bundle.
+  /// </summary>
+  public class CreateBundleOptions : IOptions<BundleResource>
+  {
     /// <summary>
-    /// Create a new Bundle.
+    /// The string that you assigned to describe the resource
     /// </summary>
-    public class CreateBundleOptions : IOptions<BundleResource>
-    {
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The email address
-        /// </summary>
-        public string Email { get; }
-        /// <summary>
-        /// The URL we call to inform your application of status changes.
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The unique string of a regulation.
-        /// </summary>
-        public string RegulationSid { get; set; }
-        /// <summary>
-        /// The ISO country code of the country
-        /// </summary>
-        public string IsoCountry { get; set; }
-        /// <summary>
-        /// The type of End User of the Bundle resource
-        /// </summary>
-        public BundleResource.EndUserTypeEnum EndUserType { get; set; }
-        /// <summary>
-        /// The type of phone number
-        /// </summary>
-        public string NumberType { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateBundleOptions
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        public CreateBundleOptions(string friendlyName, string email)
-        {
-            FriendlyName = friendlyName;
-            Email = email;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Email != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Email", Email));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (RegulationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RegulationSid", RegulationSid.ToString()));
-            }
-
-            if (IsoCountry != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry));
-            }
-
-            if (EndUserType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndUserType", EndUserType.ToString()));
-            }
-
-            if (NumberType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NumberType", NumberType));
-            }
-
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; }
     /// <summary>
-    /// Retrieve a list of all Bundles for an account.
+    /// The email address
     /// </summary>
-    public class ReadBundleOptions : ReadOptions<BundleResource>
-    {
-        /// <summary>
-        /// The verification status of the Bundle resource
-        /// </summary>
-        public BundleResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique string of a regulation.
-        /// </summary>
-        public string RegulationSid { get; set; }
-        /// <summary>
-        /// The ISO country code of the country
-        /// </summary>
-        public string IsoCountry { get; set; }
-        /// <summary>
-        /// The type of phone number
-        /// </summary>
-        public string NumberType { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (RegulationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RegulationSid", RegulationSid.ToString()));
-            }
-
-            if (IsoCountry != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry));
-            }
-
-            if (NumberType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NumberType", NumberType));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string Email { get; }
     /// <summary>
-    /// Fetch a specific Bundle instance.
+    /// The URL we call to inform your application of status changes.
     /// </summary>
-    public class FetchBundleOptions : IOptions<BundleResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchBundleOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        public FetchBundleOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public Uri StatusCallback { get; set; }
     /// <summary>
-    /// Updates a Bundle in an account.
+    /// The unique string of a regulation.
     /// </summary>
-    public class UpdateBundleOptions : IOptions<BundleResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The verification status of the Bundle resource
-        /// </summary>
-        public BundleResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The URL we call to inform your application of status changes.
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The email address
-        /// </summary>
-        public string Email { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateBundleOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        public UpdateBundleOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Email != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Email", Email));
-            }
-
-            return p;
-        }
-    }
-
+    public string RegulationSid { get; set; }
     /// <summary>
-    /// Delete a specific Bundle.
+    /// The ISO country code of the country
     /// </summary>
-    public class DeleteBundleOptions : IOptions<BundleResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteBundleOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        public DeleteBundleOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string IsoCountry { get; set; }
+    /// <summary>
+    /// The type of End User of the Bundle resource
+    /// </summary>
+    public BundleResource.EndUserTypeEnum EndUserType { get; set; }
+    /// <summary>
+    /// The type of phone number
+    /// </summary>
+    public string NumberType { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateBundleOptions
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    public CreateBundleOptions(string friendlyName, string email)
+    {
+      FriendlyName = friendlyName;
+      Email = email;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Email != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Email", Email));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (RegulationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RegulationSid", RegulationSid.ToString()));
+      }
+
+      if (IsoCountry != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry));
+      }
+
+      if (EndUserType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndUserType", EndUserType.ToString()));
+      }
+
+      if (NumberType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NumberType", NumberType));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Bundles for an account.
+  /// </summary>
+  public class ReadBundleOptions : ReadOptions<BundleResource>
+  {
+    /// <summary>
+    /// The verification status of the Bundle resource
+    /// </summary>
+    public BundleResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique string of a regulation.
+    /// </summary>
+    public string RegulationSid { get; set; }
+    /// <summary>
+    /// The ISO country code of the country
+    /// </summary>
+    public string IsoCountry { get; set; }
+    /// <summary>
+    /// The type of phone number
+    /// </summary>
+    public string NumberType { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (RegulationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RegulationSid", RegulationSid.ToString()));
+      }
+
+      if (IsoCountry != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry));
+      }
+
+      if (NumberType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NumberType", NumberType));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific Bundle instance.
+  /// </summary>
+  public class FetchBundleOptions : IOptions<BundleResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchBundleOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    public FetchBundleOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Updates a Bundle in an account.
+  /// </summary>
+  public class UpdateBundleOptions : IOptions<BundleResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The verification status of the Bundle resource
+    /// </summary>
+    public BundleResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The URL we call to inform your application of status changes.
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The email address
+    /// </summary>
+    public string Email { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateBundleOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    public UpdateBundleOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Email != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Email", Email));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Bundle.
+  /// </summary>
+  public class DeleteBundleOptions : IOptions<BundleResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteBundleOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    public DeleteBundleOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/BundleResource.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/BundleResource.cs
index 4df1594e6..ed100694c 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/BundleResource.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/BundleResource.cs
@@ -17,582 +17,582 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance
-{
-
-    public class BundleResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Draft = new StatusEnum("draft");
-            public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
-            public static readonly StatusEnum InReview = new StatusEnum("in-review");
-            public static readonly StatusEnum TwilioRejected = new StatusEnum("twilio-rejected");
-            public static readonly StatusEnum TwilioApproved = new StatusEnum("twilio-approved");
-            public static readonly StatusEnum ProvisionallyApproved = new StatusEnum("provisionally-approved");
-        }
-
-        public sealed class EndUserTypeEnum : StringEnum
-        {
-            private EndUserTypeEnum(string value) : base(value) {}
-            public EndUserTypeEnum() {}
-            public static implicit operator EndUserTypeEnum(string value)
-            {
-                return new EndUserTypeEnum(value);
-            }
-
-            public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
-            public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
-        }
-
-        private static Request BuildCreateRequest(CreateBundleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Bundle.
-        /// </summary>
-        /// <param name="options"> Create Bundle parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bundle </returns>
-        public static BundleResource Create(CreateBundleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Bundle.
-        /// </summary>
-        /// <param name="options"> Create Bundle parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bundle </returns>
-        public static async System.Threading.Tasks.Task<BundleResource> CreateAsync(CreateBundleOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Bundle.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
-        /// <param name="regulationSid"> The unique string of a regulation. </param>
-        /// <param name="isoCountry"> The ISO country code of the country </param>
-        /// <param name="endUserType"> The type of End User of the Bundle resource </param>
-        /// <param name="numberType"> The type of phone number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bundle </returns>
-        public static BundleResource Create(string friendlyName,
-                                            string email,
-                                            Uri statusCallback = null,
-                                            string regulationSid = null,
-                                            string isoCountry = null,
-                                            BundleResource.EndUserTypeEnum endUserType = null,
-                                            string numberType = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateBundleOptions(friendlyName, email){StatusCallback = statusCallback, RegulationSid = regulationSid, IsoCountry = isoCountry, EndUserType = endUserType, NumberType = numberType};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Bundle.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
-        /// <param name="regulationSid"> The unique string of a regulation. </param>
-        /// <param name="isoCountry"> The ISO country code of the country </param>
-        /// <param name="endUserType"> The type of End User of the Bundle resource </param>
-        /// <param name="numberType"> The type of phone number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bundle </returns>
-        public static async System.Threading.Tasks.Task<BundleResource> CreateAsync(string friendlyName,
-                                                                                    string email,
-                                                                                    Uri statusCallback = null,
-                                                                                    string regulationSid = null,
-                                                                                    string isoCountry = null,
-                                                                                    BundleResource.EndUserTypeEnum endUserType = null,
-                                                                                    string numberType = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateBundleOptions(friendlyName, email){StatusCallback = statusCallback, RegulationSid = regulationSid, IsoCountry = isoCountry, EndUserType = endUserType, NumberType = numberType};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadBundleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Bundles for an account.
-        /// </summary>
-        /// <param name="options"> Read Bundle parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bundle </returns>
-        public static ResourceSet<BundleResource> Read(ReadBundleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<BundleResource>.FromJson("results", response.Content);
-            return new ResourceSet<BundleResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Bundles for an account.
-        /// </summary>
-        /// <param name="options"> Read Bundle parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bundle </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BundleResource>> ReadAsync(ReadBundleOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<BundleResource>.FromJson("results", response.Content);
-            return new ResourceSet<BundleResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Bundles for an account.
-        /// </summary>
-        /// <param name="status"> The verification status of the Bundle resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="regulationSid"> The unique string of a regulation. </param>
-        /// <param name="isoCountry"> The ISO country code of the country </param>
-        /// <param name="numberType"> The type of phone number </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bundle </returns>
-        public static ResourceSet<BundleResource> Read(BundleResource.StatusEnum status = null,
-                                                       string friendlyName = null,
-                                                       string regulationSid = null,
-                                                       string isoCountry = null,
-                                                       string numberType = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadBundleOptions(){Status = status, FriendlyName = friendlyName, RegulationSid = regulationSid, IsoCountry = isoCountry, NumberType = numberType, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Bundles for an account.
-        /// </summary>
-        /// <param name="status"> The verification status of the Bundle resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="regulationSid"> The unique string of a regulation. </param>
-        /// <param name="isoCountry"> The ISO country code of the country </param>
-        /// <param name="numberType"> The type of phone number </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bundle </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BundleResource>> ReadAsync(BundleResource.StatusEnum status = null,
-                                                                                               string friendlyName = null,
-                                                                                               string regulationSid = null,
-                                                                                               string isoCountry = null,
-                                                                                               string numberType = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadBundleOptions(){Status = status, FriendlyName = friendlyName, RegulationSid = regulationSid, IsoCountry = isoCountry, NumberType = numberType, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<BundleResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<BundleResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<BundleResource> NextPage(Page<BundleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<BundleResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<BundleResource> PreviousPage(Page<BundleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<BundleResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchBundleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Bundle instance.
-        /// </summary>
-        /// <param name="options"> Fetch Bundle parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bundle </returns>
-        public static BundleResource Fetch(FetchBundleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Bundle instance.
-        /// </summary>
-        /// <param name="options"> Fetch Bundle parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bundle </returns>
-        public static async System.Threading.Tasks.Task<BundleResource> FetchAsync(FetchBundleOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Bundle instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bundle </returns>
-        public static BundleResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchBundleOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Bundle instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bundle </returns>
-        public static async System.Threading.Tasks.Task<BundleResource> FetchAsync(string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchBundleOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateBundleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates a Bundle in an account.
-        /// </summary>
-        /// <param name="options"> Update Bundle parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bundle </returns>
-        public static BundleResource Update(UpdateBundleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a Bundle in an account.
-        /// </summary>
-        /// <param name="options"> Update Bundle parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bundle </returns>
-        public static async System.Threading.Tasks.Task<BundleResource> UpdateAsync(UpdateBundleOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates a Bundle in an account.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="status"> The verification status of the Bundle resource </param>
-        /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bundle </returns>
-        public static BundleResource Update(string pathSid,
-                                            BundleResource.StatusEnum status = null,
-                                            Uri statusCallback = null,
-                                            string friendlyName = null,
-                                            string email = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateBundleOptions(pathSid){Status = status, StatusCallback = statusCallback, FriendlyName = friendlyName, Email = email};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a Bundle in an account.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="status"> The verification status of the Bundle resource </param>
-        /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bundle </returns>
-        public static async System.Threading.Tasks.Task<BundleResource> UpdateAsync(string pathSid,
-                                                                                    BundleResource.StatusEnum status = null,
-                                                                                    Uri statusCallback = null,
-                                                                                    string friendlyName = null,
-                                                                                    string email = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateBundleOptions(pathSid){Status = status, StatusCallback = statusCallback, FriendlyName = friendlyName, Email = email};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteBundleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Bundles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Bundle.
-        /// </summary>
-        /// <param name="options"> Delete Bundle parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bundle </returns>
-        public static bool Delete(DeleteBundleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Bundle.
-        /// </summary>
-        /// <param name="options"> Delete Bundle parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bundle </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBundleOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Bundle.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bundle </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteBundleOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Bundle.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bundle </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteBundleOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a BundleResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BundleResource object represented by the provided JSON </returns>
-        public static BundleResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BundleResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string of a regulation.
-        /// </summary>
-        [JsonProperty("regulation_sid")]
-        public string RegulationSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The verification status of the Bundle resource
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public BundleResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource will be valid until.
-        /// </summary>
-        [JsonProperty("valid_until")]
-        public DateTime? ValidUntil { get; private set; }
-        /// <summary>
-        /// The email address
-        /// </summary>
-        [JsonProperty("email")]
-        public string Email { get; private set; }
-        /// <summary>
-        /// The URL we call to inform your application of status changes.
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Bundle resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of the Assigned Items of the Bundle resource
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private BundleResource()
-        {
-
-        }
-    }
+{
+
+  public class BundleResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Draft = new StatusEnum("draft");
+      public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
+      public static readonly StatusEnum InReview = new StatusEnum("in-review");
+      public static readonly StatusEnum TwilioRejected = new StatusEnum("twilio-rejected");
+      public static readonly StatusEnum TwilioApproved = new StatusEnum("twilio-approved");
+      public static readonly StatusEnum ProvisionallyApproved = new StatusEnum("provisionally-approved");
+    }
+
+    public sealed class EndUserTypeEnum : StringEnum
+    {
+      private EndUserTypeEnum(string value) : base(value) { }
+      public EndUserTypeEnum() { }
+      public static implicit operator EndUserTypeEnum(string value)
+      {
+        return new EndUserTypeEnum(value);
+      }
+
+      public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
+      public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
+    }
+
+    private static Request BuildCreateRequest(CreateBundleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Bundle.
+    /// </summary>
+    /// <param name="options"> Create Bundle parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bundle </returns>
+    public static BundleResource Create(CreateBundleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Bundle.
+    /// </summary>
+    /// <param name="options"> Create Bundle parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bundle </returns>
+    public static async System.Threading.Tasks.Task<BundleResource> CreateAsync(CreateBundleOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Bundle.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
+    /// <param name="regulationSid"> The unique string of a regulation. </param>
+    /// <param name="isoCountry"> The ISO country code of the country </param>
+    /// <param name="endUserType"> The type of End User of the Bundle resource </param>
+    /// <param name="numberType"> The type of phone number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bundle </returns>
+    public static BundleResource Create(string friendlyName,
+                                        string email,
+                                        Uri statusCallback = null,
+                                        string regulationSid = null,
+                                        string isoCountry = null,
+                                        BundleResource.EndUserTypeEnum endUserType = null,
+                                        string numberType = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateBundleOptions(friendlyName, email) { StatusCallback = statusCallback, RegulationSid = regulationSid, IsoCountry = isoCountry, EndUserType = endUserType, NumberType = numberType };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Bundle.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
+    /// <param name="regulationSid"> The unique string of a regulation. </param>
+    /// <param name="isoCountry"> The ISO country code of the country </param>
+    /// <param name="endUserType"> The type of End User of the Bundle resource </param>
+    /// <param name="numberType"> The type of phone number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bundle </returns>
+    public static async System.Threading.Tasks.Task<BundleResource> CreateAsync(string friendlyName,
+                                                                                string email,
+                                                                                Uri statusCallback = null,
+                                                                                string regulationSid = null,
+                                                                                string isoCountry = null,
+                                                                                BundleResource.EndUserTypeEnum endUserType = null,
+                                                                                string numberType = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateBundleOptions(friendlyName, email) { StatusCallback = statusCallback, RegulationSid = regulationSid, IsoCountry = isoCountry, EndUserType = endUserType, NumberType = numberType };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadBundleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Bundles for an account.
+    /// </summary>
+    /// <param name="options"> Read Bundle parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bundle </returns>
+    public static ResourceSet<BundleResource> Read(ReadBundleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<BundleResource>.FromJson("results", response.Content);
+      return new ResourceSet<BundleResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Bundles for an account.
+    /// </summary>
+    /// <param name="options"> Read Bundle parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bundle </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BundleResource>> ReadAsync(ReadBundleOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<BundleResource>.FromJson("results", response.Content);
+      return new ResourceSet<BundleResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Bundles for an account.
+    /// </summary>
+    /// <param name="status"> The verification status of the Bundle resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="regulationSid"> The unique string of a regulation. </param>
+    /// <param name="isoCountry"> The ISO country code of the country </param>
+    /// <param name="numberType"> The type of phone number </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bundle </returns>
+    public static ResourceSet<BundleResource> Read(BundleResource.StatusEnum status = null,
+                                                   string friendlyName = null,
+                                                   string regulationSid = null,
+                                                   string isoCountry = null,
+                                                   string numberType = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadBundleOptions() { Status = status, FriendlyName = friendlyName, RegulationSid = regulationSid, IsoCountry = isoCountry, NumberType = numberType, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Bundles for an account.
+    /// </summary>
+    /// <param name="status"> The verification status of the Bundle resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="regulationSid"> The unique string of a regulation. </param>
+    /// <param name="isoCountry"> The ISO country code of the country </param>
+    /// <param name="numberType"> The type of phone number </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bundle </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BundleResource>> ReadAsync(BundleResource.StatusEnum status = null,
+                                                                                           string friendlyName = null,
+                                                                                           string regulationSid = null,
+                                                                                           string isoCountry = null,
+                                                                                           string numberType = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadBundleOptions() { Status = status, FriendlyName = friendlyName, RegulationSid = regulationSid, IsoCountry = isoCountry, NumberType = numberType, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<BundleResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<BundleResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<BundleResource> NextPage(Page<BundleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<BundleResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<BundleResource> PreviousPage(Page<BundleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<BundleResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchBundleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Bundle instance.
+    /// </summary>
+    /// <param name="options"> Fetch Bundle parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bundle </returns>
+    public static BundleResource Fetch(FetchBundleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Bundle instance.
+    /// </summary>
+    /// <param name="options"> Fetch Bundle parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bundle </returns>
+    public static async System.Threading.Tasks.Task<BundleResource> FetchAsync(FetchBundleOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Bundle instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bundle </returns>
+    public static BundleResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchBundleOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Bundle instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bundle </returns>
+    public static async System.Threading.Tasks.Task<BundleResource> FetchAsync(string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchBundleOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateBundleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates a Bundle in an account.
+    /// </summary>
+    /// <param name="options"> Update Bundle parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bundle </returns>
+    public static BundleResource Update(UpdateBundleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a Bundle in an account.
+    /// </summary>
+    /// <param name="options"> Update Bundle parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bundle </returns>
+    public static async System.Threading.Tasks.Task<BundleResource> UpdateAsync(UpdateBundleOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates a Bundle in an account.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="status"> The verification status of the Bundle resource </param>
+    /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bundle </returns>
+    public static BundleResource Update(string pathSid,
+                                        BundleResource.StatusEnum status = null,
+                                        Uri statusCallback = null,
+                                        string friendlyName = null,
+                                        string email = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateBundleOptions(pathSid) { Status = status, StatusCallback = statusCallback, FriendlyName = friendlyName, Email = email };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a Bundle in an account.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="status"> The verification status of the Bundle resource </param>
+    /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bundle </returns>
+    public static async System.Threading.Tasks.Task<BundleResource> UpdateAsync(string pathSid,
+                                                                                BundleResource.StatusEnum status = null,
+                                                                                Uri statusCallback = null,
+                                                                                string friendlyName = null,
+                                                                                string email = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateBundleOptions(pathSid) { Status = status, StatusCallback = statusCallback, FriendlyName = friendlyName, Email = email };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteBundleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Bundles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Bundle.
+    /// </summary>
+    /// <param name="options"> Delete Bundle parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bundle </returns>
+    public static bool Delete(DeleteBundleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Bundle.
+    /// </summary>
+    /// <param name="options"> Delete Bundle parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bundle </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBundleOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Bundle.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bundle </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteBundleOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Bundle.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bundle </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteBundleOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a BundleResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BundleResource object represented by the provided JSON </returns>
+    public static BundleResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BundleResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string of a regulation.
+    /// </summary>
+    [JsonProperty("regulation_sid")]
+    public string RegulationSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The verification status of the Bundle resource
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public BundleResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource will be valid until.
+    /// </summary>
+    [JsonProperty("valid_until")]
+    public DateTime? ValidUntil { get; private set; }
+    /// <summary>
+    /// The email address
+    /// </summary>
+    [JsonProperty("email")]
+    public string Email { get; private set; }
+    /// <summary>
+    /// The URL we call to inform your application of status changes.
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Bundle resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of the Assigned Items of the Bundle resource
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private BundleResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserOptions.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserOptions.cs
index d43bc90e4..00c35dc11 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserOptions.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserOptions.cs
@@ -9,185 +9,185 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance
-{
-
+{
+
+  /// <summary>
+  /// Create a new End User.
+  /// </summary>
+  public class CreateEndUserOptions : IOptions<EndUserResource>
+  {
     /// <summary>
-    /// Create a new End User.
-    /// </summary>
-    public class CreateEndUserOptions : IOptions<EndUserResource>
-    {
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The type of end user of the Bundle resource
-        /// </summary>
-        public EndUserResource.TypeEnum Type { get; }
-        /// <summary>
-        /// The set of parameters that compose the End User resource
-        /// </summary>
-        public object Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateEndUserOptions
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="type"> The type of end user of the Bundle resource </param>
-        public CreateEndUserOptions(string friendlyName, EndUserResource.TypeEnum type)
-        {
-            FriendlyName = friendlyName;
-            Type = type;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
-            }
-
-            return p;
-        }
-    }
-
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
     /// <summary>
-    /// Retrieve a list of all End User for an account.
-    /// </summary>
-    public class ReadEndUserOptions : ReadOptions<EndUserResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The type of end user of the Bundle resource
+    /// </summary>
+    public EndUserResource.TypeEnum Type { get; }
     /// <summary>
-    /// Fetch specific End User Instance.
+    /// The set of parameters that compose the End User resource
     /// </summary>
-    public class FetchEndUserOptions : IOptions<EndUserResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchEndUserOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchEndUserOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public object Attributes { get; set; }
+
     /// <summary>
-    /// Update an existing End User.
-    /// </summary>
-    public class UpdateEndUserOptions : IOptions<EndUserResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The set of parameters that compose the End User resource
-        /// </summary>
-        public object Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateEndUserOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateEndUserOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new CreateEndUserOptions
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="type"> The type of end user of the Bundle resource </param>
+    public CreateEndUserOptions(string friendlyName, EndUserResource.TypeEnum type)
+    {
+      FriendlyName = friendlyName;
+      Type = type;
+    }
+
     /// <summary>
-    /// Delete a specific End User.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteEndUserOptions : IOptions<EndUserResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteEndUserOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteEndUserOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all End User for an account.
+  /// </summary>
+  public class ReadEndUserOptions : ReadOptions<EndUserResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific End User Instance.
+  /// </summary>
+  public class FetchEndUserOptions : IOptions<EndUserResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchEndUserOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchEndUserOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing End User.
+  /// </summary>
+  public class UpdateEndUserOptions : IOptions<EndUserResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The set of parameters that compose the End User resource
+    /// </summary>
+    public object Attributes { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateEndUserOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateEndUserOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific End User.
+  /// </summary>
+  public class DeleteEndUserOptions : IOptions<EndUserResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteEndUserOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteEndUserOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserResource.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserResource.cs
index 59522fb61..e8d5c18be 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserResource.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserResource.cs
@@ -17,501 +17,501 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance
-{
-
-    public class EndUserResource : Resource
-    {
-        public sealed class TypeEnum : StringEnum
-        {
-            private TypeEnum(string value) : base(value) {}
-            public TypeEnum() {}
-            public static implicit operator TypeEnum(string value)
-            {
-                return new TypeEnum(value);
-            }
-
-            public static readonly TypeEnum Individual = new TypeEnum("individual");
-            public static readonly TypeEnum Business = new TypeEnum("business");
-        }
-
-        private static Request BuildCreateRequest(CreateEndUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/EndUsers",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new End User.
-        /// </summary>
-        /// <param name="options"> Create EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static EndUserResource Create(CreateEndUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new End User.
-        /// </summary>
-        /// <param name="options"> Create EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<EndUserResource> CreateAsync(CreateEndUserOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new End User.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="type"> The type of end user of the Bundle resource </param>
-        /// <param name="attributes"> The set of parameters that compose the End User resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static EndUserResource Create(string friendlyName,
-                                             EndUserResource.TypeEnum type,
-                                             object attributes = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateEndUserOptions(friendlyName, type){Attributes = attributes};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new End User.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="type"> The type of end user of the Bundle resource </param>
-        /// <param name="attributes"> The set of parameters that compose the End User resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<EndUserResource> CreateAsync(string friendlyName,
-                                                                                     EndUserResource.TypeEnum type,
-                                                                                     object attributes = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateEndUserOptions(friendlyName, type){Attributes = attributes};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadEndUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/EndUsers",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all End User for an account.
-        /// </summary>
-        /// <param name="options"> Read EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static ResourceSet<EndUserResource> Read(ReadEndUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<EndUserResource>.FromJson("results", response.Content);
-            return new ResourceSet<EndUserResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all End User for an account.
-        /// </summary>
-        /// <param name="options"> Read EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EndUserResource>> ReadAsync(ReadEndUserOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<EndUserResource>.FromJson("results", response.Content);
-            return new ResourceSet<EndUserResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all End User for an account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static ResourceSet<EndUserResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadEndUserOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all End User for an account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EndUserResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadEndUserOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<EndUserResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<EndUserResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<EndUserResource> NextPage(Page<EndUserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<EndUserResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<EndUserResource> PreviousPage(Page<EndUserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<EndUserResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchEndUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/EndUsers/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific End User Instance.
-        /// </summary>
-        /// <param name="options"> Fetch EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static EndUserResource Fetch(FetchEndUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific End User Instance.
-        /// </summary>
-        /// <param name="options"> Fetch EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<EndUserResource> FetchAsync(FetchEndUserOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific End User Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static EndUserResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchEndUserOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific End User Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<EndUserResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchEndUserOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateEndUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/EndUsers/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an existing End User.
-        /// </summary>
-        /// <param name="options"> Update EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static EndUserResource Update(UpdateEndUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing End User.
-        /// </summary>
-        /// <param name="options"> Update EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<EndUserResource> UpdateAsync(UpdateEndUserOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing End User.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The set of parameters that compose the End User resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static EndUserResource Update(string pathSid,
-                                             string friendlyName = null,
-                                             object attributes = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateEndUserOptions(pathSid){FriendlyName = friendlyName, Attributes = attributes};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing End User.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The set of parameters that compose the End User resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<EndUserResource> UpdateAsync(string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     object attributes = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateEndUserOptions(pathSid){FriendlyName = friendlyName, Attributes = attributes};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteEndUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/EndUsers/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific End User.
-        /// </summary>
-        /// <param name="options"> Delete EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static bool Delete(DeleteEndUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific End User.
-        /// </summary>
-        /// <param name="options"> Delete EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteEndUserOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific End User.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteEndUserOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific End User.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteEndUserOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a EndUserResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EndUserResource object represented by the provided JSON </returns>
-        public static EndUserResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EndUserResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type of end user of the Bundle resource
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public EndUserResource.TypeEnum Type { get; private set; }
-        /// <summary>
-        /// The set of parameters that compose the End Users resource
-        /// </summary>
-        [JsonProperty("attributes")]
-        public object Attributes { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the End User resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private EndUserResource()
-        {
-
-        }
-    }
+{
+
+  public class EndUserResource : Resource
+  {
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+      public TypeEnum() { }
+      public static implicit operator TypeEnum(string value)
+      {
+        return new TypeEnum(value);
+      }
+
+      public static readonly TypeEnum Individual = new TypeEnum("individual");
+      public static readonly TypeEnum Business = new TypeEnum("business");
+    }
+
+    private static Request BuildCreateRequest(CreateEndUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/EndUsers",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new End User.
+    /// </summary>
+    /// <param name="options"> Create EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static EndUserResource Create(CreateEndUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new End User.
+    /// </summary>
+    /// <param name="options"> Create EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<EndUserResource> CreateAsync(CreateEndUserOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new End User.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="type"> The type of end user of the Bundle resource </param>
+    /// <param name="attributes"> The set of parameters that compose the End User resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static EndUserResource Create(string friendlyName,
+                                         EndUserResource.TypeEnum type,
+                                         object attributes = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateEndUserOptions(friendlyName, type) { Attributes = attributes };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new End User.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="type"> The type of end user of the Bundle resource </param>
+    /// <param name="attributes"> The set of parameters that compose the End User resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<EndUserResource> CreateAsync(string friendlyName,
+                                                                                 EndUserResource.TypeEnum type,
+                                                                                 object attributes = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateEndUserOptions(friendlyName, type) { Attributes = attributes };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadEndUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/EndUsers",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all End User for an account.
+    /// </summary>
+    /// <param name="options"> Read EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static ResourceSet<EndUserResource> Read(ReadEndUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<EndUserResource>.FromJson("results", response.Content);
+      return new ResourceSet<EndUserResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all End User for an account.
+    /// </summary>
+    /// <param name="options"> Read EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EndUserResource>> ReadAsync(ReadEndUserOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<EndUserResource>.FromJson("results", response.Content);
+      return new ResourceSet<EndUserResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all End User for an account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static ResourceSet<EndUserResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadEndUserOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all End User for an account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EndUserResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadEndUserOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<EndUserResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<EndUserResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<EndUserResource> NextPage(Page<EndUserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<EndUserResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<EndUserResource> PreviousPage(Page<EndUserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<EndUserResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchEndUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/EndUsers/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific End User Instance.
+    /// </summary>
+    /// <param name="options"> Fetch EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static EndUserResource Fetch(FetchEndUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific End User Instance.
+    /// </summary>
+    /// <param name="options"> Fetch EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<EndUserResource> FetchAsync(FetchEndUserOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific End User Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static EndUserResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchEndUserOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific End User Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<EndUserResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchEndUserOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateEndUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/EndUsers/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an existing End User.
+    /// </summary>
+    /// <param name="options"> Update EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static EndUserResource Update(UpdateEndUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing End User.
+    /// </summary>
+    /// <param name="options"> Update EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<EndUserResource> UpdateAsync(UpdateEndUserOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing End User.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The set of parameters that compose the End User resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static EndUserResource Update(string pathSid,
+                                         string friendlyName = null,
+                                         object attributes = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateEndUserOptions(pathSid) { FriendlyName = friendlyName, Attributes = attributes };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing End User.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The set of parameters that compose the End User resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<EndUserResource> UpdateAsync(string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 object attributes = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateEndUserOptions(pathSid) { FriendlyName = friendlyName, Attributes = attributes };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteEndUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/EndUsers/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific End User.
+    /// </summary>
+    /// <param name="options"> Delete EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static bool Delete(DeleteEndUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific End User.
+    /// </summary>
+    /// <param name="options"> Delete EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteEndUserOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific End User.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteEndUserOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific End User.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteEndUserOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a EndUserResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EndUserResource object represented by the provided JSON </returns>
+    public static EndUserResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EndUserResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type of end user of the Bundle resource
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public EndUserResource.TypeEnum Type { get; private set; }
+    /// <summary>
+    /// The set of parameters that compose the End Users resource
+    /// </summary>
+    [JsonProperty("attributes")]
+    public object Attributes { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the End User resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private EndUserResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserTypeOptions.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserTypeOptions.cs
index 79017f464..7331f34e4 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserTypeOptions.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserTypeOptions.cs
@@ -9,55 +9,55 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all End-User Types.
+  /// </summary>
+  public class ReadEndUserTypeOptions : ReadOptions<EndUserTypeResource>
+  {
     /// <summary>
-    /// Retrieve a list of all End-User Types.
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadEndUserTypeOptions : ReadOptions<EndUserTypeResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific End-User Type Instance.
+  /// </summary>
+  public class FetchEndUserTypeOptions : IOptions<EndUserTypeResource>
+  {
     /// <summary>
-    /// Fetch a specific End-User Type Instance.
+    /// The unique string that identifies the End-User Type resource
     /// </summary>
-    public class FetchEndUserTypeOptions : IOptions<EndUserTypeResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the End-User Type resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchEndUserTypeOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the End-User Type resource </param>
-        public FetchEndUserTypeOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchEndUserTypeOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the End-User Type resource </param>
+    public FetchEndUserTypeOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserTypeResource.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserTypeResource.cs
index 77c02ebc0..b2acfd3cc 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserTypeResource.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/EndUserTypeResource.cs
@@ -16,254 +16,254 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance
-{
-
-    public class EndUserTypeResource : Resource
-    {
-        private static Request BuildReadRequest(ReadEndUserTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/EndUserTypes",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all End-User Types.
-        /// </summary>
-        /// <param name="options"> Read EndUserType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUserType </returns>
-        public static ResourceSet<EndUserTypeResource> Read(ReadEndUserTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
-            return new ResourceSet<EndUserTypeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all End-User Types.
-        /// </summary>
-        /// <param name="options"> Read EndUserType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUserType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EndUserTypeResource>> ReadAsync(ReadEndUserTypeOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
-            return new ResourceSet<EndUserTypeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all End-User Types.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUserType </returns>
-        public static ResourceSet<EndUserTypeResource> Read(int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadEndUserTypeOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all End-User Types.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUserType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EndUserTypeResource>> ReadAsync(int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadEndUserTypeOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<EndUserTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<EndUserTypeResource> NextPage(Page<EndUserTypeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<EndUserTypeResource> PreviousPage(Page<EndUserTypeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchEndUserTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/EndUserTypes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific End-User Type Instance.
-        /// </summary>
-        /// <param name="options"> Fetch EndUserType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUserType </returns>
-        public static EndUserTypeResource Fetch(FetchEndUserTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific End-User Type Instance.
-        /// </summary>
-        /// <param name="options"> Fetch EndUserType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUserType </returns>
-        public static async System.Threading.Tasks.Task<EndUserTypeResource> FetchAsync(FetchEndUserTypeOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific End-User Type Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the End-User Type resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUserType </returns>
-        public static EndUserTypeResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchEndUserTypeOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific End-User Type Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the End-User Type resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUserType </returns>
-        public static async System.Threading.Tasks.Task<EndUserTypeResource> FetchAsync(string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchEndUserTypeOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a EndUserTypeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EndUserTypeResource object represented by the provided JSON </returns>
-        public static EndUserTypeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EndUserTypeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the End-User Type resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A human-readable description of the End-User Type resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A machine-readable description of the End-User Type resource
-        /// </summary>
-        [JsonProperty("machine_name")]
-        public string MachineName { get; private set; }
-        /// <summary>
-        /// The required information for creating an End-User.
-        /// </summary>
-        [JsonProperty("fields")]
-        public List<object> Fields { get; private set; }
-        /// <summary>
-        /// The absolute URL of the End-User Type resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private EndUserTypeResource()
-        {
-
-        }
-    }
+{
+
+  public class EndUserTypeResource : Resource
+  {
+    private static Request BuildReadRequest(ReadEndUserTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/EndUserTypes",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all End-User Types.
+    /// </summary>
+    /// <param name="options"> Read EndUserType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUserType </returns>
+    public static ResourceSet<EndUserTypeResource> Read(ReadEndUserTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
+      return new ResourceSet<EndUserTypeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all End-User Types.
+    /// </summary>
+    /// <param name="options"> Read EndUserType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUserType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EndUserTypeResource>> ReadAsync(ReadEndUserTypeOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
+      return new ResourceSet<EndUserTypeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all End-User Types.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUserType </returns>
+    public static ResourceSet<EndUserTypeResource> Read(int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadEndUserTypeOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all End-User Types.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUserType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EndUserTypeResource>> ReadAsync(int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadEndUserTypeOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<EndUserTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<EndUserTypeResource> NextPage(Page<EndUserTypeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<EndUserTypeResource> PreviousPage(Page<EndUserTypeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchEndUserTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/EndUserTypes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific End-User Type Instance.
+    /// </summary>
+    /// <param name="options"> Fetch EndUserType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUserType </returns>
+    public static EndUserTypeResource Fetch(FetchEndUserTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific End-User Type Instance.
+    /// </summary>
+    /// <param name="options"> Fetch EndUserType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUserType </returns>
+    public static async System.Threading.Tasks.Task<EndUserTypeResource> FetchAsync(FetchEndUserTypeOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific End-User Type Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the End-User Type resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUserType </returns>
+    public static EndUserTypeResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchEndUserTypeOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific End-User Type Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the End-User Type resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUserType </returns>
+    public static async System.Threading.Tasks.Task<EndUserTypeResource> FetchAsync(string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchEndUserTypeOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a EndUserTypeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EndUserTypeResource object represented by the provided JSON </returns>
+    public static EndUserTypeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EndUserTypeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the End-User Type resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A human-readable description of the End-User Type resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A machine-readable description of the End-User Type resource
+    /// </summary>
+    [JsonProperty("machine_name")]
+    public string MachineName { get; private set; }
+    /// <summary>
+    /// The required information for creating an End-User.
+    /// </summary>
+    [JsonProperty("fields")]
+    public List<object> Fields { get; private set; }
+    /// <summary>
+    /// The absolute URL of the End-User Type resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private EndUserTypeResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/RegulationOptions.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/RegulationOptions.cs
index e06019965..6ea926a3c 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/RegulationOptions.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/RegulationOptions.cs
@@ -9,83 +9,83 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Regulations.
+  /// </summary>
+  public class ReadRegulationOptions : ReadOptions<RegulationResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Regulations.
+    /// The type of End User of the Regulation resource
     /// </summary>
-    public class ReadRegulationOptions : ReadOptions<RegulationResource>
-    {
-        /// <summary>
-        /// The type of End User of the Regulation resource
-        /// </summary>
-        public RegulationResource.EndUserTypeEnum EndUserType { get; set; }
-        /// <summary>
-        /// The ISO country code of the phone number's country
-        /// </summary>
-        public string IsoCountry { get; set; }
-        /// <summary>
-        /// The type of phone number being regulated
-        /// </summary>
-        public string NumberType { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (EndUserType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndUserType", EndUserType.ToString()));
-            }
-
-            if (IsoCountry != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry));
-            }
-
-            if (NumberType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NumberType", NumberType));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public RegulationResource.EndUserTypeEnum EndUserType { get; set; }
     /// <summary>
-    /// Fetch specific Regulation Instance.
+    /// The ISO country code of the phone number's country
     /// </summary>
-    public class FetchRegulationOptions : IOptions<RegulationResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the Regulation resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRegulationOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the Regulation resource </param>
-        public FetchRegulationOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string IsoCountry { get; set; }
+    /// <summary>
+    /// The type of phone number being regulated
+    /// </summary>
+    public string NumberType { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (EndUserType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndUserType", EndUserType.ToString()));
+      }
+
+      if (IsoCountry != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry));
+      }
+
+      if (NumberType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NumberType", NumberType));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific Regulation Instance.
+  /// </summary>
+  public class FetchRegulationOptions : IOptions<RegulationResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the Regulation resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchRegulationOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the Regulation resource </param>
+    public FetchRegulationOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/RegulationResource.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/RegulationResource.cs
index d0ad0f968..940ad0b98 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/RegulationResource.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/RegulationResource.cs
@@ -17,290 +17,290 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance
-{
-
-    public class RegulationResource : Resource
-    {
-        public sealed class EndUserTypeEnum : StringEnum
-        {
-            private EndUserTypeEnum(string value) : base(value) {}
-            public EndUserTypeEnum() {}
-            public static implicit operator EndUserTypeEnum(string value)
-            {
-                return new EndUserTypeEnum(value);
-            }
-
-            public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
-            public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
-        }
-
-        private static Request BuildReadRequest(ReadRegulationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Regulations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Regulations.
-        /// </summary>
-        /// <param name="options"> Read Regulation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Regulation </returns>
-        public static ResourceSet<RegulationResource> Read(ReadRegulationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RegulationResource>.FromJson("results", response.Content);
-            return new ResourceSet<RegulationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Regulations.
-        /// </summary>
-        /// <param name="options"> Read Regulation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Regulation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RegulationResource>> ReadAsync(ReadRegulationOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RegulationResource>.FromJson("results", response.Content);
-            return new ResourceSet<RegulationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Regulations.
-        /// </summary>
-        /// <param name="endUserType"> The type of End User of the Regulation resource </param>
-        /// <param name="isoCountry"> The ISO country code of the phone number's country </param>
-        /// <param name="numberType"> The type of phone number being regulated </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Regulation </returns>
-        public static ResourceSet<RegulationResource> Read(RegulationResource.EndUserTypeEnum endUserType = null,
-                                                           string isoCountry = null,
-                                                           string numberType = null,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadRegulationOptions(){EndUserType = endUserType, IsoCountry = isoCountry, NumberType = numberType, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Regulations.
-        /// </summary>
-        /// <param name="endUserType"> The type of End User of the Regulation resource </param>
-        /// <param name="isoCountry"> The ISO country code of the phone number's country </param>
-        /// <param name="numberType"> The type of phone number being regulated </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Regulation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RegulationResource>> ReadAsync(RegulationResource.EndUserTypeEnum endUserType = null,
-                                                                                                   string isoCountry = null,
-                                                                                                   string numberType = null,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadRegulationOptions(){EndUserType = endUserType, IsoCountry = isoCountry, NumberType = numberType, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RegulationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RegulationResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RegulationResource> NextPage(Page<RegulationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<RegulationResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RegulationResource> PreviousPage(Page<RegulationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<RegulationResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchRegulationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/Regulations/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific Regulation Instance.
-        /// </summary>
-        /// <param name="options"> Fetch Regulation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Regulation </returns>
-        public static RegulationResource Fetch(FetchRegulationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Regulation Instance.
-        /// </summary>
-        /// <param name="options"> Fetch Regulation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Regulation </returns>
-        public static async System.Threading.Tasks.Task<RegulationResource> FetchAsync(FetchRegulationOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific Regulation Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the Regulation resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Regulation </returns>
-        public static RegulationResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRegulationOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Regulation Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the Regulation resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Regulation </returns>
-        public static async System.Threading.Tasks.Task<RegulationResource> FetchAsync(string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchRegulationOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RegulationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RegulationResource object represented by the provided JSON </returns>
-        public static RegulationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RegulationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Regulation resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A human-readable description of the Regulation resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The ISO country code of the phone number's country
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The type of phone number restricted by the regulatory requirement
-        /// </summary>
-        [JsonProperty("number_type")]
-        public string NumberType { get; private set; }
-        /// <summary>
-        /// The type of End User of the Regulation resource
-        /// </summary>
-        [JsonProperty("end_user_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RegulationResource.EndUserTypeEnum EndUserType { get; private set; }
-        /// <summary>
-        /// The sid of a regulation object that dictates requirements
-        /// </summary>
-        [JsonProperty("requirements")]
-        public object Requirements { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Regulation resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private RegulationResource()
-        {
-
-        }
-    }
+{
+
+  public class RegulationResource : Resource
+  {
+    public sealed class EndUserTypeEnum : StringEnum
+    {
+      private EndUserTypeEnum(string value) : base(value) { }
+      public EndUserTypeEnum() { }
+      public static implicit operator EndUserTypeEnum(string value)
+      {
+        return new EndUserTypeEnum(value);
+      }
+
+      public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
+      public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
+    }
+
+    private static Request BuildReadRequest(ReadRegulationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Regulations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Regulations.
+    /// </summary>
+    /// <param name="options"> Read Regulation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Regulation </returns>
+    public static ResourceSet<RegulationResource> Read(ReadRegulationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RegulationResource>.FromJson("results", response.Content);
+      return new ResourceSet<RegulationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Regulations.
+    /// </summary>
+    /// <param name="options"> Read Regulation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Regulation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RegulationResource>> ReadAsync(ReadRegulationOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RegulationResource>.FromJson("results", response.Content);
+      return new ResourceSet<RegulationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Regulations.
+    /// </summary>
+    /// <param name="endUserType"> The type of End User of the Regulation resource </param>
+    /// <param name="isoCountry"> The ISO country code of the phone number's country </param>
+    /// <param name="numberType"> The type of phone number being regulated </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Regulation </returns>
+    public static ResourceSet<RegulationResource> Read(RegulationResource.EndUserTypeEnum endUserType = null,
+                                                       string isoCountry = null,
+                                                       string numberType = null,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadRegulationOptions() { EndUserType = endUserType, IsoCountry = isoCountry, NumberType = numberType, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Regulations.
+    /// </summary>
+    /// <param name="endUserType"> The type of End User of the Regulation resource </param>
+    /// <param name="isoCountry"> The ISO country code of the phone number's country </param>
+    /// <param name="numberType"> The type of phone number being regulated </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Regulation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RegulationResource>> ReadAsync(RegulationResource.EndUserTypeEnum endUserType = null,
+                                                                                               string isoCountry = null,
+                                                                                               string numberType = null,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadRegulationOptions() { EndUserType = endUserType, IsoCountry = isoCountry, NumberType = numberType, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RegulationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RegulationResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RegulationResource> NextPage(Page<RegulationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<RegulationResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RegulationResource> PreviousPage(Page<RegulationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<RegulationResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchRegulationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/Regulations/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific Regulation Instance.
+    /// </summary>
+    /// <param name="options"> Fetch Regulation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Regulation </returns>
+    public static RegulationResource Fetch(FetchRegulationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Regulation Instance.
+    /// </summary>
+    /// <param name="options"> Fetch Regulation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Regulation </returns>
+    public static async System.Threading.Tasks.Task<RegulationResource> FetchAsync(FetchRegulationOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific Regulation Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the Regulation resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Regulation </returns>
+    public static RegulationResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRegulationOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Regulation Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the Regulation resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Regulation </returns>
+    public static async System.Threading.Tasks.Task<RegulationResource> FetchAsync(string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchRegulationOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RegulationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RegulationResource object represented by the provided JSON </returns>
+    public static RegulationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RegulationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Regulation resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A human-readable description of the Regulation resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The ISO country code of the phone number's country
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The type of phone number restricted by the regulatory requirement
+    /// </summary>
+    [JsonProperty("number_type")]
+    public string NumberType { get; private set; }
+    /// <summary>
+    /// The type of End User of the Regulation resource
+    /// </summary>
+    [JsonProperty("end_user_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RegulationResource.EndUserTypeEnum EndUserType { get; private set; }
+    /// <summary>
+    /// The sid of a regulation object that dictates requirements
+    /// </summary>
+    [JsonProperty("requirements")]
+    public object Requirements { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Regulation resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private RegulationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentOptions.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentOptions.cs
index 826278492..f4fb2acee 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentOptions.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentOptions.cs
@@ -9,185 +9,185 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance
-{
-
+{
+
+  /// <summary>
+  /// Create a new Supporting Document.
+  /// </summary>
+  public class CreateSupportingDocumentOptions : IOptions<SupportingDocumentResource>
+  {
     /// <summary>
-    /// Create a new Supporting Document.
-    /// </summary>
-    public class CreateSupportingDocumentOptions : IOptions<SupportingDocumentResource>
-    {
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The type of the Supporting Document
-        /// </summary>
-        public string Type { get; }
-        /// <summary>
-        /// The set of parameters that compose the Supporting Documents resource
-        /// </summary>
-        public object Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSupportingDocumentOptions
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="type"> The type of the Supporting Document </param>
-        public CreateSupportingDocumentOptions(string friendlyName, string type)
-        {
-            FriendlyName = friendlyName;
-            Type = type;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
-            }
-
-            return p;
-        }
-    }
-
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
     /// <summary>
-    /// Retrieve a list of all Supporting Document for an account.
-    /// </summary>
-    public class ReadSupportingDocumentOptions : ReadOptions<SupportingDocumentResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The type of the Supporting Document
+    /// </summary>
+    public string Type { get; }
     /// <summary>
-    /// Fetch specific Supporting Document Instance.
+    /// The set of parameters that compose the Supporting Documents resource
     /// </summary>
-    public class FetchSupportingDocumentOptions : IOptions<SupportingDocumentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSupportingDocumentOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchSupportingDocumentOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public object Attributes { get; set; }
+
     /// <summary>
-    /// Update an existing Supporting Document.
-    /// </summary>
-    public class UpdateSupportingDocumentOptions : IOptions<SupportingDocumentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The set of parameters that compose the Supporting Document resource
-        /// </summary>
-        public object Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSupportingDocumentOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateSupportingDocumentOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new CreateSupportingDocumentOptions
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="type"> The type of the Supporting Document </param>
+    public CreateSupportingDocumentOptions(string friendlyName, string type)
+    {
+      FriendlyName = friendlyName;
+      Type = type;
+    }
+
     /// <summary>
-    /// Delete a specific Supporting Document.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteSupportingDocumentOptions : IOptions<SupportingDocumentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSupportingDocumentOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteSupportingDocumentOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Supporting Document for an account.
+  /// </summary>
+  public class ReadSupportingDocumentOptions : ReadOptions<SupportingDocumentResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific Supporting Document Instance.
+  /// </summary>
+  public class FetchSupportingDocumentOptions : IOptions<SupportingDocumentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchSupportingDocumentOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchSupportingDocumentOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing Supporting Document.
+  /// </summary>
+  public class UpdateSupportingDocumentOptions : IOptions<SupportingDocumentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The set of parameters that compose the Supporting Document resource
+    /// </summary>
+    public object Attributes { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSupportingDocumentOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateSupportingDocumentOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Supporting Document.
+  /// </summary>
+  public class DeleteSupportingDocumentOptions : IOptions<SupportingDocumentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSupportingDocumentOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteSupportingDocumentOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentResource.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentResource.cs
index 13dbddb1e..1ea53df9f 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentResource.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentResource.cs
@@ -17,521 +17,521 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance
-{
-
-    public class SupportingDocumentResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Draft = new StatusEnum("draft");
-            public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
-            public static readonly StatusEnum Rejected = new StatusEnum("rejected");
-            public static readonly StatusEnum Approved = new StatusEnum("approved");
-            public static readonly StatusEnum Expired = new StatusEnum("expired");
-            public static readonly StatusEnum ProvisionallyApproved = new StatusEnum("provisionally-approved");
-        }
-
-        private static Request BuildCreateRequest(CreateSupportingDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/SupportingDocuments",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Supporting Document.
-        /// </summary>
-        /// <param name="options"> Create SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static SupportingDocumentResource Create(CreateSupportingDocumentOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Supporting Document.
-        /// </summary>
-        /// <param name="options"> Create SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentResource> CreateAsync(CreateSupportingDocumentOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Supporting Document.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="type"> The type of the Supporting Document </param>
-        /// <param name="attributes"> The set of parameters that compose the Supporting Documents resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static SupportingDocumentResource Create(string friendlyName,
-                                                        string type,
-                                                        object attributes = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateSupportingDocumentOptions(friendlyName, type){Attributes = attributes};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Supporting Document.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="type"> The type of the Supporting Document </param>
-        /// <param name="attributes"> The set of parameters that compose the Supporting Documents resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentResource> CreateAsync(string friendlyName,
-                                                                                                string type,
-                                                                                                object attributes = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateSupportingDocumentOptions(friendlyName, type){Attributes = attributes};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSupportingDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/SupportingDocuments",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Supporting Document for an account.
-        /// </summary>
-        /// <param name="options"> Read SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static ResourceSet<SupportingDocumentResource> Read(ReadSupportingDocumentOptions options,
-                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SupportingDocumentResource>.FromJson("results", response.Content);
-            return new ResourceSet<SupportingDocumentResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Supporting Document for an account.
-        /// </summary>
-        /// <param name="options"> Read SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentResource>> ReadAsync(ReadSupportingDocumentOptions options,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SupportingDocumentResource>.FromJson("results", response.Content);
-            return new ResourceSet<SupportingDocumentResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Supporting Document for an account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static ResourceSet<SupportingDocumentResource> Read(int? pageSize = null,
-                                                                   long? limit = null,
-                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadSupportingDocumentOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Supporting Document for an account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentResource>> ReadAsync(int? pageSize = null,
-                                                                                                           long? limit = null,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadSupportingDocumentOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SupportingDocumentResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SupportingDocumentResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SupportingDocumentResource> NextPage(Page<SupportingDocumentResource> page,
-                                                                ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<SupportingDocumentResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SupportingDocumentResource> PreviousPage(Page<SupportingDocumentResource> page,
-                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<SupportingDocumentResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchSupportingDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/SupportingDocuments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific Supporting Document Instance.
-        /// </summary>
-        /// <param name="options"> Fetch SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static SupportingDocumentResource Fetch(FetchSupportingDocumentOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Supporting Document Instance.
-        /// </summary>
-        /// <param name="options"> Fetch SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentResource> FetchAsync(FetchSupportingDocumentOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific Supporting Document Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static SupportingDocumentResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSupportingDocumentOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Supporting Document Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentResource> FetchAsync(string pathSid,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchSupportingDocumentOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSupportingDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/SupportingDocuments/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an existing Supporting Document.
-        /// </summary>
-        /// <param name="options"> Update SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static SupportingDocumentResource Update(UpdateSupportingDocumentOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing Supporting Document.
-        /// </summary>
-        /// <param name="options"> Update SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentResource> UpdateAsync(UpdateSupportingDocumentOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing Supporting Document.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The set of parameters that compose the Supporting Document resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static SupportingDocumentResource Update(string pathSid,
-                                                        string friendlyName = null,
-                                                        object attributes = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateSupportingDocumentOptions(pathSid){FriendlyName = friendlyName, Attributes = attributes};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing Supporting Document.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The set of parameters that compose the Supporting Document resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentResource> UpdateAsync(string pathSid,
-                                                                                                string friendlyName = null,
-                                                                                                object attributes = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateSupportingDocumentOptions(pathSid){FriendlyName = friendlyName, Attributes = attributes};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSupportingDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/SupportingDocuments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Supporting Document.
-        /// </summary>
-        /// <param name="options"> Delete SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static bool Delete(DeleteSupportingDocumentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Supporting Document.
-        /// </summary>
-        /// <param name="options"> Delete SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSupportingDocumentOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Supporting Document.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSupportingDocumentOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Supporting Document.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSupportingDocumentOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SupportingDocumentResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SupportingDocumentResource object represented by the provided JSON </returns>
-        public static SupportingDocumentResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SupportingDocumentResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The image type of the file
-        /// </summary>
-        [JsonProperty("mime_type")]
-        public string MimeType { get; private set; }
-        /// <summary>
-        /// The verification status of the Supporting Document resource
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SupportingDocumentResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The type of the Supporting Document
-        /// </summary>
-        [JsonProperty("type")]
-        public string Type { get; private set; }
-        /// <summary>
-        /// The set of parameters that compose the Supporting Documents resource
-        /// </summary>
-        [JsonProperty("attributes")]
-        public object Attributes { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Supporting Document resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SupportingDocumentResource()
-        {
-
-        }
-    }
+{
+
+  public class SupportingDocumentResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Draft = new StatusEnum("draft");
+      public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
+      public static readonly StatusEnum Rejected = new StatusEnum("rejected");
+      public static readonly StatusEnum Approved = new StatusEnum("approved");
+      public static readonly StatusEnum Expired = new StatusEnum("expired");
+      public static readonly StatusEnum ProvisionallyApproved = new StatusEnum("provisionally-approved");
+    }
+
+    private static Request BuildCreateRequest(CreateSupportingDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/SupportingDocuments",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Supporting Document.
+    /// </summary>
+    /// <param name="options"> Create SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static SupportingDocumentResource Create(CreateSupportingDocumentOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Supporting Document.
+    /// </summary>
+    /// <param name="options"> Create SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentResource> CreateAsync(CreateSupportingDocumentOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Supporting Document.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="type"> The type of the Supporting Document </param>
+    /// <param name="attributes"> The set of parameters that compose the Supporting Documents resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static SupportingDocumentResource Create(string friendlyName,
+                                                    string type,
+                                                    object attributes = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateSupportingDocumentOptions(friendlyName, type) { Attributes = attributes };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Supporting Document.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="type"> The type of the Supporting Document </param>
+    /// <param name="attributes"> The set of parameters that compose the Supporting Documents resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentResource> CreateAsync(string friendlyName,
+                                                                                            string type,
+                                                                                            object attributes = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateSupportingDocumentOptions(friendlyName, type) { Attributes = attributes };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSupportingDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/SupportingDocuments",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Supporting Document for an account.
+    /// </summary>
+    /// <param name="options"> Read SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static ResourceSet<SupportingDocumentResource> Read(ReadSupportingDocumentOptions options,
+                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SupportingDocumentResource>.FromJson("results", response.Content);
+      return new ResourceSet<SupportingDocumentResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Supporting Document for an account.
+    /// </summary>
+    /// <param name="options"> Read SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentResource>> ReadAsync(ReadSupportingDocumentOptions options,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SupportingDocumentResource>.FromJson("results", response.Content);
+      return new ResourceSet<SupportingDocumentResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Supporting Document for an account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static ResourceSet<SupportingDocumentResource> Read(int? pageSize = null,
+                                                               long? limit = null,
+                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadSupportingDocumentOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Supporting Document for an account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentResource>> ReadAsync(int? pageSize = null,
+                                                                                                       long? limit = null,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadSupportingDocumentOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SupportingDocumentResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SupportingDocumentResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SupportingDocumentResource> NextPage(Page<SupportingDocumentResource> page,
+                                                            ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<SupportingDocumentResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SupportingDocumentResource> PreviousPage(Page<SupportingDocumentResource> page,
+                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<SupportingDocumentResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchSupportingDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/SupportingDocuments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific Supporting Document Instance.
+    /// </summary>
+    /// <param name="options"> Fetch SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static SupportingDocumentResource Fetch(FetchSupportingDocumentOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Supporting Document Instance.
+    /// </summary>
+    /// <param name="options"> Fetch SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentResource> FetchAsync(FetchSupportingDocumentOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific Supporting Document Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static SupportingDocumentResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSupportingDocumentOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Supporting Document Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentResource> FetchAsync(string pathSid,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchSupportingDocumentOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSupportingDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/SupportingDocuments/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an existing Supporting Document.
+    /// </summary>
+    /// <param name="options"> Update SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static SupportingDocumentResource Update(UpdateSupportingDocumentOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing Supporting Document.
+    /// </summary>
+    /// <param name="options"> Update SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentResource> UpdateAsync(UpdateSupportingDocumentOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing Supporting Document.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The set of parameters that compose the Supporting Document resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static SupportingDocumentResource Update(string pathSid,
+                                                    string friendlyName = null,
+                                                    object attributes = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateSupportingDocumentOptions(pathSid) { FriendlyName = friendlyName, Attributes = attributes };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing Supporting Document.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The set of parameters that compose the Supporting Document resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentResource> UpdateAsync(string pathSid,
+                                                                                            string friendlyName = null,
+                                                                                            object attributes = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateSupportingDocumentOptions(pathSid) { FriendlyName = friendlyName, Attributes = attributes };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSupportingDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/SupportingDocuments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Supporting Document.
+    /// </summary>
+    /// <param name="options"> Delete SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static bool Delete(DeleteSupportingDocumentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Supporting Document.
+    /// </summary>
+    /// <param name="options"> Delete SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSupportingDocumentOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Supporting Document.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSupportingDocumentOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Supporting Document.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSupportingDocumentOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SupportingDocumentResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SupportingDocumentResource object represented by the provided JSON </returns>
+    public static SupportingDocumentResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SupportingDocumentResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The image type of the file
+    /// </summary>
+    [JsonProperty("mime_type")]
+    public string MimeType { get; private set; }
+    /// <summary>
+    /// The verification status of the Supporting Document resource
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public SupportingDocumentResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The type of the Supporting Document
+    /// </summary>
+    [JsonProperty("type")]
+    public string Type { get; private set; }
+    /// <summary>
+    /// The set of parameters that compose the Supporting Documents resource
+    /// </summary>
+    [JsonProperty("attributes")]
+    public object Attributes { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Supporting Document resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SupportingDocumentResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentTypeOptions.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentTypeOptions.cs
index f6df8a848..606d0190a 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentTypeOptions.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentTypeOptions.cs
@@ -9,55 +9,55 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Supporting Document Types.
+  /// </summary>
+  public class ReadSupportingDocumentTypeOptions : ReadOptions<SupportingDocumentTypeResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Supporting Document Types.
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadSupportingDocumentTypeOptions : ReadOptions<SupportingDocumentTypeResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific Supporting Document Type Instance.
+  /// </summary>
+  public class FetchSupportingDocumentTypeOptions : IOptions<SupportingDocumentTypeResource>
+  {
     /// <summary>
-    /// Fetch a specific Supporting Document Type Instance.
+    /// The unique string that identifies the Supporting Document Type resource
     /// </summary>
-    public class FetchSupportingDocumentTypeOptions : IOptions<SupportingDocumentTypeResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the Supporting Document Type resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSupportingDocumentTypeOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the Supporting Document Type resource </param>
-        public FetchSupportingDocumentTypeOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchSupportingDocumentTypeOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the Supporting Document Type resource </param>
+    public FetchSupportingDocumentTypeOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentTypeResource.cs b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentTypeResource.cs
index 2e6c47dd1..a2361d45a 100644
--- a/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentTypeResource.cs
+++ b/src/Twilio/Rest/Numbers/V2/RegulatoryCompliance/SupportingDocumentTypeResource.cs
@@ -16,258 +16,258 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Numbers.V2.RegulatoryCompliance
-{
-
-    public class SupportingDocumentTypeResource : Resource
-    {
-        private static Request BuildReadRequest(ReadSupportingDocumentTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/SupportingDocumentTypes",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Supporting Document Types.
-        /// </summary>
-        /// <param name="options"> Read SupportingDocumentType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocumentType </returns>
-        public static ResourceSet<SupportingDocumentTypeResource> Read(ReadSupportingDocumentTypeOptions options,
-                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
-            return new ResourceSet<SupportingDocumentTypeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Supporting Document Types.
-        /// </summary>
-        /// <param name="options"> Read SupportingDocumentType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentTypeResource>> ReadAsync(ReadSupportingDocumentTypeOptions options,
-                                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
-            return new ResourceSet<SupportingDocumentTypeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Supporting Document Types.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocumentType </returns>
-        public static ResourceSet<SupportingDocumentTypeResource> Read(int? pageSize = null,
-                                                                       long? limit = null,
-                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadSupportingDocumentTypeOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Supporting Document Types.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentTypeResource>> ReadAsync(int? pageSize = null,
-                                                                                                               long? limit = null,
-                                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadSupportingDocumentTypeOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SupportingDocumentTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SupportingDocumentTypeResource> NextPage(Page<SupportingDocumentTypeResource> page,
-                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SupportingDocumentTypeResource> PreviousPage(Page<SupportingDocumentTypeResource> page,
-                                                                        ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Numbers)
-            );
-
-            var response = client.Request(request);
-            return Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchSupportingDocumentTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Numbers,
-                "/v2/RegulatoryCompliance/SupportingDocumentTypes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Supporting Document Type Instance.
-        /// </summary>
-        /// <param name="options"> Fetch SupportingDocumentType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocumentType </returns>
-        public static SupportingDocumentTypeResource Fetch(FetchSupportingDocumentTypeOptions options,
-                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Supporting Document Type Instance.
-        /// </summary>
-        /// <param name="options"> Fetch SupportingDocumentType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentTypeResource> FetchAsync(FetchSupportingDocumentTypeOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Supporting Document Type Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the Supporting Document Type resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocumentType </returns>
-        public static SupportingDocumentTypeResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSupportingDocumentTypeOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Supporting Document Type Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the Supporting Document Type resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentTypeResource> FetchAsync(string pathSid,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchSupportingDocumentTypeOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SupportingDocumentTypeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SupportingDocumentTypeResource object represented by the provided JSON </returns>
-        public static SupportingDocumentTypeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SupportingDocumentTypeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Supporting Document Type resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A human-readable description of the Supporting Document Type resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The machine-readable description of the Supporting Document Type resource
-        /// </summary>
-        [JsonProperty("machine_name")]
-        public string MachineName { get; private set; }
-        /// <summary>
-        /// The required information for creating a Supporting Document
-        /// </summary>
-        [JsonProperty("fields")]
-        public List<object> Fields { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Supporting Document Type resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SupportingDocumentTypeResource()
-        {
-
-        }
-    }
+{
+
+  public class SupportingDocumentTypeResource : Resource
+  {
+    private static Request BuildReadRequest(ReadSupportingDocumentTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/SupportingDocumentTypes",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Supporting Document Types.
+    /// </summary>
+    /// <param name="options"> Read SupportingDocumentType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocumentType </returns>
+    public static ResourceSet<SupportingDocumentTypeResource> Read(ReadSupportingDocumentTypeOptions options,
+                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
+      return new ResourceSet<SupportingDocumentTypeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Supporting Document Types.
+    /// </summary>
+    /// <param name="options"> Read SupportingDocumentType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentTypeResource>> ReadAsync(ReadSupportingDocumentTypeOptions options,
+                                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
+      return new ResourceSet<SupportingDocumentTypeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Supporting Document Types.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocumentType </returns>
+    public static ResourceSet<SupportingDocumentTypeResource> Read(int? pageSize = null,
+                                                                   long? limit = null,
+                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadSupportingDocumentTypeOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Supporting Document Types.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentTypeResource>> ReadAsync(int? pageSize = null,
+                                                                                                           long? limit = null,
+                                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadSupportingDocumentTypeOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SupportingDocumentTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SupportingDocumentTypeResource> NextPage(Page<SupportingDocumentTypeResource> page,
+                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SupportingDocumentTypeResource> PreviousPage(Page<SupportingDocumentTypeResource> page,
+                                                                    ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Numbers)
+      );
+
+      var response = client.Request(request);
+      return Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchSupportingDocumentTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Numbers,
+          "/v2/RegulatoryCompliance/SupportingDocumentTypes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Supporting Document Type Instance.
+    /// </summary>
+    /// <param name="options"> Fetch SupportingDocumentType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocumentType </returns>
+    public static SupportingDocumentTypeResource Fetch(FetchSupportingDocumentTypeOptions options,
+                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Supporting Document Type Instance.
+    /// </summary>
+    /// <param name="options"> Fetch SupportingDocumentType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentTypeResource> FetchAsync(FetchSupportingDocumentTypeOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Supporting Document Type Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the Supporting Document Type resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocumentType </returns>
+    public static SupportingDocumentTypeResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSupportingDocumentTypeOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Supporting Document Type Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the Supporting Document Type resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentTypeResource> FetchAsync(string pathSid,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchSupportingDocumentTypeOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SupportingDocumentTypeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SupportingDocumentTypeResource object represented by the provided JSON </returns>
+    public static SupportingDocumentTypeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SupportingDocumentTypeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Supporting Document Type resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A human-readable description of the Supporting Document Type resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The machine-readable description of the Supporting Document Type resource
+    /// </summary>
+    [JsonProperty("machine_name")]
+    public string MachineName { get; private set; }
+    /// <summary>
+    /// The required information for creating a Supporting Document
+    /// </summary>
+    [JsonProperty("fields")]
+    public List<object> Fields { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Supporting Document Type resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SupportingDocumentTypeResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/BulkExports/Export/DayOptions.cs b/src/Twilio/Rest/Preview/BulkExports/Export/DayOptions.cs
index 70e728e5d..5a29e0242 100644
--- a/src/Twilio/Rest/Preview/BulkExports/Export/DayOptions.cs
+++ b/src/Twilio/Rest/Preview/BulkExports/Export/DayOptions.cs
@@ -9,81 +9,81 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.BulkExports.Export
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch a specific Day.
+  /// </summary>
+  public class FetchDayOptions : IOptions<DayResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch a specific Day.
+    /// The type of communication – Messages, Calls, Conferences, and Participants
     /// </summary>
-    public class FetchDayOptions : IOptions<DayResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-        /// <summary>
-        /// The date of the data in the file
-        /// </summary>
-        public string PathDay { get; }
-
-        /// <summary>
-        /// Construct a new FetchDayOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pathDay"> The date of the data in the file </param>
-        public FetchDayOptions(string pathResourceType, string pathDay)
-        {
-            PathResourceType = pathResourceType;
-            PathDay = pathDay;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathResourceType { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of all Days for a resource.
+    /// The date of the data in the file
     /// </summary>
-    public class ReadDayOptions : ReadOptions<DayResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-
-        /// <summary>
-        /// Construct a new ReadDayOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        public ReadDayOptions(string pathResourceType)
-        {
-            PathResourceType = pathResourceType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathDay { get; }
+
+    /// <summary>
+    /// Construct a new FetchDayOptions
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pathDay"> The date of the data in the file </param>
+    public FetchDayOptions(string pathResourceType, string pathDay)
+    {
+      PathResourceType = pathResourceType;
+      PathDay = pathDay;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of all Days for a resource.
+  /// </summary>
+  public class ReadDayOptions : ReadOptions<DayResource>
+  {
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    public string PathResourceType { get; }
+
+    /// <summary>
+    /// Construct a new ReadDayOptions
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    public ReadDayOptions(string pathResourceType)
+    {
+      PathResourceType = pathResourceType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/BulkExports/Export/DayResource.cs b/src/Twilio/Rest/Preview/BulkExports/Export/DayResource.cs
index 0989efd3a..ae0d0284e 100644
--- a/src/Twilio/Rest/Preview/BulkExports/Export/DayResource.cs
+++ b/src/Twilio/Rest/Preview/BulkExports/Export/DayResource.cs
@@ -19,266 +19,266 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.BulkExports.Export
-{
-
-    public class DayResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchDayOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/BulkExports/Exports/" + options.PathResourceType + "/Days/" + options.PathDay + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Day.
-        /// </summary>
-        /// <param name="options"> Fetch Day parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Day </returns>
-        public static DayResource Fetch(FetchDayOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Day.
-        /// </summary>
-        /// <param name="options"> Fetch Day parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Day </returns>
-        public static async System.Threading.Tasks.Task<DayResource> FetchAsync(FetchDayOptions options,
-                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Day.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pathDay"> The date of the data in the file </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Day </returns>
-        public static DayResource Fetch(string pathResourceType, string pathDay, ITwilioRestClient client = null)
-        {
-            var options = new FetchDayOptions(pathResourceType, pathDay);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Day.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pathDay"> The date of the data in the file </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Day </returns>
-        public static async System.Threading.Tasks.Task<DayResource> FetchAsync(string pathResourceType,
-                                                                                string pathDay,
-                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchDayOptions(pathResourceType, pathDay);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadDayOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/BulkExports/Exports/" + options.PathResourceType + "/Days",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Days for a resource.
-        /// </summary>
-        /// <param name="options"> Read Day parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Day </returns>
-        public static ResourceSet<DayResource> Read(ReadDayOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DayResource>.FromJson("days", response.Content);
-            return new ResourceSet<DayResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Days for a resource.
-        /// </summary>
-        /// <param name="options"> Read Day parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Day </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DayResource>> ReadAsync(ReadDayOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DayResource>.FromJson("days", response.Content);
-            return new ResourceSet<DayResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Days for a resource.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Day </returns>
-        public static ResourceSet<DayResource> Read(string pathResourceType,
-                                                    int? pageSize = null,
-                                                    long? limit = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadDayOptions(pathResourceType){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Days for a resource.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Day </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DayResource>> ReadAsync(string pathResourceType,
-                                                                                            int? pageSize = null,
-                                                                                            long? limit = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadDayOptions(pathResourceType){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DayResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DayResource>.FromJson("days", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DayResource> NextPage(Page<DayResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<DayResource>.FromJson("days", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DayResource> PreviousPage(Page<DayResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<DayResource>.FromJson("days", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a DayResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DayResource object represented by the provided JSON </returns>
-        public static DayResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DayResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The redirect_to
-        /// </summary>
-        [JsonProperty("redirect_to")]
-        public Uri RedirectTo { get; private set; }
-        /// <summary>
-        /// The date of the data in the file
-        /// </summary>
-        [JsonProperty("day")]
-        public string Day { get; private set; }
-        /// <summary>
-        /// Size of the file in bytes
-        /// </summary>
-        [JsonProperty("size")]
-        public int? Size { get; private set; }
-        /// <summary>
-        /// The date when resource is created
-        /// </summary>
-        [JsonProperty("create_date")]
-        public string CreateDate { get; private set; }
-        /// <summary>
-        /// The friendly name specified when creating the job
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        [JsonProperty("resource_type")]
-        public string ResourceType { get; private set; }
-
-        private DayResource()
-        {
-
-        }
-    }
+{
+
+  public class DayResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchDayOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/BulkExports/Exports/" + options.PathResourceType + "/Days/" + options.PathDay + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Day.
+    /// </summary>
+    /// <param name="options"> Fetch Day parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Day </returns>
+    public static DayResource Fetch(FetchDayOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Day.
+    /// </summary>
+    /// <param name="options"> Fetch Day parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Day </returns>
+    public static async System.Threading.Tasks.Task<DayResource> FetchAsync(FetchDayOptions options,
+                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Day.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pathDay"> The date of the data in the file </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Day </returns>
+    public static DayResource Fetch(string pathResourceType, string pathDay, ITwilioRestClient client = null)
+    {
+      var options = new FetchDayOptions(pathResourceType, pathDay);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Day.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pathDay"> The date of the data in the file </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Day </returns>
+    public static async System.Threading.Tasks.Task<DayResource> FetchAsync(string pathResourceType,
+                                                                            string pathDay,
+                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchDayOptions(pathResourceType, pathDay);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadDayOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/BulkExports/Exports/" + options.PathResourceType + "/Days",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Days for a resource.
+    /// </summary>
+    /// <param name="options"> Read Day parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Day </returns>
+    public static ResourceSet<DayResource> Read(ReadDayOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DayResource>.FromJson("days", response.Content);
+      return new ResourceSet<DayResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Days for a resource.
+    /// </summary>
+    /// <param name="options"> Read Day parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Day </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DayResource>> ReadAsync(ReadDayOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DayResource>.FromJson("days", response.Content);
+      return new ResourceSet<DayResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Days for a resource.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Day </returns>
+    public static ResourceSet<DayResource> Read(string pathResourceType,
+                                                int? pageSize = null,
+                                                long? limit = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadDayOptions(pathResourceType) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Days for a resource.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Day </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DayResource>> ReadAsync(string pathResourceType,
+                                                                                        int? pageSize = null,
+                                                                                        long? limit = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadDayOptions(pathResourceType) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DayResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DayResource>.FromJson("days", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DayResource> NextPage(Page<DayResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<DayResource>.FromJson("days", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DayResource> PreviousPage(Page<DayResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<DayResource>.FromJson("days", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a DayResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DayResource object represented by the provided JSON </returns>
+    public static DayResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DayResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The redirect_to
+    /// </summary>
+    [JsonProperty("redirect_to")]
+    public Uri RedirectTo { get; private set; }
+    /// <summary>
+    /// The date of the data in the file
+    /// </summary>
+    [JsonProperty("day")]
+    public string Day { get; private set; }
+    /// <summary>
+    /// Size of the file in bytes
+    /// </summary>
+    [JsonProperty("size")]
+    public int? Size { get; private set; }
+    /// <summary>
+    /// The date when resource is created
+    /// </summary>
+    [JsonProperty("create_date")]
+    public string CreateDate { get; private set; }
+    /// <summary>
+    /// The friendly name specified when creating the job
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    [JsonProperty("resource_type")]
+    public string ResourceType { get; private set; }
+
+    private DayResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/BulkExports/Export/ExportCustomJobOptions.cs b/src/Twilio/Rest/Preview/BulkExports/Export/ExportCustomJobOptions.cs
index 6e12a142b..1fd897efb 100644
--- a/src/Twilio/Rest/Preview/BulkExports/Export/ExportCustomJobOptions.cs
+++ b/src/Twilio/Rest/Preview/BulkExports/Export/ExportCustomJobOptions.cs
@@ -9,138 +9,138 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.BulkExports.Export
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadExportCustomJobOptions
+  /// </summary>
+  public class ReadExportCustomJobOptions : ReadOptions<ExportCustomJobResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadExportCustomJobOptions
+    /// The type of communication – Messages, Calls, Conferences, and Participants
     /// </summary>
-    public class ReadExportCustomJobOptions : ReadOptions<ExportCustomJobResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-
-        /// <summary>
-        /// Construct a new ReadExportCustomJobOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        public ReadExportCustomJobOptions(string pathResourceType)
-        {
-            PathResourceType = pathResourceType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathResourceType { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateExportCustomJobOptions
+    /// Construct a new ReadExportCustomJobOptions
     /// </summary>
-    public class CreateExportCustomJobOptions : IOptions<ExportCustomJobResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages or Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-        /// <summary>
-        /// The start day for the custom export specified as a string in the format of yyyy-mm-dd
-        /// </summary>
-        public string StartDay { get; }
-        /// <summary>
-        /// The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day is inclusive and must be 2 days earlier than the current UTC day.
-        /// </summary>
-        public string EndDay { get; }
-        /// <summary>
-        /// The friendly name specified when creating the job
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The optional webhook url called on completion of the job. If this is supplied, `WebhookMethod` must also be supplied.
-        /// </summary>
-        public string WebhookUrl { get; set; }
-        /// <summary>
-        /// This is the method used to call the webhook on completion of the job. If this is supplied, `WebhookUrl` must also be supplied.
-        /// </summary>
-        public string WebhookMethod { get; set; }
-        /// <summary>
-        /// The optional email to send the completion notification to
-        /// </summary>
-        public string Email { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateExportCustomJobOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages or Calls, Conferences, and Participants
-        ///                        </param>
-        /// <param name="startDay"> The start day for the custom export specified as a string in the format of yyyy-mm-dd
-        ///                </param>
-        /// <param name="endDay"> The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day
-        ///              is inclusive and must be 2 days earlier than the current UTC day. </param>
-        /// <param name="friendlyName"> The friendly name specified when creating the job </param>
-        public CreateExportCustomJobOptions(string pathResourceType, string startDay, string endDay, string friendlyName)
-        {
-            PathResourceType = pathResourceType;
-            StartDay = startDay;
-            EndDay = endDay;
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (StartDay != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDay", StartDay));
-            }
-
-            if (EndDay != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDay", EndDay));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (WebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookUrl", WebhookUrl));
-            }
-
-            if (WebhookMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod));
-            }
-
-            if (Email != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Email", Email));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    public ReadExportCustomJobOptions(string pathResourceType)
+    {
+      PathResourceType = pathResourceType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateExportCustomJobOptions
+  /// </summary>
+  public class CreateExportCustomJobOptions : IOptions<ExportCustomJobResource>
+  {
+    /// <summary>
+    /// The type of communication – Messages or Calls, Conferences, and Participants
+    /// </summary>
+    public string PathResourceType { get; }
+    /// <summary>
+    /// The start day for the custom export specified as a string in the format of yyyy-mm-dd
+    /// </summary>
+    public string StartDay { get; }
+    /// <summary>
+    /// The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day is inclusive and must be 2 days earlier than the current UTC day.
+    /// </summary>
+    public string EndDay { get; }
+    /// <summary>
+    /// The friendly name specified when creating the job
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The optional webhook url called on completion of the job. If this is supplied, `WebhookMethod` must also be supplied.
+    /// </summary>
+    public string WebhookUrl { get; set; }
+    /// <summary>
+    /// This is the method used to call the webhook on completion of the job. If this is supplied, `WebhookUrl` must also be supplied.
+    /// </summary>
+    public string WebhookMethod { get; set; }
+    /// <summary>
+    /// The optional email to send the completion notification to
+    /// </summary>
+    public string Email { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateExportCustomJobOptions
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages or Calls, Conferences, and Participants
+    ///                        </param>
+    /// <param name="startDay"> The start day for the custom export specified as a string in the format of yyyy-mm-dd
+    ///                </param>
+    /// <param name="endDay"> The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day
+    ///              is inclusive and must be 2 days earlier than the current UTC day. </param>
+    /// <param name="friendlyName"> The friendly name specified when creating the job </param>
+    public CreateExportCustomJobOptions(string pathResourceType, string startDay, string endDay, string friendlyName)
+    {
+      PathResourceType = pathResourceType;
+      StartDay = startDay;
+      EndDay = endDay;
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (StartDay != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDay", StartDay));
+      }
+
+      if (EndDay != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDay", EndDay));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (WebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookUrl", WebhookUrl));
+      }
+
+      if (WebhookMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod));
+      }
+
+      if (Email != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Email", Email));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/BulkExports/Export/ExportCustomJobResource.cs b/src/Twilio/Rest/Preview/BulkExports/Export/ExportCustomJobResource.cs
index c3322d363..2ffd497ad 100644
--- a/src/Twilio/Rest/Preview/BulkExports/Export/ExportCustomJobResource.cs
+++ b/src/Twilio/Rest/Preview/BulkExports/Export/ExportCustomJobResource.cs
@@ -19,315 +19,315 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.BulkExports.Export
-{
-
-    public class ExportCustomJobResource : Resource
-    {
-        private static Request BuildReadRequest(ReadExportCustomJobOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/BulkExports/Exports/" + options.PathResourceType + "/Jobs",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ExportCustomJob parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportCustomJob </returns>
-        public static ResourceSet<ExportCustomJobResource> Read(ReadExportCustomJobOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
-            return new ResourceSet<ExportCustomJobResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ExportCustomJob parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ExportCustomJobResource>> ReadAsync(ReadExportCustomJobOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
-            return new ResourceSet<ExportCustomJobResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportCustomJob </returns>
-        public static ResourceSet<ExportCustomJobResource> Read(string pathResourceType,
-                                                                int? pageSize = null,
-                                                                long? limit = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadExportCustomJobOptions(pathResourceType){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ExportCustomJobResource>> ReadAsync(string pathResourceType,
-                                                                                                        int? pageSize = null,
-                                                                                                        long? limit = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadExportCustomJobOptions(pathResourceType){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ExportCustomJobResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ExportCustomJobResource> NextPage(Page<ExportCustomJobResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ExportCustomJobResource> PreviousPage(Page<ExportCustomJobResource> page,
-                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateExportCustomJobOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/BulkExports/Exports/" + options.PathResourceType + "/Jobs",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ExportCustomJob parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportCustomJob </returns>
-        public static ExportCustomJobResource Create(CreateExportCustomJobOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ExportCustomJob parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
-        public static async System.Threading.Tasks.Task<ExportCustomJobResource> CreateAsync(CreateExportCustomJobOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages or Calls, Conferences, and Participants
-        ///                        </param>
-        /// <param name="startDay"> The start day for the custom export specified as a string in the format of yyyy-mm-dd
-        ///                </param>
-        /// <param name="endDay"> The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day
-        ///              is inclusive and must be 2 days earlier than the current UTC day. </param>
-        /// <param name="friendlyName"> The friendly name specified when creating the job </param>
-        /// <param name="webhookUrl"> The optional webhook url called on completion of the job. If this is supplied,
-        ///                  `WebhookMethod` must also be supplied. </param>
-        /// <param name="webhookMethod"> This is the method used to call the webhook on completion of the job. If this is
-        ///                     supplied, `WebhookUrl` must also be supplied. </param>
-        /// <param name="email"> The optional email to send the completion notification to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportCustomJob </returns>
-        public static ExportCustomJobResource Create(string pathResourceType,
-                                                     string startDay,
-                                                     string endDay,
-                                                     string friendlyName,
-                                                     string webhookUrl = null,
-                                                     string webhookMethod = null,
-                                                     string email = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateExportCustomJobOptions(pathResourceType, startDay, endDay, friendlyName){WebhookUrl = webhookUrl, WebhookMethod = webhookMethod, Email = email};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages or Calls, Conferences, and Participants
-        ///                        </param>
-        /// <param name="startDay"> The start day for the custom export specified as a string in the format of yyyy-mm-dd
-        ///                </param>
-        /// <param name="endDay"> The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day
-        ///              is inclusive and must be 2 days earlier than the current UTC day. </param>
-        /// <param name="friendlyName"> The friendly name specified when creating the job </param>
-        /// <param name="webhookUrl"> The optional webhook url called on completion of the job. If this is supplied,
-        ///                  `WebhookMethod` must also be supplied. </param>
-        /// <param name="webhookMethod"> This is the method used to call the webhook on completion of the job. If this is
-        ///                     supplied, `WebhookUrl` must also be supplied. </param>
-        /// <param name="email"> The optional email to send the completion notification to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
-        public static async System.Threading.Tasks.Task<ExportCustomJobResource> CreateAsync(string pathResourceType,
-                                                                                             string startDay,
-                                                                                             string endDay,
-                                                                                             string friendlyName,
-                                                                                             string webhookUrl = null,
-                                                                                             string webhookMethod = null,
-                                                                                             string email = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateExportCustomJobOptions(pathResourceType, startDay, endDay, friendlyName){WebhookUrl = webhookUrl, WebhookMethod = webhookMethod, Email = email};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExportCustomJobResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExportCustomJobResource object represented by the provided JSON </returns>
-        public static ExportCustomJobResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExportCustomJobResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The friendly name specified when creating the job
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        [JsonProperty("resource_type")]
-        public string ResourceType { get; private set; }
-        /// <summary>
-        /// The start day for the custom export specified as a string in the format of yyyy-MM-dd
-        /// </summary>
-        [JsonProperty("start_day")]
-        public string StartDay { get; private set; }
-        /// <summary>
-        /// The end day for the custom export specified as a string in the format of yyyy-MM-dd
-        /// </summary>
-        [JsonProperty("end_day")]
-        public string EndDay { get; private set; }
-        /// <summary>
-        /// The optional webhook url called on completion
-        /// </summary>
-        [JsonProperty("webhook_url")]
-        public string WebhookUrl { get; private set; }
-        /// <summary>
-        /// This is the method used to call the webhook
-        /// </summary>
-        [JsonProperty("webhook_method")]
-        public string WebhookMethod { get; private set; }
-        /// <summary>
-        /// The optional email to send the completion notification to
-        /// </summary>
-        [JsonProperty("email")]
-        public string Email { get; private set; }
-        /// <summary>
-        /// The unique job_sid returned when the custom export was created. This can be used to look up the status of the job.
-        /// </summary>
-        [JsonProperty("job_sid")]
-        public string JobSid { get; private set; }
-        /// <summary>
-        /// The details
-        /// </summary>
-        [JsonProperty("details")]
-        public object Details { get; private set; }
-
-        private ExportCustomJobResource()
-        {
-
-        }
-    }
+{
+
+  public class ExportCustomJobResource : Resource
+  {
+    private static Request BuildReadRequest(ReadExportCustomJobOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/BulkExports/Exports/" + options.PathResourceType + "/Jobs",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ExportCustomJob parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportCustomJob </returns>
+    public static ResourceSet<ExportCustomJobResource> Read(ReadExportCustomJobOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
+      return new ResourceSet<ExportCustomJobResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ExportCustomJob parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ExportCustomJobResource>> ReadAsync(ReadExportCustomJobOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
+      return new ResourceSet<ExportCustomJobResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportCustomJob </returns>
+    public static ResourceSet<ExportCustomJobResource> Read(string pathResourceType,
+                                                            int? pageSize = null,
+                                                            long? limit = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadExportCustomJobOptions(pathResourceType) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ExportCustomJobResource>> ReadAsync(string pathResourceType,
+                                                                                                    int? pageSize = null,
+                                                                                                    long? limit = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadExportCustomJobOptions(pathResourceType) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ExportCustomJobResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ExportCustomJobResource> NextPage(Page<ExportCustomJobResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ExportCustomJobResource> PreviousPage(Page<ExportCustomJobResource> page,
+                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<ExportCustomJobResource>.FromJson("jobs", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateExportCustomJobOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/BulkExports/Exports/" + options.PathResourceType + "/Jobs",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ExportCustomJob parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportCustomJob </returns>
+    public static ExportCustomJobResource Create(CreateExportCustomJobOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ExportCustomJob parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
+    public static async System.Threading.Tasks.Task<ExportCustomJobResource> CreateAsync(CreateExportCustomJobOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages or Calls, Conferences, and Participants
+    ///                        </param>
+    /// <param name="startDay"> The start day for the custom export specified as a string in the format of yyyy-mm-dd
+    ///                </param>
+    /// <param name="endDay"> The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day
+    ///              is inclusive and must be 2 days earlier than the current UTC day. </param>
+    /// <param name="friendlyName"> The friendly name specified when creating the job </param>
+    /// <param name="webhookUrl"> The optional webhook url called on completion of the job. If this is supplied,
+    ///                  `WebhookMethod` must also be supplied. </param>
+    /// <param name="webhookMethod"> This is the method used to call the webhook on completion of the job. If this is
+    ///                     supplied, `WebhookUrl` must also be supplied. </param>
+    /// <param name="email"> The optional email to send the completion notification to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportCustomJob </returns>
+    public static ExportCustomJobResource Create(string pathResourceType,
+                                                 string startDay,
+                                                 string endDay,
+                                                 string friendlyName,
+                                                 string webhookUrl = null,
+                                                 string webhookMethod = null,
+                                                 string email = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateExportCustomJobOptions(pathResourceType, startDay, endDay, friendlyName) { WebhookUrl = webhookUrl, WebhookMethod = webhookMethod, Email = email };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages or Calls, Conferences, and Participants
+    ///                        </param>
+    /// <param name="startDay"> The start day for the custom export specified as a string in the format of yyyy-mm-dd
+    ///                </param>
+    /// <param name="endDay"> The end day for the custom export specified as a string in the format of yyyy-mm-dd. End day
+    ///              is inclusive and must be 2 days earlier than the current UTC day. </param>
+    /// <param name="friendlyName"> The friendly name specified when creating the job </param>
+    /// <param name="webhookUrl"> The optional webhook url called on completion of the job. If this is supplied,
+    ///                  `WebhookMethod` must also be supplied. </param>
+    /// <param name="webhookMethod"> This is the method used to call the webhook on completion of the job. If this is
+    ///                     supplied, `WebhookUrl` must also be supplied. </param>
+    /// <param name="email"> The optional email to send the completion notification to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportCustomJob </returns>
+    public static async System.Threading.Tasks.Task<ExportCustomJobResource> CreateAsync(string pathResourceType,
+                                                                                         string startDay,
+                                                                                         string endDay,
+                                                                                         string friendlyName,
+                                                                                         string webhookUrl = null,
+                                                                                         string webhookMethod = null,
+                                                                                         string email = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateExportCustomJobOptions(pathResourceType, startDay, endDay, friendlyName) { WebhookUrl = webhookUrl, WebhookMethod = webhookMethod, Email = email };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExportCustomJobResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExportCustomJobResource object represented by the provided JSON </returns>
+    public static ExportCustomJobResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExportCustomJobResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The friendly name specified when creating the job
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    [JsonProperty("resource_type")]
+    public string ResourceType { get; private set; }
+    /// <summary>
+    /// The start day for the custom export specified as a string in the format of yyyy-MM-dd
+    /// </summary>
+    [JsonProperty("start_day")]
+    public string StartDay { get; private set; }
+    /// <summary>
+    /// The end day for the custom export specified as a string in the format of yyyy-MM-dd
+    /// </summary>
+    [JsonProperty("end_day")]
+    public string EndDay { get; private set; }
+    /// <summary>
+    /// The optional webhook url called on completion
+    /// </summary>
+    [JsonProperty("webhook_url")]
+    public string WebhookUrl { get; private set; }
+    /// <summary>
+    /// This is the method used to call the webhook
+    /// </summary>
+    [JsonProperty("webhook_method")]
+    public string WebhookMethod { get; private set; }
+    /// <summary>
+    /// The optional email to send the completion notification to
+    /// </summary>
+    [JsonProperty("email")]
+    public string Email { get; private set; }
+    /// <summary>
+    /// The unique job_sid returned when the custom export was created. This can be used to look up the status of the job.
+    /// </summary>
+    [JsonProperty("job_sid")]
+    public string JobSid { get; private set; }
+    /// <summary>
+    /// The details
+    /// </summary>
+    [JsonProperty("details")]
+    public object Details { get; private set; }
+
+    private ExportCustomJobResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/BulkExports/Export/JobOptions.cs b/src/Twilio/Rest/Preview/BulkExports/Export/JobOptions.cs
index 6e028a505..7b3362d1c 100644
--- a/src/Twilio/Rest/Preview/BulkExports/Export/JobOptions.cs
+++ b/src/Twilio/Rest/Preview/BulkExports/Export/JobOptions.cs
@@ -9,70 +9,70 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.BulkExports.Export
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchJobOptions
+  /// </summary>
+  public class FetchJobOptions : IOptions<JobResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchJobOptions
+    /// The unique string that that we created to identify the Bulk Export job
     /// </summary>
-    public class FetchJobOptions : IOptions<JobResource>
-    {
-        /// <summary>
-        /// The unique string that that we created to identify the Bulk Export job
-        /// </summary>
-        public string PathJobSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchJobOptions
-        /// </summary>
-        /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
-        public FetchJobOptions(string pathJobSid)
-        {
-            PathJobSid = pathJobSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathJobSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteJobOptions
+    /// Construct a new FetchJobOptions
     /// </summary>
-    public class DeleteJobOptions : IOptions<JobResource>
-    {
-        /// <summary>
-        /// The unique string that that we created to identify the Bulk Export job
-        /// </summary>
-        public string PathJobSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteJobOptions
-        /// </summary>
-        /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
-        public DeleteJobOptions(string pathJobSid)
-        {
-            PathJobSid = pathJobSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
+    public FetchJobOptions(string pathJobSid)
+    {
+      PathJobSid = pathJobSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteJobOptions
+  /// </summary>
+  public class DeleteJobOptions : IOptions<JobResource>
+  {
+    /// <summary>
+    /// The unique string that that we created to identify the Bulk Export job
+    /// </summary>
+    public string PathJobSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteJobOptions
+    /// </summary>
+    /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
+    public DeleteJobOptions(string pathJobSid)
+    {
+      PathJobSid = pathJobSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/BulkExports/Export/JobResource.cs b/src/Twilio/Rest/Preview/BulkExports/Export/JobResource.cs
index 62192acb8..03f1b154f 100644
--- a/src/Twilio/Rest/Preview/BulkExports/Export/JobResource.cs
+++ b/src/Twilio/Rest/Preview/BulkExports/Export/JobResource.cs
@@ -19,216 +19,216 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.BulkExports.Export
-{
-
-    public class JobResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchJobOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/BulkExports/Exports/Jobs/" + options.PathJobSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Job parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Job </returns>
-        public static JobResource Fetch(FetchJobOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Job parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Job </returns>
-        public static async System.Threading.Tasks.Task<JobResource> FetchAsync(FetchJobOptions options,
-                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Job </returns>
-        public static JobResource Fetch(string pathJobSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchJobOptions(pathJobSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Job </returns>
-        public static async System.Threading.Tasks.Task<JobResource> FetchAsync(string pathJobSid,
-                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchJobOptions(pathJobSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteJobOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/BulkExports/Exports/Jobs/" + options.PathJobSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Job parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Job </returns>
-        public static bool Delete(DeleteJobOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Job parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Job </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteJobOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Job </returns>
-        public static bool Delete(string pathJobSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteJobOptions(pathJobSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Job </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathJobSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteJobOptions(pathJobSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a JobResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> JobResource object represented by the provided JSON </returns>
-        public static JobResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<JobResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        [JsonProperty("resource_type")]
-        public string ResourceType { get; private set; }
-        /// <summary>
-        /// The friendly name specified when creating the job
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// This is a list of the completed, pending, or errored dates within the export time range, with one entry for each status with more than one day in that status
-        /// </summary>
-        [JsonProperty("details")]
-        public object Details { get; private set; }
-        /// <summary>
-        /// The start time for the export specified when creating the job
-        /// </summary>
-        [JsonProperty("start_day")]
-        public string StartDay { get; private set; }
-        /// <summary>
-        /// The end time for the export specified when creating the job
-        /// </summary>
-        [JsonProperty("end_day")]
-        public string EndDay { get; private set; }
-        /// <summary>
-        /// The job_sid returned when the export was created
-        /// </summary>
-        [JsonProperty("job_sid")]
-        public string JobSid { get; private set; }
-        /// <summary>
-        /// The optional webhook url called on completion
-        /// </summary>
-        [JsonProperty("webhook_url")]
-        public string WebhookUrl { get; private set; }
-        /// <summary>
-        /// This is the method used to call the webhook
-        /// </summary>
-        [JsonProperty("webhook_method")]
-        public string WebhookMethod { get; private set; }
-        /// <summary>
-        /// The optional email to send the completion notification to
-        /// </summary>
-        [JsonProperty("email")]
-        public string Email { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private JobResource()
-        {
-
-        }
-    }
+{
+
+  public class JobResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchJobOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/BulkExports/Exports/Jobs/" + options.PathJobSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Job parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Job </returns>
+    public static JobResource Fetch(FetchJobOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Job parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Job </returns>
+    public static async System.Threading.Tasks.Task<JobResource> FetchAsync(FetchJobOptions options,
+                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Job </returns>
+    public static JobResource Fetch(string pathJobSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchJobOptions(pathJobSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Job </returns>
+    public static async System.Threading.Tasks.Task<JobResource> FetchAsync(string pathJobSid,
+                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchJobOptions(pathJobSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteJobOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/BulkExports/Exports/Jobs/" + options.PathJobSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Job parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Job </returns>
+    public static bool Delete(DeleteJobOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Job parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Job </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteJobOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Job </returns>
+    public static bool Delete(string pathJobSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteJobOptions(pathJobSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathJobSid"> The unique string that that we created to identify the Bulk Export job </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Job </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathJobSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteJobOptions(pathJobSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a JobResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> JobResource object represented by the provided JSON </returns>
+    public static JobResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<JobResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    [JsonProperty("resource_type")]
+    public string ResourceType { get; private set; }
+    /// <summary>
+    /// The friendly name specified when creating the job
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// This is a list of the completed, pending, or errored dates within the export time range, with one entry for each status with more than one day in that status
+    /// </summary>
+    [JsonProperty("details")]
+    public object Details { get; private set; }
+    /// <summary>
+    /// The start time for the export specified when creating the job
+    /// </summary>
+    [JsonProperty("start_day")]
+    public string StartDay { get; private set; }
+    /// <summary>
+    /// The end time for the export specified when creating the job
+    /// </summary>
+    [JsonProperty("end_day")]
+    public string EndDay { get; private set; }
+    /// <summary>
+    /// The job_sid returned when the export was created
+    /// </summary>
+    [JsonProperty("job_sid")]
+    public string JobSid { get; private set; }
+    /// <summary>
+    /// The optional webhook url called on completion
+    /// </summary>
+    [JsonProperty("webhook_url")]
+    public string WebhookUrl { get; private set; }
+    /// <summary>
+    /// This is the method used to call the webhook
+    /// </summary>
+    [JsonProperty("webhook_method")]
+    public string WebhookMethod { get; private set; }
+    /// <summary>
+    /// The optional email to send the completion notification to
+    /// </summary>
+    [JsonProperty("email")]
+    public string Email { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private JobResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/BulkExports/ExportConfigurationOptions.cs b/src/Twilio/Rest/Preview/BulkExports/ExportConfigurationOptions.cs
index 90143494f..2729495f4 100644
--- a/src/Twilio/Rest/Preview/BulkExports/ExportConfigurationOptions.cs
+++ b/src/Twilio/Rest/Preview/BulkExports/ExportConfigurationOptions.cs
@@ -9,97 +9,97 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.BulkExports
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch a specific Export Configuration.
+  /// </summary>
+  public class FetchExportConfigurationOptions : IOptions<ExportConfigurationResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch a specific Export Configuration.
+    /// The type of communication – Messages, Calls, Conferences, and Participants
     /// </summary>
-    public class FetchExportConfigurationOptions : IOptions<ExportConfigurationResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-
-        /// <summary>
-        /// Construct a new FetchExportConfigurationOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        public FetchExportConfigurationOptions(string pathResourceType)
-        {
-            PathResourceType = pathResourceType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathResourceType { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Update a specific Export Configuration.
+    /// Construct a new FetchExportConfigurationOptions
     /// </summary>
-    public class UpdateExportConfigurationOptions : IOptions<ExportConfigurationResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-        /// <summary>
-        /// Whether files are automatically generated
-        /// </summary>
-        public bool? Enabled { get; set; }
-        /// <summary>
-        /// URL targeted at export
-        /// </summary>
-        public Uri WebhookUrl { get; set; }
-        /// <summary>
-        /// Whether to GET or POST to the webhook url
-        /// </summary>
-        public string WebhookMethod { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateExportConfigurationOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        public UpdateExportConfigurationOptions(string pathResourceType)
-        {
-            PathResourceType = pathResourceType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            if (WebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
-            }
-
-            if (WebhookMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    public FetchExportConfigurationOptions(string pathResourceType)
+    {
+      PathResourceType = pathResourceType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Update a specific Export Configuration.
+  /// </summary>
+  public class UpdateExportConfigurationOptions : IOptions<ExportConfigurationResource>
+  {
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    public string PathResourceType { get; }
+    /// <summary>
+    /// Whether files are automatically generated
+    /// </summary>
+    public bool? Enabled { get; set; }
+    /// <summary>
+    /// URL targeted at export
+    /// </summary>
+    public Uri WebhookUrl { get; set; }
+    /// <summary>
+    /// Whether to GET or POST to the webhook url
+    /// </summary>
+    public string WebhookMethod { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateExportConfigurationOptions
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    public UpdateExportConfigurationOptions(string pathResourceType)
+    {
+      PathResourceType = pathResourceType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      if (WebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
+      }
+
+      if (WebhookMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookMethod", WebhookMethod));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/BulkExports/ExportConfigurationResource.cs b/src/Twilio/Rest/Preview/BulkExports/ExportConfigurationResource.cs
index 972b3eb3f..c1b696c20 100644
--- a/src/Twilio/Rest/Preview/BulkExports/ExportConfigurationResource.cs
+++ b/src/Twilio/Rest/Preview/BulkExports/ExportConfigurationResource.cs
@@ -19,207 +19,207 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.BulkExports
-{
-
-    public class ExportConfigurationResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchExportConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/BulkExports/Exports/" + options.PathResourceType + "/Configuration",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Export Configuration.
-        /// </summary>
-        /// <param name="options"> Fetch ExportConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportConfiguration </returns>
-        public static ExportConfigurationResource Fetch(FetchExportConfigurationOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Export Configuration.
-        /// </summary>
-        /// <param name="options"> Fetch ExportConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
-        public static async System.Threading.Tasks.Task<ExportConfigurationResource> FetchAsync(FetchExportConfigurationOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Export Configuration.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportConfiguration </returns>
-        public static ExportConfigurationResource Fetch(string pathResourceType, ITwilioRestClient client = null)
-        {
-            var options = new FetchExportConfigurationOptions(pathResourceType);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Export Configuration.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
-        public static async System.Threading.Tasks.Task<ExportConfigurationResource> FetchAsync(string pathResourceType,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchExportConfigurationOptions(pathResourceType);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateExportConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/BulkExports/Exports/" + options.PathResourceType + "/Configuration",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Export Configuration.
-        /// </summary>
-        /// <param name="options"> Update ExportConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportConfiguration </returns>
-        public static ExportConfigurationResource Update(UpdateExportConfigurationOptions options,
-                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Export Configuration.
-        /// </summary>
-        /// <param name="options"> Update ExportConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
-        public static async System.Threading.Tasks.Task<ExportConfigurationResource> UpdateAsync(UpdateExportConfigurationOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Export Configuration.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="enabled"> Whether files are automatically generated </param>
-        /// <param name="webhookUrl"> URL targeted at export </param>
-        /// <param name="webhookMethod"> Whether to GET or POST to the webhook url </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExportConfiguration </returns>
-        public static ExportConfigurationResource Update(string pathResourceType,
-                                                         bool? enabled = null,
-                                                         Uri webhookUrl = null,
-                                                         string webhookMethod = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateExportConfigurationOptions(pathResourceType){Enabled = enabled, WebhookUrl = webhookUrl, WebhookMethod = webhookMethod};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Export Configuration.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="enabled"> Whether files are automatically generated </param>
-        /// <param name="webhookUrl"> URL targeted at export </param>
-        /// <param name="webhookMethod"> Whether to GET or POST to the webhook url </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
-        public static async System.Threading.Tasks.Task<ExportConfigurationResource> UpdateAsync(string pathResourceType,
-                                                                                                 bool? enabled = null,
-                                                                                                 Uri webhookUrl = null,
-                                                                                                 string webhookMethod = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateExportConfigurationOptions(pathResourceType){Enabled = enabled, WebhookUrl = webhookUrl, WebhookMethod = webhookMethod};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExportConfigurationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExportConfigurationResource object represented by the provided JSON </returns>
-        public static ExportConfigurationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExportConfigurationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Whether files are automatically generated
-        /// </summary>
-        [JsonProperty("enabled")]
-        public bool? Enabled { get; private set; }
-        /// <summary>
-        /// URL targeted at export
-        /// </summary>
-        [JsonProperty("webhook_url")]
-        public Uri WebhookUrl { get; private set; }
-        /// <summary>
-        /// Whether to GET or POST to the webhook url
-        /// </summary>
-        [JsonProperty("webhook_method")]
-        public string WebhookMethod { get; private set; }
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        [JsonProperty("resource_type")]
-        public string ResourceType { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private ExportConfigurationResource()
-        {
-
-        }
-    }
+{
+
+  public class ExportConfigurationResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchExportConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/BulkExports/Exports/" + options.PathResourceType + "/Configuration",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Export Configuration.
+    /// </summary>
+    /// <param name="options"> Fetch ExportConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportConfiguration </returns>
+    public static ExportConfigurationResource Fetch(FetchExportConfigurationOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Export Configuration.
+    /// </summary>
+    /// <param name="options"> Fetch ExportConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
+    public static async System.Threading.Tasks.Task<ExportConfigurationResource> FetchAsync(FetchExportConfigurationOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Export Configuration.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportConfiguration </returns>
+    public static ExportConfigurationResource Fetch(string pathResourceType, ITwilioRestClient client = null)
+    {
+      var options = new FetchExportConfigurationOptions(pathResourceType);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Export Configuration.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
+    public static async System.Threading.Tasks.Task<ExportConfigurationResource> FetchAsync(string pathResourceType,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchExportConfigurationOptions(pathResourceType);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateExportConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/BulkExports/Exports/" + options.PathResourceType + "/Configuration",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Export Configuration.
+    /// </summary>
+    /// <param name="options"> Update ExportConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportConfiguration </returns>
+    public static ExportConfigurationResource Update(UpdateExportConfigurationOptions options,
+                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Export Configuration.
+    /// </summary>
+    /// <param name="options"> Update ExportConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
+    public static async System.Threading.Tasks.Task<ExportConfigurationResource> UpdateAsync(UpdateExportConfigurationOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Export Configuration.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="enabled"> Whether files are automatically generated </param>
+    /// <param name="webhookUrl"> URL targeted at export </param>
+    /// <param name="webhookMethod"> Whether to GET or POST to the webhook url </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExportConfiguration </returns>
+    public static ExportConfigurationResource Update(string pathResourceType,
+                                                     bool? enabled = null,
+                                                     Uri webhookUrl = null,
+                                                     string webhookMethod = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateExportConfigurationOptions(pathResourceType) { Enabled = enabled, WebhookUrl = webhookUrl, WebhookMethod = webhookMethod };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Export Configuration.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="enabled"> Whether files are automatically generated </param>
+    /// <param name="webhookUrl"> URL targeted at export </param>
+    /// <param name="webhookMethod"> Whether to GET or POST to the webhook url </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExportConfiguration </returns>
+    public static async System.Threading.Tasks.Task<ExportConfigurationResource> UpdateAsync(string pathResourceType,
+                                                                                             bool? enabled = null,
+                                                                                             Uri webhookUrl = null,
+                                                                                             string webhookMethod = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateExportConfigurationOptions(pathResourceType) { Enabled = enabled, WebhookUrl = webhookUrl, WebhookMethod = webhookMethod };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExportConfigurationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExportConfigurationResource object represented by the provided JSON </returns>
+    public static ExportConfigurationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExportConfigurationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Whether files are automatically generated
+    /// </summary>
+    [JsonProperty("enabled")]
+    public bool? Enabled { get; private set; }
+    /// <summary>
+    /// URL targeted at export
+    /// </summary>
+    [JsonProperty("webhook_url")]
+    public Uri WebhookUrl { get; private set; }
+    /// <summary>
+    /// Whether to GET or POST to the webhook url
+    /// </summary>
+    [JsonProperty("webhook_method")]
+    public string WebhookMethod { get; private set; }
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    [JsonProperty("resource_type")]
+    public string ResourceType { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private ExportConfigurationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/BulkExports/ExportOptions.cs b/src/Twilio/Rest/Preview/BulkExports/ExportOptions.cs
index 1ad6dd552..a3aafb89d 100644
--- a/src/Twilio/Rest/Preview/BulkExports/ExportOptions.cs
+++ b/src/Twilio/Rest/Preview/BulkExports/ExportOptions.cs
@@ -9,38 +9,38 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.BulkExports
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch a specific Export.
+  /// </summary>
+  public class FetchExportOptions : IOptions<ExportResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch a specific Export.
+    /// The type of communication – Messages, Calls, Conferences, and Participants
     /// </summary>
-    public class FetchExportOptions : IOptions<ExportResource>
-    {
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        public string PathResourceType { get; }
-
-        /// <summary>
-        /// Construct a new FetchExportOptions
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        public FetchExportOptions(string pathResourceType)
-        {
-            PathResourceType = pathResourceType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathResourceType { get; }
+
+    /// <summary>
+    /// Construct a new FetchExportOptions
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    public FetchExportOptions(string pathResourceType)
+    {
+      PathResourceType = pathResourceType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/BulkExports/ExportResource.cs b/src/Twilio/Rest/Preview/BulkExports/ExportResource.cs
index d3d749e34..318c7bb62 100644
--- a/src/Twilio/Rest/Preview/BulkExports/ExportResource.cs
+++ b/src/Twilio/Rest/Preview/BulkExports/ExportResource.cs
@@ -19,115 +19,115 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.BulkExports
-{
-
-    public class ExportResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchExportOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/BulkExports/Exports/" + options.PathResourceType + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Export.
-        /// </summary>
-        /// <param name="options"> Fetch Export parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Export </returns>
-        public static ExportResource Fetch(FetchExportOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Export.
-        /// </summary>
-        /// <param name="options"> Fetch Export parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Export </returns>
-        public static async System.Threading.Tasks.Task<ExportResource> FetchAsync(FetchExportOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Export.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Export </returns>
-        public static ExportResource Fetch(string pathResourceType, ITwilioRestClient client = null)
-        {
-            var options = new FetchExportOptions(pathResourceType);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Export.
-        /// </summary>
-        /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Export </returns>
-        public static async System.Threading.Tasks.Task<ExportResource> FetchAsync(string pathResourceType,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchExportOptions(pathResourceType);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExportResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExportResource object represented by the provided JSON </returns>
-        public static ExportResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExportResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The type of communication – Messages, Calls, Conferences, and Participants
-        /// </summary>
-        [JsonProperty("resource_type")]
-        public string ResourceType { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Nested resource URLs.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ExportResource()
-        {
-
-        }
-    }
+{
+
+  public class ExportResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchExportOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/BulkExports/Exports/" + options.PathResourceType + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Export.
+    /// </summary>
+    /// <param name="options"> Fetch Export parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Export </returns>
+    public static ExportResource Fetch(FetchExportOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Export.
+    /// </summary>
+    /// <param name="options"> Fetch Export parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Export </returns>
+    public static async System.Threading.Tasks.Task<ExportResource> FetchAsync(FetchExportOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Export.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Export </returns>
+    public static ExportResource Fetch(string pathResourceType, ITwilioRestClient client = null)
+    {
+      var options = new FetchExportOptions(pathResourceType);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Export.
+    /// </summary>
+    /// <param name="pathResourceType"> The type of communication – Messages, Calls, Conferences, and Participants </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Export </returns>
+    public static async System.Threading.Tasks.Task<ExportResource> FetchAsync(string pathResourceType,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchExportOptions(pathResourceType);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExportResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExportResource object represented by the provided JSON </returns>
+    public static ExportResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExportResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The type of communication – Messages, Calls, Conferences, and Participants
+    /// </summary>
+    [JsonProperty("resource_type")]
+    public string ResourceType { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Nested resource URLs.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ExportResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/CertificateOptions.cs b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/CertificateOptions.cs
index cb8425e86..8b51c94df 100644
--- a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/CertificateOptions.cs
+++ b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/CertificateOptions.cs
@@ -9,247 +9,247 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.DeployedDevices.Fleet
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch information about a specific Certificate credential in the Fleet.
+  /// </summary>
+  public class FetchCertificateOptions : IOptions<CertificateResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch information about a specific Certificate credential in the Fleet.
-    /// </summary>
-    public class FetchCertificateOptions : IOptions<CertificateResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies the Certificate.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCertificateOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
-        public FetchCertificateOptions(string pathFleetSid, string pathSid)
-        {
-            PathFleetSid = pathFleetSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Unregister a specific Certificate credential from the Fleet, effectively disallowing any inbound client connections
-    /// that are presenting it.
-    /// </summary>
-    public class DeleteCertificateOptions : IOptions<CertificateResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies the Certificate.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCertificateOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
-        public DeleteCertificateOptions(string pathFleetSid, string pathSid)
-        {
-            PathFleetSid = pathFleetSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// A string that uniquely identifies the Certificate.
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Enroll a new Certificate credential to the Fleet, optionally giving it a friendly name and assigning to a Device.
-    /// </summary>
-    public class CreateCertificateOptions : IOptions<CertificateResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// The public certificate data.
-        /// </summary>
-        public string CertificateData { get; }
-        /// <summary>
-        /// The human readable description for this Certificate.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique identifier of a Device to be authenticated.
-        /// </summary>
-        public string DeviceSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCertificateOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="certificateData"> The public certificate data. </param>
-        public CreateCertificateOptions(string pathFleetSid, string certificateData)
-        {
-            PathFleetSid = pathFleetSid;
-            CertificateData = certificateData;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (CertificateData != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CertificateData", CertificateData));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DeviceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeviceSid", DeviceSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchCertificateOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
+    public FetchCertificateOptions(string pathFleetSid, string pathSid)
+    {
+      PathFleetSid = pathFleetSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of all Certificate credentials belonging to the Fleet.
-    /// </summary>
-    public class ReadCertificateOptions : ReadOptions<CertificateResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// Find all Certificates authenticating specified Device.
-        /// </summary>
-        public string DeviceSid { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadCertificateOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        public ReadCertificateOptions(string pathFleetSid)
-        {
-            PathFleetSid = pathFleetSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DeviceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeviceSid", DeviceSid.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Unregister a specific Certificate credential from the Fleet, effectively disallowing any inbound client connections
+  /// that are presenting it.
+  /// </summary>
+  public class DeleteCertificateOptions : IOptions<CertificateResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Update the given properties of a specific Certificate credential in the Fleet, giving it a friendly name or
-    /// assigning to a Device.
-    /// </summary>
-    public class UpdateCertificateOptions : IOptions<CertificateResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies the Certificate.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The human readable description for this Certificate.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique identifier of a Device to be authenticated.
-        /// </summary>
-        public string DeviceSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateCertificateOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
-        public UpdateCertificateOptions(string pathFleetSid, string pathSid)
-        {
-            PathFleetSid = pathFleetSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DeviceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeviceSid", DeviceSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// A string that uniquely identifies the Certificate.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCertificateOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
+    public DeleteCertificateOptions(string pathFleetSid, string pathSid)
+    {
+      PathFleetSid = pathFleetSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Enroll a new Certificate credential to the Fleet, optionally giving it a friendly name and assigning to a Device.
+  /// </summary>
+  public class CreateCertificateOptions : IOptions<CertificateResource>
+  {
+    /// <summary>
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// The public certificate data.
+    /// </summary>
+    public string CertificateData { get; }
+    /// <summary>
+    /// The human readable description for this Certificate.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique identifier of a Device to be authenticated.
+    /// </summary>
+    public string DeviceSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCertificateOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="certificateData"> The public certificate data. </param>
+    public CreateCertificateOptions(string pathFleetSid, string certificateData)
+    {
+      PathFleetSid = pathFleetSid;
+      CertificateData = certificateData;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (CertificateData != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CertificateData", CertificateData));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DeviceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeviceSid", DeviceSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of all Certificate credentials belonging to the Fleet.
+  /// </summary>
+  public class ReadCertificateOptions : ReadOptions<CertificateResource>
+  {
+    /// <summary>
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// Find all Certificates authenticating specified Device.
+    /// </summary>
+    public string DeviceSid { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadCertificateOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    public ReadCertificateOptions(string pathFleetSid)
+    {
+      PathFleetSid = pathFleetSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DeviceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeviceSid", DeviceSid.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Update the given properties of a specific Certificate credential in the Fleet, giving it a friendly name or
+  /// assigning to a Device.
+  /// </summary>
+  public class UpdateCertificateOptions : IOptions<CertificateResource>
+  {
+    /// <summary>
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// A string that uniquely identifies the Certificate.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The human readable description for this Certificate.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique identifier of a Device to be authenticated.
+    /// </summary>
+    public string DeviceSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateCertificateOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
+    public UpdateCertificateOptions(string pathFleetSid, string pathSid)
+    {
+      PathFleetSid = pathFleetSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DeviceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeviceSid", DeviceSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/CertificateResource.cs b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/CertificateResource.cs
index 8622f8698..3862a5d00 100644
--- a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/CertificateResource.cs
+++ b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/CertificateResource.cs
@@ -19,523 +19,523 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.DeployedDevices.Fleet
-{
-
-    public class CertificateResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchCertificateOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Certificates/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch information about a specific Certificate credential in the Fleet.
-        /// </summary>
-        /// <param name="options"> Fetch Certificate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Certificate </returns>
-        public static CertificateResource Fetch(FetchCertificateOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch information about a specific Certificate credential in the Fleet.
-        /// </summary>
-        /// <param name="options"> Fetch Certificate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Certificate </returns>
-        public static async System.Threading.Tasks.Task<CertificateResource> FetchAsync(FetchCertificateOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch information about a specific Certificate credential in the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Certificate </returns>
-        public static CertificateResource Fetch(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCertificateOptions(pathFleetSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch information about a specific Certificate credential in the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Certificate </returns>
-        public static async System.Threading.Tasks.Task<CertificateResource> FetchAsync(string pathFleetSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchCertificateOptions(pathFleetSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCertificateOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Certificates/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Unregister a specific Certificate credential from the Fleet, effectively disallowing any inbound client connections
-        /// that are presenting it.
-        /// </summary>
-        /// <param name="options"> Delete Certificate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Certificate </returns>
-        public static bool Delete(DeleteCertificateOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Unregister a specific Certificate credential from the Fleet, effectively disallowing any inbound client connections
-        /// that are presenting it.
-        /// </summary>
-        /// <param name="options"> Delete Certificate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Certificate </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCertificateOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Unregister a specific Certificate credential from the Fleet, effectively disallowing any inbound client connections
-        /// that are presenting it.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Certificate </returns>
-        public static bool Delete(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCertificateOptions(pathFleetSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Unregister a specific Certificate credential from the Fleet, effectively disallowing any inbound client connections
-        /// that are presenting it.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Certificate </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFleetSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteCertificateOptions(pathFleetSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateCertificateOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Certificates",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Enroll a new Certificate credential to the Fleet, optionally giving it a friendly name and assigning to a Device.
-        /// </summary>
-        /// <param name="options"> Create Certificate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Certificate </returns>
-        public static CertificateResource Create(CreateCertificateOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Enroll a new Certificate credential to the Fleet, optionally giving it a friendly name and assigning to a Device.
-        /// </summary>
-        /// <param name="options"> Create Certificate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Certificate </returns>
-        public static async System.Threading.Tasks.Task<CertificateResource> CreateAsync(CreateCertificateOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Enroll a new Certificate credential to the Fleet, optionally giving it a friendly name and assigning to a Device.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="certificateData"> The public certificate data. </param>
-        /// <param name="friendlyName"> The human readable description for this Certificate. </param>
-        /// <param name="deviceSid"> The unique identifier of a Device to be authenticated. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Certificate </returns>
-        public static CertificateResource Create(string pathFleetSid,
-                                                 string certificateData,
-                                                 string friendlyName = null,
-                                                 string deviceSid = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateCertificateOptions(pathFleetSid, certificateData){FriendlyName = friendlyName, DeviceSid = deviceSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Enroll a new Certificate credential to the Fleet, optionally giving it a friendly name and assigning to a Device.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="certificateData"> The public certificate data. </param>
-        /// <param name="friendlyName"> The human readable description for this Certificate. </param>
-        /// <param name="deviceSid"> The unique identifier of a Device to be authenticated. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Certificate </returns>
-        public static async System.Threading.Tasks.Task<CertificateResource> CreateAsync(string pathFleetSid,
-                                                                                         string certificateData,
-                                                                                         string friendlyName = null,
-                                                                                         string deviceSid = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateCertificateOptions(pathFleetSid, certificateData){FriendlyName = friendlyName, DeviceSid = deviceSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCertificateOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Certificates",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Certificate credentials belonging to the Fleet.
-        /// </summary>
-        /// <param name="options"> Read Certificate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Certificate </returns>
-        public static ResourceSet<CertificateResource> Read(ReadCertificateOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CertificateResource>.FromJson("certificates", response.Content);
-            return new ResourceSet<CertificateResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Certificate credentials belonging to the Fleet.
-        /// </summary>
-        /// <param name="options"> Read Certificate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Certificate </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CertificateResource>> ReadAsync(ReadCertificateOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CertificateResource>.FromJson("certificates", response.Content);
-            return new ResourceSet<CertificateResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Certificate credentials belonging to the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="deviceSid"> Find all Certificates authenticating specified Device. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Certificate </returns>
-        public static ResourceSet<CertificateResource> Read(string pathFleetSid,
-                                                            string deviceSid = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadCertificateOptions(pathFleetSid){DeviceSid = deviceSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Certificate credentials belonging to the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="deviceSid"> Find all Certificates authenticating specified Device. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Certificate </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CertificateResource>> ReadAsync(string pathFleetSid,
-                                                                                                    string deviceSid = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadCertificateOptions(pathFleetSid){DeviceSid = deviceSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CertificateResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CertificateResource>.FromJson("certificates", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CertificateResource> NextPage(Page<CertificateResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<CertificateResource>.FromJson("certificates", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CertificateResource> PreviousPage(Page<CertificateResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<CertificateResource>.FromJson("certificates", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateCertificateOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Certificates/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update the given properties of a specific Certificate credential in the Fleet, giving it a friendly name or
-        /// assigning to a Device.
-        /// </summary>
-        /// <param name="options"> Update Certificate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Certificate </returns>
-        public static CertificateResource Update(UpdateCertificateOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the given properties of a specific Certificate credential in the Fleet, giving it a friendly name or
-        /// assigning to a Device.
-        /// </summary>
-        /// <param name="options"> Update Certificate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Certificate </returns>
-        public static async System.Threading.Tasks.Task<CertificateResource> UpdateAsync(UpdateCertificateOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update the given properties of a specific Certificate credential in the Fleet, giving it a friendly name or
-        /// assigning to a Device.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
-        /// <param name="friendlyName"> The human readable description for this Certificate. </param>
-        /// <param name="deviceSid"> The unique identifier of a Device to be authenticated. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Certificate </returns>
-        public static CertificateResource Update(string pathFleetSid,
-                                                 string pathSid,
-                                                 string friendlyName = null,
-                                                 string deviceSid = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateCertificateOptions(pathFleetSid, pathSid){FriendlyName = friendlyName, DeviceSid = deviceSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the given properties of a specific Certificate credential in the Fleet, giving it a friendly name or
-        /// assigning to a Device.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
-        /// <param name="friendlyName"> The human readable description for this Certificate. </param>
-        /// <param name="deviceSid"> The unique identifier of a Device to be authenticated. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Certificate </returns>
-        public static async System.Threading.Tasks.Task<CertificateResource> UpdateAsync(string pathFleetSid,
-                                                                                         string pathSid,
-                                                                                         string friendlyName = null,
-                                                                                         string deviceSid = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateCertificateOptions(pathFleetSid, pathSid){FriendlyName = friendlyName, DeviceSid = deviceSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CertificateResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CertificateResource object represented by the provided JSON </returns>
-        public static CertificateResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CertificateResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Certificate.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// URL of this Certificate.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// A human readable description for this Certificate.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique identifier of the Fleet.
-        /// </summary>
-        [JsonProperty("fleet_sid")]
-        public string FleetSid { get; private set; }
-        /// <summary>
-        /// The unique SID that identifies this Account.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique identifier of a mapped Device.
-        /// </summary>
-        [JsonProperty("device_sid")]
-        public string DeviceSid { get; private set; }
-        /// <summary>
-        /// A Certificate unique payload hash.
-        /// </summary>
-        [JsonProperty("thumbprint")]
-        public string Thumbprint { get; private set; }
-        /// <summary>
-        /// The date this Certificate was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this Certificate was updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private CertificateResource()
-        {
-
-        }
-    }
+{
+
+  public class CertificateResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchCertificateOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Certificates/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch information about a specific Certificate credential in the Fleet.
+    /// </summary>
+    /// <param name="options"> Fetch Certificate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Certificate </returns>
+    public static CertificateResource Fetch(FetchCertificateOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch information about a specific Certificate credential in the Fleet.
+    /// </summary>
+    /// <param name="options"> Fetch Certificate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Certificate </returns>
+    public static async System.Threading.Tasks.Task<CertificateResource> FetchAsync(FetchCertificateOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch information about a specific Certificate credential in the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Certificate </returns>
+    public static CertificateResource Fetch(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCertificateOptions(pathFleetSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch information about a specific Certificate credential in the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Certificate </returns>
+    public static async System.Threading.Tasks.Task<CertificateResource> FetchAsync(string pathFleetSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchCertificateOptions(pathFleetSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCertificateOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Certificates/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Unregister a specific Certificate credential from the Fleet, effectively disallowing any inbound client connections
+    /// that are presenting it.
+    /// </summary>
+    /// <param name="options"> Delete Certificate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Certificate </returns>
+    public static bool Delete(DeleteCertificateOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Unregister a specific Certificate credential from the Fleet, effectively disallowing any inbound client connections
+    /// that are presenting it.
+    /// </summary>
+    /// <param name="options"> Delete Certificate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Certificate </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCertificateOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Unregister a specific Certificate credential from the Fleet, effectively disallowing any inbound client connections
+    /// that are presenting it.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Certificate </returns>
+    public static bool Delete(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCertificateOptions(pathFleetSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Unregister a specific Certificate credential from the Fleet, effectively disallowing any inbound client connections
+    /// that are presenting it.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Certificate </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFleetSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteCertificateOptions(pathFleetSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateCertificateOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Certificates",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Enroll a new Certificate credential to the Fleet, optionally giving it a friendly name and assigning to a Device.
+    /// </summary>
+    /// <param name="options"> Create Certificate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Certificate </returns>
+    public static CertificateResource Create(CreateCertificateOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Enroll a new Certificate credential to the Fleet, optionally giving it a friendly name and assigning to a Device.
+    /// </summary>
+    /// <param name="options"> Create Certificate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Certificate </returns>
+    public static async System.Threading.Tasks.Task<CertificateResource> CreateAsync(CreateCertificateOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Enroll a new Certificate credential to the Fleet, optionally giving it a friendly name and assigning to a Device.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="certificateData"> The public certificate data. </param>
+    /// <param name="friendlyName"> The human readable description for this Certificate. </param>
+    /// <param name="deviceSid"> The unique identifier of a Device to be authenticated. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Certificate </returns>
+    public static CertificateResource Create(string pathFleetSid,
+                                             string certificateData,
+                                             string friendlyName = null,
+                                             string deviceSid = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateCertificateOptions(pathFleetSid, certificateData) { FriendlyName = friendlyName, DeviceSid = deviceSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Enroll a new Certificate credential to the Fleet, optionally giving it a friendly name and assigning to a Device.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="certificateData"> The public certificate data. </param>
+    /// <param name="friendlyName"> The human readable description for this Certificate. </param>
+    /// <param name="deviceSid"> The unique identifier of a Device to be authenticated. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Certificate </returns>
+    public static async System.Threading.Tasks.Task<CertificateResource> CreateAsync(string pathFleetSid,
+                                                                                     string certificateData,
+                                                                                     string friendlyName = null,
+                                                                                     string deviceSid = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateCertificateOptions(pathFleetSid, certificateData) { FriendlyName = friendlyName, DeviceSid = deviceSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCertificateOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Certificates",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Certificate credentials belonging to the Fleet.
+    /// </summary>
+    /// <param name="options"> Read Certificate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Certificate </returns>
+    public static ResourceSet<CertificateResource> Read(ReadCertificateOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CertificateResource>.FromJson("certificates", response.Content);
+      return new ResourceSet<CertificateResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Certificate credentials belonging to the Fleet.
+    /// </summary>
+    /// <param name="options"> Read Certificate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Certificate </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CertificateResource>> ReadAsync(ReadCertificateOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CertificateResource>.FromJson("certificates", response.Content);
+      return new ResourceSet<CertificateResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Certificate credentials belonging to the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="deviceSid"> Find all Certificates authenticating specified Device. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Certificate </returns>
+    public static ResourceSet<CertificateResource> Read(string pathFleetSid,
+                                                        string deviceSid = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadCertificateOptions(pathFleetSid) { DeviceSid = deviceSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Certificate credentials belonging to the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="deviceSid"> Find all Certificates authenticating specified Device. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Certificate </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CertificateResource>> ReadAsync(string pathFleetSid,
+                                                                                                string deviceSid = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadCertificateOptions(pathFleetSid) { DeviceSid = deviceSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CertificateResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CertificateResource>.FromJson("certificates", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CertificateResource> NextPage(Page<CertificateResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<CertificateResource>.FromJson("certificates", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CertificateResource> PreviousPage(Page<CertificateResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<CertificateResource>.FromJson("certificates", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateCertificateOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Certificates/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update the given properties of a specific Certificate credential in the Fleet, giving it a friendly name or
+    /// assigning to a Device.
+    /// </summary>
+    /// <param name="options"> Update Certificate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Certificate </returns>
+    public static CertificateResource Update(UpdateCertificateOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the given properties of a specific Certificate credential in the Fleet, giving it a friendly name or
+    /// assigning to a Device.
+    /// </summary>
+    /// <param name="options"> Update Certificate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Certificate </returns>
+    public static async System.Threading.Tasks.Task<CertificateResource> UpdateAsync(UpdateCertificateOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update the given properties of a specific Certificate credential in the Fleet, giving it a friendly name or
+    /// assigning to a Device.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
+    /// <param name="friendlyName"> The human readable description for this Certificate. </param>
+    /// <param name="deviceSid"> The unique identifier of a Device to be authenticated. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Certificate </returns>
+    public static CertificateResource Update(string pathFleetSid,
+                                             string pathSid,
+                                             string friendlyName = null,
+                                             string deviceSid = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateCertificateOptions(pathFleetSid, pathSid) { FriendlyName = friendlyName, DeviceSid = deviceSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the given properties of a specific Certificate credential in the Fleet, giving it a friendly name or
+    /// assigning to a Device.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Certificate. </param>
+    /// <param name="friendlyName"> The human readable description for this Certificate. </param>
+    /// <param name="deviceSid"> The unique identifier of a Device to be authenticated. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Certificate </returns>
+    public static async System.Threading.Tasks.Task<CertificateResource> UpdateAsync(string pathFleetSid,
+                                                                                     string pathSid,
+                                                                                     string friendlyName = null,
+                                                                                     string deviceSid = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateCertificateOptions(pathFleetSid, pathSid) { FriendlyName = friendlyName, DeviceSid = deviceSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CertificateResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CertificateResource object represented by the provided JSON </returns>
+    public static CertificateResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CertificateResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Certificate.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// URL of this Certificate.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// A human readable description for this Certificate.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique identifier of the Fleet.
+    /// </summary>
+    [JsonProperty("fleet_sid")]
+    public string FleetSid { get; private set; }
+    /// <summary>
+    /// The unique SID that identifies this Account.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique identifier of a mapped Device.
+    /// </summary>
+    [JsonProperty("device_sid")]
+    public string DeviceSid { get; private set; }
+    /// <summary>
+    /// A Certificate unique payload hash.
+    /// </summary>
+    [JsonProperty("thumbprint")]
+    public string Thumbprint { get; private set; }
+    /// <summary>
+    /// The date this Certificate was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this Certificate was updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private CertificateResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeploymentOptions.cs b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeploymentOptions.cs
index 0d921d51e..003b1da30 100644
--- a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeploymentOptions.cs
+++ b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeploymentOptions.cs
@@ -9,227 +9,227 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.DeployedDevices.Fleet
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch information about a specific Deployment in the Fleet.
+  /// </summary>
+  public class FetchDeploymentOptions : IOptions<DeploymentResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch information about a specific Deployment in the Fleet.
-    /// </summary>
-    public class FetchDeploymentOptions : IOptions<DeploymentResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies the Deployment.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchDeploymentOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
-        public FetchDeploymentOptions(string pathFleetSid, string pathSid)
-        {
-            PathFleetSid = pathFleetSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Delete a specific Deployment from the Fleet, leaving associated devices effectively undeployed.
-    /// </summary>
-    public class DeleteDeploymentOptions : IOptions<DeploymentResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies the Deployment.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteDeploymentOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
-        public DeleteDeploymentOptions(string pathFleetSid, string pathSid)
-        {
-            PathFleetSid = pathFleetSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// A string that uniquely identifies the Deployment.
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Create a new Deployment in the Fleet, optionally giving it a friendly name and linking to a specific Twilio Sync
-    /// service instance.
-    /// </summary>
-    public class CreateDeploymentOptions : IOptions<DeploymentResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A human readable description for this Deployment.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique identifier of the Sync service instance.
-        /// </summary>
-        public string SyncServiceSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateDeploymentOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        public CreateDeploymentOptions(string pathFleetSid)
-        {
-            PathFleetSid = pathFleetSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (SyncServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SyncServiceSid", SyncServiceSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchDeploymentOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
+    public FetchDeploymentOptions(string pathFleetSid, string pathSid)
+    {
+      PathFleetSid = pathFleetSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of all Deployments belonging to the Fleet.
-    /// </summary>
-    public class ReadDeploymentOptions : ReadOptions<DeploymentResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadDeploymentOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        public ReadDeploymentOptions(string pathFleetSid)
-        {
-            PathFleetSid = pathFleetSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Delete a specific Deployment from the Fleet, leaving associated devices effectively undeployed.
+  /// </summary>
+  public class DeleteDeploymentOptions : IOptions<DeploymentResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Update the given properties of a specific Deployment credential in the Fleet, giving it a friendly name or linking
-    /// to a specific Twilio Sync service instance.
-    /// </summary>
-    public class UpdateDeploymentOptions : IOptions<DeploymentResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies the Deployment.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A human readable description for this Deployment.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique identifier of the Sync service instance.
-        /// </summary>
-        public string SyncServiceSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateDeploymentOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
-        public UpdateDeploymentOptions(string pathFleetSid, string pathSid)
-        {
-            PathFleetSid = pathFleetSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (SyncServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SyncServiceSid", SyncServiceSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// A string that uniquely identifies the Deployment.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteDeploymentOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
+    public DeleteDeploymentOptions(string pathFleetSid, string pathSid)
+    {
+      PathFleetSid = pathFleetSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Create a new Deployment in the Fleet, optionally giving it a friendly name and linking to a specific Twilio Sync
+  /// service instance.
+  /// </summary>
+  public class CreateDeploymentOptions : IOptions<DeploymentResource>
+  {
+    /// <summary>
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// A human readable description for this Deployment.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique identifier of the Sync service instance.
+    /// </summary>
+    public string SyncServiceSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateDeploymentOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    public CreateDeploymentOptions(string pathFleetSid)
+    {
+      PathFleetSid = pathFleetSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (SyncServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SyncServiceSid", SyncServiceSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of all Deployments belonging to the Fleet.
+  /// </summary>
+  public class ReadDeploymentOptions : ReadOptions<DeploymentResource>
+  {
+    /// <summary>
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadDeploymentOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    public ReadDeploymentOptions(string pathFleetSid)
+    {
+      PathFleetSid = pathFleetSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Update the given properties of a specific Deployment credential in the Fleet, giving it a friendly name or linking
+  /// to a specific Twilio Sync service instance.
+  /// </summary>
+  public class UpdateDeploymentOptions : IOptions<DeploymentResource>
+  {
+    /// <summary>
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// A string that uniquely identifies the Deployment.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A human readable description for this Deployment.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique identifier of the Sync service instance.
+    /// </summary>
+    public string SyncServiceSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateDeploymentOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
+    public UpdateDeploymentOptions(string pathFleetSid, string pathSid)
+    {
+      PathFleetSid = pathFleetSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (SyncServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SyncServiceSid", SyncServiceSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeploymentResource.cs b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeploymentResource.cs
index 257204b9b..848f0b654 100644
--- a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeploymentResource.cs
+++ b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeploymentResource.cs
@@ -19,510 +19,510 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.DeployedDevices.Fleet
-{
-
-    public class DeploymentResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchDeploymentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Deployments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch information about a specific Deployment in the Fleet.
-        /// </summary>
-        /// <param name="options"> Fetch Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static DeploymentResource Fetch(FetchDeploymentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch information about a specific Deployment in the Fleet.
-        /// </summary>
-        /// <param name="options"> Fetch Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<DeploymentResource> FetchAsync(FetchDeploymentOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch information about a specific Deployment in the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static DeploymentResource Fetch(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchDeploymentOptions(pathFleetSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch information about a specific Deployment in the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<DeploymentResource> FetchAsync(string pathFleetSid,
-                                                                                       string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchDeploymentOptions(pathFleetSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteDeploymentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Deployments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Deployment from the Fleet, leaving associated devices effectively undeployed.
-        /// </summary>
-        /// <param name="options"> Delete Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static bool Delete(DeleteDeploymentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Deployment from the Fleet, leaving associated devices effectively undeployed.
-        /// </summary>
-        /// <param name="options"> Delete Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDeploymentOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Deployment from the Fleet, leaving associated devices effectively undeployed.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static bool Delete(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteDeploymentOptions(pathFleetSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Deployment from the Fleet, leaving associated devices effectively undeployed.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFleetSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteDeploymentOptions(pathFleetSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateDeploymentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Deployments",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Deployment in the Fleet, optionally giving it a friendly name and linking to a specific Twilio Sync
-        /// service instance.
-        /// </summary>
-        /// <param name="options"> Create Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static DeploymentResource Create(CreateDeploymentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Deployment in the Fleet, optionally giving it a friendly name and linking to a specific Twilio Sync
-        /// service instance.
-        /// </summary>
-        /// <param name="options"> Create Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<DeploymentResource> CreateAsync(CreateDeploymentOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Deployment in the Fleet, optionally giving it a friendly name and linking to a specific Twilio Sync
-        /// service instance.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="friendlyName"> A human readable description for this Deployment. </param>
-        /// <param name="syncServiceSid"> The unique identifier of the Sync service instance. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static DeploymentResource Create(string pathFleetSid,
-                                                string friendlyName = null,
-                                                string syncServiceSid = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateDeploymentOptions(pathFleetSid){FriendlyName = friendlyName, SyncServiceSid = syncServiceSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Deployment in the Fleet, optionally giving it a friendly name and linking to a specific Twilio Sync
-        /// service instance.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="friendlyName"> A human readable description for this Deployment. </param>
-        /// <param name="syncServiceSid"> The unique identifier of the Sync service instance. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<DeploymentResource> CreateAsync(string pathFleetSid,
-                                                                                        string friendlyName = null,
-                                                                                        string syncServiceSid = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateDeploymentOptions(pathFleetSid){FriendlyName = friendlyName, SyncServiceSid = syncServiceSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadDeploymentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Deployments",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Deployments belonging to the Fleet.
-        /// </summary>
-        /// <param name="options"> Read Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static ResourceSet<DeploymentResource> Read(ReadDeploymentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DeploymentResource>.FromJson("deployments", response.Content);
-            return new ResourceSet<DeploymentResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Deployments belonging to the Fleet.
-        /// </summary>
-        /// <param name="options"> Read Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DeploymentResource>> ReadAsync(ReadDeploymentOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DeploymentResource>.FromJson("deployments", response.Content);
-            return new ResourceSet<DeploymentResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Deployments belonging to the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static ResourceSet<DeploymentResource> Read(string pathFleetSid,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadDeploymentOptions(pathFleetSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Deployments belonging to the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DeploymentResource>> ReadAsync(string pathFleetSid,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadDeploymentOptions(pathFleetSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DeploymentResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DeploymentResource>.FromJson("deployments", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DeploymentResource> NextPage(Page<DeploymentResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<DeploymentResource>.FromJson("deployments", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DeploymentResource> PreviousPage(Page<DeploymentResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<DeploymentResource>.FromJson("deployments", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateDeploymentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Deployments/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update the given properties of a specific Deployment credential in the Fleet, giving it a friendly name or linking
-        /// to a specific Twilio Sync service instance.
-        /// </summary>
-        /// <param name="options"> Update Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static DeploymentResource Update(UpdateDeploymentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the given properties of a specific Deployment credential in the Fleet, giving it a friendly name or linking
-        /// to a specific Twilio Sync service instance.
-        /// </summary>
-        /// <param name="options"> Update Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<DeploymentResource> UpdateAsync(UpdateDeploymentOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update the given properties of a specific Deployment credential in the Fleet, giving it a friendly name or linking
-        /// to a specific Twilio Sync service instance.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
-        /// <param name="friendlyName"> A human readable description for this Deployment. </param>
-        /// <param name="syncServiceSid"> The unique identifier of the Sync service instance. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static DeploymentResource Update(string pathFleetSid,
-                                                string pathSid,
-                                                string friendlyName = null,
-                                                string syncServiceSid = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateDeploymentOptions(pathFleetSid, pathSid){FriendlyName = friendlyName, SyncServiceSid = syncServiceSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the given properties of a specific Deployment credential in the Fleet, giving it a friendly name or linking
-        /// to a specific Twilio Sync service instance.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
-        /// <param name="friendlyName"> A human readable description for this Deployment. </param>
-        /// <param name="syncServiceSid"> The unique identifier of the Sync service instance. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<DeploymentResource> UpdateAsync(string pathFleetSid,
-                                                                                        string pathSid,
-                                                                                        string friendlyName = null,
-                                                                                        string syncServiceSid = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateDeploymentOptions(pathFleetSid, pathSid){FriendlyName = friendlyName, SyncServiceSid = syncServiceSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a DeploymentResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DeploymentResource object represented by the provided JSON </returns>
-        public static DeploymentResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DeploymentResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Deployment.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// URL of this Deployment.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// A human readable description for this Deployment
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique identifier of the Fleet.
-        /// </summary>
-        [JsonProperty("fleet_sid")]
-        public string FleetSid { get; private set; }
-        /// <summary>
-        /// The unique SID that identifies this Account.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique identifier of the Sync service instance.
-        /// </summary>
-        [JsonProperty("sync_service_sid")]
-        public string SyncServiceSid { get; private set; }
-        /// <summary>
-        /// The date this Deployment was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this Deployment was updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private DeploymentResource()
-        {
-
-        }
-    }
+{
+
+  public class DeploymentResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchDeploymentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Deployments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch information about a specific Deployment in the Fleet.
+    /// </summary>
+    /// <param name="options"> Fetch Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static DeploymentResource Fetch(FetchDeploymentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch information about a specific Deployment in the Fleet.
+    /// </summary>
+    /// <param name="options"> Fetch Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<DeploymentResource> FetchAsync(FetchDeploymentOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch information about a specific Deployment in the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static DeploymentResource Fetch(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchDeploymentOptions(pathFleetSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch information about a specific Deployment in the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<DeploymentResource> FetchAsync(string pathFleetSid,
+                                                                                   string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchDeploymentOptions(pathFleetSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteDeploymentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Deployments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Deployment from the Fleet, leaving associated devices effectively undeployed.
+    /// </summary>
+    /// <param name="options"> Delete Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static bool Delete(DeleteDeploymentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Deployment from the Fleet, leaving associated devices effectively undeployed.
+    /// </summary>
+    /// <param name="options"> Delete Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDeploymentOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Deployment from the Fleet, leaving associated devices effectively undeployed.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static bool Delete(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteDeploymentOptions(pathFleetSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Deployment from the Fleet, leaving associated devices effectively undeployed.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFleetSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteDeploymentOptions(pathFleetSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateDeploymentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Deployments",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Deployment in the Fleet, optionally giving it a friendly name and linking to a specific Twilio Sync
+    /// service instance.
+    /// </summary>
+    /// <param name="options"> Create Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static DeploymentResource Create(CreateDeploymentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Deployment in the Fleet, optionally giving it a friendly name and linking to a specific Twilio Sync
+    /// service instance.
+    /// </summary>
+    /// <param name="options"> Create Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<DeploymentResource> CreateAsync(CreateDeploymentOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Deployment in the Fleet, optionally giving it a friendly name and linking to a specific Twilio Sync
+    /// service instance.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="friendlyName"> A human readable description for this Deployment. </param>
+    /// <param name="syncServiceSid"> The unique identifier of the Sync service instance. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static DeploymentResource Create(string pathFleetSid,
+                                            string friendlyName = null,
+                                            string syncServiceSid = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateDeploymentOptions(pathFleetSid) { FriendlyName = friendlyName, SyncServiceSid = syncServiceSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Deployment in the Fleet, optionally giving it a friendly name and linking to a specific Twilio Sync
+    /// service instance.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="friendlyName"> A human readable description for this Deployment. </param>
+    /// <param name="syncServiceSid"> The unique identifier of the Sync service instance. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<DeploymentResource> CreateAsync(string pathFleetSid,
+                                                                                    string friendlyName = null,
+                                                                                    string syncServiceSid = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateDeploymentOptions(pathFleetSid) { FriendlyName = friendlyName, SyncServiceSid = syncServiceSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadDeploymentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Deployments",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Deployments belonging to the Fleet.
+    /// </summary>
+    /// <param name="options"> Read Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static ResourceSet<DeploymentResource> Read(ReadDeploymentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DeploymentResource>.FromJson("deployments", response.Content);
+      return new ResourceSet<DeploymentResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Deployments belonging to the Fleet.
+    /// </summary>
+    /// <param name="options"> Read Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DeploymentResource>> ReadAsync(ReadDeploymentOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DeploymentResource>.FromJson("deployments", response.Content);
+      return new ResourceSet<DeploymentResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Deployments belonging to the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static ResourceSet<DeploymentResource> Read(string pathFleetSid,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadDeploymentOptions(pathFleetSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Deployments belonging to the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DeploymentResource>> ReadAsync(string pathFleetSid,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadDeploymentOptions(pathFleetSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DeploymentResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DeploymentResource>.FromJson("deployments", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DeploymentResource> NextPage(Page<DeploymentResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<DeploymentResource>.FromJson("deployments", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DeploymentResource> PreviousPage(Page<DeploymentResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<DeploymentResource>.FromJson("deployments", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateDeploymentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Deployments/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update the given properties of a specific Deployment credential in the Fleet, giving it a friendly name or linking
+    /// to a specific Twilio Sync service instance.
+    /// </summary>
+    /// <param name="options"> Update Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static DeploymentResource Update(UpdateDeploymentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the given properties of a specific Deployment credential in the Fleet, giving it a friendly name or linking
+    /// to a specific Twilio Sync service instance.
+    /// </summary>
+    /// <param name="options"> Update Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<DeploymentResource> UpdateAsync(UpdateDeploymentOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update the given properties of a specific Deployment credential in the Fleet, giving it a friendly name or linking
+    /// to a specific Twilio Sync service instance.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
+    /// <param name="friendlyName"> A human readable description for this Deployment. </param>
+    /// <param name="syncServiceSid"> The unique identifier of the Sync service instance. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static DeploymentResource Update(string pathFleetSid,
+                                            string pathSid,
+                                            string friendlyName = null,
+                                            string syncServiceSid = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateDeploymentOptions(pathFleetSid, pathSid) { FriendlyName = friendlyName, SyncServiceSid = syncServiceSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the given properties of a specific Deployment credential in the Fleet, giving it a friendly name or linking
+    /// to a specific Twilio Sync service instance.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Deployment. </param>
+    /// <param name="friendlyName"> A human readable description for this Deployment. </param>
+    /// <param name="syncServiceSid"> The unique identifier of the Sync service instance. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<DeploymentResource> UpdateAsync(string pathFleetSid,
+                                                                                    string pathSid,
+                                                                                    string friendlyName = null,
+                                                                                    string syncServiceSid = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateDeploymentOptions(pathFleetSid, pathSid) { FriendlyName = friendlyName, SyncServiceSid = syncServiceSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a DeploymentResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DeploymentResource object represented by the provided JSON </returns>
+    public static DeploymentResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DeploymentResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Deployment.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// URL of this Deployment.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// A human readable description for this Deployment
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique identifier of the Fleet.
+    /// </summary>
+    [JsonProperty("fleet_sid")]
+    public string FleetSid { get; private set; }
+    /// <summary>
+    /// The unique SID that identifies this Account.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique identifier of the Sync service instance.
+    /// </summary>
+    [JsonProperty("sync_service_sid")]
+    public string SyncServiceSid { get; private set; }
+    /// <summary>
+    /// The date this Deployment was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this Deployment was updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private DeploymentResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeviceOptions.cs b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeviceOptions.cs
index 87792e5a2..5bb7906e1 100644
--- a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeviceOptions.cs
+++ b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeviceOptions.cs
@@ -9,281 +9,281 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.DeployedDevices.Fleet
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch information about a specific Device in the Fleet.
+  /// </summary>
+  public class FetchDeviceOptions : IOptions<DeviceResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch information about a specific Device in the Fleet.
+    /// The fleet_sid
     /// </summary>
-    public class FetchDeviceOptions : IOptions<DeviceResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies the Device.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchDeviceOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
-        public FetchDeviceOptions(string pathFleetSid, string pathSid)
-        {
-            PathFleetSid = pathFleetSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathFleetSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Delete a specific Device from the Fleet, also removing it from associated Deployments.
+    /// A string that uniquely identifies the Device.
     /// </summary>
-    public class DeleteDeviceOptions : IOptions<DeviceResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies the Device.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteDeviceOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
-        public DeleteDeviceOptions(string pathFleetSid, string pathSid)
-        {
-            PathFleetSid = pathFleetSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Create a new Device in the Fleet, optionally giving it a unique name, friendly name, and assigning to a Deployment
-    /// and/or human identity.
+    /// Construct a new FetchDeviceOptions
     /// </summary>
-    public class CreateDeviceOptions : IOptions<DeviceResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A unique, addressable name of this Device.
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// A human readable description for this Device.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// An identifier of the Device user.
-        /// </summary>
-        public string Identity { get; set; }
-        /// <summary>
-        /// The unique SID of the Deployment group.
-        /// </summary>
-        public string DeploymentSid { get; set; }
-        /// <summary>
-        /// The enabled
-        /// </summary>
-        public bool? Enabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateDeviceOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        public CreateDeviceOptions(string pathFleetSid)
-        {
-            PathFleetSid = pathFleetSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (DeploymentSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeploymentSid", DeploymentSid.ToString()));
-            }
-
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
+    public FetchDeviceOptions(string pathFleetSid, string pathSid)
+    {
+      PathFleetSid = pathFleetSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of all Devices belonging to the Fleet.
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadDeviceOptions : ReadOptions<DeviceResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// Find all Devices grouped under the specified Deployment.
-        /// </summary>
-        public string DeploymentSid { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadDeviceOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        public ReadDeviceOptions(string pathFleetSid)
-        {
-            PathFleetSid = pathFleetSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DeploymentSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeploymentSid", DeploymentSid.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Delete a specific Device from the Fleet, also removing it from associated Deployments.
+  /// </summary>
+  public class DeleteDeviceOptions : IOptions<DeviceResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Update the given properties of a specific Device in the Fleet, giving it a friendly name, assigning to a Deployment,
-    /// or a human identity.
+    /// The fleet_sid
     /// </summary>
-    public class UpdateDeviceOptions : IOptions<DeviceResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies the Device.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A human readable description for this Device.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// An identifier of the Device user.
-        /// </summary>
-        public string Identity { get; set; }
-        /// <summary>
-        /// The unique SID of the Deployment group.
-        /// </summary>
-        public string DeploymentSid { get; set; }
-        /// <summary>
-        /// The enabled
-        /// </summary>
-        public bool? Enabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateDeviceOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
-        public UpdateDeviceOptions(string pathFleetSid, string pathSid)
-        {
-            PathFleetSid = pathFleetSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (DeploymentSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeploymentSid", DeploymentSid.ToString()));
-            }
-
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// A string that uniquely identifies the Device.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteDeviceOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
+    public DeleteDeviceOptions(string pathFleetSid, string pathSid)
+    {
+      PathFleetSid = pathFleetSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Create a new Device in the Fleet, optionally giving it a unique name, friendly name, and assigning to a Deployment
+  /// and/or human identity.
+  /// </summary>
+  public class CreateDeviceOptions : IOptions<DeviceResource>
+  {
+    /// <summary>
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// A unique, addressable name of this Device.
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// A human readable description for this Device.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// An identifier of the Device user.
+    /// </summary>
+    public string Identity { get; set; }
+    /// <summary>
+    /// The unique SID of the Deployment group.
+    /// </summary>
+    public string DeploymentSid { get; set; }
+    /// <summary>
+    /// The enabled
+    /// </summary>
+    public bool? Enabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateDeviceOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    public CreateDeviceOptions(string pathFleetSid)
+    {
+      PathFleetSid = pathFleetSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (DeploymentSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeploymentSid", DeploymentSid.ToString()));
+      }
+
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of all Devices belonging to the Fleet.
+  /// </summary>
+  public class ReadDeviceOptions : ReadOptions<DeviceResource>
+  {
+    /// <summary>
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// Find all Devices grouped under the specified Deployment.
+    /// </summary>
+    public string DeploymentSid { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadDeviceOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    public ReadDeviceOptions(string pathFleetSid)
+    {
+      PathFleetSid = pathFleetSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DeploymentSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeploymentSid", DeploymentSid.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Update the given properties of a specific Device in the Fleet, giving it a friendly name, assigning to a Deployment,
+  /// or a human identity.
+  /// </summary>
+  public class UpdateDeviceOptions : IOptions<DeviceResource>
+  {
+    /// <summary>
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// A string that uniquely identifies the Device.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A human readable description for this Device.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// An identifier of the Device user.
+    /// </summary>
+    public string Identity { get; set; }
+    /// <summary>
+    /// The unique SID of the Deployment group.
+    /// </summary>
+    public string DeploymentSid { get; set; }
+    /// <summary>
+    /// The enabled
+    /// </summary>
+    public bool? Enabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateDeviceOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
+    public UpdateDeviceOptions(string pathFleetSid, string pathSid)
+    {
+      PathFleetSid = pathFleetSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (DeploymentSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeploymentSid", DeploymentSid.ToString()));
+      }
+
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeviceResource.cs b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeviceResource.cs
index 4aa9ac8ae..f03d9ffaa 100644
--- a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeviceResource.cs
+++ b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/DeviceResource.cs
@@ -19,554 +19,554 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.DeployedDevices.Fleet
-{
-
-    public class DeviceResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchDeviceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Devices/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch information about a specific Device in the Fleet.
-        /// </summary>
-        /// <param name="options"> Fetch Device parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Device </returns>
-        public static DeviceResource Fetch(FetchDeviceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch information about a specific Device in the Fleet.
-        /// </summary>
-        /// <param name="options"> Fetch Device parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Device </returns>
-        public static async System.Threading.Tasks.Task<DeviceResource> FetchAsync(FetchDeviceOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch information about a specific Device in the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Device </returns>
-        public static DeviceResource Fetch(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchDeviceOptions(pathFleetSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch information about a specific Device in the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Device </returns>
-        public static async System.Threading.Tasks.Task<DeviceResource> FetchAsync(string pathFleetSid,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchDeviceOptions(pathFleetSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteDeviceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Devices/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Device from the Fleet, also removing it from associated Deployments.
-        /// </summary>
-        /// <param name="options"> Delete Device parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Device </returns>
-        public static bool Delete(DeleteDeviceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Device from the Fleet, also removing it from associated Deployments.
-        /// </summary>
-        /// <param name="options"> Delete Device parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Device </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDeviceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Device from the Fleet, also removing it from associated Deployments.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Device </returns>
-        public static bool Delete(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteDeviceOptions(pathFleetSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Device from the Fleet, also removing it from associated Deployments.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Device </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFleetSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteDeviceOptions(pathFleetSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateDeviceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Devices",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Device in the Fleet, optionally giving it a unique name, friendly name, and assigning to a Deployment
-        /// and/or human identity.
-        /// </summary>
-        /// <param name="options"> Create Device parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Device </returns>
-        public static DeviceResource Create(CreateDeviceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Device in the Fleet, optionally giving it a unique name, friendly name, and assigning to a Deployment
-        /// and/or human identity.
-        /// </summary>
-        /// <param name="options"> Create Device parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Device </returns>
-        public static async System.Threading.Tasks.Task<DeviceResource> CreateAsync(CreateDeviceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Device in the Fleet, optionally giving it a unique name, friendly name, and assigning to a Deployment
-        /// and/or human identity.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="uniqueName"> A unique, addressable name of this Device. </param>
-        /// <param name="friendlyName"> A human readable description for this Device. </param>
-        /// <param name="identity"> An identifier of the Device user. </param>
-        /// <param name="deploymentSid"> The unique SID of the Deployment group. </param>
-        /// <param name="enabled"> The enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Device </returns>
-        public static DeviceResource Create(string pathFleetSid,
-                                            string uniqueName = null,
-                                            string friendlyName = null,
-                                            string identity = null,
-                                            string deploymentSid = null,
-                                            bool? enabled = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateDeviceOptions(pathFleetSid){UniqueName = uniqueName, FriendlyName = friendlyName, Identity = identity, DeploymentSid = deploymentSid, Enabled = enabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Device in the Fleet, optionally giving it a unique name, friendly name, and assigning to a Deployment
-        /// and/or human identity.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="uniqueName"> A unique, addressable name of this Device. </param>
-        /// <param name="friendlyName"> A human readable description for this Device. </param>
-        /// <param name="identity"> An identifier of the Device user. </param>
-        /// <param name="deploymentSid"> The unique SID of the Deployment group. </param>
-        /// <param name="enabled"> The enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Device </returns>
-        public static async System.Threading.Tasks.Task<DeviceResource> CreateAsync(string pathFleetSid,
-                                                                                    string uniqueName = null,
-                                                                                    string friendlyName = null,
-                                                                                    string identity = null,
-                                                                                    string deploymentSid = null,
-                                                                                    bool? enabled = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateDeviceOptions(pathFleetSid){UniqueName = uniqueName, FriendlyName = friendlyName, Identity = identity, DeploymentSid = deploymentSid, Enabled = enabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadDeviceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Devices",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Devices belonging to the Fleet.
-        /// </summary>
-        /// <param name="options"> Read Device parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Device </returns>
-        public static ResourceSet<DeviceResource> Read(ReadDeviceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DeviceResource>.FromJson("devices", response.Content);
-            return new ResourceSet<DeviceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Devices belonging to the Fleet.
-        /// </summary>
-        /// <param name="options"> Read Device parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Device </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DeviceResource>> ReadAsync(ReadDeviceOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DeviceResource>.FromJson("devices", response.Content);
-            return new ResourceSet<DeviceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Devices belonging to the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="deploymentSid"> Find all Devices grouped under the specified Deployment. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Device </returns>
-        public static ResourceSet<DeviceResource> Read(string pathFleetSid,
-                                                       string deploymentSid = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadDeviceOptions(pathFleetSid){DeploymentSid = deploymentSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Devices belonging to the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="deploymentSid"> Find all Devices grouped under the specified Deployment. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Device </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DeviceResource>> ReadAsync(string pathFleetSid,
-                                                                                               string deploymentSid = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadDeviceOptions(pathFleetSid){DeploymentSid = deploymentSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DeviceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DeviceResource>.FromJson("devices", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DeviceResource> NextPage(Page<DeviceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<DeviceResource>.FromJson("devices", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DeviceResource> PreviousPage(Page<DeviceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<DeviceResource>.FromJson("devices", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateDeviceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Devices/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update the given properties of a specific Device in the Fleet, giving it a friendly name, assigning to a Deployment,
-        /// or a human identity.
-        /// </summary>
-        /// <param name="options"> Update Device parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Device </returns>
-        public static DeviceResource Update(UpdateDeviceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the given properties of a specific Device in the Fleet, giving it a friendly name, assigning to a Deployment,
-        /// or a human identity.
-        /// </summary>
-        /// <param name="options"> Update Device parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Device </returns>
-        public static async System.Threading.Tasks.Task<DeviceResource> UpdateAsync(UpdateDeviceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update the given properties of a specific Device in the Fleet, giving it a friendly name, assigning to a Deployment,
-        /// or a human identity.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
-        /// <param name="friendlyName"> A human readable description for this Device. </param>
-        /// <param name="identity"> An identifier of the Device user. </param>
-        /// <param name="deploymentSid"> The unique SID of the Deployment group. </param>
-        /// <param name="enabled"> The enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Device </returns>
-        public static DeviceResource Update(string pathFleetSid,
-                                            string pathSid,
-                                            string friendlyName = null,
-                                            string identity = null,
-                                            string deploymentSid = null,
-                                            bool? enabled = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateDeviceOptions(pathFleetSid, pathSid){FriendlyName = friendlyName, Identity = identity, DeploymentSid = deploymentSid, Enabled = enabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the given properties of a specific Device in the Fleet, giving it a friendly name, assigning to a Deployment,
-        /// or a human identity.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
-        /// <param name="friendlyName"> A human readable description for this Device. </param>
-        /// <param name="identity"> An identifier of the Device user. </param>
-        /// <param name="deploymentSid"> The unique SID of the Deployment group. </param>
-        /// <param name="enabled"> The enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Device </returns>
-        public static async System.Threading.Tasks.Task<DeviceResource> UpdateAsync(string pathFleetSid,
-                                                                                    string pathSid,
-                                                                                    string friendlyName = null,
-                                                                                    string identity = null,
-                                                                                    string deploymentSid = null,
-                                                                                    bool? enabled = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateDeviceOptions(pathFleetSid, pathSid){FriendlyName = friendlyName, Identity = identity, DeploymentSid = deploymentSid, Enabled = enabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a DeviceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DeviceResource object represented by the provided JSON </returns>
-        public static DeviceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DeviceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Device.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// URL of this Device.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// A unique, addressable name of this Device.
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// A human readable description for this Device
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique identifier of the Fleet.
-        /// </summary>
-        [JsonProperty("fleet_sid")]
-        public string FleetSid { get; private set; }
-        /// <summary>
-        /// Device enabled flag.
-        /// </summary>
-        [JsonProperty("enabled")]
-        public bool? Enabled { get; private set; }
-        /// <summary>
-        /// The unique SID that identifies this Account.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// An identifier of the Device user.
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The unique SID of the Deployment group.
-        /// </summary>
-        [JsonProperty("deployment_sid")]
-        public string DeploymentSid { get; private set; }
-        /// <summary>
-        /// The date this Device was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this Device was updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The date this Device was authenticated.
-        /// </summary>
-        [JsonProperty("date_authenticated")]
-        public DateTime? DateAuthenticated { get; private set; }
-
-        private DeviceResource()
-        {
-
-        }
-    }
+{
+
+  public class DeviceResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchDeviceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Devices/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch information about a specific Device in the Fleet.
+    /// </summary>
+    /// <param name="options"> Fetch Device parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Device </returns>
+    public static DeviceResource Fetch(FetchDeviceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch information about a specific Device in the Fleet.
+    /// </summary>
+    /// <param name="options"> Fetch Device parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Device </returns>
+    public static async System.Threading.Tasks.Task<DeviceResource> FetchAsync(FetchDeviceOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch information about a specific Device in the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Device </returns>
+    public static DeviceResource Fetch(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchDeviceOptions(pathFleetSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch information about a specific Device in the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Device </returns>
+    public static async System.Threading.Tasks.Task<DeviceResource> FetchAsync(string pathFleetSid,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchDeviceOptions(pathFleetSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteDeviceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Devices/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Device from the Fleet, also removing it from associated Deployments.
+    /// </summary>
+    /// <param name="options"> Delete Device parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Device </returns>
+    public static bool Delete(DeleteDeviceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Device from the Fleet, also removing it from associated Deployments.
+    /// </summary>
+    /// <param name="options"> Delete Device parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Device </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDeviceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Device from the Fleet, also removing it from associated Deployments.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Device </returns>
+    public static bool Delete(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteDeviceOptions(pathFleetSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Device from the Fleet, also removing it from associated Deployments.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Device </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFleetSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteDeviceOptions(pathFleetSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateDeviceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Devices",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Device in the Fleet, optionally giving it a unique name, friendly name, and assigning to a Deployment
+    /// and/or human identity.
+    /// </summary>
+    /// <param name="options"> Create Device parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Device </returns>
+    public static DeviceResource Create(CreateDeviceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Device in the Fleet, optionally giving it a unique name, friendly name, and assigning to a Deployment
+    /// and/or human identity.
+    /// </summary>
+    /// <param name="options"> Create Device parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Device </returns>
+    public static async System.Threading.Tasks.Task<DeviceResource> CreateAsync(CreateDeviceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Device in the Fleet, optionally giving it a unique name, friendly name, and assigning to a Deployment
+    /// and/or human identity.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="uniqueName"> A unique, addressable name of this Device. </param>
+    /// <param name="friendlyName"> A human readable description for this Device. </param>
+    /// <param name="identity"> An identifier of the Device user. </param>
+    /// <param name="deploymentSid"> The unique SID of the Deployment group. </param>
+    /// <param name="enabled"> The enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Device </returns>
+    public static DeviceResource Create(string pathFleetSid,
+                                        string uniqueName = null,
+                                        string friendlyName = null,
+                                        string identity = null,
+                                        string deploymentSid = null,
+                                        bool? enabled = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateDeviceOptions(pathFleetSid) { UniqueName = uniqueName, FriendlyName = friendlyName, Identity = identity, DeploymentSid = deploymentSid, Enabled = enabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Device in the Fleet, optionally giving it a unique name, friendly name, and assigning to a Deployment
+    /// and/or human identity.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="uniqueName"> A unique, addressable name of this Device. </param>
+    /// <param name="friendlyName"> A human readable description for this Device. </param>
+    /// <param name="identity"> An identifier of the Device user. </param>
+    /// <param name="deploymentSid"> The unique SID of the Deployment group. </param>
+    /// <param name="enabled"> The enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Device </returns>
+    public static async System.Threading.Tasks.Task<DeviceResource> CreateAsync(string pathFleetSid,
+                                                                                string uniqueName = null,
+                                                                                string friendlyName = null,
+                                                                                string identity = null,
+                                                                                string deploymentSid = null,
+                                                                                bool? enabled = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateDeviceOptions(pathFleetSid) { UniqueName = uniqueName, FriendlyName = friendlyName, Identity = identity, DeploymentSid = deploymentSid, Enabled = enabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadDeviceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Devices",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Devices belonging to the Fleet.
+    /// </summary>
+    /// <param name="options"> Read Device parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Device </returns>
+    public static ResourceSet<DeviceResource> Read(ReadDeviceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DeviceResource>.FromJson("devices", response.Content);
+      return new ResourceSet<DeviceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Devices belonging to the Fleet.
+    /// </summary>
+    /// <param name="options"> Read Device parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Device </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DeviceResource>> ReadAsync(ReadDeviceOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DeviceResource>.FromJson("devices", response.Content);
+      return new ResourceSet<DeviceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Devices belonging to the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="deploymentSid"> Find all Devices grouped under the specified Deployment. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Device </returns>
+    public static ResourceSet<DeviceResource> Read(string pathFleetSid,
+                                                   string deploymentSid = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadDeviceOptions(pathFleetSid) { DeploymentSid = deploymentSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Devices belonging to the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="deploymentSid"> Find all Devices grouped under the specified Deployment. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Device </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DeviceResource>> ReadAsync(string pathFleetSid,
+                                                                                           string deploymentSid = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadDeviceOptions(pathFleetSid) { DeploymentSid = deploymentSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DeviceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DeviceResource>.FromJson("devices", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DeviceResource> NextPage(Page<DeviceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<DeviceResource>.FromJson("devices", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DeviceResource> PreviousPage(Page<DeviceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<DeviceResource>.FromJson("devices", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateDeviceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Devices/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update the given properties of a specific Device in the Fleet, giving it a friendly name, assigning to a Deployment,
+    /// or a human identity.
+    /// </summary>
+    /// <param name="options"> Update Device parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Device </returns>
+    public static DeviceResource Update(UpdateDeviceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the given properties of a specific Device in the Fleet, giving it a friendly name, assigning to a Deployment,
+    /// or a human identity.
+    /// </summary>
+    /// <param name="options"> Update Device parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Device </returns>
+    public static async System.Threading.Tasks.Task<DeviceResource> UpdateAsync(UpdateDeviceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update the given properties of a specific Device in the Fleet, giving it a friendly name, assigning to a Deployment,
+    /// or a human identity.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
+    /// <param name="friendlyName"> A human readable description for this Device. </param>
+    /// <param name="identity"> An identifier of the Device user. </param>
+    /// <param name="deploymentSid"> The unique SID of the Deployment group. </param>
+    /// <param name="enabled"> The enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Device </returns>
+    public static DeviceResource Update(string pathFleetSid,
+                                        string pathSid,
+                                        string friendlyName = null,
+                                        string identity = null,
+                                        string deploymentSid = null,
+                                        bool? enabled = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateDeviceOptions(pathFleetSid, pathSid) { FriendlyName = friendlyName, Identity = identity, DeploymentSid = deploymentSid, Enabled = enabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the given properties of a specific Device in the Fleet, giving it a friendly name, assigning to a Deployment,
+    /// or a human identity.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Device. </param>
+    /// <param name="friendlyName"> A human readable description for this Device. </param>
+    /// <param name="identity"> An identifier of the Device user. </param>
+    /// <param name="deploymentSid"> The unique SID of the Deployment group. </param>
+    /// <param name="enabled"> The enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Device </returns>
+    public static async System.Threading.Tasks.Task<DeviceResource> UpdateAsync(string pathFleetSid,
+                                                                                string pathSid,
+                                                                                string friendlyName = null,
+                                                                                string identity = null,
+                                                                                string deploymentSid = null,
+                                                                                bool? enabled = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateDeviceOptions(pathFleetSid, pathSid) { FriendlyName = friendlyName, Identity = identity, DeploymentSid = deploymentSid, Enabled = enabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a DeviceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DeviceResource object represented by the provided JSON </returns>
+    public static DeviceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DeviceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Device.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// URL of this Device.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// A unique, addressable name of this Device.
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// A human readable description for this Device
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique identifier of the Fleet.
+    /// </summary>
+    [JsonProperty("fleet_sid")]
+    public string FleetSid { get; private set; }
+    /// <summary>
+    /// Device enabled flag.
+    /// </summary>
+    [JsonProperty("enabled")]
+    public bool? Enabled { get; private set; }
+    /// <summary>
+    /// The unique SID that identifies this Account.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// An identifier of the Device user.
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The unique SID of the Deployment group.
+    /// </summary>
+    [JsonProperty("deployment_sid")]
+    public string DeploymentSid { get; private set; }
+    /// <summary>
+    /// The date this Device was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this Device was updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The date this Device was authenticated.
+    /// </summary>
+    [JsonProperty("date_authenticated")]
+    public DateTime? DateAuthenticated { get; private set; }
+
+    private DeviceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/KeyOptions.cs b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/KeyOptions.cs
index 2843a740f..b4c8553d2 100644
--- a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/KeyOptions.cs
+++ b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/KeyOptions.cs
@@ -9,236 +9,236 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.DeployedDevices.Fleet
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch information about a specific Key credential in the Fleet.
+  /// </summary>
+  public class FetchKeyOptions : IOptions<KeyResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch information about a specific Key credential in the Fleet.
-    /// </summary>
-    public class FetchKeyOptions : IOptions<KeyResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies the Key.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchKeyOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
-        public FetchKeyOptions(string pathFleetSid, string pathSid)
-        {
-            PathFleetSid = pathFleetSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Delete a specific Key credential from the Fleet, effectively disallowing any inbound client connections that are
-    /// presenting it.
-    /// </summary>
-    public class DeleteKeyOptions : IOptions<KeyResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies the Key.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteKeyOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
-        public DeleteKeyOptions(string pathFleetSid, string pathSid)
-        {
-            PathFleetSid = pathFleetSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// A string that uniquely identifies the Key.
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Create a new Key credential in the Fleet, optionally giving it a friendly name and assigning to a Device.
-    /// </summary>
-    public class CreateKeyOptions : IOptions<KeyResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// The human readable description for this Key.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique identifier of a Key to be authenticated.
-        /// </summary>
-        public string DeviceSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateKeyOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        public CreateKeyOptions(string pathFleetSid)
-        {
-            PathFleetSid = pathFleetSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DeviceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeviceSid", DeviceSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchKeyOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
+    public FetchKeyOptions(string pathFleetSid, string pathSid)
+    {
+      PathFleetSid = pathFleetSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of all Keys credentials belonging to the Fleet.
-    /// </summary>
-    public class ReadKeyOptions : ReadOptions<KeyResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// Find all Keys authenticating specified Device.
-        /// </summary>
-        public string DeviceSid { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadKeyOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        public ReadKeyOptions(string pathFleetSid)
-        {
-            PathFleetSid = pathFleetSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DeviceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeviceSid", DeviceSid.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Delete a specific Key credential from the Fleet, effectively disallowing any inbound client connections that are
+  /// presenting it.
+  /// </summary>
+  public class DeleteKeyOptions : IOptions<KeyResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Update the given properties of a specific Key credential in the Fleet, giving it a friendly name or assigning to a
-    /// Device.
-    /// </summary>
-    public class UpdateKeyOptions : IOptions<KeyResource>
-    {
-        /// <summary>
-        /// The fleet_sid
-        /// </summary>
-        public string PathFleetSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies the Key.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The human readable description for this Key.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique identifier of a Key to be authenticated.
-        /// </summary>
-        public string DeviceSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateKeyOptions
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
-        public UpdateKeyOptions(string pathFleetSid, string pathSid)
-        {
-            PathFleetSid = pathFleetSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DeviceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeviceSid", DeviceSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// A string that uniquely identifies the Key.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteKeyOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
+    public DeleteKeyOptions(string pathFleetSid, string pathSid)
+    {
+      PathFleetSid = pathFleetSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Create a new Key credential in the Fleet, optionally giving it a friendly name and assigning to a Device.
+  /// </summary>
+  public class CreateKeyOptions : IOptions<KeyResource>
+  {
+    /// <summary>
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// The human readable description for this Key.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique identifier of a Key to be authenticated.
+    /// </summary>
+    public string DeviceSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateKeyOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    public CreateKeyOptions(string pathFleetSid)
+    {
+      PathFleetSid = pathFleetSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DeviceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeviceSid", DeviceSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of all Keys credentials belonging to the Fleet.
+  /// </summary>
+  public class ReadKeyOptions : ReadOptions<KeyResource>
+  {
+    /// <summary>
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// Find all Keys authenticating specified Device.
+    /// </summary>
+    public string DeviceSid { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadKeyOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    public ReadKeyOptions(string pathFleetSid)
+    {
+      PathFleetSid = pathFleetSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DeviceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeviceSid", DeviceSid.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Update the given properties of a specific Key credential in the Fleet, giving it a friendly name or assigning to a
+  /// Device.
+  /// </summary>
+  public class UpdateKeyOptions : IOptions<KeyResource>
+  {
+    /// <summary>
+    /// The fleet_sid
+    /// </summary>
+    public string PathFleetSid { get; }
+    /// <summary>
+    /// A string that uniquely identifies the Key.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The human readable description for this Key.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique identifier of a Key to be authenticated.
+    /// </summary>
+    public string DeviceSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateKeyOptions
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
+    public UpdateKeyOptions(string pathFleetSid, string pathSid)
+    {
+      PathFleetSid = pathFleetSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DeviceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeviceSid", DeviceSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/KeyResource.cs b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/KeyResource.cs
index 7f91d963a..3bb524942 100644
--- a/src/Twilio/Rest/Preview/DeployedDevices/Fleet/KeyResource.cs
+++ b/src/Twilio/Rest/Preview/DeployedDevices/Fleet/KeyResource.cs
@@ -19,519 +19,519 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.DeployedDevices.Fleet
-{
-
-    public class KeyResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Keys/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch information about a specific Key credential in the Fleet.
-        /// </summary>
-        /// <param name="options"> Fetch Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static KeyResource Fetch(FetchKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch information about a specific Key credential in the Fleet.
-        /// </summary>
-        /// <param name="options"> Fetch Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<KeyResource> FetchAsync(FetchKeyOptions options,
-                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch information about a specific Key credential in the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static KeyResource Fetch(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchKeyOptions(pathFleetSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch information about a specific Key credential in the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<KeyResource> FetchAsync(string pathFleetSid,
-                                                                                string pathSid,
-                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchKeyOptions(pathFleetSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Keys/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Key credential from the Fleet, effectively disallowing any inbound client connections that are
-        /// presenting it.
-        /// </summary>
-        /// <param name="options"> Delete Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static bool Delete(DeleteKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Key credential from the Fleet, effectively disallowing any inbound client connections that are
-        /// presenting it.
-        /// </summary>
-        /// <param name="options"> Delete Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteKeyOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Key credential from the Fleet, effectively disallowing any inbound client connections that are
-        /// presenting it.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static bool Delete(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteKeyOptions(pathFleetSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Key credential from the Fleet, effectively disallowing any inbound client connections that are
-        /// presenting it.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFleetSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteKeyOptions(pathFleetSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Keys",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Key credential in the Fleet, optionally giving it a friendly name and assigning to a Device.
-        /// </summary>
-        /// <param name="options"> Create Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static KeyResource Create(CreateKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Key credential in the Fleet, optionally giving it a friendly name and assigning to a Device.
-        /// </summary>
-        /// <param name="options"> Create Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<KeyResource> CreateAsync(CreateKeyOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Key credential in the Fleet, optionally giving it a friendly name and assigning to a Device.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="friendlyName"> The human readable description for this Key. </param>
-        /// <param name="deviceSid"> The unique identifier of a Key to be authenticated. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static KeyResource Create(string pathFleetSid,
-                                         string friendlyName = null,
-                                         string deviceSid = null,
-                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateKeyOptions(pathFleetSid){FriendlyName = friendlyName, DeviceSid = deviceSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Key credential in the Fleet, optionally giving it a friendly name and assigning to a Device.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="friendlyName"> The human readable description for this Key. </param>
-        /// <param name="deviceSid"> The unique identifier of a Key to be authenticated. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<KeyResource> CreateAsync(string pathFleetSid,
-                                                                                 string friendlyName = null,
-                                                                                 string deviceSid = null,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateKeyOptions(pathFleetSid){FriendlyName = friendlyName, DeviceSid = deviceSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Keys",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Keys credentials belonging to the Fleet.
-        /// </summary>
-        /// <param name="options"> Read Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static ResourceSet<KeyResource> Read(ReadKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<KeyResource>.FromJson("keys", response.Content);
-            return new ResourceSet<KeyResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Keys credentials belonging to the Fleet.
-        /// </summary>
-        /// <param name="options"> Read Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<KeyResource>> ReadAsync(ReadKeyOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<KeyResource>.FromJson("keys", response.Content);
-            return new ResourceSet<KeyResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Keys credentials belonging to the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="deviceSid"> Find all Keys authenticating specified Device. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static ResourceSet<KeyResource> Read(string pathFleetSid,
-                                                    string deviceSid = null,
-                                                    int? pageSize = null,
-                                                    long? limit = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadKeyOptions(pathFleetSid){DeviceSid = deviceSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Keys credentials belonging to the Fleet.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="deviceSid"> Find all Keys authenticating specified Device. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<KeyResource>> ReadAsync(string pathFleetSid,
-                                                                                            string deviceSid = null,
-                                                                                            int? pageSize = null,
-                                                                                            long? limit = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadKeyOptions(pathFleetSid){DeviceSid = deviceSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<KeyResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<KeyResource>.FromJson("keys", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<KeyResource> NextPage(Page<KeyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<KeyResource>.FromJson("keys", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<KeyResource> PreviousPage(Page<KeyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<KeyResource>.FromJson("keys", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateKeyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Keys/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update the given properties of a specific Key credential in the Fleet, giving it a friendly name or assigning to a
-        /// Device.
-        /// </summary>
-        /// <param name="options"> Update Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static KeyResource Update(UpdateKeyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the given properties of a specific Key credential in the Fleet, giving it a friendly name or assigning to a
-        /// Device.
-        /// </summary>
-        /// <param name="options"> Update Key parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<KeyResource> UpdateAsync(UpdateKeyOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update the given properties of a specific Key credential in the Fleet, giving it a friendly name or assigning to a
-        /// Device.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
-        /// <param name="friendlyName"> The human readable description for this Key. </param>
-        /// <param name="deviceSid"> The unique identifier of a Key to be authenticated. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Key </returns>
-        public static KeyResource Update(string pathFleetSid,
-                                         string pathSid,
-                                         string friendlyName = null,
-                                         string deviceSid = null,
-                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateKeyOptions(pathFleetSid, pathSid){FriendlyName = friendlyName, DeviceSid = deviceSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the given properties of a specific Key credential in the Fleet, giving it a friendly name or assigning to a
-        /// Device.
-        /// </summary>
-        /// <param name="pathFleetSid"> The fleet_sid </param>
-        /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
-        /// <param name="friendlyName"> The human readable description for this Key. </param>
-        /// <param name="deviceSid"> The unique identifier of a Key to be authenticated. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Key </returns>
-        public static async System.Threading.Tasks.Task<KeyResource> UpdateAsync(string pathFleetSid,
-                                                                                 string pathSid,
-                                                                                 string friendlyName = null,
-                                                                                 string deviceSid = null,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateKeyOptions(pathFleetSid, pathSid){FriendlyName = friendlyName, DeviceSid = deviceSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a KeyResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> KeyResource object represented by the provided JSON </returns>
-        public static KeyResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<KeyResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Key.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// URL of this Key.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// A human readable description for this Key.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique identifier of the Fleet.
-        /// </summary>
-        [JsonProperty("fleet_sid")]
-        public string FleetSid { get; private set; }
-        /// <summary>
-        /// The unique SID that identifies this Account.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique identifier of a mapped Device.
-        /// </summary>
-        [JsonProperty("device_sid")]
-        public string DeviceSid { get; private set; }
-        /// <summary>
-        /// The key secret.
-        /// </summary>
-        [JsonProperty("secret")]
-        public string Secret { get; private set; }
-        /// <summary>
-        /// The date this Key credential was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this Key credential was updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private KeyResource()
-        {
-
-        }
-    }
+{
+
+  public class KeyResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Keys/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch information about a specific Key credential in the Fleet.
+    /// </summary>
+    /// <param name="options"> Fetch Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static KeyResource Fetch(FetchKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch information about a specific Key credential in the Fleet.
+    /// </summary>
+    /// <param name="options"> Fetch Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<KeyResource> FetchAsync(FetchKeyOptions options,
+                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch information about a specific Key credential in the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static KeyResource Fetch(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchKeyOptions(pathFleetSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch information about a specific Key credential in the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<KeyResource> FetchAsync(string pathFleetSid,
+                                                                            string pathSid,
+                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchKeyOptions(pathFleetSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Keys/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Key credential from the Fleet, effectively disallowing any inbound client connections that are
+    /// presenting it.
+    /// </summary>
+    /// <param name="options"> Delete Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static bool Delete(DeleteKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Key credential from the Fleet, effectively disallowing any inbound client connections that are
+    /// presenting it.
+    /// </summary>
+    /// <param name="options"> Delete Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteKeyOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Key credential from the Fleet, effectively disallowing any inbound client connections that are
+    /// presenting it.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static bool Delete(string pathFleetSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteKeyOptions(pathFleetSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Key credential from the Fleet, effectively disallowing any inbound client connections that are
+    /// presenting it.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFleetSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteKeyOptions(pathFleetSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Keys",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Key credential in the Fleet, optionally giving it a friendly name and assigning to a Device.
+    /// </summary>
+    /// <param name="options"> Create Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static KeyResource Create(CreateKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Key credential in the Fleet, optionally giving it a friendly name and assigning to a Device.
+    /// </summary>
+    /// <param name="options"> Create Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<KeyResource> CreateAsync(CreateKeyOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Key credential in the Fleet, optionally giving it a friendly name and assigning to a Device.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="friendlyName"> The human readable description for this Key. </param>
+    /// <param name="deviceSid"> The unique identifier of a Key to be authenticated. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static KeyResource Create(string pathFleetSid,
+                                     string friendlyName = null,
+                                     string deviceSid = null,
+                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateKeyOptions(pathFleetSid) { FriendlyName = friendlyName, DeviceSid = deviceSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Key credential in the Fleet, optionally giving it a friendly name and assigning to a Device.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="friendlyName"> The human readable description for this Key. </param>
+    /// <param name="deviceSid"> The unique identifier of a Key to be authenticated. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<KeyResource> CreateAsync(string pathFleetSid,
+                                                                             string friendlyName = null,
+                                                                             string deviceSid = null,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateKeyOptions(pathFleetSid) { FriendlyName = friendlyName, DeviceSid = deviceSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Keys",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Keys credentials belonging to the Fleet.
+    /// </summary>
+    /// <param name="options"> Read Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static ResourceSet<KeyResource> Read(ReadKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<KeyResource>.FromJson("keys", response.Content);
+      return new ResourceSet<KeyResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Keys credentials belonging to the Fleet.
+    /// </summary>
+    /// <param name="options"> Read Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<KeyResource>> ReadAsync(ReadKeyOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<KeyResource>.FromJson("keys", response.Content);
+      return new ResourceSet<KeyResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Keys credentials belonging to the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="deviceSid"> Find all Keys authenticating specified Device. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static ResourceSet<KeyResource> Read(string pathFleetSid,
+                                                string deviceSid = null,
+                                                int? pageSize = null,
+                                                long? limit = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadKeyOptions(pathFleetSid) { DeviceSid = deviceSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Keys credentials belonging to the Fleet.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="deviceSid"> Find all Keys authenticating specified Device. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<KeyResource>> ReadAsync(string pathFleetSid,
+                                                                                        string deviceSid = null,
+                                                                                        int? pageSize = null,
+                                                                                        long? limit = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadKeyOptions(pathFleetSid) { DeviceSid = deviceSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<KeyResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<KeyResource>.FromJson("keys", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<KeyResource> NextPage(Page<KeyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<KeyResource>.FromJson("keys", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<KeyResource> PreviousPage(Page<KeyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<KeyResource>.FromJson("keys", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateKeyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathFleetSid + "/Keys/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update the given properties of a specific Key credential in the Fleet, giving it a friendly name or assigning to a
+    /// Device.
+    /// </summary>
+    /// <param name="options"> Update Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static KeyResource Update(UpdateKeyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the given properties of a specific Key credential in the Fleet, giving it a friendly name or assigning to a
+    /// Device.
+    /// </summary>
+    /// <param name="options"> Update Key parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<KeyResource> UpdateAsync(UpdateKeyOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update the given properties of a specific Key credential in the Fleet, giving it a friendly name or assigning to a
+    /// Device.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
+    /// <param name="friendlyName"> The human readable description for this Key. </param>
+    /// <param name="deviceSid"> The unique identifier of a Key to be authenticated. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Key </returns>
+    public static KeyResource Update(string pathFleetSid,
+                                     string pathSid,
+                                     string friendlyName = null,
+                                     string deviceSid = null,
+                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateKeyOptions(pathFleetSid, pathSid) { FriendlyName = friendlyName, DeviceSid = deviceSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the given properties of a specific Key credential in the Fleet, giving it a friendly name or assigning to a
+    /// Device.
+    /// </summary>
+    /// <param name="pathFleetSid"> The fleet_sid </param>
+    /// <param name="pathSid"> A string that uniquely identifies the Key. </param>
+    /// <param name="friendlyName"> The human readable description for this Key. </param>
+    /// <param name="deviceSid"> The unique identifier of a Key to be authenticated. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Key </returns>
+    public static async System.Threading.Tasks.Task<KeyResource> UpdateAsync(string pathFleetSid,
+                                                                             string pathSid,
+                                                                             string friendlyName = null,
+                                                                             string deviceSid = null,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateKeyOptions(pathFleetSid, pathSid) { FriendlyName = friendlyName, DeviceSid = deviceSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a KeyResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> KeyResource object represented by the provided JSON </returns>
+    public static KeyResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<KeyResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Key.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// URL of this Key.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// A human readable description for this Key.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique identifier of the Fleet.
+    /// </summary>
+    [JsonProperty("fleet_sid")]
+    public string FleetSid { get; private set; }
+    /// <summary>
+    /// The unique SID that identifies this Account.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique identifier of a mapped Device.
+    /// </summary>
+    [JsonProperty("device_sid")]
+    public string DeviceSid { get; private set; }
+    /// <summary>
+    /// The key secret.
+    /// </summary>
+    [JsonProperty("secret")]
+    public string Secret { get; private set; }
+    /// <summary>
+    /// The date this Key credential was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this Key credential was updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private KeyResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/DeployedDevices/FleetOptions.cs b/src/Twilio/Rest/Preview/DeployedDevices/FleetOptions.cs
index f60bb9375..6a360c6cb 100644
--- a/src/Twilio/Rest/Preview/DeployedDevices/FleetOptions.cs
+++ b/src/Twilio/Rest/Preview/DeployedDevices/FleetOptions.cs
@@ -9,172 +9,172 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.DeployedDevices
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch information about a specific Fleet in your account.
+  /// </summary>
+  public class FetchFleetOptions : IOptions<FleetResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch information about a specific Fleet in your account.
+    /// A string that uniquely identifies the Fleet.
     /// </summary>
-    public class FetchFleetOptions : IOptions<FleetResource>
-    {
-        /// <summary>
-        /// A string that uniquely identifies the Fleet.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFleetOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
-        public FetchFleetOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Delete a specific Fleet from your account, also destroys all nested resources: Devices, Deployments, Certificates,
-    /// Keys.
+    /// Construct a new FetchFleetOptions
     /// </summary>
-    public class DeleteFleetOptions : IOptions<FleetResource>
-    {
-        /// <summary>
-        /// A string that uniquely identifies the Fleet.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFleetOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
-        public DeleteFleetOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
+    public FetchFleetOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Create a new Fleet for scoping of deployed devices within your account.
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateFleetOptions : IOptions<FleetResource>
-    {
-        /// <summary>
-        /// A human readable description for this Fleet.
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Delete a specific Fleet from your account, also destroys all nested resources: Devices, Deployments, Certificates,
+  /// Keys.
+  /// </summary>
+  public class DeleteFleetOptions : IOptions<FleetResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of all Fleets belonging to your account.
+    /// A string that uniquely identifies the Fleet.
     /// </summary>
-    public class ReadFleetOptions : ReadOptions<FleetResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Update the friendly name property of a specific Fleet in your account.
+    /// Construct a new DeleteFleetOptions
     /// </summary>
-    public class UpdateFleetOptions : IOptions<FleetResource>
-    {
-        /// <summary>
-        /// A string that uniquely identifies the Fleet.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A human readable description for this Fleet.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// A default Deployment SID.
-        /// </summary>
-        public string DefaultDeploymentSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateFleetOptions
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
-        public UpdateFleetOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DefaultDeploymentSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultDeploymentSid", DefaultDeploymentSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
+    public DeleteFleetOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Create a new Fleet for scoping of deployed devices within your account.
+  /// </summary>
+  public class CreateFleetOptions : IOptions<FleetResource>
+  {
+    /// <summary>
+    /// A human readable description for this Fleet.
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of all Fleets belonging to your account.
+  /// </summary>
+  public class ReadFleetOptions : ReadOptions<FleetResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Update the friendly name property of a specific Fleet in your account.
+  /// </summary>
+  public class UpdateFleetOptions : IOptions<FleetResource>
+  {
+    /// <summary>
+    /// A string that uniquely identifies the Fleet.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A human readable description for this Fleet.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// A default Deployment SID.
+    /// </summary>
+    public string DefaultDeploymentSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateFleetOptions
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
+    public UpdateFleetOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DefaultDeploymentSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultDeploymentSid", DefaultDeploymentSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/DeployedDevices/FleetResource.cs b/src/Twilio/Rest/Preview/DeployedDevices/FleetResource.cs
index 71ae8290f..96370a95f 100644
--- a/src/Twilio/Rest/Preview/DeployedDevices/FleetResource.cs
+++ b/src/Twilio/Rest/Preview/DeployedDevices/FleetResource.cs
@@ -19,487 +19,487 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.DeployedDevices
-{
-
-    public class FleetResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchFleetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch information about a specific Fleet in your account.
-        /// </summary>
-        /// <param name="options"> Fetch Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static FleetResource Fetch(FetchFleetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch information about a specific Fleet in your account.
-        /// </summary>
-        /// <param name="options"> Fetch Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<FleetResource> FetchAsync(FetchFleetOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch information about a specific Fleet in your account.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static FleetResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchFleetOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch information about a specific Fleet in your account.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<FleetResource> FetchAsync(string pathSid,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchFleetOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteFleetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Fleet from your account, also destroys all nested resources: Devices, Deployments, Certificates,
-        /// Keys.
-        /// </summary>
-        /// <param name="options"> Delete Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static bool Delete(DeleteFleetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Fleet from your account, also destroys all nested resources: Devices, Deployments, Certificates,
-        /// Keys.
-        /// </summary>
-        /// <param name="options"> Delete Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFleetOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Fleet from your account, also destroys all nested resources: Devices, Deployments, Certificates,
-        /// Keys.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFleetOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Fleet from your account, also destroys all nested resources: Devices, Deployments, Certificates,
-        /// Keys.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFleetOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateFleetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Fleet for scoping of deployed devices within your account.
-        /// </summary>
-        /// <param name="options"> Create Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static FleetResource Create(CreateFleetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Fleet for scoping of deployed devices within your account.
-        /// </summary>
-        /// <param name="options"> Create Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<FleetResource> CreateAsync(CreateFleetOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Fleet for scoping of deployed devices within your account.
-        /// </summary>
-        /// <param name="friendlyName"> A human readable description for this Fleet. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static FleetResource Create(string friendlyName = null, ITwilioRestClient client = null)
-        {
-            var options = new CreateFleetOptions(){FriendlyName = friendlyName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Fleet for scoping of deployed devices within your account.
-        /// </summary>
-        /// <param name="friendlyName"> A human readable description for this Fleet. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<FleetResource> CreateAsync(string friendlyName = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateFleetOptions(){FriendlyName = friendlyName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadFleetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Fleets belonging to your account.
-        /// </summary>
-        /// <param name="options"> Read Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static ResourceSet<FleetResource> Read(ReadFleetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FleetResource>.FromJson("fleets", response.Content);
-            return new ResourceSet<FleetResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Fleets belonging to your account.
-        /// </summary>
-        /// <param name="options"> Read Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FleetResource>> ReadAsync(ReadFleetOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FleetResource>.FromJson("fleets", response.Content);
-            return new ResourceSet<FleetResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Fleets belonging to your account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static ResourceSet<FleetResource> Read(int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadFleetOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Fleets belonging to your account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FleetResource>> ReadAsync(int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadFleetOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FleetResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FleetResource>.FromJson("fleets", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FleetResource> NextPage(Page<FleetResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<FleetResource>.FromJson("fleets", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FleetResource> PreviousPage(Page<FleetResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<FleetResource>.FromJson("fleets", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateFleetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/DeployedDevices/Fleets/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update the friendly name property of a specific Fleet in your account.
-        /// </summary>
-        /// <param name="options"> Update Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static FleetResource Update(UpdateFleetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the friendly name property of a specific Fleet in your account.
-        /// </summary>
-        /// <param name="options"> Update Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<FleetResource> UpdateAsync(UpdateFleetOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update the friendly name property of a specific Fleet in your account.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
-        /// <param name="friendlyName"> A human readable description for this Fleet. </param>
-        /// <param name="defaultDeploymentSid"> A default Deployment SID. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static FleetResource Update(string pathSid,
-                                           string friendlyName = null,
-                                           string defaultDeploymentSid = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new UpdateFleetOptions(pathSid){FriendlyName = friendlyName, DefaultDeploymentSid = defaultDeploymentSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the friendly name property of a specific Fleet in your account.
-        /// </summary>
-        /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
-        /// <param name="friendlyName"> A human readable description for this Fleet. </param>
-        /// <param name="defaultDeploymentSid"> A default Deployment SID. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<FleetResource> UpdateAsync(string pathSid,
-                                                                                   string friendlyName = null,
-                                                                                   string defaultDeploymentSid = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new UpdateFleetOptions(pathSid){FriendlyName = friendlyName, DefaultDeploymentSid = defaultDeploymentSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FleetResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FleetResource object represented by the provided JSON </returns>
-        public static FleetResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FleetResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Fleet.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// URL of this Fleet.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// A unique, addressable name of this Fleet.
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// A human readable description for this Fleet.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique SID that identifies this Account.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique SID that identifies this Fleet's default Deployment.
-        /// </summary>
-        [JsonProperty("default_deployment_sid")]
-        public string DefaultDeploymentSid { get; private set; }
-        /// <summary>
-        /// The date this Fleet was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this Fleet was updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Nested resource URLs.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private FleetResource()
-        {
-
-        }
-    }
+{
+
+  public class FleetResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchFleetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch information about a specific Fleet in your account.
+    /// </summary>
+    /// <param name="options"> Fetch Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static FleetResource Fetch(FetchFleetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch information about a specific Fleet in your account.
+    /// </summary>
+    /// <param name="options"> Fetch Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<FleetResource> FetchAsync(FetchFleetOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch information about a specific Fleet in your account.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static FleetResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchFleetOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch information about a specific Fleet in your account.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<FleetResource> FetchAsync(string pathSid,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchFleetOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteFleetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Fleet from your account, also destroys all nested resources: Devices, Deployments, Certificates,
+    /// Keys.
+    /// </summary>
+    /// <param name="options"> Delete Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static bool Delete(DeleteFleetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Fleet from your account, also destroys all nested resources: Devices, Deployments, Certificates,
+    /// Keys.
+    /// </summary>
+    /// <param name="options"> Delete Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFleetOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Fleet from your account, also destroys all nested resources: Devices, Deployments, Certificates,
+    /// Keys.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFleetOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Fleet from your account, also destroys all nested resources: Devices, Deployments, Certificates,
+    /// Keys.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFleetOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateFleetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Fleet for scoping of deployed devices within your account.
+    /// </summary>
+    /// <param name="options"> Create Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static FleetResource Create(CreateFleetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Fleet for scoping of deployed devices within your account.
+    /// </summary>
+    /// <param name="options"> Create Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<FleetResource> CreateAsync(CreateFleetOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Fleet for scoping of deployed devices within your account.
+    /// </summary>
+    /// <param name="friendlyName"> A human readable description for this Fleet. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static FleetResource Create(string friendlyName = null, ITwilioRestClient client = null)
+    {
+      var options = new CreateFleetOptions() { FriendlyName = friendlyName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Fleet for scoping of deployed devices within your account.
+    /// </summary>
+    /// <param name="friendlyName"> A human readable description for this Fleet. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<FleetResource> CreateAsync(string friendlyName = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateFleetOptions() { FriendlyName = friendlyName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadFleetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Fleets belonging to your account.
+    /// </summary>
+    /// <param name="options"> Read Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static ResourceSet<FleetResource> Read(ReadFleetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FleetResource>.FromJson("fleets", response.Content);
+      return new ResourceSet<FleetResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Fleets belonging to your account.
+    /// </summary>
+    /// <param name="options"> Read Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FleetResource>> ReadAsync(ReadFleetOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FleetResource>.FromJson("fleets", response.Content);
+      return new ResourceSet<FleetResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Fleets belonging to your account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static ResourceSet<FleetResource> Read(int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadFleetOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Fleets belonging to your account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FleetResource>> ReadAsync(int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadFleetOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FleetResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FleetResource>.FromJson("fleets", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FleetResource> NextPage(Page<FleetResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<FleetResource>.FromJson("fleets", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FleetResource> PreviousPage(Page<FleetResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<FleetResource>.FromJson("fleets", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateFleetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/DeployedDevices/Fleets/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update the friendly name property of a specific Fleet in your account.
+    /// </summary>
+    /// <param name="options"> Update Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static FleetResource Update(UpdateFleetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the friendly name property of a specific Fleet in your account.
+    /// </summary>
+    /// <param name="options"> Update Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<FleetResource> UpdateAsync(UpdateFleetOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update the friendly name property of a specific Fleet in your account.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
+    /// <param name="friendlyName"> A human readable description for this Fleet. </param>
+    /// <param name="defaultDeploymentSid"> A default Deployment SID. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static FleetResource Update(string pathSid,
+                                       string friendlyName = null,
+                                       string defaultDeploymentSid = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new UpdateFleetOptions(pathSid) { FriendlyName = friendlyName, DefaultDeploymentSid = defaultDeploymentSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the friendly name property of a specific Fleet in your account.
+    /// </summary>
+    /// <param name="pathSid"> A string that uniquely identifies the Fleet. </param>
+    /// <param name="friendlyName"> A human readable description for this Fleet. </param>
+    /// <param name="defaultDeploymentSid"> A default Deployment SID. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<FleetResource> UpdateAsync(string pathSid,
+                                                                               string friendlyName = null,
+                                                                               string defaultDeploymentSid = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new UpdateFleetOptions(pathSid) { FriendlyName = friendlyName, DefaultDeploymentSid = defaultDeploymentSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FleetResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FleetResource object represented by the provided JSON </returns>
+    public static FleetResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FleetResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Fleet.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// URL of this Fleet.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// A unique, addressable name of this Fleet.
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// A human readable description for this Fleet.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique SID that identifies this Account.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique SID that identifies this Fleet's default Deployment.
+    /// </summary>
+    [JsonProperty("default_deployment_sid")]
+    public string DefaultDeploymentSid { get; private set; }
+    /// <summary>
+    /// The date this Fleet was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this Fleet was updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Nested resource URLs.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private FleetResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocument/DependentHostedNumberOrderOptions.cs b/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocument/DependentHostedNumberOrderOptions.cs
index 713c5dd32..db2d147ec 100644
--- a/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocument/DependentHostedNumberOrderOptions.cs
+++ b/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocument/DependentHostedNumberOrderOptions.cs
@@ -9,88 +9,88 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.HostedNumbers.AuthorizationDocument
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of dependent HostedNumberOrders belonging to the AuthorizationDocument.
+  /// </summary>
+  public class ReadDependentHostedNumberOrderOptions : ReadOptions<DependentHostedNumberOrderResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of dependent HostedNumberOrders belonging to the AuthorizationDocument.
+    /// The signing_document_sid
     /// </summary>
-    public class ReadDependentHostedNumberOrderOptions : ReadOptions<DependentHostedNumberOrderResource>
-    {
-        /// <summary>
-        /// The signing_document_sid
-        /// </summary>
-        public string PathSigningDocumentSid { get; }
-        /// <summary>
-        /// The Status of this HostedNumberOrder.
-        /// </summary>
-        public DependentHostedNumberOrderResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// An E164 formatted phone number.
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; set; }
-        /// <summary>
-        /// IncomingPhoneNumber sid.
-        /// </summary>
-        public string IncomingPhoneNumberSid { get; set; }
-        /// <summary>
-        /// A human readable description of this resource.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// A unique, developer assigned name of this HostedNumberOrder.
-        /// </summary>
-        public string UniqueName { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadDependentHostedNumberOrderOptions
-        /// </summary>
-        /// <param name="pathSigningDocumentSid"> The signing_document_sid </param>
-        public ReadDependentHostedNumberOrderOptions(string pathSigningDocumentSid)
-        {
-            PathSigningDocumentSid = pathSigningDocumentSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (IncomingPhoneNumberSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncomingPhoneNumberSid", IncomingPhoneNumberSid.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathSigningDocumentSid { get; }
+    /// <summary>
+    /// The Status of this HostedNumberOrder.
+    /// </summary>
+    public DependentHostedNumberOrderResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// An E164 formatted phone number.
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; set; }
+    /// <summary>
+    /// IncomingPhoneNumber sid.
+    /// </summary>
+    public string IncomingPhoneNumberSid { get; set; }
+    /// <summary>
+    /// A human readable description of this resource.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// A unique, developer assigned name of this HostedNumberOrder.
+    /// </summary>
+    public string UniqueName { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadDependentHostedNumberOrderOptions
+    /// </summary>
+    /// <param name="pathSigningDocumentSid"> The signing_document_sid </param>
+    public ReadDependentHostedNumberOrderOptions(string pathSigningDocumentSid)
+    {
+      PathSigningDocumentSid = pathSigningDocumentSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (IncomingPhoneNumberSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncomingPhoneNumberSid", IncomingPhoneNumberSid.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocument/DependentHostedNumberOrderResource.cs b/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocument/DependentHostedNumberOrderResource.cs
index 0ff6d6393..15c66ec4a 100644
--- a/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocument/DependentHostedNumberOrderResource.cs
+++ b/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocument/DependentHostedNumberOrderResource.cs
@@ -20,335 +20,335 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Preview.HostedNumbers.AuthorizationDocument
-{
-
-    public class DependentHostedNumberOrderResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Received = new StatusEnum("received");
-            public static readonly StatusEnum PendingVerification = new StatusEnum("pending-verification");
-            public static readonly StatusEnum Verified = new StatusEnum("verified");
-            public static readonly StatusEnum PendingLoa = new StatusEnum("pending-loa");
-            public static readonly StatusEnum CarrierProcessing = new StatusEnum("carrier-processing");
-            public static readonly StatusEnum Testing = new StatusEnum("testing");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-            public static readonly StatusEnum ActionRequired = new StatusEnum("action-required");
-        }
-
-        public sealed class VerificationTypeEnum : StringEnum
-        {
-            private VerificationTypeEnum(string value) : base(value) {}
-            public VerificationTypeEnum() {}
-            public static implicit operator VerificationTypeEnum(string value)
-            {
-                return new VerificationTypeEnum(value);
-            }
-
-            public static readonly VerificationTypeEnum PhoneCall = new VerificationTypeEnum("phone-call");
-            public static readonly VerificationTypeEnum PhoneBill = new VerificationTypeEnum("phone-bill");
-        }
-
-        private static Request BuildReadRequest(ReadDependentHostedNumberOrderOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/HostedNumbers/AuthorizationDocuments/" + options.PathSigningDocumentSid + "/DependentHostedNumberOrders",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of dependent HostedNumberOrders belonging to the AuthorizationDocument.
-        /// </summary>
-        /// <param name="options"> Read DependentHostedNumberOrder parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DependentHostedNumberOrder </returns>
-        public static ResourceSet<DependentHostedNumberOrderResource> Read(ReadDependentHostedNumberOrderOptions options,
-                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DependentHostedNumberOrderResource>.FromJson("items", response.Content);
-            return new ResourceSet<DependentHostedNumberOrderResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of dependent HostedNumberOrders belonging to the AuthorizationDocument.
-        /// </summary>
-        /// <param name="options"> Read DependentHostedNumberOrder parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DependentHostedNumberOrder </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DependentHostedNumberOrderResource>> ReadAsync(ReadDependentHostedNumberOrderOptions options,
-                                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DependentHostedNumberOrderResource>.FromJson("items", response.Content);
-            return new ResourceSet<DependentHostedNumberOrderResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of dependent HostedNumberOrders belonging to the AuthorizationDocument.
-        /// </summary>
-        /// <param name="pathSigningDocumentSid"> The signing_document_sid </param>
-        /// <param name="status"> The Status of this HostedNumberOrder. </param>
-        /// <param name="phoneNumber"> An E164 formatted phone number. </param>
-        /// <param name="incomingPhoneNumberSid"> IncomingPhoneNumber sid. </param>
-        /// <param name="friendlyName"> A human readable description of this resource. </param>
-        /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DependentHostedNumberOrder </returns>
-        public static ResourceSet<DependentHostedNumberOrderResource> Read(string pathSigningDocumentSid,
-                                                                           DependentHostedNumberOrderResource.StatusEnum status = null,
-                                                                           Types.PhoneNumber phoneNumber = null,
-                                                                           string incomingPhoneNumberSid = null,
-                                                                           string friendlyName = null,
-                                                                           string uniqueName = null,
-                                                                           int? pageSize = null,
-                                                                           long? limit = null,
-                                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadDependentHostedNumberOrderOptions(pathSigningDocumentSid){Status = status, PhoneNumber = phoneNumber, IncomingPhoneNumberSid = incomingPhoneNumberSid, FriendlyName = friendlyName, UniqueName = uniqueName, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of dependent HostedNumberOrders belonging to the AuthorizationDocument.
-        /// </summary>
-        /// <param name="pathSigningDocumentSid"> The signing_document_sid </param>
-        /// <param name="status"> The Status of this HostedNumberOrder. </param>
-        /// <param name="phoneNumber"> An E164 formatted phone number. </param>
-        /// <param name="incomingPhoneNumberSid"> IncomingPhoneNumber sid. </param>
-        /// <param name="friendlyName"> A human readable description of this resource. </param>
-        /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DependentHostedNumberOrder </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DependentHostedNumberOrderResource>> ReadAsync(string pathSigningDocumentSid,
-                                                                                                                   DependentHostedNumberOrderResource.StatusEnum status = null,
-                                                                                                                   Types.PhoneNumber phoneNumber = null,
-                                                                                                                   string incomingPhoneNumberSid = null,
-                                                                                                                   string friendlyName = null,
-                                                                                                                   string uniqueName = null,
-                                                                                                                   int? pageSize = null,
-                                                                                                                   long? limit = null,
-                                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadDependentHostedNumberOrderOptions(pathSigningDocumentSid){Status = status, PhoneNumber = phoneNumber, IncomingPhoneNumberSid = incomingPhoneNumberSid, FriendlyName = friendlyName, UniqueName = uniqueName, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DependentHostedNumberOrderResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DependentHostedNumberOrderResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DependentHostedNumberOrderResource> NextPage(Page<DependentHostedNumberOrderResource> page,
-                                                                        ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<DependentHostedNumberOrderResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DependentHostedNumberOrderResource> PreviousPage(Page<DependentHostedNumberOrderResource> page,
-                                                                            ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<DependentHostedNumberOrderResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a DependentHostedNumberOrderResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DependentHostedNumberOrderResource object represented by the provided JSON </returns>
-        public static DependentHostedNumberOrderResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DependentHostedNumberOrderResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// HostedNumberOrder sid.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Account sid.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// IncomingPhoneNumber sid.
-        /// </summary>
-        [JsonProperty("incoming_phone_number_sid")]
-        public string IncomingPhoneNumberSid { get; private set; }
-        /// <summary>
-        /// Address sid.
-        /// </summary>
-        [JsonProperty("address_sid")]
-        public string AddressSid { get; private set; }
-        /// <summary>
-        /// LOA document sid.
-        /// </summary>
-        [JsonProperty("signing_document_sid")]
-        public string SigningDocumentSid { get; private set; }
-        /// <summary>
-        /// An E164 formatted phone number.
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// A mapping of phone number capabilities.
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-        /// <summary>
-        /// A human readable description of this resource.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A unique, developer assigned name of this HostedNumberOrder.
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The Status of this HostedNumberOrder.
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public DependentHostedNumberOrderResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// Why a hosted_number_order reached status "action-required"
-        /// </summary>
-        [JsonProperty("failure_reason")]
-        public string FailureReason { get; private set; }
-        /// <summary>
-        /// The date this HostedNumberOrder was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this HostedNumberOrder was updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The number of attempts made to verify ownership of the phone number.
-        /// </summary>
-        [JsonProperty("verification_attempts")]
-        public int? VerificationAttempts { get; private set; }
-        /// <summary>
-        /// Email.
-        /// </summary>
-        [JsonProperty("email")]
-        public string Email { get; private set; }
-        /// <summary>
-        /// A list of emails.
-        /// </summary>
-        [JsonProperty("cc_emails")]
-        public List<string> CcEmails { get; private set; }
-        /// <summary>
-        /// The method used for verifying ownership of the number to be hosted.
-        /// </summary>
-        [JsonProperty("verification_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public DependentHostedNumberOrderResource.VerificationTypeEnum VerificationType { get; private set; }
-        /// <summary>
-        /// Verification Document Sid.
-        /// </summary>
-        [JsonProperty("verification_document_sid")]
-        public string VerificationDocumentSid { get; private set; }
-        /// <summary>
-        /// Phone extension to use for ownership verification call.
-        /// </summary>
-        [JsonProperty("extension")]
-        public string Extension { get; private set; }
-        /// <summary>
-        /// Seconds (0-30) to delay ownership verification call by.
-        /// </summary>
-        [JsonProperty("call_delay")]
-        public int? CallDelay { get; private set; }
-        /// <summary>
-        /// The digits passed during the ownership verification call.
-        /// </summary>
-        [JsonProperty("verification_code")]
-        public string VerificationCode { get; private set; }
-        /// <summary>
-        /// List of IDs for ownership verification calls.
-        /// </summary>
-        [JsonProperty("verification_call_sids")]
-        public List<string> VerificationCallSids { get; private set; }
-
-        private DependentHostedNumberOrderResource()
-        {
-
-        }
-    }
+{
+
+  public class DependentHostedNumberOrderResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Received = new StatusEnum("received");
+      public static readonly StatusEnum PendingVerification = new StatusEnum("pending-verification");
+      public static readonly StatusEnum Verified = new StatusEnum("verified");
+      public static readonly StatusEnum PendingLoa = new StatusEnum("pending-loa");
+      public static readonly StatusEnum CarrierProcessing = new StatusEnum("carrier-processing");
+      public static readonly StatusEnum Testing = new StatusEnum("testing");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+      public static readonly StatusEnum ActionRequired = new StatusEnum("action-required");
+    }
+
+    public sealed class VerificationTypeEnum : StringEnum
+    {
+      private VerificationTypeEnum(string value) : base(value) { }
+      public VerificationTypeEnum() { }
+      public static implicit operator VerificationTypeEnum(string value)
+      {
+        return new VerificationTypeEnum(value);
+      }
+
+      public static readonly VerificationTypeEnum PhoneCall = new VerificationTypeEnum("phone-call");
+      public static readonly VerificationTypeEnum PhoneBill = new VerificationTypeEnum("phone-bill");
+    }
+
+    private static Request BuildReadRequest(ReadDependentHostedNumberOrderOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/HostedNumbers/AuthorizationDocuments/" + options.PathSigningDocumentSid + "/DependentHostedNumberOrders",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of dependent HostedNumberOrders belonging to the AuthorizationDocument.
+    /// </summary>
+    /// <param name="options"> Read DependentHostedNumberOrder parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DependentHostedNumberOrder </returns>
+    public static ResourceSet<DependentHostedNumberOrderResource> Read(ReadDependentHostedNumberOrderOptions options,
+                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DependentHostedNumberOrderResource>.FromJson("items", response.Content);
+      return new ResourceSet<DependentHostedNumberOrderResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of dependent HostedNumberOrders belonging to the AuthorizationDocument.
+    /// </summary>
+    /// <param name="options"> Read DependentHostedNumberOrder parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DependentHostedNumberOrder </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DependentHostedNumberOrderResource>> ReadAsync(ReadDependentHostedNumberOrderOptions options,
+                                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DependentHostedNumberOrderResource>.FromJson("items", response.Content);
+      return new ResourceSet<DependentHostedNumberOrderResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of dependent HostedNumberOrders belonging to the AuthorizationDocument.
+    /// </summary>
+    /// <param name="pathSigningDocumentSid"> The signing_document_sid </param>
+    /// <param name="status"> The Status of this HostedNumberOrder. </param>
+    /// <param name="phoneNumber"> An E164 formatted phone number. </param>
+    /// <param name="incomingPhoneNumberSid"> IncomingPhoneNumber sid. </param>
+    /// <param name="friendlyName"> A human readable description of this resource. </param>
+    /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DependentHostedNumberOrder </returns>
+    public static ResourceSet<DependentHostedNumberOrderResource> Read(string pathSigningDocumentSid,
+                                                                       DependentHostedNumberOrderResource.StatusEnum status = null,
+                                                                       Types.PhoneNumber phoneNumber = null,
+                                                                       string incomingPhoneNumberSid = null,
+                                                                       string friendlyName = null,
+                                                                       string uniqueName = null,
+                                                                       int? pageSize = null,
+                                                                       long? limit = null,
+                                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadDependentHostedNumberOrderOptions(pathSigningDocumentSid) { Status = status, PhoneNumber = phoneNumber, IncomingPhoneNumberSid = incomingPhoneNumberSid, FriendlyName = friendlyName, UniqueName = uniqueName, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of dependent HostedNumberOrders belonging to the AuthorizationDocument.
+    /// </summary>
+    /// <param name="pathSigningDocumentSid"> The signing_document_sid </param>
+    /// <param name="status"> The Status of this HostedNumberOrder. </param>
+    /// <param name="phoneNumber"> An E164 formatted phone number. </param>
+    /// <param name="incomingPhoneNumberSid"> IncomingPhoneNumber sid. </param>
+    /// <param name="friendlyName"> A human readable description of this resource. </param>
+    /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DependentHostedNumberOrder </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DependentHostedNumberOrderResource>> ReadAsync(string pathSigningDocumentSid,
+                                                                                                               DependentHostedNumberOrderResource.StatusEnum status = null,
+                                                                                                               Types.PhoneNumber phoneNumber = null,
+                                                                                                               string incomingPhoneNumberSid = null,
+                                                                                                               string friendlyName = null,
+                                                                                                               string uniqueName = null,
+                                                                                                               int? pageSize = null,
+                                                                                                               long? limit = null,
+                                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadDependentHostedNumberOrderOptions(pathSigningDocumentSid) { Status = status, PhoneNumber = phoneNumber, IncomingPhoneNumberSid = incomingPhoneNumberSid, FriendlyName = friendlyName, UniqueName = uniqueName, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DependentHostedNumberOrderResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DependentHostedNumberOrderResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DependentHostedNumberOrderResource> NextPage(Page<DependentHostedNumberOrderResource> page,
+                                                                    ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<DependentHostedNumberOrderResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DependentHostedNumberOrderResource> PreviousPage(Page<DependentHostedNumberOrderResource> page,
+                                                                        ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<DependentHostedNumberOrderResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a DependentHostedNumberOrderResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DependentHostedNumberOrderResource object represented by the provided JSON </returns>
+    public static DependentHostedNumberOrderResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DependentHostedNumberOrderResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// HostedNumberOrder sid.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Account sid.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// IncomingPhoneNumber sid.
+    /// </summary>
+    [JsonProperty("incoming_phone_number_sid")]
+    public string IncomingPhoneNumberSid { get; private set; }
+    /// <summary>
+    /// Address sid.
+    /// </summary>
+    [JsonProperty("address_sid")]
+    public string AddressSid { get; private set; }
+    /// <summary>
+    /// LOA document sid.
+    /// </summary>
+    [JsonProperty("signing_document_sid")]
+    public string SigningDocumentSid { get; private set; }
+    /// <summary>
+    /// An E164 formatted phone number.
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// A mapping of phone number capabilities.
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+    /// <summary>
+    /// A human readable description of this resource.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A unique, developer assigned name of this HostedNumberOrder.
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The Status of this HostedNumberOrder.
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public DependentHostedNumberOrderResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// Why a hosted_number_order reached status "action-required"
+    /// </summary>
+    [JsonProperty("failure_reason")]
+    public string FailureReason { get; private set; }
+    /// <summary>
+    /// The date this HostedNumberOrder was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this HostedNumberOrder was updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The number of attempts made to verify ownership of the phone number.
+    /// </summary>
+    [JsonProperty("verification_attempts")]
+    public int? VerificationAttempts { get; private set; }
+    /// <summary>
+    /// Email.
+    /// </summary>
+    [JsonProperty("email")]
+    public string Email { get; private set; }
+    /// <summary>
+    /// A list of emails.
+    /// </summary>
+    [JsonProperty("cc_emails")]
+    public List<string> CcEmails { get; private set; }
+    /// <summary>
+    /// The method used for verifying ownership of the number to be hosted.
+    /// </summary>
+    [JsonProperty("verification_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public DependentHostedNumberOrderResource.VerificationTypeEnum VerificationType { get; private set; }
+    /// <summary>
+    /// Verification Document Sid.
+    /// </summary>
+    [JsonProperty("verification_document_sid")]
+    public string VerificationDocumentSid { get; private set; }
+    /// <summary>
+    /// Phone extension to use for ownership verification call.
+    /// </summary>
+    [JsonProperty("extension")]
+    public string Extension { get; private set; }
+    /// <summary>
+    /// Seconds (0-30) to delay ownership verification call by.
+    /// </summary>
+    [JsonProperty("call_delay")]
+    public int? CallDelay { get; private set; }
+    /// <summary>
+    /// The digits passed during the ownership verification call.
+    /// </summary>
+    [JsonProperty("verification_code")]
+    public string VerificationCode { get; private set; }
+    /// <summary>
+    /// List of IDs for ownership verification calls.
+    /// </summary>
+    [JsonProperty("verification_call_sids")]
+    public List<string> VerificationCallSids { get; private set; }
+
+    private DependentHostedNumberOrderResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocumentOptions.cs b/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocumentOptions.cs
index f4056c9b9..e034ad5e6 100644
--- a/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocumentOptions.cs
+++ b/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocumentOptions.cs
@@ -10,272 +10,272 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.HostedNumbers
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch a specific AuthorizationDocument.
+  /// </summary>
+  public class FetchAuthorizationDocumentOptions : IOptions<AuthorizationDocumentResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch a specific AuthorizationDocument.
+    /// AuthorizationDocument sid.
     /// </summary>
-    public class FetchAuthorizationDocumentOptions : IOptions<AuthorizationDocumentResource>
-    {
-        /// <summary>
-        /// AuthorizationDocument sid.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAuthorizationDocumentOptions
-        /// </summary>
-        /// <param name="pathSid"> AuthorizationDocument sid. </param>
-        public FetchAuthorizationDocumentOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Updates a specific AuthorizationDocument.
+    /// Construct a new FetchAuthorizationDocumentOptions
     /// </summary>
-    public class UpdateAuthorizationDocumentOptions : IOptions<AuthorizationDocumentResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A list of HostedNumberOrder sids.
-        /// </summary>
-        public List<string> HostedNumberOrderSids { get; set; }
-        /// <summary>
-        /// Address sid.
-        /// </summary>
-        public string AddressSid { get; set; }
-        /// <summary>
-        /// Email.
-        /// </summary>
-        public string Email { get; set; }
-        /// <summary>
-        /// A list of emails.
-        /// </summary>
-        public List<string> CcEmails { get; set; }
-        /// <summary>
-        /// The Status of this AuthorizationDocument.
-        /// </summary>
-        public AuthorizationDocumentResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// Title of signee of this Authorization Document.
-        /// </summary>
-        public string ContactTitle { get; set; }
-        /// <summary>
-        /// Authorization Document's signee's phone number.
-        /// </summary>
-        public string ContactPhoneNumber { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateAuthorizationDocumentOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateAuthorizationDocumentOptions(string pathSid)
-        {
-            PathSid = pathSid;
-            HostedNumberOrderSids = new List<string>();
-            CcEmails = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (HostedNumberOrderSids != null)
-            {
-                p.AddRange(HostedNumberOrderSids.Select(prop => new KeyValuePair<string, string>("HostedNumberOrderSids", prop)));
-            }
-
-            if (AddressSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
-            }
-
-            if (Email != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Email", Email));
-            }
-
-            if (CcEmails != null)
-            {
-                p.AddRange(CcEmails.Select(prop => new KeyValuePair<string, string>("CcEmails", prop)));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (ContactTitle != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ContactTitle", ContactTitle));
-            }
-
-            if (ContactPhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ContactPhoneNumber", ContactPhoneNumber));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> AuthorizationDocument sid. </param>
+    public FetchAuthorizationDocumentOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of AuthorizationDocuments belonging to the account initiating the request.
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadAuthorizationDocumentOptions : ReadOptions<AuthorizationDocumentResource>
-    {
-        /// <summary>
-        /// Email.
-        /// </summary>
-        public string Email { get; set; }
-        /// <summary>
-        /// The Status of this AuthorizationDocument.
-        /// </summary>
-        public AuthorizationDocumentResource.StatusEnum Status { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Email != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Email", Email));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Updates a specific AuthorizationDocument.
+  /// </summary>
+  public class UpdateAuthorizationDocumentOptions : IOptions<AuthorizationDocumentResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Create an AuthorizationDocument for authorizing the hosting of phone number capabilities on Twilio's platform.
+    /// The sid
     /// </summary>
-    public class CreateAuthorizationDocumentOptions : IOptions<AuthorizationDocumentResource>
-    {
-        /// <summary>
-        /// A list of HostedNumberOrder sids.
-        /// </summary>
-        public List<string> HostedNumberOrderSids { get; }
-        /// <summary>
-        /// Address sid.
-        /// </summary>
-        public string AddressSid { get; }
-        /// <summary>
-        /// Email.
-        /// </summary>
-        public string Email { get; }
-        /// <summary>
-        /// Title of signee of this Authorization Document.
-        /// </summary>
-        public string ContactTitle { get; }
-        /// <summary>
-        /// Authorization Document's signee's phone number.
-        /// </summary>
-        public string ContactPhoneNumber { get; }
-        /// <summary>
-        /// A list of emails.
-        /// </summary>
-        public List<string> CcEmails { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateAuthorizationDocumentOptions
-        /// </summary>
-        /// <param name="hostedNumberOrderSids"> A list of HostedNumberOrder sids. </param>
-        /// <param name="addressSid"> Address sid. </param>
-        /// <param name="email"> Email. </param>
-        /// <param name="contactTitle"> Title of signee of this Authorization Document. </param>
-        /// <param name="contactPhoneNumber"> Authorization Document's signee's phone number. </param>
-        public CreateAuthorizationDocumentOptions(List<string> hostedNumberOrderSids,
-                                                  string addressSid,
-                                                  string email,
-                                                  string contactTitle,
-                                                  string contactPhoneNumber)
-        {
-            HostedNumberOrderSids = hostedNumberOrderSids;
-            AddressSid = addressSid;
-            Email = email;
-            ContactTitle = contactTitle;
-            ContactPhoneNumber = contactPhoneNumber;
-            CcEmails = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (HostedNumberOrderSids != null)
-            {
-                p.AddRange(HostedNumberOrderSids.Select(prop => new KeyValuePair<string, string>("HostedNumberOrderSids", prop)));
-            }
-
-            if (AddressSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
-            }
-
-            if (Email != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Email", Email));
-            }
-
-            if (ContactTitle != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ContactTitle", ContactTitle));
-            }
-
-            if (ContactPhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ContactPhoneNumber", ContactPhoneNumber));
-            }
-
-            if (CcEmails != null)
-            {
-                p.AddRange(CcEmails.Select(prop => new KeyValuePair<string, string>("CcEmails", prop)));
-            }
-
-            return p;
-        }
-    }
+    public string PathSid { get; }
+    /// <summary>
+    /// A list of HostedNumberOrder sids.
+    /// </summary>
+    public List<string> HostedNumberOrderSids { get; set; }
+    /// <summary>
+    /// Address sid.
+    /// </summary>
+    public string AddressSid { get; set; }
+    /// <summary>
+    /// Email.
+    /// </summary>
+    public string Email { get; set; }
+    /// <summary>
+    /// A list of emails.
+    /// </summary>
+    public List<string> CcEmails { get; set; }
+    /// <summary>
+    /// The Status of this AuthorizationDocument.
+    /// </summary>
+    public AuthorizationDocumentResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// Title of signee of this Authorization Document.
+    /// </summary>
+    public string ContactTitle { get; set; }
+    /// <summary>
+    /// Authorization Document's signee's phone number.
+    /// </summary>
+    public string ContactPhoneNumber { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateAuthorizationDocumentOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateAuthorizationDocumentOptions(string pathSid)
+    {
+      PathSid = pathSid;
+      HostedNumberOrderSids = new List<string>();
+      CcEmails = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (HostedNumberOrderSids != null)
+      {
+        p.AddRange(HostedNumberOrderSids.Select(prop => new KeyValuePair<string, string>("HostedNumberOrderSids", prop)));
+      }
+
+      if (AddressSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
+      }
+
+      if (Email != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Email", Email));
+      }
+
+      if (CcEmails != null)
+      {
+        p.AddRange(CcEmails.Select(prop => new KeyValuePair<string, string>("CcEmails", prop)));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (ContactTitle != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ContactTitle", ContactTitle));
+      }
+
+      if (ContactPhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ContactPhoneNumber", ContactPhoneNumber));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of AuthorizationDocuments belonging to the account initiating the request.
+  /// </summary>
+  public class ReadAuthorizationDocumentOptions : ReadOptions<AuthorizationDocumentResource>
+  {
+    /// <summary>
+    /// Email.
+    /// </summary>
+    public string Email { get; set; }
+    /// <summary>
+    /// The Status of this AuthorizationDocument.
+    /// </summary>
+    public AuthorizationDocumentResource.StatusEnum Status { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Email != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Email", Email));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Create an AuthorizationDocument for authorizing the hosting of phone number capabilities on Twilio's platform.
+  /// </summary>
+  public class CreateAuthorizationDocumentOptions : IOptions<AuthorizationDocumentResource>
+  {
+    /// <summary>
+    /// A list of HostedNumberOrder sids.
+    /// </summary>
+    public List<string> HostedNumberOrderSids { get; }
+    /// <summary>
+    /// Address sid.
+    /// </summary>
+    public string AddressSid { get; }
+    /// <summary>
+    /// Email.
+    /// </summary>
+    public string Email { get; }
+    /// <summary>
+    /// Title of signee of this Authorization Document.
+    /// </summary>
+    public string ContactTitle { get; }
+    /// <summary>
+    /// Authorization Document's signee's phone number.
+    /// </summary>
+    public string ContactPhoneNumber { get; }
+    /// <summary>
+    /// A list of emails.
+    /// </summary>
+    public List<string> CcEmails { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateAuthorizationDocumentOptions
+    /// </summary>
+    /// <param name="hostedNumberOrderSids"> A list of HostedNumberOrder sids. </param>
+    /// <param name="addressSid"> Address sid. </param>
+    /// <param name="email"> Email. </param>
+    /// <param name="contactTitle"> Title of signee of this Authorization Document. </param>
+    /// <param name="contactPhoneNumber"> Authorization Document's signee's phone number. </param>
+    public CreateAuthorizationDocumentOptions(List<string> hostedNumberOrderSids,
+                                              string addressSid,
+                                              string email,
+                                              string contactTitle,
+                                              string contactPhoneNumber)
+    {
+      HostedNumberOrderSids = hostedNumberOrderSids;
+      AddressSid = addressSid;
+      Email = email;
+      ContactTitle = contactTitle;
+      ContactPhoneNumber = contactPhoneNumber;
+      CcEmails = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (HostedNumberOrderSids != null)
+      {
+        p.AddRange(HostedNumberOrderSids.Select(prop => new KeyValuePair<string, string>("HostedNumberOrderSids", prop)));
+      }
+
+      if (AddressSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
+      }
+
+      if (Email != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Email", Email));
+      }
+
+      if (ContactTitle != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ContactTitle", ContactTitle));
+      }
+
+      if (ContactPhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ContactPhoneNumber", ContactPhoneNumber));
+      }
+
+      if (CcEmails != null)
+      {
+        p.AddRange(CcEmails.Select(prop => new KeyValuePair<string, string>("CcEmails", prop)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocumentResource.cs b/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocumentResource.cs
index 78a05a011..318cc06a2 100644
--- a/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocumentResource.cs
+++ b/src/Twilio/Rest/Preview/HostedNumbers/AuthorizationDocumentResource.cs
@@ -20,489 +20,489 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Preview.HostedNumbers
-{
-
-    public class AuthorizationDocumentResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Opened = new StatusEnum("opened");
-            public static readonly StatusEnum Signing = new StatusEnum("signing");
-            public static readonly StatusEnum Signed = new StatusEnum("signed");
-            public static readonly StatusEnum Canceled = new StatusEnum("canceled");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        private static Request BuildFetchRequest(FetchAuthorizationDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/HostedNumbers/AuthorizationDocuments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific AuthorizationDocument.
-        /// </summary>
-        /// <param name="options"> Fetch AuthorizationDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthorizationDocument </returns>
-        public static AuthorizationDocumentResource Fetch(FetchAuthorizationDocumentOptions options,
-                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific AuthorizationDocument.
-        /// </summary>
-        /// <param name="options"> Fetch AuthorizationDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
-        public static async System.Threading.Tasks.Task<AuthorizationDocumentResource> FetchAsync(FetchAuthorizationDocumentOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific AuthorizationDocument.
-        /// </summary>
-        /// <param name="pathSid"> AuthorizationDocument sid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthorizationDocument </returns>
-        public static AuthorizationDocumentResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchAuthorizationDocumentOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific AuthorizationDocument.
-        /// </summary>
-        /// <param name="pathSid"> AuthorizationDocument sid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
-        public static async System.Threading.Tasks.Task<AuthorizationDocumentResource> FetchAsync(string pathSid,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchAuthorizationDocumentOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateAuthorizationDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/HostedNumbers/AuthorizationDocuments/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates a specific AuthorizationDocument.
-        /// </summary>
-        /// <param name="options"> Update AuthorizationDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthorizationDocument </returns>
-        public static AuthorizationDocumentResource Update(UpdateAuthorizationDocumentOptions options,
-                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a specific AuthorizationDocument.
-        /// </summary>
-        /// <param name="options"> Update AuthorizationDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
-        public static async System.Threading.Tasks.Task<AuthorizationDocumentResource> UpdateAsync(UpdateAuthorizationDocumentOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates a specific AuthorizationDocument.
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="hostedNumberOrderSids"> A list of HostedNumberOrder sids. </param>
-        /// <param name="addressSid"> Address sid. </param>
-        /// <param name="email"> Email. </param>
-        /// <param name="ccEmails"> A list of emails. </param>
-        /// <param name="status"> The Status of this AuthorizationDocument. </param>
-        /// <param name="contactTitle"> Title of signee of this Authorization Document. </param>
-        /// <param name="contactPhoneNumber"> Authorization Document's signee's phone number. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthorizationDocument </returns>
-        public static AuthorizationDocumentResource Update(string pathSid,
-                                                           List<string> hostedNumberOrderSids = null,
-                                                           string addressSid = null,
-                                                           string email = null,
-                                                           List<string> ccEmails = null,
-                                                           AuthorizationDocumentResource.StatusEnum status = null,
-                                                           string contactTitle = null,
-                                                           string contactPhoneNumber = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new UpdateAuthorizationDocumentOptions(pathSid){HostedNumberOrderSids = hostedNumberOrderSids, AddressSid = addressSid, Email = email, CcEmails = ccEmails, Status = status, ContactTitle = contactTitle, ContactPhoneNumber = contactPhoneNumber};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a specific AuthorizationDocument.
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="hostedNumberOrderSids"> A list of HostedNumberOrder sids. </param>
-        /// <param name="addressSid"> Address sid. </param>
-        /// <param name="email"> Email. </param>
-        /// <param name="ccEmails"> A list of emails. </param>
-        /// <param name="status"> The Status of this AuthorizationDocument. </param>
-        /// <param name="contactTitle"> Title of signee of this Authorization Document. </param>
-        /// <param name="contactPhoneNumber"> Authorization Document's signee's phone number. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
-        public static async System.Threading.Tasks.Task<AuthorizationDocumentResource> UpdateAsync(string pathSid,
-                                                                                                   List<string> hostedNumberOrderSids = null,
-                                                                                                   string addressSid = null,
-                                                                                                   string email = null,
-                                                                                                   List<string> ccEmails = null,
-                                                                                                   AuthorizationDocumentResource.StatusEnum status = null,
-                                                                                                   string contactTitle = null,
-                                                                                                   string contactPhoneNumber = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new UpdateAuthorizationDocumentOptions(pathSid){HostedNumberOrderSids = hostedNumberOrderSids, AddressSid = addressSid, Email = email, CcEmails = ccEmails, Status = status, ContactTitle = contactTitle, ContactPhoneNumber = contactPhoneNumber};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAuthorizationDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/HostedNumbers/AuthorizationDocuments",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of AuthorizationDocuments belonging to the account initiating the request.
-        /// </summary>
-        /// <param name="options"> Read AuthorizationDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthorizationDocument </returns>
-        public static ResourceSet<AuthorizationDocumentResource> Read(ReadAuthorizationDocumentOptions options,
-                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AuthorizationDocumentResource>.FromJson("items", response.Content);
-            return new ResourceSet<AuthorizationDocumentResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of AuthorizationDocuments belonging to the account initiating the request.
-        /// </summary>
-        /// <param name="options"> Read AuthorizationDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AuthorizationDocumentResource>> ReadAsync(ReadAuthorizationDocumentOptions options,
-                                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AuthorizationDocumentResource>.FromJson("items", response.Content);
-            return new ResourceSet<AuthorizationDocumentResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of AuthorizationDocuments belonging to the account initiating the request.
-        /// </summary>
-        /// <param name="email"> Email. </param>
-        /// <param name="status"> The Status of this AuthorizationDocument. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthorizationDocument </returns>
-        public static ResourceSet<AuthorizationDocumentResource> Read(string email = null,
-                                                                      AuthorizationDocumentResource.StatusEnum status = null,
-                                                                      int? pageSize = null,
-                                                                      long? limit = null,
-                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadAuthorizationDocumentOptions(){Email = email, Status = status, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of AuthorizationDocuments belonging to the account initiating the request.
-        /// </summary>
-        /// <param name="email"> Email. </param>
-        /// <param name="status"> The Status of this AuthorizationDocument. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AuthorizationDocumentResource>> ReadAsync(string email = null,
-                                                                                                              AuthorizationDocumentResource.StatusEnum status = null,
-                                                                                                              int? pageSize = null,
-                                                                                                              long? limit = null,
-                                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadAuthorizationDocumentOptions(){Email = email, Status = status, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AuthorizationDocumentResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AuthorizationDocumentResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AuthorizationDocumentResource> NextPage(Page<AuthorizationDocumentResource> page,
-                                                                   ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<AuthorizationDocumentResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AuthorizationDocumentResource> PreviousPage(Page<AuthorizationDocumentResource> page,
-                                                                       ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<AuthorizationDocumentResource>.FromJson("items", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateAuthorizationDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/HostedNumbers/AuthorizationDocuments",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create an AuthorizationDocument for authorizing the hosting of phone number capabilities on Twilio's platform.
-        /// </summary>
-        /// <param name="options"> Create AuthorizationDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthorizationDocument </returns>
-        public static AuthorizationDocumentResource Create(CreateAuthorizationDocumentOptions options,
-                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create an AuthorizationDocument for authorizing the hosting of phone number capabilities on Twilio's platform.
-        /// </summary>
-        /// <param name="options"> Create AuthorizationDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
-        public static async System.Threading.Tasks.Task<AuthorizationDocumentResource> CreateAsync(CreateAuthorizationDocumentOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create an AuthorizationDocument for authorizing the hosting of phone number capabilities on Twilio's platform.
-        /// </summary>
-        /// <param name="hostedNumberOrderSids"> A list of HostedNumberOrder sids. </param>
-        /// <param name="addressSid"> Address sid. </param>
-        /// <param name="email"> Email. </param>
-        /// <param name="contactTitle"> Title of signee of this Authorization Document. </param>
-        /// <param name="contactPhoneNumber"> Authorization Document's signee's phone number. </param>
-        /// <param name="ccEmails"> A list of emails. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AuthorizationDocument </returns>
-        public static AuthorizationDocumentResource Create(List<string> hostedNumberOrderSids,
-                                                           string addressSid,
-                                                           string email,
-                                                           string contactTitle,
-                                                           string contactPhoneNumber,
-                                                           List<string> ccEmails = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateAuthorizationDocumentOptions(hostedNumberOrderSids, addressSid, email, contactTitle, contactPhoneNumber){CcEmails = ccEmails};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create an AuthorizationDocument for authorizing the hosting of phone number capabilities on Twilio's platform.
-        /// </summary>
-        /// <param name="hostedNumberOrderSids"> A list of HostedNumberOrder sids. </param>
-        /// <param name="addressSid"> Address sid. </param>
-        /// <param name="email"> Email. </param>
-        /// <param name="contactTitle"> Title of signee of this Authorization Document. </param>
-        /// <param name="contactPhoneNumber"> Authorization Document's signee's phone number. </param>
-        /// <param name="ccEmails"> A list of emails. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
-        public static async System.Threading.Tasks.Task<AuthorizationDocumentResource> CreateAsync(List<string> hostedNumberOrderSids,
-                                                                                                   string addressSid,
-                                                                                                   string email,
-                                                                                                   string contactTitle,
-                                                                                                   string contactPhoneNumber,
-                                                                                                   List<string> ccEmails = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateAuthorizationDocumentOptions(hostedNumberOrderSids, addressSid, email, contactTitle, contactPhoneNumber){CcEmails = ccEmails};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AuthorizationDocumentResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AuthorizationDocumentResource object represented by the provided JSON </returns>
-        public static AuthorizationDocumentResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AuthorizationDocumentResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// AuthorizationDocument sid.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Address sid.
-        /// </summary>
-        [JsonProperty("address_sid")]
-        public string AddressSid { get; private set; }
-        /// <summary>
-        /// The Status of this AuthorizationDocument.
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public AuthorizationDocumentResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// Email.
-        /// </summary>
-        [JsonProperty("email")]
-        public string Email { get; private set; }
-        /// <summary>
-        /// A list of emails.
-        /// </summary>
-        [JsonProperty("cc_emails")]
-        public List<string> CcEmails { get; private set; }
-        /// <summary>
-        /// The date this AuthorizationDocument was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this AuthorizationDocument was updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private AuthorizationDocumentResource()
-        {
-
-        }
-    }
+{
+
+  public class AuthorizationDocumentResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Opened = new StatusEnum("opened");
+      public static readonly StatusEnum Signing = new StatusEnum("signing");
+      public static readonly StatusEnum Signed = new StatusEnum("signed");
+      public static readonly StatusEnum Canceled = new StatusEnum("canceled");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    private static Request BuildFetchRequest(FetchAuthorizationDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/HostedNumbers/AuthorizationDocuments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific AuthorizationDocument.
+    /// </summary>
+    /// <param name="options"> Fetch AuthorizationDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthorizationDocument </returns>
+    public static AuthorizationDocumentResource Fetch(FetchAuthorizationDocumentOptions options,
+                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific AuthorizationDocument.
+    /// </summary>
+    /// <param name="options"> Fetch AuthorizationDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
+    public static async System.Threading.Tasks.Task<AuthorizationDocumentResource> FetchAsync(FetchAuthorizationDocumentOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific AuthorizationDocument.
+    /// </summary>
+    /// <param name="pathSid"> AuthorizationDocument sid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthorizationDocument </returns>
+    public static AuthorizationDocumentResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchAuthorizationDocumentOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific AuthorizationDocument.
+    /// </summary>
+    /// <param name="pathSid"> AuthorizationDocument sid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
+    public static async System.Threading.Tasks.Task<AuthorizationDocumentResource> FetchAsync(string pathSid,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchAuthorizationDocumentOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateAuthorizationDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/HostedNumbers/AuthorizationDocuments/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates a specific AuthorizationDocument.
+    /// </summary>
+    /// <param name="options"> Update AuthorizationDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthorizationDocument </returns>
+    public static AuthorizationDocumentResource Update(UpdateAuthorizationDocumentOptions options,
+                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a specific AuthorizationDocument.
+    /// </summary>
+    /// <param name="options"> Update AuthorizationDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
+    public static async System.Threading.Tasks.Task<AuthorizationDocumentResource> UpdateAsync(UpdateAuthorizationDocumentOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates a specific AuthorizationDocument.
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="hostedNumberOrderSids"> A list of HostedNumberOrder sids. </param>
+    /// <param name="addressSid"> Address sid. </param>
+    /// <param name="email"> Email. </param>
+    /// <param name="ccEmails"> A list of emails. </param>
+    /// <param name="status"> The Status of this AuthorizationDocument. </param>
+    /// <param name="contactTitle"> Title of signee of this Authorization Document. </param>
+    /// <param name="contactPhoneNumber"> Authorization Document's signee's phone number. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthorizationDocument </returns>
+    public static AuthorizationDocumentResource Update(string pathSid,
+                                                       List<string> hostedNumberOrderSids = null,
+                                                       string addressSid = null,
+                                                       string email = null,
+                                                       List<string> ccEmails = null,
+                                                       AuthorizationDocumentResource.StatusEnum status = null,
+                                                       string contactTitle = null,
+                                                       string contactPhoneNumber = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new UpdateAuthorizationDocumentOptions(pathSid) { HostedNumberOrderSids = hostedNumberOrderSids, AddressSid = addressSid, Email = email, CcEmails = ccEmails, Status = status, ContactTitle = contactTitle, ContactPhoneNumber = contactPhoneNumber };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a specific AuthorizationDocument.
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="hostedNumberOrderSids"> A list of HostedNumberOrder sids. </param>
+    /// <param name="addressSid"> Address sid. </param>
+    /// <param name="email"> Email. </param>
+    /// <param name="ccEmails"> A list of emails. </param>
+    /// <param name="status"> The Status of this AuthorizationDocument. </param>
+    /// <param name="contactTitle"> Title of signee of this Authorization Document. </param>
+    /// <param name="contactPhoneNumber"> Authorization Document's signee's phone number. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
+    public static async System.Threading.Tasks.Task<AuthorizationDocumentResource> UpdateAsync(string pathSid,
+                                                                                               List<string> hostedNumberOrderSids = null,
+                                                                                               string addressSid = null,
+                                                                                               string email = null,
+                                                                                               List<string> ccEmails = null,
+                                                                                               AuthorizationDocumentResource.StatusEnum status = null,
+                                                                                               string contactTitle = null,
+                                                                                               string contactPhoneNumber = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new UpdateAuthorizationDocumentOptions(pathSid) { HostedNumberOrderSids = hostedNumberOrderSids, AddressSid = addressSid, Email = email, CcEmails = ccEmails, Status = status, ContactTitle = contactTitle, ContactPhoneNumber = contactPhoneNumber };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAuthorizationDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/HostedNumbers/AuthorizationDocuments",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of AuthorizationDocuments belonging to the account initiating the request.
+    /// </summary>
+    /// <param name="options"> Read AuthorizationDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthorizationDocument </returns>
+    public static ResourceSet<AuthorizationDocumentResource> Read(ReadAuthorizationDocumentOptions options,
+                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AuthorizationDocumentResource>.FromJson("items", response.Content);
+      return new ResourceSet<AuthorizationDocumentResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of AuthorizationDocuments belonging to the account initiating the request.
+    /// </summary>
+    /// <param name="options"> Read AuthorizationDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AuthorizationDocumentResource>> ReadAsync(ReadAuthorizationDocumentOptions options,
+                                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AuthorizationDocumentResource>.FromJson("items", response.Content);
+      return new ResourceSet<AuthorizationDocumentResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of AuthorizationDocuments belonging to the account initiating the request.
+    /// </summary>
+    /// <param name="email"> Email. </param>
+    /// <param name="status"> The Status of this AuthorizationDocument. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthorizationDocument </returns>
+    public static ResourceSet<AuthorizationDocumentResource> Read(string email = null,
+                                                                  AuthorizationDocumentResource.StatusEnum status = null,
+                                                                  int? pageSize = null,
+                                                                  long? limit = null,
+                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadAuthorizationDocumentOptions() { Email = email, Status = status, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of AuthorizationDocuments belonging to the account initiating the request.
+    /// </summary>
+    /// <param name="email"> Email. </param>
+    /// <param name="status"> The Status of this AuthorizationDocument. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AuthorizationDocumentResource>> ReadAsync(string email = null,
+                                                                                                          AuthorizationDocumentResource.StatusEnum status = null,
+                                                                                                          int? pageSize = null,
+                                                                                                          long? limit = null,
+                                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadAuthorizationDocumentOptions() { Email = email, Status = status, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AuthorizationDocumentResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AuthorizationDocumentResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AuthorizationDocumentResource> NextPage(Page<AuthorizationDocumentResource> page,
+                                                               ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<AuthorizationDocumentResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AuthorizationDocumentResource> PreviousPage(Page<AuthorizationDocumentResource> page,
+                                                                   ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<AuthorizationDocumentResource>.FromJson("items", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateAuthorizationDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/HostedNumbers/AuthorizationDocuments",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create an AuthorizationDocument for authorizing the hosting of phone number capabilities on Twilio's platform.
+    /// </summary>
+    /// <param name="options"> Create AuthorizationDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthorizationDocument </returns>
+    public static AuthorizationDocumentResource Create(CreateAuthorizationDocumentOptions options,
+                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create an AuthorizationDocument for authorizing the hosting of phone number capabilities on Twilio's platform.
+    /// </summary>
+    /// <param name="options"> Create AuthorizationDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
+    public static async System.Threading.Tasks.Task<AuthorizationDocumentResource> CreateAsync(CreateAuthorizationDocumentOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create an AuthorizationDocument for authorizing the hosting of phone number capabilities on Twilio's platform.
+    /// </summary>
+    /// <param name="hostedNumberOrderSids"> A list of HostedNumberOrder sids. </param>
+    /// <param name="addressSid"> Address sid. </param>
+    /// <param name="email"> Email. </param>
+    /// <param name="contactTitle"> Title of signee of this Authorization Document. </param>
+    /// <param name="contactPhoneNumber"> Authorization Document's signee's phone number. </param>
+    /// <param name="ccEmails"> A list of emails. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AuthorizationDocument </returns>
+    public static AuthorizationDocumentResource Create(List<string> hostedNumberOrderSids,
+                                                       string addressSid,
+                                                       string email,
+                                                       string contactTitle,
+                                                       string contactPhoneNumber,
+                                                       List<string> ccEmails = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateAuthorizationDocumentOptions(hostedNumberOrderSids, addressSid, email, contactTitle, contactPhoneNumber) { CcEmails = ccEmails };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create an AuthorizationDocument for authorizing the hosting of phone number capabilities on Twilio's platform.
+    /// </summary>
+    /// <param name="hostedNumberOrderSids"> A list of HostedNumberOrder sids. </param>
+    /// <param name="addressSid"> Address sid. </param>
+    /// <param name="email"> Email. </param>
+    /// <param name="contactTitle"> Title of signee of this Authorization Document. </param>
+    /// <param name="contactPhoneNumber"> Authorization Document's signee's phone number. </param>
+    /// <param name="ccEmails"> A list of emails. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AuthorizationDocument </returns>
+    public static async System.Threading.Tasks.Task<AuthorizationDocumentResource> CreateAsync(List<string> hostedNumberOrderSids,
+                                                                                               string addressSid,
+                                                                                               string email,
+                                                                                               string contactTitle,
+                                                                                               string contactPhoneNumber,
+                                                                                               List<string> ccEmails = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateAuthorizationDocumentOptions(hostedNumberOrderSids, addressSid, email, contactTitle, contactPhoneNumber) { CcEmails = ccEmails };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AuthorizationDocumentResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AuthorizationDocumentResource object represented by the provided JSON </returns>
+    public static AuthorizationDocumentResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AuthorizationDocumentResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// AuthorizationDocument sid.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Address sid.
+    /// </summary>
+    [JsonProperty("address_sid")]
+    public string AddressSid { get; private set; }
+    /// <summary>
+    /// The Status of this AuthorizationDocument.
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public AuthorizationDocumentResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// Email.
+    /// </summary>
+    [JsonProperty("email")]
+    public string Email { get; private set; }
+    /// <summary>
+    /// A list of emails.
+    /// </summary>
+    [JsonProperty("cc_emails")]
+    public List<string> CcEmails { get; private set; }
+    /// <summary>
+    /// The date this AuthorizationDocument was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this AuthorizationDocument was updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private AuthorizationDocumentResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/HostedNumbers/HostedNumberOrderOptions.cs b/src/Twilio/Rest/Preview/HostedNumbers/HostedNumberOrderOptions.cs
index 2589739e5..a7697a6fc 100644
--- a/src/Twilio/Rest/Preview/HostedNumbers/HostedNumberOrderOptions.cs
+++ b/src/Twilio/Rest/Preview/HostedNumbers/HostedNumberOrderOptions.cs
@@ -10,446 +10,446 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.HostedNumbers
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch a specific HostedNumberOrder.
+  /// </summary>
+  public class FetchHostedNumberOrderOptions : IOptions<HostedNumberOrderResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch a specific HostedNumberOrder.
-    /// </summary>
-    public class FetchHostedNumberOrderOptions : IOptions<HostedNumberOrderResource>
-    {
-        /// <summary>
-        /// HostedNumberOrder sid.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchHostedNumberOrderOptions
-        /// </summary>
-        /// <param name="pathSid"> HostedNumberOrder sid. </param>
-        public FetchHostedNumberOrderOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// HostedNumberOrder sid.
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Cancel the HostedNumberOrder (only available when the status is in `received`).
-    /// </summary>
-    public class DeleteHostedNumberOrderOptions : IOptions<HostedNumberOrderResource>
-    {
-        /// <summary>
-        /// HostedNumberOrder sid.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteHostedNumberOrderOptions
-        /// </summary>
-        /// <param name="pathSid"> HostedNumberOrder sid. </param>
-        public DeleteHostedNumberOrderOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new FetchHostedNumberOrderOptions
+    /// </summary>
+    /// <param name="pathSid"> HostedNumberOrder sid. </param>
+    public FetchHostedNumberOrderOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Updates a specific HostedNumberOrder.
-    /// </summary>
-    public class UpdateHostedNumberOrderOptions : IOptions<HostedNumberOrderResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A human readable description of this resource.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// A unique, developer assigned name of this HostedNumberOrder.
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// Email.
-        /// </summary>
-        public string Email { get; set; }
-        /// <summary>
-        /// A list of emails.
-        /// </summary>
-        public List<string> CcEmails { get; set; }
-        /// <summary>
-        /// The Status of this HostedNumberOrder.
-        /// </summary>
-        public HostedNumberOrderResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// A verification code.
-        /// </summary>
-        public string VerificationCode { get; set; }
-        /// <summary>
-        /// Verification Type.
-        /// </summary>
-        public HostedNumberOrderResource.VerificationTypeEnum VerificationType { get; set; }
-        /// <summary>
-        /// Verification Document Sid
-        /// </summary>
-        public string VerificationDocumentSid { get; set; }
-        /// <summary>
-        /// Digits to dial after connecting the verification call.
-        /// </summary>
-        public string Extension { get; set; }
-        /// <summary>
-        /// The number of seconds, between 0 and 60, to delay before initiating the verification call.
-        /// </summary>
-        public int? CallDelay { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateHostedNumberOrderOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateHostedNumberOrderOptions(string pathSid)
-        {
-            PathSid = pathSid;
-            CcEmails = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Email != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Email", Email));
-            }
-
-            if (CcEmails != null)
-            {
-                p.AddRange(CcEmails.Select(prop => new KeyValuePair<string, string>("CcEmails", prop)));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (VerificationCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VerificationCode", VerificationCode));
-            }
-
-            if (VerificationType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VerificationType", VerificationType.ToString()));
-            }
-
-            if (VerificationDocumentSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VerificationDocumentSid", VerificationDocumentSid.ToString()));
-            }
-
-            if (Extension != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Extension", Extension));
-            }
-
-            if (CallDelay != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallDelay", CallDelay.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Cancel the HostedNumberOrder (only available when the status is in `received`).
+  /// </summary>
+  public class DeleteHostedNumberOrderOptions : IOptions<HostedNumberOrderResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of HostedNumberOrders belonging to the account initiating the request.
-    /// </summary>
-    public class ReadHostedNumberOrderOptions : ReadOptions<HostedNumberOrderResource>
-    {
-        /// <summary>
-        /// The Status of this HostedNumberOrder.
-        /// </summary>
-        public HostedNumberOrderResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// An E164 formatted phone number.
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; set; }
-        /// <summary>
-        /// IncomingPhoneNumber sid.
-        /// </summary>
-        public string IncomingPhoneNumberSid { get; set; }
-        /// <summary>
-        /// A human readable description of this resource.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// A unique, developer assigned name of this HostedNumberOrder.
-        /// </summary>
-        public string UniqueName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (IncomingPhoneNumberSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncomingPhoneNumberSid", IncomingPhoneNumberSid.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// HostedNumberOrder sid.
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Host a phone number's capability on Twilio's platform.
-    /// </summary>
-    public class CreateHostedNumberOrderOptions : IOptions<HostedNumberOrderResource>
-    {
-        /// <summary>
-        /// An E164 formatted phone number.
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; }
-        /// <summary>
-        /// Specify SMS capability to host.
-        /// </summary>
-        public bool? SmsCapability { get; }
-        /// <summary>
-        /// Account Sid.
-        /// </summary>
-        public string AccountSid { get; set; }
-        /// <summary>
-        /// A human readable description of this resource.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// A unique, developer assigned name of this HostedNumberOrder.
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// A list of emails.
-        /// </summary>
-        public List<string> CcEmails { get; set; }
-        /// <summary>
-        /// SMS URL.
-        /// </summary>
-        public Uri SmsUrl { get; set; }
-        /// <summary>
-        /// SMS Method.
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsMethod { get; set; }
-        /// <summary>
-        /// SMS Fallback URL.
-        /// </summary>
-        public Uri SmsFallbackUrl { get; set; }
-        /// <summary>
-        /// SMS Fallback Method.
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
-        /// <summary>
-        /// Status Callback URL.
-        /// </summary>
-        public Uri StatusCallbackUrl { get; set; }
-        /// <summary>
-        /// Status Callback Method.
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// SMS Application Sid.
-        /// </summary>
-        public string SmsApplicationSid { get; set; }
-        /// <summary>
-        /// Address sid.
-        /// </summary>
-        public string AddressSid { get; set; }
-        /// <summary>
-        /// Email.
-        /// </summary>
-        public string Email { get; set; }
-        /// <summary>
-        /// Verification Type.
-        /// </summary>
-        public HostedNumberOrderResource.VerificationTypeEnum VerificationType { get; set; }
-        /// <summary>
-        /// Verification Document Sid
-        /// </summary>
-        public string VerificationDocumentSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateHostedNumberOrderOptions
-        /// </summary>
-        /// <param name="phoneNumber"> An E164 formatted phone number. </param>
-        /// <param name="smsCapability"> Specify SMS capability to host. </param>
-        public CreateHostedNumberOrderOptions(Types.PhoneNumber phoneNumber, bool? smsCapability)
-        {
-            PhoneNumber = phoneNumber;
-            SmsCapability = smsCapability;
-            CcEmails = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (SmsCapability != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsCapability", SmsCapability.Value.ToString().ToLower()));
-            }
-
-            if (AccountSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AccountSid", AccountSid.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (CcEmails != null)
-            {
-                p.AddRange(CcEmails.Select(prop => new KeyValuePair<string, string>("CcEmails", prop)));
-            }
-
-            if (SmsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
-            }
-
-            if (SmsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
-            }
-
-            if (SmsFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
-            }
-
-            if (SmsFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
-            }
-
-            if (StatusCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackUrl", Serializers.Url(StatusCallbackUrl)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (SmsApplicationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsApplicationSid", SmsApplicationSid.ToString()));
-            }
-
-            if (AddressSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
-            }
-
-            if (Email != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Email", Email));
-            }
-
-            if (VerificationType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VerificationType", VerificationType.ToString()));
-            }
-
-            if (VerificationDocumentSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VerificationDocumentSid", VerificationDocumentSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new DeleteHostedNumberOrderOptions
+    /// </summary>
+    /// <param name="pathSid"> HostedNumberOrder sid. </param>
+    public DeleteHostedNumberOrderOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Updates a specific HostedNumberOrder.
+  /// </summary>
+  public class UpdateHostedNumberOrderOptions : IOptions<HostedNumberOrderResource>
+  {
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A human readable description of this resource.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// A unique, developer assigned name of this HostedNumberOrder.
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// Email.
+    /// </summary>
+    public string Email { get; set; }
+    /// <summary>
+    /// A list of emails.
+    /// </summary>
+    public List<string> CcEmails { get; set; }
+    /// <summary>
+    /// The Status of this HostedNumberOrder.
+    /// </summary>
+    public HostedNumberOrderResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// A verification code.
+    /// </summary>
+    public string VerificationCode { get; set; }
+    /// <summary>
+    /// Verification Type.
+    /// </summary>
+    public HostedNumberOrderResource.VerificationTypeEnum VerificationType { get; set; }
+    /// <summary>
+    /// Verification Document Sid
+    /// </summary>
+    public string VerificationDocumentSid { get; set; }
+    /// <summary>
+    /// Digits to dial after connecting the verification call.
+    /// </summary>
+    public string Extension { get; set; }
+    /// <summary>
+    /// The number of seconds, between 0 and 60, to delay before initiating the verification call.
+    /// </summary>
+    public int? CallDelay { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateHostedNumberOrderOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateHostedNumberOrderOptions(string pathSid)
+    {
+      PathSid = pathSid;
+      CcEmails = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Email != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Email", Email));
+      }
+
+      if (CcEmails != null)
+      {
+        p.AddRange(CcEmails.Select(prop => new KeyValuePair<string, string>("CcEmails", prop)));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (VerificationCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VerificationCode", VerificationCode));
+      }
+
+      if (VerificationType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VerificationType", VerificationType.ToString()));
+      }
+
+      if (VerificationDocumentSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VerificationDocumentSid", VerificationDocumentSid.ToString()));
+      }
+
+      if (Extension != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Extension", Extension));
+      }
+
+      if (CallDelay != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallDelay", CallDelay.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of HostedNumberOrders belonging to the account initiating the request.
+  /// </summary>
+  public class ReadHostedNumberOrderOptions : ReadOptions<HostedNumberOrderResource>
+  {
+    /// <summary>
+    /// The Status of this HostedNumberOrder.
+    /// </summary>
+    public HostedNumberOrderResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// An E164 formatted phone number.
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; set; }
+    /// <summary>
+    /// IncomingPhoneNumber sid.
+    /// </summary>
+    public string IncomingPhoneNumberSid { get; set; }
+    /// <summary>
+    /// A human readable description of this resource.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// A unique, developer assigned name of this HostedNumberOrder.
+    /// </summary>
+    public string UniqueName { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (IncomingPhoneNumberSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncomingPhoneNumberSid", IncomingPhoneNumberSid.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Host a phone number's capability on Twilio's platform.
+  /// </summary>
+  public class CreateHostedNumberOrderOptions : IOptions<HostedNumberOrderResource>
+  {
+    /// <summary>
+    /// An E164 formatted phone number.
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; }
+    /// <summary>
+    /// Specify SMS capability to host.
+    /// </summary>
+    public bool? SmsCapability { get; }
+    /// <summary>
+    /// Account Sid.
+    /// </summary>
+    public string AccountSid { get; set; }
+    /// <summary>
+    /// A human readable description of this resource.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// A unique, developer assigned name of this HostedNumberOrder.
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// A list of emails.
+    /// </summary>
+    public List<string> CcEmails { get; set; }
+    /// <summary>
+    /// SMS URL.
+    /// </summary>
+    public Uri SmsUrl { get; set; }
+    /// <summary>
+    /// SMS Method.
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsMethod { get; set; }
+    /// <summary>
+    /// SMS Fallback URL.
+    /// </summary>
+    public Uri SmsFallbackUrl { get; set; }
+    /// <summary>
+    /// SMS Fallback Method.
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
+    /// <summary>
+    /// Status Callback URL.
+    /// </summary>
+    public Uri StatusCallbackUrl { get; set; }
+    /// <summary>
+    /// Status Callback Method.
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// SMS Application Sid.
+    /// </summary>
+    public string SmsApplicationSid { get; set; }
+    /// <summary>
+    /// Address sid.
+    /// </summary>
+    public string AddressSid { get; set; }
+    /// <summary>
+    /// Email.
+    /// </summary>
+    public string Email { get; set; }
+    /// <summary>
+    /// Verification Type.
+    /// </summary>
+    public HostedNumberOrderResource.VerificationTypeEnum VerificationType { get; set; }
+    /// <summary>
+    /// Verification Document Sid
+    /// </summary>
+    public string VerificationDocumentSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateHostedNumberOrderOptions
+    /// </summary>
+    /// <param name="phoneNumber"> An E164 formatted phone number. </param>
+    /// <param name="smsCapability"> Specify SMS capability to host. </param>
+    public CreateHostedNumberOrderOptions(Types.PhoneNumber phoneNumber, bool? smsCapability)
+    {
+      PhoneNumber = phoneNumber;
+      SmsCapability = smsCapability;
+      CcEmails = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (SmsCapability != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsCapability", SmsCapability.Value.ToString().ToLower()));
+      }
+
+      if (AccountSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AccountSid", AccountSid.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (CcEmails != null)
+      {
+        p.AddRange(CcEmails.Select(prop => new KeyValuePair<string, string>("CcEmails", prop)));
+      }
+
+      if (SmsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
+      }
+
+      if (SmsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
+      }
+
+      if (SmsFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
+      }
+
+      if (SmsFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
+      }
+
+      if (StatusCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackUrl", Serializers.Url(StatusCallbackUrl)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (SmsApplicationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsApplicationSid", SmsApplicationSid.ToString()));
+      }
+
+      if (AddressSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AddressSid", AddressSid.ToString()));
+      }
+
+      if (Email != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Email", Email));
+      }
+
+      if (VerificationType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VerificationType", VerificationType.ToString()));
+      }
+
+      if (VerificationDocumentSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VerificationDocumentSid", VerificationDocumentSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/HostedNumbers/HostedNumberOrderResource.cs b/src/Twilio/Rest/Preview/HostedNumbers/HostedNumberOrderResource.cs
index b07e5b285..60bd142cd 100644
--- a/src/Twilio/Rest/Preview/HostedNumbers/HostedNumberOrderResource.cs
+++ b/src/Twilio/Rest/Preview/HostedNumbers/HostedNumberOrderResource.cs
@@ -20,713 +20,713 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Preview.HostedNumbers
-{
-
-    public class HostedNumberOrderResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Received = new StatusEnum("received");
-            public static readonly StatusEnum PendingVerification = new StatusEnum("pending-verification");
-            public static readonly StatusEnum Verified = new StatusEnum("verified");
-            public static readonly StatusEnum PendingLoa = new StatusEnum("pending-loa");
-            public static readonly StatusEnum CarrierProcessing = new StatusEnum("carrier-processing");
-            public static readonly StatusEnum Testing = new StatusEnum("testing");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-            public static readonly StatusEnum ActionRequired = new StatusEnum("action-required");
-        }
-
-        public sealed class VerificationTypeEnum : StringEnum
-        {
-            private VerificationTypeEnum(string value) : base(value) {}
-            public VerificationTypeEnum() {}
-            public static implicit operator VerificationTypeEnum(string value)
-            {
-                return new VerificationTypeEnum(value);
-            }
-
-            public static readonly VerificationTypeEnum PhoneCall = new VerificationTypeEnum("phone-call");
-            public static readonly VerificationTypeEnum PhoneBill = new VerificationTypeEnum("phone-bill");
-        }
-
-        private static Request BuildFetchRequest(FetchHostedNumberOrderOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/HostedNumbers/HostedNumberOrders/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific HostedNumberOrder.
-        /// </summary>
-        /// <param name="options"> Fetch HostedNumberOrder parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of HostedNumberOrder </returns>
-        public static HostedNumberOrderResource Fetch(FetchHostedNumberOrderOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific HostedNumberOrder.
-        /// </summary>
-        /// <param name="options"> Fetch HostedNumberOrder parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
-        public static async System.Threading.Tasks.Task<HostedNumberOrderResource> FetchAsync(FetchHostedNumberOrderOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific HostedNumberOrder.
-        /// </summary>
-        /// <param name="pathSid"> HostedNumberOrder sid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of HostedNumberOrder </returns>
-        public static HostedNumberOrderResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchHostedNumberOrderOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific HostedNumberOrder.
-        /// </summary>
-        /// <param name="pathSid"> HostedNumberOrder sid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
-        public static async System.Threading.Tasks.Task<HostedNumberOrderResource> FetchAsync(string pathSid,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchHostedNumberOrderOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteHostedNumberOrderOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/HostedNumbers/HostedNumberOrders/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Cancel the HostedNumberOrder (only available when the status is in `received`).
-        /// </summary>
-        /// <param name="options"> Delete HostedNumberOrder parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of HostedNumberOrder </returns>
-        public static bool Delete(DeleteHostedNumberOrderOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Cancel the HostedNumberOrder (only available when the status is in `received`).
-        /// </summary>
-        /// <param name="options"> Delete HostedNumberOrder parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteHostedNumberOrderOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Cancel the HostedNumberOrder (only available when the status is in `received`).
-        /// </summary>
-        /// <param name="pathSid"> HostedNumberOrder sid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of HostedNumberOrder </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteHostedNumberOrderOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Cancel the HostedNumberOrder (only available when the status is in `received`).
-        /// </summary>
-        /// <param name="pathSid"> HostedNumberOrder sid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteHostedNumberOrderOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateHostedNumberOrderOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/HostedNumbers/HostedNumberOrders/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates a specific HostedNumberOrder.
-        /// </summary>
-        /// <param name="options"> Update HostedNumberOrder parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of HostedNumberOrder </returns>
-        public static HostedNumberOrderResource Update(UpdateHostedNumberOrderOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a specific HostedNumberOrder.
-        /// </summary>
-        /// <param name="options"> Update HostedNumberOrder parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
-        public static async System.Threading.Tasks.Task<HostedNumberOrderResource> UpdateAsync(UpdateHostedNumberOrderOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates a specific HostedNumberOrder.
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> A human readable description of this resource. </param>
-        /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
-        /// <param name="email"> Email. </param>
-        /// <param name="ccEmails"> A list of emails. </param>
-        /// <param name="status"> The Status of this HostedNumberOrder. </param>
-        /// <param name="verificationCode"> A verification code. </param>
-        /// <param name="verificationType"> Verification Type. </param>
-        /// <param name="verificationDocumentSid"> Verification Document Sid </param>
-        /// <param name="extension"> Digits to dial after connecting the verification call. </param>
-        /// <param name="callDelay"> The number of seconds, between 0 and 60, to delay before initiating the verification call.
-        ///                 </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of HostedNumberOrder </returns>
-        public static HostedNumberOrderResource Update(string pathSid,
-                                                       string friendlyName = null,
-                                                       string uniqueName = null,
-                                                       string email = null,
-                                                       List<string> ccEmails = null,
-                                                       HostedNumberOrderResource.StatusEnum status = null,
-                                                       string verificationCode = null,
-                                                       HostedNumberOrderResource.VerificationTypeEnum verificationType = null,
-                                                       string verificationDocumentSid = null,
-                                                       string extension = null,
-                                                       int? callDelay = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateHostedNumberOrderOptions(pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Email = email, CcEmails = ccEmails, Status = status, VerificationCode = verificationCode, VerificationType = verificationType, VerificationDocumentSid = verificationDocumentSid, Extension = extension, CallDelay = callDelay};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a specific HostedNumberOrder.
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> A human readable description of this resource. </param>
-        /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
-        /// <param name="email"> Email. </param>
-        /// <param name="ccEmails"> A list of emails. </param>
-        /// <param name="status"> The Status of this HostedNumberOrder. </param>
-        /// <param name="verificationCode"> A verification code. </param>
-        /// <param name="verificationType"> Verification Type. </param>
-        /// <param name="verificationDocumentSid"> Verification Document Sid </param>
-        /// <param name="extension"> Digits to dial after connecting the verification call. </param>
-        /// <param name="callDelay"> The number of seconds, between 0 and 60, to delay before initiating the verification call.
-        ///                 </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
-        public static async System.Threading.Tasks.Task<HostedNumberOrderResource> UpdateAsync(string pathSid,
-                                                                                               string friendlyName = null,
-                                                                                               string uniqueName = null,
-                                                                                               string email = null,
-                                                                                               List<string> ccEmails = null,
-                                                                                               HostedNumberOrderResource.StatusEnum status = null,
-                                                                                               string verificationCode = null,
-                                                                                               HostedNumberOrderResource.VerificationTypeEnum verificationType = null,
-                                                                                               string verificationDocumentSid = null,
-                                                                                               string extension = null,
-                                                                                               int? callDelay = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateHostedNumberOrderOptions(pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Email = email, CcEmails = ccEmails, Status = status, VerificationCode = verificationCode, VerificationType = verificationType, VerificationDocumentSid = verificationDocumentSid, Extension = extension, CallDelay = callDelay};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadHostedNumberOrderOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/HostedNumbers/HostedNumberOrders",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of HostedNumberOrders belonging to the account initiating the request.
-        /// </summary>
-        /// <param name="options"> Read HostedNumberOrder parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of HostedNumberOrder </returns>
-        public static ResourceSet<HostedNumberOrderResource> Read(ReadHostedNumberOrderOptions options,
-                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<HostedNumberOrderResource>.FromJson("items", response.Content);
-            return new ResourceSet<HostedNumberOrderResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of HostedNumberOrders belonging to the account initiating the request.
-        /// </summary>
-        /// <param name="options"> Read HostedNumberOrder parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<HostedNumberOrderResource>> ReadAsync(ReadHostedNumberOrderOptions options,
-                                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<HostedNumberOrderResource>.FromJson("items", response.Content);
-            return new ResourceSet<HostedNumberOrderResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of HostedNumberOrders belonging to the account initiating the request.
-        /// </summary>
-        /// <param name="status"> The Status of this HostedNumberOrder. </param>
-        /// <param name="phoneNumber"> An E164 formatted phone number. </param>
-        /// <param name="incomingPhoneNumberSid"> IncomingPhoneNumber sid. </param>
-        /// <param name="friendlyName"> A human readable description of this resource. </param>
-        /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of HostedNumberOrder </returns>
-        public static ResourceSet<HostedNumberOrderResource> Read(HostedNumberOrderResource.StatusEnum status = null,
-                                                                  Types.PhoneNumber phoneNumber = null,
-                                                                  string incomingPhoneNumberSid = null,
-                                                                  string friendlyName = null,
-                                                                  string uniqueName = null,
-                                                                  int? pageSize = null,
-                                                                  long? limit = null,
-                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadHostedNumberOrderOptions(){Status = status, PhoneNumber = phoneNumber, IncomingPhoneNumberSid = incomingPhoneNumberSid, FriendlyName = friendlyName, UniqueName = uniqueName, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of HostedNumberOrders belonging to the account initiating the request.
-        /// </summary>
-        /// <param name="status"> The Status of this HostedNumberOrder. </param>
-        /// <param name="phoneNumber"> An E164 formatted phone number. </param>
-        /// <param name="incomingPhoneNumberSid"> IncomingPhoneNumber sid. </param>
-        /// <param name="friendlyName"> A human readable description of this resource. </param>
-        /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<HostedNumberOrderResource>> ReadAsync(HostedNumberOrderResource.StatusEnum status = null,
-                                                                                                          Types.PhoneNumber phoneNumber = null,
-                                                                                                          string incomingPhoneNumberSid = null,
-                                                                                                          string friendlyName = null,
-                                                                                                          string uniqueName = null,
-                                                                                                          int? pageSize = null,
-                                                                                                          long? limit = null,
-                                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadHostedNumberOrderOptions(){Status = status, PhoneNumber = phoneNumber, IncomingPhoneNumberSid = incomingPhoneNumberSid, FriendlyName = friendlyName, UniqueName = uniqueName, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<HostedNumberOrderResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<HostedNumberOrderResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<HostedNumberOrderResource> NextPage(Page<HostedNumberOrderResource> page,
-                                                               ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<HostedNumberOrderResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<HostedNumberOrderResource> PreviousPage(Page<HostedNumberOrderResource> page,
-                                                                   ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<HostedNumberOrderResource>.FromJson("items", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateHostedNumberOrderOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/HostedNumbers/HostedNumberOrders",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Host a phone number's capability on Twilio's platform.
-        /// </summary>
-        /// <param name="options"> Create HostedNumberOrder parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of HostedNumberOrder </returns>
-        public static HostedNumberOrderResource Create(CreateHostedNumberOrderOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Host a phone number's capability on Twilio's platform.
-        /// </summary>
-        /// <param name="options"> Create HostedNumberOrder parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
-        public static async System.Threading.Tasks.Task<HostedNumberOrderResource> CreateAsync(CreateHostedNumberOrderOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Host a phone number's capability on Twilio's platform.
-        /// </summary>
-        /// <param name="phoneNumber"> An E164 formatted phone number. </param>
-        /// <param name="smsCapability"> Specify SMS capability to host. </param>
-        /// <param name="accountSid"> Account Sid. </param>
-        /// <param name="friendlyName"> A human readable description of this resource. </param>
-        /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
-        /// <param name="ccEmails"> A list of emails. </param>
-        /// <param name="smsUrl"> SMS URL. </param>
-        /// <param name="smsMethod"> SMS Method. </param>
-        /// <param name="smsFallbackUrl"> SMS Fallback URL. </param>
-        /// <param name="smsFallbackMethod"> SMS Fallback Method. </param>
-        /// <param name="statusCallbackUrl"> Status Callback URL. </param>
-        /// <param name="statusCallbackMethod"> Status Callback Method. </param>
-        /// <param name="smsApplicationSid"> SMS Application Sid. </param>
-        /// <param name="addressSid"> Address sid. </param>
-        /// <param name="email"> Email. </param>
-        /// <param name="verificationType"> Verification Type. </param>
-        /// <param name="verificationDocumentSid"> Verification Document Sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of HostedNumberOrder </returns>
-        public static HostedNumberOrderResource Create(Types.PhoneNumber phoneNumber,
-                                                       bool? smsCapability,
-                                                       string accountSid = null,
-                                                       string friendlyName = null,
-                                                       string uniqueName = null,
-                                                       List<string> ccEmails = null,
-                                                       Uri smsUrl = null,
-                                                       Twilio.Http.HttpMethod smsMethod = null,
-                                                       Uri smsFallbackUrl = null,
-                                                       Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                       Uri statusCallbackUrl = null,
-                                                       Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                       string smsApplicationSid = null,
-                                                       string addressSid = null,
-                                                       string email = null,
-                                                       HostedNumberOrderResource.VerificationTypeEnum verificationType = null,
-                                                       string verificationDocumentSid = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateHostedNumberOrderOptions(phoneNumber, smsCapability){AccountSid = accountSid, FriendlyName = friendlyName, UniqueName = uniqueName, CcEmails = ccEmails, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod, StatusCallbackUrl = statusCallbackUrl, StatusCallbackMethod = statusCallbackMethod, SmsApplicationSid = smsApplicationSid, AddressSid = addressSid, Email = email, VerificationType = verificationType, VerificationDocumentSid = verificationDocumentSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Host a phone number's capability on Twilio's platform.
-        /// </summary>
-        /// <param name="phoneNumber"> An E164 formatted phone number. </param>
-        /// <param name="smsCapability"> Specify SMS capability to host. </param>
-        /// <param name="accountSid"> Account Sid. </param>
-        /// <param name="friendlyName"> A human readable description of this resource. </param>
-        /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
-        /// <param name="ccEmails"> A list of emails. </param>
-        /// <param name="smsUrl"> SMS URL. </param>
-        /// <param name="smsMethod"> SMS Method. </param>
-        /// <param name="smsFallbackUrl"> SMS Fallback URL. </param>
-        /// <param name="smsFallbackMethod"> SMS Fallback Method. </param>
-        /// <param name="statusCallbackUrl"> Status Callback URL. </param>
-        /// <param name="statusCallbackMethod"> Status Callback Method. </param>
-        /// <param name="smsApplicationSid"> SMS Application Sid. </param>
-        /// <param name="addressSid"> Address sid. </param>
-        /// <param name="email"> Email. </param>
-        /// <param name="verificationType"> Verification Type. </param>
-        /// <param name="verificationDocumentSid"> Verification Document Sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
-        public static async System.Threading.Tasks.Task<HostedNumberOrderResource> CreateAsync(Types.PhoneNumber phoneNumber,
-                                                                                               bool? smsCapability,
-                                                                                               string accountSid = null,
-                                                                                               string friendlyName = null,
-                                                                                               string uniqueName = null,
-                                                                                               List<string> ccEmails = null,
-                                                                                               Uri smsUrl = null,
-                                                                                               Twilio.Http.HttpMethod smsMethod = null,
-                                                                                               Uri smsFallbackUrl = null,
-                                                                                               Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                                                               Uri statusCallbackUrl = null,
-                                                                                               Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                               string smsApplicationSid = null,
-                                                                                               string addressSid = null,
-                                                                                               string email = null,
-                                                                                               HostedNumberOrderResource.VerificationTypeEnum verificationType = null,
-                                                                                               string verificationDocumentSid = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateHostedNumberOrderOptions(phoneNumber, smsCapability){AccountSid = accountSid, FriendlyName = friendlyName, UniqueName = uniqueName, CcEmails = ccEmails, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod, StatusCallbackUrl = statusCallbackUrl, StatusCallbackMethod = statusCallbackMethod, SmsApplicationSid = smsApplicationSid, AddressSid = addressSid, Email = email, VerificationType = verificationType, VerificationDocumentSid = verificationDocumentSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a HostedNumberOrderResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> HostedNumberOrderResource object represented by the provided JSON </returns>
-        public static HostedNumberOrderResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<HostedNumberOrderResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// HostedNumberOrder sid.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Account Sid.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// IncomingPhoneNumber sid.
-        /// </summary>
-        [JsonProperty("incoming_phone_number_sid")]
-        public string IncomingPhoneNumberSid { get; private set; }
-        /// <summary>
-        /// Address sid.
-        /// </summary>
-        [JsonProperty("address_sid")]
-        public string AddressSid { get; private set; }
-        /// <summary>
-        /// LOA document sid.
-        /// </summary>
-        [JsonProperty("signing_document_sid")]
-        public string SigningDocumentSid { get; private set; }
-        /// <summary>
-        /// An E164 formatted phone number.
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// A mapping of phone number capabilities.
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-        /// <summary>
-        /// A human readable description of this resource.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A unique, developer assigned name of this HostedNumberOrder.
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The Status of this HostedNumberOrder.
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public HostedNumberOrderResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// Why a hosted_number_order reached status "action-required"
-        /// </summary>
-        [JsonProperty("failure_reason")]
-        public string FailureReason { get; private set; }
-        /// <summary>
-        /// The date this HostedNumberOrder was created.
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this HostedNumberOrder was updated.
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The number of attempts made to verify ownership of the phone number.
-        /// </summary>
-        [JsonProperty("verification_attempts")]
-        public int? VerificationAttempts { get; private set; }
-        /// <summary>
-        /// Email.
-        /// </summary>
-        [JsonProperty("email")]
-        public string Email { get; private set; }
-        /// <summary>
-        /// A list of emails.
-        /// </summary>
-        [JsonProperty("cc_emails")]
-        public List<string> CcEmails { get; private set; }
-        /// <summary>
-        /// The URL of this HostedNumberOrder.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The method used for verifying ownership of the number to be hosted.
-        /// </summary>
-        [JsonProperty("verification_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public HostedNumberOrderResource.VerificationTypeEnum VerificationType { get; private set; }
-        /// <summary>
-        /// Verification Document Sid.
-        /// </summary>
-        [JsonProperty("verification_document_sid")]
-        public string VerificationDocumentSid { get; private set; }
-        /// <summary>
-        /// Phone extension to use for ownership verification call.
-        /// </summary>
-        [JsonProperty("extension")]
-        public string Extension { get; private set; }
-        /// <summary>
-        /// Seconds (0-30) to delay ownership verification call by.
-        /// </summary>
-        [JsonProperty("call_delay")]
-        public int? CallDelay { get; private set; }
-        /// <summary>
-        /// The digits passed during the ownership verification call.
-        /// </summary>
-        [JsonProperty("verification_code")]
-        public string VerificationCode { get; private set; }
-        /// <summary>
-        /// List of IDs for ownership verification calls.
-        /// </summary>
-        [JsonProperty("verification_call_sids")]
-        public List<string> VerificationCallSids { get; private set; }
-
-        private HostedNumberOrderResource()
-        {
-
-        }
-    }
+{
+
+  public class HostedNumberOrderResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Received = new StatusEnum("received");
+      public static readonly StatusEnum PendingVerification = new StatusEnum("pending-verification");
+      public static readonly StatusEnum Verified = new StatusEnum("verified");
+      public static readonly StatusEnum PendingLoa = new StatusEnum("pending-loa");
+      public static readonly StatusEnum CarrierProcessing = new StatusEnum("carrier-processing");
+      public static readonly StatusEnum Testing = new StatusEnum("testing");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+      public static readonly StatusEnum ActionRequired = new StatusEnum("action-required");
+    }
+
+    public sealed class VerificationTypeEnum : StringEnum
+    {
+      private VerificationTypeEnum(string value) : base(value) { }
+      public VerificationTypeEnum() { }
+      public static implicit operator VerificationTypeEnum(string value)
+      {
+        return new VerificationTypeEnum(value);
+      }
+
+      public static readonly VerificationTypeEnum PhoneCall = new VerificationTypeEnum("phone-call");
+      public static readonly VerificationTypeEnum PhoneBill = new VerificationTypeEnum("phone-bill");
+    }
+
+    private static Request BuildFetchRequest(FetchHostedNumberOrderOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/HostedNumbers/HostedNumberOrders/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific HostedNumberOrder.
+    /// </summary>
+    /// <param name="options"> Fetch HostedNumberOrder parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of HostedNumberOrder </returns>
+    public static HostedNumberOrderResource Fetch(FetchHostedNumberOrderOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific HostedNumberOrder.
+    /// </summary>
+    /// <param name="options"> Fetch HostedNumberOrder parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
+    public static async System.Threading.Tasks.Task<HostedNumberOrderResource> FetchAsync(FetchHostedNumberOrderOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific HostedNumberOrder.
+    /// </summary>
+    /// <param name="pathSid"> HostedNumberOrder sid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of HostedNumberOrder </returns>
+    public static HostedNumberOrderResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchHostedNumberOrderOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific HostedNumberOrder.
+    /// </summary>
+    /// <param name="pathSid"> HostedNumberOrder sid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
+    public static async System.Threading.Tasks.Task<HostedNumberOrderResource> FetchAsync(string pathSid,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchHostedNumberOrderOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteHostedNumberOrderOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/HostedNumbers/HostedNumberOrders/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Cancel the HostedNumberOrder (only available when the status is in `received`).
+    /// </summary>
+    /// <param name="options"> Delete HostedNumberOrder parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of HostedNumberOrder </returns>
+    public static bool Delete(DeleteHostedNumberOrderOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Cancel the HostedNumberOrder (only available when the status is in `received`).
+    /// </summary>
+    /// <param name="options"> Delete HostedNumberOrder parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteHostedNumberOrderOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Cancel the HostedNumberOrder (only available when the status is in `received`).
+    /// </summary>
+    /// <param name="pathSid"> HostedNumberOrder sid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of HostedNumberOrder </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteHostedNumberOrderOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Cancel the HostedNumberOrder (only available when the status is in `received`).
+    /// </summary>
+    /// <param name="pathSid"> HostedNumberOrder sid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteHostedNumberOrderOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateHostedNumberOrderOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/HostedNumbers/HostedNumberOrders/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates a specific HostedNumberOrder.
+    /// </summary>
+    /// <param name="options"> Update HostedNumberOrder parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of HostedNumberOrder </returns>
+    public static HostedNumberOrderResource Update(UpdateHostedNumberOrderOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a specific HostedNumberOrder.
+    /// </summary>
+    /// <param name="options"> Update HostedNumberOrder parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
+    public static async System.Threading.Tasks.Task<HostedNumberOrderResource> UpdateAsync(UpdateHostedNumberOrderOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates a specific HostedNumberOrder.
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> A human readable description of this resource. </param>
+    /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
+    /// <param name="email"> Email. </param>
+    /// <param name="ccEmails"> A list of emails. </param>
+    /// <param name="status"> The Status of this HostedNumberOrder. </param>
+    /// <param name="verificationCode"> A verification code. </param>
+    /// <param name="verificationType"> Verification Type. </param>
+    /// <param name="verificationDocumentSid"> Verification Document Sid </param>
+    /// <param name="extension"> Digits to dial after connecting the verification call. </param>
+    /// <param name="callDelay"> The number of seconds, between 0 and 60, to delay before initiating the verification call.
+    ///                 </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of HostedNumberOrder </returns>
+    public static HostedNumberOrderResource Update(string pathSid,
+                                                   string friendlyName = null,
+                                                   string uniqueName = null,
+                                                   string email = null,
+                                                   List<string> ccEmails = null,
+                                                   HostedNumberOrderResource.StatusEnum status = null,
+                                                   string verificationCode = null,
+                                                   HostedNumberOrderResource.VerificationTypeEnum verificationType = null,
+                                                   string verificationDocumentSid = null,
+                                                   string extension = null,
+                                                   int? callDelay = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateHostedNumberOrderOptions(pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Email = email, CcEmails = ccEmails, Status = status, VerificationCode = verificationCode, VerificationType = verificationType, VerificationDocumentSid = verificationDocumentSid, Extension = extension, CallDelay = callDelay };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a specific HostedNumberOrder.
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> A human readable description of this resource. </param>
+    /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
+    /// <param name="email"> Email. </param>
+    /// <param name="ccEmails"> A list of emails. </param>
+    /// <param name="status"> The Status of this HostedNumberOrder. </param>
+    /// <param name="verificationCode"> A verification code. </param>
+    /// <param name="verificationType"> Verification Type. </param>
+    /// <param name="verificationDocumentSid"> Verification Document Sid </param>
+    /// <param name="extension"> Digits to dial after connecting the verification call. </param>
+    /// <param name="callDelay"> The number of seconds, between 0 and 60, to delay before initiating the verification call.
+    ///                 </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
+    public static async System.Threading.Tasks.Task<HostedNumberOrderResource> UpdateAsync(string pathSid,
+                                                                                           string friendlyName = null,
+                                                                                           string uniqueName = null,
+                                                                                           string email = null,
+                                                                                           List<string> ccEmails = null,
+                                                                                           HostedNumberOrderResource.StatusEnum status = null,
+                                                                                           string verificationCode = null,
+                                                                                           HostedNumberOrderResource.VerificationTypeEnum verificationType = null,
+                                                                                           string verificationDocumentSid = null,
+                                                                                           string extension = null,
+                                                                                           int? callDelay = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateHostedNumberOrderOptions(pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Email = email, CcEmails = ccEmails, Status = status, VerificationCode = verificationCode, VerificationType = verificationType, VerificationDocumentSid = verificationDocumentSid, Extension = extension, CallDelay = callDelay };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadHostedNumberOrderOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/HostedNumbers/HostedNumberOrders",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of HostedNumberOrders belonging to the account initiating the request.
+    /// </summary>
+    /// <param name="options"> Read HostedNumberOrder parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of HostedNumberOrder </returns>
+    public static ResourceSet<HostedNumberOrderResource> Read(ReadHostedNumberOrderOptions options,
+                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<HostedNumberOrderResource>.FromJson("items", response.Content);
+      return new ResourceSet<HostedNumberOrderResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of HostedNumberOrders belonging to the account initiating the request.
+    /// </summary>
+    /// <param name="options"> Read HostedNumberOrder parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<HostedNumberOrderResource>> ReadAsync(ReadHostedNumberOrderOptions options,
+                                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<HostedNumberOrderResource>.FromJson("items", response.Content);
+      return new ResourceSet<HostedNumberOrderResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of HostedNumberOrders belonging to the account initiating the request.
+    /// </summary>
+    /// <param name="status"> The Status of this HostedNumberOrder. </param>
+    /// <param name="phoneNumber"> An E164 formatted phone number. </param>
+    /// <param name="incomingPhoneNumberSid"> IncomingPhoneNumber sid. </param>
+    /// <param name="friendlyName"> A human readable description of this resource. </param>
+    /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of HostedNumberOrder </returns>
+    public static ResourceSet<HostedNumberOrderResource> Read(HostedNumberOrderResource.StatusEnum status = null,
+                                                              Types.PhoneNumber phoneNumber = null,
+                                                              string incomingPhoneNumberSid = null,
+                                                              string friendlyName = null,
+                                                              string uniqueName = null,
+                                                              int? pageSize = null,
+                                                              long? limit = null,
+                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadHostedNumberOrderOptions() { Status = status, PhoneNumber = phoneNumber, IncomingPhoneNumberSid = incomingPhoneNumberSid, FriendlyName = friendlyName, UniqueName = uniqueName, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of HostedNumberOrders belonging to the account initiating the request.
+    /// </summary>
+    /// <param name="status"> The Status of this HostedNumberOrder. </param>
+    /// <param name="phoneNumber"> An E164 formatted phone number. </param>
+    /// <param name="incomingPhoneNumberSid"> IncomingPhoneNumber sid. </param>
+    /// <param name="friendlyName"> A human readable description of this resource. </param>
+    /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<HostedNumberOrderResource>> ReadAsync(HostedNumberOrderResource.StatusEnum status = null,
+                                                                                                      Types.PhoneNumber phoneNumber = null,
+                                                                                                      string incomingPhoneNumberSid = null,
+                                                                                                      string friendlyName = null,
+                                                                                                      string uniqueName = null,
+                                                                                                      int? pageSize = null,
+                                                                                                      long? limit = null,
+                                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadHostedNumberOrderOptions() { Status = status, PhoneNumber = phoneNumber, IncomingPhoneNumberSid = incomingPhoneNumberSid, FriendlyName = friendlyName, UniqueName = uniqueName, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<HostedNumberOrderResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<HostedNumberOrderResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<HostedNumberOrderResource> NextPage(Page<HostedNumberOrderResource> page,
+                                                           ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<HostedNumberOrderResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<HostedNumberOrderResource> PreviousPage(Page<HostedNumberOrderResource> page,
+                                                               ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<HostedNumberOrderResource>.FromJson("items", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateHostedNumberOrderOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/HostedNumbers/HostedNumberOrders",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Host a phone number's capability on Twilio's platform.
+    /// </summary>
+    /// <param name="options"> Create HostedNumberOrder parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of HostedNumberOrder </returns>
+    public static HostedNumberOrderResource Create(CreateHostedNumberOrderOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Host a phone number's capability on Twilio's platform.
+    /// </summary>
+    /// <param name="options"> Create HostedNumberOrder parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
+    public static async System.Threading.Tasks.Task<HostedNumberOrderResource> CreateAsync(CreateHostedNumberOrderOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Host a phone number's capability on Twilio's platform.
+    /// </summary>
+    /// <param name="phoneNumber"> An E164 formatted phone number. </param>
+    /// <param name="smsCapability"> Specify SMS capability to host. </param>
+    /// <param name="accountSid"> Account Sid. </param>
+    /// <param name="friendlyName"> A human readable description of this resource. </param>
+    /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
+    /// <param name="ccEmails"> A list of emails. </param>
+    /// <param name="smsUrl"> SMS URL. </param>
+    /// <param name="smsMethod"> SMS Method. </param>
+    /// <param name="smsFallbackUrl"> SMS Fallback URL. </param>
+    /// <param name="smsFallbackMethod"> SMS Fallback Method. </param>
+    /// <param name="statusCallbackUrl"> Status Callback URL. </param>
+    /// <param name="statusCallbackMethod"> Status Callback Method. </param>
+    /// <param name="smsApplicationSid"> SMS Application Sid. </param>
+    /// <param name="addressSid"> Address sid. </param>
+    /// <param name="email"> Email. </param>
+    /// <param name="verificationType"> Verification Type. </param>
+    /// <param name="verificationDocumentSid"> Verification Document Sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of HostedNumberOrder </returns>
+    public static HostedNumberOrderResource Create(Types.PhoneNumber phoneNumber,
+                                                   bool? smsCapability,
+                                                   string accountSid = null,
+                                                   string friendlyName = null,
+                                                   string uniqueName = null,
+                                                   List<string> ccEmails = null,
+                                                   Uri smsUrl = null,
+                                                   Twilio.Http.HttpMethod smsMethod = null,
+                                                   Uri smsFallbackUrl = null,
+                                                   Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                   Uri statusCallbackUrl = null,
+                                                   Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                   string smsApplicationSid = null,
+                                                   string addressSid = null,
+                                                   string email = null,
+                                                   HostedNumberOrderResource.VerificationTypeEnum verificationType = null,
+                                                   string verificationDocumentSid = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateHostedNumberOrderOptions(phoneNumber, smsCapability) { AccountSid = accountSid, FriendlyName = friendlyName, UniqueName = uniqueName, CcEmails = ccEmails, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod, StatusCallbackUrl = statusCallbackUrl, StatusCallbackMethod = statusCallbackMethod, SmsApplicationSid = smsApplicationSid, AddressSid = addressSid, Email = email, VerificationType = verificationType, VerificationDocumentSid = verificationDocumentSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Host a phone number's capability on Twilio's platform.
+    /// </summary>
+    /// <param name="phoneNumber"> An E164 formatted phone number. </param>
+    /// <param name="smsCapability"> Specify SMS capability to host. </param>
+    /// <param name="accountSid"> Account Sid. </param>
+    /// <param name="friendlyName"> A human readable description of this resource. </param>
+    /// <param name="uniqueName"> A unique, developer assigned name of this HostedNumberOrder. </param>
+    /// <param name="ccEmails"> A list of emails. </param>
+    /// <param name="smsUrl"> SMS URL. </param>
+    /// <param name="smsMethod"> SMS Method. </param>
+    /// <param name="smsFallbackUrl"> SMS Fallback URL. </param>
+    /// <param name="smsFallbackMethod"> SMS Fallback Method. </param>
+    /// <param name="statusCallbackUrl"> Status Callback URL. </param>
+    /// <param name="statusCallbackMethod"> Status Callback Method. </param>
+    /// <param name="smsApplicationSid"> SMS Application Sid. </param>
+    /// <param name="addressSid"> Address sid. </param>
+    /// <param name="email"> Email. </param>
+    /// <param name="verificationType"> Verification Type. </param>
+    /// <param name="verificationDocumentSid"> Verification Document Sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of HostedNumberOrder </returns>
+    public static async System.Threading.Tasks.Task<HostedNumberOrderResource> CreateAsync(Types.PhoneNumber phoneNumber,
+                                                                                           bool? smsCapability,
+                                                                                           string accountSid = null,
+                                                                                           string friendlyName = null,
+                                                                                           string uniqueName = null,
+                                                                                           List<string> ccEmails = null,
+                                                                                           Uri smsUrl = null,
+                                                                                           Twilio.Http.HttpMethod smsMethod = null,
+                                                                                           Uri smsFallbackUrl = null,
+                                                                                           Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                                                           Uri statusCallbackUrl = null,
+                                                                                           Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                           string smsApplicationSid = null,
+                                                                                           string addressSid = null,
+                                                                                           string email = null,
+                                                                                           HostedNumberOrderResource.VerificationTypeEnum verificationType = null,
+                                                                                           string verificationDocumentSid = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateHostedNumberOrderOptions(phoneNumber, smsCapability) { AccountSid = accountSid, FriendlyName = friendlyName, UniqueName = uniqueName, CcEmails = ccEmails, SmsUrl = smsUrl, SmsMethod = smsMethod, SmsFallbackUrl = smsFallbackUrl, SmsFallbackMethod = smsFallbackMethod, StatusCallbackUrl = statusCallbackUrl, StatusCallbackMethod = statusCallbackMethod, SmsApplicationSid = smsApplicationSid, AddressSid = addressSid, Email = email, VerificationType = verificationType, VerificationDocumentSid = verificationDocumentSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a HostedNumberOrderResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> HostedNumberOrderResource object represented by the provided JSON </returns>
+    public static HostedNumberOrderResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<HostedNumberOrderResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// HostedNumberOrder sid.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Account Sid.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// IncomingPhoneNumber sid.
+    /// </summary>
+    [JsonProperty("incoming_phone_number_sid")]
+    public string IncomingPhoneNumberSid { get; private set; }
+    /// <summary>
+    /// Address sid.
+    /// </summary>
+    [JsonProperty("address_sid")]
+    public string AddressSid { get; private set; }
+    /// <summary>
+    /// LOA document sid.
+    /// </summary>
+    [JsonProperty("signing_document_sid")]
+    public string SigningDocumentSid { get; private set; }
+    /// <summary>
+    /// An E164 formatted phone number.
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// A mapping of phone number capabilities.
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+    /// <summary>
+    /// A human readable description of this resource.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A unique, developer assigned name of this HostedNumberOrder.
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The Status of this HostedNumberOrder.
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public HostedNumberOrderResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// Why a hosted_number_order reached status "action-required"
+    /// </summary>
+    [JsonProperty("failure_reason")]
+    public string FailureReason { get; private set; }
+    /// <summary>
+    /// The date this HostedNumberOrder was created.
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this HostedNumberOrder was updated.
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The number of attempts made to verify ownership of the phone number.
+    /// </summary>
+    [JsonProperty("verification_attempts")]
+    public int? VerificationAttempts { get; private set; }
+    /// <summary>
+    /// Email.
+    /// </summary>
+    [JsonProperty("email")]
+    public string Email { get; private set; }
+    /// <summary>
+    /// A list of emails.
+    /// </summary>
+    [JsonProperty("cc_emails")]
+    public List<string> CcEmails { get; private set; }
+    /// <summary>
+    /// The URL of this HostedNumberOrder.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The method used for verifying ownership of the number to be hosted.
+    /// </summary>
+    [JsonProperty("verification_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public HostedNumberOrderResource.VerificationTypeEnum VerificationType { get; private set; }
+    /// <summary>
+    /// Verification Document Sid.
+    /// </summary>
+    [JsonProperty("verification_document_sid")]
+    public string VerificationDocumentSid { get; private set; }
+    /// <summary>
+    /// Phone extension to use for ownership verification call.
+    /// </summary>
+    [JsonProperty("extension")]
+    public string Extension { get; private set; }
+    /// <summary>
+    /// Seconds (0-30) to delay ownership verification call by.
+    /// </summary>
+    [JsonProperty("call_delay")]
+    public int? CallDelay { get; private set; }
+    /// <summary>
+    /// The digits passed during the ownership verification call.
+    /// </summary>
+    [JsonProperty("verification_code")]
+    public string VerificationCode { get; private set; }
+    /// <summary>
+    /// List of IDs for ownership verification calls.
+    /// </summary>
+    [JsonProperty("verification_call_sids")]
+    public List<string> VerificationCallSids { get; private set; }
+
+    private HostedNumberOrderResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Marketplace/AvailableAddOn/AvailableAddOnExtensionOptions.cs b/src/Twilio/Rest/Preview/Marketplace/AvailableAddOn/AvailableAddOnExtensionOptions.cs
index 73ca002d8..a2d86f578 100644
--- a/src/Twilio/Rest/Preview/Marketplace/AvailableAddOn/AvailableAddOnExtensionOptions.cs
+++ b/src/Twilio/Rest/Preview/Marketplace/AvailableAddOn/AvailableAddOnExtensionOptions.cs
@@ -9,81 +9,81 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Marketplace.AvailableAddOn
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch an instance of an Extension for the Available Add-on.
+  /// </summary>
+  public class FetchAvailableAddOnExtensionOptions : IOptions<AvailableAddOnExtensionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch an instance of an Extension for the Available Add-on.
+    /// The SID of the AvailableAddOn resource with the extension to fetch
     /// </summary>
-    public class FetchAvailableAddOnExtensionOptions : IOptions<AvailableAddOnExtensionResource>
-    {
-        /// <summary>
-        /// The SID of the AvailableAddOn resource with the extension to fetch
-        /// </summary>
-        public string PathAvailableAddOnSid { get; }
-        /// <summary>
-        /// The SID of the AvailableAddOn Extension resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAvailableAddOnExtensionOptions
-        /// </summary>
-        /// <param name="pathAvailableAddOnSid"> The SID of the AvailableAddOn resource with the extension to fetch </param>
-        /// <param name="pathSid"> The SID of the AvailableAddOn Extension resource to fetch </param>
-        public FetchAvailableAddOnExtensionOptions(string pathAvailableAddOnSid, string pathSid)
-        {
-            PathAvailableAddOnSid = pathAvailableAddOnSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAvailableAddOnSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of Extensions for the Available Add-on.
+    /// The SID of the AvailableAddOn Extension resource to fetch
     /// </summary>
-    public class ReadAvailableAddOnExtensionOptions : ReadOptions<AvailableAddOnExtensionResource>
-    {
-        /// <summary>
-        /// The SID of the AvailableAddOn resource with the extensions to read
-        /// </summary>
-        public string PathAvailableAddOnSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadAvailableAddOnExtensionOptions
-        /// </summary>
-        /// <param name="pathAvailableAddOnSid"> The SID of the AvailableAddOn resource with the extensions to read </param>
-        public ReadAvailableAddOnExtensionOptions(string pathAvailableAddOnSid)
-        {
-            PathAvailableAddOnSid = pathAvailableAddOnSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchAvailableAddOnExtensionOptions
+    /// </summary>
+    /// <param name="pathAvailableAddOnSid"> The SID of the AvailableAddOn resource with the extension to fetch </param>
+    /// <param name="pathSid"> The SID of the AvailableAddOn Extension resource to fetch </param>
+    public FetchAvailableAddOnExtensionOptions(string pathAvailableAddOnSid, string pathSid)
+    {
+      PathAvailableAddOnSid = pathAvailableAddOnSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of Extensions for the Available Add-on.
+  /// </summary>
+  public class ReadAvailableAddOnExtensionOptions : ReadOptions<AvailableAddOnExtensionResource>
+  {
+    /// <summary>
+    /// The SID of the AvailableAddOn resource with the extensions to read
+    /// </summary>
+    public string PathAvailableAddOnSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadAvailableAddOnExtensionOptions
+    /// </summary>
+    /// <param name="pathAvailableAddOnSid"> The SID of the AvailableAddOn resource with the extensions to read </param>
+    public ReadAvailableAddOnExtensionOptions(string pathAvailableAddOnSid)
+    {
+      PathAvailableAddOnSid = pathAvailableAddOnSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Marketplace/AvailableAddOn/AvailableAddOnExtensionResource.cs b/src/Twilio/Rest/Preview/Marketplace/AvailableAddOn/AvailableAddOnExtensionResource.cs
index 42dbbaebb..bd74f7473 100644
--- a/src/Twilio/Rest/Preview/Marketplace/AvailableAddOn/AvailableAddOnExtensionResource.cs
+++ b/src/Twilio/Rest/Preview/Marketplace/AvailableAddOn/AvailableAddOnExtensionResource.cs
@@ -19,272 +19,272 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Marketplace.AvailableAddOn
-{
-
-    public class AvailableAddOnExtensionResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchAvailableAddOnExtensionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/marketplace/AvailableAddOns/" + options.PathAvailableAddOnSid + "/Extensions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of an Extension for the Available Add-on.
-        /// </summary>
-        /// <param name="options"> Fetch AvailableAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AvailableAddOnExtension </returns>
-        public static AvailableAddOnExtensionResource Fetch(FetchAvailableAddOnExtensionOptions options,
-                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an Extension for the Available Add-on.
-        /// </summary>
-        /// <param name="options"> Fetch AvailableAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AvailableAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<AvailableAddOnExtensionResource> FetchAsync(FetchAvailableAddOnExtensionOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of an Extension for the Available Add-on.
-        /// </summary>
-        /// <param name="pathAvailableAddOnSid"> The SID of the AvailableAddOn resource with the extension to fetch </param>
-        /// <param name="pathSid"> The SID of the AvailableAddOn Extension resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AvailableAddOnExtension </returns>
-        public static AvailableAddOnExtensionResource Fetch(string pathAvailableAddOnSid,
-                                                            string pathSid,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchAvailableAddOnExtensionOptions(pathAvailableAddOnSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an Extension for the Available Add-on.
-        /// </summary>
-        /// <param name="pathAvailableAddOnSid"> The SID of the AvailableAddOn resource with the extension to fetch </param>
-        /// <param name="pathSid"> The SID of the AvailableAddOn Extension resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AvailableAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<AvailableAddOnExtensionResource> FetchAsync(string pathAvailableAddOnSid,
-                                                                                                    string pathSid,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchAvailableAddOnExtensionOptions(pathAvailableAddOnSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAvailableAddOnExtensionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/marketplace/AvailableAddOns/" + options.PathAvailableAddOnSid + "/Extensions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Extensions for the Available Add-on.
-        /// </summary>
-        /// <param name="options"> Read AvailableAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AvailableAddOnExtension </returns>
-        public static ResourceSet<AvailableAddOnExtensionResource> Read(ReadAvailableAddOnExtensionOptions options,
-                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AvailableAddOnExtensionResource>.FromJson("extensions", response.Content);
-            return new ResourceSet<AvailableAddOnExtensionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Extensions for the Available Add-on.
-        /// </summary>
-        /// <param name="options"> Read AvailableAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AvailableAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AvailableAddOnExtensionResource>> ReadAsync(ReadAvailableAddOnExtensionOptions options,
-                                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AvailableAddOnExtensionResource>.FromJson("extensions", response.Content);
-            return new ResourceSet<AvailableAddOnExtensionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Extensions for the Available Add-on.
-        /// </summary>
-        /// <param name="pathAvailableAddOnSid"> The SID of the AvailableAddOn resource with the extensions to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AvailableAddOnExtension </returns>
-        public static ResourceSet<AvailableAddOnExtensionResource> Read(string pathAvailableAddOnSid,
-                                                                        int? pageSize = null,
-                                                                        long? limit = null,
-                                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadAvailableAddOnExtensionOptions(pathAvailableAddOnSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Extensions for the Available Add-on.
-        /// </summary>
-        /// <param name="pathAvailableAddOnSid"> The SID of the AvailableAddOn resource with the extensions to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AvailableAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AvailableAddOnExtensionResource>> ReadAsync(string pathAvailableAddOnSid,
-                                                                                                                int? pageSize = null,
-                                                                                                                long? limit = null,
-                                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadAvailableAddOnExtensionOptions(pathAvailableAddOnSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AvailableAddOnExtensionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AvailableAddOnExtensionResource>.FromJson("extensions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AvailableAddOnExtensionResource> NextPage(Page<AvailableAddOnExtensionResource> page,
-                                                                     ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<AvailableAddOnExtensionResource>.FromJson("extensions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AvailableAddOnExtensionResource> PreviousPage(Page<AvailableAddOnExtensionResource> page,
-                                                                         ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<AvailableAddOnExtensionResource>.FromJson("extensions", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a AvailableAddOnExtensionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AvailableAddOnExtensionResource object represented by the provided JSON </returns>
-        public static AvailableAddOnExtensionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AvailableAddOnExtensionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the AvailableAddOn resource to which this extension applies
-        /// </summary>
-        [JsonProperty("available_add_on_sid")]
-        public string AvailableAddOnSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The name of the Extension's Product
-        /// </summary>
-        [JsonProperty("product_name")]
-        public string ProductName { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private AvailableAddOnExtensionResource()
-        {
-
-        }
-    }
+{
+
+  public class AvailableAddOnExtensionResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchAvailableAddOnExtensionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/marketplace/AvailableAddOns/" + options.PathAvailableAddOnSid + "/Extensions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of an Extension for the Available Add-on.
+    /// </summary>
+    /// <param name="options"> Fetch AvailableAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AvailableAddOnExtension </returns>
+    public static AvailableAddOnExtensionResource Fetch(FetchAvailableAddOnExtensionOptions options,
+                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an Extension for the Available Add-on.
+    /// </summary>
+    /// <param name="options"> Fetch AvailableAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AvailableAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<AvailableAddOnExtensionResource> FetchAsync(FetchAvailableAddOnExtensionOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of an Extension for the Available Add-on.
+    /// </summary>
+    /// <param name="pathAvailableAddOnSid"> The SID of the AvailableAddOn resource with the extension to fetch </param>
+    /// <param name="pathSid"> The SID of the AvailableAddOn Extension resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AvailableAddOnExtension </returns>
+    public static AvailableAddOnExtensionResource Fetch(string pathAvailableAddOnSid,
+                                                        string pathSid,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchAvailableAddOnExtensionOptions(pathAvailableAddOnSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an Extension for the Available Add-on.
+    /// </summary>
+    /// <param name="pathAvailableAddOnSid"> The SID of the AvailableAddOn resource with the extension to fetch </param>
+    /// <param name="pathSid"> The SID of the AvailableAddOn Extension resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AvailableAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<AvailableAddOnExtensionResource> FetchAsync(string pathAvailableAddOnSid,
+                                                                                                string pathSid,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchAvailableAddOnExtensionOptions(pathAvailableAddOnSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAvailableAddOnExtensionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/marketplace/AvailableAddOns/" + options.PathAvailableAddOnSid + "/Extensions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Extensions for the Available Add-on.
+    /// </summary>
+    /// <param name="options"> Read AvailableAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AvailableAddOnExtension </returns>
+    public static ResourceSet<AvailableAddOnExtensionResource> Read(ReadAvailableAddOnExtensionOptions options,
+                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AvailableAddOnExtensionResource>.FromJson("extensions", response.Content);
+      return new ResourceSet<AvailableAddOnExtensionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Extensions for the Available Add-on.
+    /// </summary>
+    /// <param name="options"> Read AvailableAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AvailableAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AvailableAddOnExtensionResource>> ReadAsync(ReadAvailableAddOnExtensionOptions options,
+                                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AvailableAddOnExtensionResource>.FromJson("extensions", response.Content);
+      return new ResourceSet<AvailableAddOnExtensionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Extensions for the Available Add-on.
+    /// </summary>
+    /// <param name="pathAvailableAddOnSid"> The SID of the AvailableAddOn resource with the extensions to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AvailableAddOnExtension </returns>
+    public static ResourceSet<AvailableAddOnExtensionResource> Read(string pathAvailableAddOnSid,
+                                                                    int? pageSize = null,
+                                                                    long? limit = null,
+                                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadAvailableAddOnExtensionOptions(pathAvailableAddOnSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Extensions for the Available Add-on.
+    /// </summary>
+    /// <param name="pathAvailableAddOnSid"> The SID of the AvailableAddOn resource with the extensions to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AvailableAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AvailableAddOnExtensionResource>> ReadAsync(string pathAvailableAddOnSid,
+                                                                                                            int? pageSize = null,
+                                                                                                            long? limit = null,
+                                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadAvailableAddOnExtensionOptions(pathAvailableAddOnSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AvailableAddOnExtensionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AvailableAddOnExtensionResource>.FromJson("extensions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AvailableAddOnExtensionResource> NextPage(Page<AvailableAddOnExtensionResource> page,
+                                                                 ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<AvailableAddOnExtensionResource>.FromJson("extensions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AvailableAddOnExtensionResource> PreviousPage(Page<AvailableAddOnExtensionResource> page,
+                                                                     ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<AvailableAddOnExtensionResource>.FromJson("extensions", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a AvailableAddOnExtensionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AvailableAddOnExtensionResource object represented by the provided JSON </returns>
+    public static AvailableAddOnExtensionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AvailableAddOnExtensionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the AvailableAddOn resource to which this extension applies
+    /// </summary>
+    [JsonProperty("available_add_on_sid")]
+    public string AvailableAddOnSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The name of the Extension's Product
+    /// </summary>
+    [JsonProperty("product_name")]
+    public string ProductName { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private AvailableAddOnExtensionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Marketplace/AvailableAddOnOptions.cs b/src/Twilio/Rest/Preview/Marketplace/AvailableAddOnOptions.cs
index 752cfd63b..148499d9c 100644
--- a/src/Twilio/Rest/Preview/Marketplace/AvailableAddOnOptions.cs
+++ b/src/Twilio/Rest/Preview/Marketplace/AvailableAddOnOptions.cs
@@ -9,61 +9,61 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Marketplace
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch an instance of an Add-on currently available to be installed.
+  /// </summary>
+  public class FetchAvailableAddOnOptions : IOptions<AvailableAddOnResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch an instance of an Add-on currently available to be installed.
+    /// The SID of the AvailableAddOn resource to fetch
     /// </summary>
-    public class FetchAvailableAddOnOptions : IOptions<AvailableAddOnResource>
-    {
-        /// <summary>
-        /// The SID of the AvailableAddOn resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAvailableAddOnOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the AvailableAddOn resource to fetch </param>
-        public FetchAvailableAddOnOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of Add-ons currently available to be installed.
+    /// Construct a new FetchAvailableAddOnOptions
     /// </summary>
-    public class ReadAvailableAddOnOptions : ReadOptions<AvailableAddOnResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathSid"> The SID of the AvailableAddOn resource to fetch </param>
+    public FetchAvailableAddOnOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of Add-ons currently available to be installed.
+  /// </summary>
+  public class ReadAvailableAddOnOptions : ReadOptions<AvailableAddOnResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Marketplace/AvailableAddOnResource.cs b/src/Twilio/Rest/Preview/Marketplace/AvailableAddOnResource.cs
index 8f343efc7..b79b05e6f 100644
--- a/src/Twilio/Rest/Preview/Marketplace/AvailableAddOnResource.cs
+++ b/src/Twilio/Rest/Preview/Marketplace/AvailableAddOnResource.cs
@@ -19,265 +19,265 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Marketplace
-{
-
-    public class AvailableAddOnResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchAvailableAddOnOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/marketplace/AvailableAddOns/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of an Add-on currently available to be installed.
-        /// </summary>
-        /// <param name="options"> Fetch AvailableAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AvailableAddOn </returns>
-        public static AvailableAddOnResource Fetch(FetchAvailableAddOnOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an Add-on currently available to be installed.
-        /// </summary>
-        /// <param name="options"> Fetch AvailableAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AvailableAddOn </returns>
-        public static async System.Threading.Tasks.Task<AvailableAddOnResource> FetchAsync(FetchAvailableAddOnOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of an Add-on currently available to be installed.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the AvailableAddOn resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AvailableAddOn </returns>
-        public static AvailableAddOnResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchAvailableAddOnOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an Add-on currently available to be installed.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the AvailableAddOn resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AvailableAddOn </returns>
-        public static async System.Threading.Tasks.Task<AvailableAddOnResource> FetchAsync(string pathSid,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchAvailableAddOnOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAvailableAddOnOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/marketplace/AvailableAddOns",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Add-ons currently available to be installed.
-        /// </summary>
-        /// <param name="options"> Read AvailableAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AvailableAddOn </returns>
-        public static ResourceSet<AvailableAddOnResource> Read(ReadAvailableAddOnOptions options,
-                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AvailableAddOnResource>.FromJson("available_add_ons", response.Content);
-            return new ResourceSet<AvailableAddOnResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Add-ons currently available to be installed.
-        /// </summary>
-        /// <param name="options"> Read AvailableAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AvailableAddOn </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AvailableAddOnResource>> ReadAsync(ReadAvailableAddOnOptions options,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AvailableAddOnResource>.FromJson("available_add_ons", response.Content);
-            return new ResourceSet<AvailableAddOnResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Add-ons currently available to be installed.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AvailableAddOn </returns>
-        public static ResourceSet<AvailableAddOnResource> Read(int? pageSize = null,
-                                                               long? limit = null,
-                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadAvailableAddOnOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Add-ons currently available to be installed.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AvailableAddOn </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AvailableAddOnResource>> ReadAsync(int? pageSize = null,
-                                                                                                       long? limit = null,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadAvailableAddOnOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AvailableAddOnResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AvailableAddOnResource>.FromJson("available_add_ons", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AvailableAddOnResource> NextPage(Page<AvailableAddOnResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<AvailableAddOnResource>.FromJson("available_add_ons", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AvailableAddOnResource> PreviousPage(Page<AvailableAddOnResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<AvailableAddOnResource>.FromJson("available_add_ons", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a AvailableAddOnResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AvailableAddOnResource object represented by the provided JSON </returns>
-        public static AvailableAddOnResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AvailableAddOnResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A short description of the Add-on's functionality
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// How customers are charged for using this Add-on
-        /// </summary>
-        [JsonProperty("pricing_type")]
-        public string PricingType { get; private set; }
-        /// <summary>
-        /// The JSON object with the configuration that must be provided when installing a given Add-on
-        /// </summary>
-        [JsonProperty("configuration_schema")]
-        public object ConfigurationSchema { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private AvailableAddOnResource()
-        {
-
-        }
-    }
+{
+
+  public class AvailableAddOnResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchAvailableAddOnOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/marketplace/AvailableAddOns/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of an Add-on currently available to be installed.
+    /// </summary>
+    /// <param name="options"> Fetch AvailableAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AvailableAddOn </returns>
+    public static AvailableAddOnResource Fetch(FetchAvailableAddOnOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an Add-on currently available to be installed.
+    /// </summary>
+    /// <param name="options"> Fetch AvailableAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AvailableAddOn </returns>
+    public static async System.Threading.Tasks.Task<AvailableAddOnResource> FetchAsync(FetchAvailableAddOnOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of an Add-on currently available to be installed.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the AvailableAddOn resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AvailableAddOn </returns>
+    public static AvailableAddOnResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchAvailableAddOnOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an Add-on currently available to be installed.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the AvailableAddOn resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AvailableAddOn </returns>
+    public static async System.Threading.Tasks.Task<AvailableAddOnResource> FetchAsync(string pathSid,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchAvailableAddOnOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAvailableAddOnOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/marketplace/AvailableAddOns",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Add-ons currently available to be installed.
+    /// </summary>
+    /// <param name="options"> Read AvailableAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AvailableAddOn </returns>
+    public static ResourceSet<AvailableAddOnResource> Read(ReadAvailableAddOnOptions options,
+                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AvailableAddOnResource>.FromJson("available_add_ons", response.Content);
+      return new ResourceSet<AvailableAddOnResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Add-ons currently available to be installed.
+    /// </summary>
+    /// <param name="options"> Read AvailableAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AvailableAddOn </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AvailableAddOnResource>> ReadAsync(ReadAvailableAddOnOptions options,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AvailableAddOnResource>.FromJson("available_add_ons", response.Content);
+      return new ResourceSet<AvailableAddOnResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Add-ons currently available to be installed.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AvailableAddOn </returns>
+    public static ResourceSet<AvailableAddOnResource> Read(int? pageSize = null,
+                                                           long? limit = null,
+                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadAvailableAddOnOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Add-ons currently available to be installed.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AvailableAddOn </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AvailableAddOnResource>> ReadAsync(int? pageSize = null,
+                                                                                                   long? limit = null,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadAvailableAddOnOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AvailableAddOnResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AvailableAddOnResource>.FromJson("available_add_ons", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AvailableAddOnResource> NextPage(Page<AvailableAddOnResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<AvailableAddOnResource>.FromJson("available_add_ons", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AvailableAddOnResource> PreviousPage(Page<AvailableAddOnResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<AvailableAddOnResource>.FromJson("available_add_ons", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a AvailableAddOnResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AvailableAddOnResource object represented by the provided JSON </returns>
+    public static AvailableAddOnResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AvailableAddOnResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A short description of the Add-on's functionality
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// How customers are charged for using this Add-on
+    /// </summary>
+    [JsonProperty("pricing_type")]
+    public string PricingType { get; private set; }
+    /// <summary>
+    /// The JSON object with the configuration that must be provided when installing a given Add-on
+    /// </summary>
+    [JsonProperty("configuration_schema")]
+    public object ConfigurationSchema { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private AvailableAddOnResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Marketplace/InstalledAddOn/InstalledAddOnExtensionOptions.cs b/src/Twilio/Rest/Preview/Marketplace/InstalledAddOn/InstalledAddOnExtensionOptions.cs
index d0fb0e712..e5ee0d08c 100644
--- a/src/Twilio/Rest/Preview/Marketplace/InstalledAddOn/InstalledAddOnExtensionOptions.cs
+++ b/src/Twilio/Rest/Preview/Marketplace/InstalledAddOn/InstalledAddOnExtensionOptions.cs
@@ -9,130 +9,130 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Marketplace.InstalledAddOn
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch an instance of an Extension for the Installed Add-on.
+  /// </summary>
+  public class FetchInstalledAddOnExtensionOptions : IOptions<InstalledAddOnExtensionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch an instance of an Extension for the Installed Add-on.
+    /// The SID of the InstalledAddOn resource with the extension to fetch
     /// </summary>
-    public class FetchInstalledAddOnExtensionOptions : IOptions<InstalledAddOnExtensionResource>
-    {
-        /// <summary>
-        /// The SID of the InstalledAddOn resource with the extension to fetch
-        /// </summary>
-        public string PathInstalledAddOnSid { get; }
-        /// <summary>
-        /// The SID of the InstalledAddOn Extension resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchInstalledAddOnExtensionOptions
-        /// </summary>
-        /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extension to fetch </param>
-        /// <param name="pathSid"> The SID of the InstalledAddOn Extension resource to fetch </param>
-        public FetchInstalledAddOnExtensionOptions(string pathInstalledAddOnSid, string pathSid)
-        {
-            PathInstalledAddOnSid = pathInstalledAddOnSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathInstalledAddOnSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Update an Extension for an Add-on installation.
+    /// The SID of the InstalledAddOn Extension resource to fetch
     /// </summary>
-    public class UpdateInstalledAddOnExtensionOptions : IOptions<InstalledAddOnExtensionResource>
-    {
-        /// <summary>
-        /// The SID of the InstalledAddOn resource with the extension to update
-        /// </summary>
-        public string PathInstalledAddOnSid { get; }
-        /// <summary>
-        /// The SID of the InstalledAddOn Extension resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// Whether the Extension should be invoked
-        /// </summary>
-        public bool? Enabled { get; }
-
-        /// <summary>
-        /// Construct a new UpdateInstalledAddOnExtensionOptions
-        /// </summary>
-        /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extension to update </param>
-        /// <param name="pathSid"> The SID of the InstalledAddOn Extension resource to update </param>
-        /// <param name="enabled"> Whether the Extension should be invoked </param>
-        public UpdateInstalledAddOnExtensionOptions(string pathInstalledAddOnSid, string pathSid, bool? enabled)
-        {
-            PathInstalledAddOnSid = pathInstalledAddOnSid;
-            PathSid = pathSid;
-            Enabled = enabled;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of Extensions for the Installed Add-on.
+    /// Construct a new FetchInstalledAddOnExtensionOptions
     /// </summary>
-    public class ReadInstalledAddOnExtensionOptions : ReadOptions<InstalledAddOnExtensionResource>
-    {
-        /// <summary>
-        /// The SID of the InstalledAddOn resource with the extensions to read
-        /// </summary>
-        public string PathInstalledAddOnSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadInstalledAddOnExtensionOptions
-        /// </summary>
-        /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extensions to read </param>
-        public ReadInstalledAddOnExtensionOptions(string pathInstalledAddOnSid)
-        {
-            PathInstalledAddOnSid = pathInstalledAddOnSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extension to fetch </param>
+    /// <param name="pathSid"> The SID of the InstalledAddOn Extension resource to fetch </param>
+    public FetchInstalledAddOnExtensionOptions(string pathInstalledAddOnSid, string pathSid)
+    {
+      PathInstalledAddOnSid = pathInstalledAddOnSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Update an Extension for an Add-on installation.
+  /// </summary>
+  public class UpdateInstalledAddOnExtensionOptions : IOptions<InstalledAddOnExtensionResource>
+  {
+    /// <summary>
+    /// The SID of the InstalledAddOn resource with the extension to update
+    /// </summary>
+    public string PathInstalledAddOnSid { get; }
+    /// <summary>
+    /// The SID of the InstalledAddOn Extension resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// Whether the Extension should be invoked
+    /// </summary>
+    public bool? Enabled { get; }
+
+    /// <summary>
+    /// Construct a new UpdateInstalledAddOnExtensionOptions
+    /// </summary>
+    /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extension to update </param>
+    /// <param name="pathSid"> The SID of the InstalledAddOn Extension resource to update </param>
+    /// <param name="enabled"> Whether the Extension should be invoked </param>
+    public UpdateInstalledAddOnExtensionOptions(string pathInstalledAddOnSid, string pathSid, bool? enabled)
+    {
+      PathInstalledAddOnSid = pathInstalledAddOnSid;
+      PathSid = pathSid;
+      Enabled = enabled;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of Extensions for the Installed Add-on.
+  /// </summary>
+  public class ReadInstalledAddOnExtensionOptions : ReadOptions<InstalledAddOnExtensionResource>
+  {
+    /// <summary>
+    /// The SID of the InstalledAddOn resource with the extensions to read
+    /// </summary>
+    public string PathInstalledAddOnSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadInstalledAddOnExtensionOptions
+    /// </summary>
+    /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extensions to read </param>
+    public ReadInstalledAddOnExtensionOptions(string pathInstalledAddOnSid)
+    {
+      PathInstalledAddOnSid = pathInstalledAddOnSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Marketplace/InstalledAddOn/InstalledAddOnExtensionResource.cs b/src/Twilio/Rest/Preview/Marketplace/InstalledAddOn/InstalledAddOnExtensionResource.cs
index 61a3d62dd..c765db8b4 100644
--- a/src/Twilio/Rest/Preview/Marketplace/InstalledAddOn/InstalledAddOnExtensionResource.cs
+++ b/src/Twilio/Rest/Preview/Marketplace/InstalledAddOn/InstalledAddOnExtensionResource.cs
@@ -19,354 +19,354 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Marketplace.InstalledAddOn
-{
-
-    public class InstalledAddOnExtensionResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchInstalledAddOnExtensionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/marketplace/InstalledAddOns/" + options.PathInstalledAddOnSid + "/Extensions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of an Extension for the Installed Add-on.
-        /// </summary>
-        /// <param name="options"> Fetch InstalledAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOnExtension </returns>
-        public static InstalledAddOnExtensionResource Fetch(FetchInstalledAddOnExtensionOptions options,
-                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an Extension for the Installed Add-on.
-        /// </summary>
-        /// <param name="options"> Fetch InstalledAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<InstalledAddOnExtensionResource> FetchAsync(FetchInstalledAddOnExtensionOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of an Extension for the Installed Add-on.
-        /// </summary>
-        /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extension to fetch </param>
-        /// <param name="pathSid"> The SID of the InstalledAddOn Extension resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOnExtension </returns>
-        public static InstalledAddOnExtensionResource Fetch(string pathInstalledAddOnSid,
-                                                            string pathSid,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchInstalledAddOnExtensionOptions(pathInstalledAddOnSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an Extension for the Installed Add-on.
-        /// </summary>
-        /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extension to fetch </param>
-        /// <param name="pathSid"> The SID of the InstalledAddOn Extension resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<InstalledAddOnExtensionResource> FetchAsync(string pathInstalledAddOnSid,
-                                                                                                    string pathSid,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchInstalledAddOnExtensionOptions(pathInstalledAddOnSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateInstalledAddOnExtensionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/marketplace/InstalledAddOns/" + options.PathInstalledAddOnSid + "/Extensions/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an Extension for an Add-on installation.
-        /// </summary>
-        /// <param name="options"> Update InstalledAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOnExtension </returns>
-        public static InstalledAddOnExtensionResource Update(UpdateInstalledAddOnExtensionOptions options,
-                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an Extension for an Add-on installation.
-        /// </summary>
-        /// <param name="options"> Update InstalledAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<InstalledAddOnExtensionResource> UpdateAsync(UpdateInstalledAddOnExtensionOptions options,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an Extension for an Add-on installation.
-        /// </summary>
-        /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extension to update </param>
-        /// <param name="pathSid"> The SID of the InstalledAddOn Extension resource to update </param>
-        /// <param name="enabled"> Whether the Extension should be invoked </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOnExtension </returns>
-        public static InstalledAddOnExtensionResource Update(string pathInstalledAddOnSid,
-                                                             string pathSid,
-                                                             bool? enabled,
-                                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateInstalledAddOnExtensionOptions(pathInstalledAddOnSid, pathSid, enabled);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an Extension for an Add-on installation.
-        /// </summary>
-        /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extension to update </param>
-        /// <param name="pathSid"> The SID of the InstalledAddOn Extension resource to update </param>
-        /// <param name="enabled"> Whether the Extension should be invoked </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<InstalledAddOnExtensionResource> UpdateAsync(string pathInstalledAddOnSid,
-                                                                                                     string pathSid,
-                                                                                                     bool? enabled,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateInstalledAddOnExtensionOptions(pathInstalledAddOnSid, pathSid, enabled);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadInstalledAddOnExtensionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/marketplace/InstalledAddOns/" + options.PathInstalledAddOnSid + "/Extensions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Extensions for the Installed Add-on.
-        /// </summary>
-        /// <param name="options"> Read InstalledAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOnExtension </returns>
-        public static ResourceSet<InstalledAddOnExtensionResource> Read(ReadInstalledAddOnExtensionOptions options,
-                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<InstalledAddOnExtensionResource>.FromJson("extensions", response.Content);
-            return new ResourceSet<InstalledAddOnExtensionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Extensions for the Installed Add-on.
-        /// </summary>
-        /// <param name="options"> Read InstalledAddOnExtension parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InstalledAddOnExtensionResource>> ReadAsync(ReadInstalledAddOnExtensionOptions options,
-                                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<InstalledAddOnExtensionResource>.FromJson("extensions", response.Content);
-            return new ResourceSet<InstalledAddOnExtensionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Extensions for the Installed Add-on.
-        /// </summary>
-        /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extensions to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOnExtension </returns>
-        public static ResourceSet<InstalledAddOnExtensionResource> Read(string pathInstalledAddOnSid,
-                                                                        int? pageSize = null,
-                                                                        long? limit = null,
-                                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadInstalledAddOnExtensionOptions(pathInstalledAddOnSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Extensions for the Installed Add-on.
-        /// </summary>
-        /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extensions to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOnExtension </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InstalledAddOnExtensionResource>> ReadAsync(string pathInstalledAddOnSid,
-                                                                                                                int? pageSize = null,
-                                                                                                                long? limit = null,
-                                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadInstalledAddOnExtensionOptions(pathInstalledAddOnSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<InstalledAddOnExtensionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<InstalledAddOnExtensionResource>.FromJson("extensions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<InstalledAddOnExtensionResource> NextPage(Page<InstalledAddOnExtensionResource> page,
-                                                                     ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<InstalledAddOnExtensionResource>.FromJson("extensions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<InstalledAddOnExtensionResource> PreviousPage(Page<InstalledAddOnExtensionResource> page,
-                                                                         ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<InstalledAddOnExtensionResource>.FromJson("extensions", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a InstalledAddOnExtensionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> InstalledAddOnExtensionResource object represented by the provided JSON </returns>
-        public static InstalledAddOnExtensionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<InstalledAddOnExtensionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the InstalledAddOn resource to which this extension applies
-        /// </summary>
-        [JsonProperty("installed_add_on_sid")]
-        public string InstalledAddOnSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The name of the Extension's Product
-        /// </summary>
-        [JsonProperty("product_name")]
-        public string ProductName { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// Whether the Extension will be invoked
-        /// </summary>
-        [JsonProperty("enabled")]
-        public bool? Enabled { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private InstalledAddOnExtensionResource()
-        {
-
-        }
-    }
+{
+
+  public class InstalledAddOnExtensionResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchInstalledAddOnExtensionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/marketplace/InstalledAddOns/" + options.PathInstalledAddOnSid + "/Extensions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of an Extension for the Installed Add-on.
+    /// </summary>
+    /// <param name="options"> Fetch InstalledAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOnExtension </returns>
+    public static InstalledAddOnExtensionResource Fetch(FetchInstalledAddOnExtensionOptions options,
+                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an Extension for the Installed Add-on.
+    /// </summary>
+    /// <param name="options"> Fetch InstalledAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<InstalledAddOnExtensionResource> FetchAsync(FetchInstalledAddOnExtensionOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of an Extension for the Installed Add-on.
+    /// </summary>
+    /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extension to fetch </param>
+    /// <param name="pathSid"> The SID of the InstalledAddOn Extension resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOnExtension </returns>
+    public static InstalledAddOnExtensionResource Fetch(string pathInstalledAddOnSid,
+                                                        string pathSid,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchInstalledAddOnExtensionOptions(pathInstalledAddOnSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an Extension for the Installed Add-on.
+    /// </summary>
+    /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extension to fetch </param>
+    /// <param name="pathSid"> The SID of the InstalledAddOn Extension resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<InstalledAddOnExtensionResource> FetchAsync(string pathInstalledAddOnSid,
+                                                                                                string pathSid,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchInstalledAddOnExtensionOptions(pathInstalledAddOnSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateInstalledAddOnExtensionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/marketplace/InstalledAddOns/" + options.PathInstalledAddOnSid + "/Extensions/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an Extension for an Add-on installation.
+    /// </summary>
+    /// <param name="options"> Update InstalledAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOnExtension </returns>
+    public static InstalledAddOnExtensionResource Update(UpdateInstalledAddOnExtensionOptions options,
+                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an Extension for an Add-on installation.
+    /// </summary>
+    /// <param name="options"> Update InstalledAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<InstalledAddOnExtensionResource> UpdateAsync(UpdateInstalledAddOnExtensionOptions options,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an Extension for an Add-on installation.
+    /// </summary>
+    /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extension to update </param>
+    /// <param name="pathSid"> The SID of the InstalledAddOn Extension resource to update </param>
+    /// <param name="enabled"> Whether the Extension should be invoked </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOnExtension </returns>
+    public static InstalledAddOnExtensionResource Update(string pathInstalledAddOnSid,
+                                                         string pathSid,
+                                                         bool? enabled,
+                                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateInstalledAddOnExtensionOptions(pathInstalledAddOnSid, pathSid, enabled);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an Extension for an Add-on installation.
+    /// </summary>
+    /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extension to update </param>
+    /// <param name="pathSid"> The SID of the InstalledAddOn Extension resource to update </param>
+    /// <param name="enabled"> Whether the Extension should be invoked </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<InstalledAddOnExtensionResource> UpdateAsync(string pathInstalledAddOnSid,
+                                                                                                 string pathSid,
+                                                                                                 bool? enabled,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateInstalledAddOnExtensionOptions(pathInstalledAddOnSid, pathSid, enabled);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadInstalledAddOnExtensionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/marketplace/InstalledAddOns/" + options.PathInstalledAddOnSid + "/Extensions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Extensions for the Installed Add-on.
+    /// </summary>
+    /// <param name="options"> Read InstalledAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOnExtension </returns>
+    public static ResourceSet<InstalledAddOnExtensionResource> Read(ReadInstalledAddOnExtensionOptions options,
+                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<InstalledAddOnExtensionResource>.FromJson("extensions", response.Content);
+      return new ResourceSet<InstalledAddOnExtensionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Extensions for the Installed Add-on.
+    /// </summary>
+    /// <param name="options"> Read InstalledAddOnExtension parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InstalledAddOnExtensionResource>> ReadAsync(ReadInstalledAddOnExtensionOptions options,
+                                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<InstalledAddOnExtensionResource>.FromJson("extensions", response.Content);
+      return new ResourceSet<InstalledAddOnExtensionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Extensions for the Installed Add-on.
+    /// </summary>
+    /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extensions to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOnExtension </returns>
+    public static ResourceSet<InstalledAddOnExtensionResource> Read(string pathInstalledAddOnSid,
+                                                                    int? pageSize = null,
+                                                                    long? limit = null,
+                                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadInstalledAddOnExtensionOptions(pathInstalledAddOnSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Extensions for the Installed Add-on.
+    /// </summary>
+    /// <param name="pathInstalledAddOnSid"> The SID of the InstalledAddOn resource with the extensions to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOnExtension </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InstalledAddOnExtensionResource>> ReadAsync(string pathInstalledAddOnSid,
+                                                                                                            int? pageSize = null,
+                                                                                                            long? limit = null,
+                                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadInstalledAddOnExtensionOptions(pathInstalledAddOnSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<InstalledAddOnExtensionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<InstalledAddOnExtensionResource>.FromJson("extensions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<InstalledAddOnExtensionResource> NextPage(Page<InstalledAddOnExtensionResource> page,
+                                                                 ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<InstalledAddOnExtensionResource>.FromJson("extensions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<InstalledAddOnExtensionResource> PreviousPage(Page<InstalledAddOnExtensionResource> page,
+                                                                     ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<InstalledAddOnExtensionResource>.FromJson("extensions", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a InstalledAddOnExtensionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> InstalledAddOnExtensionResource object represented by the provided JSON </returns>
+    public static InstalledAddOnExtensionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<InstalledAddOnExtensionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the InstalledAddOn resource to which this extension applies
+    /// </summary>
+    [JsonProperty("installed_add_on_sid")]
+    public string InstalledAddOnSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The name of the Extension's Product
+    /// </summary>
+    [JsonProperty("product_name")]
+    public string ProductName { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// Whether the Extension will be invoked
+    /// </summary>
+    [JsonProperty("enabled")]
+    public bool? Enabled { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private InstalledAddOnExtensionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Marketplace/InstalledAddOnOptions.cs b/src/Twilio/Rest/Preview/Marketplace/InstalledAddOnOptions.cs
index c77ce3a0c..5d6c13754 100644
--- a/src/Twilio/Rest/Preview/Marketplace/InstalledAddOnOptions.cs
+++ b/src/Twilio/Rest/Preview/Marketplace/InstalledAddOnOptions.cs
@@ -9,209 +9,209 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Marketplace
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Install an Add-on for the Account specified.
+  /// </summary>
+  public class CreateInstalledAddOnOptions : IOptions<InstalledAddOnResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Install an Add-on for the Account specified.
-    /// </summary>
-    public class CreateInstalledAddOnOptions : IOptions<InstalledAddOnResource>
-    {
-        /// <summary>
-        /// The SID of the AvaliableAddOn to install
-        /// </summary>
-        public string AvailableAddOnSid { get; }
-        /// <summary>
-        /// Whether the Terms of Service were accepted
-        /// </summary>
-        public bool? AcceptTermsOfService { get; }
-        /// <summary>
-        /// The JSON object representing the configuration
-        /// </summary>
-        public object Configuration { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateInstalledAddOnOptions
-        /// </summary>
-        /// <param name="availableAddOnSid"> The SID of the AvaliableAddOn to install </param>
-        /// <param name="acceptTermsOfService"> Whether the Terms of Service were accepted </param>
-        public CreateInstalledAddOnOptions(string availableAddOnSid, bool? acceptTermsOfService)
-        {
-            AvailableAddOnSid = availableAddOnSid;
-            AcceptTermsOfService = acceptTermsOfService;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AvailableAddOnSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AvailableAddOnSid", AvailableAddOnSid.ToString()));
-            }
-
-            if (AcceptTermsOfService != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AcceptTermsOfService", AcceptTermsOfService.Value.ToString().ToLower()));
-            }
-
-            if (Configuration != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration", Serializers.JsonObject(Configuration)));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the AvaliableAddOn to install
+    /// </summary>
+    public string AvailableAddOnSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Remove an Add-on installation from your account
-    /// </summary>
-    public class DeleteInstalledAddOnOptions : IOptions<InstalledAddOnResource>
-    {
-        /// <summary>
-        /// The SID of the InstalledAddOn resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteInstalledAddOnOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the InstalledAddOn resource to delete </param>
-        public DeleteInstalledAddOnOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Whether the Terms of Service were accepted
+    /// </summary>
+    public bool? AcceptTermsOfService { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch an instance of an Add-on currently installed on this Account.
-    /// </summary>
-    public class FetchInstalledAddOnOptions : IOptions<InstalledAddOnResource>
-    {
-        /// <summary>
-        /// The SID of the InstalledAddOn resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchInstalledAddOnOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the InstalledAddOn resource to fetch </param>
-        public FetchInstalledAddOnOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The JSON object representing the configuration
+    /// </summary>
+    public object Configuration { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Update an Add-on installation for the Account specified.
-    /// </summary>
-    public class UpdateInstalledAddOnOptions : IOptions<InstalledAddOnResource>
-    {
-        /// <summary>
-        /// The SID of the InstalledAddOn resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The JSON object representing the configuration
-        /// </summary>
-        public object Configuration { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateInstalledAddOnOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the InstalledAddOn resource to update </param>
-        public UpdateInstalledAddOnOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Configuration != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration", Serializers.JsonObject(Configuration)));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-    }
-
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of Add-ons currently installed on this Account.
-    /// </summary>
-    public class ReadInstalledAddOnOptions : ReadOptions<InstalledAddOnResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new CreateInstalledAddOnOptions
+    /// </summary>
+    /// <param name="availableAddOnSid"> The SID of the AvaliableAddOn to install </param>
+    /// <param name="acceptTermsOfService"> Whether the Terms of Service were accepted </param>
+    public CreateInstalledAddOnOptions(string availableAddOnSid, bool? acceptTermsOfService)
+    {
+      AvailableAddOnSid = availableAddOnSid;
+      AcceptTermsOfService = acceptTermsOfService;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AvailableAddOnSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AvailableAddOnSid", AvailableAddOnSid.ToString()));
+      }
+
+      if (AcceptTermsOfService != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AcceptTermsOfService", AcceptTermsOfService.Value.ToString().ToLower()));
+      }
+
+      if (Configuration != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration", Serializers.JsonObject(Configuration)));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Remove an Add-on installation from your account
+  /// </summary>
+  public class DeleteInstalledAddOnOptions : IOptions<InstalledAddOnResource>
+  {
+    /// <summary>
+    /// The SID of the InstalledAddOn resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteInstalledAddOnOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the InstalledAddOn resource to delete </param>
+    public DeleteInstalledAddOnOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch an instance of an Add-on currently installed on this Account.
+  /// </summary>
+  public class FetchInstalledAddOnOptions : IOptions<InstalledAddOnResource>
+  {
+    /// <summary>
+    /// The SID of the InstalledAddOn resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchInstalledAddOnOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the InstalledAddOn resource to fetch </param>
+    public FetchInstalledAddOnOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Update an Add-on installation for the Account specified.
+  /// </summary>
+  public class UpdateInstalledAddOnOptions : IOptions<InstalledAddOnResource>
+  {
+    /// <summary>
+    /// The SID of the InstalledAddOn resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The JSON object representing the configuration
+    /// </summary>
+    public object Configuration { get; set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateInstalledAddOnOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the InstalledAddOn resource to update </param>
+    public UpdateInstalledAddOnOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Configuration != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration", Serializers.JsonObject(Configuration)));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of Add-ons currently installed on this Account.
+  /// </summary>
+  public class ReadInstalledAddOnOptions : ReadOptions<InstalledAddOnResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Marketplace/InstalledAddOnResource.cs b/src/Twilio/Rest/Preview/Marketplace/InstalledAddOnResource.cs
index 458e182b1..621b7f4b2 100644
--- a/src/Twilio/Rest/Preview/Marketplace/InstalledAddOnResource.cs
+++ b/src/Twilio/Rest/Preview/Marketplace/InstalledAddOnResource.cs
@@ -19,502 +19,502 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Marketplace
-{
-
-    public class InstalledAddOnResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateInstalledAddOnOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/marketplace/InstalledAddOns",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Install an Add-on for the Account specified.
-        /// </summary>
-        /// <param name="options"> Create InstalledAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOn </returns>
-        public static InstalledAddOnResource Create(CreateInstalledAddOnOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Install an Add-on for the Account specified.
-        /// </summary>
-        /// <param name="options"> Create InstalledAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
-        public static async System.Threading.Tasks.Task<InstalledAddOnResource> CreateAsync(CreateInstalledAddOnOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Install an Add-on for the Account specified.
-        /// </summary>
-        /// <param name="availableAddOnSid"> The SID of the AvaliableAddOn to install </param>
-        /// <param name="acceptTermsOfService"> Whether the Terms of Service were accepted </param>
-        /// <param name="configuration"> The JSON object representing the configuration </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOn </returns>
-        public static InstalledAddOnResource Create(string availableAddOnSid,
-                                                    bool? acceptTermsOfService,
-                                                    object configuration = null,
-                                                    string uniqueName = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateInstalledAddOnOptions(availableAddOnSid, acceptTermsOfService){Configuration = configuration, UniqueName = uniqueName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Install an Add-on for the Account specified.
-        /// </summary>
-        /// <param name="availableAddOnSid"> The SID of the AvaliableAddOn to install </param>
-        /// <param name="acceptTermsOfService"> Whether the Terms of Service were accepted </param>
-        /// <param name="configuration"> The JSON object representing the configuration </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
-        public static async System.Threading.Tasks.Task<InstalledAddOnResource> CreateAsync(string availableAddOnSid,
-                                                                                            bool? acceptTermsOfService,
-                                                                                            object configuration = null,
-                                                                                            string uniqueName = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateInstalledAddOnOptions(availableAddOnSid, acceptTermsOfService){Configuration = configuration, UniqueName = uniqueName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteInstalledAddOnOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/marketplace/InstalledAddOns/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove an Add-on installation from your account
-        /// </summary>
-        /// <param name="options"> Delete InstalledAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOn </returns>
-        public static bool Delete(DeleteInstalledAddOnOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an Add-on installation from your account
-        /// </summary>
-        /// <param name="options"> Delete InstalledAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteInstalledAddOnOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove an Add-on installation from your account
-        /// </summary>
-        /// <param name="pathSid"> The SID of the InstalledAddOn resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOn </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteInstalledAddOnOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an Add-on installation from your account
-        /// </summary>
-        /// <param name="pathSid"> The SID of the InstalledAddOn resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteInstalledAddOnOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchInstalledAddOnOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/marketplace/InstalledAddOns/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch an instance of an Add-on currently installed on this Account.
-        /// </summary>
-        /// <param name="options"> Fetch InstalledAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOn </returns>
-        public static InstalledAddOnResource Fetch(FetchInstalledAddOnOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an Add-on currently installed on this Account.
-        /// </summary>
-        /// <param name="options"> Fetch InstalledAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
-        public static async System.Threading.Tasks.Task<InstalledAddOnResource> FetchAsync(FetchInstalledAddOnOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch an instance of an Add-on currently installed on this Account.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the InstalledAddOn resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOn </returns>
-        public static InstalledAddOnResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchInstalledAddOnOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch an instance of an Add-on currently installed on this Account.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the InstalledAddOn resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
-        public static async System.Threading.Tasks.Task<InstalledAddOnResource> FetchAsync(string pathSid,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchInstalledAddOnOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateInstalledAddOnOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/marketplace/InstalledAddOns/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an Add-on installation for the Account specified.
-        /// </summary>
-        /// <param name="options"> Update InstalledAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOn </returns>
-        public static InstalledAddOnResource Update(UpdateInstalledAddOnOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an Add-on installation for the Account specified.
-        /// </summary>
-        /// <param name="options"> Update InstalledAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
-        public static async System.Threading.Tasks.Task<InstalledAddOnResource> UpdateAsync(UpdateInstalledAddOnOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an Add-on installation for the Account specified.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the InstalledAddOn resource to update </param>
-        /// <param name="configuration"> The JSON object representing the configuration </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOn </returns>
-        public static InstalledAddOnResource Update(string pathSid,
-                                                    object configuration = null,
-                                                    string uniqueName = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateInstalledAddOnOptions(pathSid){Configuration = configuration, UniqueName = uniqueName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an Add-on installation for the Account specified.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the InstalledAddOn resource to update </param>
-        /// <param name="configuration"> The JSON object representing the configuration </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
-        public static async System.Threading.Tasks.Task<InstalledAddOnResource> UpdateAsync(string pathSid,
-                                                                                            object configuration = null,
-                                                                                            string uniqueName = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateInstalledAddOnOptions(pathSid){Configuration = configuration, UniqueName = uniqueName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadInstalledAddOnOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/marketplace/InstalledAddOns",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Add-ons currently installed on this Account.
-        /// </summary>
-        /// <param name="options"> Read InstalledAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOn </returns>
-        public static ResourceSet<InstalledAddOnResource> Read(ReadInstalledAddOnOptions options,
-                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<InstalledAddOnResource>.FromJson("installed_add_ons", response.Content);
-            return new ResourceSet<InstalledAddOnResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Add-ons currently installed on this Account.
-        /// </summary>
-        /// <param name="options"> Read InstalledAddOn parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InstalledAddOnResource>> ReadAsync(ReadInstalledAddOnOptions options,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<InstalledAddOnResource>.FromJson("installed_add_ons", response.Content);
-            return new ResourceSet<InstalledAddOnResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Add-ons currently installed on this Account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of InstalledAddOn </returns>
-        public static ResourceSet<InstalledAddOnResource> Read(int? pageSize = null,
-                                                               long? limit = null,
-                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadInstalledAddOnOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Add-ons currently installed on this Account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InstalledAddOnResource>> ReadAsync(int? pageSize = null,
-                                                                                                       long? limit = null,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadInstalledAddOnOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<InstalledAddOnResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<InstalledAddOnResource>.FromJson("installed_add_ons", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<InstalledAddOnResource> NextPage(Page<InstalledAddOnResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<InstalledAddOnResource>.FromJson("installed_add_ons", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<InstalledAddOnResource> PreviousPage(Page<InstalledAddOnResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<InstalledAddOnResource>.FromJson("installed_add_ons", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a InstalledAddOnResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> InstalledAddOnResource object represented by the provided JSON </returns>
-        public static InstalledAddOnResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<InstalledAddOnResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A short description of the Add-on's functionality
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// The JSON object that represents the current configuration of installed Add-on
-        /// </summary>
-        [JsonProperty("configuration")]
-        public object Configuration { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private InstalledAddOnResource()
-        {
-
-        }
-    }
+{
+
+  public class InstalledAddOnResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateInstalledAddOnOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/marketplace/InstalledAddOns",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Install an Add-on for the Account specified.
+    /// </summary>
+    /// <param name="options"> Create InstalledAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOn </returns>
+    public static InstalledAddOnResource Create(CreateInstalledAddOnOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Install an Add-on for the Account specified.
+    /// </summary>
+    /// <param name="options"> Create InstalledAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
+    public static async System.Threading.Tasks.Task<InstalledAddOnResource> CreateAsync(CreateInstalledAddOnOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Install an Add-on for the Account specified.
+    /// </summary>
+    /// <param name="availableAddOnSid"> The SID of the AvaliableAddOn to install </param>
+    /// <param name="acceptTermsOfService"> Whether the Terms of Service were accepted </param>
+    /// <param name="configuration"> The JSON object representing the configuration </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOn </returns>
+    public static InstalledAddOnResource Create(string availableAddOnSid,
+                                                bool? acceptTermsOfService,
+                                                object configuration = null,
+                                                string uniqueName = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateInstalledAddOnOptions(availableAddOnSid, acceptTermsOfService) { Configuration = configuration, UniqueName = uniqueName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Install an Add-on for the Account specified.
+    /// </summary>
+    /// <param name="availableAddOnSid"> The SID of the AvaliableAddOn to install </param>
+    /// <param name="acceptTermsOfService"> Whether the Terms of Service were accepted </param>
+    /// <param name="configuration"> The JSON object representing the configuration </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
+    public static async System.Threading.Tasks.Task<InstalledAddOnResource> CreateAsync(string availableAddOnSid,
+                                                                                        bool? acceptTermsOfService,
+                                                                                        object configuration = null,
+                                                                                        string uniqueName = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateInstalledAddOnOptions(availableAddOnSid, acceptTermsOfService) { Configuration = configuration, UniqueName = uniqueName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteInstalledAddOnOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/marketplace/InstalledAddOns/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove an Add-on installation from your account
+    /// </summary>
+    /// <param name="options"> Delete InstalledAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOn </returns>
+    public static bool Delete(DeleteInstalledAddOnOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an Add-on installation from your account
+    /// </summary>
+    /// <param name="options"> Delete InstalledAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteInstalledAddOnOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove an Add-on installation from your account
+    /// </summary>
+    /// <param name="pathSid"> The SID of the InstalledAddOn resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOn </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteInstalledAddOnOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an Add-on installation from your account
+    /// </summary>
+    /// <param name="pathSid"> The SID of the InstalledAddOn resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteInstalledAddOnOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchInstalledAddOnOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/marketplace/InstalledAddOns/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch an instance of an Add-on currently installed on this Account.
+    /// </summary>
+    /// <param name="options"> Fetch InstalledAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOn </returns>
+    public static InstalledAddOnResource Fetch(FetchInstalledAddOnOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an Add-on currently installed on this Account.
+    /// </summary>
+    /// <param name="options"> Fetch InstalledAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
+    public static async System.Threading.Tasks.Task<InstalledAddOnResource> FetchAsync(FetchInstalledAddOnOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch an instance of an Add-on currently installed on this Account.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the InstalledAddOn resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOn </returns>
+    public static InstalledAddOnResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchInstalledAddOnOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch an instance of an Add-on currently installed on this Account.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the InstalledAddOn resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
+    public static async System.Threading.Tasks.Task<InstalledAddOnResource> FetchAsync(string pathSid,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchInstalledAddOnOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateInstalledAddOnOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/marketplace/InstalledAddOns/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an Add-on installation for the Account specified.
+    /// </summary>
+    /// <param name="options"> Update InstalledAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOn </returns>
+    public static InstalledAddOnResource Update(UpdateInstalledAddOnOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an Add-on installation for the Account specified.
+    /// </summary>
+    /// <param name="options"> Update InstalledAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
+    public static async System.Threading.Tasks.Task<InstalledAddOnResource> UpdateAsync(UpdateInstalledAddOnOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an Add-on installation for the Account specified.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the InstalledAddOn resource to update </param>
+    /// <param name="configuration"> The JSON object representing the configuration </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOn </returns>
+    public static InstalledAddOnResource Update(string pathSid,
+                                                object configuration = null,
+                                                string uniqueName = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateInstalledAddOnOptions(pathSid) { Configuration = configuration, UniqueName = uniqueName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an Add-on installation for the Account specified.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the InstalledAddOn resource to update </param>
+    /// <param name="configuration"> The JSON object representing the configuration </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
+    public static async System.Threading.Tasks.Task<InstalledAddOnResource> UpdateAsync(string pathSid,
+                                                                                        object configuration = null,
+                                                                                        string uniqueName = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateInstalledAddOnOptions(pathSid) { Configuration = configuration, UniqueName = uniqueName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadInstalledAddOnOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/marketplace/InstalledAddOns",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Add-ons currently installed on this Account.
+    /// </summary>
+    /// <param name="options"> Read InstalledAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOn </returns>
+    public static ResourceSet<InstalledAddOnResource> Read(ReadInstalledAddOnOptions options,
+                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<InstalledAddOnResource>.FromJson("installed_add_ons", response.Content);
+      return new ResourceSet<InstalledAddOnResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Add-ons currently installed on this Account.
+    /// </summary>
+    /// <param name="options"> Read InstalledAddOn parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InstalledAddOnResource>> ReadAsync(ReadInstalledAddOnOptions options,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<InstalledAddOnResource>.FromJson("installed_add_ons", response.Content);
+      return new ResourceSet<InstalledAddOnResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Add-ons currently installed on this Account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of InstalledAddOn </returns>
+    public static ResourceSet<InstalledAddOnResource> Read(int? pageSize = null,
+                                                           long? limit = null,
+                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadInstalledAddOnOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Add-ons currently installed on this Account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of InstalledAddOn </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InstalledAddOnResource>> ReadAsync(int? pageSize = null,
+                                                                                                   long? limit = null,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadInstalledAddOnOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<InstalledAddOnResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<InstalledAddOnResource>.FromJson("installed_add_ons", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<InstalledAddOnResource> NextPage(Page<InstalledAddOnResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<InstalledAddOnResource>.FromJson("installed_add_ons", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<InstalledAddOnResource> PreviousPage(Page<InstalledAddOnResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<InstalledAddOnResource>.FromJson("installed_add_ons", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a InstalledAddOnResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> InstalledAddOnResource object represented by the provided JSON </returns>
+    public static InstalledAddOnResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<InstalledAddOnResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A short description of the Add-on's functionality
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// The JSON object that represents the current configuration of installed Add-on
+    /// </summary>
+    [JsonProperty("configuration")]
+    public object Configuration { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private InstalledAddOnResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/Document/DocumentPermissionOptions.cs b/src/Twilio/Rest/Preview/Sync/Service/Document/DocumentPermissionOptions.cs
index f65c1eac7..4b5debf74 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/Document/DocumentPermissionOptions.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/Document/DocumentPermissionOptions.cs
@@ -9,219 +9,219 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Sync.Service.Document
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch a specific Sync Document Permission.
+  /// </summary>
+  public class FetchDocumentPermissionOptions : IOptions<DocumentPermissionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch a specific Sync Document Permission.
-    /// </summary>
-    public class FetchDocumentPermissionOptions : IOptions<DocumentPermissionResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Sync Document SID or unique name.
-        /// </summary>
-        public string PathDocumentSid { get; }
-        /// <summary>
-        /// Identity of the user to whom the Sync Document Permission applies.
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new FetchDocumentPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
-        public FetchDocumentPermissionOptions(string pathServiceSid, string pathDocumentSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathDocumentSid = pathDocumentSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Delete a specific Sync Document Permission.
-    /// </summary>
-    public class DeleteDocumentPermissionOptions : IOptions<DocumentPermissionResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Sync Document SID or unique name.
-        /// </summary>
-        public string PathDocumentSid { get; }
-        /// <summary>
-        /// Identity of the user to whom the Sync Document Permission applies.
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new DeleteDocumentPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
-        public DeleteDocumentPermissionOptions(string pathServiceSid, string pathDocumentSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathDocumentSid = pathDocumentSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Sync Document SID or unique name.
+    /// </summary>
+    public string PathDocumentSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of all Permissions applying to a Sync Document.
-    /// </summary>
-    public class ReadDocumentPermissionOptions : ReadOptions<DocumentPermissionResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Sync Document SID or unique name.
-        /// </summary>
-        public string PathDocumentSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadDocumentPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
-        public ReadDocumentPermissionOptions(string pathServiceSid, string pathDocumentSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathDocumentSid = pathDocumentSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Identity of the user to whom the Sync Document Permission applies.
+    /// </summary>
+    public string PathIdentity { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Update an identity's access to a specific Sync Document.
-    /// </summary>
-    public class UpdateDocumentPermissionOptions : IOptions<DocumentPermissionResource>
-    {
-        /// <summary>
-        /// Sync Service Instance SID.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Sync Document SID or unique name.
-        /// </summary>
-        public string PathDocumentSid { get; }
-        /// <summary>
-        /// Identity of the user to whom the Sync Document Permission applies.
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// Read access.
-        /// </summary>
-        public bool? Read { get; }
-        /// <summary>
-        /// Write access.
-        /// </summary>
-        public bool? Write { get; }
-        /// <summary>
-        /// Manage access.
-        /// </summary>
-        public bool? Manage { get; }
-
-        /// <summary>
-        /// Construct a new UpdateDocumentPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
-        /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
-        /// <param name="read"> Read access. </param>
-        /// <param name="write"> Write access. </param>
-        /// <param name="manage"> Manage access. </param>
-        public UpdateDocumentPermissionOptions(string pathServiceSid,
-                                               string pathDocumentSid,
-                                               string pathIdentity,
-                                               bool? read,
-                                               bool? write,
-                                               bool? manage)
-        {
-            PathServiceSid = pathServiceSid;
-            PathDocumentSid = pathDocumentSid;
-            PathIdentity = pathIdentity;
-            Read = read;
-            Write = write;
-            Manage = manage;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Read != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Read", Read.Value.ToString().ToLower()));
-            }
-
-            if (Write != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Write", Write.Value.ToString().ToLower()));
-            }
-
-            if (Manage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Manage", Manage.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new FetchDocumentPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
+    public FetchDocumentPermissionOptions(string pathServiceSid, string pathDocumentSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathDocumentSid = pathDocumentSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Delete a specific Sync Document Permission.
+  /// </summary>
+  public class DeleteDocumentPermissionOptions : IOptions<DocumentPermissionResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Sync Document SID or unique name.
+    /// </summary>
+    public string PathDocumentSid { get; }
+    /// <summary>
+    /// Identity of the user to whom the Sync Document Permission applies.
+    /// </summary>
+    public string PathIdentity { get; }
+
+    /// <summary>
+    /// Construct a new DeleteDocumentPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
+    public DeleteDocumentPermissionOptions(string pathServiceSid, string pathDocumentSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathDocumentSid = pathDocumentSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of all Permissions applying to a Sync Document.
+  /// </summary>
+  public class ReadDocumentPermissionOptions : ReadOptions<DocumentPermissionResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Sync Document SID or unique name.
+    /// </summary>
+    public string PathDocumentSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadDocumentPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
+    public ReadDocumentPermissionOptions(string pathServiceSid, string pathDocumentSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathDocumentSid = pathDocumentSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Update an identity's access to a specific Sync Document.
+  /// </summary>
+  public class UpdateDocumentPermissionOptions : IOptions<DocumentPermissionResource>
+  {
+    /// <summary>
+    /// Sync Service Instance SID.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Sync Document SID or unique name.
+    /// </summary>
+    public string PathDocumentSid { get; }
+    /// <summary>
+    /// Identity of the user to whom the Sync Document Permission applies.
+    /// </summary>
+    public string PathIdentity { get; }
+    /// <summary>
+    /// Read access.
+    /// </summary>
+    public bool? Read { get; }
+    /// <summary>
+    /// Write access.
+    /// </summary>
+    public bool? Write { get; }
+    /// <summary>
+    /// Manage access.
+    /// </summary>
+    public bool? Manage { get; }
+
+    /// <summary>
+    /// Construct a new UpdateDocumentPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
+    /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
+    /// <param name="read"> Read access. </param>
+    /// <param name="write"> Write access. </param>
+    /// <param name="manage"> Manage access. </param>
+    public UpdateDocumentPermissionOptions(string pathServiceSid,
+                                           string pathDocumentSid,
+                                           string pathIdentity,
+                                           bool? read,
+                                           bool? write,
+                                           bool? manage)
+    {
+      PathServiceSid = pathServiceSid;
+      PathDocumentSid = pathDocumentSid;
+      PathIdentity = pathIdentity;
+      Read = read;
+      Write = write;
+      Manage = manage;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Read != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Read", Read.Value.ToString().ToLower()));
+      }
+
+      if (Write != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Write", Write.Value.ToString().ToLower()));
+      }
+
+      if (Manage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Manage", Manage.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/Document/DocumentPermissionResource.cs b/src/Twilio/Rest/Preview/Sync/Service/Document/DocumentPermissionResource.cs
index d34d76af3..38bb26206 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/Document/DocumentPermissionResource.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/Document/DocumentPermissionResource.cs
@@ -19,455 +19,455 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Sync.Service.Document
-{
-
-    public class DocumentPermissionResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchDocumentPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="options"> Fetch DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static DocumentPermissionResource Fetch(FetchDocumentPermissionOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="options"> Fetch DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<DocumentPermissionResource> FetchAsync(FetchDocumentPermissionOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static DocumentPermissionResource Fetch(string pathServiceSid,
-                                                       string pathDocumentSid,
-                                                       string pathIdentity,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<DocumentPermissionResource> FetchAsync(string pathServiceSid,
-                                                                                               string pathDocumentSid,
-                                                                                               string pathIdentity,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteDocumentPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="options"> Delete DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static bool Delete(DeleteDocumentPermissionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="options"> Delete DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDocumentPermissionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathDocumentSid,
-                                  string pathIdentity,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathDocumentSid,
-                                                                          string pathIdentity,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadDocumentPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Document.
-        /// </summary>
-        /// <param name="options"> Read DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static ResourceSet<DocumentPermissionResource> Read(ReadDocumentPermissionOptions options,
-                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
-            return new ResourceSet<DocumentPermissionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Document.
-        /// </summary>
-        /// <param name="options"> Read DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DocumentPermissionResource>> ReadAsync(ReadDocumentPermissionOptions options,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
-            return new ResourceSet<DocumentPermissionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Document.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static ResourceSet<DocumentPermissionResource> Read(string pathServiceSid,
-                                                                   string pathDocumentSid,
-                                                                   int? pageSize = null,
-                                                                   long? limit = null,
-                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadDocumentPermissionOptions(pathServiceSid, pathDocumentSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Document.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DocumentPermissionResource>> ReadAsync(string pathServiceSid,
-                                                                                                           string pathDocumentSid,
-                                                                                                           int? pageSize = null,
-                                                                                                           long? limit = null,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadDocumentPermissionOptions(pathServiceSid, pathDocumentSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DocumentPermissionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DocumentPermissionResource> NextPage(Page<DocumentPermissionResource> page,
-                                                                ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DocumentPermissionResource> PreviousPage(Page<DocumentPermissionResource> page,
-                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateDocumentPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions/" + options.PathIdentity + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an identity's access to a specific Sync Document.
-        /// </summary>
-        /// <param name="options"> Update DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static DocumentPermissionResource Update(UpdateDocumentPermissionOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an identity's access to a specific Sync Document.
-        /// </summary>
-        /// <param name="options"> Update DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<DocumentPermissionResource> UpdateAsync(UpdateDocumentPermissionOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an identity's access to a specific Sync Document.
-        /// </summary>
-        /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
-        /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
-        /// <param name="read"> Read access. </param>
-        /// <param name="write"> Write access. </param>
-        /// <param name="manage"> Manage access. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static DocumentPermissionResource Update(string pathServiceSid,
-                                                        string pathDocumentSid,
-                                                        string pathIdentity,
-                                                        bool? read,
-                                                        bool? write,
-                                                        bool? manage,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity, read, write, manage);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an identity's access to a specific Sync Document.
-        /// </summary>
-        /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
-        /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
-        /// <param name="read"> Read access. </param>
-        /// <param name="write"> Write access. </param>
-        /// <param name="manage"> Manage access. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<DocumentPermissionResource> UpdateAsync(string pathServiceSid,
-                                                                                                string pathDocumentSid,
-                                                                                                string pathIdentity,
-                                                                                                bool? read,
-                                                                                                bool? write,
-                                                                                                bool? manage,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity, read, write, manage);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a DocumentPermissionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DocumentPermissionResource object represented by the provided JSON </returns>
-        public static DocumentPermissionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DocumentPermissionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Twilio Account SID.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Sync Service Instance SID.
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// Sync Document SID.
-        /// </summary>
-        [JsonProperty("document_sid")]
-        public string DocumentSid { get; private set; }
-        /// <summary>
-        /// Identity of the user to whom the Sync Document Permission applies.
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// Read access.
-        /// </summary>
-        [JsonProperty("read")]
-        public bool? _Read { get; private set; }
-        /// <summary>
-        /// Write access.
-        /// </summary>
-        [JsonProperty("write")]
-        public bool? Write { get; private set; }
-        /// <summary>
-        /// Manage access.
-        /// </summary>
-        [JsonProperty("manage")]
-        public bool? Manage { get; private set; }
-        /// <summary>
-        /// URL of this Sync Document Permission.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private DocumentPermissionResource()
-        {
-
-        }
-    }
+{
+
+  public class DocumentPermissionResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchDocumentPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="options"> Fetch DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static DocumentPermissionResource Fetch(FetchDocumentPermissionOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="options"> Fetch DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<DocumentPermissionResource> FetchAsync(FetchDocumentPermissionOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static DocumentPermissionResource Fetch(string pathServiceSid,
+                                                   string pathDocumentSid,
+                                                   string pathIdentity,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<DocumentPermissionResource> FetchAsync(string pathServiceSid,
+                                                                                           string pathDocumentSid,
+                                                                                           string pathIdentity,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteDocumentPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="options"> Delete DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static bool Delete(DeleteDocumentPermissionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="options"> Delete DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDocumentPermissionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathDocumentSid,
+                              string pathIdentity,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathDocumentSid,
+                                                                      string pathIdentity,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadDocumentPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Document.
+    /// </summary>
+    /// <param name="options"> Read DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static ResourceSet<DocumentPermissionResource> Read(ReadDocumentPermissionOptions options,
+                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
+      return new ResourceSet<DocumentPermissionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Document.
+    /// </summary>
+    /// <param name="options"> Read DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DocumentPermissionResource>> ReadAsync(ReadDocumentPermissionOptions options,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
+      return new ResourceSet<DocumentPermissionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Document.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static ResourceSet<DocumentPermissionResource> Read(string pathServiceSid,
+                                                               string pathDocumentSid,
+                                                               int? pageSize = null,
+                                                               long? limit = null,
+                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadDocumentPermissionOptions(pathServiceSid, pathDocumentSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Document.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DocumentPermissionResource>> ReadAsync(string pathServiceSid,
+                                                                                                       string pathDocumentSid,
+                                                                                                       int? pageSize = null,
+                                                                                                       long? limit = null,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadDocumentPermissionOptions(pathServiceSid, pathDocumentSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DocumentPermissionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DocumentPermissionResource> NextPage(Page<DocumentPermissionResource> page,
+                                                            ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DocumentPermissionResource> PreviousPage(Page<DocumentPermissionResource> page,
+                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateDocumentPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions/" + options.PathIdentity + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an identity's access to a specific Sync Document.
+    /// </summary>
+    /// <param name="options"> Update DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static DocumentPermissionResource Update(UpdateDocumentPermissionOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an identity's access to a specific Sync Document.
+    /// </summary>
+    /// <param name="options"> Update DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<DocumentPermissionResource> UpdateAsync(UpdateDocumentPermissionOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an identity's access to a specific Sync Document.
+    /// </summary>
+    /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
+    /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
+    /// <param name="read"> Read access. </param>
+    /// <param name="write"> Write access. </param>
+    /// <param name="manage"> Manage access. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static DocumentPermissionResource Update(string pathServiceSid,
+                                                    string pathDocumentSid,
+                                                    string pathIdentity,
+                                                    bool? read,
+                                                    bool? write,
+                                                    bool? manage,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity, read, write, manage);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an identity's access to a specific Sync Document.
+    /// </summary>
+    /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
+    /// <param name="pathDocumentSid"> Sync Document SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Document Permission applies. </param>
+    /// <param name="read"> Read access. </param>
+    /// <param name="write"> Write access. </param>
+    /// <param name="manage"> Manage access. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<DocumentPermissionResource> UpdateAsync(string pathServiceSid,
+                                                                                            string pathDocumentSid,
+                                                                                            string pathIdentity,
+                                                                                            bool? read,
+                                                                                            bool? write,
+                                                                                            bool? manage,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity, read, write, manage);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a DocumentPermissionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DocumentPermissionResource object represented by the provided JSON </returns>
+    public static DocumentPermissionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DocumentPermissionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Twilio Account SID.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Sync Service Instance SID.
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// Sync Document SID.
+    /// </summary>
+    [JsonProperty("document_sid")]
+    public string DocumentSid { get; private set; }
+    /// <summary>
+    /// Identity of the user to whom the Sync Document Permission applies.
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// Read access.
+    /// </summary>
+    [JsonProperty("read")]
+    public bool? _Read { get; private set; }
+    /// <summary>
+    /// Write access.
+    /// </summary>
+    [JsonProperty("write")]
+    public bool? Write { get; private set; }
+    /// <summary>
+    /// Manage access.
+    /// </summary>
+    [JsonProperty("manage")]
+    public bool? Manage { get; private set; }
+    /// <summary>
+    /// URL of this Sync Document Permission.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private DocumentPermissionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/DocumentOptions.cs b/src/Twilio/Rest/Preview/Sync/Service/DocumentOptions.cs
index b02a85ccd..23ffcd5a0 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/DocumentOptions.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/DocumentOptions.cs
@@ -9,236 +9,236 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Sync.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchDocumentOptions
+  /// </summary>
+  public class FetchDocumentOptions : IOptions<DocumentResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchDocumentOptions
-    /// </summary>
-    public class FetchDocumentOptions : IOptions<DocumentResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchDocumentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchDocumentOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteDocumentOptions
-    /// </summary>
-    public class DeleteDocumentOptions : IOptions<DocumentResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteDocumentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteDocumentOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateDocumentOptions
-    /// </summary>
-    public class CreateDocumentOptions : IOptions<DocumentResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The data
-        /// </summary>
-        public object Data { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateDocumentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public CreateDocumentOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchDocumentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchDocumentOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadDocumentOptions
-    /// </summary>
-    public class ReadDocumentOptions : ReadOptions<DocumentResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadDocumentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public ReadDocumentOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteDocumentOptions
+  /// </summary>
+  public class DeleteDocumentOptions : IOptions<DocumentResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateDocumentOptions
-    /// </summary>
-    public class UpdateDocumentOptions : IOptions<DocumentResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The data
-        /// </summary>
-        public object Data { get; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateDocumentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="data"> The data </param>
-        public UpdateDocumentOptions(string pathServiceSid, string pathSid, object data)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-            Data = data;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteDocumentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteDocumentOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateDocumentOptions
+  /// </summary>
+  public class CreateDocumentOptions : IOptions<DocumentResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The data
+    /// </summary>
+    public object Data { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateDocumentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public CreateDocumentOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadDocumentOptions
+  /// </summary>
+  public class ReadDocumentOptions : ReadOptions<DocumentResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadDocumentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public ReadDocumentOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateDocumentOptions
+  /// </summary>
+  public class UpdateDocumentOptions : IOptions<DocumentResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The data
+    /// </summary>
+    public object Data { get; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateDocumentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="data"> The data </param>
+    public UpdateDocumentOptions(string pathServiceSid, string pathSid, object data)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+      Data = data;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/DocumentResource.cs b/src/Twilio/Rest/Preview/Sync/Service/DocumentResource.cs
index 57f87e2d8..b5c040232 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/DocumentResource.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/DocumentResource.cs
@@ -19,517 +19,517 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Sync.Service
-{
-
-    public class DocumentResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static DocumentResource Fetch(FetchDocumentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<DocumentResource> FetchAsync(FetchDocumentOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static DocumentResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchDocumentOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<DocumentResource> FetchAsync(string pathServiceSid,
-                                                                                     string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchDocumentOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static bool Delete(DeleteDocumentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDocumentOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteDocumentOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteDocumentOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Documents",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static DocumentResource Create(CreateDocumentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<DocumentResource> CreateAsync(CreateDocumentOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="data"> The data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static DocumentResource Create(string pathServiceSid,
-                                              string uniqueName = null,
-                                              object data = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateDocumentOptions(pathServiceSid){UniqueName = uniqueName, Data = data};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="data"> The data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<DocumentResource> CreateAsync(string pathServiceSid,
-                                                                                      string uniqueName = null,
-                                                                                      object data = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateDocumentOptions(pathServiceSid){UniqueName = uniqueName, Data = data};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Documents",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static ResourceSet<DocumentResource> Read(ReadDocumentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DocumentResource>.FromJson("documents", response.Content);
-            return new ResourceSet<DocumentResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DocumentResource>> ReadAsync(ReadDocumentOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DocumentResource>.FromJson("documents", response.Content);
-            return new ResourceSet<DocumentResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static ResourceSet<DocumentResource> Read(string pathServiceSid,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadDocumentOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DocumentResource>> ReadAsync(string pathServiceSid,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadDocumentOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DocumentResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DocumentResource>.FromJson("documents", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DocumentResource> NextPage(Page<DocumentResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<DocumentResource>.FromJson("documents", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DocumentResource> PreviousPage(Page<DocumentResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<DocumentResource>.FromJson("documents", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static DocumentResource Update(UpdateDocumentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<DocumentResource> UpdateAsync(UpdateDocumentOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="data"> The data </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static DocumentResource Update(string pathServiceSid,
-                                              string pathSid,
-                                              object data,
-                                              string ifMatch = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateDocumentOptions(pathServiceSid, pathSid, data){IfMatch = ifMatch};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="data"> The data </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<DocumentResource> UpdateAsync(string pathServiceSid,
-                                                                                      string pathSid,
-                                                                                      object data,
-                                                                                      string ifMatch = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateDocumentOptions(pathServiceSid, pathSid, data){IfMatch = ifMatch};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a DocumentResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DocumentResource object represented by the provided JSON </returns>
-        public static DocumentResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DocumentResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The revision
-        /// </summary>
-        [JsonProperty("revision")]
-        public string Revision { get; private set; }
-        /// <summary>
-        /// The data
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The created_by
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-
-        private DocumentResource()
-        {
-
-        }
-    }
+{
+
+  public class DocumentResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static DocumentResource Fetch(FetchDocumentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<DocumentResource> FetchAsync(FetchDocumentOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static DocumentResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchDocumentOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<DocumentResource> FetchAsync(string pathServiceSid,
+                                                                                 string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchDocumentOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static bool Delete(DeleteDocumentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDocumentOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteDocumentOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteDocumentOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Documents",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static DocumentResource Create(CreateDocumentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<DocumentResource> CreateAsync(CreateDocumentOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="data"> The data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static DocumentResource Create(string pathServiceSid,
+                                          string uniqueName = null,
+                                          object data = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateDocumentOptions(pathServiceSid) { UniqueName = uniqueName, Data = data };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="data"> The data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<DocumentResource> CreateAsync(string pathServiceSid,
+                                                                                  string uniqueName = null,
+                                                                                  object data = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateDocumentOptions(pathServiceSid) { UniqueName = uniqueName, Data = data };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Documents",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static ResourceSet<DocumentResource> Read(ReadDocumentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DocumentResource>.FromJson("documents", response.Content);
+      return new ResourceSet<DocumentResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DocumentResource>> ReadAsync(ReadDocumentOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DocumentResource>.FromJson("documents", response.Content);
+      return new ResourceSet<DocumentResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static ResourceSet<DocumentResource> Read(string pathServiceSid,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadDocumentOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DocumentResource>> ReadAsync(string pathServiceSid,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadDocumentOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DocumentResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DocumentResource>.FromJson("documents", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DocumentResource> NextPage(Page<DocumentResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<DocumentResource>.FromJson("documents", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DocumentResource> PreviousPage(Page<DocumentResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<DocumentResource>.FromJson("documents", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Documents/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static DocumentResource Update(UpdateDocumentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<DocumentResource> UpdateAsync(UpdateDocumentOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="data"> The data </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static DocumentResource Update(string pathServiceSid,
+                                          string pathSid,
+                                          object data,
+                                          string ifMatch = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateDocumentOptions(pathServiceSid, pathSid, data) { IfMatch = ifMatch };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="data"> The data </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<DocumentResource> UpdateAsync(string pathServiceSid,
+                                                                                  string pathSid,
+                                                                                  object data,
+                                                                                  string ifMatch = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateDocumentOptions(pathServiceSid, pathSid, data) { IfMatch = ifMatch };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a DocumentResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DocumentResource object represented by the provided JSON </returns>
+    public static DocumentResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DocumentResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The revision
+    /// </summary>
+    [JsonProperty("revision")]
+    public string Revision { get; private set; }
+    /// <summary>
+    /// The data
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The created_by
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+
+    private DocumentResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListItemOptions.cs b/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListItemOptions.cs
index 4c7b98a45..09830345a 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListItemOptions.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListItemOptions.cs
@@ -9,304 +9,304 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Sync.Service.SyncList
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchSyncListItemOptions
+  /// </summary>
+  public class FetchSyncListItemOptions : IOptions<SyncListItemResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchSyncListItemOptions
-    /// </summary>
-    public class FetchSyncListItemOptions : IOptions<SyncListItemResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The list_sid
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// The index
-        /// </summary>
-        public int? PathIndex { get; }
-
-        /// <summary>
-        /// Construct a new FetchSyncListItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="pathIndex"> The index </param>
-        public FetchSyncListItemOptions(string pathServiceSid, string pathListSid, int? pathIndex)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            PathIndex = pathIndex;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteSyncListItemOptions
-    /// </summary>
-    public class DeleteSyncListItemOptions : IOptions<SyncListItemResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The list_sid
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// The index
-        /// </summary>
-        public int? PathIndex { get; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteSyncListItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="pathIndex"> The index </param>
-        public DeleteSyncListItemOptions(string pathServiceSid, string pathListSid, int? pathIndex)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            PathIndex = pathIndex;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
-
+    /// The list_sid
+    /// </summary>
+    public string PathListSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateSyncListItemOptions
-    /// </summary>
-    public class CreateSyncListItemOptions : IOptions<SyncListItemResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The list_sid
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// The data
-        /// </summary>
-        public object Data { get; }
-
-        /// <summary>
-        /// Construct a new CreateSyncListItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="data"> The data </param>
-        public CreateSyncListItemOptions(string pathServiceSid, string pathListSid, object data)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            Data = data;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            return p;
-        }
-    }
-
+    /// The index
+    /// </summary>
+    public int? PathIndex { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadSyncListItemOptions
-    /// </summary>
-    public class ReadSyncListItemOptions : ReadOptions<SyncListItemResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The list_sid
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// The order
-        /// </summary>
-        public SyncListItemResource.QueryResultOrderEnum Order { get; set; }
-        /// <summary>
-        /// The from
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// The bounds
-        /// </summary>
-        public SyncListItemResource.QueryFromBoundTypeEnum Bounds { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadSyncListItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        public ReadSyncListItemOptions(string pathServiceSid, string pathListSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Order != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            if (Bounds != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Bounds", Bounds.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchSyncListItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="pathIndex"> The index </param>
+    public FetchSyncListItemOptions(string pathServiceSid, string pathListSid, int? pathIndex)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      PathIndex = pathIndex;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateSyncListItemOptions
-    /// </summary>
-    public class UpdateSyncListItemOptions : IOptions<SyncListItemResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The list_sid
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// The index
-        /// </summary>
-        public int? PathIndex { get; }
-        /// <summary>
-        /// The data
-        /// </summary>
-        public object Data { get; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSyncListItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="pathIndex"> The index </param>
-        /// <param name="data"> The data </param>
-        public UpdateSyncListItemOptions(string pathServiceSid, string pathListSid, int? pathIndex, object data)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            PathIndex = pathIndex;
-            Data = data;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteSyncListItemOptions
+  /// </summary>
+  public class DeleteSyncListItemOptions : IOptions<SyncListItemResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The list_sid
+    /// </summary>
+    public string PathListSid { get; }
+    /// <summary>
+    /// The index
+    /// </summary>
+    public int? PathIndex { get; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteSyncListItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="pathIndex"> The index </param>
+    public DeleteSyncListItemOptions(string pathServiceSid, string pathListSid, int? pathIndex)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      PathIndex = pathIndex;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateSyncListItemOptions
+  /// </summary>
+  public class CreateSyncListItemOptions : IOptions<SyncListItemResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The list_sid
+    /// </summary>
+    public string PathListSid { get; }
+    /// <summary>
+    /// The data
+    /// </summary>
+    public object Data { get; }
+
+    /// <summary>
+    /// Construct a new CreateSyncListItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="data"> The data </param>
+    public CreateSyncListItemOptions(string pathServiceSid, string pathListSid, object data)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      Data = data;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadSyncListItemOptions
+  /// </summary>
+  public class ReadSyncListItemOptions : ReadOptions<SyncListItemResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The list_sid
+    /// </summary>
+    public string PathListSid { get; }
+    /// <summary>
+    /// The order
+    /// </summary>
+    public SyncListItemResource.QueryResultOrderEnum Order { get; set; }
+    /// <summary>
+    /// The from
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// The bounds
+    /// </summary>
+    public SyncListItemResource.QueryFromBoundTypeEnum Bounds { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadSyncListItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    public ReadSyncListItemOptions(string pathServiceSid, string pathListSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Order != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      if (Bounds != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Bounds", Bounds.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateSyncListItemOptions
+  /// </summary>
+  public class UpdateSyncListItemOptions : IOptions<SyncListItemResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The list_sid
+    /// </summary>
+    public string PathListSid { get; }
+    /// <summary>
+    /// The index
+    /// </summary>
+    public int? PathIndex { get; }
+    /// <summary>
+    /// The data
+    /// </summary>
+    public object Data { get; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSyncListItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="pathIndex"> The index </param>
+    /// <param name="data"> The data </param>
+    public UpdateSyncListItemOptions(string pathServiceSid, string pathListSid, int? pathIndex, object data)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      PathIndex = pathIndex;
+      Data = data;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListItemResource.cs b/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListItemResource.cs
index f3dc7e1bf..446a172b6 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListItemResource.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListItemResource.cs
@@ -20,575 +20,575 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Preview.Sync.Service.SyncList
-{
-
-    public class SyncListItemResource : Resource
-    {
-        public sealed class QueryResultOrderEnum : StringEnum
-        {
-            private QueryResultOrderEnum(string value) : base(value) {}
-            public QueryResultOrderEnum() {}
-            public static implicit operator QueryResultOrderEnum(string value)
-            {
-                return new QueryResultOrderEnum(value);
-            }
-
-            public static readonly QueryResultOrderEnum Asc = new QueryResultOrderEnum("asc");
-            public static readonly QueryResultOrderEnum Desc = new QueryResultOrderEnum("desc");
-        }
-
-        public sealed class QueryFromBoundTypeEnum : StringEnum
-        {
-            private QueryFromBoundTypeEnum(string value) : base(value) {}
-            public QueryFromBoundTypeEnum() {}
-            public static implicit operator QueryFromBoundTypeEnum(string value)
-            {
-                return new QueryFromBoundTypeEnum(value);
-            }
-
-            public static readonly QueryFromBoundTypeEnum Inclusive = new QueryFromBoundTypeEnum("inclusive");
-            public static readonly QueryFromBoundTypeEnum Exclusive = new QueryFromBoundTypeEnum("exclusive");
-        }
-
-        private static Request BuildFetchRequest(FetchSyncListItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items/" + options.PathIndex + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static SyncListItemResource Fetch(FetchSyncListItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<SyncListItemResource> FetchAsync(FetchSyncListItemOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="pathIndex"> The index </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static SyncListItemResource Fetch(string pathServiceSid,
-                                                 string pathListSid,
-                                                 int? pathIndex,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncListItemOptions(pathServiceSid, pathListSid, pathIndex);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="pathIndex"> The index </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<SyncListItemResource> FetchAsync(string pathServiceSid,
-                                                                                         string pathListSid,
-                                                                                         int? pathIndex,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncListItemOptions(pathServiceSid, pathListSid, pathIndex);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSyncListItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items/" + options.PathIndex + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static bool Delete(DeleteSyncListItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncListItemOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="pathIndex"> The index </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathListSid,
-                                  int? pathIndex,
-                                  string ifMatch = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncListItemOptions(pathServiceSid, pathListSid, pathIndex){IfMatch = ifMatch};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="pathIndex"> The index </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathListSid,
-                                                                          int? pathIndex,
-                                                                          string ifMatch = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncListItemOptions(pathServiceSid, pathListSid, pathIndex){IfMatch = ifMatch};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateSyncListItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static SyncListItemResource Create(CreateSyncListItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<SyncListItemResource> CreateAsync(CreateSyncListItemOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="data"> The data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static SyncListItemResource Create(string pathServiceSid,
-                                                  string pathListSid,
-                                                  object data,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncListItemOptions(pathServiceSid, pathListSid, data);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="data"> The data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<SyncListItemResource> CreateAsync(string pathServiceSid,
-                                                                                          string pathListSid,
-                                                                                          object data,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncListItemOptions(pathServiceSid, pathListSid, data);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSyncListItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static ResourceSet<SyncListItemResource> Read(ReadSyncListItemOptions options,
-                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SyncListItemResource>.FromJson("items", response.Content);
-            return new ResourceSet<SyncListItemResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncListItemResource>> ReadAsync(ReadSyncListItemOptions options,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SyncListItemResource>.FromJson("items", response.Content);
-            return new ResourceSet<SyncListItemResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="order"> The order </param>
-        /// <param name="from"> The from </param>
-        /// <param name="bounds"> The bounds </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static ResourceSet<SyncListItemResource> Read(string pathServiceSid,
-                                                             string pathListSid,
-                                                             SyncListItemResource.QueryResultOrderEnum order = null,
-                                                             string from = null,
-                                                             SyncListItemResource.QueryFromBoundTypeEnum bounds = null,
-                                                             int? pageSize = null,
-                                                             long? limit = null,
-                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncListItemOptions(pathServiceSid, pathListSid){Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="order"> The order </param>
-        /// <param name="from"> The from </param>
-        /// <param name="bounds"> The bounds </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncListItemResource>> ReadAsync(string pathServiceSid,
-                                                                                                     string pathListSid,
-                                                                                                     SyncListItemResource.QueryResultOrderEnum order = null,
-                                                                                                     string from = null,
-                                                                                                     SyncListItemResource.QueryFromBoundTypeEnum bounds = null,
-                                                                                                     int? pageSize = null,
-                                                                                                     long? limit = null,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncListItemOptions(pathServiceSid, pathListSid){Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SyncListItemResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListItemResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SyncListItemResource> NextPage(Page<SyncListItemResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListItemResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SyncListItemResource> PreviousPage(Page<SyncListItemResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListItemResource>.FromJson("items", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateSyncListItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items/" + options.PathIndex + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static SyncListItemResource Update(UpdateSyncListItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<SyncListItemResource> UpdateAsync(UpdateSyncListItemOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="pathIndex"> The index </param>
-        /// <param name="data"> The data </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static SyncListItemResource Update(string pathServiceSid,
-                                                  string pathListSid,
-                                                  int? pathIndex,
-                                                  object data,
-                                                  string ifMatch = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncListItemOptions(pathServiceSid, pathListSid, pathIndex, data){IfMatch = ifMatch};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> The list_sid </param>
-        /// <param name="pathIndex"> The index </param>
-        /// <param name="data"> The data </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<SyncListItemResource> UpdateAsync(string pathServiceSid,
-                                                                                          string pathListSid,
-                                                                                          int? pathIndex,
-                                                                                          object data,
-                                                                                          string ifMatch = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncListItemOptions(pathServiceSid, pathListSid, pathIndex, data){IfMatch = ifMatch};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SyncListItemResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SyncListItemResource object represented by the provided JSON </returns>
-        public static SyncListItemResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SyncListItemResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The index
-        /// </summary>
-        [JsonProperty("index")]
-        public int? Index { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The list_sid
-        /// </summary>
-        [JsonProperty("list_sid")]
-        public string ListSid { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The revision
-        /// </summary>
-        [JsonProperty("revision")]
-        public string Revision { get; private set; }
-        /// <summary>
-        /// The data
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The created_by
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-
-        private SyncListItemResource()
-        {
-
-        }
-    }
+{
+
+  public class SyncListItemResource : Resource
+  {
+    public sealed class QueryResultOrderEnum : StringEnum
+    {
+      private QueryResultOrderEnum(string value) : base(value) { }
+      public QueryResultOrderEnum() { }
+      public static implicit operator QueryResultOrderEnum(string value)
+      {
+        return new QueryResultOrderEnum(value);
+      }
+
+      public static readonly QueryResultOrderEnum Asc = new QueryResultOrderEnum("asc");
+      public static readonly QueryResultOrderEnum Desc = new QueryResultOrderEnum("desc");
+    }
+
+    public sealed class QueryFromBoundTypeEnum : StringEnum
+    {
+      private QueryFromBoundTypeEnum(string value) : base(value) { }
+      public QueryFromBoundTypeEnum() { }
+      public static implicit operator QueryFromBoundTypeEnum(string value)
+      {
+        return new QueryFromBoundTypeEnum(value);
+      }
+
+      public static readonly QueryFromBoundTypeEnum Inclusive = new QueryFromBoundTypeEnum("inclusive");
+      public static readonly QueryFromBoundTypeEnum Exclusive = new QueryFromBoundTypeEnum("exclusive");
+    }
+
+    private static Request BuildFetchRequest(FetchSyncListItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items/" + options.PathIndex + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static SyncListItemResource Fetch(FetchSyncListItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<SyncListItemResource> FetchAsync(FetchSyncListItemOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="pathIndex"> The index </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static SyncListItemResource Fetch(string pathServiceSid,
+                                             string pathListSid,
+                                             int? pathIndex,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncListItemOptions(pathServiceSid, pathListSid, pathIndex);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="pathIndex"> The index </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<SyncListItemResource> FetchAsync(string pathServiceSid,
+                                                                                     string pathListSid,
+                                                                                     int? pathIndex,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncListItemOptions(pathServiceSid, pathListSid, pathIndex);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSyncListItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items/" + options.PathIndex + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static bool Delete(DeleteSyncListItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncListItemOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="pathIndex"> The index </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathListSid,
+                              int? pathIndex,
+                              string ifMatch = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncListItemOptions(pathServiceSid, pathListSid, pathIndex) { IfMatch = ifMatch };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="pathIndex"> The index </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathListSid,
+                                                                      int? pathIndex,
+                                                                      string ifMatch = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncListItemOptions(pathServiceSid, pathListSid, pathIndex) { IfMatch = ifMatch };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateSyncListItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static SyncListItemResource Create(CreateSyncListItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<SyncListItemResource> CreateAsync(CreateSyncListItemOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="data"> The data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static SyncListItemResource Create(string pathServiceSid,
+                                              string pathListSid,
+                                              object data,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncListItemOptions(pathServiceSid, pathListSid, data);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="data"> The data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<SyncListItemResource> CreateAsync(string pathServiceSid,
+                                                                                      string pathListSid,
+                                                                                      object data,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncListItemOptions(pathServiceSid, pathListSid, data);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSyncListItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static ResourceSet<SyncListItemResource> Read(ReadSyncListItemOptions options,
+                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SyncListItemResource>.FromJson("items", response.Content);
+      return new ResourceSet<SyncListItemResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncListItemResource>> ReadAsync(ReadSyncListItemOptions options,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SyncListItemResource>.FromJson("items", response.Content);
+      return new ResourceSet<SyncListItemResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="order"> The order </param>
+    /// <param name="from"> The from </param>
+    /// <param name="bounds"> The bounds </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static ResourceSet<SyncListItemResource> Read(string pathServiceSid,
+                                                         string pathListSid,
+                                                         SyncListItemResource.QueryResultOrderEnum order = null,
+                                                         string from = null,
+                                                         SyncListItemResource.QueryFromBoundTypeEnum bounds = null,
+                                                         int? pageSize = null,
+                                                         long? limit = null,
+                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncListItemOptions(pathServiceSid, pathListSid) { Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="order"> The order </param>
+    /// <param name="from"> The from </param>
+    /// <param name="bounds"> The bounds </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncListItemResource>> ReadAsync(string pathServiceSid,
+                                                                                                 string pathListSid,
+                                                                                                 SyncListItemResource.QueryResultOrderEnum order = null,
+                                                                                                 string from = null,
+                                                                                                 SyncListItemResource.QueryFromBoundTypeEnum bounds = null,
+                                                                                                 int? pageSize = null,
+                                                                                                 long? limit = null,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncListItemOptions(pathServiceSid, pathListSid) { Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SyncListItemResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListItemResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SyncListItemResource> NextPage(Page<SyncListItemResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListItemResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SyncListItemResource> PreviousPage(Page<SyncListItemResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListItemResource>.FromJson("items", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateSyncListItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items/" + options.PathIndex + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static SyncListItemResource Update(UpdateSyncListItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<SyncListItemResource> UpdateAsync(UpdateSyncListItemOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="pathIndex"> The index </param>
+    /// <param name="data"> The data </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static SyncListItemResource Update(string pathServiceSid,
+                                              string pathListSid,
+                                              int? pathIndex,
+                                              object data,
+                                              string ifMatch = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncListItemOptions(pathServiceSid, pathListSid, pathIndex, data) { IfMatch = ifMatch };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> The list_sid </param>
+    /// <param name="pathIndex"> The index </param>
+    /// <param name="data"> The data </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<SyncListItemResource> UpdateAsync(string pathServiceSid,
+                                                                                      string pathListSid,
+                                                                                      int? pathIndex,
+                                                                                      object data,
+                                                                                      string ifMatch = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncListItemOptions(pathServiceSid, pathListSid, pathIndex, data) { IfMatch = ifMatch };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SyncListItemResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SyncListItemResource object represented by the provided JSON </returns>
+    public static SyncListItemResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SyncListItemResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The index
+    /// </summary>
+    [JsonProperty("index")]
+    public int? Index { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The list_sid
+    /// </summary>
+    [JsonProperty("list_sid")]
+    public string ListSid { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The revision
+    /// </summary>
+    [JsonProperty("revision")]
+    public string Revision { get; private set; }
+    /// <summary>
+    /// The data
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The created_by
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+
+    private SyncListItemResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListPermissionOptions.cs b/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListPermissionOptions.cs
index 66250b954..3409d88d1 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListPermissionOptions.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListPermissionOptions.cs
@@ -9,219 +9,219 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Sync.Service.SyncList
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch a specific Sync List Permission.
+  /// </summary>
+  public class FetchSyncListPermissionOptions : IOptions<SyncListPermissionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch a specific Sync List Permission.
-    /// </summary>
-    public class FetchSyncListPermissionOptions : IOptions<SyncListPermissionResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Sync List SID or unique name.
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// Identity of the user to whom the Sync List Permission applies.
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new FetchSyncListPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> Sync List SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
-        public FetchSyncListPermissionOptions(string pathServiceSid, string pathListSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Delete a specific Sync List Permission.
-    /// </summary>
-    public class DeleteSyncListPermissionOptions : IOptions<SyncListPermissionResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Sync List SID or unique name.
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// Identity of the user to whom the Sync List Permission applies.
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSyncListPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> Sync List SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
-        public DeleteSyncListPermissionOptions(string pathServiceSid, string pathListSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Sync List SID or unique name.
+    /// </summary>
+    public string PathListSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of all Permissions applying to a Sync List.
-    /// </summary>
-    public class ReadSyncListPermissionOptions : ReadOptions<SyncListPermissionResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Sync List SID or unique name.
-        /// </summary>
-        public string PathListSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadSyncListPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> Sync List SID or unique name. </param>
-        public ReadSyncListPermissionOptions(string pathServiceSid, string pathListSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Identity of the user to whom the Sync List Permission applies.
+    /// </summary>
+    public string PathIdentity { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Update an identity's access to a specific Sync List.
-    /// </summary>
-    public class UpdateSyncListPermissionOptions : IOptions<SyncListPermissionResource>
-    {
-        /// <summary>
-        /// Sync Service Instance SID.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Sync List SID or unique name.
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// Identity of the user to whom the Sync List Permission applies.
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// Read access.
-        /// </summary>
-        public bool? Read { get; }
-        /// <summary>
-        /// Write access.
-        /// </summary>
-        public bool? Write { get; }
-        /// <summary>
-        /// Manage access.
-        /// </summary>
-        public bool? Manage { get; }
-
-        /// <summary>
-        /// Construct a new UpdateSyncListPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
-        /// <param name="pathListSid"> Sync List SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
-        /// <param name="read"> Read access. </param>
-        /// <param name="write"> Write access. </param>
-        /// <param name="manage"> Manage access. </param>
-        public UpdateSyncListPermissionOptions(string pathServiceSid,
-                                               string pathListSid,
-                                               string pathIdentity,
-                                               bool? read,
-                                               bool? write,
-                                               bool? manage)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            PathIdentity = pathIdentity;
-            Read = read;
-            Write = write;
-            Manage = manage;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Read != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Read", Read.Value.ToString().ToLower()));
-            }
-
-            if (Write != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Write", Write.Value.ToString().ToLower()));
-            }
-
-            if (Manage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Manage", Manage.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new FetchSyncListPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> Sync List SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
+    public FetchSyncListPermissionOptions(string pathServiceSid, string pathListSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Delete a specific Sync List Permission.
+  /// </summary>
+  public class DeleteSyncListPermissionOptions : IOptions<SyncListPermissionResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Sync List SID or unique name.
+    /// </summary>
+    public string PathListSid { get; }
+    /// <summary>
+    /// Identity of the user to whom the Sync List Permission applies.
+    /// </summary>
+    public string PathIdentity { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSyncListPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> Sync List SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
+    public DeleteSyncListPermissionOptions(string pathServiceSid, string pathListSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of all Permissions applying to a Sync List.
+  /// </summary>
+  public class ReadSyncListPermissionOptions : ReadOptions<SyncListPermissionResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Sync List SID or unique name.
+    /// </summary>
+    public string PathListSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadSyncListPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> Sync List SID or unique name. </param>
+    public ReadSyncListPermissionOptions(string pathServiceSid, string pathListSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Update an identity's access to a specific Sync List.
+  /// </summary>
+  public class UpdateSyncListPermissionOptions : IOptions<SyncListPermissionResource>
+  {
+    /// <summary>
+    /// Sync Service Instance SID.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Sync List SID or unique name.
+    /// </summary>
+    public string PathListSid { get; }
+    /// <summary>
+    /// Identity of the user to whom the Sync List Permission applies.
+    /// </summary>
+    public string PathIdentity { get; }
+    /// <summary>
+    /// Read access.
+    /// </summary>
+    public bool? Read { get; }
+    /// <summary>
+    /// Write access.
+    /// </summary>
+    public bool? Write { get; }
+    /// <summary>
+    /// Manage access.
+    /// </summary>
+    public bool? Manage { get; }
+
+    /// <summary>
+    /// Construct a new UpdateSyncListPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
+    /// <param name="pathListSid"> Sync List SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
+    /// <param name="read"> Read access. </param>
+    /// <param name="write"> Write access. </param>
+    /// <param name="manage"> Manage access. </param>
+    public UpdateSyncListPermissionOptions(string pathServiceSid,
+                                           string pathListSid,
+                                           string pathIdentity,
+                                           bool? read,
+                                           bool? write,
+                                           bool? manage)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      PathIdentity = pathIdentity;
+      Read = read;
+      Write = write;
+      Manage = manage;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Read != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Read", Read.Value.ToString().ToLower()));
+      }
+
+      if (Write != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Write", Write.Value.ToString().ToLower()));
+      }
+
+      if (Manage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Manage", Manage.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListPermissionResource.cs b/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListPermissionResource.cs
index 97930b819..32aa28f63 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListPermissionResource.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/SyncList/SyncListPermissionResource.cs
@@ -19,455 +19,455 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Sync.Service.SyncList
-{
-
-    public class SyncListPermissionResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSyncListPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Sync List Permission.
-        /// </summary>
-        /// <param name="options"> Fetch SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static SyncListPermissionResource Fetch(FetchSyncListPermissionOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sync List Permission.
-        /// </summary>
-        /// <param name="options"> Fetch SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncListPermissionResource> FetchAsync(FetchSyncListPermissionOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Sync List Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> Sync List SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static SyncListPermissionResource Fetch(string pathServiceSid,
-                                                       string pathListSid,
-                                                       string pathIdentity,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sync List Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> Sync List SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncListPermissionResource> FetchAsync(string pathServiceSid,
-                                                                                               string pathListSid,
-                                                                                               string pathIdentity,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSyncListPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Sync List Permission.
-        /// </summary>
-        /// <param name="options"> Delete SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static bool Delete(DeleteSyncListPermissionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sync List Permission.
-        /// </summary>
-        /// <param name="options"> Delete SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncListPermissionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Sync List Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> Sync List SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathListSid,
-                                  string pathIdentity,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sync List Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> Sync List SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathListSid,
-                                                                          string pathIdentity,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSyncListPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync List.
-        /// </summary>
-        /// <param name="options"> Read SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static ResourceSet<SyncListPermissionResource> Read(ReadSyncListPermissionOptions options,
-                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
-            return new ResourceSet<SyncListPermissionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync List.
-        /// </summary>
-        /// <param name="options"> Read SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncListPermissionResource>> ReadAsync(ReadSyncListPermissionOptions options,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
-            return new ResourceSet<SyncListPermissionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync List.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> Sync List SID or unique name. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static ResourceSet<SyncListPermissionResource> Read(string pathServiceSid,
-                                                                   string pathListSid,
-                                                                   int? pageSize = null,
-                                                                   long? limit = null,
-                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncListPermissionOptions(pathServiceSid, pathListSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync List.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathListSid"> Sync List SID or unique name. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncListPermissionResource>> ReadAsync(string pathServiceSid,
-                                                                                                           string pathListSid,
-                                                                                                           int? pageSize = null,
-                                                                                                           long? limit = null,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncListPermissionOptions(pathServiceSid, pathListSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SyncListPermissionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SyncListPermissionResource> NextPage(Page<SyncListPermissionResource> page,
-                                                                ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SyncListPermissionResource> PreviousPage(Page<SyncListPermissionResource> page,
-                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateSyncListPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions/" + options.PathIdentity + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an identity's access to a specific Sync List.
-        /// </summary>
-        /// <param name="options"> Update SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static SyncListPermissionResource Update(UpdateSyncListPermissionOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an identity's access to a specific Sync List.
-        /// </summary>
-        /// <param name="options"> Update SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncListPermissionResource> UpdateAsync(UpdateSyncListPermissionOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an identity's access to a specific Sync List.
-        /// </summary>
-        /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
-        /// <param name="pathListSid"> Sync List SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
-        /// <param name="read"> Read access. </param>
-        /// <param name="write"> Write access. </param>
-        /// <param name="manage"> Manage access. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static SyncListPermissionResource Update(string pathServiceSid,
-                                                        string pathListSid,
-                                                        string pathIdentity,
-                                                        bool? read,
-                                                        bool? write,
-                                                        bool? manage,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity, read, write, manage);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an identity's access to a specific Sync List.
-        /// </summary>
-        /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
-        /// <param name="pathListSid"> Sync List SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
-        /// <param name="read"> Read access. </param>
-        /// <param name="write"> Write access. </param>
-        /// <param name="manage"> Manage access. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncListPermissionResource> UpdateAsync(string pathServiceSid,
-                                                                                                string pathListSid,
-                                                                                                string pathIdentity,
-                                                                                                bool? read,
-                                                                                                bool? write,
-                                                                                                bool? manage,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity, read, write, manage);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SyncListPermissionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SyncListPermissionResource object represented by the provided JSON </returns>
-        public static SyncListPermissionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SyncListPermissionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Twilio Account SID.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Sync Service Instance SID.
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// Sync List SID.
-        /// </summary>
-        [JsonProperty("list_sid")]
-        public string ListSid { get; private set; }
-        /// <summary>
-        /// Identity of the user to whom the Sync List Permission applies.
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// Read access.
-        /// </summary>
-        [JsonProperty("read")]
-        public bool? _Read { get; private set; }
-        /// <summary>
-        /// Write access.
-        /// </summary>
-        [JsonProperty("write")]
-        public bool? Write { get; private set; }
-        /// <summary>
-        /// Manage access.
-        /// </summary>
-        [JsonProperty("manage")]
-        public bool? Manage { get; private set; }
-        /// <summary>
-        /// URL of this Sync List Permission.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SyncListPermissionResource()
-        {
-
-        }
-    }
+{
+
+  public class SyncListPermissionResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSyncListPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Sync List Permission.
+    /// </summary>
+    /// <param name="options"> Fetch SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static SyncListPermissionResource Fetch(FetchSyncListPermissionOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sync List Permission.
+    /// </summary>
+    /// <param name="options"> Fetch SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncListPermissionResource> FetchAsync(FetchSyncListPermissionOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Sync List Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> Sync List SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static SyncListPermissionResource Fetch(string pathServiceSid,
+                                                   string pathListSid,
+                                                   string pathIdentity,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sync List Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> Sync List SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncListPermissionResource> FetchAsync(string pathServiceSid,
+                                                                                           string pathListSid,
+                                                                                           string pathIdentity,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSyncListPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Sync List Permission.
+    /// </summary>
+    /// <param name="options"> Delete SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static bool Delete(DeleteSyncListPermissionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sync List Permission.
+    /// </summary>
+    /// <param name="options"> Delete SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncListPermissionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Sync List Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> Sync List SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathListSid,
+                              string pathIdentity,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sync List Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> Sync List SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathListSid,
+                                                                      string pathIdentity,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSyncListPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync List.
+    /// </summary>
+    /// <param name="options"> Read SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static ResourceSet<SyncListPermissionResource> Read(ReadSyncListPermissionOptions options,
+                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
+      return new ResourceSet<SyncListPermissionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync List.
+    /// </summary>
+    /// <param name="options"> Read SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncListPermissionResource>> ReadAsync(ReadSyncListPermissionOptions options,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
+      return new ResourceSet<SyncListPermissionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync List.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> Sync List SID or unique name. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static ResourceSet<SyncListPermissionResource> Read(string pathServiceSid,
+                                                               string pathListSid,
+                                                               int? pageSize = null,
+                                                               long? limit = null,
+                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncListPermissionOptions(pathServiceSid, pathListSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync List.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathListSid"> Sync List SID or unique name. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncListPermissionResource>> ReadAsync(string pathServiceSid,
+                                                                                                       string pathListSid,
+                                                                                                       int? pageSize = null,
+                                                                                                       long? limit = null,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncListPermissionOptions(pathServiceSid, pathListSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SyncListPermissionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SyncListPermissionResource> NextPage(Page<SyncListPermissionResource> page,
+                                                            ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SyncListPermissionResource> PreviousPage(Page<SyncListPermissionResource> page,
+                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateSyncListPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions/" + options.PathIdentity + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an identity's access to a specific Sync List.
+    /// </summary>
+    /// <param name="options"> Update SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static SyncListPermissionResource Update(UpdateSyncListPermissionOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an identity's access to a specific Sync List.
+    /// </summary>
+    /// <param name="options"> Update SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncListPermissionResource> UpdateAsync(UpdateSyncListPermissionOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an identity's access to a specific Sync List.
+    /// </summary>
+    /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
+    /// <param name="pathListSid"> Sync List SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
+    /// <param name="read"> Read access. </param>
+    /// <param name="write"> Write access. </param>
+    /// <param name="manage"> Manage access. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static SyncListPermissionResource Update(string pathServiceSid,
+                                                    string pathListSid,
+                                                    string pathIdentity,
+                                                    bool? read,
+                                                    bool? write,
+                                                    bool? manage,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity, read, write, manage);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an identity's access to a specific Sync List.
+    /// </summary>
+    /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
+    /// <param name="pathListSid"> Sync List SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync List Permission applies. </param>
+    /// <param name="read"> Read access. </param>
+    /// <param name="write"> Write access. </param>
+    /// <param name="manage"> Manage access. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncListPermissionResource> UpdateAsync(string pathServiceSid,
+                                                                                            string pathListSid,
+                                                                                            string pathIdentity,
+                                                                                            bool? read,
+                                                                                            bool? write,
+                                                                                            bool? manage,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity, read, write, manage);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SyncListPermissionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SyncListPermissionResource object represented by the provided JSON </returns>
+    public static SyncListPermissionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SyncListPermissionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Twilio Account SID.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Sync Service Instance SID.
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// Sync List SID.
+    /// </summary>
+    [JsonProperty("list_sid")]
+    public string ListSid { get; private set; }
+    /// <summary>
+    /// Identity of the user to whom the Sync List Permission applies.
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// Read access.
+    /// </summary>
+    [JsonProperty("read")]
+    public bool? _Read { get; private set; }
+    /// <summary>
+    /// Write access.
+    /// </summary>
+    [JsonProperty("write")]
+    public bool? Write { get; private set; }
+    /// <summary>
+    /// Manage access.
+    /// </summary>
+    [JsonProperty("manage")]
+    public bool? Manage { get; private set; }
+    /// <summary>
+    /// URL of this Sync List Permission.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SyncListPermissionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/SyncListOptions.cs b/src/Twilio/Rest/Preview/Sync/Service/SyncListOptions.cs
index c15cf0002..884ad1de7 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/SyncListOptions.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/SyncListOptions.cs
@@ -9,160 +9,160 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Sync.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchSyncListOptions
+  /// </summary>
+  public class FetchSyncListOptions : IOptions<SyncListResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchSyncListOptions
+    /// The service_sid
     /// </summary>
-    public class FetchSyncListOptions : IOptions<SyncListResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSyncListOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchSyncListOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteSyncListOptions
+    /// The sid
     /// </summary>
-    public class DeleteSyncListOptions : IOptions<SyncListResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSyncListOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteSyncListOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateSyncListOptions
+    /// Construct a new FetchSyncListOptions
     /// </summary>
-    public class CreateSyncListOptions : IOptions<SyncListResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        public string UniqueName { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSyncListOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public CreateSyncListOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchSyncListOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadSyncListOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadSyncListOptions : ReadOptions<SyncListResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadSyncListOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public ReadSyncListOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteSyncListOptions
+  /// </summary>
+  public class DeleteSyncListOptions : IOptions<SyncListResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSyncListOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteSyncListOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateSyncListOptions
+  /// </summary>
+  public class CreateSyncListOptions : IOptions<SyncListResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    public string UniqueName { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateSyncListOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public CreateSyncListOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadSyncListOptions
+  /// </summary>
+  public class ReadSyncListOptions : ReadOptions<SyncListResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadSyncListOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public ReadSyncListOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/SyncListResource.cs b/src/Twilio/Rest/Preview/Sync/Service/SyncListResource.cs
index 34b15814d..0383dae9a 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/SyncListResource.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/SyncListResource.cs
@@ -19,428 +19,428 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Sync.Service
-{
-
-    public class SyncListResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSyncListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static SyncListResource Fetch(FetchSyncListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<SyncListResource> FetchAsync(FetchSyncListOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static SyncListResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncListOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<SyncListResource> FetchAsync(string pathServiceSid,
-                                                                                     string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncListOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSyncListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static bool Delete(DeleteSyncListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncListOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncListOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncListOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateSyncListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Lists",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static SyncListResource Create(CreateSyncListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<SyncListResource> CreateAsync(CreateSyncListOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static SyncListResource Create(string pathServiceSid,
-                                              string uniqueName = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncListOptions(pathServiceSid){UniqueName = uniqueName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<SyncListResource> CreateAsync(string pathServiceSid,
-                                                                                      string uniqueName = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncListOptions(pathServiceSid){UniqueName = uniqueName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSyncListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Lists",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static ResourceSet<SyncListResource> Read(ReadSyncListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SyncListResource>.FromJson("lists", response.Content);
-            return new ResourceSet<SyncListResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncListResource>> ReadAsync(ReadSyncListOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SyncListResource>.FromJson("lists", response.Content);
-            return new ResourceSet<SyncListResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static ResourceSet<SyncListResource> Read(string pathServiceSid,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncListOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncListResource>> ReadAsync(string pathServiceSid,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncListOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SyncListResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListResource>.FromJson("lists", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SyncListResource> NextPage(Page<SyncListResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListResource>.FromJson("lists", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SyncListResource> PreviousPage(Page<SyncListResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListResource>.FromJson("lists", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a SyncListResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SyncListResource object represented by the provided JSON </returns>
-        public static SyncListResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SyncListResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The revision
-        /// </summary>
-        [JsonProperty("revision")]
-        public string Revision { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The created_by
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-
-        private SyncListResource()
-        {
-
-        }
-    }
+{
+
+  public class SyncListResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSyncListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static SyncListResource Fetch(FetchSyncListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<SyncListResource> FetchAsync(FetchSyncListOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static SyncListResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncListOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<SyncListResource> FetchAsync(string pathServiceSid,
+                                                                                 string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncListOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSyncListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Lists/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static bool Delete(DeleteSyncListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncListOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncListOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncListOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateSyncListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Lists",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static SyncListResource Create(CreateSyncListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<SyncListResource> CreateAsync(CreateSyncListOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static SyncListResource Create(string pathServiceSid,
+                                          string uniqueName = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncListOptions(pathServiceSid) { UniqueName = uniqueName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<SyncListResource> CreateAsync(string pathServiceSid,
+                                                                                  string uniqueName = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncListOptions(pathServiceSid) { UniqueName = uniqueName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSyncListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Lists",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static ResourceSet<SyncListResource> Read(ReadSyncListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SyncListResource>.FromJson("lists", response.Content);
+      return new ResourceSet<SyncListResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncListResource>> ReadAsync(ReadSyncListOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SyncListResource>.FromJson("lists", response.Content);
+      return new ResourceSet<SyncListResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static ResourceSet<SyncListResource> Read(string pathServiceSid,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncListOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncListResource>> ReadAsync(string pathServiceSid,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncListOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SyncListResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListResource>.FromJson("lists", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SyncListResource> NextPage(Page<SyncListResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListResource>.FromJson("lists", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SyncListResource> PreviousPage(Page<SyncListResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListResource>.FromJson("lists", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a SyncListResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SyncListResource object represented by the provided JSON </returns>
+    public static SyncListResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SyncListResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The revision
+    /// </summary>
+    [JsonProperty("revision")]
+    public string Revision { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The created_by
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+
+    private SyncListResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapItemOptions.cs b/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapItemOptions.cs
index 16b9e659c..8a0890f67 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapItemOptions.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapItemOptions.cs
@@ -9,315 +9,315 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Sync.Service.SyncMap
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchSyncMapItemOptions
+  /// </summary>
+  public class FetchSyncMapItemOptions : IOptions<SyncMapItemResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchSyncMapItemOptions
-    /// </summary>
-    public class FetchSyncMapItemOptions : IOptions<SyncMapItemResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The map_sid
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// The key
-        /// </summary>
-        public string PathKey { get; }
-
-        /// <summary>
-        /// Construct a new FetchSyncMapItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="pathKey"> The key </param>
-        public FetchSyncMapItemOptions(string pathServiceSid, string pathMapSid, string pathKey)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            PathKey = pathKey;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteSyncMapItemOptions
-    /// </summary>
-    public class DeleteSyncMapItemOptions : IOptions<SyncMapItemResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The map_sid
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// The key
-        /// </summary>
-        public string PathKey { get; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteSyncMapItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="pathKey"> The key </param>
-        public DeleteSyncMapItemOptions(string pathServiceSid, string pathMapSid, string pathKey)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            PathKey = pathKey;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
-
+    /// The map_sid
+    /// </summary>
+    public string PathMapSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateSyncMapItemOptions
-    /// </summary>
-    public class CreateSyncMapItemOptions : IOptions<SyncMapItemResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The map_sid
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// The key
-        /// </summary>
-        public string Key { get; }
-        /// <summary>
-        /// The data
-        /// </summary>
-        public object Data { get; }
-
-        /// <summary>
-        /// Construct a new CreateSyncMapItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="key"> The key </param>
-        /// <param name="data"> The data </param>
-        public CreateSyncMapItemOptions(string pathServiceSid, string pathMapSid, string key, object data)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            Key = key;
-            Data = data;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Key != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Key", Key));
-            }
-
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            return p;
-        }
-    }
-
+    /// The key
+    /// </summary>
+    public string PathKey { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadSyncMapItemOptions
-    /// </summary>
-    public class ReadSyncMapItemOptions : ReadOptions<SyncMapItemResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The map_sid
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// The order
-        /// </summary>
-        public SyncMapItemResource.QueryResultOrderEnum Order { get; set; }
-        /// <summary>
-        /// The from
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// The bounds
-        /// </summary>
-        public SyncMapItemResource.QueryFromBoundTypeEnum Bounds { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadSyncMapItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        public ReadSyncMapItemOptions(string pathServiceSid, string pathMapSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Order != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            if (Bounds != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Bounds", Bounds.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchSyncMapItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="pathKey"> The key </param>
+    public FetchSyncMapItemOptions(string pathServiceSid, string pathMapSid, string pathKey)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      PathKey = pathKey;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateSyncMapItemOptions
-    /// </summary>
-    public class UpdateSyncMapItemOptions : IOptions<SyncMapItemResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The map_sid
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// The key
-        /// </summary>
-        public string PathKey { get; }
-        /// <summary>
-        /// The data
-        /// </summary>
-        public object Data { get; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSyncMapItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="pathKey"> The key </param>
-        /// <param name="data"> The data </param>
-        public UpdateSyncMapItemOptions(string pathServiceSid, string pathMapSid, string pathKey, object data)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            PathKey = pathKey;
-            Data = data;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteSyncMapItemOptions
+  /// </summary>
+  public class DeleteSyncMapItemOptions : IOptions<SyncMapItemResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The map_sid
+    /// </summary>
+    public string PathMapSid { get; }
+    /// <summary>
+    /// The key
+    /// </summary>
+    public string PathKey { get; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteSyncMapItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="pathKey"> The key </param>
+    public DeleteSyncMapItemOptions(string pathServiceSid, string pathMapSid, string pathKey)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      PathKey = pathKey;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateSyncMapItemOptions
+  /// </summary>
+  public class CreateSyncMapItemOptions : IOptions<SyncMapItemResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The map_sid
+    /// </summary>
+    public string PathMapSid { get; }
+    /// <summary>
+    /// The key
+    /// </summary>
+    public string Key { get; }
+    /// <summary>
+    /// The data
+    /// </summary>
+    public object Data { get; }
+
+    /// <summary>
+    /// Construct a new CreateSyncMapItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="key"> The key </param>
+    /// <param name="data"> The data </param>
+    public CreateSyncMapItemOptions(string pathServiceSid, string pathMapSid, string key, object data)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      Key = key;
+      Data = data;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Key != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Key", Key));
+      }
+
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadSyncMapItemOptions
+  /// </summary>
+  public class ReadSyncMapItemOptions : ReadOptions<SyncMapItemResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The map_sid
+    /// </summary>
+    public string PathMapSid { get; }
+    /// <summary>
+    /// The order
+    /// </summary>
+    public SyncMapItemResource.QueryResultOrderEnum Order { get; set; }
+    /// <summary>
+    /// The from
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// The bounds
+    /// </summary>
+    public SyncMapItemResource.QueryFromBoundTypeEnum Bounds { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadSyncMapItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    public ReadSyncMapItemOptions(string pathServiceSid, string pathMapSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Order != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      if (Bounds != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Bounds", Bounds.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateSyncMapItemOptions
+  /// </summary>
+  public class UpdateSyncMapItemOptions : IOptions<SyncMapItemResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The map_sid
+    /// </summary>
+    public string PathMapSid { get; }
+    /// <summary>
+    /// The key
+    /// </summary>
+    public string PathKey { get; }
+    /// <summary>
+    /// The data
+    /// </summary>
+    public object Data { get; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSyncMapItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="pathKey"> The key </param>
+    /// <param name="data"> The data </param>
+    public UpdateSyncMapItemOptions(string pathServiceSid, string pathMapSid, string pathKey, object data)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      PathKey = pathKey;
+      Data = data;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapItemResource.cs b/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapItemResource.cs
index 179a66d55..a99d86d0b 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapItemResource.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapItemResource.cs
@@ -20,578 +20,578 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Preview.Sync.Service.SyncMap
-{
-
-    public class SyncMapItemResource : Resource
-    {
-        public sealed class QueryResultOrderEnum : StringEnum
-        {
-            private QueryResultOrderEnum(string value) : base(value) {}
-            public QueryResultOrderEnum() {}
-            public static implicit operator QueryResultOrderEnum(string value)
-            {
-                return new QueryResultOrderEnum(value);
-            }
-
-            public static readonly QueryResultOrderEnum Asc = new QueryResultOrderEnum("asc");
-            public static readonly QueryResultOrderEnum Desc = new QueryResultOrderEnum("desc");
-        }
-
-        public sealed class QueryFromBoundTypeEnum : StringEnum
-        {
-            private QueryFromBoundTypeEnum(string value) : base(value) {}
-            public QueryFromBoundTypeEnum() {}
-            public static implicit operator QueryFromBoundTypeEnum(string value)
-            {
-                return new QueryFromBoundTypeEnum(value);
-            }
-
-            public static readonly QueryFromBoundTypeEnum Inclusive = new QueryFromBoundTypeEnum("inclusive");
-            public static readonly QueryFromBoundTypeEnum Exclusive = new QueryFromBoundTypeEnum("exclusive");
-        }
-
-        private static Request BuildFetchRequest(FetchSyncMapItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items/" + options.PathKey + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static SyncMapItemResource Fetch(FetchSyncMapItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<SyncMapItemResource> FetchAsync(FetchSyncMapItemOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="pathKey"> The key </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static SyncMapItemResource Fetch(string pathServiceSid,
-                                                string pathMapSid,
-                                                string pathKey,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="pathKey"> The key </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<SyncMapItemResource> FetchAsync(string pathServiceSid,
-                                                                                        string pathMapSid,
-                                                                                        string pathKey,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSyncMapItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items/" + options.PathKey + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static bool Delete(DeleteSyncMapItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncMapItemOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="pathKey"> The key </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathMapSid,
-                                  string pathKey,
-                                  string ifMatch = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey){IfMatch = ifMatch};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="pathKey"> The key </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathMapSid,
-                                                                          string pathKey,
-                                                                          string ifMatch = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey){IfMatch = ifMatch};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateSyncMapItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static SyncMapItemResource Create(CreateSyncMapItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<SyncMapItemResource> CreateAsync(CreateSyncMapItemOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="key"> The key </param>
-        /// <param name="data"> The data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static SyncMapItemResource Create(string pathServiceSid,
-                                                 string pathMapSid,
-                                                 string key,
-                                                 object data,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncMapItemOptions(pathServiceSid, pathMapSid, key, data);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="key"> The key </param>
-        /// <param name="data"> The data </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<SyncMapItemResource> CreateAsync(string pathServiceSid,
-                                                                                         string pathMapSid,
-                                                                                         string key,
-                                                                                         object data,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncMapItemOptions(pathServiceSid, pathMapSid, key, data);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSyncMapItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static ResourceSet<SyncMapItemResource> Read(ReadSyncMapItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SyncMapItemResource>.FromJson("items", response.Content);
-            return new ResourceSet<SyncMapItemResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncMapItemResource>> ReadAsync(ReadSyncMapItemOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SyncMapItemResource>.FromJson("items", response.Content);
-            return new ResourceSet<SyncMapItemResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="order"> The order </param>
-        /// <param name="from"> The from </param>
-        /// <param name="bounds"> The bounds </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static ResourceSet<SyncMapItemResource> Read(string pathServiceSid,
-                                                            string pathMapSid,
-                                                            SyncMapItemResource.QueryResultOrderEnum order = null,
-                                                            string from = null,
-                                                            SyncMapItemResource.QueryFromBoundTypeEnum bounds = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncMapItemOptions(pathServiceSid, pathMapSid){Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="order"> The order </param>
-        /// <param name="from"> The from </param>
-        /// <param name="bounds"> The bounds </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncMapItemResource>> ReadAsync(string pathServiceSid,
-                                                                                                    string pathMapSid,
-                                                                                                    SyncMapItemResource.QueryResultOrderEnum order = null,
-                                                                                                    string from = null,
-                                                                                                    SyncMapItemResource.QueryFromBoundTypeEnum bounds = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncMapItemOptions(pathServiceSid, pathMapSid){Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SyncMapItemResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapItemResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SyncMapItemResource> NextPage(Page<SyncMapItemResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapItemResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SyncMapItemResource> PreviousPage(Page<SyncMapItemResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapItemResource>.FromJson("items", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateSyncMapItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items/" + options.PathKey + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static SyncMapItemResource Update(UpdateSyncMapItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<SyncMapItemResource> UpdateAsync(UpdateSyncMapItemOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="pathKey"> The key </param>
-        /// <param name="data"> The data </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static SyncMapItemResource Update(string pathServiceSid,
-                                                 string pathMapSid,
-                                                 string pathKey,
-                                                 object data,
-                                                 string ifMatch = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey, data){IfMatch = ifMatch};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> The map_sid </param>
-        /// <param name="pathKey"> The key </param>
-        /// <param name="data"> The data </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<SyncMapItemResource> UpdateAsync(string pathServiceSid,
-                                                                                         string pathMapSid,
-                                                                                         string pathKey,
-                                                                                         object data,
-                                                                                         string ifMatch = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey, data){IfMatch = ifMatch};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SyncMapItemResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SyncMapItemResource object represented by the provided JSON </returns>
-        public static SyncMapItemResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SyncMapItemResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The key
-        /// </summary>
-        [JsonProperty("key")]
-        public string Key { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The map_sid
-        /// </summary>
-        [JsonProperty("map_sid")]
-        public string MapSid { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The revision
-        /// </summary>
-        [JsonProperty("revision")]
-        public string Revision { get; private set; }
-        /// <summary>
-        /// The data
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The created_by
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-
-        private SyncMapItemResource()
-        {
-
-        }
-    }
+{
+
+  public class SyncMapItemResource : Resource
+  {
+    public sealed class QueryResultOrderEnum : StringEnum
+    {
+      private QueryResultOrderEnum(string value) : base(value) { }
+      public QueryResultOrderEnum() { }
+      public static implicit operator QueryResultOrderEnum(string value)
+      {
+        return new QueryResultOrderEnum(value);
+      }
+
+      public static readonly QueryResultOrderEnum Asc = new QueryResultOrderEnum("asc");
+      public static readonly QueryResultOrderEnum Desc = new QueryResultOrderEnum("desc");
+    }
+
+    public sealed class QueryFromBoundTypeEnum : StringEnum
+    {
+      private QueryFromBoundTypeEnum(string value) : base(value) { }
+      public QueryFromBoundTypeEnum() { }
+      public static implicit operator QueryFromBoundTypeEnum(string value)
+      {
+        return new QueryFromBoundTypeEnum(value);
+      }
+
+      public static readonly QueryFromBoundTypeEnum Inclusive = new QueryFromBoundTypeEnum("inclusive");
+      public static readonly QueryFromBoundTypeEnum Exclusive = new QueryFromBoundTypeEnum("exclusive");
+    }
+
+    private static Request BuildFetchRequest(FetchSyncMapItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items/" + options.PathKey + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static SyncMapItemResource Fetch(FetchSyncMapItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<SyncMapItemResource> FetchAsync(FetchSyncMapItemOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="pathKey"> The key </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static SyncMapItemResource Fetch(string pathServiceSid,
+                                            string pathMapSid,
+                                            string pathKey,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="pathKey"> The key </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<SyncMapItemResource> FetchAsync(string pathServiceSid,
+                                                                                    string pathMapSid,
+                                                                                    string pathKey,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSyncMapItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items/" + options.PathKey + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static bool Delete(DeleteSyncMapItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncMapItemOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="pathKey"> The key </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathMapSid,
+                              string pathKey,
+                              string ifMatch = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey) { IfMatch = ifMatch };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="pathKey"> The key </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathMapSid,
+                                                                      string pathKey,
+                                                                      string ifMatch = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey) { IfMatch = ifMatch };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateSyncMapItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static SyncMapItemResource Create(CreateSyncMapItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<SyncMapItemResource> CreateAsync(CreateSyncMapItemOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="key"> The key </param>
+    /// <param name="data"> The data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static SyncMapItemResource Create(string pathServiceSid,
+                                             string pathMapSid,
+                                             string key,
+                                             object data,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncMapItemOptions(pathServiceSid, pathMapSid, key, data);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="key"> The key </param>
+    /// <param name="data"> The data </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<SyncMapItemResource> CreateAsync(string pathServiceSid,
+                                                                                     string pathMapSid,
+                                                                                     string key,
+                                                                                     object data,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncMapItemOptions(pathServiceSid, pathMapSid, key, data);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSyncMapItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static ResourceSet<SyncMapItemResource> Read(ReadSyncMapItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SyncMapItemResource>.FromJson("items", response.Content);
+      return new ResourceSet<SyncMapItemResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncMapItemResource>> ReadAsync(ReadSyncMapItemOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SyncMapItemResource>.FromJson("items", response.Content);
+      return new ResourceSet<SyncMapItemResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="order"> The order </param>
+    /// <param name="from"> The from </param>
+    /// <param name="bounds"> The bounds </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static ResourceSet<SyncMapItemResource> Read(string pathServiceSid,
+                                                        string pathMapSid,
+                                                        SyncMapItemResource.QueryResultOrderEnum order = null,
+                                                        string from = null,
+                                                        SyncMapItemResource.QueryFromBoundTypeEnum bounds = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncMapItemOptions(pathServiceSid, pathMapSid) { Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="order"> The order </param>
+    /// <param name="from"> The from </param>
+    /// <param name="bounds"> The bounds </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncMapItemResource>> ReadAsync(string pathServiceSid,
+                                                                                                string pathMapSid,
+                                                                                                SyncMapItemResource.QueryResultOrderEnum order = null,
+                                                                                                string from = null,
+                                                                                                SyncMapItemResource.QueryFromBoundTypeEnum bounds = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncMapItemOptions(pathServiceSid, pathMapSid) { Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SyncMapItemResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapItemResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SyncMapItemResource> NextPage(Page<SyncMapItemResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapItemResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SyncMapItemResource> PreviousPage(Page<SyncMapItemResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapItemResource>.FromJson("items", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateSyncMapItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items/" + options.PathKey + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static SyncMapItemResource Update(UpdateSyncMapItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<SyncMapItemResource> UpdateAsync(UpdateSyncMapItemOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="pathKey"> The key </param>
+    /// <param name="data"> The data </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static SyncMapItemResource Update(string pathServiceSid,
+                                             string pathMapSid,
+                                             string pathKey,
+                                             object data,
+                                             string ifMatch = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey, data) { IfMatch = ifMatch };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> The map_sid </param>
+    /// <param name="pathKey"> The key </param>
+    /// <param name="data"> The data </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<SyncMapItemResource> UpdateAsync(string pathServiceSid,
+                                                                                     string pathMapSid,
+                                                                                     string pathKey,
+                                                                                     object data,
+                                                                                     string ifMatch = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey, data) { IfMatch = ifMatch };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SyncMapItemResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SyncMapItemResource object represented by the provided JSON </returns>
+    public static SyncMapItemResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SyncMapItemResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The key
+    /// </summary>
+    [JsonProperty("key")]
+    public string Key { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The map_sid
+    /// </summary>
+    [JsonProperty("map_sid")]
+    public string MapSid { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The revision
+    /// </summary>
+    [JsonProperty("revision")]
+    public string Revision { get; private set; }
+    /// <summary>
+    /// The data
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The created_by
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+
+    private SyncMapItemResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapPermissionOptions.cs b/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapPermissionOptions.cs
index 0b369e203..724c75c89 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapPermissionOptions.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapPermissionOptions.cs
@@ -9,219 +9,219 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Sync.Service.SyncMap
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch a specific Sync Map Permission.
+  /// </summary>
+  public class FetchSyncMapPermissionOptions : IOptions<SyncMapPermissionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch a specific Sync Map Permission.
-    /// </summary>
-    public class FetchSyncMapPermissionOptions : IOptions<SyncMapPermissionResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Sync Map SID or unique name.
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// Identity of the user to whom the Sync Map Permission applies.
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new FetchSyncMapPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
-        public FetchSyncMapPermissionOptions(string pathServiceSid, string pathMapSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Delete a specific Sync Map Permission.
-    /// </summary>
-    public class DeleteSyncMapPermissionOptions : IOptions<SyncMapPermissionResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Sync Map SID or unique name.
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// Identity of the user to whom the Sync Map Permission applies.
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSyncMapPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
-        public DeleteSyncMapPermissionOptions(string pathServiceSid, string pathMapSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Sync Map SID or unique name.
+    /// </summary>
+    public string PathMapSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a list of all Permissions applying to a Sync Map.
-    /// </summary>
-    public class ReadSyncMapPermissionOptions : ReadOptions<SyncMapPermissionResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Sync Map SID or unique name.
-        /// </summary>
-        public string PathMapSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadSyncMapPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
-        public ReadSyncMapPermissionOptions(string pathServiceSid, string pathMapSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Identity of the user to whom the Sync Map Permission applies.
+    /// </summary>
+    public string PathIdentity { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Update an identity's access to a specific Sync Map.
-    /// </summary>
-    public class UpdateSyncMapPermissionOptions : IOptions<SyncMapPermissionResource>
-    {
-        /// <summary>
-        /// Sync Service Instance SID.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Sync Map SID or unique name.
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// Identity of the user to whom the Sync Map Permission applies.
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// Read access.
-        /// </summary>
-        public bool? Read { get; }
-        /// <summary>
-        /// Write access.
-        /// </summary>
-        public bool? Write { get; }
-        /// <summary>
-        /// Manage access.
-        /// </summary>
-        public bool? Manage { get; }
-
-        /// <summary>
-        /// Construct a new UpdateSyncMapPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
-        /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
-        /// <param name="read"> Read access. </param>
-        /// <param name="write"> Write access. </param>
-        /// <param name="manage"> Manage access. </param>
-        public UpdateSyncMapPermissionOptions(string pathServiceSid,
-                                              string pathMapSid,
-                                              string pathIdentity,
-                                              bool? read,
-                                              bool? write,
-                                              bool? manage)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            PathIdentity = pathIdentity;
-            Read = read;
-            Write = write;
-            Manage = manage;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Read != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Read", Read.Value.ToString().ToLower()));
-            }
-
-            if (Write != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Write", Write.Value.ToString().ToLower()));
-            }
-
-            if (Manage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Manage", Manage.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new FetchSyncMapPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
+    public FetchSyncMapPermissionOptions(string pathServiceSid, string pathMapSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Delete a specific Sync Map Permission.
+  /// </summary>
+  public class DeleteSyncMapPermissionOptions : IOptions<SyncMapPermissionResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Sync Map SID or unique name.
+    /// </summary>
+    public string PathMapSid { get; }
+    /// <summary>
+    /// Identity of the user to whom the Sync Map Permission applies.
+    /// </summary>
+    public string PathIdentity { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSyncMapPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
+    public DeleteSyncMapPermissionOptions(string pathServiceSid, string pathMapSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a list of all Permissions applying to a Sync Map.
+  /// </summary>
+  public class ReadSyncMapPermissionOptions : ReadOptions<SyncMapPermissionResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Sync Map SID or unique name.
+    /// </summary>
+    public string PathMapSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadSyncMapPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
+    public ReadSyncMapPermissionOptions(string pathServiceSid, string pathMapSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Update an identity's access to a specific Sync Map.
+  /// </summary>
+  public class UpdateSyncMapPermissionOptions : IOptions<SyncMapPermissionResource>
+  {
+    /// <summary>
+    /// Sync Service Instance SID.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Sync Map SID or unique name.
+    /// </summary>
+    public string PathMapSid { get; }
+    /// <summary>
+    /// Identity of the user to whom the Sync Map Permission applies.
+    /// </summary>
+    public string PathIdentity { get; }
+    /// <summary>
+    /// Read access.
+    /// </summary>
+    public bool? Read { get; }
+    /// <summary>
+    /// Write access.
+    /// </summary>
+    public bool? Write { get; }
+    /// <summary>
+    /// Manage access.
+    /// </summary>
+    public bool? Manage { get; }
+
+    /// <summary>
+    /// Construct a new UpdateSyncMapPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
+    /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
+    /// <param name="read"> Read access. </param>
+    /// <param name="write"> Write access. </param>
+    /// <param name="manage"> Manage access. </param>
+    public UpdateSyncMapPermissionOptions(string pathServiceSid,
+                                          string pathMapSid,
+                                          string pathIdentity,
+                                          bool? read,
+                                          bool? write,
+                                          bool? manage)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      PathIdentity = pathIdentity;
+      Read = read;
+      Write = write;
+      Manage = manage;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Read != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Read", Read.Value.ToString().ToLower()));
+      }
+
+      if (Write != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Write", Write.Value.ToString().ToLower()));
+      }
+
+      if (Manage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Manage", Manage.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapPermissionResource.cs b/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapPermissionResource.cs
index 499f951b5..fdf82e873 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapPermissionResource.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/SyncMap/SyncMapPermissionResource.cs
@@ -19,454 +19,454 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Sync.Service.SyncMap
-{
-
-    public class SyncMapPermissionResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSyncMapPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="options"> Fetch SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static SyncMapPermissionResource Fetch(FetchSyncMapPermissionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="options"> Fetch SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncMapPermissionResource> FetchAsync(FetchSyncMapPermissionOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static SyncMapPermissionResource Fetch(string pathServiceSid,
-                                                      string pathMapSid,
-                                                      string pathIdentity,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncMapPermissionResource> FetchAsync(string pathServiceSid,
-                                                                                              string pathMapSid,
-                                                                                              string pathIdentity,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSyncMapPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="options"> Delete SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static bool Delete(DeleteSyncMapPermissionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="options"> Delete SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncMapPermissionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathMapSid,
-                                  string pathIdentity,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathMapSid,
-                                                                          string pathIdentity,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSyncMapPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Map.
-        /// </summary>
-        /// <param name="options"> Read SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static ResourceSet<SyncMapPermissionResource> Read(ReadSyncMapPermissionOptions options,
-                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
-            return new ResourceSet<SyncMapPermissionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Map.
-        /// </summary>
-        /// <param name="options"> Read SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncMapPermissionResource>> ReadAsync(ReadSyncMapPermissionOptions options,
-                                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
-            return new ResourceSet<SyncMapPermissionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Map.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static ResourceSet<SyncMapPermissionResource> Read(string pathServiceSid,
-                                                                  string pathMapSid,
-                                                                  int? pageSize = null,
-                                                                  long? limit = null,
-                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncMapPermissionOptions(pathServiceSid, pathMapSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Map.
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncMapPermissionResource>> ReadAsync(string pathServiceSid,
-                                                                                                          string pathMapSid,
-                                                                                                          int? pageSize = null,
-                                                                                                          long? limit = null,
-                                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncMapPermissionOptions(pathServiceSid, pathMapSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SyncMapPermissionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SyncMapPermissionResource> NextPage(Page<SyncMapPermissionResource> page,
-                                                               ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SyncMapPermissionResource> PreviousPage(Page<SyncMapPermissionResource> page,
-                                                                   ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateSyncMapPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions/" + options.PathIdentity + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an identity's access to a specific Sync Map.
-        /// </summary>
-        /// <param name="options"> Update SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static SyncMapPermissionResource Update(UpdateSyncMapPermissionOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an identity's access to a specific Sync Map.
-        /// </summary>
-        /// <param name="options"> Update SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncMapPermissionResource> UpdateAsync(UpdateSyncMapPermissionOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an identity's access to a specific Sync Map.
-        /// </summary>
-        /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
-        /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
-        /// <param name="read"> Read access. </param>
-        /// <param name="write"> Write access. </param>
-        /// <param name="manage"> Manage access. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static SyncMapPermissionResource Update(string pathServiceSid,
-                                                       string pathMapSid,
-                                                       string pathIdentity,
-                                                       bool? read,
-                                                       bool? write,
-                                                       bool? manage,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity, read, write, manage);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an identity's access to a specific Sync Map.
-        /// </summary>
-        /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
-        /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
-        /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
-        /// <param name="read"> Read access. </param>
-        /// <param name="write"> Write access. </param>
-        /// <param name="manage"> Manage access. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncMapPermissionResource> UpdateAsync(string pathServiceSid,
-                                                                                               string pathMapSid,
-                                                                                               string pathIdentity,
-                                                                                               bool? read,
-                                                                                               bool? write,
-                                                                                               bool? manage,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity, read, write, manage);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SyncMapPermissionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SyncMapPermissionResource object represented by the provided JSON </returns>
-        public static SyncMapPermissionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SyncMapPermissionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Twilio Account SID.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Sync Service Instance SID.
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// Sync Map SID.
-        /// </summary>
-        [JsonProperty("map_sid")]
-        public string MapSid { get; private set; }
-        /// <summary>
-        /// Identity of the user to whom the Sync Map Permission applies.
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// Read access.
-        /// </summary>
-        [JsonProperty("read")]
-        public bool? _Read { get; private set; }
-        /// <summary>
-        /// Write access.
-        /// </summary>
-        [JsonProperty("write")]
-        public bool? Write { get; private set; }
-        /// <summary>
-        /// Manage access.
-        /// </summary>
-        [JsonProperty("manage")]
-        public bool? Manage { get; private set; }
-        /// <summary>
-        /// URL of this Sync Map Permission.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SyncMapPermissionResource()
-        {
-
-        }
-    }
+{
+
+  public class SyncMapPermissionResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSyncMapPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="options"> Fetch SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static SyncMapPermissionResource Fetch(FetchSyncMapPermissionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="options"> Fetch SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncMapPermissionResource> FetchAsync(FetchSyncMapPermissionOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static SyncMapPermissionResource Fetch(string pathServiceSid,
+                                                  string pathMapSid,
+                                                  string pathIdentity,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncMapPermissionResource> FetchAsync(string pathServiceSid,
+                                                                                          string pathMapSid,
+                                                                                          string pathIdentity,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSyncMapPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="options"> Delete SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static bool Delete(DeleteSyncMapPermissionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="options"> Delete SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncMapPermissionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathMapSid,
+                              string pathIdentity,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathMapSid,
+                                                                      string pathIdentity,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSyncMapPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Map.
+    /// </summary>
+    /// <param name="options"> Read SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static ResourceSet<SyncMapPermissionResource> Read(ReadSyncMapPermissionOptions options,
+                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
+      return new ResourceSet<SyncMapPermissionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Map.
+    /// </summary>
+    /// <param name="options"> Read SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncMapPermissionResource>> ReadAsync(ReadSyncMapPermissionOptions options,
+                                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
+      return new ResourceSet<SyncMapPermissionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Map.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static ResourceSet<SyncMapPermissionResource> Read(string pathServiceSid,
+                                                              string pathMapSid,
+                                                              int? pageSize = null,
+                                                              long? limit = null,
+                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncMapPermissionOptions(pathServiceSid, pathMapSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Map.
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncMapPermissionResource>> ReadAsync(string pathServiceSid,
+                                                                                                      string pathMapSid,
+                                                                                                      int? pageSize = null,
+                                                                                                      long? limit = null,
+                                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncMapPermissionOptions(pathServiceSid, pathMapSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SyncMapPermissionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SyncMapPermissionResource> NextPage(Page<SyncMapPermissionResource> page,
+                                                           ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SyncMapPermissionResource> PreviousPage(Page<SyncMapPermissionResource> page,
+                                                               ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateSyncMapPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions/" + options.PathIdentity + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an identity's access to a specific Sync Map.
+    /// </summary>
+    /// <param name="options"> Update SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static SyncMapPermissionResource Update(UpdateSyncMapPermissionOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an identity's access to a specific Sync Map.
+    /// </summary>
+    /// <param name="options"> Update SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncMapPermissionResource> UpdateAsync(UpdateSyncMapPermissionOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an identity's access to a specific Sync Map.
+    /// </summary>
+    /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
+    /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
+    /// <param name="read"> Read access. </param>
+    /// <param name="write"> Write access. </param>
+    /// <param name="manage"> Manage access. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static SyncMapPermissionResource Update(string pathServiceSid,
+                                                   string pathMapSid,
+                                                   string pathIdentity,
+                                                   bool? read,
+                                                   bool? write,
+                                                   bool? manage,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity, read, write, manage);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an identity's access to a specific Sync Map.
+    /// </summary>
+    /// <param name="pathServiceSid"> Sync Service Instance SID. </param>
+    /// <param name="pathMapSid"> Sync Map SID or unique name. </param>
+    /// <param name="pathIdentity"> Identity of the user to whom the Sync Map Permission applies. </param>
+    /// <param name="read"> Read access. </param>
+    /// <param name="write"> Write access. </param>
+    /// <param name="manage"> Manage access. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncMapPermissionResource> UpdateAsync(string pathServiceSid,
+                                                                                           string pathMapSid,
+                                                                                           string pathIdentity,
+                                                                                           bool? read,
+                                                                                           bool? write,
+                                                                                           bool? manage,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity, read, write, manage);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SyncMapPermissionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SyncMapPermissionResource object represented by the provided JSON </returns>
+    public static SyncMapPermissionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SyncMapPermissionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Twilio Account SID.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Sync Service Instance SID.
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// Sync Map SID.
+    /// </summary>
+    [JsonProperty("map_sid")]
+    public string MapSid { get; private set; }
+    /// <summary>
+    /// Identity of the user to whom the Sync Map Permission applies.
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// Read access.
+    /// </summary>
+    [JsonProperty("read")]
+    public bool? _Read { get; private set; }
+    /// <summary>
+    /// Write access.
+    /// </summary>
+    [JsonProperty("write")]
+    public bool? Write { get; private set; }
+    /// <summary>
+    /// Manage access.
+    /// </summary>
+    [JsonProperty("manage")]
+    public bool? Manage { get; private set; }
+    /// <summary>
+    /// URL of this Sync Map Permission.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SyncMapPermissionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/SyncMapOptions.cs b/src/Twilio/Rest/Preview/Sync/Service/SyncMapOptions.cs
index 0b724c47b..7a4a9e0d8 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/SyncMapOptions.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/SyncMapOptions.cs
@@ -9,160 +9,160 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Sync.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchSyncMapOptions
+  /// </summary>
+  public class FetchSyncMapOptions : IOptions<SyncMapResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchSyncMapOptions
+    /// The service_sid
     /// </summary>
-    public class FetchSyncMapOptions : IOptions<SyncMapResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSyncMapOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchSyncMapOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteSyncMapOptions
+    /// The sid
     /// </summary>
-    public class DeleteSyncMapOptions : IOptions<SyncMapResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSyncMapOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteSyncMapOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateSyncMapOptions
+    /// Construct a new FetchSyncMapOptions
     /// </summary>
-    public class CreateSyncMapOptions : IOptions<SyncMapResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        public string UniqueName { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSyncMapOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public CreateSyncMapOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchSyncMapOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadSyncMapOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadSyncMapOptions : ReadOptions<SyncMapResource>
-    {
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadSyncMapOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        public ReadSyncMapOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteSyncMapOptions
+  /// </summary>
+  public class DeleteSyncMapOptions : IOptions<SyncMapResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSyncMapOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteSyncMapOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateSyncMapOptions
+  /// </summary>
+  public class CreateSyncMapOptions : IOptions<SyncMapResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    public string UniqueName { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateSyncMapOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public CreateSyncMapOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadSyncMapOptions
+  /// </summary>
+  public class ReadSyncMapOptions : ReadOptions<SyncMapResource>
+  {
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadSyncMapOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    public ReadSyncMapOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/Service/SyncMapResource.cs b/src/Twilio/Rest/Preview/Sync/Service/SyncMapResource.cs
index 69e73fb84..2db181089 100644
--- a/src/Twilio/Rest/Preview/Sync/Service/SyncMapResource.cs
+++ b/src/Twilio/Rest/Preview/Sync/Service/SyncMapResource.cs
@@ -19,428 +19,428 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Sync.Service
-{
-
-    public class SyncMapResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSyncMapOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static SyncMapResource Fetch(FetchSyncMapOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<SyncMapResource> FetchAsync(FetchSyncMapOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static SyncMapResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncMapOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<SyncMapResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncMapOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSyncMapOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static bool Delete(DeleteSyncMapOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncMapOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncMapOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncMapOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateSyncMapOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Maps",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static SyncMapResource Create(CreateSyncMapOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<SyncMapResource> CreateAsync(CreateSyncMapOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static SyncMapResource Create(string pathServiceSid,
-                                             string uniqueName = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncMapOptions(pathServiceSid){UniqueName = uniqueName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<SyncMapResource> CreateAsync(string pathServiceSid,
-                                                                                     string uniqueName = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncMapOptions(pathServiceSid){UniqueName = uniqueName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSyncMapOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathServiceSid + "/Maps",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static ResourceSet<SyncMapResource> Read(ReadSyncMapOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SyncMapResource>.FromJson("maps", response.Content);
-            return new ResourceSet<SyncMapResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncMapResource>> ReadAsync(ReadSyncMapOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SyncMapResource>.FromJson("maps", response.Content);
-            return new ResourceSet<SyncMapResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static ResourceSet<SyncMapResource> Read(string pathServiceSid,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncMapOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The service_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncMapResource>> ReadAsync(string pathServiceSid,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncMapOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SyncMapResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapResource>.FromJson("maps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SyncMapResource> NextPage(Page<SyncMapResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapResource>.FromJson("maps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SyncMapResource> PreviousPage(Page<SyncMapResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapResource>.FromJson("maps", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a SyncMapResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SyncMapResource object represented by the provided JSON </returns>
-        public static SyncMapResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SyncMapResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The revision
-        /// </summary>
-        [JsonProperty("revision")]
-        public string Revision { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The created_by
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-
-        private SyncMapResource()
-        {
-
-        }
-    }
+{
+
+  public class SyncMapResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSyncMapOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static SyncMapResource Fetch(FetchSyncMapOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<SyncMapResource> FetchAsync(FetchSyncMapOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static SyncMapResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncMapOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<SyncMapResource> FetchAsync(string pathServiceSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncMapOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSyncMapOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Maps/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static bool Delete(DeleteSyncMapOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncMapOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncMapOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncMapOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateSyncMapOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Maps",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static SyncMapResource Create(CreateSyncMapOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<SyncMapResource> CreateAsync(CreateSyncMapOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static SyncMapResource Create(string pathServiceSid,
+                                         string uniqueName = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncMapOptions(pathServiceSid) { UniqueName = uniqueName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<SyncMapResource> CreateAsync(string pathServiceSid,
+                                                                                 string uniqueName = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncMapOptions(pathServiceSid) { UniqueName = uniqueName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSyncMapOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathServiceSid + "/Maps",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static ResourceSet<SyncMapResource> Read(ReadSyncMapOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SyncMapResource>.FromJson("maps", response.Content);
+      return new ResourceSet<SyncMapResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncMapResource>> ReadAsync(ReadSyncMapOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SyncMapResource>.FromJson("maps", response.Content);
+      return new ResourceSet<SyncMapResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static ResourceSet<SyncMapResource> Read(string pathServiceSid,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncMapOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The service_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncMapResource>> ReadAsync(string pathServiceSid,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncMapOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SyncMapResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapResource>.FromJson("maps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SyncMapResource> NextPage(Page<SyncMapResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapResource>.FromJson("maps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SyncMapResource> PreviousPage(Page<SyncMapResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapResource>.FromJson("maps", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a SyncMapResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SyncMapResource object represented by the provided JSON </returns>
+    public static SyncMapResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SyncMapResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The revision
+    /// </summary>
+    [JsonProperty("revision")]
+    public string Revision { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The created_by
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+
+    private SyncMapResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/ServiceOptions.cs b/src/Twilio/Rest/Preview/Sync/ServiceOptions.cs
index 823bec597..d84bee8b3 100644
--- a/src/Twilio/Rest/Preview/Sync/ServiceOptions.cs
+++ b/src/Twilio/Rest/Preview/Sync/ServiceOptions.cs
@@ -9,216 +9,216 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Sync
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchServiceOptions
+  /// </summary>
+  public class FetchServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchServiceOptions
-    /// </summary>
-    public class FetchServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public FetchServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteServiceOptions
-    /// </summary>
-    public class DeleteServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new FetchServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public FetchServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateServiceOptions
-    /// </summary>
-    public class CreateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The webhook_url
-        /// </summary>
-        public Uri WebhookUrl { get; set; }
-        /// <summary>
-        /// The reachability_webhooks_enabled
-        /// </summary>
-        public bool? ReachabilityWebhooksEnabled { get; set; }
-        /// <summary>
-        /// The acl_enabled
-        /// </summary>
-        public bool? AclEnabled { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (WebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
-            }
-
-            if (ReachabilityWebhooksEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReachabilityWebhooksEnabled", ReachabilityWebhooksEnabled.Value.ToString().ToLower()));
-            }
-
-            if (AclEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AclEnabled", AclEnabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteServiceOptions
+  /// </summary>
+  public class DeleteServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadServiceOptions
-    /// </summary>
-    public class ReadServiceOptions : ReadOptions<ServiceResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateServiceOptions
-    /// </summary>
-    public class UpdateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The webhook_url
-        /// </summary>
-        public Uri WebhookUrl { get; set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The reachability_webhooks_enabled
-        /// </summary>
-        public bool? ReachabilityWebhooksEnabled { get; set; }
-        /// <summary>
-        /// The acl_enabled
-        /// </summary>
-        public bool? AclEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (WebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (ReachabilityWebhooksEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReachabilityWebhooksEnabled", ReachabilityWebhooksEnabled.Value.ToString().ToLower()));
-            }
-
-            if (AclEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AclEnabled", AclEnabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new DeleteServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateServiceOptions
+  /// </summary>
+  public class CreateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The webhook_url
+    /// </summary>
+    public Uri WebhookUrl { get; set; }
+    /// <summary>
+    /// The reachability_webhooks_enabled
+    /// </summary>
+    public bool? ReachabilityWebhooksEnabled { get; set; }
+    /// <summary>
+    /// The acl_enabled
+    /// </summary>
+    public bool? AclEnabled { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (WebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
+      }
+
+      if (ReachabilityWebhooksEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReachabilityWebhooksEnabled", ReachabilityWebhooksEnabled.Value.ToString().ToLower()));
+      }
+
+      if (AclEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AclEnabled", AclEnabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadServiceOptions
+  /// </summary>
+  public class ReadServiceOptions : ReadOptions<ServiceResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateServiceOptions
+  /// </summary>
+  public class UpdateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The webhook_url
+    /// </summary>
+    public Uri WebhookUrl { get; set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The reachability_webhooks_enabled
+    /// </summary>
+    public bool? ReachabilityWebhooksEnabled { get; set; }
+    /// <summary>
+    /// The acl_enabled
+    /// </summary>
+    public bool? AclEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (WebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (ReachabilityWebhooksEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReachabilityWebhooksEnabled", ReachabilityWebhooksEnabled.Value.ToString().ToLower()));
+      }
+
+      if (AclEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AclEnabled", AclEnabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Sync/ServiceResource.cs b/src/Twilio/Rest/Preview/Sync/ServiceResource.cs
index 668551c80..48f1c3886 100644
--- a/src/Twilio/Rest/Preview/Sync/ServiceResource.cs
+++ b/src/Twilio/Rest/Preview/Sync/ServiceResource.cs
@@ -19,509 +19,509 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Sync
-{
-
-    public class ServiceResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/Sync/Services",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="webhookUrl"> The webhook_url </param>
-        /// <param name="reachabilityWebhooksEnabled"> The reachability_webhooks_enabled </param>
-        /// <param name="aclEnabled"> The acl_enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(string friendlyName = null,
-                                             Uri webhookUrl = null,
-                                             bool? reachabilityWebhooksEnabled = null,
-                                             bool? aclEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(){FriendlyName = friendlyName, WebhookUrl = webhookUrl, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="webhookUrl"> The webhook_url </param>
-        /// <param name="reachabilityWebhooksEnabled"> The reachability_webhooks_enabled </param>
-        /// <param name="aclEnabled"> The acl_enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName = null,
-                                                                                     Uri webhookUrl = null,
-                                                                                     bool? reachabilityWebhooksEnabled = null,
-                                                                                     bool? aclEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(){FriendlyName = friendlyName, WebhookUrl = webhookUrl, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/Sync/Services",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/Sync/Services/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="webhookUrl"> The webhook_url </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="reachabilityWebhooksEnabled"> The reachability_webhooks_enabled </param>
-        /// <param name="aclEnabled"> The acl_enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(string pathSid,
-                                             Uri webhookUrl = null,
-                                             string friendlyName = null,
-                                             bool? reachabilityWebhooksEnabled = null,
-                                             bool? aclEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){WebhookUrl = webhookUrl, FriendlyName = friendlyName, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="webhookUrl"> The webhook_url </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="reachabilityWebhooksEnabled"> The reachability_webhooks_enabled </param>
-        /// <param name="aclEnabled"> The acl_enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
-                                                                                     Uri webhookUrl = null,
-                                                                                     string friendlyName = null,
-                                                                                     bool? reachabilityWebhooksEnabled = null,
-                                                                                     bool? aclEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){WebhookUrl = webhookUrl, FriendlyName = friendlyName, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ServiceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ServiceResource object represented by the provided JSON </returns>
-        public static ServiceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ServiceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The webhook_url
-        /// </summary>
-        [JsonProperty("webhook_url")]
-        public Uri WebhookUrl { get; private set; }
-        /// <summary>
-        /// The reachability_webhooks_enabled
-        /// </summary>
-        [JsonProperty("reachability_webhooks_enabled")]
-        public bool? ReachabilityWebhooksEnabled { get; private set; }
-        /// <summary>
-        /// The acl_enabled
-        /// </summary>
-        [JsonProperty("acl_enabled")]
-        public bool? AclEnabled { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ServiceResource()
-        {
-
-        }
-    }
+{
+
+  public class ServiceResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/Sync/Services",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="webhookUrl"> The webhook_url </param>
+    /// <param name="reachabilityWebhooksEnabled"> The reachability_webhooks_enabled </param>
+    /// <param name="aclEnabled"> The acl_enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(string friendlyName = null,
+                                         Uri webhookUrl = null,
+                                         bool? reachabilityWebhooksEnabled = null,
+                                         bool? aclEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions() { FriendlyName = friendlyName, WebhookUrl = webhookUrl, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="webhookUrl"> The webhook_url </param>
+    /// <param name="reachabilityWebhooksEnabled"> The reachability_webhooks_enabled </param>
+    /// <param name="aclEnabled"> The acl_enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName = null,
+                                                                                 Uri webhookUrl = null,
+                                                                                 bool? reachabilityWebhooksEnabled = null,
+                                                                                 bool? aclEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions() { FriendlyName = friendlyName, WebhookUrl = webhookUrl, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/Sync/Services",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/Sync/Services/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="webhookUrl"> The webhook_url </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="reachabilityWebhooksEnabled"> The reachability_webhooks_enabled </param>
+    /// <param name="aclEnabled"> The acl_enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(string pathSid,
+                                         Uri webhookUrl = null,
+                                         string friendlyName = null,
+                                         bool? reachabilityWebhooksEnabled = null,
+                                         bool? aclEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { WebhookUrl = webhookUrl, FriendlyName = friendlyName, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="webhookUrl"> The webhook_url </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="reachabilityWebhooksEnabled"> The reachability_webhooks_enabled </param>
+    /// <param name="aclEnabled"> The acl_enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
+                                                                                 Uri webhookUrl = null,
+                                                                                 string friendlyName = null,
+                                                                                 bool? reachabilityWebhooksEnabled = null,
+                                                                                 bool? aclEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { WebhookUrl = webhookUrl, FriendlyName = friendlyName, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ServiceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ServiceResource object represented by the provided JSON </returns>
+    public static ServiceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ServiceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The webhook_url
+    /// </summary>
+    [JsonProperty("webhook_url")]
+    public Uri WebhookUrl { get; private set; }
+    /// <summary>
+    /// The reachability_webhooks_enabled
+    /// </summary>
+    [JsonProperty("reachability_webhooks_enabled")]
+    public bool? ReachabilityWebhooksEnabled { get; private set; }
+    /// <summary>
+    /// The acl_enabled
+    /// </summary>
+    [JsonProperty("acl_enabled")]
+    public bool? AclEnabled { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ServiceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/TrustedComms/BrandedChannel/ChannelOptions.cs b/src/Twilio/Rest/Preview/TrustedComms/BrandedChannel/ChannelOptions.cs
index 3f3d11377..404d4bab6 100644
--- a/src/Twilio/Rest/Preview/TrustedComms/BrandedChannel/ChannelOptions.cs
+++ b/src/Twilio/Rest/Preview/TrustedComms/BrandedChannel/ChannelOptions.cs
@@ -9,49 +9,49 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.TrustedComms.BrandedChannel
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Associate a channel to a branded channel
+  /// </summary>
+  public class CreateChannelOptions : IOptions<ChannelResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Associate a channel to a branded channel
+    /// Branded Channel Sid.
     /// </summary>
-    public class CreateChannelOptions : IOptions<ChannelResource>
-    {
-        /// <summary>
-        /// Branded Channel Sid.
-        /// </summary>
-        public string PathBrandedChannelSid { get; }
-        /// <summary>
-        /// Phone Number Sid to be branded.
-        /// </summary>
-        public string PhoneNumberSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateChannelOptions
-        /// </summary>
-        /// <param name="pathBrandedChannelSid"> Branded Channel Sid. </param>
-        /// <param name="phoneNumberSid"> Phone Number Sid to be branded. </param>
-        public CreateChannelOptions(string pathBrandedChannelSid, string phoneNumberSid)
-        {
-            PathBrandedChannelSid = pathBrandedChannelSid;
-            PhoneNumberSid = phoneNumberSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PhoneNumberSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumberSid", PhoneNumberSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathBrandedChannelSid { get; }
+    /// <summary>
+    /// Phone Number Sid to be branded.
+    /// </summary>
+    public string PhoneNumberSid { get; }
+
+    /// <summary>
+    /// Construct a new CreateChannelOptions
+    /// </summary>
+    /// <param name="pathBrandedChannelSid"> Branded Channel Sid. </param>
+    /// <param name="phoneNumberSid"> Phone Number Sid to be branded. </param>
+    public CreateChannelOptions(string pathBrandedChannelSid, string phoneNumberSid)
+    {
+      PathBrandedChannelSid = pathBrandedChannelSid;
+      PhoneNumberSid = phoneNumberSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PhoneNumberSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumberSid", PhoneNumberSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/TrustedComms/BrandedChannel/ChannelResource.cs b/src/Twilio/Rest/Preview/TrustedComms/BrandedChannel/ChannelResource.cs
index 0d42cb456..7a49b8778 100644
--- a/src/Twilio/Rest/Preview/TrustedComms/BrandedChannel/ChannelResource.cs
+++ b/src/Twilio/Rest/Preview/TrustedComms/BrandedChannel/ChannelResource.cs
@@ -19,140 +19,140 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.TrustedComms.BrandedChannel
-{
-
-    public class ChannelResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/TrustedComms/BrandedChannels/" + options.PathBrandedChannelSid + "/Channels",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Associate a channel to a branded channel
-        /// </summary>
-        /// <param name="options"> Create Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Create(CreateChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Associate a channel to a branded channel
-        /// </summary>
-        /// <param name="options"> Create Channel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(CreateChannelOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Associate a channel to a branded channel
-        /// </summary>
-        /// <param name="pathBrandedChannelSid"> Branded Channel Sid. </param>
-        /// <param name="phoneNumberSid"> Phone Number Sid to be branded. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Channel </returns>
-        public static ChannelResource Create(string pathBrandedChannelSid,
-                                             string phoneNumberSid,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateChannelOptions(pathBrandedChannelSid, phoneNumberSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Associate a channel to a branded channel
-        /// </summary>
-        /// <param name="pathBrandedChannelSid"> Branded Channel Sid. </param>
-        /// <param name="phoneNumberSid"> Phone Number Sid to be branded. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Channel </returns>
-        public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(string pathBrandedChannelSid,
-                                                                                     string phoneNumberSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateChannelOptions(pathBrandedChannelSid, phoneNumberSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ChannelResource object represented by the provided JSON </returns>
-        public static ChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Account Sid.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Business Sid.
-        /// </summary>
-        [JsonProperty("business_sid")]
-        public string BusinessSid { get; private set; }
-        /// <summary>
-        /// Brand Sid.
-        /// </summary>
-        [JsonProperty("brand_sid")]
-        public string BrandSid { get; private set; }
-        /// <summary>
-        /// Branded Channel Sid.
-        /// </summary>
-        [JsonProperty("branded_channel_sid")]
-        public string BrandedChannelSid { get; private set; }
-        /// <summary>
-        /// Phone Number Sid to be branded.
-        /// </summary>
-        [JsonProperty("phone_number_sid")]
-        public string PhoneNumberSid { get; private set; }
-        /// <summary>
-        /// Twilio number to assign to the Branded Channel
-        /// </summary>
-        [JsonProperty("phone_number")]
-        public string PhoneNumber { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private ChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class ChannelResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/TrustedComms/BrandedChannels/" + options.PathBrandedChannelSid + "/Channels",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Associate a channel to a branded channel
+    /// </summary>
+    /// <param name="options"> Create Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Create(CreateChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Associate a channel to a branded channel
+    /// </summary>
+    /// <param name="options"> Create Channel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(CreateChannelOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Associate a channel to a branded channel
+    /// </summary>
+    /// <param name="pathBrandedChannelSid"> Branded Channel Sid. </param>
+    /// <param name="phoneNumberSid"> Phone Number Sid to be branded. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Channel </returns>
+    public static ChannelResource Create(string pathBrandedChannelSid,
+                                         string phoneNumberSid,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateChannelOptions(pathBrandedChannelSid, phoneNumberSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Associate a channel to a branded channel
+    /// </summary>
+    /// <param name="pathBrandedChannelSid"> Branded Channel Sid. </param>
+    /// <param name="phoneNumberSid"> Phone Number Sid to be branded. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Channel </returns>
+    public static async System.Threading.Tasks.Task<ChannelResource> CreateAsync(string pathBrandedChannelSid,
+                                                                                 string phoneNumberSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateChannelOptions(pathBrandedChannelSid, phoneNumberSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ChannelResource object represented by the provided JSON </returns>
+    public static ChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Account Sid.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Business Sid.
+    /// </summary>
+    [JsonProperty("business_sid")]
+    public string BusinessSid { get; private set; }
+    /// <summary>
+    /// Brand Sid.
+    /// </summary>
+    [JsonProperty("brand_sid")]
+    public string BrandSid { get; private set; }
+    /// <summary>
+    /// Branded Channel Sid.
+    /// </summary>
+    [JsonProperty("branded_channel_sid")]
+    public string BrandedChannelSid { get; private set; }
+    /// <summary>
+    /// Phone Number Sid to be branded.
+    /// </summary>
+    [JsonProperty("phone_number_sid")]
+    public string PhoneNumberSid { get; private set; }
+    /// <summary>
+    /// Twilio number to assign to the Branded Channel
+    /// </summary>
+    [JsonProperty("phone_number")]
+    public string PhoneNumber { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private ChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/TrustedComms/BrandedChannelOptions.cs b/src/Twilio/Rest/Preview/TrustedComms/BrandedChannelOptions.cs
index 567121fe7..3c47bb8be 100644
--- a/src/Twilio/Rest/Preview/TrustedComms/BrandedChannelOptions.cs
+++ b/src/Twilio/Rest/Preview/TrustedComms/BrandedChannelOptions.cs
@@ -9,38 +9,38 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.TrustedComms
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch a specific Branded Channel.
+  /// </summary>
+  public class FetchBrandedChannelOptions : IOptions<BrandedChannelResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch a specific Branded Channel.
+    /// Branded Channel Sid.
     /// </summary>
-    public class FetchBrandedChannelOptions : IOptions<BrandedChannelResource>
-    {
-        /// <summary>
-        /// Branded Channel Sid.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchBrandedChannelOptions
-        /// </summary>
-        /// <param name="pathSid"> Branded Channel Sid. </param>
-        public FetchBrandedChannelOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchBrandedChannelOptions
+    /// </summary>
+    /// <param name="pathSid"> Branded Channel Sid. </param>
+    public FetchBrandedChannelOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/TrustedComms/BrandedChannelResource.cs b/src/Twilio/Rest/Preview/TrustedComms/BrandedChannelResource.cs
index 4af23c2ae..2f3829d8b 100644
--- a/src/Twilio/Rest/Preview/TrustedComms/BrandedChannelResource.cs
+++ b/src/Twilio/Rest/Preview/TrustedComms/BrandedChannelResource.cs
@@ -19,130 +19,130 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.TrustedComms
-{
-
-    public class BrandedChannelResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchBrandedChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/TrustedComms/BrandedChannels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Branded Channel.
-        /// </summary>
-        /// <param name="options"> Fetch BrandedChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandedChannel </returns>
-        public static BrandedChannelResource Fetch(FetchBrandedChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Branded Channel.
-        /// </summary>
-        /// <param name="options"> Fetch BrandedChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandedChannel </returns>
-        public static async System.Threading.Tasks.Task<BrandedChannelResource> FetchAsync(FetchBrandedChannelOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Branded Channel.
-        /// </summary>
-        /// <param name="pathSid"> Branded Channel Sid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandedChannel </returns>
-        public static BrandedChannelResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchBrandedChannelOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Branded Channel.
-        /// </summary>
-        /// <param name="pathSid"> Branded Channel Sid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandedChannel </returns>
-        public static async System.Threading.Tasks.Task<BrandedChannelResource> FetchAsync(string pathSid,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchBrandedChannelOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a BrandedChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BrandedChannelResource object represented by the provided JSON </returns>
-        public static BrandedChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BrandedChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Account Sid.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Business Sid.
-        /// </summary>
-        [JsonProperty("business_sid")]
-        public string BusinessSid { get; private set; }
-        /// <summary>
-        /// Brand Sid.
-        /// </summary>
-        [JsonProperty("brand_sid")]
-        public string BrandSid { get; private set; }
-        /// <summary>
-        /// Branded Channel Sid.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Nested resource URLs.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private BrandedChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class BrandedChannelResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchBrandedChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/TrustedComms/BrandedChannels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Branded Channel.
+    /// </summary>
+    /// <param name="options"> Fetch BrandedChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandedChannel </returns>
+    public static BrandedChannelResource Fetch(FetchBrandedChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Branded Channel.
+    /// </summary>
+    /// <param name="options"> Fetch BrandedChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandedChannel </returns>
+    public static async System.Threading.Tasks.Task<BrandedChannelResource> FetchAsync(FetchBrandedChannelOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Branded Channel.
+    /// </summary>
+    /// <param name="pathSid"> Branded Channel Sid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandedChannel </returns>
+    public static BrandedChannelResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchBrandedChannelOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Branded Channel.
+    /// </summary>
+    /// <param name="pathSid"> Branded Channel Sid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandedChannel </returns>
+    public static async System.Threading.Tasks.Task<BrandedChannelResource> FetchAsync(string pathSid,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchBrandedChannelOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a BrandedChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BrandedChannelResource object represented by the provided JSON </returns>
+    public static BrandedChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BrandedChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Account Sid.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Business Sid.
+    /// </summary>
+    [JsonProperty("business_sid")]
+    public string BusinessSid { get; private set; }
+    /// <summary>
+    /// Brand Sid.
+    /// </summary>
+    [JsonProperty("brand_sid")]
+    public string BrandSid { get; private set; }
+    /// <summary>
+    /// Branded Channel Sid.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Nested resource URLs.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private BrandedChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/TrustedComms/BrandsInformationOptions.cs b/src/Twilio/Rest/Preview/TrustedComms/BrandsInformationOptions.cs
index 3119eb921..918dfeee3 100644
--- a/src/Twilio/Rest/Preview/TrustedComms/BrandsInformationOptions.cs
+++ b/src/Twilio/Rest/Preview/TrustedComms/BrandsInformationOptions.cs
@@ -9,43 +9,43 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.TrustedComms
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve the newest available BrandInformation
+  /// </summary>
+  public class FetchBrandsInformationOptions : IOptions<BrandsInformationResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve the newest available BrandInformation
+    /// Standard `If-None-Match` HTTP header
     /// </summary>
-    public class FetchBrandsInformationOptions : IOptions<BrandsInformationResource>
-    {
-        /// <summary>
-        /// Standard `If-None-Match` HTTP header
-        /// </summary>
-        public string IfNoneMatch { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfNoneMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-None-Match", IfNoneMatch));
-            }
-
-            return p;
-        }
-    }
+    public string IfNoneMatch { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfNoneMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-None-Match", IfNoneMatch));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/TrustedComms/BrandsInformationResource.cs b/src/Twilio/Rest/Preview/TrustedComms/BrandsInformationResource.cs
index d91e88005..ee79660a4 100644
--- a/src/Twilio/Rest/Preview/TrustedComms/BrandsInformationResource.cs
+++ b/src/Twilio/Rest/Preview/TrustedComms/BrandsInformationResource.cs
@@ -19,120 +19,120 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.TrustedComms
-{
-
-    public class BrandsInformationResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchBrandsInformationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/TrustedComms/BrandsInformation",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Retrieve the newest available BrandInformation
-        /// </summary>
-        /// <param name="options"> Fetch BrandsInformation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandsInformation </returns>
-        public static BrandsInformationResource Fetch(FetchBrandsInformationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the newest available BrandInformation
-        /// </summary>
-        /// <param name="options"> Fetch BrandsInformation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandsInformation </returns>
-        public static async System.Threading.Tasks.Task<BrandsInformationResource> FetchAsync(FetchBrandsInformationOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve the newest available BrandInformation
-        /// </summary>
-        /// <param name="ifNoneMatch"> Standard `If-None-Match` HTTP header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BrandsInformation </returns>
-        public static BrandsInformationResource Fetch(string ifNoneMatch = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchBrandsInformationOptions(){IfNoneMatch = ifNoneMatch};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the newest available BrandInformation
-        /// </summary>
-        /// <param name="ifNoneMatch"> Standard `If-None-Match` HTTP header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BrandsInformation </returns>
-        public static async System.Threading.Tasks.Task<BrandsInformationResource> FetchAsync(string ifNoneMatch = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchBrandsInformationOptions(){IfNoneMatch = ifNoneMatch};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a BrandsInformationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BrandsInformationResource object represented by the provided JSON </returns>
-        public static BrandsInformationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BrandsInformationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Creation time of the information retrieved
-        /// </summary>
-        [JsonProperty("update_time")]
-        public DateTime? UpdateTime { get; private set; }
-        /// <summary>
-        /// The URL to the brands information
-        /// </summary>
-        [JsonProperty("file_link")]
-        public Uri FileLink { get; private set; }
-        /// <summary>
-        /// How long will be the `file_link` valid
-        /// </summary>
-        [JsonProperty("file_link_ttl_in_seconds")]
-        public string FileLinkTtlInSeconds { get; private set; }
-        /// <summary>
-        /// The URL of this resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private BrandsInformationResource()
-        {
-
-        }
-    }
+{
+
+  public class BrandsInformationResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchBrandsInformationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/TrustedComms/BrandsInformation",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Retrieve the newest available BrandInformation
+    /// </summary>
+    /// <param name="options"> Fetch BrandsInformation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandsInformation </returns>
+    public static BrandsInformationResource Fetch(FetchBrandsInformationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the newest available BrandInformation
+    /// </summary>
+    /// <param name="options"> Fetch BrandsInformation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandsInformation </returns>
+    public static async System.Threading.Tasks.Task<BrandsInformationResource> FetchAsync(FetchBrandsInformationOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve the newest available BrandInformation
+    /// </summary>
+    /// <param name="ifNoneMatch"> Standard `If-None-Match` HTTP header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BrandsInformation </returns>
+    public static BrandsInformationResource Fetch(string ifNoneMatch = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchBrandsInformationOptions() { IfNoneMatch = ifNoneMatch };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the newest available BrandInformation
+    /// </summary>
+    /// <param name="ifNoneMatch"> Standard `If-None-Match` HTTP header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BrandsInformation </returns>
+    public static async System.Threading.Tasks.Task<BrandsInformationResource> FetchAsync(string ifNoneMatch = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchBrandsInformationOptions() { IfNoneMatch = ifNoneMatch };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a BrandsInformationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BrandsInformationResource object represented by the provided JSON </returns>
+    public static BrandsInformationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BrandsInformationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Creation time of the information retrieved
+    /// </summary>
+    [JsonProperty("update_time")]
+    public DateTime? UpdateTime { get; private set; }
+    /// <summary>
+    /// The URL to the brands information
+    /// </summary>
+    [JsonProperty("file_link")]
+    public Uri FileLink { get; private set; }
+    /// <summary>
+    /// How long will be the `file_link` valid
+    /// </summary>
+    [JsonProperty("file_link_ttl_in_seconds")]
+    public string FileLinkTtlInSeconds { get; private set; }
+    /// <summary>
+    /// The URL of this resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private BrandsInformationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/TrustedComms/CpsOptions.cs b/src/Twilio/Rest/Preview/TrustedComms/CpsOptions.cs
index 9fd0bb76a..cebfac4d2 100644
--- a/src/Twilio/Rest/Preview/TrustedComms/CpsOptions.cs
+++ b/src/Twilio/Rest/Preview/TrustedComms/CpsOptions.cs
@@ -9,43 +9,43 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.TrustedComms
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch a specific Call Placement Service (CPS) given a phone number via `X-XCNAM-Sensitive-Phone-Number` header.
+  /// </summary>
+  public class FetchCpsOptions : IOptions<CpsResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch a specific Call Placement Service (CPS) given a phone number via `X-XCNAM-Sensitive-Phone-Number` header.
+    /// Phone number to retrieve CPS.
     /// </summary>
-    public class FetchCpsOptions : IOptions<CpsResource>
-    {
-        /// <summary>
-        /// Phone number to retrieve CPS.
-        /// </summary>
-        public string XXcnamSensitivePhoneNumber { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XXcnamSensitivePhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Xcnam-Sensitive-Phone-Number", XXcnamSensitivePhoneNumber));
-            }
-
-            return p;
-        }
-    }
+    public string XXcnamSensitivePhoneNumber { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XXcnamSensitivePhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Xcnam-Sensitive-Phone-Number", XXcnamSensitivePhoneNumber));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/TrustedComms/CpsResource.cs b/src/Twilio/Rest/Preview/TrustedComms/CpsResource.cs
index 452310764..1baac35de 100644
--- a/src/Twilio/Rest/Preview/TrustedComms/CpsResource.cs
+++ b/src/Twilio/Rest/Preview/TrustedComms/CpsResource.cs
@@ -19,115 +19,115 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.TrustedComms
-{
-
-    public class CpsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchCpsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/TrustedComms/CPS",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Call Placement Service (CPS) given a phone number via `X-XCNAM-Sensitive-Phone-Number` header.
-        /// </summary>
-        /// <param name="options"> Fetch Cps parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Cps </returns>
-        public static CpsResource Fetch(FetchCpsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Call Placement Service (CPS) given a phone number via `X-XCNAM-Sensitive-Phone-Number` header.
-        /// </summary>
-        /// <param name="options"> Fetch Cps parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Cps </returns>
-        public static async System.Threading.Tasks.Task<CpsResource> FetchAsync(FetchCpsOptions options,
-                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Call Placement Service (CPS) given a phone number via `X-XCNAM-Sensitive-Phone-Number` header.
-        /// </summary>
-        /// <param name="xXcnamSensitivePhoneNumber"> Phone number to retrieve CPS. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Cps </returns>
-        public static CpsResource Fetch(string xXcnamSensitivePhoneNumber = null, ITwilioRestClient client = null)
-        {
-            var options = new FetchCpsOptions(){XXcnamSensitivePhoneNumber = xXcnamSensitivePhoneNumber};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Call Placement Service (CPS) given a phone number via `X-XCNAM-Sensitive-Phone-Number` header.
-        /// </summary>
-        /// <param name="xXcnamSensitivePhoneNumber"> Phone number to retrieve CPS. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Cps </returns>
-        public static async System.Threading.Tasks.Task<CpsResource> FetchAsync(string xXcnamSensitivePhoneNumber = null,
-                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchCpsOptions(){XXcnamSensitivePhoneNumber = xXcnamSensitivePhoneNumber};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CpsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CpsResource object represented by the provided JSON </returns>
-        public static CpsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CpsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// CPS URL of the phone number.
-        /// </summary>
-        [JsonProperty("cps_url")]
-        public Uri CpsUrl { get; private set; }
-        /// <summary>
-        /// Phone number passed.
-        /// </summary>
-        [JsonProperty("phone_number")]
-        public string PhoneNumber { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CpsResource()
-        {
-
-        }
-    }
+{
+
+  public class CpsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchCpsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/TrustedComms/CPS",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Call Placement Service (CPS) given a phone number via `X-XCNAM-Sensitive-Phone-Number` header.
+    /// </summary>
+    /// <param name="options"> Fetch Cps parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Cps </returns>
+    public static CpsResource Fetch(FetchCpsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Call Placement Service (CPS) given a phone number via `X-XCNAM-Sensitive-Phone-Number` header.
+    /// </summary>
+    /// <param name="options"> Fetch Cps parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Cps </returns>
+    public static async System.Threading.Tasks.Task<CpsResource> FetchAsync(FetchCpsOptions options,
+                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Call Placement Service (CPS) given a phone number via `X-XCNAM-Sensitive-Phone-Number` header.
+    /// </summary>
+    /// <param name="xXcnamSensitivePhoneNumber"> Phone number to retrieve CPS. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Cps </returns>
+    public static CpsResource Fetch(string xXcnamSensitivePhoneNumber = null, ITwilioRestClient client = null)
+    {
+      var options = new FetchCpsOptions() { XXcnamSensitivePhoneNumber = xXcnamSensitivePhoneNumber };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Call Placement Service (CPS) given a phone number via `X-XCNAM-Sensitive-Phone-Number` header.
+    /// </summary>
+    /// <param name="xXcnamSensitivePhoneNumber"> Phone number to retrieve CPS. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Cps </returns>
+    public static async System.Threading.Tasks.Task<CpsResource> FetchAsync(string xXcnamSensitivePhoneNumber = null,
+                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchCpsOptions() { XXcnamSensitivePhoneNumber = xXcnamSensitivePhoneNumber };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CpsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CpsResource object represented by the provided JSON </returns>
+    public static CpsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CpsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// CPS URL of the phone number.
+    /// </summary>
+    [JsonProperty("cps_url")]
+    public Uri CpsUrl { get; private set; }
+    /// <summary>
+    /// Phone number passed.
+    /// </summary>
+    [JsonProperty("phone_number")]
+    public string PhoneNumber { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CpsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/TrustedComms/CurrentCallOptions.cs b/src/Twilio/Rest/Preview/TrustedComms/CurrentCallOptions.cs
index 5e3a62d98..225a21c71 100644
--- a/src/Twilio/Rest/Preview/TrustedComms/CurrentCallOptions.cs
+++ b/src/Twilio/Rest/Preview/TrustedComms/CurrentCallOptions.cs
@@ -9,53 +9,53 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.TrustedComms
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve a current call given the originating and terminating number via `X-XCNAM-Sensitive-Phone-Number-From` and
+  /// `X-XCNAM-Sensitive-Phone-Number-To` headers.
+  /// </summary>
+  public class FetchCurrentCallOptions : IOptions<CurrentCallResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve a current call given the originating and terminating number via `X-XCNAM-Sensitive-Phone-Number-From` and
-    /// `X-XCNAM-Sensitive-Phone-Number-To` headers.
+    /// The originating Phone Number
     /// </summary>
-    public class FetchCurrentCallOptions : IOptions<CurrentCallResource>
-    {
-        /// <summary>
-        /// The originating Phone Number
-        /// </summary>
-        public string XXcnamSensitivePhoneNumberFrom { get; set; }
-        /// <summary>
-        /// The terminating Phone Number
-        /// </summary>
-        public string XXcnamSensitivePhoneNumberTo { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (XXcnamSensitivePhoneNumberFrom != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Xcnam-Sensitive-Phone-Number-From", XXcnamSensitivePhoneNumberFrom));
-            }
-
-            if (XXcnamSensitivePhoneNumberTo != null)
-            {
-                p.Add(new KeyValuePair<string, string>("X-Xcnam-Sensitive-Phone-Number-To", XXcnamSensitivePhoneNumberTo));
-            }
-
-            return p;
-        }
-    }
+    public string XXcnamSensitivePhoneNumberFrom { get; set; }
+    /// <summary>
+    /// The terminating Phone Number
+    /// </summary>
+    public string XXcnamSensitivePhoneNumberTo { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (XXcnamSensitivePhoneNumberFrom != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Xcnam-Sensitive-Phone-Number-From", XXcnamSensitivePhoneNumberFrom));
+      }
+
+      if (XXcnamSensitivePhoneNumberTo != null)
+      {
+        p.Add(new KeyValuePair<string, string>("X-Xcnam-Sensitive-Phone-Number-To", XXcnamSensitivePhoneNumberTo));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/TrustedComms/CurrentCallResource.cs b/src/Twilio/Rest/Preview/TrustedComms/CurrentCallResource.cs
index 5e10ab9c1..fae3064bd 100644
--- a/src/Twilio/Rest/Preview/TrustedComms/CurrentCallResource.cs
+++ b/src/Twilio/Rest/Preview/TrustedComms/CurrentCallResource.cs
@@ -19,179 +19,179 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.TrustedComms
-{
-
-    public class CurrentCallResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchCurrentCallOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/TrustedComms/CurrentCall",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a current call given the originating and terminating number via `X-XCNAM-Sensitive-Phone-Number-From` and
-        /// `X-XCNAM-Sensitive-Phone-Number-To` headers.
-        /// </summary>
-        /// <param name="options"> Fetch CurrentCall parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CurrentCall </returns>
-        public static CurrentCallResource Fetch(FetchCurrentCallOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a current call given the originating and terminating number via `X-XCNAM-Sensitive-Phone-Number-From` and
-        /// `X-XCNAM-Sensitive-Phone-Number-To` headers.
-        /// </summary>
-        /// <param name="options"> Fetch CurrentCall parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CurrentCall </returns>
-        public static async System.Threading.Tasks.Task<CurrentCallResource> FetchAsync(FetchCurrentCallOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a current call given the originating and terminating number via `X-XCNAM-Sensitive-Phone-Number-From` and
-        /// `X-XCNAM-Sensitive-Phone-Number-To` headers.
-        /// </summary>
-        /// <param name="xXcnamSensitivePhoneNumberFrom"> The originating Phone Number </param>
-        /// <param name="xXcnamSensitivePhoneNumberTo"> The terminating Phone Number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CurrentCall </returns>
-        public static CurrentCallResource Fetch(string xXcnamSensitivePhoneNumberFrom = null,
-                                                string xXcnamSensitivePhoneNumberTo = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchCurrentCallOptions(){XXcnamSensitivePhoneNumberFrom = xXcnamSensitivePhoneNumberFrom, XXcnamSensitivePhoneNumberTo = xXcnamSensitivePhoneNumberTo};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a current call given the originating and terminating number via `X-XCNAM-Sensitive-Phone-Number-From` and
-        /// `X-XCNAM-Sensitive-Phone-Number-To` headers.
-        /// </summary>
-        /// <param name="xXcnamSensitivePhoneNumberFrom"> The originating Phone Number </param>
-        /// <param name="xXcnamSensitivePhoneNumberTo"> The terminating Phone Number </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CurrentCall </returns>
-        public static async System.Threading.Tasks.Task<CurrentCallResource> FetchAsync(string xXcnamSensitivePhoneNumberFrom = null,
-                                                                                        string xXcnamSensitivePhoneNumberTo = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchCurrentCallOptions(){XXcnamSensitivePhoneNumberFrom = xXcnamSensitivePhoneNumberFrom, XXcnamSensitivePhoneNumberTo = xXcnamSensitivePhoneNumberTo};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CurrentCallResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CurrentCallResource object represented by the provided JSON </returns>
-        public static CurrentCallResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CurrentCallResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Background color of the current phone call
-        /// </summary>
-        [JsonProperty("bg_color")]
-        public string BgColor { get; private set; }
-        /// <summary>
-        /// Caller name of the current phone call
-        /// </summary>
-        [JsonProperty("caller")]
-        public string Caller { get; private set; }
-        /// <summary>
-        /// The date this current phone call was created
-        /// </summary>
-        [JsonProperty("created_at")]
-        public DateTime? CreatedAt { get; private set; }
-        /// <summary>
-        /// Font color of the current phone call
-        /// </summary>
-        [JsonProperty("font_color")]
-        public string FontColor { get; private set; }
-        /// <summary>
-        /// The originating phone number
-        /// </summary>
-        [JsonProperty("from")]
-        public string From { get; private set; }
-        /// <summary>
-        /// Logo URL of the caller
-        /// </summary>
-        [JsonProperty("logo")]
-        public string Logo { get; private set; }
-        /// <summary>
-        /// The name of the CPS organization
-        /// </summary>
-        [JsonProperty("manager")]
-        public string Manager { get; private set; }
-        /// <summary>
-        /// The business reason for this current phone call
-        /// </summary>
-        [JsonProperty("reason")]
-        public string Reason { get; private set; }
-        /// <summary>
-        /// Shield image URL that serves as authenticity proof of the current phone call
-        /// </summary>
-        [JsonProperty("shield_img")]
-        public string ShieldImg { get; private set; }
-        /// <summary>
-        /// A string that uniquely identifies this current branded phone call.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The status of the current phone call
-        /// </summary>
-        [JsonProperty("status")]
-        public string Status { get; private set; }
-        /// <summary>
-        /// The terminating phone number
-        /// </summary>
-        [JsonProperty("to")]
-        public string To { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The use case for the current phone call
-        /// </summary>
-        [JsonProperty("use_case")]
-        public string UseCase { get; private set; }
-
-        private CurrentCallResource()
-        {
-
-        }
-    }
+{
+
+  public class CurrentCallResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchCurrentCallOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/TrustedComms/CurrentCall",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a current call given the originating and terminating number via `X-XCNAM-Sensitive-Phone-Number-From` and
+    /// `X-XCNAM-Sensitive-Phone-Number-To` headers.
+    /// </summary>
+    /// <param name="options"> Fetch CurrentCall parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CurrentCall </returns>
+    public static CurrentCallResource Fetch(FetchCurrentCallOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a current call given the originating and terminating number via `X-XCNAM-Sensitive-Phone-Number-From` and
+    /// `X-XCNAM-Sensitive-Phone-Number-To` headers.
+    /// </summary>
+    /// <param name="options"> Fetch CurrentCall parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CurrentCall </returns>
+    public static async System.Threading.Tasks.Task<CurrentCallResource> FetchAsync(FetchCurrentCallOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a current call given the originating and terminating number via `X-XCNAM-Sensitive-Phone-Number-From` and
+    /// `X-XCNAM-Sensitive-Phone-Number-To` headers.
+    /// </summary>
+    /// <param name="xXcnamSensitivePhoneNumberFrom"> The originating Phone Number </param>
+    /// <param name="xXcnamSensitivePhoneNumberTo"> The terminating Phone Number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CurrentCall </returns>
+    public static CurrentCallResource Fetch(string xXcnamSensitivePhoneNumberFrom = null,
+                                            string xXcnamSensitivePhoneNumberTo = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchCurrentCallOptions() { XXcnamSensitivePhoneNumberFrom = xXcnamSensitivePhoneNumberFrom, XXcnamSensitivePhoneNumberTo = xXcnamSensitivePhoneNumberTo };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a current call given the originating and terminating number via `X-XCNAM-Sensitive-Phone-Number-From` and
+    /// `X-XCNAM-Sensitive-Phone-Number-To` headers.
+    /// </summary>
+    /// <param name="xXcnamSensitivePhoneNumberFrom"> The originating Phone Number </param>
+    /// <param name="xXcnamSensitivePhoneNumberTo"> The terminating Phone Number </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CurrentCall </returns>
+    public static async System.Threading.Tasks.Task<CurrentCallResource> FetchAsync(string xXcnamSensitivePhoneNumberFrom = null,
+                                                                                    string xXcnamSensitivePhoneNumberTo = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchCurrentCallOptions() { XXcnamSensitivePhoneNumberFrom = xXcnamSensitivePhoneNumberFrom, XXcnamSensitivePhoneNumberTo = xXcnamSensitivePhoneNumberTo };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CurrentCallResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CurrentCallResource object represented by the provided JSON </returns>
+    public static CurrentCallResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CurrentCallResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Background color of the current phone call
+    /// </summary>
+    [JsonProperty("bg_color")]
+    public string BgColor { get; private set; }
+    /// <summary>
+    /// Caller name of the current phone call
+    /// </summary>
+    [JsonProperty("caller")]
+    public string Caller { get; private set; }
+    /// <summary>
+    /// The date this current phone call was created
+    /// </summary>
+    [JsonProperty("created_at")]
+    public DateTime? CreatedAt { get; private set; }
+    /// <summary>
+    /// Font color of the current phone call
+    /// </summary>
+    [JsonProperty("font_color")]
+    public string FontColor { get; private set; }
+    /// <summary>
+    /// The originating phone number
+    /// </summary>
+    [JsonProperty("from")]
+    public string From { get; private set; }
+    /// <summary>
+    /// Logo URL of the caller
+    /// </summary>
+    [JsonProperty("logo")]
+    public string Logo { get; private set; }
+    /// <summary>
+    /// The name of the CPS organization
+    /// </summary>
+    [JsonProperty("manager")]
+    public string Manager { get; private set; }
+    /// <summary>
+    /// The business reason for this current phone call
+    /// </summary>
+    [JsonProperty("reason")]
+    public string Reason { get; private set; }
+    /// <summary>
+    /// Shield image URL that serves as authenticity proof of the current phone call
+    /// </summary>
+    [JsonProperty("shield_img")]
+    public string ShieldImg { get; private set; }
+    /// <summary>
+    /// A string that uniquely identifies this current branded phone call.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The status of the current phone call
+    /// </summary>
+    [JsonProperty("status")]
+    public string Status { get; private set; }
+    /// <summary>
+    /// The terminating phone number
+    /// </summary>
+    [JsonProperty("to")]
+    public string To { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The use case for the current phone call
+    /// </summary>
+    [JsonProperty("use_case")]
+    public string UseCase { get; private set; }
+
+    private CurrentCallResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/AssistantFallbackActionsOptions.cs b/src/Twilio/Rest/Preview/Understand/Assistant/AssistantFallbackActionsOptions.cs
index 1511a86c0..871c50083 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/AssistantFallbackActionsOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/AssistantFallbackActionsOptions.cs
@@ -9,79 +9,79 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchAssistantFallbackActionsOptions
+  /// </summary>
+  public class FetchAssistantFallbackActionsOptions : IOptions<AssistantFallbackActionsResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchAssistantFallbackActionsOptions
+    /// The assistant_sid
     /// </summary>
-    public class FetchAssistantFallbackActionsOptions : IOptions<AssistantFallbackActionsResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAssistantFallbackActionsOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        public FetchAssistantFallbackActionsOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateAssistantFallbackActionsOptions
+    /// Construct a new FetchAssistantFallbackActionsOptions
     /// </summary>
-    public class UpdateAssistantFallbackActionsOptions : IOptions<AssistantFallbackActionsResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The fallback_actions
-        /// </summary>
-        public object FallbackActions { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateAssistantFallbackActionsOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        public UpdateAssistantFallbackActionsOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FallbackActions != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackActions", Serializers.JsonObject(FallbackActions)));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    public FetchAssistantFallbackActionsOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateAssistantFallbackActionsOptions
+  /// </summary>
+  public class UpdateAssistantFallbackActionsOptions : IOptions<AssistantFallbackActionsResource>
+  {
+    /// <summary>
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The fallback_actions
+    /// </summary>
+    public object FallbackActions { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateAssistantFallbackActionsOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    public UpdateAssistantFallbackActionsOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FallbackActions != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackActions", Serializers.JsonObject(FallbackActions)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/AssistantFallbackActionsResource.cs b/src/Twilio/Rest/Preview/Understand/Assistant/AssistantFallbackActionsResource.cs
index 4274f2375..2fa7d3dc6 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/AssistantFallbackActionsResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/AssistantFallbackActionsResource.cs
@@ -19,194 +19,194 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
-    public class AssistantFallbackActionsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchAssistantFallbackActionsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/FallbackActions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch AssistantFallbackActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssistantFallbackActions </returns>
-        public static AssistantFallbackActionsResource Fetch(FetchAssistantFallbackActionsOptions options,
-                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch AssistantFallbackActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssistantFallbackActions </returns>
-        public static async System.Threading.Tasks.Task<AssistantFallbackActionsResource> FetchAsync(FetchAssistantFallbackActionsOptions options,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssistantFallbackActions </returns>
-        public static AssistantFallbackActionsResource Fetch(string pathAssistantSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchAssistantFallbackActionsOptions(pathAssistantSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssistantFallbackActions </returns>
-        public static async System.Threading.Tasks.Task<AssistantFallbackActionsResource> FetchAsync(string pathAssistantSid,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchAssistantFallbackActionsOptions(pathAssistantSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateAssistantFallbackActionsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/FallbackActions",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update AssistantFallbackActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssistantFallbackActions </returns>
-        public static AssistantFallbackActionsResource Update(UpdateAssistantFallbackActionsOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update AssistantFallbackActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssistantFallbackActions </returns>
-        public static async System.Threading.Tasks.Task<AssistantFallbackActionsResource> UpdateAsync(UpdateAssistantFallbackActionsOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="fallbackActions"> The fallback_actions </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssistantFallbackActions </returns>
-        public static AssistantFallbackActionsResource Update(string pathAssistantSid,
-                                                              object fallbackActions = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateAssistantFallbackActionsOptions(pathAssistantSid){FallbackActions = fallbackActions};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="fallbackActions"> The fallback_actions </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssistantFallbackActions </returns>
-        public static async System.Threading.Tasks.Task<AssistantFallbackActionsResource> UpdateAsync(string pathAssistantSid,
-                                                                                                      object fallbackActions = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateAssistantFallbackActionsOptions(pathAssistantSid){FallbackActions = fallbackActions};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AssistantFallbackActionsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AssistantFallbackActionsResource object represented by the provided JSON </returns>
-        public static AssistantFallbackActionsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AssistantFallbackActionsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The data
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-
-        private AssistantFallbackActionsResource()
-        {
-
-        }
-    }
+{
+
+  public class AssistantFallbackActionsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchAssistantFallbackActionsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/FallbackActions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch AssistantFallbackActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssistantFallbackActions </returns>
+    public static AssistantFallbackActionsResource Fetch(FetchAssistantFallbackActionsOptions options,
+                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch AssistantFallbackActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssistantFallbackActions </returns>
+    public static async System.Threading.Tasks.Task<AssistantFallbackActionsResource> FetchAsync(FetchAssistantFallbackActionsOptions options,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssistantFallbackActions </returns>
+    public static AssistantFallbackActionsResource Fetch(string pathAssistantSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchAssistantFallbackActionsOptions(pathAssistantSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssistantFallbackActions </returns>
+    public static async System.Threading.Tasks.Task<AssistantFallbackActionsResource> FetchAsync(string pathAssistantSid,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchAssistantFallbackActionsOptions(pathAssistantSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateAssistantFallbackActionsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/FallbackActions",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update AssistantFallbackActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssistantFallbackActions </returns>
+    public static AssistantFallbackActionsResource Update(UpdateAssistantFallbackActionsOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update AssistantFallbackActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssistantFallbackActions </returns>
+    public static async System.Threading.Tasks.Task<AssistantFallbackActionsResource> UpdateAsync(UpdateAssistantFallbackActionsOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="fallbackActions"> The fallback_actions </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssistantFallbackActions </returns>
+    public static AssistantFallbackActionsResource Update(string pathAssistantSid,
+                                                          object fallbackActions = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateAssistantFallbackActionsOptions(pathAssistantSid) { FallbackActions = fallbackActions };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="fallbackActions"> The fallback_actions </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssistantFallbackActions </returns>
+    public static async System.Threading.Tasks.Task<AssistantFallbackActionsResource> UpdateAsync(string pathAssistantSid,
+                                                                                                  object fallbackActions = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateAssistantFallbackActionsOptions(pathAssistantSid) { FallbackActions = fallbackActions };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AssistantFallbackActionsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AssistantFallbackActionsResource object represented by the provided JSON </returns>
+    public static AssistantFallbackActionsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AssistantFallbackActionsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The assistant_sid
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The data
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+
+    private AssistantFallbackActionsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/AssistantInitiationActionsOptions.cs b/src/Twilio/Rest/Preview/Understand/Assistant/AssistantInitiationActionsOptions.cs
index 0def2fffd..4704a8ae0 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/AssistantInitiationActionsOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/AssistantInitiationActionsOptions.cs
@@ -9,79 +9,79 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchAssistantInitiationActionsOptions
+  /// </summary>
+  public class FetchAssistantInitiationActionsOptions : IOptions<AssistantInitiationActionsResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchAssistantInitiationActionsOptions
+    /// The assistant_sid
     /// </summary>
-    public class FetchAssistantInitiationActionsOptions : IOptions<AssistantInitiationActionsResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAssistantInitiationActionsOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        public FetchAssistantInitiationActionsOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateAssistantInitiationActionsOptions
+    /// Construct a new FetchAssistantInitiationActionsOptions
     /// </summary>
-    public class UpdateAssistantInitiationActionsOptions : IOptions<AssistantInitiationActionsResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The initiation_actions
-        /// </summary>
-        public object InitiationActions { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateAssistantInitiationActionsOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        public UpdateAssistantInitiationActionsOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (InitiationActions != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InitiationActions", Serializers.JsonObject(InitiationActions)));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    public FetchAssistantInitiationActionsOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateAssistantInitiationActionsOptions
+  /// </summary>
+  public class UpdateAssistantInitiationActionsOptions : IOptions<AssistantInitiationActionsResource>
+  {
+    /// <summary>
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The initiation_actions
+    /// </summary>
+    public object InitiationActions { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateAssistantInitiationActionsOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    public UpdateAssistantInitiationActionsOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (InitiationActions != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InitiationActions", Serializers.JsonObject(InitiationActions)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/AssistantInitiationActionsResource.cs b/src/Twilio/Rest/Preview/Understand/Assistant/AssistantInitiationActionsResource.cs
index 1e3f58b8a..4b65f4b41 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/AssistantInitiationActionsResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/AssistantInitiationActionsResource.cs
@@ -19,194 +19,194 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
-    public class AssistantInitiationActionsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchAssistantInitiationActionsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/InitiationActions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch AssistantInitiationActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssistantInitiationActions </returns>
-        public static AssistantInitiationActionsResource Fetch(FetchAssistantInitiationActionsOptions options,
-                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch AssistantInitiationActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssistantInitiationActions </returns>
-        public static async System.Threading.Tasks.Task<AssistantInitiationActionsResource> FetchAsync(FetchAssistantInitiationActionsOptions options,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssistantInitiationActions </returns>
-        public static AssistantInitiationActionsResource Fetch(string pathAssistantSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchAssistantInitiationActionsOptions(pathAssistantSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssistantInitiationActions </returns>
-        public static async System.Threading.Tasks.Task<AssistantInitiationActionsResource> FetchAsync(string pathAssistantSid,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchAssistantInitiationActionsOptions(pathAssistantSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateAssistantInitiationActionsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/InitiationActions",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update AssistantInitiationActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssistantInitiationActions </returns>
-        public static AssistantInitiationActionsResource Update(UpdateAssistantInitiationActionsOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update AssistantInitiationActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssistantInitiationActions </returns>
-        public static async System.Threading.Tasks.Task<AssistantInitiationActionsResource> UpdateAsync(UpdateAssistantInitiationActionsOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="initiationActions"> The initiation_actions </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssistantInitiationActions </returns>
-        public static AssistantInitiationActionsResource Update(string pathAssistantSid,
-                                                                object initiationActions = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateAssistantInitiationActionsOptions(pathAssistantSid){InitiationActions = initiationActions};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="initiationActions"> The initiation_actions </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssistantInitiationActions </returns>
-        public static async System.Threading.Tasks.Task<AssistantInitiationActionsResource> UpdateAsync(string pathAssistantSid,
-                                                                                                        object initiationActions = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateAssistantInitiationActionsOptions(pathAssistantSid){InitiationActions = initiationActions};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AssistantInitiationActionsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AssistantInitiationActionsResource object represented by the provided JSON </returns>
-        public static AssistantInitiationActionsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AssistantInitiationActionsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The data
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-
-        private AssistantInitiationActionsResource()
-        {
-
-        }
-    }
+{
+
+  public class AssistantInitiationActionsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchAssistantInitiationActionsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/InitiationActions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch AssistantInitiationActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssistantInitiationActions </returns>
+    public static AssistantInitiationActionsResource Fetch(FetchAssistantInitiationActionsOptions options,
+                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch AssistantInitiationActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssistantInitiationActions </returns>
+    public static async System.Threading.Tasks.Task<AssistantInitiationActionsResource> FetchAsync(FetchAssistantInitiationActionsOptions options,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssistantInitiationActions </returns>
+    public static AssistantInitiationActionsResource Fetch(string pathAssistantSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchAssistantInitiationActionsOptions(pathAssistantSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssistantInitiationActions </returns>
+    public static async System.Threading.Tasks.Task<AssistantInitiationActionsResource> FetchAsync(string pathAssistantSid,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchAssistantInitiationActionsOptions(pathAssistantSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateAssistantInitiationActionsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/InitiationActions",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update AssistantInitiationActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssistantInitiationActions </returns>
+    public static AssistantInitiationActionsResource Update(UpdateAssistantInitiationActionsOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update AssistantInitiationActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssistantInitiationActions </returns>
+    public static async System.Threading.Tasks.Task<AssistantInitiationActionsResource> UpdateAsync(UpdateAssistantInitiationActionsOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="initiationActions"> The initiation_actions </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssistantInitiationActions </returns>
+    public static AssistantInitiationActionsResource Update(string pathAssistantSid,
+                                                            object initiationActions = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateAssistantInitiationActionsOptions(pathAssistantSid) { InitiationActions = initiationActions };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="initiationActions"> The initiation_actions </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssistantInitiationActions </returns>
+    public static async System.Threading.Tasks.Task<AssistantInitiationActionsResource> UpdateAsync(string pathAssistantSid,
+                                                                                                    object initiationActions = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateAssistantInitiationActionsOptions(pathAssistantSid) { InitiationActions = initiationActions };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AssistantInitiationActionsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AssistantInitiationActionsResource object represented by the provided JSON </returns>
+    public static AssistantInitiationActionsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AssistantInitiationActionsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The assistant_sid
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The data
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+
+    private AssistantInitiationActionsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/DialogueOptions.cs b/src/Twilio/Rest/Preview/Understand/Assistant/DialogueOptions.cs
index bc88eb848..0a4804f67 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/DialogueOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/DialogueOptions.cs
@@ -9,44 +9,44 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchDialogueOptions
+  /// </summary>
+  public class FetchDialogueOptions : IOptions<DialogueResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchDialogueOptions
+    /// The assistant_sid
     /// </summary>
-    public class FetchDialogueOptions : IOptions<DialogueResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchDialogueOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchDialogueOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchDialogueOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchDialogueOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/DialogueResource.cs b/src/Twilio/Rest/Preview/Understand/Assistant/DialogueResource.cs
index 255ee021a..96ff0fc9b 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/DialogueResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/DialogueResource.cs
@@ -19,128 +19,128 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
-    public class DialogueResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchDialogueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Dialogues/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Dialogue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Dialogue </returns>
-        public static DialogueResource Fetch(FetchDialogueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Dialogue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Dialogue </returns>
-        public static async System.Threading.Tasks.Task<DialogueResource> FetchAsync(FetchDialogueOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Dialogue </returns>
-        public static DialogueResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchDialogueOptions(pathAssistantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Dialogue </returns>
-        public static async System.Threading.Tasks.Task<DialogueResource> FetchAsync(string pathAssistantSid,
-                                                                                     string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchDialogueOptions(pathAssistantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a DialogueResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DialogueResource object represented by the provided JSON </returns>
-        public static DialogueResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DialogueResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account that created this Field.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the parent Assistant.
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Dialogue
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The dialogue memory object as json
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private DialogueResource()
-        {
-
-        }
-    }
+{
+
+  public class DialogueResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchDialogueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Dialogues/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Dialogue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Dialogue </returns>
+    public static DialogueResource Fetch(FetchDialogueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Dialogue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Dialogue </returns>
+    public static async System.Threading.Tasks.Task<DialogueResource> FetchAsync(FetchDialogueOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Dialogue </returns>
+    public static DialogueResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchDialogueOptions(pathAssistantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Dialogue </returns>
+    public static async System.Threading.Tasks.Task<DialogueResource> FetchAsync(string pathAssistantSid,
+                                                                                 string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchDialogueOptions(pathAssistantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a DialogueResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DialogueResource object represented by the provided JSON </returns>
+    public static DialogueResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DialogueResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account that created this Field.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the parent Assistant.
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Dialogue
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The dialogue memory object as json
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private DialogueResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/FieldType/FieldValueOptions.cs b/src/Twilio/Rest/Preview/Understand/Assistant/FieldType/FieldValueOptions.cs
index 11846a432..bb9a72786 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/FieldType/FieldValueOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/FieldType/FieldValueOptions.cs
@@ -9,216 +9,216 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand.Assistant.FieldType
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchFieldValueOptions
+  /// </summary>
+  public class FetchFieldValueOptions : IOptions<FieldValueResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchFieldValueOptions
-    /// </summary>
-    public class FetchFieldValueOptions : IOptions<FieldValueResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The field_type_sid
-        /// </summary>
-        public string PathFieldTypeSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFieldValueOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathFieldTypeSid"> The field_type_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathFieldTypeSid = pathFieldTypeSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadFieldValueOptions
-    /// </summary>
-    public class ReadFieldValueOptions : ReadOptions<FieldValueResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The field_type_sid
-        /// </summary>
-        public string PathFieldTypeSid { get; }
-        /// <summary>
-        /// An ISO language-country string of the value. For example: en-US
-        /// </summary>
-        public string Language { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadFieldValueOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathFieldTypeSid"> The field_type_sid </param>
-        public ReadFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathFieldTypeSid = pathFieldTypeSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The field_type_sid
+    /// </summary>
+    public string PathFieldTypeSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateFieldValueOptions
-    /// </summary>
-    public class CreateFieldValueOptions : IOptions<FieldValueResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The field_type_sid
-        /// </summary>
-        public string PathFieldTypeSid { get; }
-        /// <summary>
-        /// An ISO language-country string of the value.
-        /// </summary>
-        public string Language { get; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
-        /// </summary>
-        public string Value { get; }
-        /// <summary>
-        /// A value that indicates this field value is a synonym of. Empty if the value is not a synonym.
-        /// </summary>
-        public string SynonymOf { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateFieldValueOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathFieldTypeSid"> The field_type_sid </param>
-        /// <param name="language"> An ISO language-country string of the value. </param>
-        /// <param name="value"> A user-provided string that uniquely identifies this resource as an alternative to the sid.
-        ///             Unique up to 64 characters long. </param>
-        public CreateFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid, string language, string value)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathFieldTypeSid = pathFieldTypeSid;
-            Language = language;
-            Value = value;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Value", Value));
-            }
-
-            if (SynonymOf != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SynonymOf", SynonymOf.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteFieldValueOptions
-    /// </summary>
-    public class DeleteFieldValueOptions : IOptions<FieldValueResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The field_type_sid
-        /// </summary>
-        public string PathFieldTypeSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFieldValueOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathFieldTypeSid"> The field_type_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathFieldTypeSid = pathFieldTypeSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new FetchFieldValueOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathFieldTypeSid"> The field_type_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathFieldTypeSid = pathFieldTypeSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadFieldValueOptions
+  /// </summary>
+  public class ReadFieldValueOptions : ReadOptions<FieldValueResource>
+  {
+    /// <summary>
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The field_type_sid
+    /// </summary>
+    public string PathFieldTypeSid { get; }
+    /// <summary>
+    /// An ISO language-country string of the value. For example: en-US
+    /// </summary>
+    public string Language { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadFieldValueOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathFieldTypeSid"> The field_type_sid </param>
+    public ReadFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathFieldTypeSid = pathFieldTypeSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateFieldValueOptions
+  /// </summary>
+  public class CreateFieldValueOptions : IOptions<FieldValueResource>
+  {
+    /// <summary>
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The field_type_sid
+    /// </summary>
+    public string PathFieldTypeSid { get; }
+    /// <summary>
+    /// An ISO language-country string of the value.
+    /// </summary>
+    public string Language { get; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
+    /// </summary>
+    public string Value { get; }
+    /// <summary>
+    /// A value that indicates this field value is a synonym of. Empty if the value is not a synonym.
+    /// </summary>
+    public string SynonymOf { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateFieldValueOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathFieldTypeSid"> The field_type_sid </param>
+    /// <param name="language"> An ISO language-country string of the value. </param>
+    /// <param name="value"> A user-provided string that uniquely identifies this resource as an alternative to the sid.
+    ///             Unique up to 64 characters long. </param>
+    public CreateFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid, string language, string value)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathFieldTypeSid = pathFieldTypeSid;
+      Language = language;
+      Value = value;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Value", Value));
+      }
+
+      if (SynonymOf != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SynonymOf", SynonymOf.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteFieldValueOptions
+  /// </summary>
+  public class DeleteFieldValueOptions : IOptions<FieldValueResource>
+  {
+    /// <summary>
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The field_type_sid
+    /// </summary>
+    public string PathFieldTypeSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteFieldValueOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathFieldTypeSid"> The field_type_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteFieldValueOptions(string pathAssistantSid, string pathFieldTypeSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathFieldTypeSid = pathFieldTypeSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/FieldType/FieldValueResource.cs b/src/Twilio/Rest/Preview/Understand/Assistant/FieldType/FieldValueResource.cs
index eb5c07a62..458707671 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/FieldType/FieldValueResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/FieldType/FieldValueResource.cs
@@ -19,464 +19,464 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Understand.Assistant.FieldType
-{
-
-    public class FieldValueResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchFieldValueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static FieldValueResource Fetch(FetchFieldValueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<FieldValueResource> FetchAsync(FetchFieldValueOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathFieldTypeSid"> The field_type_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static FieldValueResource Fetch(string pathAssistantSid,
-                                               string pathFieldTypeSid,
-                                               string pathSid,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathFieldTypeSid"> The field_type_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<FieldValueResource> FetchAsync(string pathAssistantSid,
-                                                                                       string pathFieldTypeSid,
-                                                                                       string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadFieldValueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static ResourceSet<FieldValueResource> Read(ReadFieldValueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FieldValueResource>.FromJson("field_values", response.Content);
-            return new ResourceSet<FieldValueResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FieldValueResource>> ReadAsync(ReadFieldValueOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FieldValueResource>.FromJson("field_values", response.Content);
-            return new ResourceSet<FieldValueResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathFieldTypeSid"> The field_type_sid </param>
-        /// <param name="language"> An ISO language-country string of the value. For example: en-US </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static ResourceSet<FieldValueResource> Read(string pathAssistantSid,
-                                                           string pathFieldTypeSid,
-                                                           string language = null,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadFieldValueOptions(pathAssistantSid, pathFieldTypeSid){Language = language, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathFieldTypeSid"> The field_type_sid </param>
-        /// <param name="language"> An ISO language-country string of the value. For example: en-US </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FieldValueResource>> ReadAsync(string pathAssistantSid,
-                                                                                                   string pathFieldTypeSid,
-                                                                                                   string language = null,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadFieldValueOptions(pathAssistantSid, pathFieldTypeSid){Language = language, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FieldValueResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FieldValueResource>.FromJson("field_values", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FieldValueResource> NextPage(Page<FieldValueResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<FieldValueResource>.FromJson("field_values", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FieldValueResource> PreviousPage(Page<FieldValueResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<FieldValueResource>.FromJson("field_values", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateFieldValueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static FieldValueResource Create(CreateFieldValueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<FieldValueResource> CreateAsync(CreateFieldValueOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathFieldTypeSid"> The field_type_sid </param>
-        /// <param name="language"> An ISO language-country string of the value. </param>
-        /// <param name="value"> A user-provided string that uniquely identifies this resource as an alternative to the sid.
-        ///             Unique up to 64 characters long. </param>
-        /// <param name="synonymOf"> A value that indicates this field value is a synonym of. Empty if the value is not a
-        ///                 synonym. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static FieldValueResource Create(string pathAssistantSid,
-                                                string pathFieldTypeSid,
-                                                string language,
-                                                string value,
-                                                string synonymOf = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateFieldValueOptions(pathAssistantSid, pathFieldTypeSid, language, value){SynonymOf = synonymOf};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathFieldTypeSid"> The field_type_sid </param>
-        /// <param name="language"> An ISO language-country string of the value. </param>
-        /// <param name="value"> A user-provided string that uniquely identifies this resource as an alternative to the sid.
-        ///             Unique up to 64 characters long. </param>
-        /// <param name="synonymOf"> A value that indicates this field value is a synonym of. Empty if the value is not a
-        ///                 synonym. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<FieldValueResource> CreateAsync(string pathAssistantSid,
-                                                                                        string pathFieldTypeSid,
-                                                                                        string language,
-                                                                                        string value,
-                                                                                        string synonymOf = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateFieldValueOptions(pathAssistantSid, pathFieldTypeSid, language, value){SynonymOf = synonymOf};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteFieldValueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static bool Delete(DeleteFieldValueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete FieldValue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFieldValueOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathFieldTypeSid"> The field_type_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldValue </returns>
-        public static bool Delete(string pathAssistantSid,
-                                  string pathFieldTypeSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathFieldTypeSid"> The field_type_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldValue </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathFieldTypeSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FieldValueResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FieldValueResource object represented by the provided JSON </returns>
-        public static FieldValueResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FieldValueResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account that created this Field Value.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The unique ID of the Field Type associated with this Field Value.
-        /// </summary>
-        [JsonProperty("field_type_sid")]
-        public string FieldTypeSid { get; private set; }
-        /// <summary>
-        /// An ISO language-country string of the value.
-        /// </summary>
-        [JsonProperty("language")]
-        public string Language { get; private set; }
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The Field Value itself.
-        /// </summary>
-        [JsonProperty("value")]
-        public string Value { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// A value that indicates this field value is a synonym of. Empty if the value is not a synonym.
-        /// </summary>
-        [JsonProperty("synonym_of")]
-        public string SynonymOf { get; private set; }
-
-        private FieldValueResource()
-        {
-
-        }
-    }
+{
+
+  public class FieldValueResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchFieldValueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static FieldValueResource Fetch(FetchFieldValueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<FieldValueResource> FetchAsync(FetchFieldValueOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathFieldTypeSid"> The field_type_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static FieldValueResource Fetch(string pathAssistantSid,
+                                           string pathFieldTypeSid,
+                                           string pathSid,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathFieldTypeSid"> The field_type_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<FieldValueResource> FetchAsync(string pathAssistantSid,
+                                                                                   string pathFieldTypeSid,
+                                                                                   string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadFieldValueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static ResourceSet<FieldValueResource> Read(ReadFieldValueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FieldValueResource>.FromJson("field_values", response.Content);
+      return new ResourceSet<FieldValueResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FieldValueResource>> ReadAsync(ReadFieldValueOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FieldValueResource>.FromJson("field_values", response.Content);
+      return new ResourceSet<FieldValueResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathFieldTypeSid"> The field_type_sid </param>
+    /// <param name="language"> An ISO language-country string of the value. For example: en-US </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static ResourceSet<FieldValueResource> Read(string pathAssistantSid,
+                                                       string pathFieldTypeSid,
+                                                       string language = null,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadFieldValueOptions(pathAssistantSid, pathFieldTypeSid) { Language = language, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathFieldTypeSid"> The field_type_sid </param>
+    /// <param name="language"> An ISO language-country string of the value. For example: en-US </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FieldValueResource>> ReadAsync(string pathAssistantSid,
+                                                                                               string pathFieldTypeSid,
+                                                                                               string language = null,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadFieldValueOptions(pathAssistantSid, pathFieldTypeSid) { Language = language, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FieldValueResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FieldValueResource>.FromJson("field_values", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FieldValueResource> NextPage(Page<FieldValueResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<FieldValueResource>.FromJson("field_values", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FieldValueResource> PreviousPage(Page<FieldValueResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<FieldValueResource>.FromJson("field_values", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateFieldValueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static FieldValueResource Create(CreateFieldValueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<FieldValueResource> CreateAsync(CreateFieldValueOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathFieldTypeSid"> The field_type_sid </param>
+    /// <param name="language"> An ISO language-country string of the value. </param>
+    /// <param name="value"> A user-provided string that uniquely identifies this resource as an alternative to the sid.
+    ///             Unique up to 64 characters long. </param>
+    /// <param name="synonymOf"> A value that indicates this field value is a synonym of. Empty if the value is not a
+    ///                 synonym. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static FieldValueResource Create(string pathAssistantSid,
+                                            string pathFieldTypeSid,
+                                            string language,
+                                            string value,
+                                            string synonymOf = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateFieldValueOptions(pathAssistantSid, pathFieldTypeSid, language, value) { SynonymOf = synonymOf };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathFieldTypeSid"> The field_type_sid </param>
+    /// <param name="language"> An ISO language-country string of the value. </param>
+    /// <param name="value"> A user-provided string that uniquely identifies this resource as an alternative to the sid.
+    ///             Unique up to 64 characters long. </param>
+    /// <param name="synonymOf"> A value that indicates this field value is a synonym of. Empty if the value is not a
+    ///                 synonym. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<FieldValueResource> CreateAsync(string pathAssistantSid,
+                                                                                    string pathFieldTypeSid,
+                                                                                    string language,
+                                                                                    string value,
+                                                                                    string synonymOf = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateFieldValueOptions(pathAssistantSid, pathFieldTypeSid, language, value) { SynonymOf = synonymOf };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteFieldValueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathFieldTypeSid + "/FieldValues/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static bool Delete(DeleteFieldValueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete FieldValue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFieldValueOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathFieldTypeSid"> The field_type_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldValue </returns>
+    public static bool Delete(string pathAssistantSid,
+                              string pathFieldTypeSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathFieldTypeSid"> The field_type_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldValue </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathFieldTypeSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteFieldValueOptions(pathAssistantSid, pathFieldTypeSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FieldValueResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FieldValueResource object represented by the provided JSON </returns>
+    public static FieldValueResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FieldValueResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account that created this Field Value.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The unique ID of the Field Type associated with this Field Value.
+    /// </summary>
+    [JsonProperty("field_type_sid")]
+    public string FieldTypeSid { get; private set; }
+    /// <summary>
+    /// An ISO language-country string of the value.
+    /// </summary>
+    [JsonProperty("language")]
+    public string Language { get; private set; }
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The Field Value itself.
+    /// </summary>
+    [JsonProperty("value")]
+    public string Value { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// A value that indicates this field value is a synonym of. Empty if the value is not a synonym.
+    /// </summary>
+    [JsonProperty("synonym_of")]
+    public string SynonymOf { get; private set; }
+
+    private FieldValueResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/FieldTypeOptions.cs b/src/Twilio/Rest/Preview/Understand/Assistant/FieldTypeOptions.cs
index ae8a1e689..8a96eabb7 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/FieldTypeOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/FieldTypeOptions.cs
@@ -9,228 +9,228 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchFieldTypeOptions
+  /// </summary>
+  public class FetchFieldTypeOptions : IOptions<FieldTypeResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchFieldTypeOptions
-    /// </summary>
-    public class FetchFieldTypeOptions : IOptions<FieldTypeResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFieldTypeOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchFieldTypeOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadFieldTypeOptions
-    /// </summary>
-    public class ReadFieldTypeOptions : ReadOptions<FieldTypeResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadFieldTypeOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        public ReadFieldTypeOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateFieldTypeOptions
-    /// </summary>
-    public class CreateFieldTypeOptions : IOptions<FieldTypeResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
-        /// </summary>
-        public string UniqueName { get; }
-        /// <summary>
-        /// A user-provided string that identifies this resource. It is non-unique and can up to 255 characters long.
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateFieldTypeOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        public CreateFieldTypeOptions(string pathAssistantSid, string uniqueName)
-        {
-            PathAssistantSid = pathAssistantSid;
-            UniqueName = uniqueName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchFieldTypeOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchFieldTypeOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateFieldTypeOptions
-    /// </summary>
-    public class UpdateFieldTypeOptions : IOptions<FieldTypeResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A user-provided string that identifies this resource. It is non-unique and can up to 255 characters long.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
-        /// </summary>
-        public string UniqueName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateFieldTypeOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateFieldTypeOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadFieldTypeOptions
+  /// </summary>
+  public class ReadFieldTypeOptions : ReadOptions<FieldTypeResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteFieldTypeOptions
-    /// </summary>
-    public class DeleteFieldTypeOptions : IOptions<FieldTypeResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFieldTypeOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteFieldTypeOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadFieldTypeOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    public ReadFieldTypeOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateFieldTypeOptions
+  /// </summary>
+  public class CreateFieldTypeOptions : IOptions<FieldTypeResource>
+  {
+    /// <summary>
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
+    /// </summary>
+    public string UniqueName { get; }
+    /// <summary>
+    /// A user-provided string that identifies this resource. It is non-unique and can up to 255 characters long.
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateFieldTypeOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    public CreateFieldTypeOptions(string pathAssistantSid, string uniqueName)
+    {
+      PathAssistantSid = pathAssistantSid;
+      UniqueName = uniqueName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateFieldTypeOptions
+  /// </summary>
+  public class UpdateFieldTypeOptions : IOptions<FieldTypeResource>
+  {
+    /// <summary>
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A user-provided string that identifies this resource. It is non-unique and can up to 255 characters long.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
+    /// </summary>
+    public string UniqueName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateFieldTypeOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateFieldTypeOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteFieldTypeOptions
+  /// </summary>
+  public class DeleteFieldTypeOptions : IOptions<FieldTypeResource>
+  {
+    /// <summary>
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteFieldTypeOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteFieldTypeOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/FieldTypeResource.cs b/src/Twilio/Rest/Preview/Understand/Assistant/FieldTypeResource.cs
index ee93ffb73..fc131407f 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/FieldTypeResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/FieldTypeResource.cs
@@ -1,533 +1,533 @@
-/// This code was generated by
-/// \ / _    _  _|   _  _
-///  | (_)\/(_)(_|\/| |(/_  v1.0.0
-///       /       /
-/// <summary>
-/// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-/// currently do not have developer preview access, please contact help@twilio.com.
-///
-/// FieldTypeResource
-/// </summary>
-
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using Twilio.Base;
-using Twilio.Clients;
-using Twilio.Converters;
-using Twilio.Exceptions;
-using Twilio.Http;
-
-namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
-    public class FieldTypeResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchFieldTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static FieldTypeResource Fetch(FetchFieldTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<FieldTypeResource> FetchAsync(FetchFieldTypeOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static FieldTypeResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchFieldTypeOptions(pathAssistantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<FieldTypeResource> FetchAsync(string pathAssistantSid,
-                                                                                      string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchFieldTypeOptions(pathAssistantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadFieldTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static ResourceSet<FieldTypeResource> Read(ReadFieldTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FieldTypeResource>.FromJson("field_types", response.Content);
-            return new ResourceSet<FieldTypeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FieldTypeResource>> ReadAsync(ReadFieldTypeOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FieldTypeResource>.FromJson("field_types", response.Content);
-            return new ResourceSet<FieldTypeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static ResourceSet<FieldTypeResource> Read(string pathAssistantSid,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadFieldTypeOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FieldTypeResource>> ReadAsync(string pathAssistantSid,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadFieldTypeOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FieldTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FieldTypeResource>.FromJson("field_types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FieldTypeResource> NextPage(Page<FieldTypeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<FieldTypeResource>.FromJson("field_types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FieldTypeResource> PreviousPage(Page<FieldTypeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<FieldTypeResource>.FromJson("field_types", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateFieldTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static FieldTypeResource Create(CreateFieldTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<FieldTypeResource> CreateAsync(CreateFieldTypeOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
-        ///                    255 characters long. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static FieldTypeResource Create(string pathAssistantSid,
-                                               string uniqueName,
-                                               string friendlyName = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateFieldTypeOptions(pathAssistantSid, uniqueName){FriendlyName = friendlyName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
-        ///                    255 characters long. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<FieldTypeResource> CreateAsync(string pathAssistantSid,
-                                                                                       string uniqueName,
-                                                                                       string friendlyName = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateFieldTypeOptions(pathAssistantSid, uniqueName){FriendlyName = friendlyName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateFieldTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static FieldTypeResource Update(UpdateFieldTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<FieldTypeResource> UpdateAsync(UpdateFieldTypeOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
-        ///                    255 characters long. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static FieldTypeResource Update(string pathAssistantSid,
-                                               string pathSid,
-                                               string friendlyName = null,
-                                               string uniqueName = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateFieldTypeOptions(pathAssistantSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
-        ///                    255 characters long. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<FieldTypeResource> UpdateAsync(string pathAssistantSid,
-                                                                                       string pathSid,
-                                                                                       string friendlyName = null,
-                                                                                       string uniqueName = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateFieldTypeOptions(pathAssistantSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteFieldTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static bool Delete(DeleteFieldTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete FieldType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFieldTypeOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FieldType </returns>
-        public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFieldTypeOptions(pathAssistantSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FieldType </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteFieldTypeOptions(pathAssistantSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FieldTypeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FieldTypeResource object represented by the provided JSON </returns>
-        public static FieldTypeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FieldTypeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account that created this Field Type.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// A user-provided string that identifies this resource. It is non-unique and can up to 255 characters long.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private FieldTypeResource()
-        {
-
-        }
-    }
-
+/// This code was generated by
+/// \ / _    _  _|   _  _
+///  | (_)\/(_)(_|\/| |(/_  v1.0.0
+///       /       /
+/// <summary>
+/// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+/// currently do not have developer preview access, please contact help@twilio.com.
+///
+/// FieldTypeResource
+/// </summary>
+
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using Twilio.Base;
+using Twilio.Clients;
+using Twilio.Converters;
+using Twilio.Exceptions;
+using Twilio.Http;
+
+namespace Twilio.Rest.Preview.Understand.Assistant
+{
+
+  public class FieldTypeResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchFieldTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static FieldTypeResource Fetch(FetchFieldTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<FieldTypeResource> FetchAsync(FetchFieldTypeOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static FieldTypeResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchFieldTypeOptions(pathAssistantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<FieldTypeResource> FetchAsync(string pathAssistantSid,
+                                                                                  string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchFieldTypeOptions(pathAssistantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadFieldTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static ResourceSet<FieldTypeResource> Read(ReadFieldTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FieldTypeResource>.FromJson("field_types", response.Content);
+      return new ResourceSet<FieldTypeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FieldTypeResource>> ReadAsync(ReadFieldTypeOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FieldTypeResource>.FromJson("field_types", response.Content);
+      return new ResourceSet<FieldTypeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static ResourceSet<FieldTypeResource> Read(string pathAssistantSid,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadFieldTypeOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FieldTypeResource>> ReadAsync(string pathAssistantSid,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadFieldTypeOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FieldTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FieldTypeResource>.FromJson("field_types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FieldTypeResource> NextPage(Page<FieldTypeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<FieldTypeResource>.FromJson("field_types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FieldTypeResource> PreviousPage(Page<FieldTypeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<FieldTypeResource>.FromJson("field_types", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateFieldTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static FieldTypeResource Create(CreateFieldTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<FieldTypeResource> CreateAsync(CreateFieldTypeOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
+    ///                    255 characters long. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static FieldTypeResource Create(string pathAssistantSid,
+                                           string uniqueName,
+                                           string friendlyName = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateFieldTypeOptions(pathAssistantSid, uniqueName) { FriendlyName = friendlyName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
+    ///                    255 characters long. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<FieldTypeResource> CreateAsync(string pathAssistantSid,
+                                                                                   string uniqueName,
+                                                                                   string friendlyName = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateFieldTypeOptions(pathAssistantSid, uniqueName) { FriendlyName = friendlyName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateFieldTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static FieldTypeResource Update(UpdateFieldTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<FieldTypeResource> UpdateAsync(UpdateFieldTypeOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
+    ///                    255 characters long. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static FieldTypeResource Update(string pathAssistantSid,
+                                           string pathSid,
+                                           string friendlyName = null,
+                                           string uniqueName = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateFieldTypeOptions(pathAssistantSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
+    ///                    255 characters long. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<FieldTypeResource> UpdateAsync(string pathAssistantSid,
+                                                                                   string pathSid,
+                                                                                   string friendlyName = null,
+                                                                                   string uniqueName = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateFieldTypeOptions(pathAssistantSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteFieldTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/FieldTypes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static bool Delete(DeleteFieldTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete FieldType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFieldTypeOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FieldType </returns>
+    public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFieldTypeOptions(pathAssistantSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FieldType </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteFieldTypeOptions(pathAssistantSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FieldTypeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FieldTypeResource object represented by the provided JSON </returns>
+    public static FieldTypeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FieldTypeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account that created this Field Type.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// A user-provided string that identifies this resource. It is non-unique and can up to 255 characters long.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private FieldTypeResource()
+    {
+
+    }
+  }
+
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/ModelBuildOptions.cs b/src/Twilio/Rest/Preview/Understand/Assistant/ModelBuildOptions.cs
index aef95593d..15503c138 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/ModelBuildOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/ModelBuildOptions.cs
@@ -9,216 +9,216 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchModelBuildOptions
+  /// </summary>
+  public class FetchModelBuildOptions : IOptions<ModelBuildResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchModelBuildOptions
-    /// </summary>
-    public class FetchModelBuildOptions : IOptions<ModelBuildResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchModelBuildOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public FetchModelBuildOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadModelBuildOptions
-    /// </summary>
-    public class ReadModelBuildOptions : ReadOptions<ModelBuildResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadModelBuildOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        public ReadModelBuildOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateModelBuildOptions
-    /// </summary>
-    public class CreateModelBuildOptions : IOptions<ModelBuildResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The status_callback
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long. For example: v0.1
-        /// </summary>
-        public string UniqueName { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateModelBuildOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        public CreateModelBuildOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchModelBuildOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public FetchModelBuildOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateModelBuildOptions
-    /// </summary>
-    public class UpdateModelBuildOptions : IOptions<ModelBuildResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long. For example: v0.1
-        /// </summary>
-        public string UniqueName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateModelBuildOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateModelBuildOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadModelBuildOptions
+  /// </summary>
+  public class ReadModelBuildOptions : ReadOptions<ModelBuildResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteModelBuildOptions
-    /// </summary>
-    public class DeleteModelBuildOptions : IOptions<ModelBuildResource>
-    {
-        /// <summary>
-        /// The assistant_sid
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteModelBuildOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteModelBuildOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadModelBuildOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    public ReadModelBuildOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateModelBuildOptions
+  /// </summary>
+  public class CreateModelBuildOptions : IOptions<ModelBuildResource>
+  {
+    /// <summary>
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The status_callback
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long. For example: v0.1
+    /// </summary>
+    public string UniqueName { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateModelBuildOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    public CreateModelBuildOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateModelBuildOptions
+  /// </summary>
+  public class UpdateModelBuildOptions : IOptions<ModelBuildResource>
+  {
+    /// <summary>
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long. For example: v0.1
+    /// </summary>
+    public string UniqueName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateModelBuildOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateModelBuildOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteModelBuildOptions
+  /// </summary>
+  public class DeleteModelBuildOptions : IOptions<ModelBuildResource>
+  {
+    /// <summary>
+    /// The assistant_sid
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteModelBuildOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteModelBuildOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/ModelBuildResource.cs b/src/Twilio/Rest/Preview/Understand/Assistant/ModelBuildResource.cs
index 572953dd5..13cc76f8e 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/ModelBuildResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/ModelBuildResource.cs
@@ -20,529 +20,529 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
-    public class ModelBuildResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Enqueued = new StatusEnum("enqueued");
-            public static readonly StatusEnum Building = new StatusEnum("building");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-            public static readonly StatusEnum Canceled = new StatusEnum("canceled");
-        }
-
-        private static Request BuildFetchRequest(FetchModelBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/ModelBuilds/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ModelBuildResource Fetch(FetchModelBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ModelBuildResource> FetchAsync(FetchModelBuildOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ModelBuildResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchModelBuildOptions(pathAssistantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ModelBuildResource> FetchAsync(string pathAssistantSid,
-                                                                                       string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchModelBuildOptions(pathAssistantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadModelBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/ModelBuilds",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ResourceSet<ModelBuildResource> Read(ReadModelBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ModelBuildResource>.FromJson("model_builds", response.Content);
-            return new ResourceSet<ModelBuildResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ModelBuildResource>> ReadAsync(ReadModelBuildOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ModelBuildResource>.FromJson("model_builds", response.Content);
-            return new ResourceSet<ModelBuildResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ResourceSet<ModelBuildResource> Read(string pathAssistantSid,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadModelBuildOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ModelBuildResource>> ReadAsync(string pathAssistantSid,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadModelBuildOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ModelBuildResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ModelBuildResource>.FromJson("model_builds", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ModelBuildResource> NextPage(Page<ModelBuildResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<ModelBuildResource>.FromJson("model_builds", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ModelBuildResource> PreviousPage(Page<ModelBuildResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<ModelBuildResource>.FromJson("model_builds", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateModelBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/ModelBuilds",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ModelBuildResource Create(CreateModelBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ModelBuildResource> CreateAsync(CreateModelBuildOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="statusCallback"> The status_callback </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. For example: v0.1 </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ModelBuildResource Create(string pathAssistantSid,
-                                                Uri statusCallback = null,
-                                                string uniqueName = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateModelBuildOptions(pathAssistantSid){StatusCallback = statusCallback, UniqueName = uniqueName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="statusCallback"> The status_callback </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. For example: v0.1 </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ModelBuildResource> CreateAsync(string pathAssistantSid,
-                                                                                        Uri statusCallback = null,
-                                                                                        string uniqueName = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateModelBuildOptions(pathAssistantSid){StatusCallback = statusCallback, UniqueName = uniqueName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateModelBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/ModelBuilds/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ModelBuildResource Update(UpdateModelBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ModelBuildResource> UpdateAsync(UpdateModelBuildOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. For example: v0.1 </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static ModelBuildResource Update(string pathAssistantSid,
-                                                string pathSid,
-                                                string uniqueName = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateModelBuildOptions(pathAssistantSid, pathSid){UniqueName = uniqueName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. For example: v0.1 </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<ModelBuildResource> UpdateAsync(string pathAssistantSid,
-                                                                                        string pathSid,
-                                                                                        string uniqueName = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateModelBuildOptions(pathAssistantSid, pathSid){UniqueName = uniqueName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteModelBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/ModelBuilds/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static bool Delete(DeleteModelBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete ModelBuild parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteModelBuildOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ModelBuild </returns>
-        public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteModelBuildOptions(pathAssistantSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The assistant_sid </param>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ModelBuild </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteModelBuildOptions(pathAssistantSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ModelBuildResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ModelBuildResource object represented by the provided JSON </returns>
-        public static ModelBuildResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ModelBuildResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account that created this Model Build.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The unique ID of the parent Assistant.
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A string that described the model build status. The values can be: enqueued, building, completed, failed
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ModelBuildResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The time in seconds it took to build the model.
-        /// </summary>
-        [JsonProperty("build_duration")]
-        public int? BuildDuration { get; private set; }
-        /// <summary>
-        /// The error_code
-        /// </summary>
-        [JsonProperty("error_code")]
-        public int? ErrorCode { get; private set; }
-
-        private ModelBuildResource()
-        {
-
-        }
-    }
+{
+
+  public class ModelBuildResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Enqueued = new StatusEnum("enqueued");
+      public static readonly StatusEnum Building = new StatusEnum("building");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+      public static readonly StatusEnum Canceled = new StatusEnum("canceled");
+    }
+
+    private static Request BuildFetchRequest(FetchModelBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/ModelBuilds/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ModelBuildResource Fetch(FetchModelBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ModelBuildResource> FetchAsync(FetchModelBuildOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ModelBuildResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchModelBuildOptions(pathAssistantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ModelBuildResource> FetchAsync(string pathAssistantSid,
+                                                                                   string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchModelBuildOptions(pathAssistantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadModelBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/ModelBuilds",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ResourceSet<ModelBuildResource> Read(ReadModelBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ModelBuildResource>.FromJson("model_builds", response.Content);
+      return new ResourceSet<ModelBuildResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ModelBuildResource>> ReadAsync(ReadModelBuildOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ModelBuildResource>.FromJson("model_builds", response.Content);
+      return new ResourceSet<ModelBuildResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ResourceSet<ModelBuildResource> Read(string pathAssistantSid,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadModelBuildOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ModelBuildResource>> ReadAsync(string pathAssistantSid,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadModelBuildOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ModelBuildResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ModelBuildResource>.FromJson("model_builds", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ModelBuildResource> NextPage(Page<ModelBuildResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<ModelBuildResource>.FromJson("model_builds", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ModelBuildResource> PreviousPage(Page<ModelBuildResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<ModelBuildResource>.FromJson("model_builds", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateModelBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/ModelBuilds",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ModelBuildResource Create(CreateModelBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ModelBuildResource> CreateAsync(CreateModelBuildOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="statusCallback"> The status_callback </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. For example: v0.1 </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ModelBuildResource Create(string pathAssistantSid,
+                                            Uri statusCallback = null,
+                                            string uniqueName = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateModelBuildOptions(pathAssistantSid) { StatusCallback = statusCallback, UniqueName = uniqueName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="statusCallback"> The status_callback </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. For example: v0.1 </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ModelBuildResource> CreateAsync(string pathAssistantSid,
+                                                                                    Uri statusCallback = null,
+                                                                                    string uniqueName = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateModelBuildOptions(pathAssistantSid) { StatusCallback = statusCallback, UniqueName = uniqueName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateModelBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/ModelBuilds/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ModelBuildResource Update(UpdateModelBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ModelBuildResource> UpdateAsync(UpdateModelBuildOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. For example: v0.1 </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static ModelBuildResource Update(string pathAssistantSid,
+                                            string pathSid,
+                                            string uniqueName = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateModelBuildOptions(pathAssistantSid, pathSid) { UniqueName = uniqueName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. For example: v0.1 </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<ModelBuildResource> UpdateAsync(string pathAssistantSid,
+                                                                                    string pathSid,
+                                                                                    string uniqueName = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateModelBuildOptions(pathAssistantSid, pathSid) { UniqueName = uniqueName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteModelBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/ModelBuilds/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static bool Delete(DeleteModelBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete ModelBuild parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteModelBuildOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ModelBuild </returns>
+    public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteModelBuildOptions(pathAssistantSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The assistant_sid </param>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ModelBuild </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteModelBuildOptions(pathAssistantSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ModelBuildResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ModelBuildResource object represented by the provided JSON </returns>
+    public static ModelBuildResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ModelBuildResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account that created this Model Build.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The unique ID of the parent Assistant.
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A string that described the model build status. The values can be: enqueued, building, completed, failed
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ModelBuildResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The time in seconds it took to build the model.
+    /// </summary>
+    [JsonProperty("build_duration")]
+    public int? BuildDuration { get; private set; }
+    /// <summary>
+    /// The error_code
+    /// </summary>
+    [JsonProperty("error_code")]
+    public int? ErrorCode { get; private set; }
+
+    private ModelBuildResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/QueryOptions.cs b/src/Twilio/Rest/Preview/Understand/Assistant/QueryOptions.cs
index cbd490be3..32b94c85d 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/QueryOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/QueryOptions.cs
@@ -9,284 +9,284 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchQueryOptions
+  /// </summary>
+  public class FetchQueryOptions : IOptions<QueryResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchQueryOptions
+    /// The unique ID of the Assistant.
     /// </summary>
-    public class FetchQueryOptions : IOptions<QueryResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchQueryOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchQueryOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadQueryOptions
+    /// A 34 character string that uniquely identifies this resource.
     /// </summary>
-    public class ReadQueryOptions : ReadOptions<QueryResource>
-    {
-        /// <summary>
-        /// The unique ID of the parent Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// An ISO language-country string of the sample.
-        /// </summary>
-        public string Language { get; set; }
-        /// <summary>
-        /// The Model Build Sid or unique name of the Model Build to be queried.
-        /// </summary>
-        public string ModelBuild { get; set; }
-        /// <summary>
-        /// A string that described the query status. The values can be: pending_review, reviewed, discarded
-        /// </summary>
-        public string Status { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadQueryOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        public ReadQueryOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (ModelBuild != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ModelBuild", ModelBuild.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateQueryOptions
+    /// Construct a new FetchQueryOptions
     /// </summary>
-    public class CreateQueryOptions : IOptions<QueryResource>
-    {
-        /// <summary>
-        /// The unique ID of the parent Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// An ISO language-country string of the sample.
-        /// </summary>
-        public string Language { get; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. It can be up to 2048 characters long.
-        /// </summary>
-        public string Query { get; }
-        /// <summary>
-        /// Constraints the query to a set of tasks. Useful when you need to constrain the paths the user can take. Tasks should be comma separated task-unique-name-1, task-unique-name-2
-        /// </summary>
-        public string Tasks { get; set; }
-        /// <summary>
-        /// The Model Build Sid or unique name of the Model Build to be queried.
-        /// </summary>
-        public string ModelBuild { get; set; }
-        /// <summary>
-        /// Constraints the query to a given Field with an task. Useful when you know the Field you are expecting. It accepts one field in the format task-unique-name-1:field-unique-name
-        /// </summary>
-        public string Field { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateQueryOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="language"> An ISO language-country string of the sample. </param>
-        /// <param name="query"> A user-provided string that uniquely identifies this resource as an alternative to the sid. It
-        ///             can be up to 2048 characters long. </param>
-        public CreateQueryOptions(string pathAssistantSid, string language, string query)
-        {
-            PathAssistantSid = pathAssistantSid;
-            Language = language;
-            Query = query;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (Query != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Query", Query));
-            }
-
-            if (Tasks != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Tasks", Tasks));
-            }
-
-            if (ModelBuild != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ModelBuild", ModelBuild.ToString()));
-            }
-
-            if (Field != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Field", Field));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchQueryOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateQueryOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateQueryOptions : IOptions<QueryResource>
-    {
-        /// <summary>
-        /// The unique ID of the parent Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// An optional reference to the Sample created from this query.
-        /// </summary>
-        public string SampleSid { get; set; }
-        /// <summary>
-        /// A string that described the query status. The values can be: pending_review, reviewed, discarded
-        /// </summary>
-        public string Status { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateQueryOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public UpdateQueryOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (SampleSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SampleSid", SampleSid.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadQueryOptions
+  /// </summary>
+  public class ReadQueryOptions : ReadOptions<QueryResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteQueryOptions
+    /// The unique ID of the parent Assistant.
     /// </summary>
-    public class DeleteQueryOptions : IOptions<QueryResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteQueryOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteQueryOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// An ISO language-country string of the sample.
+    /// </summary>
+    public string Language { get; set; }
+    /// <summary>
+    /// The Model Build Sid or unique name of the Model Build to be queried.
+    /// </summary>
+    public string ModelBuild { get; set; }
+    /// <summary>
+    /// A string that described the query status. The values can be: pending_review, reviewed, discarded
+    /// </summary>
+    public string Status { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadQueryOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    public ReadQueryOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (ModelBuild != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ModelBuild", ModelBuild.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateQueryOptions
+  /// </summary>
+  public class CreateQueryOptions : IOptions<QueryResource>
+  {
+    /// <summary>
+    /// The unique ID of the parent Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// An ISO language-country string of the sample.
+    /// </summary>
+    public string Language { get; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. It can be up to 2048 characters long.
+    /// </summary>
+    public string Query { get; }
+    /// <summary>
+    /// Constraints the query to a set of tasks. Useful when you need to constrain the paths the user can take. Tasks should be comma separated task-unique-name-1, task-unique-name-2
+    /// </summary>
+    public string Tasks { get; set; }
+    /// <summary>
+    /// The Model Build Sid or unique name of the Model Build to be queried.
+    /// </summary>
+    public string ModelBuild { get; set; }
+    /// <summary>
+    /// Constraints the query to a given Field with an task. Useful when you know the Field you are expecting. It accepts one field in the format task-unique-name-1:field-unique-name
+    /// </summary>
+    public string Field { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateQueryOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="language"> An ISO language-country string of the sample. </param>
+    /// <param name="query"> A user-provided string that uniquely identifies this resource as an alternative to the sid. It
+    ///             can be up to 2048 characters long. </param>
+    public CreateQueryOptions(string pathAssistantSid, string language, string query)
+    {
+      PathAssistantSid = pathAssistantSid;
+      Language = language;
+      Query = query;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (Query != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Query", Query));
+      }
+
+      if (Tasks != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Tasks", Tasks));
+      }
+
+      if (ModelBuild != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ModelBuild", ModelBuild.ToString()));
+      }
+
+      if (Field != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Field", Field));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateQueryOptions
+  /// </summary>
+  public class UpdateQueryOptions : IOptions<QueryResource>
+  {
+    /// <summary>
+    /// The unique ID of the parent Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// An optional reference to the Sample created from this query.
+    /// </summary>
+    public string SampleSid { get; set; }
+    /// <summary>
+    /// A string that described the query status. The values can be: pending_review, reviewed, discarded
+    /// </summary>
+    public string Status { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateQueryOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public UpdateQueryOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (SampleSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SampleSid", SampleSid.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteQueryOptions
+  /// </summary>
+  public class DeleteQueryOptions : IOptions<QueryResource>
+  {
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteQueryOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteQueryOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/QueryResource.cs b/src/Twilio/Rest/Preview/Understand/Assistant/QueryResource.cs
index a8ebf5732..cb753d270 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/QueryResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/QueryResource.cs
@@ -19,561 +19,561 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
-    public class QueryResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchQueryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Queries/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static QueryResource Fetch(FetchQueryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<QueryResource> FetchAsync(FetchQueryOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static QueryResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchQueryOptions(pathAssistantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<QueryResource> FetchAsync(string pathAssistantSid,
-                                                                                  string pathSid,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchQueryOptions(pathAssistantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadQueryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Queries",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static ResourceSet<QueryResource> Read(ReadQueryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<QueryResource>.FromJson("queries", response.Content);
-            return new ResourceSet<QueryResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<QueryResource>> ReadAsync(ReadQueryOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<QueryResource>.FromJson("queries", response.Content);
-            return new ResourceSet<QueryResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="language"> An ISO language-country string of the sample. </param>
-        /// <param name="modelBuild"> The Model Build Sid or unique name of the Model Build to be queried. </param>
-        /// <param name="status"> A string that described the query status. The values can be: pending_review, reviewed,
-        ///              discarded </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static ResourceSet<QueryResource> Read(string pathAssistantSid,
-                                                      string language = null,
-                                                      string modelBuild = null,
-                                                      string status = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadQueryOptions(pathAssistantSid){Language = language, ModelBuild = modelBuild, Status = status, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="language"> An ISO language-country string of the sample. </param>
-        /// <param name="modelBuild"> The Model Build Sid or unique name of the Model Build to be queried. </param>
-        /// <param name="status"> A string that described the query status. The values can be: pending_review, reviewed,
-        ///              discarded </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<QueryResource>> ReadAsync(string pathAssistantSid,
-                                                                                              string language = null,
-                                                                                              string modelBuild = null,
-                                                                                              string status = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadQueryOptions(pathAssistantSid){Language = language, ModelBuild = modelBuild, Status = status, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<QueryResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<QueryResource>.FromJson("queries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<QueryResource> NextPage(Page<QueryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<QueryResource>.FromJson("queries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<QueryResource> PreviousPage(Page<QueryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<QueryResource>.FromJson("queries", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateQueryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Queries",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static QueryResource Create(CreateQueryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<QueryResource> CreateAsync(CreateQueryOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="language"> An ISO language-country string of the sample. </param>
-        /// <param name="query"> A user-provided string that uniquely identifies this resource as an alternative to the sid. It
-        ///             can be up to 2048 characters long. </param>
-        /// <param name="tasks"> Constraints the query to a set of tasks. Useful when you need to constrain the paths the user
-        ///             can take. Tasks should be comma separated task-unique-name-1, task-unique-name-2 </param>
-        /// <param name="modelBuild"> The Model Build Sid or unique name of the Model Build to be queried. </param>
-        /// <param name="field"> Constraints the query to a given Field with an task. Useful when you know the Field you are
-        ///             expecting. It accepts one field in the format task-unique-name-1:field-unique-name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static QueryResource Create(string pathAssistantSid,
-                                           string language,
-                                           string query,
-                                           string tasks = null,
-                                           string modelBuild = null,
-                                           string field = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateQueryOptions(pathAssistantSid, language, query){Tasks = tasks, ModelBuild = modelBuild, Field = field};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="language"> An ISO language-country string of the sample. </param>
-        /// <param name="query"> A user-provided string that uniquely identifies this resource as an alternative to the sid. It
-        ///             can be up to 2048 characters long. </param>
-        /// <param name="tasks"> Constraints the query to a set of tasks. Useful when you need to constrain the paths the user
-        ///             can take. Tasks should be comma separated task-unique-name-1, task-unique-name-2 </param>
-        /// <param name="modelBuild"> The Model Build Sid or unique name of the Model Build to be queried. </param>
-        /// <param name="field"> Constraints the query to a given Field with an task. Useful when you know the Field you are
-        ///             expecting. It accepts one field in the format task-unique-name-1:field-unique-name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<QueryResource> CreateAsync(string pathAssistantSid,
-                                                                                   string language,
-                                                                                   string query,
-                                                                                   string tasks = null,
-                                                                                   string modelBuild = null,
-                                                                                   string field = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateQueryOptions(pathAssistantSid, language, query){Tasks = tasks, ModelBuild = modelBuild, Field = field};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateQueryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Queries/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static QueryResource Update(UpdateQueryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<QueryResource> UpdateAsync(UpdateQueryOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="sampleSid"> An optional reference to the Sample created from this query. </param>
-        /// <param name="status"> A string that described the query status. The values can be: pending_review, reviewed,
-        ///              discarded </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static QueryResource Update(string pathAssistantSid,
-                                           string pathSid,
-                                           string sampleSid = null,
-                                           string status = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new UpdateQueryOptions(pathAssistantSid, pathSid){SampleSid = sampleSid, Status = status};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="sampleSid"> An optional reference to the Sample created from this query. </param>
-        /// <param name="status"> A string that described the query status. The values can be: pending_review, reviewed,
-        ///              discarded </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<QueryResource> UpdateAsync(string pathAssistantSid,
-                                                                                   string pathSid,
-                                                                                   string sampleSid = null,
-                                                                                   string status = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new UpdateQueryOptions(pathAssistantSid, pathSid){SampleSid = sampleSid, Status = status};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteQueryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Queries/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static bool Delete(DeleteQueryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Query parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteQueryOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Query </returns>
-        public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteQueryOptions(pathAssistantSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Query </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteQueryOptions(pathAssistantSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a QueryResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> QueryResource object represented by the provided JSON </returns>
-        public static QueryResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<QueryResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account that created this Query.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The natural language analysis results which include the Task recognized, the confidence score and a list of identified Fields.
-        /// </summary>
-        [JsonProperty("results")]
-        public object Results { get; private set; }
-        /// <summary>
-        /// An ISO language-country string of the sample.
-        /// </summary>
-        [JsonProperty("language")]
-        public string Language { get; private set; }
-        /// <summary>
-        /// The unique ID of the Model Build queried.
-        /// </summary>
-        [JsonProperty("model_build_sid")]
-        public string ModelBuildSid { get; private set; }
-        /// <summary>
-        /// The end-user's natural language input.
-        /// </summary>
-        [JsonProperty("query")]
-        public string Query { get; private set; }
-        /// <summary>
-        /// An optional reference to the Sample created from this query.
-        /// </summary>
-        [JsonProperty("sample_sid")]
-        public string SampleSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the parent Assistant.
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A string that described the query status. The values can be: pending_review, reviewed, discarded
-        /// </summary>
-        [JsonProperty("status")]
-        public string Status { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The communication channel where this end-user input came from
-        /// </summary>
-        [JsonProperty("source_channel")]
-        public string SourceChannel { get; private set; }
-
-        private QueryResource()
-        {
-
-        }
-    }
+{
+
+  public class QueryResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchQueryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Queries/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static QueryResource Fetch(FetchQueryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<QueryResource> FetchAsync(FetchQueryOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static QueryResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchQueryOptions(pathAssistantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<QueryResource> FetchAsync(string pathAssistantSid,
+                                                                              string pathSid,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchQueryOptions(pathAssistantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadQueryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Queries",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static ResourceSet<QueryResource> Read(ReadQueryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<QueryResource>.FromJson("queries", response.Content);
+      return new ResourceSet<QueryResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<QueryResource>> ReadAsync(ReadQueryOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<QueryResource>.FromJson("queries", response.Content);
+      return new ResourceSet<QueryResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="language"> An ISO language-country string of the sample. </param>
+    /// <param name="modelBuild"> The Model Build Sid or unique name of the Model Build to be queried. </param>
+    /// <param name="status"> A string that described the query status. The values can be: pending_review, reviewed,
+    ///              discarded </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static ResourceSet<QueryResource> Read(string pathAssistantSid,
+                                                  string language = null,
+                                                  string modelBuild = null,
+                                                  string status = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadQueryOptions(pathAssistantSid) { Language = language, ModelBuild = modelBuild, Status = status, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="language"> An ISO language-country string of the sample. </param>
+    /// <param name="modelBuild"> The Model Build Sid or unique name of the Model Build to be queried. </param>
+    /// <param name="status"> A string that described the query status. The values can be: pending_review, reviewed,
+    ///              discarded </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<QueryResource>> ReadAsync(string pathAssistantSid,
+                                                                                          string language = null,
+                                                                                          string modelBuild = null,
+                                                                                          string status = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadQueryOptions(pathAssistantSid) { Language = language, ModelBuild = modelBuild, Status = status, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<QueryResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<QueryResource>.FromJson("queries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<QueryResource> NextPage(Page<QueryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<QueryResource>.FromJson("queries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<QueryResource> PreviousPage(Page<QueryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<QueryResource>.FromJson("queries", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateQueryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Queries",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static QueryResource Create(CreateQueryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<QueryResource> CreateAsync(CreateQueryOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="language"> An ISO language-country string of the sample. </param>
+    /// <param name="query"> A user-provided string that uniquely identifies this resource as an alternative to the sid. It
+    ///             can be up to 2048 characters long. </param>
+    /// <param name="tasks"> Constraints the query to a set of tasks. Useful when you need to constrain the paths the user
+    ///             can take. Tasks should be comma separated task-unique-name-1, task-unique-name-2 </param>
+    /// <param name="modelBuild"> The Model Build Sid or unique name of the Model Build to be queried. </param>
+    /// <param name="field"> Constraints the query to a given Field with an task. Useful when you know the Field you are
+    ///             expecting. It accepts one field in the format task-unique-name-1:field-unique-name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static QueryResource Create(string pathAssistantSid,
+                                       string language,
+                                       string query,
+                                       string tasks = null,
+                                       string modelBuild = null,
+                                       string field = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateQueryOptions(pathAssistantSid, language, query) { Tasks = tasks, ModelBuild = modelBuild, Field = field };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="language"> An ISO language-country string of the sample. </param>
+    /// <param name="query"> A user-provided string that uniquely identifies this resource as an alternative to the sid. It
+    ///             can be up to 2048 characters long. </param>
+    /// <param name="tasks"> Constraints the query to a set of tasks. Useful when you need to constrain the paths the user
+    ///             can take. Tasks should be comma separated task-unique-name-1, task-unique-name-2 </param>
+    /// <param name="modelBuild"> The Model Build Sid or unique name of the Model Build to be queried. </param>
+    /// <param name="field"> Constraints the query to a given Field with an task. Useful when you know the Field you are
+    ///             expecting. It accepts one field in the format task-unique-name-1:field-unique-name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<QueryResource> CreateAsync(string pathAssistantSid,
+                                                                               string language,
+                                                                               string query,
+                                                                               string tasks = null,
+                                                                               string modelBuild = null,
+                                                                               string field = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateQueryOptions(pathAssistantSid, language, query) { Tasks = tasks, ModelBuild = modelBuild, Field = field };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateQueryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Queries/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static QueryResource Update(UpdateQueryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<QueryResource> UpdateAsync(UpdateQueryOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="sampleSid"> An optional reference to the Sample created from this query. </param>
+    /// <param name="status"> A string that described the query status. The values can be: pending_review, reviewed,
+    ///              discarded </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static QueryResource Update(string pathAssistantSid,
+                                       string pathSid,
+                                       string sampleSid = null,
+                                       string status = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new UpdateQueryOptions(pathAssistantSid, pathSid) { SampleSid = sampleSid, Status = status };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="sampleSid"> An optional reference to the Sample created from this query. </param>
+    /// <param name="status"> A string that described the query status. The values can be: pending_review, reviewed,
+    ///              discarded </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<QueryResource> UpdateAsync(string pathAssistantSid,
+                                                                               string pathSid,
+                                                                               string sampleSid = null,
+                                                                               string status = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new UpdateQueryOptions(pathAssistantSid, pathSid) { SampleSid = sampleSid, Status = status };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteQueryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Queries/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static bool Delete(DeleteQueryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Query parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteQueryOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Query </returns>
+    public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteQueryOptions(pathAssistantSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Query </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteQueryOptions(pathAssistantSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a QueryResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> QueryResource object represented by the provided JSON </returns>
+    public static QueryResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<QueryResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account that created this Query.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The natural language analysis results which include the Task recognized, the confidence score and a list of identified Fields.
+    /// </summary>
+    [JsonProperty("results")]
+    public object Results { get; private set; }
+    /// <summary>
+    /// An ISO language-country string of the sample.
+    /// </summary>
+    [JsonProperty("language")]
+    public string Language { get; private set; }
+    /// <summary>
+    /// The unique ID of the Model Build queried.
+    /// </summary>
+    [JsonProperty("model_build_sid")]
+    public string ModelBuildSid { get; private set; }
+    /// <summary>
+    /// The end-user's natural language input.
+    /// </summary>
+    [JsonProperty("query")]
+    public string Query { get; private set; }
+    /// <summary>
+    /// An optional reference to the Sample created from this query.
+    /// </summary>
+    [JsonProperty("sample_sid")]
+    public string SampleSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the parent Assistant.
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A string that described the query status. The values can be: pending_review, reviewed, discarded
+    /// </summary>
+    [JsonProperty("status")]
+    public string Status { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The communication channel where this end-user input came from
+    /// </summary>
+    [JsonProperty("source_channel")]
+    public string SourceChannel { get; private set; }
+
+    private QueryResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/StyleSheetOptions.cs b/src/Twilio/Rest/Preview/Understand/Assistant/StyleSheetOptions.cs
index 757037bb3..0a7e512cf 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/StyleSheetOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/StyleSheetOptions.cs
@@ -9,79 +9,79 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Returns Style sheet JSON object for this Assistant
+  /// </summary>
+  public class FetchStyleSheetOptions : IOptions<StyleSheetResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Returns Style sheet JSON object for this Assistant
+    /// The unique ID of the Assistant
     /// </summary>
-    public class FetchStyleSheetOptions : IOptions<StyleSheetResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant
-        /// </summary>
-        public string PathAssistantSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchStyleSheetOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant </param>
-        public FetchStyleSheetOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Updates the style sheet for an assistant identified by {AssistantSid} or {AssistantUniqueName}.
+    /// Construct a new FetchStyleSheetOptions
     /// </summary>
-    public class UpdateStyleSheetOptions : IOptions<StyleSheetResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The JSON Style sheet string
-        /// </summary>
-        public object StyleSheet { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateStyleSheetOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant </param>
-        public UpdateStyleSheetOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (StyleSheet != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StyleSheet", Serializers.JsonObject(StyleSheet)));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant </param>
+    public FetchStyleSheetOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Updates the style sheet for an assistant identified by {AssistantSid} or {AssistantUniqueName}.
+  /// </summary>
+  public class UpdateStyleSheetOptions : IOptions<StyleSheetResource>
+  {
+    /// <summary>
+    /// The unique ID of the Assistant
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The JSON Style sheet string
+    /// </summary>
+    public object StyleSheet { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateStyleSheetOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant </param>
+    public UpdateStyleSheetOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (StyleSheet != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StyleSheet", Serializers.JsonObject(StyleSheet)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/StyleSheetResource.cs b/src/Twilio/Rest/Preview/Understand/Assistant/StyleSheetResource.cs
index beeab5cb6..e5847d76b 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/StyleSheetResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/StyleSheetResource.cs
@@ -19,192 +19,192 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
-    public class StyleSheetResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchStyleSheetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/StyleSheet",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns Style sheet JSON object for this Assistant
-        /// </summary>
-        /// <param name="options"> Fetch StyleSheet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of StyleSheet </returns>
-        public static StyleSheetResource Fetch(FetchStyleSheetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns Style sheet JSON object for this Assistant
-        /// </summary>
-        /// <param name="options"> Fetch StyleSheet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of StyleSheet </returns>
-        public static async System.Threading.Tasks.Task<StyleSheetResource> FetchAsync(FetchStyleSheetOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns Style sheet JSON object for this Assistant
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of StyleSheet </returns>
-        public static StyleSheetResource Fetch(string pathAssistantSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchStyleSheetOptions(pathAssistantSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns Style sheet JSON object for this Assistant
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of StyleSheet </returns>
-        public static async System.Threading.Tasks.Task<StyleSheetResource> FetchAsync(string pathAssistantSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchStyleSheetOptions(pathAssistantSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateStyleSheetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/StyleSheet",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates the style sheet for an assistant identified by {AssistantSid} or {AssistantUniqueName}.
-        /// </summary>
-        /// <param name="options"> Update StyleSheet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of StyleSheet </returns>
-        public static StyleSheetResource Update(UpdateStyleSheetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the style sheet for an assistant identified by {AssistantSid} or {AssistantUniqueName}.
-        /// </summary>
-        /// <param name="options"> Update StyleSheet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of StyleSheet </returns>
-        public static async System.Threading.Tasks.Task<StyleSheetResource> UpdateAsync(UpdateStyleSheetOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates the style sheet for an assistant identified by {AssistantSid} or {AssistantUniqueName}.
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant </param>
-        /// <param name="styleSheet"> The JSON Style sheet string </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of StyleSheet </returns>
-        public static StyleSheetResource Update(string pathAssistantSid,
-                                                object styleSheet = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateStyleSheetOptions(pathAssistantSid){StyleSheet = styleSheet};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the style sheet for an assistant identified by {AssistantSid} or {AssistantUniqueName}.
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant </param>
-        /// <param name="styleSheet"> The JSON Style sheet string </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of StyleSheet </returns>
-        public static async System.Threading.Tasks.Task<StyleSheetResource> UpdateAsync(string pathAssistantSid,
-                                                                                        object styleSheet = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateStyleSheetOptions(pathAssistantSid){StyleSheet = styleSheet};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a StyleSheetResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> StyleSheetResource object represented by the provided JSON </returns>
-        public static StyleSheetResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<StyleSheetResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account that created this Assistant
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Assistant
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The JSON style sheet object
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-
-        private StyleSheetResource()
-        {
-
-        }
-    }
+{
+
+  public class StyleSheetResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchStyleSheetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/StyleSheet",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns Style sheet JSON object for this Assistant
+    /// </summary>
+    /// <param name="options"> Fetch StyleSheet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of StyleSheet </returns>
+    public static StyleSheetResource Fetch(FetchStyleSheetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns Style sheet JSON object for this Assistant
+    /// </summary>
+    /// <param name="options"> Fetch StyleSheet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of StyleSheet </returns>
+    public static async System.Threading.Tasks.Task<StyleSheetResource> FetchAsync(FetchStyleSheetOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Returns Style sheet JSON object for this Assistant
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of StyleSheet </returns>
+    public static StyleSheetResource Fetch(string pathAssistantSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchStyleSheetOptions(pathAssistantSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns Style sheet JSON object for this Assistant
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of StyleSheet </returns>
+    public static async System.Threading.Tasks.Task<StyleSheetResource> FetchAsync(string pathAssistantSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchStyleSheetOptions(pathAssistantSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateStyleSheetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/StyleSheet",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates the style sheet for an assistant identified by {AssistantSid} or {AssistantUniqueName}.
+    /// </summary>
+    /// <param name="options"> Update StyleSheet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of StyleSheet </returns>
+    public static StyleSheetResource Update(UpdateStyleSheetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the style sheet for an assistant identified by {AssistantSid} or {AssistantUniqueName}.
+    /// </summary>
+    /// <param name="options"> Update StyleSheet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of StyleSheet </returns>
+    public static async System.Threading.Tasks.Task<StyleSheetResource> UpdateAsync(UpdateStyleSheetOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates the style sheet for an assistant identified by {AssistantSid} or {AssistantUniqueName}.
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant </param>
+    /// <param name="styleSheet"> The JSON Style sheet string </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of StyleSheet </returns>
+    public static StyleSheetResource Update(string pathAssistantSid,
+                                            object styleSheet = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateStyleSheetOptions(pathAssistantSid) { StyleSheet = styleSheet };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the style sheet for an assistant identified by {AssistantSid} or {AssistantUniqueName}.
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant </param>
+    /// <param name="styleSheet"> The JSON Style sheet string </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of StyleSheet </returns>
+    public static async System.Threading.Tasks.Task<StyleSheetResource> UpdateAsync(string pathAssistantSid,
+                                                                                    object styleSheet = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateStyleSheetOptions(pathAssistantSid) { StyleSheet = styleSheet };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a StyleSheetResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> StyleSheetResource object represented by the provided JSON </returns>
+    public static StyleSheetResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<StyleSheetResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account that created this Assistant
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Assistant
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The JSON style sheet object
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+
+    private StyleSheetResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/Task/FieldOptions.cs b/src/Twilio/Rest/Preview/Understand/Assistant/Task/FieldOptions.cs
index a16844b82..1c5724edd 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/Task/FieldOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/Task/FieldOptions.cs
@@ -9,199 +9,199 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand.Assistant.Task
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchFieldOptions
+  /// </summary>
+  public class FetchFieldOptions : IOptions<FieldResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchFieldOptions
-    /// </summary>
-    public class FetchFieldOptions : IOptions<FieldResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique ID of the Task associated with this Field.
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFieldOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchFieldOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The unique ID of the Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadFieldOptions
-    /// </summary>
-    public class ReadFieldOptions : ReadOptions<FieldResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique ID of the Task associated with this Field.
-        /// </summary>
-        public string PathTaskSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadFieldOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        public ReadFieldOptions(string pathAssistantSid, string pathTaskSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique ID of the Task associated with this Field.
+    /// </summary>
+    public string PathTaskSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateFieldOptions
-    /// </summary>
-    public class CreateFieldOptions : IOptions<FieldResource>
-    {
-        /// <summary>
-        /// The unique ID of the parent Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique ID of the Task associated with this Field.
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// The unique name or sid of the FieldType. It can be any Built-in Field Type or the unique_name or sid of a custom Field Type.
-        /// </summary>
-        public string FieldType { get; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
-        /// </summary>
-        public string UniqueName { get; }
-
-        /// <summary>
-        /// Construct a new CreateFieldOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        /// <param name="fieldType"> The unique name or sid of the FieldType. It can be any Built-in Field Type or the
-        ///                 unique_name or sid of a custom Field Type. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        public CreateFieldOptions(string pathAssistantSid, string pathTaskSid, string fieldType, string uniqueName)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            FieldType = fieldType;
-            UniqueName = uniqueName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FieldType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FieldType", FieldType));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-    }
-
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteFieldOptions
-    /// </summary>
-    public class DeleteFieldOptions : IOptions<FieldResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique ID of the Task associated with this Field.
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFieldOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteFieldOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new FetchFieldOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchFieldOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadFieldOptions
+  /// </summary>
+  public class ReadFieldOptions : ReadOptions<FieldResource>
+  {
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique ID of the Task associated with this Field.
+    /// </summary>
+    public string PathTaskSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadFieldOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    public ReadFieldOptions(string pathAssistantSid, string pathTaskSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateFieldOptions
+  /// </summary>
+  public class CreateFieldOptions : IOptions<FieldResource>
+  {
+    /// <summary>
+    /// The unique ID of the parent Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique ID of the Task associated with this Field.
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// The unique name or sid of the FieldType. It can be any Built-in Field Type or the unique_name or sid of a custom Field Type.
+    /// </summary>
+    public string FieldType { get; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
+    /// </summary>
+    public string UniqueName { get; }
+
+    /// <summary>
+    /// Construct a new CreateFieldOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    /// <param name="fieldType"> The unique name or sid of the FieldType. It can be any Built-in Field Type or the
+    ///                 unique_name or sid of a custom Field Type. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    public CreateFieldOptions(string pathAssistantSid, string pathTaskSid, string fieldType, string uniqueName)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      FieldType = fieldType;
+      UniqueName = uniqueName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FieldType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FieldType", FieldType));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteFieldOptions
+  /// </summary>
+  public class DeleteFieldOptions : IOptions<FieldResource>
+  {
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique ID of the Task associated with this Field.
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteFieldOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteFieldOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/Task/FieldResource.cs b/src/Twilio/Rest/Preview/Understand/Assistant/Task/FieldResource.cs
index 8764a6785..5ff66e0f3 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/Task/FieldResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/Task/FieldResource.cs
@@ -19,451 +19,451 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Understand.Assistant.Task
-{
-
-    public class FieldResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchFieldOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static FieldResource Fetch(FetchFieldOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<FieldResource> FetchAsync(FetchFieldOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static FieldResource Fetch(string pathAssistantSid,
-                                          string pathTaskSid,
-                                          string pathSid,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<FieldResource> FetchAsync(string pathAssistantSid,
-                                                                                  string pathTaskSid,
-                                                                                  string pathSid,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadFieldOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static ResourceSet<FieldResource> Read(ReadFieldOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FieldResource>.FromJson("fields", response.Content);
-            return new ResourceSet<FieldResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FieldResource>> ReadAsync(ReadFieldOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FieldResource>.FromJson("fields", response.Content);
-            return new ResourceSet<FieldResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static ResourceSet<FieldResource> Read(string pathAssistantSid,
-                                                      string pathTaskSid,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadFieldOptions(pathAssistantSid, pathTaskSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FieldResource>> ReadAsync(string pathAssistantSid,
-                                                                                              string pathTaskSid,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadFieldOptions(pathAssistantSid, pathTaskSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FieldResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FieldResource>.FromJson("fields", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FieldResource> NextPage(Page<FieldResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<FieldResource>.FromJson("fields", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FieldResource> PreviousPage(Page<FieldResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<FieldResource>.FromJson("fields", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateFieldOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static FieldResource Create(CreateFieldOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<FieldResource> CreateAsync(CreateFieldOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        /// <param name="fieldType"> The unique name or sid of the FieldType. It can be any Built-in Field Type or the
-        ///                 unique_name or sid of a custom Field Type. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static FieldResource Create(string pathAssistantSid,
-                                           string pathTaskSid,
-                                           string fieldType,
-                                           string uniqueName,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateFieldOptions(pathAssistantSid, pathTaskSid, fieldType, uniqueName);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        /// <param name="fieldType"> The unique name or sid of the FieldType. It can be any Built-in Field Type or the
-        ///                 unique_name or sid of a custom Field Type. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<FieldResource> CreateAsync(string pathAssistantSid,
-                                                                                   string pathTaskSid,
-                                                                                   string fieldType,
-                                                                                   string uniqueName,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateFieldOptions(pathAssistantSid, pathTaskSid, fieldType, uniqueName);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteFieldOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static bool Delete(DeleteFieldOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Field parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFieldOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Field </returns>
-        public static bool Delete(string pathAssistantSid,
-                                  string pathTaskSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Field </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathTaskSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FieldResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FieldResource object represented by the provided JSON </returns>
-        public static FieldResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FieldResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account that created this Field.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The Field Type of this field. It can be any Built-in Field Type or unique_name or the Field Type sid of a custom Field Type.
-        /// </summary>
-        [JsonProperty("field_type")]
-        public string FieldType { get; private set; }
-        /// <summary>
-        /// The unique ID of the Task associated with this Field.
-        /// </summary>
-        [JsonProperty("task_sid")]
-        public string TaskSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the parent Assistant.
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private FieldResource()
-        {
-
-        }
-    }
+{
+
+  public class FieldResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchFieldOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static FieldResource Fetch(FetchFieldOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<FieldResource> FetchAsync(FetchFieldOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static FieldResource Fetch(string pathAssistantSid,
+                                      string pathTaskSid,
+                                      string pathSid,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<FieldResource> FetchAsync(string pathAssistantSid,
+                                                                              string pathTaskSid,
+                                                                              string pathSid,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadFieldOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static ResourceSet<FieldResource> Read(ReadFieldOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FieldResource>.FromJson("fields", response.Content);
+      return new ResourceSet<FieldResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FieldResource>> ReadAsync(ReadFieldOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FieldResource>.FromJson("fields", response.Content);
+      return new ResourceSet<FieldResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static ResourceSet<FieldResource> Read(string pathAssistantSid,
+                                                  string pathTaskSid,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadFieldOptions(pathAssistantSid, pathTaskSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FieldResource>> ReadAsync(string pathAssistantSid,
+                                                                                          string pathTaskSid,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadFieldOptions(pathAssistantSid, pathTaskSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FieldResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FieldResource>.FromJson("fields", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FieldResource> NextPage(Page<FieldResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<FieldResource>.FromJson("fields", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FieldResource> PreviousPage(Page<FieldResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<FieldResource>.FromJson("fields", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateFieldOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static FieldResource Create(CreateFieldOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<FieldResource> CreateAsync(CreateFieldOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    /// <param name="fieldType"> The unique name or sid of the FieldType. It can be any Built-in Field Type or the
+    ///                 unique_name or sid of a custom Field Type. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static FieldResource Create(string pathAssistantSid,
+                                       string pathTaskSid,
+                                       string fieldType,
+                                       string uniqueName,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateFieldOptions(pathAssistantSid, pathTaskSid, fieldType, uniqueName);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    /// <param name="fieldType"> The unique name or sid of the FieldType. It can be any Built-in Field Type or the
+    ///                 unique_name or sid of a custom Field Type. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<FieldResource> CreateAsync(string pathAssistantSid,
+                                                                               string pathTaskSid,
+                                                                               string fieldType,
+                                                                               string uniqueName,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateFieldOptions(pathAssistantSid, pathTaskSid, fieldType, uniqueName);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteFieldOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Fields/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static bool Delete(DeleteFieldOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Field parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFieldOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Field </returns>
+    public static bool Delete(string pathAssistantSid,
+                              string pathTaskSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Field </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathTaskSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteFieldOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FieldResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FieldResource object represented by the provided JSON </returns>
+    public static FieldResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FieldResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account that created this Field.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The Field Type of this field. It can be any Built-in Field Type or unique_name or the Field Type sid of a custom Field Type.
+    /// </summary>
+    [JsonProperty("field_type")]
+    public string FieldType { get; private set; }
+    /// <summary>
+    /// The unique ID of the Task associated with this Field.
+    /// </summary>
+    [JsonProperty("task_sid")]
+    public string TaskSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the parent Assistant.
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private FieldResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/Task/SampleOptions.cs b/src/Twilio/Rest/Preview/Understand/Assistant/Task/SampleOptions.cs
index 465f872a7..b774cc881 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/Task/SampleOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/Task/SampleOptions.cs
@@ -9,287 +9,287 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand.Assistant.Task
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchSampleOptions
+  /// </summary>
+  public class FetchSampleOptions : IOptions<SampleResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchSampleOptions
+    /// The unique ID of the Assistant.
     /// </summary>
-    public class FetchSampleOptions : IOptions<SampleResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique ID of the Task associated with this Sample.
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSampleOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchSampleOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadSampleOptions
+    /// The unique ID of the Task associated with this Sample.
     /// </summary>
-    public class ReadSampleOptions : ReadOptions<SampleResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique ID of the Task associated with this Sample.
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// An ISO language-country string of the sample.
-        /// </summary>
-        public string Language { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadSampleOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        public ReadSampleOptions(string pathAssistantSid, string pathTaskSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathTaskSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateSampleOptions
+    /// A 34 character string that uniquely identifies this resource.
     /// </summary>
-    public class CreateSampleOptions : IOptions<SampleResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique ID of the Task associated with this Sample.
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// An ISO language-country string of the sample.
-        /// </summary>
-        public string Language { get; }
-        /// <summary>
-        /// The text example of how end-users may express this task. The sample may contain Field tag blocks.
-        /// </summary>
-        public string TaggedText { get; }
-        /// <summary>
-        /// The communication channel the sample was captured. It can be: voice, sms, chat, alexa, google-assistant, or slack. If not included the value will be null
-        /// </summary>
-        public string SourceChannel { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSampleOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="language"> An ISO language-country string of the sample. </param>
-        /// <param name="taggedText"> The text example of how end-users may express this task. The sample may contain Field tag
-        ///                  blocks. </param>
-        public CreateSampleOptions(string pathAssistantSid, string pathTaskSid, string language, string taggedText)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            Language = language;
-            TaggedText = taggedText;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (TaggedText != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaggedText", TaggedText));
-            }
-
-            if (SourceChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SourceChannel", SourceChannel));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateSampleOptions
+    /// Construct a new FetchSampleOptions
     /// </summary>
-    public class UpdateSampleOptions : IOptions<SampleResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique ID of the Task associated with this Sample.
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// An ISO language-country string of the sample.
-        /// </summary>
-        public string Language { get; set; }
-        /// <summary>
-        /// The text example of how end-users may express this task. The sample may contain Field tag blocks.
-        /// </summary>
-        public string TaggedText { get; set; }
-        /// <summary>
-        /// The communication channel the sample was captured. It can be: voice, sms, chat, alexa, google-assistant, or slack. If not included the value will be null
-        /// </summary>
-        public string SourceChannel { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSampleOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public UpdateSampleOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Language != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Language", Language));
-            }
-
-            if (TaggedText != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaggedText", TaggedText));
-            }
-
-            if (SourceChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SourceChannel", SourceChannel));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchSampleOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteSampleOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteSampleOptions : IOptions<SampleResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique ID of the Task associated with this Sample.
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSampleOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteSampleOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadSampleOptions
+  /// </summary>
+  public class ReadSampleOptions : ReadOptions<SampleResource>
+  {
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique ID of the Task associated with this Sample.
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// An ISO language-country string of the sample.
+    /// </summary>
+    public string Language { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadSampleOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    public ReadSampleOptions(string pathAssistantSid, string pathTaskSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateSampleOptions
+  /// </summary>
+  public class CreateSampleOptions : IOptions<SampleResource>
+  {
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique ID of the Task associated with this Sample.
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// An ISO language-country string of the sample.
+    /// </summary>
+    public string Language { get; }
+    /// <summary>
+    /// The text example of how end-users may express this task. The sample may contain Field tag blocks.
+    /// </summary>
+    public string TaggedText { get; }
+    /// <summary>
+    /// The communication channel the sample was captured. It can be: voice, sms, chat, alexa, google-assistant, or slack. If not included the value will be null
+    /// </summary>
+    public string SourceChannel { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateSampleOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="language"> An ISO language-country string of the sample. </param>
+    /// <param name="taggedText"> The text example of how end-users may express this task. The sample may contain Field tag
+    ///                  blocks. </param>
+    public CreateSampleOptions(string pathAssistantSid, string pathTaskSid, string language, string taggedText)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      Language = language;
+      TaggedText = taggedText;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (TaggedText != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaggedText", TaggedText));
+      }
+
+      if (SourceChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SourceChannel", SourceChannel));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateSampleOptions
+  /// </summary>
+  public class UpdateSampleOptions : IOptions<SampleResource>
+  {
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique ID of the Task associated with this Sample.
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// An ISO language-country string of the sample.
+    /// </summary>
+    public string Language { get; set; }
+    /// <summary>
+    /// The text example of how end-users may express this task. The sample may contain Field tag blocks.
+    /// </summary>
+    public string TaggedText { get; set; }
+    /// <summary>
+    /// The communication channel the sample was captured. It can be: voice, sms, chat, alexa, google-assistant, or slack. If not included the value will be null
+    /// </summary>
+    public string SourceChannel { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSampleOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public UpdateSampleOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Language != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Language", Language));
+      }
+
+      if (TaggedText != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaggedText", TaggedText));
+      }
+
+      if (SourceChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SourceChannel", SourceChannel));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteSampleOptions
+  /// </summary>
+  public class DeleteSampleOptions : IOptions<SampleResource>
+  {
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique ID of the Task associated with this Sample.
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSampleOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteSampleOptions(string pathAssistantSid, string pathTaskSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/Task/SampleResource.cs b/src/Twilio/Rest/Preview/Understand/Assistant/Task/SampleResource.cs
index eca495e4e..470b22651 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/Task/SampleResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/Task/SampleResource.cs
@@ -19,556 +19,556 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Understand.Assistant.Task
-{
-
-    public class SampleResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSampleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static SampleResource Fetch(FetchSampleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<SampleResource> FetchAsync(FetchSampleOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static SampleResource Fetch(string pathAssistantSid,
-                                           string pathTaskSid,
-                                           string pathSid,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<SampleResource> FetchAsync(string pathAssistantSid,
-                                                                                   string pathTaskSid,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSampleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static ResourceSet<SampleResource> Read(ReadSampleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SampleResource>.FromJson("samples", response.Content);
-            return new ResourceSet<SampleResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SampleResource>> ReadAsync(ReadSampleOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SampleResource>.FromJson("samples", response.Content);
-            return new ResourceSet<SampleResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="language"> An ISO language-country string of the sample. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static ResourceSet<SampleResource> Read(string pathAssistantSid,
-                                                       string pathTaskSid,
-                                                       string language = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadSampleOptions(pathAssistantSid, pathTaskSid){Language = language, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="language"> An ISO language-country string of the sample. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SampleResource>> ReadAsync(string pathAssistantSid,
-                                                                                               string pathTaskSid,
-                                                                                               string language = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadSampleOptions(pathAssistantSid, pathTaskSid){Language = language, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SampleResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SampleResource>.FromJson("samples", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SampleResource> NextPage(Page<SampleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SampleResource>.FromJson("samples", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SampleResource> PreviousPage(Page<SampleResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SampleResource>.FromJson("samples", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateSampleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static SampleResource Create(CreateSampleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<SampleResource> CreateAsync(CreateSampleOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="language"> An ISO language-country string of the sample. </param>
-        /// <param name="taggedText"> The text example of how end-users may express this task. The sample may contain Field tag
-        ///                  blocks. </param>
-        /// <param name="sourceChannel"> The communication channel the sample was captured. It can be: voice, sms, chat, alexa,
-        ///                     google-assistant, or slack. If not included the value will be null </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static SampleResource Create(string pathAssistantSid,
-                                            string pathTaskSid,
-                                            string language,
-                                            string taggedText,
-                                            string sourceChannel = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateSampleOptions(pathAssistantSid, pathTaskSid, language, taggedText){SourceChannel = sourceChannel};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="language"> An ISO language-country string of the sample. </param>
-        /// <param name="taggedText"> The text example of how end-users may express this task. The sample may contain Field tag
-        ///                  blocks. </param>
-        /// <param name="sourceChannel"> The communication channel the sample was captured. It can be: voice, sms, chat, alexa,
-        ///                     google-assistant, or slack. If not included the value will be null </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<SampleResource> CreateAsync(string pathAssistantSid,
-                                                                                    string pathTaskSid,
-                                                                                    string language,
-                                                                                    string taggedText,
-                                                                                    string sourceChannel = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateSampleOptions(pathAssistantSid, pathTaskSid, language, taggedText){SourceChannel = sourceChannel};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSampleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static SampleResource Update(UpdateSampleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<SampleResource> UpdateAsync(UpdateSampleOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="language"> An ISO language-country string of the sample. </param>
-        /// <param name="taggedText"> The text example of how end-users may express this task. The sample may contain Field tag
-        ///                  blocks. </param>
-        /// <param name="sourceChannel"> The communication channel the sample was captured. It can be: voice, sms, chat, alexa,
-        ///                     google-assistant, or slack. If not included the value will be null </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static SampleResource Update(string pathAssistantSid,
-                                            string pathTaskSid,
-                                            string pathSid,
-                                            string language = null,
-                                            string taggedText = null,
-                                            string sourceChannel = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateSampleOptions(pathAssistantSid, pathTaskSid, pathSid){Language = language, TaggedText = taggedText, SourceChannel = sourceChannel};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="language"> An ISO language-country string of the sample. </param>
-        /// <param name="taggedText"> The text example of how end-users may express this task. The sample may contain Field tag
-        ///                  blocks. </param>
-        /// <param name="sourceChannel"> The communication channel the sample was captured. It can be: voice, sms, chat, alexa,
-        ///                     google-assistant, or slack. If not included the value will be null </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<SampleResource> UpdateAsync(string pathAssistantSid,
-                                                                                    string pathTaskSid,
-                                                                                    string pathSid,
-                                                                                    string language = null,
-                                                                                    string taggedText = null,
-                                                                                    string sourceChannel = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateSampleOptions(pathAssistantSid, pathTaskSid, pathSid){Language = language, TaggedText = taggedText, SourceChannel = sourceChannel};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSampleOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static bool Delete(DeleteSampleOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Sample parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSampleOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sample </returns>
-        public static bool Delete(string pathAssistantSid,
-                                  string pathTaskSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sample </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathTaskSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SampleResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SampleResource object represented by the provided JSON </returns>
-        public static SampleResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SampleResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account that created this Sample.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The unique ID of the Task associated with this Sample.
-        /// </summary>
-        [JsonProperty("task_sid")]
-        public string TaskSid { get; private set; }
-        /// <summary>
-        /// An ISO language-country string of the sample.
-        /// </summary>
-        [JsonProperty("language")]
-        public string Language { get; private set; }
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The text example of how end-users may express this task. The sample may contain Field tag blocks.
-        /// </summary>
-        [JsonProperty("tagged_text")]
-        public string TaggedText { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The communication channel the sample was captured. It can be: voice, sms, chat, alexa, google-assistant, or slack. If not included the value will be null
-        /// </summary>
-        [JsonProperty("source_channel")]
-        public string SourceChannel { get; private set; }
-
-        private SampleResource()
-        {
-
-        }
-    }
+{
+
+  public class SampleResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSampleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static SampleResource Fetch(FetchSampleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<SampleResource> FetchAsync(FetchSampleOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static SampleResource Fetch(string pathAssistantSid,
+                                       string pathTaskSid,
+                                       string pathSid,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<SampleResource> FetchAsync(string pathAssistantSid,
+                                                                               string pathTaskSid,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSampleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static ResourceSet<SampleResource> Read(ReadSampleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SampleResource>.FromJson("samples", response.Content);
+      return new ResourceSet<SampleResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SampleResource>> ReadAsync(ReadSampleOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SampleResource>.FromJson("samples", response.Content);
+      return new ResourceSet<SampleResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="language"> An ISO language-country string of the sample. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static ResourceSet<SampleResource> Read(string pathAssistantSid,
+                                                   string pathTaskSid,
+                                                   string language = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadSampleOptions(pathAssistantSid, pathTaskSid) { Language = language, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="language"> An ISO language-country string of the sample. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SampleResource>> ReadAsync(string pathAssistantSid,
+                                                                                           string pathTaskSid,
+                                                                                           string language = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadSampleOptions(pathAssistantSid, pathTaskSid) { Language = language, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SampleResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SampleResource>.FromJson("samples", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SampleResource> NextPage(Page<SampleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SampleResource>.FromJson("samples", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SampleResource> PreviousPage(Page<SampleResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SampleResource>.FromJson("samples", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateSampleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static SampleResource Create(CreateSampleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<SampleResource> CreateAsync(CreateSampleOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="language"> An ISO language-country string of the sample. </param>
+    /// <param name="taggedText"> The text example of how end-users may express this task. The sample may contain Field tag
+    ///                  blocks. </param>
+    /// <param name="sourceChannel"> The communication channel the sample was captured. It can be: voice, sms, chat, alexa,
+    ///                     google-assistant, or slack. If not included the value will be null </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static SampleResource Create(string pathAssistantSid,
+                                        string pathTaskSid,
+                                        string language,
+                                        string taggedText,
+                                        string sourceChannel = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateSampleOptions(pathAssistantSid, pathTaskSid, language, taggedText) { SourceChannel = sourceChannel };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="language"> An ISO language-country string of the sample. </param>
+    /// <param name="taggedText"> The text example of how end-users may express this task. The sample may contain Field tag
+    ///                  blocks. </param>
+    /// <param name="sourceChannel"> The communication channel the sample was captured. It can be: voice, sms, chat, alexa,
+    ///                     google-assistant, or slack. If not included the value will be null </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<SampleResource> CreateAsync(string pathAssistantSid,
+                                                                                string pathTaskSid,
+                                                                                string language,
+                                                                                string taggedText,
+                                                                                string sourceChannel = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateSampleOptions(pathAssistantSid, pathTaskSid, language, taggedText) { SourceChannel = sourceChannel };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSampleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static SampleResource Update(UpdateSampleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<SampleResource> UpdateAsync(UpdateSampleOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="language"> An ISO language-country string of the sample. </param>
+    /// <param name="taggedText"> The text example of how end-users may express this task. The sample may contain Field tag
+    ///                  blocks. </param>
+    /// <param name="sourceChannel"> The communication channel the sample was captured. It can be: voice, sms, chat, alexa,
+    ///                     google-assistant, or slack. If not included the value will be null </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static SampleResource Update(string pathAssistantSid,
+                                        string pathTaskSid,
+                                        string pathSid,
+                                        string language = null,
+                                        string taggedText = null,
+                                        string sourceChannel = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateSampleOptions(pathAssistantSid, pathTaskSid, pathSid) { Language = language, TaggedText = taggedText, SourceChannel = sourceChannel };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="language"> An ISO language-country string of the sample. </param>
+    /// <param name="taggedText"> The text example of how end-users may express this task. The sample may contain Field tag
+    ///                  blocks. </param>
+    /// <param name="sourceChannel"> The communication channel the sample was captured. It can be: voice, sms, chat, alexa,
+    ///                     google-assistant, or slack. If not included the value will be null </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<SampleResource> UpdateAsync(string pathAssistantSid,
+                                                                                string pathTaskSid,
+                                                                                string pathSid,
+                                                                                string language = null,
+                                                                                string taggedText = null,
+                                                                                string sourceChannel = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateSampleOptions(pathAssistantSid, pathTaskSid, pathSid) { Language = language, TaggedText = taggedText, SourceChannel = sourceChannel };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSampleOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Samples/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static bool Delete(DeleteSampleOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Sample parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSampleOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sample </returns>
+    public static bool Delete(string pathAssistantSid,
+                              string pathTaskSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Sample. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sample </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathTaskSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSampleOptions(pathAssistantSid, pathTaskSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SampleResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SampleResource object represented by the provided JSON </returns>
+    public static SampleResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SampleResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account that created this Sample.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The unique ID of the Task associated with this Sample.
+    /// </summary>
+    [JsonProperty("task_sid")]
+    public string TaskSid { get; private set; }
+    /// <summary>
+    /// An ISO language-country string of the sample.
+    /// </summary>
+    [JsonProperty("language")]
+    public string Language { get; private set; }
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The text example of how end-users may express this task. The sample may contain Field tag blocks.
+    /// </summary>
+    [JsonProperty("tagged_text")]
+    public string TaggedText { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The communication channel the sample was captured. It can be: voice, sms, chat, alexa, google-assistant, or slack. If not included the value will be null
+    /// </summary>
+    [JsonProperty("source_channel")]
+    public string SourceChannel { get; private set; }
+
+    private SampleResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskActionsOptions.cs b/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskActionsOptions.cs
index 30bb8b87a..ba1428113 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskActionsOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskActionsOptions.cs
@@ -9,91 +9,91 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand.Assistant.Task
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Returns JSON actions for this Task.
+  /// </summary>
+  public class FetchTaskActionsOptions : IOptions<TaskActionsResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Returns JSON actions for this Task.
+    /// The unique ID of the parent Assistant.
     /// </summary>
-    public class FetchTaskActionsOptions : IOptions<TaskActionsResource>
-    {
-        /// <summary>
-        /// The unique ID of the parent Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique ID of the Task.
-        /// </summary>
-        public string PathTaskSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTaskActionsOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task. </param>
-        public FetchTaskActionsOptions(string pathAssistantSid, string pathTaskSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
+    /// The unique ID of the Task.
     /// </summary>
-    public class UpdateTaskActionsOptions : IOptions<TaskActionsResource>
-    {
-        /// <summary>
-        /// The unique ID of the parent Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique ID of the Task.
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// The JSON actions that instruct the Assistant how to perform this task.
-        /// </summary>
-        public object Actions { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateTaskActionsOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task. </param>
-        public UpdateTaskActionsOptions(string pathAssistantSid, string pathTaskSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Actions != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Actions", Serializers.JsonObject(Actions)));
-            }
-
-            return p;
-        }
-    }
+    public string PathTaskSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchTaskActionsOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task. </param>
+    public FetchTaskActionsOptions(string pathAssistantSid, string pathTaskSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
+  /// </summary>
+  public class UpdateTaskActionsOptions : IOptions<TaskActionsResource>
+  {
+    /// <summary>
+    /// The unique ID of the parent Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique ID of the Task.
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// The JSON actions that instruct the Assistant how to perform this task.
+    /// </summary>
+    public object Actions { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateTaskActionsOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task. </param>
+    public UpdateTaskActionsOptions(string pathAssistantSid, string pathTaskSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Actions != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Actions", Serializers.JsonObject(Actions)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskActionsResource.cs b/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskActionsResource.cs
index 983c92387..3e579746a 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskActionsResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskActionsResource.cs
@@ -19,204 +19,204 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Understand.Assistant.Task
-{
-
-    public class TaskActionsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchTaskActionsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Actions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns JSON actions for this Task.
-        /// </summary>
-        /// <param name="options"> Fetch TaskActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskActions </returns>
-        public static TaskActionsResource Fetch(FetchTaskActionsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns JSON actions for this Task.
-        /// </summary>
-        /// <param name="options"> Fetch TaskActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskActions </returns>
-        public static async System.Threading.Tasks.Task<TaskActionsResource> FetchAsync(FetchTaskActionsOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns JSON actions for this Task.
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskActions </returns>
-        public static TaskActionsResource Fetch(string pathAssistantSid, string pathTaskSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskActionsOptions(pathAssistantSid, pathTaskSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns JSON actions for this Task.
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskActions </returns>
-        public static async System.Threading.Tasks.Task<TaskActionsResource> FetchAsync(string pathAssistantSid,
-                                                                                        string pathTaskSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskActionsOptions(pathAssistantSid, pathTaskSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateTaskActionsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Actions",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
-        /// </summary>
-        /// <param name="options"> Update TaskActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskActions </returns>
-        public static TaskActionsResource Update(UpdateTaskActionsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
-        /// </summary>
-        /// <param name="options"> Update TaskActions parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskActions </returns>
-        public static async System.Threading.Tasks.Task<TaskActionsResource> UpdateAsync(UpdateTaskActionsOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task. </param>
-        /// <param name="actions"> The JSON actions that instruct the Assistant how to perform this task. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskActions </returns>
-        public static TaskActionsResource Update(string pathAssistantSid,
-                                                 string pathTaskSid,
-                                                 object actions = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskActionsOptions(pathAssistantSid, pathTaskSid){Actions = actions};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task. </param>
-        /// <param name="actions"> The JSON actions that instruct the Assistant how to perform this task. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskActions </returns>
-        public static async System.Threading.Tasks.Task<TaskActionsResource> UpdateAsync(string pathAssistantSid,
-                                                                                         string pathTaskSid,
-                                                                                         object actions = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskActionsOptions(pathAssistantSid, pathTaskSid){Actions = actions};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TaskActionsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TaskActionsResource object represented by the provided JSON </returns>
-        public static TaskActionsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TaskActionsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account that created this Field.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the parent Assistant.
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Task.
-        /// </summary>
-        [JsonProperty("task_sid")]
-        public string TaskSid { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The data
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-
-        private TaskActionsResource()
-        {
-
-        }
-    }
+{
+
+  public class TaskActionsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchTaskActionsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Actions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns JSON actions for this Task.
+    /// </summary>
+    /// <param name="options"> Fetch TaskActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskActions </returns>
+    public static TaskActionsResource Fetch(FetchTaskActionsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns JSON actions for this Task.
+    /// </summary>
+    /// <param name="options"> Fetch TaskActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskActions </returns>
+    public static async System.Threading.Tasks.Task<TaskActionsResource> FetchAsync(FetchTaskActionsOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Returns JSON actions for this Task.
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskActions </returns>
+    public static TaskActionsResource Fetch(string pathAssistantSid, string pathTaskSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskActionsOptions(pathAssistantSid, pathTaskSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns JSON actions for this Task.
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskActions </returns>
+    public static async System.Threading.Tasks.Task<TaskActionsResource> FetchAsync(string pathAssistantSid,
+                                                                                    string pathTaskSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskActionsOptions(pathAssistantSid, pathTaskSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateTaskActionsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Actions",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
+    /// </summary>
+    /// <param name="options"> Update TaskActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskActions </returns>
+    public static TaskActionsResource Update(UpdateTaskActionsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
+    /// </summary>
+    /// <param name="options"> Update TaskActions parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskActions </returns>
+    public static async System.Threading.Tasks.Task<TaskActionsResource> UpdateAsync(UpdateTaskActionsOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task. </param>
+    /// <param name="actions"> The JSON actions that instruct the Assistant how to perform this task. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskActions </returns>
+    public static TaskActionsResource Update(string pathAssistantSid,
+                                             string pathTaskSid,
+                                             object actions = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskActionsOptions(pathAssistantSid, pathTaskSid) { Actions = actions };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the actions of an Task identified by {TaskSid} or {TaskUniqueName}.
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task. </param>
+    /// <param name="actions"> The JSON actions that instruct the Assistant how to perform this task. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskActions </returns>
+    public static async System.Threading.Tasks.Task<TaskActionsResource> UpdateAsync(string pathAssistantSid,
+                                                                                     string pathTaskSid,
+                                                                                     object actions = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskActionsOptions(pathAssistantSid, pathTaskSid) { Actions = actions };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TaskActionsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TaskActionsResource object represented by the provided JSON </returns>
+    public static TaskActionsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TaskActionsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account that created this Field.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the parent Assistant.
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Task.
+    /// </summary>
+    [JsonProperty("task_sid")]
+    public string TaskSid { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The data
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+
+    private TaskActionsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskStatisticsOptions.cs b/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskStatisticsOptions.cs
index f3de91027..be1db8fd6 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskStatisticsOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskStatisticsOptions.cs
@@ -9,44 +9,44 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand.Assistant.Task
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchTaskStatisticsOptions
+  /// </summary>
+  public class FetchTaskStatisticsOptions : IOptions<TaskStatisticsResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchTaskStatisticsOptions
+    /// The unique ID of the parent Assistant.
     /// </summary>
-    public class FetchTaskStatisticsOptions : IOptions<TaskStatisticsResource>
-    {
-        /// <summary>
-        /// The unique ID of the parent Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// The unique ID of the Task associated with this Field.
-        /// </summary>
-        public string PathTaskSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTaskStatisticsOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        public FetchTaskStatisticsOptions(string pathAssistantSid, string pathTaskSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathTaskSid = pathTaskSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// The unique ID of the Task associated with this Field.
+    /// </summary>
+    public string PathTaskSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchTaskStatisticsOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    public FetchTaskStatisticsOptions(string pathAssistantSid, string pathTaskSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathTaskSid = pathTaskSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskStatisticsResource.cs b/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskStatisticsResource.cs
index a7f1af93e..5388bb687 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskStatisticsResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/Task/TaskStatisticsResource.cs
@@ -19,135 +19,135 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Understand.Assistant.Task
-{
-
-    public class TaskStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchTaskStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Statistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskStatistics </returns>
-        public static TaskStatisticsResource Fetch(FetchTaskStatisticsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskStatistics </returns>
-        public static async System.Threading.Tasks.Task<TaskStatisticsResource> FetchAsync(FetchTaskStatisticsOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskStatistics </returns>
-        public static TaskStatisticsResource Fetch(string pathAssistantSid,
-                                                   string pathTaskSid,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskStatisticsOptions(pathAssistantSid, pathTaskSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
-        /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskStatistics </returns>
-        public static async System.Threading.Tasks.Task<TaskStatisticsResource> FetchAsync(string pathAssistantSid,
-                                                                                           string pathTaskSid,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskStatisticsOptions(pathAssistantSid, pathTaskSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TaskStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TaskStatisticsResource object represented by the provided JSON </returns>
-        public static TaskStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TaskStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account that created this Field.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the parent Assistant.
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// The unique ID of the Task associated with this Field.
-        /// </summary>
-        [JsonProperty("task_sid")]
-        public string TaskSid { get; private set; }
-        /// <summary>
-        /// The total number of Samples associated with this Task.
-        /// </summary>
-        [JsonProperty("samples_count")]
-        public int? SamplesCount { get; private set; }
-        /// <summary>
-        /// The total number of Fields associated with this Task.
-        /// </summary>
-        [JsonProperty("fields_count")]
-        public int? FieldsCount { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private TaskStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class TaskStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchTaskStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathTaskSid + "/Statistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskStatistics </returns>
+    public static TaskStatisticsResource Fetch(FetchTaskStatisticsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskStatistics </returns>
+    public static async System.Threading.Tasks.Task<TaskStatisticsResource> FetchAsync(FetchTaskStatisticsOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskStatistics </returns>
+    public static TaskStatisticsResource Fetch(string pathAssistantSid,
+                                               string pathTaskSid,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskStatisticsOptions(pathAssistantSid, pathTaskSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the parent Assistant. </param>
+    /// <param name="pathTaskSid"> The unique ID of the Task associated with this Field. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskStatistics </returns>
+    public static async System.Threading.Tasks.Task<TaskStatisticsResource> FetchAsync(string pathAssistantSid,
+                                                                                       string pathTaskSid,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskStatisticsOptions(pathAssistantSid, pathTaskSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TaskStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TaskStatisticsResource object represented by the provided JSON </returns>
+    public static TaskStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TaskStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account that created this Field.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the parent Assistant.
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// The unique ID of the Task associated with this Field.
+    /// </summary>
+    [JsonProperty("task_sid")]
+    public string TaskSid { get; private set; }
+    /// <summary>
+    /// The total number of Samples associated with this Task.
+    /// </summary>
+    [JsonProperty("samples_count")]
+    public int? SamplesCount { get; private set; }
+    /// <summary>
+    /// The total number of Fields associated with this Task.
+    /// </summary>
+    [JsonProperty("fields_count")]
+    public int? FieldsCount { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private TaskStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/TaskOptions.cs b/src/Twilio/Rest/Preview/Understand/Assistant/TaskOptions.cs
index 5486b0e8d..bc54a8789 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/TaskOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/TaskOptions.cs
@@ -9,264 +9,264 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchTaskOptions
+  /// </summary>
+  public class FetchTaskOptions : IOptions<TaskResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchTaskOptions
+    /// The unique ID of the Assistant.
     /// </summary>
-    public class FetchTaskOptions : IOptions<TaskResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTaskOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchTaskOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathAssistantSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadTaskOptions
+    /// A 34 character string that uniquely identifies this resource.
     /// </summary>
-    public class ReadTaskOptions : ReadOptions<TaskResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadTaskOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        public ReadTaskOptions(string pathAssistantSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateTaskOptions
+    /// Construct a new FetchTaskOptions
     /// </summary>
-    public class CreateTaskOptions : IOptions<TaskResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
-        /// </summary>
-        public string UniqueName { get; }
-        /// <summary>
-        /// A user-provided string that identifies this resource. It is non-unique and can up to 255 characters long.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// A user-provided JSON object encoded as a string to specify the actions for this task. It is optional and non-unique.
-        /// </summary>
-        public object Actions { get; set; }
-        /// <summary>
-        /// User-provided HTTP endpoint where from the assistant fetches actions
-        /// </summary>
-        public Uri ActionsUrl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateTaskOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        public CreateTaskOptions(string pathAssistantSid, string uniqueName)
-        {
-            PathAssistantSid = pathAssistantSid;
-            UniqueName = uniqueName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Actions != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Actions", Serializers.JsonObject(Actions)));
-            }
-
-            if (ActionsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ActionsUrl", Serializers.Url(ActionsUrl)));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchTaskOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateTaskOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateTaskOptions : IOptions<TaskResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A user-provided string that identifies this resource. It is non-unique and can up to 255 characters long.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// A user-provided JSON object encoded as a string to specify the actions for this task. It is optional and non-unique.
-        /// </summary>
-        public object Actions { get; set; }
-        /// <summary>
-        /// User-provided HTTP endpoint where from the assistant fetches actions
-        /// </summary>
-        public Uri ActionsUrl { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateTaskOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public UpdateTaskOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Actions != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Actions", Serializers.JsonObject(Actions)));
-            }
-
-            if (ActionsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ActionsUrl", Serializers.Url(ActionsUrl)));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadTaskOptions
+  /// </summary>
+  public class ReadTaskOptions : ReadOptions<TaskResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteTaskOptions
+    /// The unique ID of the Assistant.
     /// </summary>
-    public class DeleteTaskOptions : IOptions<TaskResource>
-    {
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        public string PathAssistantSid { get; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteTaskOptions
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteTaskOptions(string pathAssistantSid, string pathSid)
-        {
-            PathAssistantSid = pathAssistantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathAssistantSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadTaskOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    public ReadTaskOptions(string pathAssistantSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateTaskOptions
+  /// </summary>
+  public class CreateTaskOptions : IOptions<TaskResource>
+  {
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
+    /// </summary>
+    public string UniqueName { get; }
+    /// <summary>
+    /// A user-provided string that identifies this resource. It is non-unique and can up to 255 characters long.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// A user-provided JSON object encoded as a string to specify the actions for this task. It is optional and non-unique.
+    /// </summary>
+    public object Actions { get; set; }
+    /// <summary>
+    /// User-provided HTTP endpoint where from the assistant fetches actions
+    /// </summary>
+    public Uri ActionsUrl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateTaskOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    public CreateTaskOptions(string pathAssistantSid, string uniqueName)
+    {
+      PathAssistantSid = pathAssistantSid;
+      UniqueName = uniqueName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Actions != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Actions", Serializers.JsonObject(Actions)));
+      }
+
+      if (ActionsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ActionsUrl", Serializers.Url(ActionsUrl)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateTaskOptions
+  /// </summary>
+  public class UpdateTaskOptions : IOptions<TaskResource>
+  {
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A user-provided string that identifies this resource. It is non-unique and can up to 255 characters long.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// A user-provided JSON object encoded as a string to specify the actions for this task. It is optional and non-unique.
+    /// </summary>
+    public object Actions { get; set; }
+    /// <summary>
+    /// User-provided HTTP endpoint where from the assistant fetches actions
+    /// </summary>
+    public Uri ActionsUrl { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateTaskOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public UpdateTaskOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Actions != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Actions", Serializers.JsonObject(Actions)));
+      }
+
+      if (ActionsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ActionsUrl", Serializers.Url(ActionsUrl)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteTaskOptions
+  /// </summary>
+  public class DeleteTaskOptions : IOptions<TaskResource>
+  {
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    public string PathAssistantSid { get; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteTaskOptions
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteTaskOptions(string pathAssistantSid, string pathSid)
+    {
+      PathAssistantSid = pathAssistantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/Assistant/TaskResource.cs b/src/Twilio/Rest/Preview/Understand/Assistant/TaskResource.cs
index f999421ea..5b8a35160 100644
--- a/src/Twilio/Rest/Preview/Understand/Assistant/TaskResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/Assistant/TaskResource.cs
@@ -19,540 +19,540 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Understand.Assistant
-{
-
-    public class TaskResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Fetch(FetchTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> FetchAsync(FetchTaskOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskOptions(pathAssistantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> FetchAsync(string pathAssistantSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskOptions(pathAssistantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static ResourceSet<TaskResource> Read(ReadTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TaskResource>.FromJson("tasks", response.Content);
-            return new ResourceSet<TaskResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TaskResource>> ReadAsync(ReadTaskOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TaskResource>.FromJson("tasks", response.Content);
-            return new ResourceSet<TaskResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static ResourceSet<TaskResource> Read(string pathAssistantSid,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadTaskOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TaskResource>> ReadAsync(string pathAssistantSid,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadTaskOptions(pathAssistantSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TaskResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TaskResource>.FromJson("tasks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TaskResource> NextPage(Page<TaskResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<TaskResource>.FromJson("tasks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TaskResource> PreviousPage(Page<TaskResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<TaskResource>.FromJson("tasks", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Create(CreateTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> CreateAsync(CreateTaskOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
-        ///                    255 characters long. </param>
-        /// <param name="actions"> A user-provided JSON object encoded as a string to specify the actions for this task. It is
-        ///               optional and non-unique. </param>
-        /// <param name="actionsUrl"> User-provided HTTP endpoint where from the assistant fetches actions </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Create(string pathAssistantSid,
-                                          string uniqueName,
-                                          string friendlyName = null,
-                                          object actions = null,
-                                          Uri actionsUrl = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateTaskOptions(pathAssistantSid, uniqueName){FriendlyName = friendlyName, Actions = actions, ActionsUrl = actionsUrl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
-        ///                    255 characters long. </param>
-        /// <param name="actions"> A user-provided JSON object encoded as a string to specify the actions for this task. It is
-        ///               optional and non-unique. </param>
-        /// <param name="actionsUrl"> User-provided HTTP endpoint where from the assistant fetches actions </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> CreateAsync(string pathAssistantSid,
-                                                                                  string uniqueName,
-                                                                                  string friendlyName = null,
-                                                                                  object actions = null,
-                                                                                  Uri actionsUrl = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateTaskOptions(pathAssistantSid, uniqueName){FriendlyName = friendlyName, Actions = actions, ActionsUrl = actionsUrl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Update(UpdateTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> UpdateAsync(UpdateTaskOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
-        ///                    255 characters long. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="actions"> A user-provided JSON object encoded as a string to specify the actions for this task. It is
-        ///               optional and non-unique. </param>
-        /// <param name="actionsUrl"> User-provided HTTP endpoint where from the assistant fetches actions </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Update(string pathAssistantSid,
-                                          string pathSid,
-                                          string friendlyName = null,
-                                          string uniqueName = null,
-                                          object actions = null,
-                                          Uri actionsUrl = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskOptions(pathAssistantSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Actions = actions, ActionsUrl = actionsUrl};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
-        ///                    255 characters long. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="actions"> A user-provided JSON object encoded as a string to specify the actions for this task. It is
-        ///               optional and non-unique. </param>
-        /// <param name="actionsUrl"> User-provided HTTP endpoint where from the assistant fetches actions </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> UpdateAsync(string pathAssistantSid,
-                                                                                  string pathSid,
-                                                                                  string friendlyName = null,
-                                                                                  string uniqueName = null,
-                                                                                  object actions = null,
-                                                                                  Uri actionsUrl = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskOptions(pathAssistantSid, pathSid){FriendlyName = friendlyName, UniqueName = uniqueName, Actions = actions, ActionsUrl = actionsUrl};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static bool Delete(DeleteTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTaskOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteTaskOptions(pathAssistantSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteTaskOptions(pathAssistantSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TaskResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TaskResource object represented by the provided JSON </returns>
-        public static TaskResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TaskResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account that created this Task.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// A user-provided string that identifies this resource. It is non-unique and can up to 255 characters long.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The unique ID of the Assistant.
-        /// </summary>
-        [JsonProperty("assistant_sid")]
-        public string AssistantSid { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// User-provided HTTP endpoint where from the assistant fetches actions
-        /// </summary>
-        [JsonProperty("actions_url")]
-        public Uri ActionsUrl { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private TaskResource()
-        {
-
-        }
-    }
+{
+
+  public class TaskResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Fetch(FetchTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> FetchAsync(FetchTaskOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Fetch(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskOptions(pathAssistantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> FetchAsync(string pathAssistantSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskOptions(pathAssistantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static ResourceSet<TaskResource> Read(ReadTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TaskResource>.FromJson("tasks", response.Content);
+      return new ResourceSet<TaskResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TaskResource>> ReadAsync(ReadTaskOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TaskResource>.FromJson("tasks", response.Content);
+      return new ResourceSet<TaskResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static ResourceSet<TaskResource> Read(string pathAssistantSid,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadTaskOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TaskResource>> ReadAsync(string pathAssistantSid,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadTaskOptions(pathAssistantSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TaskResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TaskResource>.FromJson("tasks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TaskResource> NextPage(Page<TaskResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<TaskResource>.FromJson("tasks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TaskResource> PreviousPage(Page<TaskResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<TaskResource>.FromJson("tasks", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Create(CreateTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> CreateAsync(CreateTaskOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
+    ///                    255 characters long. </param>
+    /// <param name="actions"> A user-provided JSON object encoded as a string to specify the actions for this task. It is
+    ///               optional and non-unique. </param>
+    /// <param name="actionsUrl"> User-provided HTTP endpoint where from the assistant fetches actions </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Create(string pathAssistantSid,
+                                      string uniqueName,
+                                      string friendlyName = null,
+                                      object actions = null,
+                                      Uri actionsUrl = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateTaskOptions(pathAssistantSid, uniqueName) { FriendlyName = friendlyName, Actions = actions, ActionsUrl = actionsUrl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
+    ///                    255 characters long. </param>
+    /// <param name="actions"> A user-provided JSON object encoded as a string to specify the actions for this task. It is
+    ///               optional and non-unique. </param>
+    /// <param name="actionsUrl"> User-provided HTTP endpoint where from the assistant fetches actions </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> CreateAsync(string pathAssistantSid,
+                                                                              string uniqueName,
+                                                                              string friendlyName = null,
+                                                                              object actions = null,
+                                                                              Uri actionsUrl = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateTaskOptions(pathAssistantSid, uniqueName) { FriendlyName = friendlyName, Actions = actions, ActionsUrl = actionsUrl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Update(UpdateTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> UpdateAsync(UpdateTaskOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
+    ///                    255 characters long. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="actions"> A user-provided JSON object encoded as a string to specify the actions for this task. It is
+    ///               optional and non-unique. </param>
+    /// <param name="actionsUrl"> User-provided HTTP endpoint where from the assistant fetches actions </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Update(string pathAssistantSid,
+                                      string pathSid,
+                                      string friendlyName = null,
+                                      string uniqueName = null,
+                                      object actions = null,
+                                      Uri actionsUrl = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskOptions(pathAssistantSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Actions = actions, ActionsUrl = actionsUrl };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="friendlyName"> A user-provided string that identifies this resource. It is non-unique and can up to
+    ///                    255 characters long. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="actions"> A user-provided JSON object encoded as a string to specify the actions for this task. It is
+    ///               optional and non-unique. </param>
+    /// <param name="actionsUrl"> User-provided HTTP endpoint where from the assistant fetches actions </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> UpdateAsync(string pathAssistantSid,
+                                                                              string pathSid,
+                                                                              string friendlyName = null,
+                                                                              string uniqueName = null,
+                                                                              object actions = null,
+                                                                              Uri actionsUrl = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskOptions(pathAssistantSid, pathSid) { FriendlyName = friendlyName, UniqueName = uniqueName, Actions = actions, ActionsUrl = actionsUrl };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathAssistantSid + "/Tasks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static bool Delete(DeleteTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTaskOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static bool Delete(string pathAssistantSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteTaskOptions(pathAssistantSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathAssistantSid"> The unique ID of the Assistant. </param>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathAssistantSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteTaskOptions(pathAssistantSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TaskResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TaskResource object represented by the provided JSON </returns>
+    public static TaskResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TaskResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account that created this Task.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// A user-provided string that identifies this resource. It is non-unique and can up to 255 characters long.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The unique ID of the Assistant.
+    /// </summary>
+    [JsonProperty("assistant_sid")]
+    public string AssistantSid { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// User-provided HTTP endpoint where from the assistant fetches actions
+    /// </summary>
+    [JsonProperty("actions_url")]
+    public Uri ActionsUrl { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private TaskResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/AssistantOptions.cs b/src/Twilio/Rest/Preview/Understand/AssistantOptions.cs
index d461aa8d1..84553724a 100644
--- a/src/Twilio/Rest/Preview/Understand/AssistantOptions.cs
+++ b/src/Twilio/Rest/Preview/Understand/AssistantOptions.cs
@@ -9,288 +9,288 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Understand
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchAssistantOptions
+  /// </summary>
+  public class FetchAssistantOptions : IOptions<AssistantResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchAssistantOptions
+    /// A 34 character string that uniquely identifies this resource.
     /// </summary>
-    public class FetchAssistantOptions : IOptions<AssistantResource>
-    {
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAssistantOptions
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public FetchAssistantOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadAssistantOptions
+    /// Construct a new FetchAssistantOptions
     /// </summary>
-    public class ReadAssistantOptions : ReadOptions<AssistantResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public FetchAssistantOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateAssistantOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateAssistantOptions : IOptions<AssistantResource>
-    {
-        /// <summary>
-        /// A text description for the Assistant. It is non-unique and can up to 255 characters long.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// A boolean that specifies whether queries should be logged for 30 days further training. If false, no queries will be stored, if true, queries will be stored for 30 days and deleted thereafter. Defaults to true if no value is provided.
-        /// </summary>
-        public bool? LogQueries { get; set; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// A user-provided URL to send event callbacks to.
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-        /// <summary>
-        /// Space-separated list of callback events that will trigger callbacks.
-        /// </summary>
-        public string CallbackEvents { get; set; }
-        /// <summary>
-        /// The JSON actions to be executed when the user's input is not recognized as matching any Task.
-        /// </summary>
-        public object FallbackActions { get; set; }
-        /// <summary>
-        /// The JSON actions to be executed on inbound phone calls when the Assistant has to say something first.
-        /// </summary>
-        public object InitiationActions { get; set; }
-        /// <summary>
-        /// The JSON object that holds the style sheet for the assistant
-        /// </summary>
-        public object StyleSheet { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (LogQueries != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LogQueries", LogQueries.Value.ToString().ToLower()));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (CallbackEvents != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackEvents", CallbackEvents));
-            }
-
-            if (FallbackActions != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackActions", Serializers.JsonObject(FallbackActions)));
-            }
-
-            if (InitiationActions != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InitiationActions", Serializers.JsonObject(InitiationActions)));
-            }
-
-            if (StyleSheet != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StyleSheet", Serializers.JsonObject(StyleSheet)));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadAssistantOptions
+  /// </summary>
+  public class ReadAssistantOptions : ReadOptions<AssistantResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateAssistantOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateAssistantOptions : IOptions<AssistantResource>
-    {
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A text description for the Assistant. It is non-unique and can up to 255 characters long.
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// A boolean that specifies whether queries should be logged for 30 days further training. If false, no queries will be stored, if true, queries will be stored for 30 days and deleted thereafter. Defaults to true if no value is provided.
-        /// </summary>
-        public bool? LogQueries { get; set; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// A user-provided URL to send event callbacks to.
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-        /// <summary>
-        /// Space-separated list of callback events that will trigger callbacks.
-        /// </summary>
-        public string CallbackEvents { get; set; }
-        /// <summary>
-        /// The JSON actions to be executed when the user's input is not recognized as matching any Task.
-        /// </summary>
-        public object FallbackActions { get; set; }
-        /// <summary>
-        /// The JSON actions to be executed on inbound phone calls when the Assistant has to say something first.
-        /// </summary>
-        public object InitiationActions { get; set; }
-        /// <summary>
-        /// The JSON object that holds the style sheet for the assistant
-        /// </summary>
-        public object StyleSheet { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateAssistantOptions
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public UpdateAssistantOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (LogQueries != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LogQueries", LogQueries.Value.ToString().ToLower()));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (CallbackEvents != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackEvents", CallbackEvents));
-            }
-
-            if (FallbackActions != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackActions", Serializers.JsonObject(FallbackActions)));
-            }
-
-            if (InitiationActions != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InitiationActions", Serializers.JsonObject(InitiationActions)));
-            }
-
-            if (StyleSheet != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StyleSheet", Serializers.JsonObject(StyleSheet)));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateAssistantOptions
+  /// </summary>
+  public class CreateAssistantOptions : IOptions<AssistantResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteAssistantOptions
+    /// A text description for the Assistant. It is non-unique and can up to 255 characters long.
     /// </summary>
-    public class DeleteAssistantOptions : IOptions<AssistantResource>
-    {
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteAssistantOptions
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        public DeleteAssistantOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// A boolean that specifies whether queries should be logged for 30 days further training. If false, no queries will be stored, if true, queries will be stored for 30 days and deleted thereafter. Defaults to true if no value is provided.
+    /// </summary>
+    public bool? LogQueries { get; set; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// A user-provided URL to send event callbacks to.
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+    /// <summary>
+    /// Space-separated list of callback events that will trigger callbacks.
+    /// </summary>
+    public string CallbackEvents { get; set; }
+    /// <summary>
+    /// The JSON actions to be executed when the user's input is not recognized as matching any Task.
+    /// </summary>
+    public object FallbackActions { get; set; }
+    /// <summary>
+    /// The JSON actions to be executed on inbound phone calls when the Assistant has to say something first.
+    /// </summary>
+    public object InitiationActions { get; set; }
+    /// <summary>
+    /// The JSON object that holds the style sheet for the assistant
+    /// </summary>
+    public object StyleSheet { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (LogQueries != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LogQueries", LogQueries.Value.ToString().ToLower()));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (CallbackEvents != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackEvents", CallbackEvents));
+      }
+
+      if (FallbackActions != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackActions", Serializers.JsonObject(FallbackActions)));
+      }
+
+      if (InitiationActions != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InitiationActions", Serializers.JsonObject(InitiationActions)));
+      }
+
+      if (StyleSheet != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StyleSheet", Serializers.JsonObject(StyleSheet)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateAssistantOptions
+  /// </summary>
+  public class UpdateAssistantOptions : IOptions<AssistantResource>
+  {
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A text description for the Assistant. It is non-unique and can up to 255 characters long.
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// A boolean that specifies whether queries should be logged for 30 days further training. If false, no queries will be stored, if true, queries will be stored for 30 days and deleted thereafter. Defaults to true if no value is provided.
+    /// </summary>
+    public bool? LogQueries { get; set; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. Unique up to 64 characters long.
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// A user-provided URL to send event callbacks to.
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+    /// <summary>
+    /// Space-separated list of callback events that will trigger callbacks.
+    /// </summary>
+    public string CallbackEvents { get; set; }
+    /// <summary>
+    /// The JSON actions to be executed when the user's input is not recognized as matching any Task.
+    /// </summary>
+    public object FallbackActions { get; set; }
+    /// <summary>
+    /// The JSON actions to be executed on inbound phone calls when the Assistant has to say something first.
+    /// </summary>
+    public object InitiationActions { get; set; }
+    /// <summary>
+    /// The JSON object that holds the style sheet for the assistant
+    /// </summary>
+    public object StyleSheet { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateAssistantOptions
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public UpdateAssistantOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (LogQueries != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LogQueries", LogQueries.Value.ToString().ToLower()));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (CallbackEvents != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackEvents", CallbackEvents));
+      }
+
+      if (FallbackActions != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackActions", Serializers.JsonObject(FallbackActions)));
+      }
+
+      if (InitiationActions != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InitiationActions", Serializers.JsonObject(InitiationActions)));
+      }
+
+      if (StyleSheet != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StyleSheet", Serializers.JsonObject(StyleSheet)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteAssistantOptions
+  /// </summary>
+  public class DeleteAssistantOptions : IOptions<AssistantResource>
+  {
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteAssistantOptions
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    public DeleteAssistantOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Understand/AssistantResource.cs b/src/Twilio/Rest/Preview/Understand/AssistantResource.cs
index 07b0e459a..227ab2bf5 100644
--- a/src/Twilio/Rest/Preview/Understand/AssistantResource.cs
+++ b/src/Twilio/Rest/Preview/Understand/AssistantResource.cs
@@ -19,575 +19,575 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Understand
-{
-
-    public class AssistantResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchAssistantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static AssistantResource Fetch(FetchAssistantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<AssistantResource> FetchAsync(FetchAssistantOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static AssistantResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchAssistantOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<AssistantResource> FetchAsync(string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchAssistantOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadAssistantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/understand/Assistants",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static ResourceSet<AssistantResource> Read(ReadAssistantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AssistantResource>.FromJson("assistants", response.Content);
-            return new ResourceSet<AssistantResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AssistantResource>> ReadAsync(ReadAssistantOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AssistantResource>.FromJson("assistants", response.Content);
-            return new ResourceSet<AssistantResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static ResourceSet<AssistantResource> Read(int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadAssistantOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AssistantResource>> ReadAsync(int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadAssistantOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AssistantResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AssistantResource>.FromJson("assistants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AssistantResource> NextPage(Page<AssistantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<AssistantResource>.FromJson("assistants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AssistantResource> PreviousPage(Page<AssistantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<AssistantResource>.FromJson("assistants", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateAssistantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static AssistantResource Create(CreateAssistantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<AssistantResource> CreateAsync(CreateAssistantOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A text description for the Assistant. It is non-unique and can up to 255 characters
-        ///                    long. </param>
-        /// <param name="logQueries"> A boolean that specifies whether queries should be logged for 30 days further training.
-        ///                  If false, no queries will be stored, if true, queries will be stored for 30 days and deleted
-        ///                  thereafter. Defaults to true if no value is provided. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="callbackUrl"> A user-provided URL to send event callbacks to. </param>
-        /// <param name="callbackEvents"> Space-separated list of callback events that will trigger callbacks. </param>
-        /// <param name="fallbackActions"> The JSON actions to be executed when the user's input is not recognized as matching
-        ///                       any Task. </param>
-        /// <param name="initiationActions"> The JSON actions to be executed on inbound phone calls when the Assistant has to
-        ///                         say something first. </param>
-        /// <param name="styleSheet"> The JSON object that holds the style sheet for the assistant </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static AssistantResource Create(string friendlyName = null,
-                                               bool? logQueries = null,
-                                               string uniqueName = null,
-                                               Uri callbackUrl = null,
-                                               string callbackEvents = null,
-                                               object fallbackActions = null,
-                                               object initiationActions = null,
-                                               object styleSheet = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateAssistantOptions(){FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, FallbackActions = fallbackActions, InitiationActions = initiationActions, StyleSheet = styleSheet};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A text description for the Assistant. It is non-unique and can up to 255 characters
-        ///                    long. </param>
-        /// <param name="logQueries"> A boolean that specifies whether queries should be logged for 30 days further training.
-        ///                  If false, no queries will be stored, if true, queries will be stored for 30 days and deleted
-        ///                  thereafter. Defaults to true if no value is provided. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="callbackUrl"> A user-provided URL to send event callbacks to. </param>
-        /// <param name="callbackEvents"> Space-separated list of callback events that will trigger callbacks. </param>
-        /// <param name="fallbackActions"> The JSON actions to be executed when the user's input is not recognized as matching
-        ///                       any Task. </param>
-        /// <param name="initiationActions"> The JSON actions to be executed on inbound phone calls when the Assistant has to
-        ///                         say something first. </param>
-        /// <param name="styleSheet"> The JSON object that holds the style sheet for the assistant </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<AssistantResource> CreateAsync(string friendlyName = null,
-                                                                                       bool? logQueries = null,
-                                                                                       string uniqueName = null,
-                                                                                       Uri callbackUrl = null,
-                                                                                       string callbackEvents = null,
-                                                                                       object fallbackActions = null,
-                                                                                       object initiationActions = null,
-                                                                                       object styleSheet = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateAssistantOptions(){FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, FallbackActions = fallbackActions, InitiationActions = initiationActions, StyleSheet = styleSheet};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateAssistantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static AssistantResource Update(UpdateAssistantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<AssistantResource> UpdateAsync(UpdateAssistantOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="friendlyName"> A text description for the Assistant. It is non-unique and can up to 255 characters
-        ///                    long. </param>
-        /// <param name="logQueries"> A boolean that specifies whether queries should be logged for 30 days further training.
-        ///                  If false, no queries will be stored, if true, queries will be stored for 30 days and deleted
-        ///                  thereafter. Defaults to true if no value is provided. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="callbackUrl"> A user-provided URL to send event callbacks to. </param>
-        /// <param name="callbackEvents"> Space-separated list of callback events that will trigger callbacks. </param>
-        /// <param name="fallbackActions"> The JSON actions to be executed when the user's input is not recognized as matching
-        ///                       any Task. </param>
-        /// <param name="initiationActions"> The JSON actions to be executed on inbound phone calls when the Assistant has to
-        ///                         say something first. </param>
-        /// <param name="styleSheet"> The JSON object that holds the style sheet for the assistant </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static AssistantResource Update(string pathSid,
-                                               string friendlyName = null,
-                                               bool? logQueries = null,
-                                               string uniqueName = null,
-                                               Uri callbackUrl = null,
-                                               string callbackEvents = null,
-                                               object fallbackActions = null,
-                                               object initiationActions = null,
-                                               object styleSheet = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateAssistantOptions(pathSid){FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, FallbackActions = fallbackActions, InitiationActions = initiationActions, StyleSheet = styleSheet};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="friendlyName"> A text description for the Assistant. It is non-unique and can up to 255 characters
-        ///                    long. </param>
-        /// <param name="logQueries"> A boolean that specifies whether queries should be logged for 30 days further training.
-        ///                  If false, no queries will be stored, if true, queries will be stored for 30 days and deleted
-        ///                  thereafter. Defaults to true if no value is provided. </param>
-        /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
-        ///                  sid. Unique up to 64 characters long. </param>
-        /// <param name="callbackUrl"> A user-provided URL to send event callbacks to. </param>
-        /// <param name="callbackEvents"> Space-separated list of callback events that will trigger callbacks. </param>
-        /// <param name="fallbackActions"> The JSON actions to be executed when the user's input is not recognized as matching
-        ///                       any Task. </param>
-        /// <param name="initiationActions"> The JSON actions to be executed on inbound phone calls when the Assistant has to
-        ///                         say something first. </param>
-        /// <param name="styleSheet"> The JSON object that holds the style sheet for the assistant </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<AssistantResource> UpdateAsync(string pathSid,
-                                                                                       string friendlyName = null,
-                                                                                       bool? logQueries = null,
-                                                                                       string uniqueName = null,
-                                                                                       Uri callbackUrl = null,
-                                                                                       string callbackEvents = null,
-                                                                                       object fallbackActions = null,
-                                                                                       object initiationActions = null,
-                                                                                       object styleSheet = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateAssistantOptions(pathSid){FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, FallbackActions = fallbackActions, InitiationActions = initiationActions, StyleSheet = styleSheet};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteAssistantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/understand/Assistants/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static bool Delete(DeleteAssistantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Assistant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAssistantOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Assistant </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteAssistantOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Assistant </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteAssistantOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AssistantResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AssistantResource object represented by the provided JSON </returns>
-        public static AssistantResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AssistantResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique ID of the Account that created this Assistant.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The date that this resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date that this resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// A text description for the Assistant. It is non-unique and can up to 255 characters long.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique ID (Sid) of the latest model build. Null if no model has been built.
-        /// </summary>
-        [JsonProperty("latest_model_build_sid")]
-        public string LatestModelBuildSid { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// A boolean that specifies whether queries should be logged for 30 days further training. If false, no queries will be stored, if true, queries will be stored for 30 days and deleted thereafter.
-        /// </summary>
-        [JsonProperty("log_queries")]
-        public bool? LogQueries { get; private set; }
-        /// <summary>
-        /// A 34 character string that uniquely identifies this resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A user-provided string that uniquely identifies this resource as an alternative to the sid. You can use the unique name in the URL path. Unique up to 64 characters long.
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// A user-provided URL to send event callbacks to.
-        /// </summary>
-        [JsonProperty("callback_url")]
-        public Uri CallbackUrl { get; private set; }
-        /// <summary>
-        /// Space-separated list of callback events that will trigger callbacks.
-        /// </summary>
-        [JsonProperty("callback_events")]
-        public string CallbackEvents { get; private set; }
-
-        private AssistantResource()
-        {
-
-        }
-    }
+{
+
+  public class AssistantResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchAssistantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static AssistantResource Fetch(FetchAssistantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<AssistantResource> FetchAsync(FetchAssistantOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static AssistantResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchAssistantOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<AssistantResource> FetchAsync(string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchAssistantOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadAssistantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/understand/Assistants",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static ResourceSet<AssistantResource> Read(ReadAssistantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AssistantResource>.FromJson("assistants", response.Content);
+      return new ResourceSet<AssistantResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AssistantResource>> ReadAsync(ReadAssistantOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AssistantResource>.FromJson("assistants", response.Content);
+      return new ResourceSet<AssistantResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static ResourceSet<AssistantResource> Read(int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadAssistantOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AssistantResource>> ReadAsync(int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadAssistantOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AssistantResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AssistantResource>.FromJson("assistants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AssistantResource> NextPage(Page<AssistantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<AssistantResource>.FromJson("assistants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AssistantResource> PreviousPage(Page<AssistantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<AssistantResource>.FromJson("assistants", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateAssistantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static AssistantResource Create(CreateAssistantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<AssistantResource> CreateAsync(CreateAssistantOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A text description for the Assistant. It is non-unique and can up to 255 characters
+    ///                    long. </param>
+    /// <param name="logQueries"> A boolean that specifies whether queries should be logged for 30 days further training.
+    ///                  If false, no queries will be stored, if true, queries will be stored for 30 days and deleted
+    ///                  thereafter. Defaults to true if no value is provided. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="callbackUrl"> A user-provided URL to send event callbacks to. </param>
+    /// <param name="callbackEvents"> Space-separated list of callback events that will trigger callbacks. </param>
+    /// <param name="fallbackActions"> The JSON actions to be executed when the user's input is not recognized as matching
+    ///                       any Task. </param>
+    /// <param name="initiationActions"> The JSON actions to be executed on inbound phone calls when the Assistant has to
+    ///                         say something first. </param>
+    /// <param name="styleSheet"> The JSON object that holds the style sheet for the assistant </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static AssistantResource Create(string friendlyName = null,
+                                           bool? logQueries = null,
+                                           string uniqueName = null,
+                                           Uri callbackUrl = null,
+                                           string callbackEvents = null,
+                                           object fallbackActions = null,
+                                           object initiationActions = null,
+                                           object styleSheet = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateAssistantOptions() { FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, FallbackActions = fallbackActions, InitiationActions = initiationActions, StyleSheet = styleSheet };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A text description for the Assistant. It is non-unique and can up to 255 characters
+    ///                    long. </param>
+    /// <param name="logQueries"> A boolean that specifies whether queries should be logged for 30 days further training.
+    ///                  If false, no queries will be stored, if true, queries will be stored for 30 days and deleted
+    ///                  thereafter. Defaults to true if no value is provided. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="callbackUrl"> A user-provided URL to send event callbacks to. </param>
+    /// <param name="callbackEvents"> Space-separated list of callback events that will trigger callbacks. </param>
+    /// <param name="fallbackActions"> The JSON actions to be executed when the user's input is not recognized as matching
+    ///                       any Task. </param>
+    /// <param name="initiationActions"> The JSON actions to be executed on inbound phone calls when the Assistant has to
+    ///                         say something first. </param>
+    /// <param name="styleSheet"> The JSON object that holds the style sheet for the assistant </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<AssistantResource> CreateAsync(string friendlyName = null,
+                                                                                   bool? logQueries = null,
+                                                                                   string uniqueName = null,
+                                                                                   Uri callbackUrl = null,
+                                                                                   string callbackEvents = null,
+                                                                                   object fallbackActions = null,
+                                                                                   object initiationActions = null,
+                                                                                   object styleSheet = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateAssistantOptions() { FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, FallbackActions = fallbackActions, InitiationActions = initiationActions, StyleSheet = styleSheet };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateAssistantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static AssistantResource Update(UpdateAssistantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<AssistantResource> UpdateAsync(UpdateAssistantOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="friendlyName"> A text description for the Assistant. It is non-unique and can up to 255 characters
+    ///                    long. </param>
+    /// <param name="logQueries"> A boolean that specifies whether queries should be logged for 30 days further training.
+    ///                  If false, no queries will be stored, if true, queries will be stored for 30 days and deleted
+    ///                  thereafter. Defaults to true if no value is provided. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="callbackUrl"> A user-provided URL to send event callbacks to. </param>
+    /// <param name="callbackEvents"> Space-separated list of callback events that will trigger callbacks. </param>
+    /// <param name="fallbackActions"> The JSON actions to be executed when the user's input is not recognized as matching
+    ///                       any Task. </param>
+    /// <param name="initiationActions"> The JSON actions to be executed on inbound phone calls when the Assistant has to
+    ///                         say something first. </param>
+    /// <param name="styleSheet"> The JSON object that holds the style sheet for the assistant </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static AssistantResource Update(string pathSid,
+                                           string friendlyName = null,
+                                           bool? logQueries = null,
+                                           string uniqueName = null,
+                                           Uri callbackUrl = null,
+                                           string callbackEvents = null,
+                                           object fallbackActions = null,
+                                           object initiationActions = null,
+                                           object styleSheet = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateAssistantOptions(pathSid) { FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, FallbackActions = fallbackActions, InitiationActions = initiationActions, StyleSheet = styleSheet };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="friendlyName"> A text description for the Assistant. It is non-unique and can up to 255 characters
+    ///                    long. </param>
+    /// <param name="logQueries"> A boolean that specifies whether queries should be logged for 30 days further training.
+    ///                  If false, no queries will be stored, if true, queries will be stored for 30 days and deleted
+    ///                  thereafter. Defaults to true if no value is provided. </param>
+    /// <param name="uniqueName"> A user-provided string that uniquely identifies this resource as an alternative to the
+    ///                  sid. Unique up to 64 characters long. </param>
+    /// <param name="callbackUrl"> A user-provided URL to send event callbacks to. </param>
+    /// <param name="callbackEvents"> Space-separated list of callback events that will trigger callbacks. </param>
+    /// <param name="fallbackActions"> The JSON actions to be executed when the user's input is not recognized as matching
+    ///                       any Task. </param>
+    /// <param name="initiationActions"> The JSON actions to be executed on inbound phone calls when the Assistant has to
+    ///                         say something first. </param>
+    /// <param name="styleSheet"> The JSON object that holds the style sheet for the assistant </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<AssistantResource> UpdateAsync(string pathSid,
+                                                                                   string friendlyName = null,
+                                                                                   bool? logQueries = null,
+                                                                                   string uniqueName = null,
+                                                                                   Uri callbackUrl = null,
+                                                                                   string callbackEvents = null,
+                                                                                   object fallbackActions = null,
+                                                                                   object initiationActions = null,
+                                                                                   object styleSheet = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateAssistantOptions(pathSid) { FriendlyName = friendlyName, LogQueries = logQueries, UniqueName = uniqueName, CallbackUrl = callbackUrl, CallbackEvents = callbackEvents, FallbackActions = fallbackActions, InitiationActions = initiationActions, StyleSheet = styleSheet };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteAssistantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/understand/Assistants/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static bool Delete(DeleteAssistantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Assistant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAssistantOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Assistant </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteAssistantOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> A 34 character string that uniquely identifies this resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Assistant </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteAssistantOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AssistantResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AssistantResource object represented by the provided JSON </returns>
+    public static AssistantResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AssistantResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique ID of the Account that created this Assistant.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The date that this resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date that this resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// A text description for the Assistant. It is non-unique and can up to 255 characters long.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique ID (Sid) of the latest model build. Null if no model has been built.
+    /// </summary>
+    [JsonProperty("latest_model_build_sid")]
+    public string LatestModelBuildSid { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// A boolean that specifies whether queries should be logged for 30 days further training. If false, no queries will be stored, if true, queries will be stored for 30 days and deleted thereafter.
+    /// </summary>
+    [JsonProperty("log_queries")]
+    public bool? LogQueries { get; private set; }
+    /// <summary>
+    /// A 34 character string that uniquely identifies this resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A user-provided string that uniquely identifies this resource as an alternative to the sid. You can use the unique name in the URL path. Unique up to 64 characters long.
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// A user-provided URL to send event callbacks to.
+    /// </summary>
+    [JsonProperty("callback_url")]
+    public Uri CallbackUrl { get; private set; }
+    /// <summary>
+    /// Space-separated list of callback events that will trigger callbacks.
+    /// </summary>
+    [JsonProperty("callback_events")]
+    public string CallbackEvents { get; private set; }
+
+    private AssistantResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Wireless/CommandOptions.cs b/src/Twilio/Rest/Preview/Wireless/CommandOptions.cs
index 23a207c78..c87230ccd 100644
--- a/src/Twilio/Rest/Preview/Wireless/CommandOptions.cs
+++ b/src/Twilio/Rest/Preview/Wireless/CommandOptions.cs
@@ -9,189 +9,189 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Wireless
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchCommandOptions
+  /// </summary>
+  public class FetchCommandOptions : IOptions<CommandResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchCommandOptions
-    /// </summary>
-    public class FetchCommandOptions : IOptions<CommandResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCommandOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public FetchCommandOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadCommandOptions
-    /// </summary>
-    public class ReadCommandOptions : ReadOptions<CommandResource>
-    {
-        /// <summary>
-        /// The device
-        /// </summary>
-        public string Device { get; set; }
-        /// <summary>
-        /// The sim
-        /// </summary>
-        public string Sim { get; set; }
-        /// <summary>
-        /// The status
-        /// </summary>
-        public string Status { get; set; }
-        /// <summary>
-        /// The direction
-        /// </summary>
-        public string Direction { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Device != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Device", Device));
-            }
-
-            if (Sim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sim", Sim));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status));
-            }
-
-            if (Direction != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Direction", Direction));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchCommandOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public FetchCommandOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateCommandOptions
-    /// </summary>
-    public class CreateCommandOptions : IOptions<CommandResource>
-    {
-        /// <summary>
-        /// The command
-        /// </summary>
-        public string Command { get; }
-        /// <summary>
-        /// The device
-        /// </summary>
-        public string Device { get; set; }
-        /// <summary>
-        /// The sim
-        /// </summary>
-        public string Sim { get; set; }
-        /// <summary>
-        /// The callback_method
-        /// </summary>
-        public string CallbackMethod { get; set; }
-        /// <summary>
-        /// The callback_url
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-        /// <summary>
-        /// The command_mode
-        /// </summary>
-        public string CommandMode { get; set; }
-        /// <summary>
-        /// The include_sid
-        /// </summary>
-        public string IncludeSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCommandOptions
-        /// </summary>
-        /// <param name="command"> The command </param>
-        public CreateCommandOptions(string command)
-        {
-            Command = command;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Command != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Command", Command));
-            }
-
-            if (Device != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Device", Device));
-            }
-
-            if (Sim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sim", Sim));
-            }
-
-            if (CallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (CommandMode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommandMode", CommandMode));
-            }
-
-            if (IncludeSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeSid", IncludeSid));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadCommandOptions
+  /// </summary>
+  public class ReadCommandOptions : ReadOptions<CommandResource>
+  {
+    /// <summary>
+    /// The device
+    /// </summary>
+    public string Device { get; set; }
+    /// <summary>
+    /// The sim
+    /// </summary>
+    public string Sim { get; set; }
+    /// <summary>
+    /// The status
+    /// </summary>
+    public string Status { get; set; }
+    /// <summary>
+    /// The direction
+    /// </summary>
+    public string Direction { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Device != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Device", Device));
+      }
+
+      if (Sim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sim", Sim));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status));
+      }
+
+      if (Direction != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Direction", Direction));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateCommandOptions
+  /// </summary>
+  public class CreateCommandOptions : IOptions<CommandResource>
+  {
+    /// <summary>
+    /// The command
+    /// </summary>
+    public string Command { get; }
+    /// <summary>
+    /// The device
+    /// </summary>
+    public string Device { get; set; }
+    /// <summary>
+    /// The sim
+    /// </summary>
+    public string Sim { get; set; }
+    /// <summary>
+    /// The callback_method
+    /// </summary>
+    public string CallbackMethod { get; set; }
+    /// <summary>
+    /// The callback_url
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+    /// <summary>
+    /// The command_mode
+    /// </summary>
+    public string CommandMode { get; set; }
+    /// <summary>
+    /// The include_sid
+    /// </summary>
+    public string IncludeSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCommandOptions
+    /// </summary>
+    /// <param name="command"> The command </param>
+    public CreateCommandOptions(string command)
+    {
+      Command = command;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Command != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Command", Command));
+      }
+
+      if (Device != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Device", Device));
+      }
+
+      if (Sim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sim", Sim));
+      }
+
+      if (CallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (CommandMode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommandMode", CommandMode));
+      }
+
+      if (IncludeSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeSid", IncludeSid));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Wireless/CommandResource.cs b/src/Twilio/Rest/Preview/Wireless/CommandResource.cs
index ee399613a..38a9da04f 100644
--- a/src/Twilio/Rest/Preview/Wireless/CommandResource.cs
+++ b/src/Twilio/Rest/Preview/Wireless/CommandResource.cs
@@ -19,392 +19,392 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Wireless
-{
-
-    public class CommandResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/wireless/Commands/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static CommandResource Fetch(FetchCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<CommandResource> FetchAsync(FetchCommandOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static CommandResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCommandOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<CommandResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchCommandOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/wireless/Commands",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static ResourceSet<CommandResource> Read(ReadCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CommandResource>.FromJson("commands", response.Content);
-            return new ResourceSet<CommandResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CommandResource>> ReadAsync(ReadCommandOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CommandResource>.FromJson("commands", response.Content);
-            return new ResourceSet<CommandResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="device"> The device </param>
-        /// <param name="sim"> The sim </param>
-        /// <param name="status"> The status </param>
-        /// <param name="direction"> The direction </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static ResourceSet<CommandResource> Read(string device = null,
-                                                        string sim = null,
-                                                        string status = null,
-                                                        string direction = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadCommandOptions(){Device = device, Sim = sim, Status = status, Direction = direction, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="device"> The device </param>
-        /// <param name="sim"> The sim </param>
-        /// <param name="status"> The status </param>
-        /// <param name="direction"> The direction </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CommandResource>> ReadAsync(string device = null,
-                                                                                                string sim = null,
-                                                                                                string status = null,
-                                                                                                string direction = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadCommandOptions(){Device = device, Sim = sim, Status = status, Direction = direction, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CommandResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CommandResource>.FromJson("commands", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CommandResource> NextPage(Page<CommandResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<CommandResource>.FromJson("commands", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CommandResource> PreviousPage(Page<CommandResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<CommandResource>.FromJson("commands", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/wireless/Commands",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static CommandResource Create(CreateCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<CommandResource> CreateAsync(CreateCommandOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="command"> The command </param>
-        /// <param name="device"> The device </param>
-        /// <param name="sim"> The sim </param>
-        /// <param name="callbackMethod"> The callback_method </param>
-        /// <param name="callbackUrl"> The callback_url </param>
-        /// <param name="commandMode"> The command_mode </param>
-        /// <param name="includeSid"> The include_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static CommandResource Create(string command,
-                                             string device = null,
-                                             string sim = null,
-                                             string callbackMethod = null,
-                                             Uri callbackUrl = null,
-                                             string commandMode = null,
-                                             string includeSid = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateCommandOptions(command){Device = device, Sim = sim, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, CommandMode = commandMode, IncludeSid = includeSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="command"> The command </param>
-        /// <param name="device"> The device </param>
-        /// <param name="sim"> The sim </param>
-        /// <param name="callbackMethod"> The callback_method </param>
-        /// <param name="callbackUrl"> The callback_url </param>
-        /// <param name="commandMode"> The command_mode </param>
-        /// <param name="includeSid"> The include_sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<CommandResource> CreateAsync(string command,
-                                                                                     string device = null,
-                                                                                     string sim = null,
-                                                                                     string callbackMethod = null,
-                                                                                     Uri callbackUrl = null,
-                                                                                     string commandMode = null,
-                                                                                     string includeSid = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateCommandOptions(command){Device = device, Sim = sim, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, CommandMode = commandMode, IncludeSid = includeSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CommandResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CommandResource object represented by the provided JSON </returns>
-        public static CommandResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CommandResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The device_sid
-        /// </summary>
-        [JsonProperty("device_sid")]
-        public string DeviceSid { get; private set; }
-        /// <summary>
-        /// The sim_sid
-        /// </summary>
-        [JsonProperty("sim_sid")]
-        public string SimSid { get; private set; }
-        /// <summary>
-        /// The command
-        /// </summary>
-        [JsonProperty("command")]
-        public string Command { get; private set; }
-        /// <summary>
-        /// The command_mode
-        /// </summary>
-        [JsonProperty("command_mode")]
-        public string CommandMode { get; private set; }
-        /// <summary>
-        /// The status
-        /// </summary>
-        [JsonProperty("status")]
-        public string Status { get; private set; }
-        /// <summary>
-        /// The direction
-        /// </summary>
-        [JsonProperty("direction")]
-        public string Direction { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CommandResource()
-        {
-
-        }
-    }
+{
+
+  public class CommandResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/wireless/Commands/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static CommandResource Fetch(FetchCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<CommandResource> FetchAsync(FetchCommandOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static CommandResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCommandOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<CommandResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchCommandOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/wireless/Commands",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static ResourceSet<CommandResource> Read(ReadCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CommandResource>.FromJson("commands", response.Content);
+      return new ResourceSet<CommandResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CommandResource>> ReadAsync(ReadCommandOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CommandResource>.FromJson("commands", response.Content);
+      return new ResourceSet<CommandResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="device"> The device </param>
+    /// <param name="sim"> The sim </param>
+    /// <param name="status"> The status </param>
+    /// <param name="direction"> The direction </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static ResourceSet<CommandResource> Read(string device = null,
+                                                    string sim = null,
+                                                    string status = null,
+                                                    string direction = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadCommandOptions() { Device = device, Sim = sim, Status = status, Direction = direction, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="device"> The device </param>
+    /// <param name="sim"> The sim </param>
+    /// <param name="status"> The status </param>
+    /// <param name="direction"> The direction </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CommandResource>> ReadAsync(string device = null,
+                                                                                            string sim = null,
+                                                                                            string status = null,
+                                                                                            string direction = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadCommandOptions() { Device = device, Sim = sim, Status = status, Direction = direction, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CommandResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CommandResource>.FromJson("commands", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CommandResource> NextPage(Page<CommandResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<CommandResource>.FromJson("commands", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CommandResource> PreviousPage(Page<CommandResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<CommandResource>.FromJson("commands", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/wireless/Commands",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static CommandResource Create(CreateCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<CommandResource> CreateAsync(CreateCommandOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="command"> The command </param>
+    /// <param name="device"> The device </param>
+    /// <param name="sim"> The sim </param>
+    /// <param name="callbackMethod"> The callback_method </param>
+    /// <param name="callbackUrl"> The callback_url </param>
+    /// <param name="commandMode"> The command_mode </param>
+    /// <param name="includeSid"> The include_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static CommandResource Create(string command,
+                                         string device = null,
+                                         string sim = null,
+                                         string callbackMethod = null,
+                                         Uri callbackUrl = null,
+                                         string commandMode = null,
+                                         string includeSid = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateCommandOptions(command) { Device = device, Sim = sim, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, CommandMode = commandMode, IncludeSid = includeSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="command"> The command </param>
+    /// <param name="device"> The device </param>
+    /// <param name="sim"> The sim </param>
+    /// <param name="callbackMethod"> The callback_method </param>
+    /// <param name="callbackUrl"> The callback_url </param>
+    /// <param name="commandMode"> The command_mode </param>
+    /// <param name="includeSid"> The include_sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<CommandResource> CreateAsync(string command,
+                                                                                 string device = null,
+                                                                                 string sim = null,
+                                                                                 string callbackMethod = null,
+                                                                                 Uri callbackUrl = null,
+                                                                                 string commandMode = null,
+                                                                                 string includeSid = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateCommandOptions(command) { Device = device, Sim = sim, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, CommandMode = commandMode, IncludeSid = includeSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CommandResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CommandResource object represented by the provided JSON </returns>
+    public static CommandResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CommandResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The device_sid
+    /// </summary>
+    [JsonProperty("device_sid")]
+    public string DeviceSid { get; private set; }
+    /// <summary>
+    /// The sim_sid
+    /// </summary>
+    [JsonProperty("sim_sid")]
+    public string SimSid { get; private set; }
+    /// <summary>
+    /// The command
+    /// </summary>
+    [JsonProperty("command")]
+    public string Command { get; private set; }
+    /// <summary>
+    /// The command_mode
+    /// </summary>
+    [JsonProperty("command_mode")]
+    public string CommandMode { get; private set; }
+    /// <summary>
+    /// The status
+    /// </summary>
+    [JsonProperty("status")]
+    public string Status { get; private set; }
+    /// <summary>
+    /// The direction
+    /// </summary>
+    [JsonProperty("direction")]
+    public string Direction { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CommandResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Wireless/RatePlanOptions.cs b/src/Twilio/Rest/Preview/Wireless/RatePlanOptions.cs
index c82a8a66d..25f621dcc 100644
--- a/src/Twilio/Rest/Preview/Wireless/RatePlanOptions.cs
+++ b/src/Twilio/Rest/Preview/Wireless/RatePlanOptions.cs
@@ -10,260 +10,260 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Wireless
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadRatePlanOptions
+  /// </summary>
+  public class ReadRatePlanOptions : ReadOptions<RatePlanResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadRatePlanOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadRatePlanOptions : ReadOptions<RatePlanResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchRatePlanOptions
+  /// </summary>
+  public class FetchRatePlanOptions : IOptions<RatePlanResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchRatePlanOptions
+    /// The sid
     /// </summary>
-    public class FetchRatePlanOptions : IOptions<RatePlanResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRatePlanOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public FetchRatePlanOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// CreateRatePlanOptions
+    /// Construct a new FetchRatePlanOptions
     /// </summary>
-    public class CreateRatePlanOptions : IOptions<RatePlanResource>
-    {
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The data_enabled
-        /// </summary>
-        public bool? DataEnabled { get; set; }
-        /// <summary>
-        /// The data_limit
-        /// </summary>
-        public int? DataLimit { get; set; }
-        /// <summary>
-        /// The data_metering
-        /// </summary>
-        public string DataMetering { get; set; }
-        /// <summary>
-        /// The messaging_enabled
-        /// </summary>
-        public bool? MessagingEnabled { get; set; }
-        /// <summary>
-        /// The voice_enabled
-        /// </summary>
-        public bool? VoiceEnabled { get; set; }
-        /// <summary>
-        /// The commands_enabled
-        /// </summary>
-        public bool? CommandsEnabled { get; set; }
-        /// <summary>
-        /// The national_roaming_enabled
-        /// </summary>
-        public bool? NationalRoamingEnabled { get; set; }
-        /// <summary>
-        /// The international_roaming
-        /// </summary>
-        public List<string> InternationalRoaming { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateRatePlanOptions
-        /// </summary>
-        public CreateRatePlanOptions()
-        {
-            InternationalRoaming = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DataEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DataEnabled", DataEnabled.Value.ToString().ToLower()));
-            }
-
-            if (DataLimit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DataLimit", DataLimit.ToString()));
-            }
-
-            if (DataMetering != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DataMetering", DataMetering));
-            }
-
-            if (MessagingEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingEnabled", MessagingEnabled.Value.ToString().ToLower()));
-            }
-
-            if (VoiceEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
-            }
-
-            if (CommandsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommandsEnabled", CommandsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NationalRoamingEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NationalRoamingEnabled", NationalRoamingEnabled.Value.ToString().ToLower()));
-            }
-
-            if (InternationalRoaming != null)
-            {
-                p.AddRange(InternationalRoaming.Select(prop => new KeyValuePair<string, string>("InternationalRoaming", prop)));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The sid </param>
+    public FetchRatePlanOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateRatePlanOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateRatePlanOptions : IOptions<RatePlanResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateRatePlanOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateRatePlanOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// CreateRatePlanOptions
+  /// </summary>
+  public class CreateRatePlanOptions : IOptions<RatePlanResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// DeleteRatePlanOptions
+    /// The unique_name
     /// </summary>
-    public class DeleteRatePlanOptions : IOptions<RatePlanResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRatePlanOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public DeleteRatePlanOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The data_enabled
+    /// </summary>
+    public bool? DataEnabled { get; set; }
+    /// <summary>
+    /// The data_limit
+    /// </summary>
+    public int? DataLimit { get; set; }
+    /// <summary>
+    /// The data_metering
+    /// </summary>
+    public string DataMetering { get; set; }
+    /// <summary>
+    /// The messaging_enabled
+    /// </summary>
+    public bool? MessagingEnabled { get; set; }
+    /// <summary>
+    /// The voice_enabled
+    /// </summary>
+    public bool? VoiceEnabled { get; set; }
+    /// <summary>
+    /// The commands_enabled
+    /// </summary>
+    public bool? CommandsEnabled { get; set; }
+    /// <summary>
+    /// The national_roaming_enabled
+    /// </summary>
+    public bool? NationalRoamingEnabled { get; set; }
+    /// <summary>
+    /// The international_roaming
+    /// </summary>
+    public List<string> InternationalRoaming { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateRatePlanOptions
+    /// </summary>
+    public CreateRatePlanOptions()
+    {
+      InternationalRoaming = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DataEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DataEnabled", DataEnabled.Value.ToString().ToLower()));
+      }
+
+      if (DataLimit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DataLimit", DataLimit.ToString()));
+      }
+
+      if (DataMetering != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DataMetering", DataMetering));
+      }
+
+      if (MessagingEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingEnabled", MessagingEnabled.Value.ToString().ToLower()));
+      }
+
+      if (VoiceEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
+      }
+
+      if (CommandsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommandsEnabled", CommandsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NationalRoamingEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NationalRoamingEnabled", NationalRoamingEnabled.Value.ToString().ToLower()));
+      }
+
+      if (InternationalRoaming != null)
+      {
+        p.AddRange(InternationalRoaming.Select(prop => new KeyValuePair<string, string>("InternationalRoaming", prop)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateRatePlanOptions
+  /// </summary>
+  public class UpdateRatePlanOptions : IOptions<RatePlanResource>
+  {
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateRatePlanOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateRatePlanOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// DeleteRatePlanOptions
+  /// </summary>
+  public class DeleteRatePlanOptions : IOptions<RatePlanResource>
+  {
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRatePlanOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public DeleteRatePlanOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Wireless/RatePlanResource.cs b/src/Twilio/Rest/Preview/Wireless/RatePlanResource.cs
index 3f18e777f..7335b228a 100644
--- a/src/Twilio/Rest/Preview/Wireless/RatePlanResource.cs
+++ b/src/Twilio/Rest/Preview/Wireless/RatePlanResource.cs
@@ -19,545 +19,545 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Wireless
-{
-
-    public class RatePlanResource : Resource
-    {
-        private static Request BuildReadRequest(ReadRatePlanOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/wireless/RatePlans",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static ResourceSet<RatePlanResource> Read(ReadRatePlanOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RatePlanResource>.FromJson("rate_plans", response.Content);
-            return new ResourceSet<RatePlanResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RatePlanResource>> ReadAsync(ReadRatePlanOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RatePlanResource>.FromJson("rate_plans", response.Content);
-            return new ResourceSet<RatePlanResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static ResourceSet<RatePlanResource> Read(int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadRatePlanOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RatePlanResource>> ReadAsync(int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadRatePlanOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RatePlanResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RatePlanResource>.FromJson("rate_plans", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RatePlanResource> NextPage(Page<RatePlanResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<RatePlanResource>.FromJson("rate_plans", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RatePlanResource> PreviousPage(Page<RatePlanResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<RatePlanResource>.FromJson("rate_plans", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchRatePlanOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/wireless/RatePlans/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static RatePlanResource Fetch(FetchRatePlanOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<RatePlanResource> FetchAsync(FetchRatePlanOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static RatePlanResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRatePlanOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<RatePlanResource> FetchAsync(string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchRatePlanOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateRatePlanOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/wireless/RatePlans",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static RatePlanResource Create(CreateRatePlanOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<RatePlanResource> CreateAsync(CreateRatePlanOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="dataEnabled"> The data_enabled </param>
-        /// <param name="dataLimit"> The data_limit </param>
-        /// <param name="dataMetering"> The data_metering </param>
-        /// <param name="messagingEnabled"> The messaging_enabled </param>
-        /// <param name="voiceEnabled"> The voice_enabled </param>
-        /// <param name="commandsEnabled"> The commands_enabled </param>
-        /// <param name="nationalRoamingEnabled"> The national_roaming_enabled </param>
-        /// <param name="internationalRoaming"> The international_roaming </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static RatePlanResource Create(string uniqueName = null,
-                                              string friendlyName = null,
-                                              bool? dataEnabled = null,
-                                              int? dataLimit = null,
-                                              string dataMetering = null,
-                                              bool? messagingEnabled = null,
-                                              bool? voiceEnabled = null,
-                                              bool? commandsEnabled = null,
-                                              bool? nationalRoamingEnabled = null,
-                                              List<string> internationalRoaming = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateRatePlanOptions(){UniqueName = uniqueName, FriendlyName = friendlyName, DataEnabled = dataEnabled, DataLimit = dataLimit, DataMetering = dataMetering, MessagingEnabled = messagingEnabled, VoiceEnabled = voiceEnabled, CommandsEnabled = commandsEnabled, NationalRoamingEnabled = nationalRoamingEnabled, InternationalRoaming = internationalRoaming};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="dataEnabled"> The data_enabled </param>
-        /// <param name="dataLimit"> The data_limit </param>
-        /// <param name="dataMetering"> The data_metering </param>
-        /// <param name="messagingEnabled"> The messaging_enabled </param>
-        /// <param name="voiceEnabled"> The voice_enabled </param>
-        /// <param name="commandsEnabled"> The commands_enabled </param>
-        /// <param name="nationalRoamingEnabled"> The national_roaming_enabled </param>
-        /// <param name="internationalRoaming"> The international_roaming </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<RatePlanResource> CreateAsync(string uniqueName = null,
-                                                                                      string friendlyName = null,
-                                                                                      bool? dataEnabled = null,
-                                                                                      int? dataLimit = null,
-                                                                                      string dataMetering = null,
-                                                                                      bool? messagingEnabled = null,
-                                                                                      bool? voiceEnabled = null,
-                                                                                      bool? commandsEnabled = null,
-                                                                                      bool? nationalRoamingEnabled = null,
-                                                                                      List<string> internationalRoaming = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateRatePlanOptions(){UniqueName = uniqueName, FriendlyName = friendlyName, DataEnabled = dataEnabled, DataLimit = dataLimit, DataMetering = dataMetering, MessagingEnabled = messagingEnabled, VoiceEnabled = voiceEnabled, CommandsEnabled = commandsEnabled, NationalRoamingEnabled = nationalRoamingEnabled, InternationalRoaming = internationalRoaming};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateRatePlanOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/wireless/RatePlans/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static RatePlanResource Update(UpdateRatePlanOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<RatePlanResource> UpdateAsync(UpdateRatePlanOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static RatePlanResource Update(string pathSid,
-                                              string uniqueName = null,
-                                              string friendlyName = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateRatePlanOptions(pathSid){UniqueName = uniqueName, FriendlyName = friendlyName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<RatePlanResource> UpdateAsync(string pathSid,
-                                                                                      string uniqueName = null,
-                                                                                      string friendlyName = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateRatePlanOptions(pathSid){UniqueName = uniqueName, FriendlyName = friendlyName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteRatePlanOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Preview,
-                "/wireless/RatePlans/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static bool Delete(DeleteRatePlanOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRatePlanOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRatePlanOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRatePlanOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RatePlanResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RatePlanResource object represented by the provided JSON </returns>
-        public static RatePlanResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RatePlanResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The data_enabled
-        /// </summary>
-        [JsonProperty("data_enabled")]
-        public bool? DataEnabled { get; private set; }
-        /// <summary>
-        /// The data_metering
-        /// </summary>
-        [JsonProperty("data_metering")]
-        public string DataMetering { get; private set; }
-        /// <summary>
-        /// The data_limit
-        /// </summary>
-        [JsonProperty("data_limit")]
-        public int? DataLimit { get; private set; }
-        /// <summary>
-        /// The messaging_enabled
-        /// </summary>
-        [JsonProperty("messaging_enabled")]
-        public bool? MessagingEnabled { get; private set; }
-        /// <summary>
-        /// The voice_enabled
-        /// </summary>
-        [JsonProperty("voice_enabled")]
-        public bool? VoiceEnabled { get; private set; }
-        /// <summary>
-        /// The national_roaming_enabled
-        /// </summary>
-        [JsonProperty("national_roaming_enabled")]
-        public bool? NationalRoamingEnabled { get; private set; }
-        /// <summary>
-        /// The international_roaming
-        /// </summary>
-        [JsonProperty("international_roaming")]
-        public List<string> InternationalRoaming { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private RatePlanResource()
-        {
-
-        }
-    }
+{
+
+  public class RatePlanResource : Resource
+  {
+    private static Request BuildReadRequest(ReadRatePlanOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/wireless/RatePlans",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static ResourceSet<RatePlanResource> Read(ReadRatePlanOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RatePlanResource>.FromJson("rate_plans", response.Content);
+      return new ResourceSet<RatePlanResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RatePlanResource>> ReadAsync(ReadRatePlanOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RatePlanResource>.FromJson("rate_plans", response.Content);
+      return new ResourceSet<RatePlanResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static ResourceSet<RatePlanResource> Read(int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadRatePlanOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RatePlanResource>> ReadAsync(int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadRatePlanOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RatePlanResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RatePlanResource>.FromJson("rate_plans", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RatePlanResource> NextPage(Page<RatePlanResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<RatePlanResource>.FromJson("rate_plans", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RatePlanResource> PreviousPage(Page<RatePlanResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<RatePlanResource>.FromJson("rate_plans", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchRatePlanOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/wireless/RatePlans/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static RatePlanResource Fetch(FetchRatePlanOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<RatePlanResource> FetchAsync(FetchRatePlanOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static RatePlanResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRatePlanOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<RatePlanResource> FetchAsync(string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchRatePlanOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateRatePlanOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/wireless/RatePlans",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static RatePlanResource Create(CreateRatePlanOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<RatePlanResource> CreateAsync(CreateRatePlanOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="dataEnabled"> The data_enabled </param>
+    /// <param name="dataLimit"> The data_limit </param>
+    /// <param name="dataMetering"> The data_metering </param>
+    /// <param name="messagingEnabled"> The messaging_enabled </param>
+    /// <param name="voiceEnabled"> The voice_enabled </param>
+    /// <param name="commandsEnabled"> The commands_enabled </param>
+    /// <param name="nationalRoamingEnabled"> The national_roaming_enabled </param>
+    /// <param name="internationalRoaming"> The international_roaming </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static RatePlanResource Create(string uniqueName = null,
+                                          string friendlyName = null,
+                                          bool? dataEnabled = null,
+                                          int? dataLimit = null,
+                                          string dataMetering = null,
+                                          bool? messagingEnabled = null,
+                                          bool? voiceEnabled = null,
+                                          bool? commandsEnabled = null,
+                                          bool? nationalRoamingEnabled = null,
+                                          List<string> internationalRoaming = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateRatePlanOptions() { UniqueName = uniqueName, FriendlyName = friendlyName, DataEnabled = dataEnabled, DataLimit = dataLimit, DataMetering = dataMetering, MessagingEnabled = messagingEnabled, VoiceEnabled = voiceEnabled, CommandsEnabled = commandsEnabled, NationalRoamingEnabled = nationalRoamingEnabled, InternationalRoaming = internationalRoaming };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="dataEnabled"> The data_enabled </param>
+    /// <param name="dataLimit"> The data_limit </param>
+    /// <param name="dataMetering"> The data_metering </param>
+    /// <param name="messagingEnabled"> The messaging_enabled </param>
+    /// <param name="voiceEnabled"> The voice_enabled </param>
+    /// <param name="commandsEnabled"> The commands_enabled </param>
+    /// <param name="nationalRoamingEnabled"> The national_roaming_enabled </param>
+    /// <param name="internationalRoaming"> The international_roaming </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<RatePlanResource> CreateAsync(string uniqueName = null,
+                                                                                  string friendlyName = null,
+                                                                                  bool? dataEnabled = null,
+                                                                                  int? dataLimit = null,
+                                                                                  string dataMetering = null,
+                                                                                  bool? messagingEnabled = null,
+                                                                                  bool? voiceEnabled = null,
+                                                                                  bool? commandsEnabled = null,
+                                                                                  bool? nationalRoamingEnabled = null,
+                                                                                  List<string> internationalRoaming = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateRatePlanOptions() { UniqueName = uniqueName, FriendlyName = friendlyName, DataEnabled = dataEnabled, DataLimit = dataLimit, DataMetering = dataMetering, MessagingEnabled = messagingEnabled, VoiceEnabled = voiceEnabled, CommandsEnabled = commandsEnabled, NationalRoamingEnabled = nationalRoamingEnabled, InternationalRoaming = internationalRoaming };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateRatePlanOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/wireless/RatePlans/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static RatePlanResource Update(UpdateRatePlanOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<RatePlanResource> UpdateAsync(UpdateRatePlanOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static RatePlanResource Update(string pathSid,
+                                          string uniqueName = null,
+                                          string friendlyName = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateRatePlanOptions(pathSid) { UniqueName = uniqueName, FriendlyName = friendlyName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<RatePlanResource> UpdateAsync(string pathSid,
+                                                                                  string uniqueName = null,
+                                                                                  string friendlyName = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateRatePlanOptions(pathSid) { UniqueName = uniqueName, FriendlyName = friendlyName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteRatePlanOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Preview,
+          "/wireless/RatePlans/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static bool Delete(DeleteRatePlanOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRatePlanOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRatePlanOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRatePlanOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RatePlanResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RatePlanResource object represented by the provided JSON </returns>
+    public static RatePlanResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RatePlanResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The data_enabled
+    /// </summary>
+    [JsonProperty("data_enabled")]
+    public bool? DataEnabled { get; private set; }
+    /// <summary>
+    /// The data_metering
+    /// </summary>
+    [JsonProperty("data_metering")]
+    public string DataMetering { get; private set; }
+    /// <summary>
+    /// The data_limit
+    /// </summary>
+    [JsonProperty("data_limit")]
+    public int? DataLimit { get; private set; }
+    /// <summary>
+    /// The messaging_enabled
+    /// </summary>
+    [JsonProperty("messaging_enabled")]
+    public bool? MessagingEnabled { get; private set; }
+    /// <summary>
+    /// The voice_enabled
+    /// </summary>
+    [JsonProperty("voice_enabled")]
+    public bool? VoiceEnabled { get; private set; }
+    /// <summary>
+    /// The national_roaming_enabled
+    /// </summary>
+    [JsonProperty("national_roaming_enabled")]
+    public bool? NationalRoamingEnabled { get; private set; }
+    /// <summary>
+    /// The international_roaming
+    /// </summary>
+    [JsonProperty("international_roaming")]
+    public List<string> InternationalRoaming { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private RatePlanResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Wireless/Sim/UsageOptions.cs b/src/Twilio/Rest/Preview/Wireless/Sim/UsageOptions.cs
index aa5a5ec5f..755c8609b 100644
--- a/src/Twilio/Rest/Preview/Wireless/Sim/UsageOptions.cs
+++ b/src/Twilio/Rest/Preview/Wireless/Sim/UsageOptions.cs
@@ -9,56 +9,56 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Wireless.Sim
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchUsageOptions
+  /// </summary>
+  public class FetchUsageOptions : IOptions<UsageResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchUsageOptions
+    /// The sim_sid
     /// </summary>
-    public class FetchUsageOptions : IOptions<UsageResource>
-    {
-        /// <summary>
-        /// The sim_sid
-        /// </summary>
-        public string PathSimSid { get; }
-        /// <summary>
-        /// The end
-        /// </summary>
-        public string End { get; set; }
-        /// <summary>
-        /// The start
-        /// </summary>
-        public string Start { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchUsageOptions
-        /// </summary>
-        /// <param name="pathSimSid"> The sim_sid </param>
-        public FetchUsageOptions(string pathSimSid)
-        {
-            PathSimSid = pathSimSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (End != null)
-            {
-                p.Add(new KeyValuePair<string, string>("End", End));
-            }
-
-            if (Start != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Start", Start));
-            }
-
-            return p;
-        }
-    }
+    public string PathSimSid { get; }
+    /// <summary>
+    /// The end
+    /// </summary>
+    public string End { get; set; }
+    /// <summary>
+    /// The start
+    /// </summary>
+    public string Start { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchUsageOptions
+    /// </summary>
+    /// <param name="pathSimSid"> The sim_sid </param>
+    public FetchUsageOptions(string pathSimSid)
+    {
+      PathSimSid = pathSimSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (End != null)
+      {
+        p.Add(new KeyValuePair<string, string>("End", End));
+      }
+
+      if (Start != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Start", Start));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Wireless/Sim/UsageResource.cs b/src/Twilio/Rest/Preview/Wireless/Sim/UsageResource.cs
index 502b458f7..779e79889 100644
--- a/src/Twilio/Rest/Preview/Wireless/Sim/UsageResource.cs
+++ b/src/Twilio/Rest/Preview/Wireless/Sim/UsageResource.cs
@@ -19,154 +19,154 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Wireless.Sim
-{
-
-    public class UsageResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchUsageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/wireless/Sims/" + options.PathSimSid + "/Usage",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Usage parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Usage </returns>
-        public static UsageResource Fetch(FetchUsageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Usage parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Usage </returns>
-        public static async System.Threading.Tasks.Task<UsageResource> FetchAsync(FetchUsageOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSimSid"> The sim_sid </param>
-        /// <param name="end"> The end </param>
-        /// <param name="start"> The start </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Usage </returns>
-        public static UsageResource Fetch(string pathSimSid,
-                                          string end = null,
-                                          string start = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchUsageOptions(pathSimSid){End = end, Start = start};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSimSid"> The sim_sid </param>
-        /// <param name="end"> The end </param>
-        /// <param name="start"> The start </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Usage </returns>
-        public static async System.Threading.Tasks.Task<UsageResource> FetchAsync(string pathSimSid,
-                                                                                  string end = null,
-                                                                                  string start = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchUsageOptions(pathSimSid){End = end, Start = start};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a UsageResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UsageResource object represented by the provided JSON </returns>
-        public static UsageResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UsageResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sim_sid
-        /// </summary>
-        [JsonProperty("sim_sid")]
-        public string SimSid { get; private set; }
-        /// <summary>
-        /// The sim_unique_name
-        /// </summary>
-        [JsonProperty("sim_unique_name")]
-        public string SimUniqueName { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The period
-        /// </summary>
-        [JsonProperty("period")]
-        public object Period { get; private set; }
-        /// <summary>
-        /// The commands_usage
-        /// </summary>
-        [JsonProperty("commands_usage")]
-        public object CommandsUsage { get; private set; }
-        /// <summary>
-        /// The commands_costs
-        /// </summary>
-        [JsonProperty("commands_costs")]
-        public object CommandsCosts { get; private set; }
-        /// <summary>
-        /// The data_usage
-        /// </summary>
-        [JsonProperty("data_usage")]
-        public object DataUsage { get; private set; }
-        /// <summary>
-        /// The data_costs
-        /// </summary>
-        [JsonProperty("data_costs")]
-        public object DataCosts { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private UsageResource()
-        {
-
-        }
-    }
+{
+
+  public class UsageResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchUsageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/wireless/Sims/" + options.PathSimSid + "/Usage",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Usage parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Usage </returns>
+    public static UsageResource Fetch(FetchUsageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Usage parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Usage </returns>
+    public static async System.Threading.Tasks.Task<UsageResource> FetchAsync(FetchUsageOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSimSid"> The sim_sid </param>
+    /// <param name="end"> The end </param>
+    /// <param name="start"> The start </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Usage </returns>
+    public static UsageResource Fetch(string pathSimSid,
+                                      string end = null,
+                                      string start = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchUsageOptions(pathSimSid) { End = end, Start = start };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSimSid"> The sim_sid </param>
+    /// <param name="end"> The end </param>
+    /// <param name="start"> The start </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Usage </returns>
+    public static async System.Threading.Tasks.Task<UsageResource> FetchAsync(string pathSimSid,
+                                                                              string end = null,
+                                                                              string start = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchUsageOptions(pathSimSid) { End = end, Start = start };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a UsageResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UsageResource object represented by the provided JSON </returns>
+    public static UsageResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UsageResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sim_sid
+    /// </summary>
+    [JsonProperty("sim_sid")]
+    public string SimSid { get; private set; }
+    /// <summary>
+    /// The sim_unique_name
+    /// </summary>
+    [JsonProperty("sim_unique_name")]
+    public string SimUniqueName { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The period
+    /// </summary>
+    [JsonProperty("period")]
+    public object Period { get; private set; }
+    /// <summary>
+    /// The commands_usage
+    /// </summary>
+    [JsonProperty("commands_usage")]
+    public object CommandsUsage { get; private set; }
+    /// <summary>
+    /// The commands_costs
+    /// </summary>
+    [JsonProperty("commands_costs")]
+    public object CommandsCosts { get; private set; }
+    /// <summary>
+    /// The data_usage
+    /// </summary>
+    [JsonProperty("data_usage")]
+    public object DataUsage { get; private set; }
+    /// <summary>
+    /// The data_costs
+    /// </summary>
+    [JsonProperty("data_costs")]
+    public object DataCosts { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private UsageResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Wireless/SimOptions.cs b/src/Twilio/Rest/Preview/Wireless/SimOptions.cs
index d45e698b8..db6d9a14a 100644
--- a/src/Twilio/Rest/Preview/Wireless/SimOptions.cs
+++ b/src/Twilio/Rest/Preview/Wireless/SimOptions.cs
@@ -9,283 +9,283 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Preview.Wireless
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// FetchSimOptions
+  /// </summary>
+  public class FetchSimOptions : IOptions<SimResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// FetchSimOptions
+    /// The sid
     /// </summary>
-    public class FetchSimOptions : IOptions<SimResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSimOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public FetchSimOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// ReadSimOptions
+    /// Construct a new FetchSimOptions
     /// </summary>
-    public class ReadSimOptions : ReadOptions<SimResource>
-    {
-        /// <summary>
-        /// The status
-        /// </summary>
-        public string Status { get; set; }
-        /// <summary>
-        /// The iccid
-        /// </summary>
-        public string Iccid { get; set; }
-        /// <summary>
-        /// The rate_plan
-        /// </summary>
-        public string RatePlan { get; set; }
-        /// <summary>
-        /// The e_id
-        /// </summary>
-        public string EId { get; set; }
-        /// <summary>
-        /// The sim_registration_code
-        /// </summary>
-        public string SimRegistrationCode { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status));
-            }
-
-            if (Iccid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Iccid", Iccid));
-            }
-
-            if (RatePlan != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RatePlan", RatePlan));
-            }
-
-            if (EId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EId", EId));
-            }
-
-            if (SimRegistrationCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SimRegistrationCode", SimRegistrationCode));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The sid </param>
+    public FetchSimOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// UpdateSimOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateSimOptions : IOptions<SimResource>
-    {
-        /// <summary>
-        /// The sid
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The callback_method
-        /// </summary>
-        public string CallbackMethod { get; set; }
-        /// <summary>
-        /// The callback_url
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The rate_plan
-        /// </summary>
-        public string RatePlan { get; set; }
-        /// <summary>
-        /// The status
-        /// </summary>
-        public string Status { get; set; }
-        /// <summary>
-        /// The commands_callback_method
-        /// </summary>
-        public Twilio.Http.HttpMethod CommandsCallbackMethod { get; set; }
-        /// <summary>
-        /// The commands_callback_url
-        /// </summary>
-        public Uri CommandsCallbackUrl { get; set; }
-        /// <summary>
-        /// The sms_fallback_method
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
-        /// <summary>
-        /// The sms_fallback_url
-        /// </summary>
-        public Uri SmsFallbackUrl { get; set; }
-        /// <summary>
-        /// The sms_method
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsMethod { get; set; }
-        /// <summary>
-        /// The sms_url
-        /// </summary>
-        public Uri SmsUrl { get; set; }
-        /// <summary>
-        /// The voice_fallback_method
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
-        /// <summary>
-        /// The voice_fallback_url
-        /// </summary>
-        public Uri VoiceFallbackUrl { get; set; }
-        /// <summary>
-        /// The voice_method
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceMethod { get; set; }
-        /// <summary>
-        /// The voice_url
-        /// </summary>
-        public Uri VoiceUrl { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSimOptions
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        public UpdateSimOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (CallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (RatePlan != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RatePlan", RatePlan.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status));
-            }
-
-            if (CommandsCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommandsCallbackMethod", CommandsCallbackMethod.ToString()));
-            }
-
-            if (CommandsCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommandsCallbackUrl", Serializers.Url(CommandsCallbackUrl)));
-            }
-
-            if (SmsFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
-            }
-
-            if (SmsFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
-            }
-
-            if (SmsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
-            }
-
-            if (SmsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
-            }
-
-            if (VoiceFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
-            }
-
-            if (VoiceFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
-            }
-
-            if (VoiceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
-            }
-
-            if (VoiceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// ReadSimOptions
+  /// </summary>
+  public class ReadSimOptions : ReadOptions<SimResource>
+  {
+    /// <summary>
+    /// The status
+    /// </summary>
+    public string Status { get; set; }
+    /// <summary>
+    /// The iccid
+    /// </summary>
+    public string Iccid { get; set; }
+    /// <summary>
+    /// The rate_plan
+    /// </summary>
+    public string RatePlan { get; set; }
+    /// <summary>
+    /// The e_id
+    /// </summary>
+    public string EId { get; set; }
+    /// <summary>
+    /// The sim_registration_code
+    /// </summary>
+    public string SimRegistrationCode { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status));
+      }
+
+      if (Iccid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Iccid", Iccid));
+      }
+
+      if (RatePlan != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RatePlan", RatePlan));
+      }
+
+      if (EId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EId", EId));
+      }
+
+      if (SimRegistrationCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SimRegistrationCode", SimRegistrationCode));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// UpdateSimOptions
+  /// </summary>
+  public class UpdateSimOptions : IOptions<SimResource>
+  {
+    /// <summary>
+    /// The sid
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The callback_method
+    /// </summary>
+    public string CallbackMethod { get; set; }
+    /// <summary>
+    /// The callback_url
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The rate_plan
+    /// </summary>
+    public string RatePlan { get; set; }
+    /// <summary>
+    /// The status
+    /// </summary>
+    public string Status { get; set; }
+    /// <summary>
+    /// The commands_callback_method
+    /// </summary>
+    public Twilio.Http.HttpMethod CommandsCallbackMethod { get; set; }
+    /// <summary>
+    /// The commands_callback_url
+    /// </summary>
+    public Uri CommandsCallbackUrl { get; set; }
+    /// <summary>
+    /// The sms_fallback_method
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
+    /// <summary>
+    /// The sms_fallback_url
+    /// </summary>
+    public Uri SmsFallbackUrl { get; set; }
+    /// <summary>
+    /// The sms_method
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsMethod { get; set; }
+    /// <summary>
+    /// The sms_url
+    /// </summary>
+    public Uri SmsUrl { get; set; }
+    /// <summary>
+    /// The voice_fallback_method
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
+    /// <summary>
+    /// The voice_fallback_url
+    /// </summary>
+    public Uri VoiceFallbackUrl { get; set; }
+    /// <summary>
+    /// The voice_method
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceMethod { get; set; }
+    /// <summary>
+    /// The voice_url
+    /// </summary>
+    public Uri VoiceUrl { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSimOptions
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    public UpdateSimOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (CallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (RatePlan != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RatePlan", RatePlan.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status));
+      }
+
+      if (CommandsCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommandsCallbackMethod", CommandsCallbackMethod.ToString()));
+      }
+
+      if (CommandsCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommandsCallbackUrl", Serializers.Url(CommandsCallbackUrl)));
+      }
+
+      if (SmsFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
+      }
+
+      if (SmsFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
+      }
+
+      if (SmsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
+      }
+
+      if (SmsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
+      }
+
+      if (VoiceFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
+      }
+
+      if (VoiceFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
+      }
+
+      if (VoiceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
+      }
+
+      if (VoiceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Preview/Wireless/SimResource.cs b/src/Twilio/Rest/Preview/Wireless/SimResource.cs
index 77830c863..83c6017d1 100644
--- a/src/Twilio/Rest/Preview/Wireless/SimResource.cs
+++ b/src/Twilio/Rest/Preview/Wireless/SimResource.cs
@@ -19,495 +19,495 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Preview.Wireless
-{
-
-    public class SimResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSimOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/wireless/Sims/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Fetch(FetchSimOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> FetchAsync(FetchSimOptions options,
-                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSimOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> FetchAsync(string pathSid,
-                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchSimOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSimOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Preview,
-                "/wireless/Sims",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static ResourceSet<SimResource> Read(ReadSimOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SimResource>.FromJson("sims", response.Content);
-            return new ResourceSet<SimResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SimResource>> ReadAsync(ReadSimOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SimResource>.FromJson("sims", response.Content);
-            return new ResourceSet<SimResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="status"> The status </param>
-        /// <param name="iccid"> The iccid </param>
-        /// <param name="ratePlan"> The rate_plan </param>
-        /// <param name="eId"> The e_id </param>
-        /// <param name="simRegistrationCode"> The sim_registration_code </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static ResourceSet<SimResource> Read(string status = null,
-                                                    string iccid = null,
-                                                    string ratePlan = null,
-                                                    string eId = null,
-                                                    string simRegistrationCode = null,
-                                                    int? pageSize = null,
-                                                    long? limit = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadSimOptions(){Status = status, Iccid = iccid, RatePlan = ratePlan, EId = eId, SimRegistrationCode = simRegistrationCode, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="status"> The status </param>
-        /// <param name="iccid"> The iccid </param>
-        /// <param name="ratePlan"> The rate_plan </param>
-        /// <param name="eId"> The e_id </param>
-        /// <param name="simRegistrationCode"> The sim_registration_code </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SimResource>> ReadAsync(string status = null,
-                                                                                            string iccid = null,
-                                                                                            string ratePlan = null,
-                                                                                            string eId = null,
-                                                                                            string simRegistrationCode = null,
-                                                                                            int? pageSize = null,
-                                                                                            long? limit = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadSimOptions(){Status = status, Iccid = iccid, RatePlan = ratePlan, EId = eId, SimRegistrationCode = simRegistrationCode, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SimResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SimResource>.FromJson("sims", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SimResource> NextPage(Page<SimResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SimResource>.FromJson("sims", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SimResource> PreviousPage(Page<SimResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Preview)
-            );
-
-            var response = client.Request(request);
-            return Page<SimResource>.FromJson("sims", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateSimOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Preview,
-                "/wireless/Sims/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Update(UpdateSimOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> UpdateAsync(UpdateSimOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="callbackMethod"> The callback_method </param>
-        /// <param name="callbackUrl"> The callback_url </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="ratePlan"> The rate_plan </param>
-        /// <param name="status"> The status </param>
-        /// <param name="commandsCallbackMethod"> The commands_callback_method </param>
-        /// <param name="commandsCallbackUrl"> The commands_callback_url </param>
-        /// <param name="smsFallbackMethod"> The sms_fallback_method </param>
-        /// <param name="smsFallbackUrl"> The sms_fallback_url </param>
-        /// <param name="smsMethod"> The sms_method </param>
-        /// <param name="smsUrl"> The sms_url </param>
-        /// <param name="voiceFallbackMethod"> The voice_fallback_method </param>
-        /// <param name="voiceFallbackUrl"> The voice_fallback_url </param>
-        /// <param name="voiceMethod"> The voice_method </param>
-        /// <param name="voiceUrl"> The voice_url </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Update(string pathSid,
-                                         string uniqueName = null,
-                                         string callbackMethod = null,
-                                         Uri callbackUrl = null,
-                                         string friendlyName = null,
-                                         string ratePlan = null,
-                                         string status = null,
-                                         Twilio.Http.HttpMethod commandsCallbackMethod = null,
-                                         Uri commandsCallbackUrl = null,
-                                         Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                         Uri smsFallbackUrl = null,
-                                         Twilio.Http.HttpMethod smsMethod = null,
-                                         Uri smsUrl = null,
-                                         Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                         Uri voiceFallbackUrl = null,
-                                         Twilio.Http.HttpMethod voiceMethod = null,
-                                         Uri voiceUrl = null,
-                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateSimOptions(pathSid){UniqueName = uniqueName, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, FriendlyName = friendlyName, RatePlan = ratePlan, Status = status, CommandsCallbackMethod = commandsCallbackMethod, CommandsCallbackUrl = commandsCallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The sid </param>
-        /// <param name="uniqueName"> The unique_name </param>
-        /// <param name="callbackMethod"> The callback_method </param>
-        /// <param name="callbackUrl"> The callback_url </param>
-        /// <param name="friendlyName"> The friendly_name </param>
-        /// <param name="ratePlan"> The rate_plan </param>
-        /// <param name="status"> The status </param>
-        /// <param name="commandsCallbackMethod"> The commands_callback_method </param>
-        /// <param name="commandsCallbackUrl"> The commands_callback_url </param>
-        /// <param name="smsFallbackMethod"> The sms_fallback_method </param>
-        /// <param name="smsFallbackUrl"> The sms_fallback_url </param>
-        /// <param name="smsMethod"> The sms_method </param>
-        /// <param name="smsUrl"> The sms_url </param>
-        /// <param name="voiceFallbackMethod"> The voice_fallback_method </param>
-        /// <param name="voiceFallbackUrl"> The voice_fallback_url </param>
-        /// <param name="voiceMethod"> The voice_method </param>
-        /// <param name="voiceUrl"> The voice_url </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> UpdateAsync(string pathSid,
-                                                                                 string uniqueName = null,
-                                                                                 string callbackMethod = null,
-                                                                                 Uri callbackUrl = null,
-                                                                                 string friendlyName = null,
-                                                                                 string ratePlan = null,
-                                                                                 string status = null,
-                                                                                 Twilio.Http.HttpMethod commandsCallbackMethod = null,
-                                                                                 Uri commandsCallbackUrl = null,
-                                                                                 Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                                                 Uri smsFallbackUrl = null,
-                                                                                 Twilio.Http.HttpMethod smsMethod = null,
-                                                                                 Uri smsUrl = null,
-                                                                                 Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                                                 Uri voiceFallbackUrl = null,
-                                                                                 Twilio.Http.HttpMethod voiceMethod = null,
-                                                                                 Uri voiceUrl = null,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateSimOptions(pathSid){UniqueName = uniqueName, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, FriendlyName = friendlyName, RatePlan = ratePlan, Status = status, CommandsCallbackMethod = commandsCallbackMethod, CommandsCallbackUrl = commandsCallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SimResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SimResource object represented by the provided JSON </returns>
-        public static SimResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SimResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique_name
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The account_sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The rate_plan_sid
-        /// </summary>
-        [JsonProperty("rate_plan_sid")]
-        public string RatePlanSid { get; private set; }
-        /// <summary>
-        /// The friendly_name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The iccid
-        /// </summary>
-        [JsonProperty("iccid")]
-        public string Iccid { get; private set; }
-        /// <summary>
-        /// The e_id
-        /// </summary>
-        [JsonProperty("e_id")]
-        public string EId { get; private set; }
-        /// <summary>
-        /// The status
-        /// </summary>
-        [JsonProperty("status")]
-        public string Status { get; private set; }
-        /// <summary>
-        /// The commands_callback_url
-        /// </summary>
-        [JsonProperty("commands_callback_url")]
-        public Uri CommandsCallbackUrl { get; private set; }
-        /// <summary>
-        /// The commands_callback_method
-        /// </summary>
-        [JsonProperty("commands_callback_method")]
-        public string CommandsCallbackMethod { get; private set; }
-        /// <summary>
-        /// The sms_fallback_method
-        /// </summary>
-        [JsonProperty("sms_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
-        /// <summary>
-        /// The sms_fallback_url
-        /// </summary>
-        [JsonProperty("sms_fallback_url")]
-        public Uri SmsFallbackUrl { get; private set; }
-        /// <summary>
-        /// The sms_method
-        /// </summary>
-        [JsonProperty("sms_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsMethod { get; private set; }
-        /// <summary>
-        /// The sms_url
-        /// </summary>
-        [JsonProperty("sms_url")]
-        public Uri SmsUrl { get; private set; }
-        /// <summary>
-        /// The voice_fallback_method
-        /// </summary>
-        [JsonProperty("voice_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
-        /// <summary>
-        /// The voice_fallback_url
-        /// </summary>
-        [JsonProperty("voice_fallback_url")]
-        public Uri VoiceFallbackUrl { get; private set; }
-        /// <summary>
-        /// The voice_method
-        /// </summary>
-        [JsonProperty("voice_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
-        /// <summary>
-        /// The voice_url
-        /// </summary>
-        [JsonProperty("voice_url")]
-        public Uri VoiceUrl { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date_updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private SimResource()
-        {
-
-        }
-    }
+{
+
+  public class SimResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSimOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/wireless/Sims/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Fetch(FetchSimOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> FetchAsync(FetchSimOptions options,
+                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSimOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> FetchAsync(string pathSid,
+                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchSimOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSimOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Preview,
+          "/wireless/Sims",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static ResourceSet<SimResource> Read(ReadSimOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SimResource>.FromJson("sims", response.Content);
+      return new ResourceSet<SimResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SimResource>> ReadAsync(ReadSimOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SimResource>.FromJson("sims", response.Content);
+      return new ResourceSet<SimResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="status"> The status </param>
+    /// <param name="iccid"> The iccid </param>
+    /// <param name="ratePlan"> The rate_plan </param>
+    /// <param name="eId"> The e_id </param>
+    /// <param name="simRegistrationCode"> The sim_registration_code </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static ResourceSet<SimResource> Read(string status = null,
+                                                string iccid = null,
+                                                string ratePlan = null,
+                                                string eId = null,
+                                                string simRegistrationCode = null,
+                                                int? pageSize = null,
+                                                long? limit = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadSimOptions() { Status = status, Iccid = iccid, RatePlan = ratePlan, EId = eId, SimRegistrationCode = simRegistrationCode, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="status"> The status </param>
+    /// <param name="iccid"> The iccid </param>
+    /// <param name="ratePlan"> The rate_plan </param>
+    /// <param name="eId"> The e_id </param>
+    /// <param name="simRegistrationCode"> The sim_registration_code </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SimResource>> ReadAsync(string status = null,
+                                                                                        string iccid = null,
+                                                                                        string ratePlan = null,
+                                                                                        string eId = null,
+                                                                                        string simRegistrationCode = null,
+                                                                                        int? pageSize = null,
+                                                                                        long? limit = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadSimOptions() { Status = status, Iccid = iccid, RatePlan = ratePlan, EId = eId, SimRegistrationCode = simRegistrationCode, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SimResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SimResource>.FromJson("sims", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SimResource> NextPage(Page<SimResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SimResource>.FromJson("sims", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SimResource> PreviousPage(Page<SimResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Preview)
+      );
+
+      var response = client.Request(request);
+      return Page<SimResource>.FromJson("sims", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateSimOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Preview,
+          "/wireless/Sims/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Update(UpdateSimOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> UpdateAsync(UpdateSimOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="callbackMethod"> The callback_method </param>
+    /// <param name="callbackUrl"> The callback_url </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="ratePlan"> The rate_plan </param>
+    /// <param name="status"> The status </param>
+    /// <param name="commandsCallbackMethod"> The commands_callback_method </param>
+    /// <param name="commandsCallbackUrl"> The commands_callback_url </param>
+    /// <param name="smsFallbackMethod"> The sms_fallback_method </param>
+    /// <param name="smsFallbackUrl"> The sms_fallback_url </param>
+    /// <param name="smsMethod"> The sms_method </param>
+    /// <param name="smsUrl"> The sms_url </param>
+    /// <param name="voiceFallbackMethod"> The voice_fallback_method </param>
+    /// <param name="voiceFallbackUrl"> The voice_fallback_url </param>
+    /// <param name="voiceMethod"> The voice_method </param>
+    /// <param name="voiceUrl"> The voice_url </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Update(string pathSid,
+                                     string uniqueName = null,
+                                     string callbackMethod = null,
+                                     Uri callbackUrl = null,
+                                     string friendlyName = null,
+                                     string ratePlan = null,
+                                     string status = null,
+                                     Twilio.Http.HttpMethod commandsCallbackMethod = null,
+                                     Uri commandsCallbackUrl = null,
+                                     Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                     Uri smsFallbackUrl = null,
+                                     Twilio.Http.HttpMethod smsMethod = null,
+                                     Uri smsUrl = null,
+                                     Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                     Uri voiceFallbackUrl = null,
+                                     Twilio.Http.HttpMethod voiceMethod = null,
+                                     Uri voiceUrl = null,
+                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateSimOptions(pathSid) { UniqueName = uniqueName, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, FriendlyName = friendlyName, RatePlan = ratePlan, Status = status, CommandsCallbackMethod = commandsCallbackMethod, CommandsCallbackUrl = commandsCallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The sid </param>
+    /// <param name="uniqueName"> The unique_name </param>
+    /// <param name="callbackMethod"> The callback_method </param>
+    /// <param name="callbackUrl"> The callback_url </param>
+    /// <param name="friendlyName"> The friendly_name </param>
+    /// <param name="ratePlan"> The rate_plan </param>
+    /// <param name="status"> The status </param>
+    /// <param name="commandsCallbackMethod"> The commands_callback_method </param>
+    /// <param name="commandsCallbackUrl"> The commands_callback_url </param>
+    /// <param name="smsFallbackMethod"> The sms_fallback_method </param>
+    /// <param name="smsFallbackUrl"> The sms_fallback_url </param>
+    /// <param name="smsMethod"> The sms_method </param>
+    /// <param name="smsUrl"> The sms_url </param>
+    /// <param name="voiceFallbackMethod"> The voice_fallback_method </param>
+    /// <param name="voiceFallbackUrl"> The voice_fallback_url </param>
+    /// <param name="voiceMethod"> The voice_method </param>
+    /// <param name="voiceUrl"> The voice_url </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> UpdateAsync(string pathSid,
+                                                                             string uniqueName = null,
+                                                                             string callbackMethod = null,
+                                                                             Uri callbackUrl = null,
+                                                                             string friendlyName = null,
+                                                                             string ratePlan = null,
+                                                                             string status = null,
+                                                                             Twilio.Http.HttpMethod commandsCallbackMethod = null,
+                                                                             Uri commandsCallbackUrl = null,
+                                                                             Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                                             Uri smsFallbackUrl = null,
+                                                                             Twilio.Http.HttpMethod smsMethod = null,
+                                                                             Uri smsUrl = null,
+                                                                             Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                                             Uri voiceFallbackUrl = null,
+                                                                             Twilio.Http.HttpMethod voiceMethod = null,
+                                                                             Uri voiceUrl = null,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateSimOptions(pathSid) { UniqueName = uniqueName, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, FriendlyName = friendlyName, RatePlan = ratePlan, Status = status, CommandsCallbackMethod = commandsCallbackMethod, CommandsCallbackUrl = commandsCallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SimResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SimResource object represented by the provided JSON </returns>
+    public static SimResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SimResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique_name
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The account_sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The rate_plan_sid
+    /// </summary>
+    [JsonProperty("rate_plan_sid")]
+    public string RatePlanSid { get; private set; }
+    /// <summary>
+    /// The friendly_name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The iccid
+    /// </summary>
+    [JsonProperty("iccid")]
+    public string Iccid { get; private set; }
+    /// <summary>
+    /// The e_id
+    /// </summary>
+    [JsonProperty("e_id")]
+    public string EId { get; private set; }
+    /// <summary>
+    /// The status
+    /// </summary>
+    [JsonProperty("status")]
+    public string Status { get; private set; }
+    /// <summary>
+    /// The commands_callback_url
+    /// </summary>
+    [JsonProperty("commands_callback_url")]
+    public Uri CommandsCallbackUrl { get; private set; }
+    /// <summary>
+    /// The commands_callback_method
+    /// </summary>
+    [JsonProperty("commands_callback_method")]
+    public string CommandsCallbackMethod { get; private set; }
+    /// <summary>
+    /// The sms_fallback_method
+    /// </summary>
+    [JsonProperty("sms_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
+    /// <summary>
+    /// The sms_fallback_url
+    /// </summary>
+    [JsonProperty("sms_fallback_url")]
+    public Uri SmsFallbackUrl { get; private set; }
+    /// <summary>
+    /// The sms_method
+    /// </summary>
+    [JsonProperty("sms_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsMethod { get; private set; }
+    /// <summary>
+    /// The sms_url
+    /// </summary>
+    [JsonProperty("sms_url")]
+    public Uri SmsUrl { get; private set; }
+    /// <summary>
+    /// The voice_fallback_method
+    /// </summary>
+    [JsonProperty("voice_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
+    /// <summary>
+    /// The voice_fallback_url
+    /// </summary>
+    [JsonProperty("voice_fallback_url")]
+    public Uri VoiceFallbackUrl { get; private set; }
+    /// <summary>
+    /// The voice_method
+    /// </summary>
+    [JsonProperty("voice_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
+    /// <summary>
+    /// The voice_url
+    /// </summary>
+    [JsonProperty("voice_url")]
+    public Uri VoiceUrl { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date_updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private SimResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V1/Messaging/CountryOptions.cs b/src/Twilio/Rest/Pricing/V1/Messaging/CountryOptions.cs
index f35548935..765a37423 100644
--- a/src/Twilio/Rest/Pricing/V1/Messaging/CountryOptions.cs
+++ b/src/Twilio/Rest/Pricing/V1/Messaging/CountryOptions.cs
@@ -9,55 +9,55 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Pricing.V1.Messaging
-{
-
+{
+
+  /// <summary>
+  /// ReadCountryOptions
+  /// </summary>
+  public class ReadCountryOptions : ReadOptions<CountryResource>
+  {
     /// <summary>
-    /// ReadCountryOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadCountryOptions : ReadOptions<CountryResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchCountryOptions
+  /// </summary>
+  public class FetchCountryOptions : IOptions<CountryResource>
+  {
     /// <summary>
-    /// FetchCountryOptions
+    /// The ISO country code
     /// </summary>
-    public class FetchCountryOptions : IOptions<CountryResource>
-    {
-        /// <summary>
-        /// The ISO country code
-        /// </summary>
-        public string PathIsoCountry { get; }
-
-        /// <summary>
-        /// Construct a new FetchCountryOptions
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code </param>
-        public FetchCountryOptions(string pathIsoCountry)
-        {
-            PathIsoCountry = pathIsoCountry;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathIsoCountry { get; }
+
+    /// <summary>
+    /// Construct a new FetchCountryOptions
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code </param>
+    public FetchCountryOptions(string pathIsoCountry)
+    {
+      PathIsoCountry = pathIsoCountry;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V1/Messaging/CountryResource.cs b/src/Twilio/Rest/Pricing/V1/Messaging/CountryResource.cs
index d2232e1ef..350b78dbe 100644
--- a/src/Twilio/Rest/Pricing/V1/Messaging/CountryResource.cs
+++ b/src/Twilio/Rest/Pricing/V1/Messaging/CountryResource.cs
@@ -17,259 +17,259 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Pricing.V1.Messaging
-{
-
-    public class CountryResource : Resource
-    {
-        private static Request BuildReadRequest(ReadCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Pricing,
-                "/v1/Messaging/Countries",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static ResourceSet<CountryResource> Read(ReadCountryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CountryResource>.FromJson("countries", response.Content);
-            return new ResourceSet<CountryResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(ReadCountryOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CountryResource>.FromJson("countries", response.Content);
-            return new ResourceSet<CountryResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static ResourceSet<CountryResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadCountryOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadCountryOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CountryResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CountryResource> NextPage(Page<CountryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Pricing)
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CountryResource> PreviousPage(Page<CountryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Pricing)
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Pricing,
-                "/v1/Messaging/Countries/" + options.PathIsoCountry + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static CountryResource Fetch(FetchCountryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(FetchCountryOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static CountryResource Fetch(string pathIsoCountry, ITwilioRestClient client = null)
-        {
-            var options = new FetchCountryOptions(pathIsoCountry);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(string pathIsoCountry,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchCountryOptions(pathIsoCountry);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CountryResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CountryResource object represented by the provided JSON </returns>
-        public static CountryResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CountryResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The name of the country
-        /// </summary>
-        [JsonProperty("country")]
-        public string Country { get; private set; }
-        /// <summary>
-        /// The ISO country code
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The list of OutboundSMSPrice records
-        /// </summary>
-        [JsonProperty("outbound_sms_prices")]
-        public List<OutboundSmsPrice> OutboundSmsPrices { get; private set; }
-        /// <summary>
-        /// The list of InboundPrice records
-        /// </summary>
-        [JsonProperty("inbound_sms_prices")]
-        public List<InboundSmsPrice> InboundSmsPrices { get; private set; }
-        /// <summary>
-        /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CountryResource()
-        {
-
-        }
-    }
+{
+
+  public class CountryResource : Resource
+  {
+    private static Request BuildReadRequest(ReadCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Pricing,
+          "/v1/Messaging/Countries",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static ResourceSet<CountryResource> Read(ReadCountryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CountryResource>.FromJson("countries", response.Content);
+      return new ResourceSet<CountryResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(ReadCountryOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CountryResource>.FromJson("countries", response.Content);
+      return new ResourceSet<CountryResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static ResourceSet<CountryResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadCountryOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadCountryOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CountryResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CountryResource> NextPage(Page<CountryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Pricing)
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CountryResource> PreviousPage(Page<CountryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Pricing)
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Pricing,
+          "/v1/Messaging/Countries/" + options.PathIsoCountry + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static CountryResource Fetch(FetchCountryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(FetchCountryOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static CountryResource Fetch(string pathIsoCountry, ITwilioRestClient client = null)
+    {
+      var options = new FetchCountryOptions(pathIsoCountry);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(string pathIsoCountry,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchCountryOptions(pathIsoCountry);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CountryResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CountryResource object represented by the provided JSON </returns>
+    public static CountryResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CountryResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The name of the country
+    /// </summary>
+    [JsonProperty("country")]
+    public string Country { get; private set; }
+    /// <summary>
+    /// The ISO country code
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The list of OutboundSMSPrice records
+    /// </summary>
+    [JsonProperty("outbound_sms_prices")]
+    public List<OutboundSmsPrice> OutboundSmsPrices { get; private set; }
+    /// <summary>
+    /// The list of InboundPrice records
+    /// </summary>
+    [JsonProperty("inbound_sms_prices")]
+    public List<InboundSmsPrice> InboundSmsPrices { get; private set; }
+    /// <summary>
+    /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CountryResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V1/PhoneNumber/CountryOptions.cs b/src/Twilio/Rest/Pricing/V1/PhoneNumber/CountryOptions.cs
index c5d6c4efb..ee5999868 100644
--- a/src/Twilio/Rest/Pricing/V1/PhoneNumber/CountryOptions.cs
+++ b/src/Twilio/Rest/Pricing/V1/PhoneNumber/CountryOptions.cs
@@ -9,55 +9,55 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Pricing.V1.PhoneNumber
-{
-
+{
+
+  /// <summary>
+  /// ReadCountryOptions
+  /// </summary>
+  public class ReadCountryOptions : ReadOptions<CountryResource>
+  {
     /// <summary>
-    /// ReadCountryOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadCountryOptions : ReadOptions<CountryResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchCountryOptions
+  /// </summary>
+  public class FetchCountryOptions : IOptions<CountryResource>
+  {
     /// <summary>
-    /// FetchCountryOptions
+    /// The ISO country code
     /// </summary>
-    public class FetchCountryOptions : IOptions<CountryResource>
-    {
-        /// <summary>
-        /// The ISO country code
-        /// </summary>
-        public string PathIsoCountry { get; }
-
-        /// <summary>
-        /// Construct a new FetchCountryOptions
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code </param>
-        public FetchCountryOptions(string pathIsoCountry)
-        {
-            PathIsoCountry = pathIsoCountry;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathIsoCountry { get; }
+
+    /// <summary>
+    /// Construct a new FetchCountryOptions
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code </param>
+    public FetchCountryOptions(string pathIsoCountry)
+    {
+      PathIsoCountry = pathIsoCountry;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V1/PhoneNumber/CountryResource.cs b/src/Twilio/Rest/Pricing/V1/PhoneNumber/CountryResource.cs
index 87b7677e5..f5001179d 100644
--- a/src/Twilio/Rest/Pricing/V1/PhoneNumber/CountryResource.cs
+++ b/src/Twilio/Rest/Pricing/V1/PhoneNumber/CountryResource.cs
@@ -17,254 +17,254 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Pricing.V1.PhoneNumber
-{
-
-    public class CountryResource : Resource
-    {
-        private static Request BuildReadRequest(ReadCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Pricing,
-                "/v1/PhoneNumbers/Countries",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static ResourceSet<CountryResource> Read(ReadCountryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CountryResource>.FromJson("countries", response.Content);
-            return new ResourceSet<CountryResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(ReadCountryOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CountryResource>.FromJson("countries", response.Content);
-            return new ResourceSet<CountryResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static ResourceSet<CountryResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadCountryOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadCountryOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CountryResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CountryResource> NextPage(Page<CountryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Pricing)
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CountryResource> PreviousPage(Page<CountryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Pricing)
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Pricing,
-                "/v1/PhoneNumbers/Countries/" + options.PathIsoCountry + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static CountryResource Fetch(FetchCountryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(FetchCountryOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static CountryResource Fetch(string pathIsoCountry, ITwilioRestClient client = null)
-        {
-            var options = new FetchCountryOptions(pathIsoCountry);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(string pathIsoCountry,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchCountryOptions(pathIsoCountry);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CountryResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CountryResource object represented by the provided JSON </returns>
-        public static CountryResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CountryResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The name of the country
-        /// </summary>
-        [JsonProperty("country")]
-        public string Country { get; private set; }
-        /// <summary>
-        /// The ISO country code
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The list of PhoneNumberPrices records
-        /// </summary>
-        [JsonProperty("phone_number_prices")]
-        public List<PhoneNumberPrice> PhoneNumberPrices { get; private set; }
-        /// <summary>
-        /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CountryResource()
-        {
-
-        }
-    }
+{
+
+  public class CountryResource : Resource
+  {
+    private static Request BuildReadRequest(ReadCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Pricing,
+          "/v1/PhoneNumbers/Countries",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static ResourceSet<CountryResource> Read(ReadCountryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CountryResource>.FromJson("countries", response.Content);
+      return new ResourceSet<CountryResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(ReadCountryOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CountryResource>.FromJson("countries", response.Content);
+      return new ResourceSet<CountryResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static ResourceSet<CountryResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadCountryOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadCountryOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CountryResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CountryResource> NextPage(Page<CountryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Pricing)
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CountryResource> PreviousPage(Page<CountryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Pricing)
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Pricing,
+          "/v1/PhoneNumbers/Countries/" + options.PathIsoCountry + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static CountryResource Fetch(FetchCountryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(FetchCountryOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static CountryResource Fetch(string pathIsoCountry, ITwilioRestClient client = null)
+    {
+      var options = new FetchCountryOptions(pathIsoCountry);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(string pathIsoCountry,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchCountryOptions(pathIsoCountry);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CountryResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CountryResource object represented by the provided JSON </returns>
+    public static CountryResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CountryResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The name of the country
+    /// </summary>
+    [JsonProperty("country")]
+    public string Country { get; private set; }
+    /// <summary>
+    /// The ISO country code
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The list of PhoneNumberPrices records
+    /// </summary>
+    [JsonProperty("phone_number_prices")]
+    public List<PhoneNumberPrice> PhoneNumberPrices { get; private set; }
+    /// <summary>
+    /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CountryResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V1/Voice/CountryOptions.cs b/src/Twilio/Rest/Pricing/V1/Voice/CountryOptions.cs
index afb84447b..d1a0c6995 100644
--- a/src/Twilio/Rest/Pricing/V1/Voice/CountryOptions.cs
+++ b/src/Twilio/Rest/Pricing/V1/Voice/CountryOptions.cs
@@ -9,55 +9,55 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Pricing.V1.Voice
-{
-
+{
+
+  /// <summary>
+  /// ReadCountryOptions
+  /// </summary>
+  public class ReadCountryOptions : ReadOptions<CountryResource>
+  {
     /// <summary>
-    /// ReadCountryOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadCountryOptions : ReadOptions<CountryResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchCountryOptions
+  /// </summary>
+  public class FetchCountryOptions : IOptions<CountryResource>
+  {
     /// <summary>
-    /// FetchCountryOptions
+    /// The ISO country code
     /// </summary>
-    public class FetchCountryOptions : IOptions<CountryResource>
-    {
-        /// <summary>
-        /// The ISO country code
-        /// </summary>
-        public string PathIsoCountry { get; }
-
-        /// <summary>
-        /// Construct a new FetchCountryOptions
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code </param>
-        public FetchCountryOptions(string pathIsoCountry)
-        {
-            PathIsoCountry = pathIsoCountry;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathIsoCountry { get; }
+
+    /// <summary>
+    /// Construct a new FetchCountryOptions
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code </param>
+    public FetchCountryOptions(string pathIsoCountry)
+    {
+      PathIsoCountry = pathIsoCountry;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V1/Voice/CountryResource.cs b/src/Twilio/Rest/Pricing/V1/Voice/CountryResource.cs
index 13c3299dd..b90ea7a01 100644
--- a/src/Twilio/Rest/Pricing/V1/Voice/CountryResource.cs
+++ b/src/Twilio/Rest/Pricing/V1/Voice/CountryResource.cs
@@ -17,259 +17,259 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Pricing.V1.Voice
-{
-
-    public class CountryResource : Resource
-    {
-        private static Request BuildReadRequest(ReadCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Pricing,
-                "/v1/Voice/Countries",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static ResourceSet<CountryResource> Read(ReadCountryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CountryResource>.FromJson("countries", response.Content);
-            return new ResourceSet<CountryResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(ReadCountryOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CountryResource>.FromJson("countries", response.Content);
-            return new ResourceSet<CountryResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static ResourceSet<CountryResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadCountryOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadCountryOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CountryResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CountryResource> NextPage(Page<CountryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Pricing)
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CountryResource> PreviousPage(Page<CountryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Pricing)
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Pricing,
-                "/v1/Voice/Countries/" + options.PathIsoCountry + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static CountryResource Fetch(FetchCountryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(FetchCountryOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static CountryResource Fetch(string pathIsoCountry, ITwilioRestClient client = null)
-        {
-            var options = new FetchCountryOptions(pathIsoCountry);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(string pathIsoCountry,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchCountryOptions(pathIsoCountry);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CountryResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CountryResource object represented by the provided JSON </returns>
-        public static CountryResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CountryResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The name of the country
-        /// </summary>
-        [JsonProperty("country")]
-        public string Country { get; private set; }
-        /// <summary>
-        /// The ISO country code
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The list of OutboundPrefixPrice records
-        /// </summary>
-        [JsonProperty("outbound_prefix_prices")]
-        public List<OutboundPrefixPrice> OutboundPrefixPrices { get; private set; }
-        /// <summary>
-        /// The list of InboundCallPrice records
-        /// </summary>
-        [JsonProperty("inbound_call_prices")]
-        public List<InboundCallPrice> InboundCallPrices { get; private set; }
-        /// <summary>
-        /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CountryResource()
-        {
-
-        }
-    }
+{
+
+  public class CountryResource : Resource
+  {
+    private static Request BuildReadRequest(ReadCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Pricing,
+          "/v1/Voice/Countries",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static ResourceSet<CountryResource> Read(ReadCountryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CountryResource>.FromJson("countries", response.Content);
+      return new ResourceSet<CountryResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(ReadCountryOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CountryResource>.FromJson("countries", response.Content);
+      return new ResourceSet<CountryResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static ResourceSet<CountryResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadCountryOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadCountryOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CountryResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CountryResource> NextPage(Page<CountryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Pricing)
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CountryResource> PreviousPage(Page<CountryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Pricing)
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Pricing,
+          "/v1/Voice/Countries/" + options.PathIsoCountry + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static CountryResource Fetch(FetchCountryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(FetchCountryOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static CountryResource Fetch(string pathIsoCountry, ITwilioRestClient client = null)
+    {
+      var options = new FetchCountryOptions(pathIsoCountry);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(string pathIsoCountry,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchCountryOptions(pathIsoCountry);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CountryResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CountryResource object represented by the provided JSON </returns>
+    public static CountryResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CountryResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The name of the country
+    /// </summary>
+    [JsonProperty("country")]
+    public string Country { get; private set; }
+    /// <summary>
+    /// The ISO country code
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The list of OutboundPrefixPrice records
+    /// </summary>
+    [JsonProperty("outbound_prefix_prices")]
+    public List<OutboundPrefixPrice> OutboundPrefixPrices { get; private set; }
+    /// <summary>
+    /// The list of InboundCallPrice records
+    /// </summary>
+    [JsonProperty("inbound_call_prices")]
+    public List<InboundCallPrice> InboundCallPrices { get; private set; }
+    /// <summary>
+    /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CountryResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V1/Voice/NumberOptions.cs b/src/Twilio/Rest/Pricing/V1/Voice/NumberOptions.cs
index 4306a859e..ab5627655 100644
--- a/src/Twilio/Rest/Pricing/V1/Voice/NumberOptions.cs
+++ b/src/Twilio/Rest/Pricing/V1/Voice/NumberOptions.cs
@@ -9,35 +9,35 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Pricing.V1.Voice
-{
-
+{
+
+  /// <summary>
+  /// FetchNumberOptions
+  /// </summary>
+  public class FetchNumberOptions : IOptions<NumberResource>
+  {
     /// <summary>
-    /// FetchNumberOptions
+    /// The phone number to fetch
     /// </summary>
-    public class FetchNumberOptions : IOptions<NumberResource>
-    {
-        /// <summary>
-        /// The phone number to fetch
-        /// </summary>
-        public Types.PhoneNumber PathNumber { get; }
-
-        /// <summary>
-        /// Construct a new FetchNumberOptions
-        /// </summary>
-        /// <param name="pathNumber"> The phone number to fetch </param>
-        public FetchNumberOptions(Types.PhoneNumber pathNumber)
-        {
-            PathNumber = pathNumber;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public Types.PhoneNumber PathNumber { get; }
+
+    /// <summary>
+    /// Construct a new FetchNumberOptions
+    /// </summary>
+    /// <param name="pathNumber"> The phone number to fetch </param>
+    public FetchNumberOptions(Types.PhoneNumber pathNumber)
+    {
+      PathNumber = pathNumber;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V1/Voice/NumberResource.cs b/src/Twilio/Rest/Pricing/V1/Voice/NumberResource.cs
index 6cfb54b30..3ca6ca8d1 100644
--- a/src/Twilio/Rest/Pricing/V1/Voice/NumberResource.cs
+++ b/src/Twilio/Rest/Pricing/V1/Voice/NumberResource.cs
@@ -17,136 +17,136 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Pricing.V1.Voice
-{
-
-    public class NumberResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Pricing,
-                "/v1/Voice/Numbers/" + options.PathNumber + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Number parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Number </returns>
-        public static NumberResource Fetch(FetchNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Number parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Number </returns>
-        public static async System.Threading.Tasks.Task<NumberResource> FetchAsync(FetchNumberOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathNumber"> The phone number to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Number </returns>
-        public static NumberResource Fetch(Types.PhoneNumber pathNumber, ITwilioRestClient client = null)
-        {
-            var options = new FetchNumberOptions(pathNumber);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathNumber"> The phone number to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Number </returns>
-        public static async System.Threading.Tasks.Task<NumberResource> FetchAsync(Types.PhoneNumber pathNumber,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchNumberOptions(pathNumber);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a NumberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NumberResource object represented by the provided JSON </returns>
-        public static NumberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NumberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The phone number
-        /// </summary>
-        [JsonProperty("number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber Number { get; private set; }
-        /// <summary>
-        /// The name of the country
-        /// </summary>
-        [JsonProperty("country")]
-        public string Country { get; private set; }
-        /// <summary>
-        /// The ISO country code
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The OutboundCallPrice record
-        /// </summary>
-        [JsonProperty("outbound_call_price")]
-        public OutboundCallPrice OutboundCallPrice { get; private set; }
-        /// <summary>
-        /// The InboundCallPrice record
-        /// </summary>
-        [JsonProperty("inbound_call_price")]
-        public InboundCallPrice InboundCallPrice { get; private set; }
-        /// <summary>
-        /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private NumberResource()
-        {
-
-        }
-    }
+{
+
+  public class NumberResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Pricing,
+          "/v1/Voice/Numbers/" + options.PathNumber + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Number parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Number </returns>
+    public static NumberResource Fetch(FetchNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Number parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Number </returns>
+    public static async System.Threading.Tasks.Task<NumberResource> FetchAsync(FetchNumberOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathNumber"> The phone number to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Number </returns>
+    public static NumberResource Fetch(Types.PhoneNumber pathNumber, ITwilioRestClient client = null)
+    {
+      var options = new FetchNumberOptions(pathNumber);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathNumber"> The phone number to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Number </returns>
+    public static async System.Threading.Tasks.Task<NumberResource> FetchAsync(Types.PhoneNumber pathNumber,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchNumberOptions(pathNumber);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a NumberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NumberResource object represented by the provided JSON </returns>
+    public static NumberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NumberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The phone number
+    /// </summary>
+    [JsonProperty("number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber Number { get; private set; }
+    /// <summary>
+    /// The name of the country
+    /// </summary>
+    [JsonProperty("country")]
+    public string Country { get; private set; }
+    /// <summary>
+    /// The ISO country code
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The OutboundCallPrice record
+    /// </summary>
+    [JsonProperty("outbound_call_price")]
+    public OutboundCallPrice OutboundCallPrice { get; private set; }
+    /// <summary>
+    /// The InboundCallPrice record
+    /// </summary>
+    [JsonProperty("inbound_call_price")]
+    public InboundCallPrice InboundCallPrice { get; private set; }
+    /// <summary>
+    /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private NumberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V2/CountryOptions.cs b/src/Twilio/Rest/Pricing/V2/CountryOptions.cs
index ab659f06a..f71222481 100644
--- a/src/Twilio/Rest/Pricing/V2/CountryOptions.cs
+++ b/src/Twilio/Rest/Pricing/V2/CountryOptions.cs
@@ -9,55 +9,55 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Pricing.V2
-{
-
+{
+
+  /// <summary>
+  /// ReadCountryOptions
+  /// </summary>
+  public class ReadCountryOptions : ReadOptions<CountryResource>
+  {
     /// <summary>
-    /// ReadCountryOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadCountryOptions : ReadOptions<CountryResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific Country.
+  /// </summary>
+  public class FetchCountryOptions : IOptions<CountryResource>
+  {
     /// <summary>
-    /// Fetch a specific Country.
+    /// The ISO country code of the pricing information to fetch
     /// </summary>
-    public class FetchCountryOptions : IOptions<CountryResource>
-    {
-        /// <summary>
-        /// The ISO country code of the pricing information to fetch
-        /// </summary>
-        public string PathIsoCountry { get; }
-
-        /// <summary>
-        /// Construct a new FetchCountryOptions
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code of the pricing information to fetch </param>
-        public FetchCountryOptions(string pathIsoCountry)
-        {
-            PathIsoCountry = pathIsoCountry;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathIsoCountry { get; }
+
+    /// <summary>
+    /// Construct a new FetchCountryOptions
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code of the pricing information to fetch </param>
+    public FetchCountryOptions(string pathIsoCountry)
+    {
+      PathIsoCountry = pathIsoCountry;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V2/CountryResource.cs b/src/Twilio/Rest/Pricing/V2/CountryResource.cs
index e71d80be9..1beb33c72 100644
--- a/src/Twilio/Rest/Pricing/V2/CountryResource.cs
+++ b/src/Twilio/Rest/Pricing/V2/CountryResource.cs
@@ -17,259 +17,259 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Pricing.V2
-{
-
-    public class CountryResource : Resource
-    {
-        private static Request BuildReadRequest(ReadCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Pricing,
-                "/v2/Trunking/Countries",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static ResourceSet<CountryResource> Read(ReadCountryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CountryResource>.FromJson("countries", response.Content);
-            return new ResourceSet<CountryResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(ReadCountryOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CountryResource>.FromJson("countries", response.Content);
-            return new ResourceSet<CountryResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static ResourceSet<CountryResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadCountryOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadCountryOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CountryResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CountryResource> NextPage(Page<CountryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Pricing)
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CountryResource> PreviousPage(Page<CountryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Pricing)
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Pricing,
-                "/v2/Trunking/Countries/" + options.PathIsoCountry + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Country.
-        /// </summary>
-        /// <param name="options"> Fetch Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static CountryResource Fetch(FetchCountryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Country.
-        /// </summary>
-        /// <param name="options"> Fetch Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(FetchCountryOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Country.
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code of the pricing information to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static CountryResource Fetch(string pathIsoCountry, ITwilioRestClient client = null)
-        {
-            var options = new FetchCountryOptions(pathIsoCountry);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Country.
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code of the pricing information to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(string pathIsoCountry,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchCountryOptions(pathIsoCountry);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CountryResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CountryResource object represented by the provided JSON </returns>
-        public static CountryResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CountryResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The name of the country
-        /// </summary>
-        [JsonProperty("country")]
-        public string Country { get; private set; }
-        /// <summary>
-        /// The ISO country code
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The list of TerminatingPrefixPrice records
-        /// </summary>
-        [JsonProperty("terminating_prefix_prices")]
-        public List<OutboundPrefixPriceWithOrigin> TerminatingPrefixPrices { get; private set; }
-        /// <summary>
-        /// The list of OriginatingCallPrice records
-        /// </summary>
-        [JsonProperty("originating_call_prices")]
-        public List<InboundCallPrice> OriginatingCallPrices { get; private set; }
-        /// <summary>
-        /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CountryResource()
-        {
-
-        }
-    }
+{
+
+  public class CountryResource : Resource
+  {
+    private static Request BuildReadRequest(ReadCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Pricing,
+          "/v2/Trunking/Countries",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static ResourceSet<CountryResource> Read(ReadCountryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CountryResource>.FromJson("countries", response.Content);
+      return new ResourceSet<CountryResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(ReadCountryOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CountryResource>.FromJson("countries", response.Content);
+      return new ResourceSet<CountryResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static ResourceSet<CountryResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadCountryOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadCountryOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CountryResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CountryResource> NextPage(Page<CountryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Pricing)
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CountryResource> PreviousPage(Page<CountryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Pricing)
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Pricing,
+          "/v2/Trunking/Countries/" + options.PathIsoCountry + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Country.
+    /// </summary>
+    /// <param name="options"> Fetch Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static CountryResource Fetch(FetchCountryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Country.
+    /// </summary>
+    /// <param name="options"> Fetch Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(FetchCountryOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Country.
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code of the pricing information to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static CountryResource Fetch(string pathIsoCountry, ITwilioRestClient client = null)
+    {
+      var options = new FetchCountryOptions(pathIsoCountry);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Country.
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code of the pricing information to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(string pathIsoCountry,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchCountryOptions(pathIsoCountry);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CountryResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CountryResource object represented by the provided JSON </returns>
+    public static CountryResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CountryResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The name of the country
+    /// </summary>
+    [JsonProperty("country")]
+    public string Country { get; private set; }
+    /// <summary>
+    /// The ISO country code
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The list of TerminatingPrefixPrice records
+    /// </summary>
+    [JsonProperty("terminating_prefix_prices")]
+    public List<OutboundPrefixPriceWithOrigin> TerminatingPrefixPrices { get; private set; }
+    /// <summary>
+    /// The list of OriginatingCallPrice records
+    /// </summary>
+    [JsonProperty("originating_call_prices")]
+    public List<InboundCallPrice> OriginatingCallPrices { get; private set; }
+    /// <summary>
+    /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CountryResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V2/NumberOptions.cs b/src/Twilio/Rest/Pricing/V2/NumberOptions.cs
index 6a352f188..3c5660f9e 100644
--- a/src/Twilio/Rest/Pricing/V2/NumberOptions.cs
+++ b/src/Twilio/Rest/Pricing/V2/NumberOptions.cs
@@ -9,44 +9,44 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Pricing.V2
-{
-
+{
+
+  /// <summary>
+  /// Fetch pricing information for a specific destination and, optionally, origination phone number.
+  /// </summary>
+  public class FetchNumberOptions : IOptions<NumberResource>
+  {
     /// <summary>
-    /// Fetch pricing information for a specific destination and, optionally, origination phone number.
+    /// The destination number for which to fetch pricing information
     /// </summary>
-    public class FetchNumberOptions : IOptions<NumberResource>
-    {
-        /// <summary>
-        /// The destination number for which to fetch pricing information
-        /// </summary>
-        public Types.PhoneNumber PathDestinationNumber { get; }
-        /// <summary>
-        /// The origination number for which to fetch pricing information
-        /// </summary>
-        public Types.PhoneNumber OriginationNumber { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchNumberOptions
-        /// </summary>
-        /// <param name="pathDestinationNumber"> The destination number for which to fetch pricing information </param>
-        public FetchNumberOptions(Types.PhoneNumber pathDestinationNumber)
-        {
-            PathDestinationNumber = pathDestinationNumber;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (OriginationNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("OriginationNumber", OriginationNumber.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public Types.PhoneNumber PathDestinationNumber { get; }
+    /// <summary>
+    /// The origination number for which to fetch pricing information
+    /// </summary>
+    public Types.PhoneNumber OriginationNumber { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchNumberOptions
+    /// </summary>
+    /// <param name="pathDestinationNumber"> The destination number for which to fetch pricing information </param>
+    public FetchNumberOptions(Types.PhoneNumber pathDestinationNumber)
+    {
+      PathDestinationNumber = pathDestinationNumber;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (OriginationNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("OriginationNumber", OriginationNumber.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V2/NumberResource.cs b/src/Twilio/Rest/Pricing/V2/NumberResource.cs
index b47dd5464..0972ba8af 100644
--- a/src/Twilio/Rest/Pricing/V2/NumberResource.cs
+++ b/src/Twilio/Rest/Pricing/V2/NumberResource.cs
@@ -17,147 +17,147 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Pricing.V2
-{
-
-    public class NumberResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Pricing,
-                "/v2/Trunking/Numbers/" + options.PathDestinationNumber + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch pricing information for a specific destination and, optionally, origination phone number.
-        /// </summary>
-        /// <param name="options"> Fetch Number parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Number </returns>
-        public static NumberResource Fetch(FetchNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch pricing information for a specific destination and, optionally, origination phone number.
-        /// </summary>
-        /// <param name="options"> Fetch Number parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Number </returns>
-        public static async System.Threading.Tasks.Task<NumberResource> FetchAsync(FetchNumberOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch pricing information for a specific destination and, optionally, origination phone number.
-        /// </summary>
-        /// <param name="pathDestinationNumber"> The destination number for which to fetch pricing information </param>
-        /// <param name="originationNumber"> The origination number for which to fetch pricing information </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Number </returns>
-        public static NumberResource Fetch(Types.PhoneNumber pathDestinationNumber,
-                                           Types.PhoneNumber originationNumber = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchNumberOptions(pathDestinationNumber){OriginationNumber = originationNumber};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch pricing information for a specific destination and, optionally, origination phone number.
-        /// </summary>
-        /// <param name="pathDestinationNumber"> The destination number for which to fetch pricing information </param>
-        /// <param name="originationNumber"> The origination number for which to fetch pricing information </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Number </returns>
-        public static async System.Threading.Tasks.Task<NumberResource> FetchAsync(Types.PhoneNumber pathDestinationNumber,
-                                                                                   Types.PhoneNumber originationNumber = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchNumberOptions(pathDestinationNumber){OriginationNumber = originationNumber};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a NumberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NumberResource object represented by the provided JSON </returns>
-        public static NumberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NumberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The destination phone number, in E.164 format
-        /// </summary>
-        [JsonProperty("destination_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber DestinationNumber { get; private set; }
-        /// <summary>
-        /// The origination phone number, in E.164 format
-        /// </summary>
-        [JsonProperty("origination_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber OriginationNumber { get; private set; }
-        /// <summary>
-        /// The name of the country
-        /// </summary>
-        [JsonProperty("country")]
-        public string Country { get; private set; }
-        /// <summary>
-        /// The ISO country code
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The terminating_prefix_prices
-        /// </summary>
-        [JsonProperty("terminating_prefix_prices")]
-        public List<OutboundPrefixPriceWithOrigin> TerminatingPrefixPrices { get; private set; }
-        /// <summary>
-        /// The OriginatingCallPrice record
-        /// </summary>
-        [JsonProperty("originating_call_price")]
-        public InboundCallPrice OriginatingCallPrice { get; private set; }
-        /// <summary>
-        /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private NumberResource()
-        {
-
-        }
-    }
+{
+
+  public class NumberResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Pricing,
+          "/v2/Trunking/Numbers/" + options.PathDestinationNumber + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch pricing information for a specific destination and, optionally, origination phone number.
+    /// </summary>
+    /// <param name="options"> Fetch Number parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Number </returns>
+    public static NumberResource Fetch(FetchNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch pricing information for a specific destination and, optionally, origination phone number.
+    /// </summary>
+    /// <param name="options"> Fetch Number parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Number </returns>
+    public static async System.Threading.Tasks.Task<NumberResource> FetchAsync(FetchNumberOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch pricing information for a specific destination and, optionally, origination phone number.
+    /// </summary>
+    /// <param name="pathDestinationNumber"> The destination number for which to fetch pricing information </param>
+    /// <param name="originationNumber"> The origination number for which to fetch pricing information </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Number </returns>
+    public static NumberResource Fetch(Types.PhoneNumber pathDestinationNumber,
+                                       Types.PhoneNumber originationNumber = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchNumberOptions(pathDestinationNumber) { OriginationNumber = originationNumber };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch pricing information for a specific destination and, optionally, origination phone number.
+    /// </summary>
+    /// <param name="pathDestinationNumber"> The destination number for which to fetch pricing information </param>
+    /// <param name="originationNumber"> The origination number for which to fetch pricing information </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Number </returns>
+    public static async System.Threading.Tasks.Task<NumberResource> FetchAsync(Types.PhoneNumber pathDestinationNumber,
+                                                                               Types.PhoneNumber originationNumber = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchNumberOptions(pathDestinationNumber) { OriginationNumber = originationNumber };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a NumberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NumberResource object represented by the provided JSON </returns>
+    public static NumberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NumberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The destination phone number, in E.164 format
+    /// </summary>
+    [JsonProperty("destination_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber DestinationNumber { get; private set; }
+    /// <summary>
+    /// The origination phone number, in E.164 format
+    /// </summary>
+    [JsonProperty("origination_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber OriginationNumber { get; private set; }
+    /// <summary>
+    /// The name of the country
+    /// </summary>
+    [JsonProperty("country")]
+    public string Country { get; private set; }
+    /// <summary>
+    /// The ISO country code
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The terminating_prefix_prices
+    /// </summary>
+    [JsonProperty("terminating_prefix_prices")]
+    public List<OutboundPrefixPriceWithOrigin> TerminatingPrefixPrices { get; private set; }
+    /// <summary>
+    /// The OriginatingCallPrice record
+    /// </summary>
+    [JsonProperty("originating_call_price")]
+    public InboundCallPrice OriginatingCallPrice { get; private set; }
+    /// <summary>
+    /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private NumberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V2/Voice/CountryOptions.cs b/src/Twilio/Rest/Pricing/V2/Voice/CountryOptions.cs
index 11a69637c..05b248f3a 100644
--- a/src/Twilio/Rest/Pricing/V2/Voice/CountryOptions.cs
+++ b/src/Twilio/Rest/Pricing/V2/Voice/CountryOptions.cs
@@ -9,55 +9,55 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Pricing.V2.Voice
-{
-
+{
+
+  /// <summary>
+  /// ReadCountryOptions
+  /// </summary>
+  public class ReadCountryOptions : ReadOptions<CountryResource>
+  {
     /// <summary>
-    /// ReadCountryOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadCountryOptions : ReadOptions<CountryResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific Country.
+  /// </summary>
+  public class FetchCountryOptions : IOptions<CountryResource>
+  {
     /// <summary>
-    /// Fetch a specific Country.
+    /// The ISO country code of the pricing information to fetch
     /// </summary>
-    public class FetchCountryOptions : IOptions<CountryResource>
-    {
-        /// <summary>
-        /// The ISO country code of the pricing information to fetch
-        /// </summary>
-        public string PathIsoCountry { get; }
-
-        /// <summary>
-        /// Construct a new FetchCountryOptions
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code of the pricing information to fetch </param>
-        public FetchCountryOptions(string pathIsoCountry)
-        {
-            PathIsoCountry = pathIsoCountry;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathIsoCountry { get; }
+
+    /// <summary>
+    /// Construct a new FetchCountryOptions
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code of the pricing information to fetch </param>
+    public FetchCountryOptions(string pathIsoCountry)
+    {
+      PathIsoCountry = pathIsoCountry;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V2/Voice/CountryResource.cs b/src/Twilio/Rest/Pricing/V2/Voice/CountryResource.cs
index b91aadb54..b844a9fb4 100644
--- a/src/Twilio/Rest/Pricing/V2/Voice/CountryResource.cs
+++ b/src/Twilio/Rest/Pricing/V2/Voice/CountryResource.cs
@@ -17,259 +17,259 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Pricing.V2.Voice
-{
-
-    public class CountryResource : Resource
-    {
-        private static Request BuildReadRequest(ReadCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Pricing,
-                "/v2/Voice/Countries",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static ResourceSet<CountryResource> Read(ReadCountryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CountryResource>.FromJson("countries", response.Content);
-            return new ResourceSet<CountryResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(ReadCountryOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CountryResource>.FromJson("countries", response.Content);
-            return new ResourceSet<CountryResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static ResourceSet<CountryResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadCountryOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadCountryOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CountryResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CountryResource> NextPage(Page<CountryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Pricing)
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CountryResource> PreviousPage(Page<CountryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Pricing)
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("countries", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Pricing,
-                "/v2/Voice/Countries/" + options.PathIsoCountry + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Country.
-        /// </summary>
-        /// <param name="options"> Fetch Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static CountryResource Fetch(FetchCountryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Country.
-        /// </summary>
-        /// <param name="options"> Fetch Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(FetchCountryOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Country.
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code of the pricing information to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static CountryResource Fetch(string pathIsoCountry, ITwilioRestClient client = null)
-        {
-            var options = new FetchCountryOptions(pathIsoCountry);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Country.
-        /// </summary>
-        /// <param name="pathIsoCountry"> The ISO country code of the pricing information to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(string pathIsoCountry,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchCountryOptions(pathIsoCountry);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CountryResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CountryResource object represented by the provided JSON </returns>
-        public static CountryResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CountryResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The name of the country
-        /// </summary>
-        [JsonProperty("country")]
-        public string Country { get; private set; }
-        /// <summary>
-        /// The ISO country code
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The list of OutboundPrefixPriceWithOrigin records
-        /// </summary>
-        [JsonProperty("outbound_prefix_prices")]
-        public List<OutboundPrefixPriceWithOrigin> OutboundPrefixPrices { get; private set; }
-        /// <summary>
-        /// The list of InboundCallPrice records
-        /// </summary>
-        [JsonProperty("inbound_call_prices")]
-        public List<InboundCallPrice> InboundCallPrices { get; private set; }
-        /// <summary>
-        /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CountryResource()
-        {
-
-        }
-    }
+{
+
+  public class CountryResource : Resource
+  {
+    private static Request BuildReadRequest(ReadCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Pricing,
+          "/v2/Voice/Countries",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static ResourceSet<CountryResource> Read(ReadCountryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CountryResource>.FromJson("countries", response.Content);
+      return new ResourceSet<CountryResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(ReadCountryOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CountryResource>.FromJson("countries", response.Content);
+      return new ResourceSet<CountryResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static ResourceSet<CountryResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadCountryOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadCountryOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CountryResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CountryResource> NextPage(Page<CountryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Pricing)
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CountryResource> PreviousPage(Page<CountryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Pricing)
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("countries", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Pricing,
+          "/v2/Voice/Countries/" + options.PathIsoCountry + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Country.
+    /// </summary>
+    /// <param name="options"> Fetch Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static CountryResource Fetch(FetchCountryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Country.
+    /// </summary>
+    /// <param name="options"> Fetch Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(FetchCountryOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Country.
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code of the pricing information to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static CountryResource Fetch(string pathIsoCountry, ITwilioRestClient client = null)
+    {
+      var options = new FetchCountryOptions(pathIsoCountry);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Country.
+    /// </summary>
+    /// <param name="pathIsoCountry"> The ISO country code of the pricing information to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(string pathIsoCountry,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchCountryOptions(pathIsoCountry);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CountryResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CountryResource object represented by the provided JSON </returns>
+    public static CountryResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CountryResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The name of the country
+    /// </summary>
+    [JsonProperty("country")]
+    public string Country { get; private set; }
+    /// <summary>
+    /// The ISO country code
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The list of OutboundPrefixPriceWithOrigin records
+    /// </summary>
+    [JsonProperty("outbound_prefix_prices")]
+    public List<OutboundPrefixPriceWithOrigin> OutboundPrefixPrices { get; private set; }
+    /// <summary>
+    /// The list of InboundCallPrice records
+    /// </summary>
+    [JsonProperty("inbound_call_prices")]
+    public List<InboundCallPrice> InboundCallPrices { get; private set; }
+    /// <summary>
+    /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CountryResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V2/Voice/NumberOptions.cs b/src/Twilio/Rest/Pricing/V2/Voice/NumberOptions.cs
index edb5b4041..6c51f3d33 100644
--- a/src/Twilio/Rest/Pricing/V2/Voice/NumberOptions.cs
+++ b/src/Twilio/Rest/Pricing/V2/Voice/NumberOptions.cs
@@ -9,44 +9,44 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Pricing.V2.Voice
-{
-
+{
+
+  /// <summary>
+  /// Fetch pricing information for a specific destination and, optionally, origination phone number.
+  /// </summary>
+  public class FetchNumberOptions : IOptions<NumberResource>
+  {
     /// <summary>
-    /// Fetch pricing information for a specific destination and, optionally, origination phone number.
+    /// The destination number for which to fetch pricing information
     /// </summary>
-    public class FetchNumberOptions : IOptions<NumberResource>
-    {
-        /// <summary>
-        /// The destination number for which to fetch pricing information
-        /// </summary>
-        public Types.PhoneNumber PathDestinationNumber { get; }
-        /// <summary>
-        /// The origination number for which to fetch pricing information
-        /// </summary>
-        public Types.PhoneNumber OriginationNumber { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchNumberOptions
-        /// </summary>
-        /// <param name="pathDestinationNumber"> The destination number for which to fetch pricing information </param>
-        public FetchNumberOptions(Types.PhoneNumber pathDestinationNumber)
-        {
-            PathDestinationNumber = pathDestinationNumber;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (OriginationNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("OriginationNumber", OriginationNumber.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public Types.PhoneNumber PathDestinationNumber { get; }
+    /// <summary>
+    /// The origination number for which to fetch pricing information
+    /// </summary>
+    public Types.PhoneNumber OriginationNumber { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchNumberOptions
+    /// </summary>
+    /// <param name="pathDestinationNumber"> The destination number for which to fetch pricing information </param>
+    public FetchNumberOptions(Types.PhoneNumber pathDestinationNumber)
+    {
+      PathDestinationNumber = pathDestinationNumber;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (OriginationNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("OriginationNumber", OriginationNumber.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Pricing/V2/Voice/NumberResource.cs b/src/Twilio/Rest/Pricing/V2/Voice/NumberResource.cs
index 02082a558..d0adfe4f4 100644
--- a/src/Twilio/Rest/Pricing/V2/Voice/NumberResource.cs
+++ b/src/Twilio/Rest/Pricing/V2/Voice/NumberResource.cs
@@ -17,147 +17,147 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Pricing.V2.Voice
-{
-
-    public class NumberResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Pricing,
-                "/v2/Voice/Numbers/" + options.PathDestinationNumber + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch pricing information for a specific destination and, optionally, origination phone number.
-        /// </summary>
-        /// <param name="options"> Fetch Number parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Number </returns>
-        public static NumberResource Fetch(FetchNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch pricing information for a specific destination and, optionally, origination phone number.
-        /// </summary>
-        /// <param name="options"> Fetch Number parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Number </returns>
-        public static async System.Threading.Tasks.Task<NumberResource> FetchAsync(FetchNumberOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch pricing information for a specific destination and, optionally, origination phone number.
-        /// </summary>
-        /// <param name="pathDestinationNumber"> The destination number for which to fetch pricing information </param>
-        /// <param name="originationNumber"> The origination number for which to fetch pricing information </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Number </returns>
-        public static NumberResource Fetch(Types.PhoneNumber pathDestinationNumber,
-                                           Types.PhoneNumber originationNumber = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchNumberOptions(pathDestinationNumber){OriginationNumber = originationNumber};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch pricing information for a specific destination and, optionally, origination phone number.
-        /// </summary>
-        /// <param name="pathDestinationNumber"> The destination number for which to fetch pricing information </param>
-        /// <param name="originationNumber"> The origination number for which to fetch pricing information </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Number </returns>
-        public static async System.Threading.Tasks.Task<NumberResource> FetchAsync(Types.PhoneNumber pathDestinationNumber,
-                                                                                   Types.PhoneNumber originationNumber = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchNumberOptions(pathDestinationNumber){OriginationNumber = originationNumber};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a NumberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NumberResource object represented by the provided JSON </returns>
-        public static NumberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NumberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The destination phone number, in E.164 format
-        /// </summary>
-        [JsonProperty("destination_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber DestinationNumber { get; private set; }
-        /// <summary>
-        /// The origination phone number, in E.164 format
-        /// </summary>
-        [JsonProperty("origination_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber OriginationNumber { get; private set; }
-        /// <summary>
-        /// The name of the country
-        /// </summary>
-        [JsonProperty("country")]
-        public string Country { get; private set; }
-        /// <summary>
-        /// The ISO country code
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The list of OutboundCallPriceWithOrigin records
-        /// </summary>
-        [JsonProperty("outbound_call_prices")]
-        public List<OutboundCallPriceWithOrigin> OutboundCallPrices { get; private set; }
-        /// <summary>
-        /// The InboundCallPrice record
-        /// </summary>
-        [JsonProperty("inbound_call_price")]
-        public InboundCallPrice InboundCallPrice { get; private set; }
-        /// <summary>
-        /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
-        /// </summary>
-        [JsonProperty("price_unit")]
-        public string PriceUnit { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private NumberResource()
-        {
-
-        }
-    }
+{
+
+  public class NumberResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Pricing,
+          "/v2/Voice/Numbers/" + options.PathDestinationNumber + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch pricing information for a specific destination and, optionally, origination phone number.
+    /// </summary>
+    /// <param name="options"> Fetch Number parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Number </returns>
+    public static NumberResource Fetch(FetchNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch pricing information for a specific destination and, optionally, origination phone number.
+    /// </summary>
+    /// <param name="options"> Fetch Number parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Number </returns>
+    public static async System.Threading.Tasks.Task<NumberResource> FetchAsync(FetchNumberOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch pricing information for a specific destination and, optionally, origination phone number.
+    /// </summary>
+    /// <param name="pathDestinationNumber"> The destination number for which to fetch pricing information </param>
+    /// <param name="originationNumber"> The origination number for which to fetch pricing information </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Number </returns>
+    public static NumberResource Fetch(Types.PhoneNumber pathDestinationNumber,
+                                       Types.PhoneNumber originationNumber = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchNumberOptions(pathDestinationNumber) { OriginationNumber = originationNumber };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch pricing information for a specific destination and, optionally, origination phone number.
+    /// </summary>
+    /// <param name="pathDestinationNumber"> The destination number for which to fetch pricing information </param>
+    /// <param name="originationNumber"> The origination number for which to fetch pricing information </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Number </returns>
+    public static async System.Threading.Tasks.Task<NumberResource> FetchAsync(Types.PhoneNumber pathDestinationNumber,
+                                                                               Types.PhoneNumber originationNumber = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchNumberOptions(pathDestinationNumber) { OriginationNumber = originationNumber };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a NumberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NumberResource object represented by the provided JSON </returns>
+    public static NumberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NumberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The destination phone number, in E.164 format
+    /// </summary>
+    [JsonProperty("destination_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber DestinationNumber { get; private set; }
+    /// <summary>
+    /// The origination phone number, in E.164 format
+    /// </summary>
+    [JsonProperty("origination_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber OriginationNumber { get; private set; }
+    /// <summary>
+    /// The name of the country
+    /// </summary>
+    [JsonProperty("country")]
+    public string Country { get; private set; }
+    /// <summary>
+    /// The ISO country code
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The list of OutboundCallPriceWithOrigin records
+    /// </summary>
+    [JsonProperty("outbound_call_prices")]
+    public List<OutboundCallPriceWithOrigin> OutboundCallPrices { get; private set; }
+    /// <summary>
+    /// The InboundCallPrice record
+    /// </summary>
+    [JsonProperty("inbound_call_price")]
+    public InboundCallPrice InboundCallPrice { get; private set; }
+    /// <summary>
+    /// The currency in which prices are measured, in ISO 4127 format (e.g. usd, eur, jpy)
+    /// </summary>
+    [JsonProperty("price_unit")]
+    public string PriceUnit { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private NumberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/Service/PhoneNumberOptions.cs b/src/Twilio/Rest/Proxy/V1/Service/PhoneNumberOptions.cs
index ab83730b8..06ea0f577 100644
--- a/src/Twilio/Rest/Proxy/V1/Service/PhoneNumberOptions.cs
+++ b/src/Twilio/Rest/Proxy/V1/Service/PhoneNumberOptions.cs
@@ -9,221 +9,221 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Proxy.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Add a Phone Number to a Service's Proxy Number Pool.
+  /// </summary>
+  public class CreatePhoneNumberOptions : IOptions<PhoneNumberResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Add a Phone Number to a Service's Proxy Number Pool.
-    /// </summary>
-    public class CreatePhoneNumberOptions : IOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the resource's parent Service
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of a Twilio IncomingPhoneNumber resource
-        /// </summary>
-        public string Sid { get; set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; set; }
-        /// <summary>
-        /// Whether the new phone number should be reserved
-        /// </summary>
-        public bool? IsReserved { get; set; }
-
-        /// <summary>
-        /// Construct a new CreatePhoneNumberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the resource's parent Service </param>
-        public CreatePhoneNumberOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Sid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sid", Sid.ToString()));
-            }
-
-            if (PhoneNumber != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
-            }
-
-            if (IsReserved != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IsReserved", IsReserved.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the resource's parent Service
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific Phone Number from a Service.
-    /// </summary>
-    public class DeletePhoneNumberOptions : IOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service resource of the PhoneNumber resource to delete
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeletePhoneNumberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeletePhoneNumberOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of a Twilio IncomingPhoneNumber resource
+    /// </summary>
+    public string Sid { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Phone Numbers in the Proxy Number Pool for a Service. A maximum of 100 records will be
-    /// returned per page.
-    /// </summary>
-    public class ReadPhoneNumberOptions : ReadOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service resource of the PhoneNumber resource to read
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadPhoneNumberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to read </param>
-        public ReadPhoneNumberOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The phone number in E.164 format
+    /// </summary>
+    public Types.PhoneNumber PhoneNumber { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific Phone Number.
-    /// </summary>
-    public class FetchPhoneNumberOptions : IOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service resource of the PhoneNumber resource to fetch
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchPhoneNumberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchPhoneNumberOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Whether the new phone number should be reserved
+    /// </summary>
+    public bool? IsReserved { get; set; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update a specific Proxy Number.
-    /// </summary>
-    public class UpdatePhoneNumberOptions : IOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service resource of the PhoneNumber resource to update
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// Whether the new phone number should be reserved
-        /// </summary>
-        public bool? IsReserved { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdatePhoneNumberOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdatePhoneNumberOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IsReserved != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IsReserved", IsReserved.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new CreatePhoneNumberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the resource's parent Service </param>
+    public CreatePhoneNumberOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Sid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sid", Sid.ToString()));
+      }
+
+      if (PhoneNumber != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumber", PhoneNumber.ToString()));
+      }
+
+      if (IsReserved != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IsReserved", IsReserved.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific Phone Number from a Service.
+  /// </summary>
+  public class DeletePhoneNumberOptions : IOptions<PhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the parent Service resource of the PhoneNumber resource to delete
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeletePhoneNumberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeletePhoneNumberOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Phone Numbers in the Proxy Number Pool for a Service. A maximum of 100 records will be
+  /// returned per page.
+  /// </summary>
+  public class ReadPhoneNumberOptions : ReadOptions<PhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the parent Service resource of the PhoneNumber resource to read
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadPhoneNumberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to read </param>
+    public ReadPhoneNumberOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific Phone Number.
+  /// </summary>
+  public class FetchPhoneNumberOptions : IOptions<PhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the parent Service resource of the PhoneNumber resource to fetch
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchPhoneNumberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchPhoneNumberOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update a specific Proxy Number.
+  /// </summary>
+  public class UpdatePhoneNumberOptions : IOptions<PhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the parent Service resource of the PhoneNumber resource to update
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// Whether the new phone number should be reserved
+    /// </summary>
+    public bool? IsReserved { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdatePhoneNumberOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdatePhoneNumberOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IsReserved != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IsReserved", IsReserved.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/Service/PhoneNumberResource.cs b/src/Twilio/Rest/Proxy/V1/Service/PhoneNumberResource.cs
index 2eabb0cfd..cae4021da 100644
--- a/src/Twilio/Rest/Proxy/V1/Service/PhoneNumberResource.cs
+++ b/src/Twilio/Rest/Proxy/V1/Service/PhoneNumberResource.cs
@@ -19,527 +19,527 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Proxy.V1.Service
-{
-
-    public class PhoneNumberResource : Resource
-    {
-        private static Request BuildCreateRequest(CreatePhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Add a Phone Number to a Service's Proxy Number Pool.
-        /// </summary>
-        /// <param name="options"> Create PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Create(CreatePhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a Phone Number to a Service's Proxy Number Pool.
-        /// </summary>
-        /// <param name="options"> Create PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> CreateAsync(CreatePhoneNumberOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Add a Phone Number to a Service's Proxy Number Pool.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the resource's parent Service </param>
-        /// <param name="sid"> The SID of a Twilio IncomingPhoneNumber resource </param>
-        /// <param name="phoneNumber"> The phone number in E.164 format </param>
-        /// <param name="isReserved"> Whether the new phone number should be reserved </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Create(string pathServiceSid,
-                                                 string sid = null,
-                                                 Types.PhoneNumber phoneNumber = null,
-                                                 bool? isReserved = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreatePhoneNumberOptions(pathServiceSid){Sid = sid, PhoneNumber = phoneNumber, IsReserved = isReserved};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a Phone Number to a Service's Proxy Number Pool.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the resource's parent Service </param>
-        /// <param name="sid"> The SID of a Twilio IncomingPhoneNumber resource </param>
-        /// <param name="phoneNumber"> The phone number in E.164 format </param>
-        /// <param name="isReserved"> Whether the new phone number should be reserved </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> CreateAsync(string pathServiceSid,
-                                                                                         string sid = null,
-                                                                                         Types.PhoneNumber phoneNumber = null,
-                                                                                         bool? isReserved = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreatePhoneNumberOptions(pathServiceSid){Sid = sid, PhoneNumber = phoneNumber, IsReserved = isReserved};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeletePhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Phone Number from a Service.
-        /// </summary>
-        /// <param name="options"> Delete PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static bool Delete(DeletePhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Phone Number from a Service.
-        /// </summary>
-        /// <param name="options"> Delete PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeletePhoneNumberOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Phone Number from a Service.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeletePhoneNumberOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Phone Number from a Service.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeletePhoneNumberOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadPhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Phone Numbers in the Proxy Number Pool for a Service. A maximum of 100 records will be
-        /// returned per page.
-        /// </summary>
-        /// <param name="options"> Read PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static ResourceSet<PhoneNumberResource> Read(ReadPhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-            return new ResourceSet<PhoneNumberResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Phone Numbers in the Proxy Number Pool for a Service. A maximum of 100 records will be
-        /// returned per page.
-        /// </summary>
-        /// <param name="options"> Read PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PhoneNumberResource>> ReadAsync(ReadPhoneNumberOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-            return new ResourceSet<PhoneNumberResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Phone Numbers in the Proxy Number Pool for a Service. A maximum of 100 records will be
-        /// returned per page.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static ResourceSet<PhoneNumberResource> Read(string pathServiceSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadPhoneNumberOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Phone Numbers in the Proxy Number Pool for a Service. A maximum of 100 records will be
-        /// returned per page.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PhoneNumberResource>> ReadAsync(string pathServiceSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadPhoneNumberOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<PhoneNumberResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<PhoneNumberResource> NextPage(Page<PhoneNumberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<PhoneNumberResource> PreviousPage(Page<PhoneNumberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchPhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Phone Number.
-        /// </summary>
-        /// <param name="options"> Fetch PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Fetch(FetchPhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Phone Number.
-        /// </summary>
-        /// <param name="options"> Fetch PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(FetchPhoneNumberOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Phone Number.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchPhoneNumberOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Phone Number.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(string pathServiceSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchPhoneNumberOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdatePhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Proxy Number.
-        /// </summary>
-        /// <param name="options"> Update PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Update(UpdatePhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Proxy Number.
-        /// </summary>
-        /// <param name="options"> Update PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> UpdateAsync(UpdatePhoneNumberOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Proxy Number.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="isReserved"> Whether the new phone number should be reserved </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Update(string pathServiceSid,
-                                                 string pathSid,
-                                                 bool? isReserved = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdatePhoneNumberOptions(pathServiceSid, pathSid){IsReserved = isReserved};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Proxy Number.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to update </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="isReserved"> Whether the new phone number should be reserved </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> UpdateAsync(string pathServiceSid,
-                                                                                         string pathSid,
-                                                                                         bool? isReserved = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdatePhoneNumberOptions(pathServiceSid, pathSid){IsReserved = isReserved};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a PhoneNumberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> PhoneNumberResource object represented by the provided JSON </returns>
-        public static PhoneNumberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<PhoneNumberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the PhoneNumber resource's parent Service resource
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The ISO Country Code
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The capabilities of the phone number
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-        /// <summary>
-        /// The absolute URL of the PhoneNumber resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Reserve the phone number for manual assignment to participants only
-        /// </summary>
-        [JsonProperty("is_reserved")]
-        public bool? IsReserved { get; private set; }
-        /// <summary>
-        /// The number of open session assigned to the number.
-        /// </summary>
-        [JsonProperty("in_use")]
-        public int? InUse { get; private set; }
-
-        private PhoneNumberResource()
-        {
-
-        }
-    }
+{
+
+  public class PhoneNumberResource : Resource
+  {
+    private static Request BuildCreateRequest(CreatePhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Add a Phone Number to a Service's Proxy Number Pool.
+    /// </summary>
+    /// <param name="options"> Create PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Create(CreatePhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a Phone Number to a Service's Proxy Number Pool.
+    /// </summary>
+    /// <param name="options"> Create PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> CreateAsync(CreatePhoneNumberOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Add a Phone Number to a Service's Proxy Number Pool.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the resource's parent Service </param>
+    /// <param name="sid"> The SID of a Twilio IncomingPhoneNumber resource </param>
+    /// <param name="phoneNumber"> The phone number in E.164 format </param>
+    /// <param name="isReserved"> Whether the new phone number should be reserved </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Create(string pathServiceSid,
+                                             string sid = null,
+                                             Types.PhoneNumber phoneNumber = null,
+                                             bool? isReserved = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreatePhoneNumberOptions(pathServiceSid) { Sid = sid, PhoneNumber = phoneNumber, IsReserved = isReserved };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a Phone Number to a Service's Proxy Number Pool.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the resource's parent Service </param>
+    /// <param name="sid"> The SID of a Twilio IncomingPhoneNumber resource </param>
+    /// <param name="phoneNumber"> The phone number in E.164 format </param>
+    /// <param name="isReserved"> Whether the new phone number should be reserved </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> CreateAsync(string pathServiceSid,
+                                                                                     string sid = null,
+                                                                                     Types.PhoneNumber phoneNumber = null,
+                                                                                     bool? isReserved = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreatePhoneNumberOptions(pathServiceSid) { Sid = sid, PhoneNumber = phoneNumber, IsReserved = isReserved };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeletePhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Phone Number from a Service.
+    /// </summary>
+    /// <param name="options"> Delete PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static bool Delete(DeletePhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Phone Number from a Service.
+    /// </summary>
+    /// <param name="options"> Delete PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeletePhoneNumberOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Phone Number from a Service.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeletePhoneNumberOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Phone Number from a Service.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeletePhoneNumberOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadPhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Phone Numbers in the Proxy Number Pool for a Service. A maximum of 100 records will be
+    /// returned per page.
+    /// </summary>
+    /// <param name="options"> Read PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static ResourceSet<PhoneNumberResource> Read(ReadPhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+      return new ResourceSet<PhoneNumberResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Phone Numbers in the Proxy Number Pool for a Service. A maximum of 100 records will be
+    /// returned per page.
+    /// </summary>
+    /// <param name="options"> Read PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PhoneNumberResource>> ReadAsync(ReadPhoneNumberOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+      return new ResourceSet<PhoneNumberResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Phone Numbers in the Proxy Number Pool for a Service. A maximum of 100 records will be
+    /// returned per page.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static ResourceSet<PhoneNumberResource> Read(string pathServiceSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadPhoneNumberOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Phone Numbers in the Proxy Number Pool for a Service. A maximum of 100 records will be
+    /// returned per page.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PhoneNumberResource>> ReadAsync(string pathServiceSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadPhoneNumberOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<PhoneNumberResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<PhoneNumberResource> NextPage(Page<PhoneNumberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<PhoneNumberResource> PreviousPage(Page<PhoneNumberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchPhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Phone Number.
+    /// </summary>
+    /// <param name="options"> Fetch PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Fetch(FetchPhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Phone Number.
+    /// </summary>
+    /// <param name="options"> Fetch PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(FetchPhoneNumberOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Phone Number.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchPhoneNumberOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Phone Number.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(string pathServiceSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchPhoneNumberOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdatePhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/PhoneNumbers/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Proxy Number.
+    /// </summary>
+    /// <param name="options"> Update PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Update(UpdatePhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Proxy Number.
+    /// </summary>
+    /// <param name="options"> Update PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> UpdateAsync(UpdatePhoneNumberOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Proxy Number.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="isReserved"> Whether the new phone number should be reserved </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Update(string pathServiceSid,
+                                             string pathSid,
+                                             bool? isReserved = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdatePhoneNumberOptions(pathServiceSid, pathSid) { IsReserved = isReserved };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Proxy Number.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource of the PhoneNumber resource to update </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="isReserved"> Whether the new phone number should be reserved </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> UpdateAsync(string pathServiceSid,
+                                                                                     string pathSid,
+                                                                                     bool? isReserved = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdatePhoneNumberOptions(pathServiceSid, pathSid) { IsReserved = isReserved };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a PhoneNumberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> PhoneNumberResource object represented by the provided JSON </returns>
+    public static PhoneNumberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<PhoneNumberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the PhoneNumber resource's parent Service resource
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The ISO Country Code
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The capabilities of the phone number
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+    /// <summary>
+    /// The absolute URL of the PhoneNumber resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Reserve the phone number for manual assignment to participants only
+    /// </summary>
+    [JsonProperty("is_reserved")]
+    public bool? IsReserved { get; private set; }
+    /// <summary>
+    /// The number of open session assigned to the number.
+    /// </summary>
+    [JsonProperty("in_use")]
+    public int? InUse { get; private set; }
+
+    private PhoneNumberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/Service/Session/InteractionOptions.cs b/src/Twilio/Rest/Proxy/V1/Service/Session/InteractionOptions.cs
index f413b035e..96ae56cee 100644
--- a/src/Twilio/Rest/Proxy/V1/Service/Session/InteractionOptions.cs
+++ b/src/Twilio/Rest/Proxy/V1/Service/Session/InteractionOptions.cs
@@ -9,134 +9,134 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Proxy.V1.Service.Session
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of Interactions for a given [Session](https://www.twilio.com/docs/proxy/api/session).
+  /// </summary>
+  public class FetchInteractionOptions : IOptions<InteractionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of Interactions for a given [Session](https://www.twilio.com/docs/proxy/api/session).
+    /// The SID of the parent Service of the resource to fetch
     /// </summary>
-    public class FetchInteractionOptions : IOptions<InteractionResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service of the resource to fetch
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// he SID of the parent Session of the resource to fetch
-        /// </summary>
-        public string PathSessionSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchInteractionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to fetch </param>
-        /// <param name="pathSessionSid"> he SID of the parent Session of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchInteractionOptions(string pathServiceSid, string pathSessionSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSessionSid = pathSessionSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Interactions for a Session. A maximum of 100 records will be returned per page.
+    /// he SID of the parent Session of the resource to fetch
     /// </summary>
-    public class ReadInteractionOptions : ReadOptions<InteractionResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service to read the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the parent Session to read the resource from
-        /// </summary>
-        public string PathSessionSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadInteractionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service to read the resource from </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session to read the resource from </param>
-        public ReadInteractionOptions(string pathServiceSid, string pathSessionSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSessionSid = pathSessionSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSessionSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific Interaction.
+    /// The unique string that identifies the resource
     /// </summary>
-    public class DeleteInteractionOptions : IOptions<InteractionResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service of the resource to delete
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// he SID of the parent Session of the resource to delete
-        /// </summary>
-        public string PathSessionSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteInteractionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to delete </param>
-        /// <param name="pathSessionSid"> he SID of the parent Session of the resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteInteractionOptions(string pathServiceSid, string pathSessionSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSessionSid = pathSessionSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchInteractionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to fetch </param>
+    /// <param name="pathSessionSid"> he SID of the parent Session of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchInteractionOptions(string pathServiceSid, string pathSessionSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSessionSid = pathSessionSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Interactions for a Session. A maximum of 100 records will be returned per page.
+  /// </summary>
+  public class ReadInteractionOptions : ReadOptions<InteractionResource>
+  {
+    /// <summary>
+    /// The SID of the parent Service to read the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the parent Session to read the resource from
+    /// </summary>
+    public string PathSessionSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadInteractionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service to read the resource from </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session to read the resource from </param>
+    public ReadInteractionOptions(string pathServiceSid, string pathSessionSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSessionSid = pathSessionSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific Interaction.
+  /// </summary>
+  public class DeleteInteractionOptions : IOptions<InteractionResource>
+  {
+    /// <summary>
+    /// The SID of the parent Service of the resource to delete
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// he SID of the parent Session of the resource to delete
+    /// </summary>
+    public string PathSessionSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteInteractionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to delete </param>
+    /// <param name="pathSessionSid"> he SID of the parent Session of the resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteInteractionOptions(string pathServiceSid, string pathSessionSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSessionSid = pathSessionSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/Service/Session/InteractionResource.cs b/src/Twilio/Rest/Proxy/V1/Service/Session/InteractionResource.cs
index 79edd8a15..11227db87 100644
--- a/src/Twilio/Rest/Proxy/V1/Service/Session/InteractionResource.cs
+++ b/src/Twilio/Rest/Proxy/V1/Service/Session/InteractionResource.cs
@@ -19,466 +19,466 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Proxy.V1.Service.Session
-{
-
-    public class InteractionResource : Resource
-    {
-        public sealed class TypeEnum : StringEnum
-        {
-            private TypeEnum(string value) : base(value) {}
-            public TypeEnum() {}
-            public static implicit operator TypeEnum(string value)
-            {
-                return new TypeEnum(value);
-            }
-
-            public static readonly TypeEnum Message = new TypeEnum("message");
-            public static readonly TypeEnum Voice = new TypeEnum("voice");
-            public static readonly TypeEnum Unknown = new TypeEnum("unknown");
-        }
-
-        public sealed class ResourceStatusEnum : StringEnum
-        {
-            private ResourceStatusEnum(string value) : base(value) {}
-            public ResourceStatusEnum() {}
-            public static implicit operator ResourceStatusEnum(string value)
-            {
-                return new ResourceStatusEnum(value);
-            }
-
-            public static readonly ResourceStatusEnum Accepted = new ResourceStatusEnum("accepted");
-            public static readonly ResourceStatusEnum Answered = new ResourceStatusEnum("answered");
-            public static readonly ResourceStatusEnum Busy = new ResourceStatusEnum("busy");
-            public static readonly ResourceStatusEnum Canceled = new ResourceStatusEnum("canceled");
-            public static readonly ResourceStatusEnum Completed = new ResourceStatusEnum("completed");
-            public static readonly ResourceStatusEnum Deleted = new ResourceStatusEnum("deleted");
-            public static readonly ResourceStatusEnum Delivered = new ResourceStatusEnum("delivered");
-            public static readonly ResourceStatusEnum DeliveryUnknown = new ResourceStatusEnum("delivery-unknown");
-            public static readonly ResourceStatusEnum Failed = new ResourceStatusEnum("failed");
-            public static readonly ResourceStatusEnum InProgress = new ResourceStatusEnum("in-progress");
-            public static readonly ResourceStatusEnum Initiated = new ResourceStatusEnum("initiated");
-            public static readonly ResourceStatusEnum NoAnswer = new ResourceStatusEnum("no-answer");
-            public static readonly ResourceStatusEnum Queued = new ResourceStatusEnum("queued");
-            public static readonly ResourceStatusEnum Received = new ResourceStatusEnum("received");
-            public static readonly ResourceStatusEnum Receiving = new ResourceStatusEnum("receiving");
-            public static readonly ResourceStatusEnum Ringing = new ResourceStatusEnum("ringing");
-            public static readonly ResourceStatusEnum Scheduled = new ResourceStatusEnum("scheduled");
-            public static readonly ResourceStatusEnum Sending = new ResourceStatusEnum("sending");
-            public static readonly ResourceStatusEnum Sent = new ResourceStatusEnum("sent");
-            public static readonly ResourceStatusEnum Undelivered = new ResourceStatusEnum("undelivered");
-            public static readonly ResourceStatusEnum Unknown = new ResourceStatusEnum("unknown");
-        }
-
-        private static Request BuildFetchRequest(FetchInteractionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Interactions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Interactions for a given [Session](https://www.twilio.com/docs/proxy/api/session).
-        /// </summary>
-        /// <param name="options"> Fetch Interaction parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Interaction </returns>
-        public static InteractionResource Fetch(FetchInteractionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Interactions for a given [Session](https://www.twilio.com/docs/proxy/api/session).
-        /// </summary>
-        /// <param name="options"> Fetch Interaction parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Interaction </returns>
-        public static async System.Threading.Tasks.Task<InteractionResource> FetchAsync(FetchInteractionOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Interactions for a given [Session](https://www.twilio.com/docs/proxy/api/session).
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to fetch </param>
-        /// <param name="pathSessionSid"> he SID of the parent Session of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Interaction </returns>
-        public static InteractionResource Fetch(string pathServiceSid,
-                                                string pathSessionSid,
-                                                string pathSid,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchInteractionOptions(pathServiceSid, pathSessionSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Interactions for a given [Session](https://www.twilio.com/docs/proxy/api/session).
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to fetch </param>
-        /// <param name="pathSessionSid"> he SID of the parent Session of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Interaction </returns>
-        public static async System.Threading.Tasks.Task<InteractionResource> FetchAsync(string pathServiceSid,
-                                                                                        string pathSessionSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchInteractionOptions(pathServiceSid, pathSessionSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadInteractionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Interactions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Interactions for a Session. A maximum of 100 records will be returned per page.
-        /// </summary>
-        /// <param name="options"> Read Interaction parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Interaction </returns>
-        public static ResourceSet<InteractionResource> Read(ReadInteractionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<InteractionResource>.FromJson("interactions", response.Content);
-            return new ResourceSet<InteractionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Interactions for a Session. A maximum of 100 records will be returned per page.
-        /// </summary>
-        /// <param name="options"> Read Interaction parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Interaction </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InteractionResource>> ReadAsync(ReadInteractionOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<InteractionResource>.FromJson("interactions", response.Content);
-            return new ResourceSet<InteractionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Interactions for a Session. A maximum of 100 records will be returned per page.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service to read the resource from </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session to read the resource from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Interaction </returns>
-        public static ResourceSet<InteractionResource> Read(string pathServiceSid,
-                                                            string pathSessionSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadInteractionOptions(pathServiceSid, pathSessionSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Interactions for a Session. A maximum of 100 records will be returned per page.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service to read the resource from </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session to read the resource from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Interaction </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<InteractionResource>> ReadAsync(string pathServiceSid,
-                                                                                                    string pathSessionSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadInteractionOptions(pathServiceSid, pathSessionSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<InteractionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<InteractionResource>.FromJson("interactions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<InteractionResource> NextPage(Page<InteractionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<InteractionResource>.FromJson("interactions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<InteractionResource> PreviousPage(Page<InteractionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<InteractionResource>.FromJson("interactions", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteInteractionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Interactions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Interaction.
-        /// </summary>
-        /// <param name="options"> Delete Interaction parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Interaction </returns>
-        public static bool Delete(DeleteInteractionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Interaction.
-        /// </summary>
-        /// <param name="options"> Delete Interaction parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Interaction </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteInteractionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Interaction.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to delete </param>
-        /// <param name="pathSessionSid"> he SID of the parent Session of the resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Interaction </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathSessionSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteInteractionOptions(pathServiceSid, pathSessionSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Interaction.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to delete </param>
-        /// <param name="pathSessionSid"> he SID of the parent Session of the resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Interaction </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSessionSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteInteractionOptions(pathServiceSid, pathSessionSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a InteractionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> InteractionResource object represented by the provided JSON </returns>
-        public static InteractionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<InteractionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the resource's parent Session
-        /// </summary>
-        [JsonProperty("session_sid")]
-        public string SessionSid { get; private set; }
-        /// <summary>
-        /// The SID of the resource's parent Service
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// A JSON string that includes the message body of message interactions
-        /// </summary>
-        [JsonProperty("data")]
-        public string Data { get; private set; }
-        /// <summary>
-        /// The Type of the Interaction
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public InteractionResource.TypeEnum Type { get; private set; }
-        /// <summary>
-        /// The SID of the inbound Participant resource
-        /// </summary>
-        [JsonProperty("inbound_participant_sid")]
-        public string InboundParticipantSid { get; private set; }
-        /// <summary>
-        /// The SID of the inbound resource
-        /// </summary>
-        [JsonProperty("inbound_resource_sid")]
-        public string InboundResourceSid { get; private set; }
-        /// <summary>
-        /// The inbound resource status of the Interaction
-        /// </summary>
-        [JsonProperty("inbound_resource_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public InteractionResource.ResourceStatusEnum InboundResourceStatus { get; private set; }
-        /// <summary>
-        /// The inbound resource type
-        /// </summary>
-        [JsonProperty("inbound_resource_type")]
-        public string InboundResourceType { get; private set; }
-        /// <summary>
-        /// The URL of the Twilio inbound resource
-        /// </summary>
-        [JsonProperty("inbound_resource_url")]
-        public Uri InboundResourceUrl { get; private set; }
-        /// <summary>
-        /// The SID of the outbound Participant
-        /// </summary>
-        [JsonProperty("outbound_participant_sid")]
-        public string OutboundParticipantSid { get; private set; }
-        /// <summary>
-        /// The SID of the outbound resource
-        /// </summary>
-        [JsonProperty("outbound_resource_sid")]
-        public string OutboundResourceSid { get; private set; }
-        /// <summary>
-        /// The outbound resource status of the Interaction
-        /// </summary>
-        [JsonProperty("outbound_resource_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public InteractionResource.ResourceStatusEnum OutboundResourceStatus { get; private set; }
-        /// <summary>
-        /// The outbound resource type
-        /// </summary>
-        [JsonProperty("outbound_resource_type")]
-        public string OutboundResourceType { get; private set; }
-        /// <summary>
-        /// The URL of the Twilio outbound resource
-        /// </summary>
-        [JsonProperty("outbound_resource_url")]
-        public Uri OutboundResourceUrl { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Interaction was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Interaction resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private InteractionResource()
-        {
-
-        }
-    }
+{
+
+  public class InteractionResource : Resource
+  {
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+      public TypeEnum() { }
+      public static implicit operator TypeEnum(string value)
+      {
+        return new TypeEnum(value);
+      }
+
+      public static readonly TypeEnum Message = new TypeEnum("message");
+      public static readonly TypeEnum Voice = new TypeEnum("voice");
+      public static readonly TypeEnum Unknown = new TypeEnum("unknown");
+    }
+
+    public sealed class ResourceStatusEnum : StringEnum
+    {
+      private ResourceStatusEnum(string value) : base(value) { }
+      public ResourceStatusEnum() { }
+      public static implicit operator ResourceStatusEnum(string value)
+      {
+        return new ResourceStatusEnum(value);
+      }
+
+      public static readonly ResourceStatusEnum Accepted = new ResourceStatusEnum("accepted");
+      public static readonly ResourceStatusEnum Answered = new ResourceStatusEnum("answered");
+      public static readonly ResourceStatusEnum Busy = new ResourceStatusEnum("busy");
+      public static readonly ResourceStatusEnum Canceled = new ResourceStatusEnum("canceled");
+      public static readonly ResourceStatusEnum Completed = new ResourceStatusEnum("completed");
+      public static readonly ResourceStatusEnum Deleted = new ResourceStatusEnum("deleted");
+      public static readonly ResourceStatusEnum Delivered = new ResourceStatusEnum("delivered");
+      public static readonly ResourceStatusEnum DeliveryUnknown = new ResourceStatusEnum("delivery-unknown");
+      public static readonly ResourceStatusEnum Failed = new ResourceStatusEnum("failed");
+      public static readonly ResourceStatusEnum InProgress = new ResourceStatusEnum("in-progress");
+      public static readonly ResourceStatusEnum Initiated = new ResourceStatusEnum("initiated");
+      public static readonly ResourceStatusEnum NoAnswer = new ResourceStatusEnum("no-answer");
+      public static readonly ResourceStatusEnum Queued = new ResourceStatusEnum("queued");
+      public static readonly ResourceStatusEnum Received = new ResourceStatusEnum("received");
+      public static readonly ResourceStatusEnum Receiving = new ResourceStatusEnum("receiving");
+      public static readonly ResourceStatusEnum Ringing = new ResourceStatusEnum("ringing");
+      public static readonly ResourceStatusEnum Scheduled = new ResourceStatusEnum("scheduled");
+      public static readonly ResourceStatusEnum Sending = new ResourceStatusEnum("sending");
+      public static readonly ResourceStatusEnum Sent = new ResourceStatusEnum("sent");
+      public static readonly ResourceStatusEnum Undelivered = new ResourceStatusEnum("undelivered");
+      public static readonly ResourceStatusEnum Unknown = new ResourceStatusEnum("unknown");
+    }
+
+    private static Request BuildFetchRequest(FetchInteractionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Interactions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Interactions for a given [Session](https://www.twilio.com/docs/proxy/api/session).
+    /// </summary>
+    /// <param name="options"> Fetch Interaction parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Interaction </returns>
+    public static InteractionResource Fetch(FetchInteractionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Interactions for a given [Session](https://www.twilio.com/docs/proxy/api/session).
+    /// </summary>
+    /// <param name="options"> Fetch Interaction parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Interaction </returns>
+    public static async System.Threading.Tasks.Task<InteractionResource> FetchAsync(FetchInteractionOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Interactions for a given [Session](https://www.twilio.com/docs/proxy/api/session).
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to fetch </param>
+    /// <param name="pathSessionSid"> he SID of the parent Session of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Interaction </returns>
+    public static InteractionResource Fetch(string pathServiceSid,
+                                            string pathSessionSid,
+                                            string pathSid,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchInteractionOptions(pathServiceSid, pathSessionSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Interactions for a given [Session](https://www.twilio.com/docs/proxy/api/session).
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to fetch </param>
+    /// <param name="pathSessionSid"> he SID of the parent Session of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Interaction </returns>
+    public static async System.Threading.Tasks.Task<InteractionResource> FetchAsync(string pathServiceSid,
+                                                                                    string pathSessionSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchInteractionOptions(pathServiceSid, pathSessionSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadInteractionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Interactions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Interactions for a Session. A maximum of 100 records will be returned per page.
+    /// </summary>
+    /// <param name="options"> Read Interaction parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Interaction </returns>
+    public static ResourceSet<InteractionResource> Read(ReadInteractionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<InteractionResource>.FromJson("interactions", response.Content);
+      return new ResourceSet<InteractionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Interactions for a Session. A maximum of 100 records will be returned per page.
+    /// </summary>
+    /// <param name="options"> Read Interaction parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Interaction </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InteractionResource>> ReadAsync(ReadInteractionOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<InteractionResource>.FromJson("interactions", response.Content);
+      return new ResourceSet<InteractionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Interactions for a Session. A maximum of 100 records will be returned per page.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service to read the resource from </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session to read the resource from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Interaction </returns>
+    public static ResourceSet<InteractionResource> Read(string pathServiceSid,
+                                                        string pathSessionSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadInteractionOptions(pathServiceSid, pathSessionSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Interactions for a Session. A maximum of 100 records will be returned per page.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service to read the resource from </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session to read the resource from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Interaction </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<InteractionResource>> ReadAsync(string pathServiceSid,
+                                                                                                string pathSessionSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadInteractionOptions(pathServiceSid, pathSessionSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<InteractionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<InteractionResource>.FromJson("interactions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<InteractionResource> NextPage(Page<InteractionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<InteractionResource>.FromJson("interactions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<InteractionResource> PreviousPage(Page<InteractionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<InteractionResource>.FromJson("interactions", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteInteractionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Interactions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Interaction.
+    /// </summary>
+    /// <param name="options"> Delete Interaction parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Interaction </returns>
+    public static bool Delete(DeleteInteractionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Interaction.
+    /// </summary>
+    /// <param name="options"> Delete Interaction parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Interaction </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteInteractionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Interaction.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to delete </param>
+    /// <param name="pathSessionSid"> he SID of the parent Session of the resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Interaction </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathSessionSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteInteractionOptions(pathServiceSid, pathSessionSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Interaction.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to delete </param>
+    /// <param name="pathSessionSid"> he SID of the parent Session of the resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Interaction </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSessionSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteInteractionOptions(pathServiceSid, pathSessionSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a InteractionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> InteractionResource object represented by the provided JSON </returns>
+    public static InteractionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<InteractionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the resource's parent Session
+    /// </summary>
+    [JsonProperty("session_sid")]
+    public string SessionSid { get; private set; }
+    /// <summary>
+    /// The SID of the resource's parent Service
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// A JSON string that includes the message body of message interactions
+    /// </summary>
+    [JsonProperty("data")]
+    public string Data { get; private set; }
+    /// <summary>
+    /// The Type of the Interaction
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public InteractionResource.TypeEnum Type { get; private set; }
+    /// <summary>
+    /// The SID of the inbound Participant resource
+    /// </summary>
+    [JsonProperty("inbound_participant_sid")]
+    public string InboundParticipantSid { get; private set; }
+    /// <summary>
+    /// The SID of the inbound resource
+    /// </summary>
+    [JsonProperty("inbound_resource_sid")]
+    public string InboundResourceSid { get; private set; }
+    /// <summary>
+    /// The inbound resource status of the Interaction
+    /// </summary>
+    [JsonProperty("inbound_resource_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public InteractionResource.ResourceStatusEnum InboundResourceStatus { get; private set; }
+    /// <summary>
+    /// The inbound resource type
+    /// </summary>
+    [JsonProperty("inbound_resource_type")]
+    public string InboundResourceType { get; private set; }
+    /// <summary>
+    /// The URL of the Twilio inbound resource
+    /// </summary>
+    [JsonProperty("inbound_resource_url")]
+    public Uri InboundResourceUrl { get; private set; }
+    /// <summary>
+    /// The SID of the outbound Participant
+    /// </summary>
+    [JsonProperty("outbound_participant_sid")]
+    public string OutboundParticipantSid { get; private set; }
+    /// <summary>
+    /// The SID of the outbound resource
+    /// </summary>
+    [JsonProperty("outbound_resource_sid")]
+    public string OutboundResourceSid { get; private set; }
+    /// <summary>
+    /// The outbound resource status of the Interaction
+    /// </summary>
+    [JsonProperty("outbound_resource_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public InteractionResource.ResourceStatusEnum OutboundResourceStatus { get; private set; }
+    /// <summary>
+    /// The outbound resource type
+    /// </summary>
+    [JsonProperty("outbound_resource_type")]
+    public string OutboundResourceType { get; private set; }
+    /// <summary>
+    /// The URL of the Twilio outbound resource
+    /// </summary>
+    [JsonProperty("outbound_resource_url")]
+    public Uri OutboundResourceUrl { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Interaction was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Interaction resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private InteractionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/Service/Session/Participant/MessageInteractionOptions.cs b/src/Twilio/Rest/Proxy/V1/Service/Session/Participant/MessageInteractionOptions.cs
index 270e32b42..00df3fada 100644
--- a/src/Twilio/Rest/Proxy/V1/Service/Session/Participant/MessageInteractionOptions.cs
+++ b/src/Twilio/Rest/Proxy/V1/Service/Session/Participant/MessageInteractionOptions.cs
@@ -10,170 +10,170 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Proxy.V1.Service.Session.Participant
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new message Interaction to send directly from your system to one
+  /// [Participant](https://www.twilio.com/docs/proxy/api/participant).  The `inbound` properties for the Interaction will
+  /// always be empty.
+  /// </summary>
+  public class CreateMessageInteractionOptions : IOptions<MessageInteractionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new message Interaction to send directly from your system to one
-    /// [Participant](https://www.twilio.com/docs/proxy/api/participant).  The `inbound` properties for the Interaction will
-    /// always be empty.
-    /// </summary>
-    public class CreateMessageInteractionOptions : IOptions<MessageInteractionResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service resource
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the parent Session resource
-        /// </summary>
-        public string PathSessionSid { get; }
-        /// <summary>
-        /// The SID of the Participant resource
-        /// </summary>
-        public string PathParticipantSid { get; }
-        /// <summary>
-        /// Message body
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        public List<Uri> MediaUrl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateMessageInteractionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session resource </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
-        public CreateMessageInteractionOptions(string pathServiceSid, string pathSessionSid, string pathParticipantSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSessionSid = pathSessionSid;
-            PathParticipantSid = pathParticipantSid;
-            MediaUrl = new List<Uri>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Body != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Body", Body));
-            }
-
-            if (MediaUrl != null)
-            {
-                p.AddRange(MediaUrl.Select(prop => new KeyValuePair<string, string>("MediaUrl", Serializers.Url(prop))));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the parent Service resource
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// FetchMessageInteractionOptions
-    /// </summary>
-    public class FetchMessageInteractionOptions : IOptions<MessageInteractionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the parent Session
-        /// </summary>
-        public string PathSessionSid { get; }
-        /// <summary>
-        /// The SID of the Participant resource
-        /// </summary>
-        public string PathParticipantSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchMessageInteractionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchMessageInteractionOptions(string pathServiceSid,
-                                              string pathSessionSid,
-                                              string pathParticipantSid,
-                                              string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSessionSid = pathSessionSid;
-            PathParticipantSid = pathParticipantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the parent Session resource
+    /// </summary>
+    public string PathSessionSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// ReadMessageInteractionOptions
-    /// </summary>
-    public class ReadMessageInteractionOptions : ReadOptions<MessageInteractionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the parent Session
-        /// </summary>
-        public string PathSessionSid { get; }
-        /// <summary>
-        /// The SID of the Participant resource
-        /// </summary>
-        public string PathParticipantSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadMessageInteractionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
-        public ReadMessageInteractionOptions(string pathServiceSid, string pathSessionSid, string pathParticipantSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSessionSid = pathSessionSid;
-            PathParticipantSid = pathParticipantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Participant resource
+    /// </summary>
+    public string PathParticipantSid { get; }
+    /// <summary>
+    /// Message body
+    /// </summary>
+    public string Body { get; set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    public List<Uri> MediaUrl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateMessageInteractionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session resource </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
+    public CreateMessageInteractionOptions(string pathServiceSid, string pathSessionSid, string pathParticipantSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSessionSid = pathSessionSid;
+      PathParticipantSid = pathParticipantSid;
+      MediaUrl = new List<Uri>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Body != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Body", Body));
+      }
+
+      if (MediaUrl != null)
+      {
+        p.AddRange(MediaUrl.Select(prop => new KeyValuePair<string, string>("MediaUrl", Serializers.Url(prop))));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// FetchMessageInteractionOptions
+  /// </summary>
+  public class FetchMessageInteractionOptions : IOptions<MessageInteractionResource>
+  {
+    /// <summary>
+    /// The SID of the Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the parent Session
+    /// </summary>
+    public string PathSessionSid { get; }
+    /// <summary>
+    /// The SID of the Participant resource
+    /// </summary>
+    public string PathParticipantSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchMessageInteractionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchMessageInteractionOptions(string pathServiceSid,
+                                          string pathSessionSid,
+                                          string pathParticipantSid,
+                                          string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSessionSid = pathSessionSid;
+      PathParticipantSid = pathParticipantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// ReadMessageInteractionOptions
+  /// </summary>
+  public class ReadMessageInteractionOptions : ReadOptions<MessageInteractionResource>
+  {
+    /// <summary>
+    /// The SID of the Service to read the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the parent Session
+    /// </summary>
+    public string PathSessionSid { get; }
+    /// <summary>
+    /// The SID of the Participant resource
+    /// </summary>
+    public string PathParticipantSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadMessageInteractionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
+    public ReadMessageInteractionOptions(string pathServiceSid, string pathSessionSid, string pathParticipantSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSessionSid = pathSessionSid;
+      PathParticipantSid = pathParticipantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/Service/Session/Participant/MessageInteractionResource.cs b/src/Twilio/Rest/Proxy/V1/Service/Session/Participant/MessageInteractionResource.cs
index 478bf6f74..17916b0f1 100644
--- a/src/Twilio/Rest/Proxy/V1/Service/Session/Participant/MessageInteractionResource.cs
+++ b/src/Twilio/Rest/Proxy/V1/Service/Session/Participant/MessageInteractionResource.cs
@@ -19,500 +19,500 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Proxy.V1.Service.Session.Participant
-{
-
-    public class MessageInteractionResource : Resource
-    {
-        public sealed class TypeEnum : StringEnum
-        {
-            private TypeEnum(string value) : base(value) {}
-            public TypeEnum() {}
-            public static implicit operator TypeEnum(string value)
-            {
-                return new TypeEnum(value);
-            }
-
-            public static readonly TypeEnum Message = new TypeEnum("message");
-            public static readonly TypeEnum Voice = new TypeEnum("voice");
-            public static readonly TypeEnum Unknown = new TypeEnum("unknown");
-        }
-
-        public sealed class ResourceStatusEnum : StringEnum
-        {
-            private ResourceStatusEnum(string value) : base(value) {}
-            public ResourceStatusEnum() {}
-            public static implicit operator ResourceStatusEnum(string value)
-            {
-                return new ResourceStatusEnum(value);
-            }
-
-            public static readonly ResourceStatusEnum Accepted = new ResourceStatusEnum("accepted");
-            public static readonly ResourceStatusEnum Answered = new ResourceStatusEnum("answered");
-            public static readonly ResourceStatusEnum Busy = new ResourceStatusEnum("busy");
-            public static readonly ResourceStatusEnum Canceled = new ResourceStatusEnum("canceled");
-            public static readonly ResourceStatusEnum Completed = new ResourceStatusEnum("completed");
-            public static readonly ResourceStatusEnum Deleted = new ResourceStatusEnum("deleted");
-            public static readonly ResourceStatusEnum Delivered = new ResourceStatusEnum("delivered");
-            public static readonly ResourceStatusEnum DeliveryUnknown = new ResourceStatusEnum("delivery-unknown");
-            public static readonly ResourceStatusEnum Failed = new ResourceStatusEnum("failed");
-            public static readonly ResourceStatusEnum InProgress = new ResourceStatusEnum("in-progress");
-            public static readonly ResourceStatusEnum Initiated = new ResourceStatusEnum("initiated");
-            public static readonly ResourceStatusEnum NoAnswer = new ResourceStatusEnum("no-answer");
-            public static readonly ResourceStatusEnum Queued = new ResourceStatusEnum("queued");
-            public static readonly ResourceStatusEnum Received = new ResourceStatusEnum("received");
-            public static readonly ResourceStatusEnum Receiving = new ResourceStatusEnum("receiving");
-            public static readonly ResourceStatusEnum Ringing = new ResourceStatusEnum("ringing");
-            public static readonly ResourceStatusEnum Scheduled = new ResourceStatusEnum("scheduled");
-            public static readonly ResourceStatusEnum Sending = new ResourceStatusEnum("sending");
-            public static readonly ResourceStatusEnum Sent = new ResourceStatusEnum("sent");
-            public static readonly ResourceStatusEnum Undelivered = new ResourceStatusEnum("undelivered");
-            public static readonly ResourceStatusEnum Unknown = new ResourceStatusEnum("unknown");
-        }
-
-        private static Request BuildCreateRequest(CreateMessageInteractionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants/" + options.PathParticipantSid + "/MessageInteractions",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new message Interaction to send directly from your system to one
-        /// [Participant](https://www.twilio.com/docs/proxy/api/participant).  The `inbound` properties for the Interaction will
-        /// always be empty.
-        /// </summary>
-        /// <param name="options"> Create MessageInteraction parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessageInteraction </returns>
-        public static MessageInteractionResource Create(CreateMessageInteractionOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new message Interaction to send directly from your system to one
-        /// [Participant](https://www.twilio.com/docs/proxy/api/participant).  The `inbound` properties for the Interaction will
-        /// always be empty.
-        /// </summary>
-        /// <param name="options"> Create MessageInteraction parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessageInteraction </returns>
-        public static async System.Threading.Tasks.Task<MessageInteractionResource> CreateAsync(CreateMessageInteractionOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new message Interaction to send directly from your system to one
-        /// [Participant](https://www.twilio.com/docs/proxy/api/participant).  The `inbound` properties for the Interaction will
-        /// always be empty.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session resource </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
-        /// <param name="body"> Message body </param>
-        /// <param name="mediaUrl"> Reserved </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessageInteraction </returns>
-        public static MessageInteractionResource Create(string pathServiceSid,
-                                                        string pathSessionSid,
-                                                        string pathParticipantSid,
-                                                        string body = null,
-                                                        List<Uri> mediaUrl = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageInteractionOptions(pathServiceSid, pathSessionSid, pathParticipantSid){Body = body, MediaUrl = mediaUrl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new message Interaction to send directly from your system to one
-        /// [Participant](https://www.twilio.com/docs/proxy/api/participant).  The `inbound` properties for the Interaction will
-        /// always be empty.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session resource </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
-        /// <param name="body"> Message body </param>
-        /// <param name="mediaUrl"> Reserved </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessageInteraction </returns>
-        public static async System.Threading.Tasks.Task<MessageInteractionResource> CreateAsync(string pathServiceSid,
-                                                                                                string pathSessionSid,
-                                                                                                string pathParticipantSid,
-                                                                                                string body = null,
-                                                                                                List<Uri> mediaUrl = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateMessageInteractionOptions(pathServiceSid, pathSessionSid, pathParticipantSid){Body = body, MediaUrl = mediaUrl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchMessageInteractionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants/" + options.PathParticipantSid + "/MessageInteractions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch MessageInteraction parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessageInteraction </returns>
-        public static MessageInteractionResource Fetch(FetchMessageInteractionOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch MessageInteraction parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessageInteraction </returns>
-        public static async System.Threading.Tasks.Task<MessageInteractionResource> FetchAsync(FetchMessageInteractionOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessageInteraction </returns>
-        public static MessageInteractionResource Fetch(string pathServiceSid,
-                                                       string pathSessionSid,
-                                                       string pathParticipantSid,
-                                                       string pathSid,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageInteractionOptions(pathServiceSid, pathSessionSid, pathParticipantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessageInteraction </returns>
-        public static async System.Threading.Tasks.Task<MessageInteractionResource> FetchAsync(string pathServiceSid,
-                                                                                               string pathSessionSid,
-                                                                                               string pathParticipantSid,
-                                                                                               string pathSid,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchMessageInteractionOptions(pathServiceSid, pathSessionSid, pathParticipantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMessageInteractionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants/" + options.PathParticipantSid + "/MessageInteractions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read MessageInteraction parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessageInteraction </returns>
-        public static ResourceSet<MessageInteractionResource> Read(ReadMessageInteractionOptions options,
-                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MessageInteractionResource>.FromJson("interactions", response.Content);
-            return new ResourceSet<MessageInteractionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read MessageInteraction parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessageInteraction </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageInteractionResource>> ReadAsync(ReadMessageInteractionOptions options,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MessageInteractionResource>.FromJson("interactions", response.Content);
-            return new ResourceSet<MessageInteractionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessageInteraction </returns>
-        public static ResourceSet<MessageInteractionResource> Read(string pathServiceSid,
-                                                                   string pathSessionSid,
-                                                                   string pathParticipantSid,
-                                                                   int? pageSize = null,
-                                                                   long? limit = null,
-                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageInteractionOptions(pathServiceSid, pathSessionSid, pathParticipantSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessageInteraction </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessageInteractionResource>> ReadAsync(string pathServiceSid,
-                                                                                                           string pathSessionSid,
-                                                                                                           string pathParticipantSid,
-                                                                                                           int? pageSize = null,
-                                                                                                           long? limit = null,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadMessageInteractionOptions(pathServiceSid, pathSessionSid, pathParticipantSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MessageInteractionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MessageInteractionResource>.FromJson("interactions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MessageInteractionResource> NextPage(Page<MessageInteractionResource> page,
-                                                                ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageInteractionResource>.FromJson("interactions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MessageInteractionResource> PreviousPage(Page<MessageInteractionResource> page,
-                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<MessageInteractionResource>.FromJson("interactions", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a MessageInteractionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MessageInteractionResource object represented by the provided JSON </returns>
-        public static MessageInteractionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MessageInteractionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the resource's parent Session
-        /// </summary>
-        [JsonProperty("session_sid")]
-        public string SessionSid { get; private set; }
-        /// <summary>
-        /// The SID of the resource's parent Service
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// A JSON string that includes the message body sent to the participant
-        /// </summary>
-        [JsonProperty("data")]
-        public string Data { get; private set; }
-        /// <summary>
-        /// The Type of Message Interaction
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public MessageInteractionResource.TypeEnum Type { get; private set; }
-        /// <summary>
-        /// The SID of the Participant resource
-        /// </summary>
-        [JsonProperty("participant_sid")]
-        public string ParticipantSid { get; private set; }
-        /// <summary>
-        /// Always empty for Message Interactions
-        /// </summary>
-        [JsonProperty("inbound_participant_sid")]
-        public string InboundParticipantSid { get; private set; }
-        /// <summary>
-        /// Always empty for Message Interactions
-        /// </summary>
-        [JsonProperty("inbound_resource_sid")]
-        public string InboundResourceSid { get; private set; }
-        /// <summary>
-        /// Always empty for Message Interactions
-        /// </summary>
-        [JsonProperty("inbound_resource_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public MessageInteractionResource.ResourceStatusEnum InboundResourceStatus { get; private set; }
-        /// <summary>
-        /// Always empty for Message Interactions
-        /// </summary>
-        [JsonProperty("inbound_resource_type")]
-        public string InboundResourceType { get; private set; }
-        /// <summary>
-        /// Always empty for Message Interactions
-        /// </summary>
-        [JsonProperty("inbound_resource_url")]
-        public Uri InboundResourceUrl { get; private set; }
-        /// <summary>
-        /// The SID of the outbound Participant resource
-        /// </summary>
-        [JsonProperty("outbound_participant_sid")]
-        public string OutboundParticipantSid { get; private set; }
-        /// <summary>
-        /// The SID of the outbound Message resource
-        /// </summary>
-        [JsonProperty("outbound_resource_sid")]
-        public string OutboundResourceSid { get; private set; }
-        /// <summary>
-        /// The outbound resource status
-        /// </summary>
-        [JsonProperty("outbound_resource_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public MessageInteractionResource.ResourceStatusEnum OutboundResourceStatus { get; private set; }
-        /// <summary>
-        /// The outbound resource type
-        /// </summary>
-        [JsonProperty("outbound_resource_type")]
-        public string OutboundResourceType { get; private set; }
-        /// <summary>
-        /// The URL of the Twilio message resource
-        /// </summary>
-        [JsonProperty("outbound_resource_url")]
-        public Uri OutboundResourceUrl { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the MessageInteraction resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private MessageInteractionResource()
-        {
-
-        }
-    }
+{
+
+  public class MessageInteractionResource : Resource
+  {
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+      public TypeEnum() { }
+      public static implicit operator TypeEnum(string value)
+      {
+        return new TypeEnum(value);
+      }
+
+      public static readonly TypeEnum Message = new TypeEnum("message");
+      public static readonly TypeEnum Voice = new TypeEnum("voice");
+      public static readonly TypeEnum Unknown = new TypeEnum("unknown");
+    }
+
+    public sealed class ResourceStatusEnum : StringEnum
+    {
+      private ResourceStatusEnum(string value) : base(value) { }
+      public ResourceStatusEnum() { }
+      public static implicit operator ResourceStatusEnum(string value)
+      {
+        return new ResourceStatusEnum(value);
+      }
+
+      public static readonly ResourceStatusEnum Accepted = new ResourceStatusEnum("accepted");
+      public static readonly ResourceStatusEnum Answered = new ResourceStatusEnum("answered");
+      public static readonly ResourceStatusEnum Busy = new ResourceStatusEnum("busy");
+      public static readonly ResourceStatusEnum Canceled = new ResourceStatusEnum("canceled");
+      public static readonly ResourceStatusEnum Completed = new ResourceStatusEnum("completed");
+      public static readonly ResourceStatusEnum Deleted = new ResourceStatusEnum("deleted");
+      public static readonly ResourceStatusEnum Delivered = new ResourceStatusEnum("delivered");
+      public static readonly ResourceStatusEnum DeliveryUnknown = new ResourceStatusEnum("delivery-unknown");
+      public static readonly ResourceStatusEnum Failed = new ResourceStatusEnum("failed");
+      public static readonly ResourceStatusEnum InProgress = new ResourceStatusEnum("in-progress");
+      public static readonly ResourceStatusEnum Initiated = new ResourceStatusEnum("initiated");
+      public static readonly ResourceStatusEnum NoAnswer = new ResourceStatusEnum("no-answer");
+      public static readonly ResourceStatusEnum Queued = new ResourceStatusEnum("queued");
+      public static readonly ResourceStatusEnum Received = new ResourceStatusEnum("received");
+      public static readonly ResourceStatusEnum Receiving = new ResourceStatusEnum("receiving");
+      public static readonly ResourceStatusEnum Ringing = new ResourceStatusEnum("ringing");
+      public static readonly ResourceStatusEnum Scheduled = new ResourceStatusEnum("scheduled");
+      public static readonly ResourceStatusEnum Sending = new ResourceStatusEnum("sending");
+      public static readonly ResourceStatusEnum Sent = new ResourceStatusEnum("sent");
+      public static readonly ResourceStatusEnum Undelivered = new ResourceStatusEnum("undelivered");
+      public static readonly ResourceStatusEnum Unknown = new ResourceStatusEnum("unknown");
+    }
+
+    private static Request BuildCreateRequest(CreateMessageInteractionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants/" + options.PathParticipantSid + "/MessageInteractions",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new message Interaction to send directly from your system to one
+    /// [Participant](https://www.twilio.com/docs/proxy/api/participant).  The `inbound` properties for the Interaction will
+    /// always be empty.
+    /// </summary>
+    /// <param name="options"> Create MessageInteraction parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessageInteraction </returns>
+    public static MessageInteractionResource Create(CreateMessageInteractionOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new message Interaction to send directly from your system to one
+    /// [Participant](https://www.twilio.com/docs/proxy/api/participant).  The `inbound` properties for the Interaction will
+    /// always be empty.
+    /// </summary>
+    /// <param name="options"> Create MessageInteraction parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessageInteraction </returns>
+    public static async System.Threading.Tasks.Task<MessageInteractionResource> CreateAsync(CreateMessageInteractionOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new message Interaction to send directly from your system to one
+    /// [Participant](https://www.twilio.com/docs/proxy/api/participant).  The `inbound` properties for the Interaction will
+    /// always be empty.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session resource </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
+    /// <param name="body"> Message body </param>
+    /// <param name="mediaUrl"> Reserved </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessageInteraction </returns>
+    public static MessageInteractionResource Create(string pathServiceSid,
+                                                    string pathSessionSid,
+                                                    string pathParticipantSid,
+                                                    string body = null,
+                                                    List<Uri> mediaUrl = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageInteractionOptions(pathServiceSid, pathSessionSid, pathParticipantSid) { Body = body, MediaUrl = mediaUrl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new message Interaction to send directly from your system to one
+    /// [Participant](https://www.twilio.com/docs/proxy/api/participant).  The `inbound` properties for the Interaction will
+    /// always be empty.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session resource </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
+    /// <param name="body"> Message body </param>
+    /// <param name="mediaUrl"> Reserved </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessageInteraction </returns>
+    public static async System.Threading.Tasks.Task<MessageInteractionResource> CreateAsync(string pathServiceSid,
+                                                                                            string pathSessionSid,
+                                                                                            string pathParticipantSid,
+                                                                                            string body = null,
+                                                                                            List<Uri> mediaUrl = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateMessageInteractionOptions(pathServiceSid, pathSessionSid, pathParticipantSid) { Body = body, MediaUrl = mediaUrl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchMessageInteractionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants/" + options.PathParticipantSid + "/MessageInteractions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch MessageInteraction parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessageInteraction </returns>
+    public static MessageInteractionResource Fetch(FetchMessageInteractionOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch MessageInteraction parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessageInteraction </returns>
+    public static async System.Threading.Tasks.Task<MessageInteractionResource> FetchAsync(FetchMessageInteractionOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessageInteraction </returns>
+    public static MessageInteractionResource Fetch(string pathServiceSid,
+                                                   string pathSessionSid,
+                                                   string pathParticipantSid,
+                                                   string pathSid,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageInteractionOptions(pathServiceSid, pathSessionSid, pathParticipantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessageInteraction </returns>
+    public static async System.Threading.Tasks.Task<MessageInteractionResource> FetchAsync(string pathServiceSid,
+                                                                                           string pathSessionSid,
+                                                                                           string pathParticipantSid,
+                                                                                           string pathSid,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchMessageInteractionOptions(pathServiceSid, pathSessionSid, pathParticipantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMessageInteractionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants/" + options.PathParticipantSid + "/MessageInteractions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read MessageInteraction parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessageInteraction </returns>
+    public static ResourceSet<MessageInteractionResource> Read(ReadMessageInteractionOptions options,
+                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MessageInteractionResource>.FromJson("interactions", response.Content);
+      return new ResourceSet<MessageInteractionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read MessageInteraction parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessageInteraction </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageInteractionResource>> ReadAsync(ReadMessageInteractionOptions options,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MessageInteractionResource>.FromJson("interactions", response.Content);
+      return new ResourceSet<MessageInteractionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessageInteraction </returns>
+    public static ResourceSet<MessageInteractionResource> Read(string pathServiceSid,
+                                                               string pathSessionSid,
+                                                               string pathParticipantSid,
+                                                               int? pageSize = null,
+                                                               long? limit = null,
+                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageInteractionOptions(pathServiceSid, pathSessionSid, pathParticipantSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the resource from </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessageInteraction </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessageInteractionResource>> ReadAsync(string pathServiceSid,
+                                                                                                       string pathSessionSid,
+                                                                                                       string pathParticipantSid,
+                                                                                                       int? pageSize = null,
+                                                                                                       long? limit = null,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadMessageInteractionOptions(pathServiceSid, pathSessionSid, pathParticipantSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MessageInteractionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MessageInteractionResource>.FromJson("interactions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MessageInteractionResource> NextPage(Page<MessageInteractionResource> page,
+                                                            ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageInteractionResource>.FromJson("interactions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MessageInteractionResource> PreviousPage(Page<MessageInteractionResource> page,
+                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<MessageInteractionResource>.FromJson("interactions", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a MessageInteractionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MessageInteractionResource object represented by the provided JSON </returns>
+    public static MessageInteractionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MessageInteractionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the resource's parent Session
+    /// </summary>
+    [JsonProperty("session_sid")]
+    public string SessionSid { get; private set; }
+    /// <summary>
+    /// The SID of the resource's parent Service
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// A JSON string that includes the message body sent to the participant
+    /// </summary>
+    [JsonProperty("data")]
+    public string Data { get; private set; }
+    /// <summary>
+    /// The Type of Message Interaction
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public MessageInteractionResource.TypeEnum Type { get; private set; }
+    /// <summary>
+    /// The SID of the Participant resource
+    /// </summary>
+    [JsonProperty("participant_sid")]
+    public string ParticipantSid { get; private set; }
+    /// <summary>
+    /// Always empty for Message Interactions
+    /// </summary>
+    [JsonProperty("inbound_participant_sid")]
+    public string InboundParticipantSid { get; private set; }
+    /// <summary>
+    /// Always empty for Message Interactions
+    /// </summary>
+    [JsonProperty("inbound_resource_sid")]
+    public string InboundResourceSid { get; private set; }
+    /// <summary>
+    /// Always empty for Message Interactions
+    /// </summary>
+    [JsonProperty("inbound_resource_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public MessageInteractionResource.ResourceStatusEnum InboundResourceStatus { get; private set; }
+    /// <summary>
+    /// Always empty for Message Interactions
+    /// </summary>
+    [JsonProperty("inbound_resource_type")]
+    public string InboundResourceType { get; private set; }
+    /// <summary>
+    /// Always empty for Message Interactions
+    /// </summary>
+    [JsonProperty("inbound_resource_url")]
+    public Uri InboundResourceUrl { get; private set; }
+    /// <summary>
+    /// The SID of the outbound Participant resource
+    /// </summary>
+    [JsonProperty("outbound_participant_sid")]
+    public string OutboundParticipantSid { get; private set; }
+    /// <summary>
+    /// The SID of the outbound Message resource
+    /// </summary>
+    [JsonProperty("outbound_resource_sid")]
+    public string OutboundResourceSid { get; private set; }
+    /// <summary>
+    /// The outbound resource status
+    /// </summary>
+    [JsonProperty("outbound_resource_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public MessageInteractionResource.ResourceStatusEnum OutboundResourceStatus { get; private set; }
+    /// <summary>
+    /// The outbound resource type
+    /// </summary>
+    [JsonProperty("outbound_resource_type")]
+    public string OutboundResourceType { get; private set; }
+    /// <summary>
+    /// The URL of the Twilio message resource
+    /// </summary>
+    [JsonProperty("outbound_resource_url")]
+    public Uri OutboundResourceUrl { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the MessageInteraction resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private MessageInteractionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/Service/Session/ParticipantOptions.cs b/src/Twilio/Rest/Proxy/V1/Service/Session/ParticipantOptions.cs
index 4f7b6aebf..ae8226cca 100644
--- a/src/Twilio/Rest/Proxy/V1/Service/Session/ParticipantOptions.cs
+++ b/src/Twilio/Rest/Proxy/V1/Service/Session/ParticipantOptions.cs
@@ -9,220 +9,220 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Proxy.V1.Service.Session
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific Participant.
+  /// </summary>
+  public class FetchParticipantOptions : IOptions<ParticipantResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific Participant.
-    /// </summary>
-    public class FetchParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service of the resource to fetch
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the parent Session of the resource to fetch
-        /// </summary>
-        public string PathSessionSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchParticipantOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to fetch </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchParticipantOptions(string pathServiceSid, string pathSessionSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSessionSid = pathSessionSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the parent Service of the resource to fetch
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Participants in a Session.
-    /// </summary>
-    public class ReadParticipantOptions : ReadOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service of the resource to read
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the parent Session of the resource to read
-        /// </summary>
-        public string PathSessionSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadParticipantOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to read </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session of the resource to read </param>
-        public ReadParticipantOptions(string pathServiceSid, string pathSessionSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSessionSid = pathSessionSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the parent Session of the resource to fetch
+    /// </summary>
+    public string PathSessionSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Add a new Participant to the Session
-    /// </summary>
-    public class CreateParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service resource
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the parent Session resource
-        /// </summary>
-        public string PathSessionSid { get; }
-        /// <summary>
-        /// The phone number of the Participant
-        /// </summary>
-        public string Identifier { get; }
-        /// <summary>
-        /// The string that you assigned to describe the participant
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The proxy phone number to use for the Participant
-        /// </summary>
-        public string ProxyIdentifier { get; set; }
-        /// <summary>
-        /// The Proxy Identifier Sid
-        /// </summary>
-        public string ProxyIdentifierSid { get; set; }
-        /// <summary>
-        /// An experimental parameter to override the ProxyAllowParticipantConflict account flag on a per-request basis.
-        /// </summary>
-        public bool? FailOnParticipantConflict { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateParticipantOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session resource </param>
-        /// <param name="identifier"> The phone number of the Participant </param>
-        public CreateParticipantOptions(string pathServiceSid, string pathSessionSid, string identifier)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSessionSid = pathSessionSid;
-            Identifier = identifier;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identifier != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identifier", Identifier));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (ProxyIdentifier != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ProxyIdentifier", ProxyIdentifier));
-            }
-
-            if (ProxyIdentifierSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ProxyIdentifierSid", ProxyIdentifierSid.ToString()));
-            }
-
-            if (FailOnParticipantConflict != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FailOnParticipantConflict", FailOnParticipantConflict.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific Participant. This is a soft-delete. The participant remains associated with the session and cannot
-    /// be re-added. Participants are only permanently deleted when the
-    /// [Session](https://www.twilio.com/docs/proxy/api/session) is deleted.
-    /// </summary>
-    public class DeleteParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service of the resource to delete
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the parent Session of the resource to delete
-        /// </summary>
-        public string PathSessionSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteParticipantOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to delete </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session of the resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteParticipantOptions(string pathServiceSid, string pathSessionSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSessionSid = pathSessionSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new FetchParticipantOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to fetch </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchParticipantOptions(string pathServiceSid, string pathSessionSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSessionSid = pathSessionSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Participants in a Session.
+  /// </summary>
+  public class ReadParticipantOptions : ReadOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the parent Service of the resource to read
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the parent Session of the resource to read
+    /// </summary>
+    public string PathSessionSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadParticipantOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to read </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session of the resource to read </param>
+    public ReadParticipantOptions(string pathServiceSid, string pathSessionSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSessionSid = pathSessionSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Add a new Participant to the Session
+  /// </summary>
+  public class CreateParticipantOptions : IOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the parent Service resource
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the parent Session resource
+    /// </summary>
+    public string PathSessionSid { get; }
+    /// <summary>
+    /// The phone number of the Participant
+    /// </summary>
+    public string Identifier { get; }
+    /// <summary>
+    /// The string that you assigned to describe the participant
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The proxy phone number to use for the Participant
+    /// </summary>
+    public string ProxyIdentifier { get; set; }
+    /// <summary>
+    /// The Proxy Identifier Sid
+    /// </summary>
+    public string ProxyIdentifierSid { get; set; }
+    /// <summary>
+    /// An experimental parameter to override the ProxyAllowParticipantConflict account flag on a per-request basis.
+    /// </summary>
+    public bool? FailOnParticipantConflict { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateParticipantOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session resource </param>
+    /// <param name="identifier"> The phone number of the Participant </param>
+    public CreateParticipantOptions(string pathServiceSid, string pathSessionSid, string identifier)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSessionSid = pathSessionSid;
+      Identifier = identifier;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identifier != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identifier", Identifier));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (ProxyIdentifier != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ProxyIdentifier", ProxyIdentifier));
+      }
+
+      if (ProxyIdentifierSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ProxyIdentifierSid", ProxyIdentifierSid.ToString()));
+      }
+
+      if (FailOnParticipantConflict != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FailOnParticipantConflict", FailOnParticipantConflict.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific Participant. This is a soft-delete. The participant remains associated with the session and cannot
+  /// be re-added. Participants are only permanently deleted when the
+  /// [Session](https://www.twilio.com/docs/proxy/api/session) is deleted.
+  /// </summary>
+  public class DeleteParticipantOptions : IOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the parent Service of the resource to delete
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the parent Session of the resource to delete
+    /// </summary>
+    public string PathSessionSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteParticipantOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to delete </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session of the resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteParticipantOptions(string pathServiceSid, string pathSessionSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSessionSid = pathSessionSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/Service/Session/ParticipantResource.cs b/src/Twilio/Rest/Proxy/V1/Service/Session/ParticipantResource.cs
index 7bfad4084..0a7af42f7 100644
--- a/src/Twilio/Rest/Proxy/V1/Service/Session/ParticipantResource.cs
+++ b/src/Twilio/Rest/Proxy/V1/Service/Session/ParticipantResource.cs
@@ -18,489 +18,489 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Proxy.V1.Service.Session
-{
-
-    public class ParticipantResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Participant.
-        /// </summary>
-        /// <param name="options"> Fetch Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Fetch(FetchParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Participant.
-        /// </summary>
-        /// <param name="options"> Fetch Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(FetchParticipantOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Participant.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to fetch </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Fetch(string pathServiceSid,
-                                                string pathSessionSid,
-                                                string pathSid,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchParticipantOptions(pathServiceSid, pathSessionSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Participant.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to fetch </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session of the resource to fetch </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(string pathServiceSid,
-                                                                                        string pathSessionSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchParticipantOptions(pathServiceSid, pathSessionSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Participants in a Session.
-        /// </summary>
-        /// <param name="options"> Read Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ResourceSet<ParticipantResource> Read(ReadParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantResource>.FromJson("participants", response.Content);
-            return new ResourceSet<ParticipantResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Participants in a Session.
-        /// </summary>
-        /// <param name="options"> Read Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(ReadParticipantOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantResource>.FromJson("participants", response.Content);
-            return new ResourceSet<ParticipantResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Participants in a Session.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to read </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session of the resource to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ResourceSet<ParticipantResource> Read(string pathServiceSid,
-                                                            string pathSessionSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantOptions(pathServiceSid, pathSessionSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Participants in a Session.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to read </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session of the resource to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(string pathServiceSid,
-                                                                                                    string pathSessionSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantOptions(pathServiceSid, pathSessionSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ParticipantResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ParticipantResource> NextPage(Page<ParticipantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ParticipantResource> PreviousPage(Page<ParticipantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Add a new Participant to the Session
-        /// </summary>
-        /// <param name="options"> Create Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Create(CreateParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new Participant to the Session
-        /// </summary>
-        /// <param name="options"> Create Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(CreateParticipantOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Add a new Participant to the Session
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session resource </param>
-        /// <param name="identifier"> The phone number of the Participant </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the participant </param>
-        /// <param name="proxyIdentifier"> The proxy phone number to use for the Participant </param>
-        /// <param name="proxyIdentifierSid"> The Proxy Identifier Sid </param>
-        /// <param name="failOnParticipantConflict"> An experimental parameter to override the ProxyAllowParticipantConflict
-        ///                                 account flag on a per-request basis. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Create(string pathServiceSid,
-                                                 string pathSessionSid,
-                                                 string identifier,
-                                                 string friendlyName = null,
-                                                 string proxyIdentifier = null,
-                                                 string proxyIdentifierSid = null,
-                                                 bool? failOnParticipantConflict = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateParticipantOptions(pathServiceSid, pathSessionSid, identifier){FriendlyName = friendlyName, ProxyIdentifier = proxyIdentifier, ProxyIdentifierSid = proxyIdentifierSid, FailOnParticipantConflict = failOnParticipantConflict};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a new Participant to the Session
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session resource </param>
-        /// <param name="identifier"> The phone number of the Participant </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the participant </param>
-        /// <param name="proxyIdentifier"> The proxy phone number to use for the Participant </param>
-        /// <param name="proxyIdentifierSid"> The Proxy Identifier Sid </param>
-        /// <param name="failOnParticipantConflict"> An experimental parameter to override the ProxyAllowParticipantConflict
-        ///                                 account flag on a per-request basis. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(string pathServiceSid,
-                                                                                         string pathSessionSid,
-                                                                                         string identifier,
-                                                                                         string friendlyName = null,
-                                                                                         string proxyIdentifier = null,
-                                                                                         string proxyIdentifierSid = null,
-                                                                                         bool? failOnParticipantConflict = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateParticipantOptions(pathServiceSid, pathSessionSid, identifier){FriendlyName = friendlyName, ProxyIdentifier = proxyIdentifier, ProxyIdentifierSid = proxyIdentifierSid, FailOnParticipantConflict = failOnParticipantConflict};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Participant. This is a soft-delete. The participant remains associated with the session and cannot
-        /// be re-added. Participants are only permanently deleted when the
-        /// [Session](https://www.twilio.com/docs/proxy/api/session) is deleted.
-        /// </summary>
-        /// <param name="options"> Delete Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static bool Delete(DeleteParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Participant. This is a soft-delete. The participant remains associated with the session and cannot
-        /// be re-added. Participants are only permanently deleted when the
-        /// [Session](https://www.twilio.com/docs/proxy/api/session) is deleted.
-        /// </summary>
-        /// <param name="options"> Delete Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteParticipantOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Participant. This is a soft-delete. The participant remains associated with the session and cannot
-        /// be re-added. Participants are only permanently deleted when the
-        /// [Session](https://www.twilio.com/docs/proxy/api/session) is deleted.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to delete </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session of the resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathSessionSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteParticipantOptions(pathServiceSid, pathSessionSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Participant. This is a soft-delete. The participant remains associated with the session and cannot
-        /// be re-added. Participants are only permanently deleted when the
-        /// [Session](https://www.twilio.com/docs/proxy/api/session) is deleted.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service of the resource to delete </param>
-        /// <param name="pathSessionSid"> The SID of the parent Session of the resource to delete </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSessionSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteParticipantOptions(pathServiceSid, pathSessionSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ParticipantResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ParticipantResource object represented by the provided JSON </returns>
-        public static ParticipantResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ParticipantResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the resource's parent Session
-        /// </summary>
-        [JsonProperty("session_sid")]
-        public string SessionSid { get; private set; }
-        /// <summary>
-        /// The SID of the resource's parent Service
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the participant
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The phone number or channel identifier of the Participant
-        /// </summary>
-        [JsonProperty("identifier")]
-        public string Identifier { get; private set; }
-        /// <summary>
-        /// The phone number or short code of the participant's partner
-        /// </summary>
-        [JsonProperty("proxy_identifier")]
-        public string ProxyIdentifier { get; private set; }
-        /// <summary>
-        /// The SID of the Proxy Identifier assigned to the Participant
-        /// </summary>
-        [JsonProperty("proxy_identifier_sid")]
-        public string ProxyIdentifierSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date the Participant was removed
-        /// </summary>
-        [JsonProperty("date_deleted")]
-        public DateTime? DateDeleted { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Participant resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs to resources related the participant
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ParticipantResource()
-        {
-
-        }
-    }
+{
+
+  public class ParticipantResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Participant.
+    /// </summary>
+    /// <param name="options"> Fetch Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Fetch(FetchParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Participant.
+    /// </summary>
+    /// <param name="options"> Fetch Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(FetchParticipantOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Participant.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to fetch </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Fetch(string pathServiceSid,
+                                            string pathSessionSid,
+                                            string pathSid,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchParticipantOptions(pathServiceSid, pathSessionSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Participant.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to fetch </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session of the resource to fetch </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(string pathServiceSid,
+                                                                                    string pathSessionSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchParticipantOptions(pathServiceSid, pathSessionSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Participants in a Session.
+    /// </summary>
+    /// <param name="options"> Read Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ResourceSet<ParticipantResource> Read(ReadParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantResource>.FromJson("participants", response.Content);
+      return new ResourceSet<ParticipantResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Participants in a Session.
+    /// </summary>
+    /// <param name="options"> Read Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(ReadParticipantOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantResource>.FromJson("participants", response.Content);
+      return new ResourceSet<ParticipantResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Participants in a Session.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to read </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session of the resource to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ResourceSet<ParticipantResource> Read(string pathServiceSid,
+                                                        string pathSessionSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantOptions(pathServiceSid, pathSessionSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Participants in a Session.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to read </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session of the resource to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(string pathServiceSid,
+                                                                                                string pathSessionSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantOptions(pathServiceSid, pathSessionSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ParticipantResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ParticipantResource> NextPage(Page<ParticipantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ParticipantResource> PreviousPage(Page<ParticipantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Add a new Participant to the Session
+    /// </summary>
+    /// <param name="options"> Create Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Create(CreateParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new Participant to the Session
+    /// </summary>
+    /// <param name="options"> Create Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(CreateParticipantOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Add a new Participant to the Session
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session resource </param>
+    /// <param name="identifier"> The phone number of the Participant </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the participant </param>
+    /// <param name="proxyIdentifier"> The proxy phone number to use for the Participant </param>
+    /// <param name="proxyIdentifierSid"> The Proxy Identifier Sid </param>
+    /// <param name="failOnParticipantConflict"> An experimental parameter to override the ProxyAllowParticipantConflict
+    ///                                 account flag on a per-request basis. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Create(string pathServiceSid,
+                                             string pathSessionSid,
+                                             string identifier,
+                                             string friendlyName = null,
+                                             string proxyIdentifier = null,
+                                             string proxyIdentifierSid = null,
+                                             bool? failOnParticipantConflict = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateParticipantOptions(pathServiceSid, pathSessionSid, identifier) { FriendlyName = friendlyName, ProxyIdentifier = proxyIdentifier, ProxyIdentifierSid = proxyIdentifierSid, FailOnParticipantConflict = failOnParticipantConflict };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a new Participant to the Session
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session resource </param>
+    /// <param name="identifier"> The phone number of the Participant </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the participant </param>
+    /// <param name="proxyIdentifier"> The proxy phone number to use for the Participant </param>
+    /// <param name="proxyIdentifierSid"> The Proxy Identifier Sid </param>
+    /// <param name="failOnParticipantConflict"> An experimental parameter to override the ProxyAllowParticipantConflict
+    ///                                 account flag on a per-request basis. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> CreateAsync(string pathServiceSid,
+                                                                                     string pathSessionSid,
+                                                                                     string identifier,
+                                                                                     string friendlyName = null,
+                                                                                     string proxyIdentifier = null,
+                                                                                     string proxyIdentifierSid = null,
+                                                                                     bool? failOnParticipantConflict = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateParticipantOptions(pathServiceSid, pathSessionSid, identifier) { FriendlyName = friendlyName, ProxyIdentifier = proxyIdentifier, ProxyIdentifierSid = proxyIdentifierSid, FailOnParticipantConflict = failOnParticipantConflict };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSessionSid + "/Participants/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Participant. This is a soft-delete. The participant remains associated with the session and cannot
+    /// be re-added. Participants are only permanently deleted when the
+    /// [Session](https://www.twilio.com/docs/proxy/api/session) is deleted.
+    /// </summary>
+    /// <param name="options"> Delete Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static bool Delete(DeleteParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Participant. This is a soft-delete. The participant remains associated with the session and cannot
+    /// be re-added. Participants are only permanently deleted when the
+    /// [Session](https://www.twilio.com/docs/proxy/api/session) is deleted.
+    /// </summary>
+    /// <param name="options"> Delete Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteParticipantOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Participant. This is a soft-delete. The participant remains associated with the session and cannot
+    /// be re-added. Participants are only permanently deleted when the
+    /// [Session](https://www.twilio.com/docs/proxy/api/session) is deleted.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to delete </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session of the resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathSessionSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteParticipantOptions(pathServiceSid, pathSessionSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Participant. This is a soft-delete. The participant remains associated with the session and cannot
+    /// be re-added. Participants are only permanently deleted when the
+    /// [Session](https://www.twilio.com/docs/proxy/api/session) is deleted.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service of the resource to delete </param>
+    /// <param name="pathSessionSid"> The SID of the parent Session of the resource to delete </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSessionSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteParticipantOptions(pathServiceSid, pathSessionSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ParticipantResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ParticipantResource object represented by the provided JSON </returns>
+    public static ParticipantResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ParticipantResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the resource's parent Session
+    /// </summary>
+    [JsonProperty("session_sid")]
+    public string SessionSid { get; private set; }
+    /// <summary>
+    /// The SID of the resource's parent Service
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the participant
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The phone number or channel identifier of the Participant
+    /// </summary>
+    [JsonProperty("identifier")]
+    public string Identifier { get; private set; }
+    /// <summary>
+    /// The phone number or short code of the participant's partner
+    /// </summary>
+    [JsonProperty("proxy_identifier")]
+    public string ProxyIdentifier { get; private set; }
+    /// <summary>
+    /// The SID of the Proxy Identifier assigned to the Participant
+    /// </summary>
+    [JsonProperty("proxy_identifier_sid")]
+    public string ProxyIdentifierSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date the Participant was removed
+    /// </summary>
+    [JsonProperty("date_deleted")]
+    public DateTime? DateDeleted { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Participant resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs to resources related the participant
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ParticipantResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/Service/SessionOptions.cs b/src/Twilio/Rest/Proxy/V1/Service/SessionOptions.cs
index ab9e0a2bb..7aca1d7ce 100644
--- a/src/Twilio/Rest/Proxy/V1/Service/SessionOptions.cs
+++ b/src/Twilio/Rest/Proxy/V1/Service/SessionOptions.cs
@@ -10,284 +10,284 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Proxy.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific Session.
+  /// </summary>
+  public class FetchSessionOptions : IOptions<SessionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific Session.
+    /// The SID of the Service to fetch the resource from
     /// </summary>
-    public class FetchSessionOptions : IOptions<SessionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSessionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchSessionOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Sessions for the Service. A maximum of 100 records will be returned per page.
+    /// The unique string that identifies the resource
     /// </summary>
-    public class ReadSessionOptions : ReadOptions<SessionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadSessionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        public ReadSessionOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Session
+    /// Construct a new FetchSessionOptions
     /// </summary>
-    public class CreateSessionOptions : IOptions<SessionResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service resource
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The ISO 8601 date when the Session should expire
-        /// </summary>
-        public DateTime? DateExpiry { get; set; }
-        /// <summary>
-        /// When the session will expire
-        /// </summary>
-        public int? Ttl { get; set; }
-        /// <summary>
-        /// The Mode of the Session
-        /// </summary>
-        public SessionResource.ModeEnum Mode { get; set; }
-        /// <summary>
-        /// Session status
-        /// </summary>
-        public SessionResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The Participant objects to include in the new session
-        /// </summary>
-        public List<object> Participants { get; set; }
-        /// <summary>
-        /// An experimental parameter to override the ProxyAllowParticipantConflict account flag on a per-request basis.
-        /// </summary>
-        public bool? FailOnParticipantConflict { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSessionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
-        public CreateSessionOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-            Participants = new List<object>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (DateExpiry != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateExpiry", Serializers.DateTimeIso8601(DateExpiry)));
-            }
-
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            if (Mode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Mode", Mode.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Participants != null)
-            {
-                p.AddRange(Participants.Select(prop => new KeyValuePair<string, string>("Participants", Serializers.JsonObject(prop))));
-            }
-
-            if (FailOnParticipantConflict != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FailOnParticipantConflict", FailOnParticipantConflict.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchSessionOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific Session.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteSessionOptions : IOptions<SessionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSessionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteSessionOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Sessions for the Service. A maximum of 100 records will be returned per page.
+  /// </summary>
+  public class ReadSessionOptions : ReadOptions<SessionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update a specific Session.
+    /// The SID of the Service to fetch the resource from
     /// </summary>
-    public class UpdateSessionOptions : IOptions<SessionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The ISO 8601 date when the Session should expire
-        /// </summary>
-        public DateTime? DateExpiry { get; set; }
-        /// <summary>
-        /// When the session will expire
-        /// </summary>
-        public int? Ttl { get; set; }
-        /// <summary>
-        /// The new status of the resource
-        /// </summary>
-        public SessionResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// An experimental parameter to override the ProxyAllowParticipantConflict account flag on a per-request basis.
-        /// </summary>
-        public bool? FailOnParticipantConflict { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSessionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateSessionOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DateExpiry != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateExpiry", Serializers.DateTimeIso8601(DateExpiry)));
-            }
-
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (FailOnParticipantConflict != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FailOnParticipantConflict", FailOnParticipantConflict.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadSessionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    public ReadSessionOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Session
+  /// </summary>
+  public class CreateSessionOptions : IOptions<SessionResource>
+  {
+    /// <summary>
+    /// The SID of the parent Service resource
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The ISO 8601 date when the Session should expire
+    /// </summary>
+    public DateTime? DateExpiry { get; set; }
+    /// <summary>
+    /// When the session will expire
+    /// </summary>
+    public int? Ttl { get; set; }
+    /// <summary>
+    /// The Mode of the Session
+    /// </summary>
+    public SessionResource.ModeEnum Mode { get; set; }
+    /// <summary>
+    /// Session status
+    /// </summary>
+    public SessionResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The Participant objects to include in the new session
+    /// </summary>
+    public List<object> Participants { get; set; }
+    /// <summary>
+    /// An experimental parameter to override the ProxyAllowParticipantConflict account flag on a per-request basis.
+    /// </summary>
+    public bool? FailOnParticipantConflict { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateSessionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
+    public CreateSessionOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+      Participants = new List<object>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (DateExpiry != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateExpiry", Serializers.DateTimeIso8601(DateExpiry)));
+      }
+
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      if (Mode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Mode", Mode.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Participants != null)
+      {
+        p.AddRange(Participants.Select(prop => new KeyValuePair<string, string>("Participants", Serializers.JsonObject(prop))));
+      }
+
+      if (FailOnParticipantConflict != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FailOnParticipantConflict", FailOnParticipantConflict.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific Session.
+  /// </summary>
+  public class DeleteSessionOptions : IOptions<SessionResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSessionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteSessionOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update a specific Session.
+  /// </summary>
+  public class UpdateSessionOptions : IOptions<SessionResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The ISO 8601 date when the Session should expire
+    /// </summary>
+    public DateTime? DateExpiry { get; set; }
+    /// <summary>
+    /// When the session will expire
+    /// </summary>
+    public int? Ttl { get; set; }
+    /// <summary>
+    /// The new status of the resource
+    /// </summary>
+    public SessionResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// An experimental parameter to override the ProxyAllowParticipantConflict account flag on a per-request basis.
+    /// </summary>
+    public bool? FailOnParticipantConflict { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSessionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateSessionOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DateExpiry != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateExpiry", Serializers.DateTimeIso8601(DateExpiry)));
+      }
+
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (FailOnParticipantConflict != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FailOnParticipantConflict", FailOnParticipantConflict.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/Service/SessionResource.cs b/src/Twilio/Rest/Proxy/V1/Service/SessionResource.cs
index d7b266b02..ec899b6c8 100644
--- a/src/Twilio/Rest/Proxy/V1/Service/SessionResource.cs
+++ b/src/Twilio/Rest/Proxy/V1/Service/SessionResource.cs
@@ -19,606 +19,606 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Proxy.V1.Service
-{
-
-    public class SessionResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Open = new StatusEnum("open");
-            public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
-            public static readonly StatusEnum Closed = new StatusEnum("closed");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-            public static readonly StatusEnum Unknown = new StatusEnum("unknown");
-        }
-
-        public sealed class ModeEnum : StringEnum
-        {
-            private ModeEnum(string value) : base(value) {}
-            public ModeEnum() {}
-            public static implicit operator ModeEnum(string value)
-            {
-                return new ModeEnum(value);
-            }
-
-            public static readonly ModeEnum MessageOnly = new ModeEnum("message-only");
-            public static readonly ModeEnum VoiceOnly = new ModeEnum("voice-only");
-            public static readonly ModeEnum VoiceAndMessage = new ModeEnum("voice-and-message");
-        }
-
-        private static Request BuildFetchRequest(FetchSessionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Session.
-        /// </summary>
-        /// <param name="options"> Fetch Session parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Session </returns>
-        public static SessionResource Fetch(FetchSessionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Session.
-        /// </summary>
-        /// <param name="options"> Fetch Session parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Session </returns>
-        public static async System.Threading.Tasks.Task<SessionResource> FetchAsync(FetchSessionOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Session.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Session </returns>
-        public static SessionResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSessionOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Session.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Session </returns>
-        public static async System.Threading.Tasks.Task<SessionResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchSessionOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSessionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Sessions for the Service. A maximum of 100 records will be returned per page.
-        /// </summary>
-        /// <param name="options"> Read Session parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Session </returns>
-        public static ResourceSet<SessionResource> Read(ReadSessionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SessionResource>.FromJson("sessions", response.Content);
-            return new ResourceSet<SessionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Sessions for the Service. A maximum of 100 records will be returned per page.
-        /// </summary>
-        /// <param name="options"> Read Session parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Session </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SessionResource>> ReadAsync(ReadSessionOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SessionResource>.FromJson("sessions", response.Content);
-            return new ResourceSet<SessionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Sessions for the Service. A maximum of 100 records will be returned per page.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Session </returns>
-        public static ResourceSet<SessionResource> Read(string pathServiceSid,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadSessionOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Sessions for the Service. A maximum of 100 records will be returned per page.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Session </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SessionResource>> ReadAsync(string pathServiceSid,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadSessionOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SessionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SessionResource>.FromJson("sessions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SessionResource> NextPage(Page<SessionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<SessionResource>.FromJson("sessions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SessionResource> PreviousPage(Page<SessionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<SessionResource>.FromJson("sessions", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateSessionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Session
-        /// </summary>
-        /// <param name="options"> Create Session parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Session </returns>
-        public static SessionResource Create(CreateSessionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Session
-        /// </summary>
-        /// <param name="options"> Create Session parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Session </returns>
-        public static async System.Threading.Tasks.Task<SessionResource> CreateAsync(CreateSessionOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Session
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="dateExpiry"> The ISO 8601 date when the Session should expire </param>
-        /// <param name="ttl"> When the session will expire </param>
-        /// <param name="mode"> The Mode of the Session </param>
-        /// <param name="status"> Session status </param>
-        /// <param name="participants"> The Participant objects to include in the new session </param>
-        /// <param name="failOnParticipantConflict"> An experimental parameter to override the ProxyAllowParticipantConflict
-        ///                                 account flag on a per-request basis. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Session </returns>
-        public static SessionResource Create(string pathServiceSid,
-                                             string uniqueName = null,
-                                             DateTime? dateExpiry = null,
-                                             int? ttl = null,
-                                             SessionResource.ModeEnum mode = null,
-                                             SessionResource.StatusEnum status = null,
-                                             List<object> participants = null,
-                                             bool? failOnParticipantConflict = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateSessionOptions(pathServiceSid){UniqueName = uniqueName, DateExpiry = dateExpiry, Ttl = ttl, Mode = mode, Status = status, Participants = participants, FailOnParticipantConflict = failOnParticipantConflict};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Session
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="dateExpiry"> The ISO 8601 date when the Session should expire </param>
-        /// <param name="ttl"> When the session will expire </param>
-        /// <param name="mode"> The Mode of the Session </param>
-        /// <param name="status"> Session status </param>
-        /// <param name="participants"> The Participant objects to include in the new session </param>
-        /// <param name="failOnParticipantConflict"> An experimental parameter to override the ProxyAllowParticipantConflict
-        ///                                 account flag on a per-request basis. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Session </returns>
-        public static async System.Threading.Tasks.Task<SessionResource> CreateAsync(string pathServiceSid,
-                                                                                     string uniqueName = null,
-                                                                                     DateTime? dateExpiry = null,
-                                                                                     int? ttl = null,
-                                                                                     SessionResource.ModeEnum mode = null,
-                                                                                     SessionResource.StatusEnum status = null,
-                                                                                     List<object> participants = null,
-                                                                                     bool? failOnParticipantConflict = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateSessionOptions(pathServiceSid){UniqueName = uniqueName, DateExpiry = dateExpiry, Ttl = ttl, Mode = mode, Status = status, Participants = participants, FailOnParticipantConflict = failOnParticipantConflict};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSessionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Session.
-        /// </summary>
-        /// <param name="options"> Delete Session parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Session </returns>
-        public static bool Delete(DeleteSessionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Session.
-        /// </summary>
-        /// <param name="options"> Delete Session parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Session </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSessionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Session.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Session </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSessionOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Session.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Session </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSessionOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSessionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Session.
-        /// </summary>
-        /// <param name="options"> Update Session parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Session </returns>
-        public static SessionResource Update(UpdateSessionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Session.
-        /// </summary>
-        /// <param name="options"> Update Session parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Session </returns>
-        public static async System.Threading.Tasks.Task<SessionResource> UpdateAsync(UpdateSessionOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Session.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="dateExpiry"> The ISO 8601 date when the Session should expire </param>
-        /// <param name="ttl"> When the session will expire </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="failOnParticipantConflict"> An experimental parameter to override the ProxyAllowParticipantConflict
-        ///                                 account flag on a per-request basis. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Session </returns>
-        public static SessionResource Update(string pathServiceSid,
-                                             string pathSid,
-                                             DateTime? dateExpiry = null,
-                                             int? ttl = null,
-                                             SessionResource.StatusEnum status = null,
-                                             bool? failOnParticipantConflict = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateSessionOptions(pathServiceSid, pathSid){DateExpiry = dateExpiry, Ttl = ttl, Status = status, FailOnParticipantConflict = failOnParticipantConflict};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Session.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="dateExpiry"> The ISO 8601 date when the Session should expire </param>
-        /// <param name="ttl"> When the session will expire </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="failOnParticipantConflict"> An experimental parameter to override the ProxyAllowParticipantConflict
-        ///                                 account flag on a per-request basis. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Session </returns>
-        public static async System.Threading.Tasks.Task<SessionResource> UpdateAsync(string pathServiceSid,
-                                                                                     string pathSid,
-                                                                                     DateTime? dateExpiry = null,
-                                                                                     int? ttl = null,
-                                                                                     SessionResource.StatusEnum status = null,
-                                                                                     bool? failOnParticipantConflict = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateSessionOptions(pathServiceSid, pathSid){DateExpiry = dateExpiry, Ttl = ttl, Status = status, FailOnParticipantConflict = failOnParticipantConflict};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SessionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SessionResource object represented by the provided JSON </returns>
-        public static SessionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SessionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the resource's parent Service
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date when the Session started
-        /// </summary>
-        [JsonProperty("date_started")]
-        public DateTime? DateStarted { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date when the Session ended
-        /// </summary>
-        [JsonProperty("date_ended")]
-        public DateTime? DateEnded { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date when the Session last had an interaction
-        /// </summary>
-        [JsonProperty("date_last_interaction")]
-        public DateTime? DateLastInteraction { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date when the Session should expire
-        /// </summary>
-        [JsonProperty("date_expiry")]
-        public DateTime? DateExpiry { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The status of the Session
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SessionResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The reason the Session ended
-        /// </summary>
-        [JsonProperty("closed_reason")]
-        public string ClosedReason { get; private set; }
-        /// <summary>
-        /// When the session will expire
-        /// </summary>
-        [JsonProperty("ttl")]
-        public int? Ttl { get; private set; }
-        /// <summary>
-        /// The Mode of the Session
-        /// </summary>
-        [JsonProperty("mode")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SessionResource.ModeEnum Mode { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Session resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of resources related to the Session
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private SessionResource()
-        {
-
-        }
-    }
+{
+
+  public class SessionResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Open = new StatusEnum("open");
+      public static readonly StatusEnum InProgress = new StatusEnum("in-progress");
+      public static readonly StatusEnum Closed = new StatusEnum("closed");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+      public static readonly StatusEnum Unknown = new StatusEnum("unknown");
+    }
+
+    public sealed class ModeEnum : StringEnum
+    {
+      private ModeEnum(string value) : base(value) { }
+      public ModeEnum() { }
+      public static implicit operator ModeEnum(string value)
+      {
+        return new ModeEnum(value);
+      }
+
+      public static readonly ModeEnum MessageOnly = new ModeEnum("message-only");
+      public static readonly ModeEnum VoiceOnly = new ModeEnum("voice-only");
+      public static readonly ModeEnum VoiceAndMessage = new ModeEnum("voice-and-message");
+    }
+
+    private static Request BuildFetchRequest(FetchSessionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Session.
+    /// </summary>
+    /// <param name="options"> Fetch Session parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Session </returns>
+    public static SessionResource Fetch(FetchSessionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Session.
+    /// </summary>
+    /// <param name="options"> Fetch Session parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Session </returns>
+    public static async System.Threading.Tasks.Task<SessionResource> FetchAsync(FetchSessionOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Session.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Session </returns>
+    public static SessionResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSessionOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Session.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Session </returns>
+    public static async System.Threading.Tasks.Task<SessionResource> FetchAsync(string pathServiceSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchSessionOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSessionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Sessions for the Service. A maximum of 100 records will be returned per page.
+    /// </summary>
+    /// <param name="options"> Read Session parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Session </returns>
+    public static ResourceSet<SessionResource> Read(ReadSessionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SessionResource>.FromJson("sessions", response.Content);
+      return new ResourceSet<SessionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Sessions for the Service. A maximum of 100 records will be returned per page.
+    /// </summary>
+    /// <param name="options"> Read Session parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Session </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SessionResource>> ReadAsync(ReadSessionOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SessionResource>.FromJson("sessions", response.Content);
+      return new ResourceSet<SessionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Sessions for the Service. A maximum of 100 records will be returned per page.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Session </returns>
+    public static ResourceSet<SessionResource> Read(string pathServiceSid,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadSessionOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Sessions for the Service. A maximum of 100 records will be returned per page.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the resource from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Session </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SessionResource>> ReadAsync(string pathServiceSid,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadSessionOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SessionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SessionResource>.FromJson("sessions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SessionResource> NextPage(Page<SessionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<SessionResource>.FromJson("sessions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SessionResource> PreviousPage(Page<SessionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<SessionResource>.FromJson("sessions", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateSessionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Session
+    /// </summary>
+    /// <param name="options"> Create Session parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Session </returns>
+    public static SessionResource Create(CreateSessionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Session
+    /// </summary>
+    /// <param name="options"> Create Session parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Session </returns>
+    public static async System.Threading.Tasks.Task<SessionResource> CreateAsync(CreateSessionOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Session
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="dateExpiry"> The ISO 8601 date when the Session should expire </param>
+    /// <param name="ttl"> When the session will expire </param>
+    /// <param name="mode"> The Mode of the Session </param>
+    /// <param name="status"> Session status </param>
+    /// <param name="participants"> The Participant objects to include in the new session </param>
+    /// <param name="failOnParticipantConflict"> An experimental parameter to override the ProxyAllowParticipantConflict
+    ///                                 account flag on a per-request basis. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Session </returns>
+    public static SessionResource Create(string pathServiceSid,
+                                         string uniqueName = null,
+                                         DateTime? dateExpiry = null,
+                                         int? ttl = null,
+                                         SessionResource.ModeEnum mode = null,
+                                         SessionResource.StatusEnum status = null,
+                                         List<object> participants = null,
+                                         bool? failOnParticipantConflict = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateSessionOptions(pathServiceSid) { UniqueName = uniqueName, DateExpiry = dateExpiry, Ttl = ttl, Mode = mode, Status = status, Participants = participants, FailOnParticipantConflict = failOnParticipantConflict };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Session
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="dateExpiry"> The ISO 8601 date when the Session should expire </param>
+    /// <param name="ttl"> When the session will expire </param>
+    /// <param name="mode"> The Mode of the Session </param>
+    /// <param name="status"> Session status </param>
+    /// <param name="participants"> The Participant objects to include in the new session </param>
+    /// <param name="failOnParticipantConflict"> An experimental parameter to override the ProxyAllowParticipantConflict
+    ///                                 account flag on a per-request basis. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Session </returns>
+    public static async System.Threading.Tasks.Task<SessionResource> CreateAsync(string pathServiceSid,
+                                                                                 string uniqueName = null,
+                                                                                 DateTime? dateExpiry = null,
+                                                                                 int? ttl = null,
+                                                                                 SessionResource.ModeEnum mode = null,
+                                                                                 SessionResource.StatusEnum status = null,
+                                                                                 List<object> participants = null,
+                                                                                 bool? failOnParticipantConflict = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateSessionOptions(pathServiceSid) { UniqueName = uniqueName, DateExpiry = dateExpiry, Ttl = ttl, Mode = mode, Status = status, Participants = participants, FailOnParticipantConflict = failOnParticipantConflict };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSessionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Session.
+    /// </summary>
+    /// <param name="options"> Delete Session parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Session </returns>
+    public static bool Delete(DeleteSessionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Session.
+    /// </summary>
+    /// <param name="options"> Delete Session parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Session </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSessionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Session.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Session </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSessionOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Session.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Session </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSessionOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSessionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/Sessions/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Session.
+    /// </summary>
+    /// <param name="options"> Update Session parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Session </returns>
+    public static SessionResource Update(UpdateSessionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Session.
+    /// </summary>
+    /// <param name="options"> Update Session parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Session </returns>
+    public static async System.Threading.Tasks.Task<SessionResource> UpdateAsync(UpdateSessionOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Session.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="dateExpiry"> The ISO 8601 date when the Session should expire </param>
+    /// <param name="ttl"> When the session will expire </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="failOnParticipantConflict"> An experimental parameter to override the ProxyAllowParticipantConflict
+    ///                                 account flag on a per-request basis. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Session </returns>
+    public static SessionResource Update(string pathServiceSid,
+                                         string pathSid,
+                                         DateTime? dateExpiry = null,
+                                         int? ttl = null,
+                                         SessionResource.StatusEnum status = null,
+                                         bool? failOnParticipantConflict = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateSessionOptions(pathServiceSid, pathSid) { DateExpiry = dateExpiry, Ttl = ttl, Status = status, FailOnParticipantConflict = failOnParticipantConflict };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Session.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="dateExpiry"> The ISO 8601 date when the Session should expire </param>
+    /// <param name="ttl"> When the session will expire </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="failOnParticipantConflict"> An experimental parameter to override the ProxyAllowParticipantConflict
+    ///                                 account flag on a per-request basis. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Session </returns>
+    public static async System.Threading.Tasks.Task<SessionResource> UpdateAsync(string pathServiceSid,
+                                                                                 string pathSid,
+                                                                                 DateTime? dateExpiry = null,
+                                                                                 int? ttl = null,
+                                                                                 SessionResource.StatusEnum status = null,
+                                                                                 bool? failOnParticipantConflict = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateSessionOptions(pathServiceSid, pathSid) { DateExpiry = dateExpiry, Ttl = ttl, Status = status, FailOnParticipantConflict = failOnParticipantConflict };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SessionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SessionResource object represented by the provided JSON </returns>
+    public static SessionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SessionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the resource's parent Service
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date when the Session started
+    /// </summary>
+    [JsonProperty("date_started")]
+    public DateTime? DateStarted { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date when the Session ended
+    /// </summary>
+    [JsonProperty("date_ended")]
+    public DateTime? DateEnded { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date when the Session last had an interaction
+    /// </summary>
+    [JsonProperty("date_last_interaction")]
+    public DateTime? DateLastInteraction { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date when the Session should expire
+    /// </summary>
+    [JsonProperty("date_expiry")]
+    public DateTime? DateExpiry { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The status of the Session
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public SessionResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The reason the Session ended
+    /// </summary>
+    [JsonProperty("closed_reason")]
+    public string ClosedReason { get; private set; }
+    /// <summary>
+    /// When the session will expire
+    /// </summary>
+    [JsonProperty("ttl")]
+    public int? Ttl { get; private set; }
+    /// <summary>
+    /// The Mode of the Session
+    /// </summary>
+    [JsonProperty("mode")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public SessionResource.ModeEnum Mode { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Session resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of resources related to the Session
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private SessionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/Service/ShortCodeOptions.cs b/src/Twilio/Rest/Proxy/V1/Service/ShortCodeOptions.cs
index 5c8129d54..51b6f2d11 100644
--- a/src/Twilio/Rest/Proxy/V1/Service/ShortCodeOptions.cs
+++ b/src/Twilio/Rest/Proxy/V1/Service/ShortCodeOptions.cs
@@ -9,205 +9,205 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Proxy.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Add a Short Code to the Proxy Number Pool for the Service.
+  /// </summary>
+  public class CreateShortCodeOptions : IOptions<ShortCodeResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Add a Short Code to the Proxy Number Pool for the Service.
-    /// </summary>
-    public class CreateShortCodeOptions : IOptions<ShortCodeResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service resource
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of a Twilio ShortCode resource
-        /// </summary>
-        public string Sid { get; }
-
-        /// <summary>
-        /// Construct a new CreateShortCodeOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
-        /// <param name="sid"> The SID of a Twilio ShortCode resource </param>
-        public CreateShortCodeOptions(string pathServiceSid, string sid)
-        {
-            PathServiceSid = pathServiceSid;
-            Sid = sid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Sid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sid", Sid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the parent Service resource
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific Short Code from a Service.
-    /// </summary>
-    public class DeleteShortCodeOptions : IOptions<ShortCodeResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service to delete the ShortCode resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteShortCodeOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service to delete the ShortCode resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteShortCodeOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of a Twilio ShortCode resource
+    /// </summary>
+    public string Sid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Short Codes in the Proxy Number Pool for the Service. A maximum of 100 records will be
-    /// returned per page.
-    /// </summary>
-    public class ReadShortCodeOptions : ReadOptions<ShortCodeResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service to read the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadShortCodeOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service to read the resource from </param>
-        public ReadShortCodeOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new CreateShortCodeOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
+    /// <param name="sid"> The SID of a Twilio ShortCode resource </param>
+    public CreateShortCodeOptions(string pathServiceSid, string sid)
+    {
+      PathServiceSid = pathServiceSid;
+      Sid = sid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific Short Code.
-    /// </summary>
-    public class FetchShortCodeOptions : IOptions<ShortCodeResource>
-    {
-        /// <summary>
-        /// The SID of the parent Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchShortCodeOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchShortCodeOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Sid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sid", Sid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific Short Code from a Service.
+  /// </summary>
+  public class DeleteShortCodeOptions : IOptions<ShortCodeResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update a specific Short Code.
-    /// </summary>
-    public class UpdateShortCodeOptions : IOptions<ShortCodeResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// Whether the short code should be reserved for manual assignment to participants only
-        /// </summary>
-        public bool? IsReserved { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateShortCodeOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateShortCodeOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IsReserved != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IsReserved", IsReserved.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the parent Service to delete the ShortCode resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteShortCodeOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service to delete the ShortCode resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteShortCodeOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Short Codes in the Proxy Number Pool for the Service. A maximum of 100 records will be
+  /// returned per page.
+  /// </summary>
+  public class ReadShortCodeOptions : ReadOptions<ShortCodeResource>
+  {
+    /// <summary>
+    /// The SID of the parent Service to read the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadShortCodeOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service to read the resource from </param>
+    public ReadShortCodeOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific Short Code.
+  /// </summary>
+  public class FetchShortCodeOptions : IOptions<ShortCodeResource>
+  {
+    /// <summary>
+    /// The SID of the parent Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchShortCodeOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchShortCodeOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update a specific Short Code.
+  /// </summary>
+  public class UpdateShortCodeOptions : IOptions<ShortCodeResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// Whether the short code should be reserved for manual assignment to participants only
+    /// </summary>
+    public bool? IsReserved { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateShortCodeOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateShortCodeOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IsReserved != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IsReserved", IsReserved.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/Service/ShortCodeResource.cs b/src/Twilio/Rest/Proxy/V1/Service/ShortCodeResource.cs
index 5f21226d0..ba190413f 100644
--- a/src/Twilio/Rest/Proxy/V1/Service/ShortCodeResource.cs
+++ b/src/Twilio/Rest/Proxy/V1/Service/ShortCodeResource.cs
@@ -19,508 +19,508 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Proxy.V1.Service
-{
-
-    public class ShortCodeResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateShortCodeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/ShortCodes",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Add a Short Code to the Proxy Number Pool for the Service.
-        /// </summary>
-        /// <param name="options"> Create ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Create(CreateShortCodeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a Short Code to the Proxy Number Pool for the Service.
-        /// </summary>
-        /// <param name="options"> Create ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> CreateAsync(CreateShortCodeOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Add a Short Code to the Proxy Number Pool for the Service.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
-        /// <param name="sid"> The SID of a Twilio ShortCode resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Create(string pathServiceSid, string sid, ITwilioRestClient client = null)
-        {
-            var options = new CreateShortCodeOptions(pathServiceSid, sid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a Short Code to the Proxy Number Pool for the Service.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
-        /// <param name="sid"> The SID of a Twilio ShortCode resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> CreateAsync(string pathServiceSid,
-                                                                                       string sid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateShortCodeOptions(pathServiceSid, sid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteShortCodeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/ShortCodes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Short Code from a Service.
-        /// </summary>
-        /// <param name="options"> Delete ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static bool Delete(DeleteShortCodeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Short Code from a Service.
-        /// </summary>
-        /// <param name="options"> Delete ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteShortCodeOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Short Code from a Service.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service to delete the ShortCode resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteShortCodeOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Short Code from a Service.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service to delete the ShortCode resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteShortCodeOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadShortCodeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/ShortCodes",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Short Codes in the Proxy Number Pool for the Service. A maximum of 100 records will be
-        /// returned per page.
-        /// </summary>
-        /// <param name="options"> Read ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ResourceSet<ShortCodeResource> Read(ReadShortCodeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-            return new ResourceSet<ShortCodeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Short Codes in the Proxy Number Pool for the Service. A maximum of 100 records will be
-        /// returned per page.
-        /// </summary>
-        /// <param name="options"> Read ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ShortCodeResource>> ReadAsync(ReadShortCodeOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-            return new ResourceSet<ShortCodeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Short Codes in the Proxy Number Pool for the Service. A maximum of 100 records will be
-        /// returned per page.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service to read the resource from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ResourceSet<ShortCodeResource> Read(string pathServiceSid,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadShortCodeOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Short Codes in the Proxy Number Pool for the Service. A maximum of 100 records will be
-        /// returned per page.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service to read the resource from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ShortCodeResource>> ReadAsync(string pathServiceSid,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadShortCodeOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ShortCodeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ShortCodeResource> NextPage(Page<ShortCodeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ShortCodeResource> PreviousPage(Page<ShortCodeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchShortCodeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/ShortCodes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Short Code.
-        /// </summary>
-        /// <param name="options"> Fetch ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Fetch(FetchShortCodeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Short Code.
-        /// </summary>
-        /// <param name="options"> Fetch ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> FetchAsync(FetchShortCodeOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Short Code.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchShortCodeOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Short Code.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the parent Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> FetchAsync(string pathServiceSid,
-                                                                                      string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchShortCodeOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateShortCodeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathServiceSid + "/ShortCodes/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Short Code.
-        /// </summary>
-        /// <param name="options"> Update ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Update(UpdateShortCodeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Short Code.
-        /// </summary>
-        /// <param name="options"> Update ShortCode parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> UpdateAsync(UpdateShortCodeOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Short Code.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="isReserved"> Whether the short code should be reserved for manual assignment to participants only
-        ///                  </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ShortCode </returns>
-        public static ShortCodeResource Update(string pathServiceSid,
-                                               string pathSid,
-                                               bool? isReserved = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateShortCodeOptions(pathServiceSid, pathSid){IsReserved = isReserved};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Short Code.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="isReserved"> Whether the short code should be reserved for manual assignment to participants only
-        ///                  </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ShortCode </returns>
-        public static async System.Threading.Tasks.Task<ShortCodeResource> UpdateAsync(string pathServiceSid,
-                                                                                       string pathSid,
-                                                                                       bool? isReserved = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateShortCodeOptions(pathServiceSid, pathSid){IsReserved = isReserved};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ShortCodeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ShortCodeResource object represented by the provided JSON </returns>
-        public static ShortCodeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ShortCodeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the resource's parent Service
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The short code's number
-        /// </summary>
-        [JsonProperty("short_code")]
-        public string ShortCode { get; private set; }
-        /// <summary>
-        /// The ISO Country Code
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The capabilities of the short code
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public PhoneNumberCapabilities Capabilities { get; private set; }
-        /// <summary>
-        /// The absolute URL of the ShortCode resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Whether the short code should be reserved for manual assignment to participants only
-        /// </summary>
-        [JsonProperty("is_reserved")]
-        public bool? IsReserved { get; private set; }
-
-        private ShortCodeResource()
-        {
-
-        }
-    }
+{
+
+  public class ShortCodeResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateShortCodeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/ShortCodes",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Add a Short Code to the Proxy Number Pool for the Service.
+    /// </summary>
+    /// <param name="options"> Create ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Create(CreateShortCodeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a Short Code to the Proxy Number Pool for the Service.
+    /// </summary>
+    /// <param name="options"> Create ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> CreateAsync(CreateShortCodeOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Add a Short Code to the Proxy Number Pool for the Service.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
+    /// <param name="sid"> The SID of a Twilio ShortCode resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Create(string pathServiceSid, string sid, ITwilioRestClient client = null)
+    {
+      var options = new CreateShortCodeOptions(pathServiceSid, sid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a Short Code to the Proxy Number Pool for the Service.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service resource </param>
+    /// <param name="sid"> The SID of a Twilio ShortCode resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> CreateAsync(string pathServiceSid,
+                                                                                   string sid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateShortCodeOptions(pathServiceSid, sid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteShortCodeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/ShortCodes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Short Code from a Service.
+    /// </summary>
+    /// <param name="options"> Delete ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static bool Delete(DeleteShortCodeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Short Code from a Service.
+    /// </summary>
+    /// <param name="options"> Delete ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteShortCodeOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Short Code from a Service.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service to delete the ShortCode resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteShortCodeOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Short Code from a Service.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service to delete the ShortCode resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteShortCodeOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadShortCodeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/ShortCodes",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Short Codes in the Proxy Number Pool for the Service. A maximum of 100 records will be
+    /// returned per page.
+    /// </summary>
+    /// <param name="options"> Read ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ResourceSet<ShortCodeResource> Read(ReadShortCodeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+      return new ResourceSet<ShortCodeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Short Codes in the Proxy Number Pool for the Service. A maximum of 100 records will be
+    /// returned per page.
+    /// </summary>
+    /// <param name="options"> Read ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ShortCodeResource>> ReadAsync(ReadShortCodeOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+      return new ResourceSet<ShortCodeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Short Codes in the Proxy Number Pool for the Service. A maximum of 100 records will be
+    /// returned per page.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service to read the resource from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ResourceSet<ShortCodeResource> Read(string pathServiceSid,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadShortCodeOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Short Codes in the Proxy Number Pool for the Service. A maximum of 100 records will be
+    /// returned per page.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service to read the resource from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ShortCodeResource>> ReadAsync(string pathServiceSid,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadShortCodeOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ShortCodeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ShortCodeResource> NextPage(Page<ShortCodeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ShortCodeResource> PreviousPage(Page<ShortCodeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<ShortCodeResource>.FromJson("short_codes", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchShortCodeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/ShortCodes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Short Code.
+    /// </summary>
+    /// <param name="options"> Fetch ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Fetch(FetchShortCodeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Short Code.
+    /// </summary>
+    /// <param name="options"> Fetch ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> FetchAsync(FetchShortCodeOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Short Code.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchShortCodeOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Short Code.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the parent Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> FetchAsync(string pathServiceSid,
+                                                                                  string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchShortCodeOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateShortCodeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathServiceSid + "/ShortCodes/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Short Code.
+    /// </summary>
+    /// <param name="options"> Update ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Update(UpdateShortCodeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Short Code.
+    /// </summary>
+    /// <param name="options"> Update ShortCode parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> UpdateAsync(UpdateShortCodeOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Short Code.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="isReserved"> Whether the short code should be reserved for manual assignment to participants only
+    ///                  </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ShortCode </returns>
+    public static ShortCodeResource Update(string pathServiceSid,
+                                           string pathSid,
+                                           bool? isReserved = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateShortCodeOptions(pathServiceSid, pathSid) { IsReserved = isReserved };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Short Code.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="isReserved"> Whether the short code should be reserved for manual assignment to participants only
+    ///                  </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ShortCode </returns>
+    public static async System.Threading.Tasks.Task<ShortCodeResource> UpdateAsync(string pathServiceSid,
+                                                                                   string pathSid,
+                                                                                   bool? isReserved = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateShortCodeOptions(pathServiceSid, pathSid) { IsReserved = isReserved };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ShortCodeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ShortCodeResource object represented by the provided JSON </returns>
+    public static ShortCodeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ShortCodeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the resource's parent Service
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The short code's number
+    /// </summary>
+    [JsonProperty("short_code")]
+    public string ShortCode { get; private set; }
+    /// <summary>
+    /// The ISO Country Code
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The capabilities of the short code
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public PhoneNumberCapabilities Capabilities { get; private set; }
+    /// <summary>
+    /// The absolute URL of the ShortCode resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Whether the short code should be reserved for manual assignment to participants only
+    /// </summary>
+    [JsonProperty("is_reserved")]
+    public bool? IsReserved { get; private set; }
+
+    private ShortCodeResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/ServiceOptions.cs b/src/Twilio/Rest/Proxy/V1/ServiceOptions.cs
index 1bbb4a8b6..52f2c4351 100644
--- a/src/Twilio/Rest/Proxy/V1/ServiceOptions.cs
+++ b/src/Twilio/Rest/Proxy/V1/ServiceOptions.cs
@@ -9,292 +9,292 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Proxy.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific Service.
+  /// </summary>
+  public class FetchServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific Service.
+    /// The unique string that identifies the resource
     /// </summary>
-    public class FetchServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Services for Twilio Proxy. A maximum of 100 records will be returned per page.
+    /// Construct a new FetchServiceOptions
     /// </summary>
-    public class ReadServiceOptions : ReadOptions<ServiceResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Service for Twilio Proxy
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; }
-        /// <summary>
-        /// Default TTL for a Session, in seconds
-        /// </summary>
-        public int? DefaultTtl { get; set; }
-        /// <summary>
-        /// The URL we should call when the interaction status changes
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-        /// <summary>
-        /// Where a proxy number must be located relative to the participant identifier
-        /// </summary>
-        public ServiceResource.GeoMatchLevelEnum GeoMatchLevel { get; set; }
-        /// <summary>
-        /// The preference for Proxy Number selection for the Service instance
-        /// </summary>
-        public ServiceResource.NumberSelectionBehaviorEnum NumberSelectionBehavior { get; set; }
-        /// <summary>
-        /// The URL we call on each interaction
-        /// </summary>
-        public Uri InterceptCallbackUrl { get; set; }
-        /// <summary>
-        /// The URL we call when an inbound call or SMS action occurs on a closed or non-existent Session
-        /// </summary>
-        public Uri OutOfSessionCallbackUrl { get; set; }
-        /// <summary>
-        /// The SID of the Chat Service Instance
-        /// </summary>
-        public string ChatInstanceSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateServiceOptions
-        /// </summary>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        public CreateServiceOptions(string uniqueName)
-        {
-            UniqueName = uniqueName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (DefaultTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultTtl", DefaultTtl.ToString()));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (GeoMatchLevel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("GeoMatchLevel", GeoMatchLevel.ToString()));
-            }
-
-            if (NumberSelectionBehavior != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NumberSelectionBehavior", NumberSelectionBehavior.ToString()));
-            }
-
-            if (InterceptCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InterceptCallbackUrl", Serializers.Url(InterceptCallbackUrl)));
-            }
-
-            if (OutOfSessionCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("OutOfSessionCallbackUrl", Serializers.Url(OutOfSessionCallbackUrl)));
-            }
-
-            if (ChatInstanceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChatInstanceSid", ChatInstanceSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Services for Twilio Proxy. A maximum of 100 records will be returned per page.
+  /// </summary>
+  public class ReadServiceOptions : ReadOptions<ServiceResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific Service.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Service for Twilio Proxy
+  /// </summary>
+  public class CreateServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update a specific Service.
+    /// An application-defined string that uniquely identifies the resource
     /// </summary>
-    public class UpdateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// Default TTL for a Session, in seconds
-        /// </summary>
-        public int? DefaultTtl { get; set; }
-        /// <summary>
-        /// The URL we should call when the interaction status changes
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-        /// <summary>
-        /// Where a proxy number must be located relative to the participant identifier
-        /// </summary>
-        public ServiceResource.GeoMatchLevelEnum GeoMatchLevel { get; set; }
-        /// <summary>
-        /// The preference for Proxy Number selection for the Service instance
-        /// </summary>
-        public ServiceResource.NumberSelectionBehaviorEnum NumberSelectionBehavior { get; set; }
-        /// <summary>
-        /// The URL we call on each interaction
-        /// </summary>
-        public Uri InterceptCallbackUrl { get; set; }
-        /// <summary>
-        /// The URL we call when an inbound call or SMS action occurs on a closed or non-existent Session
-        /// </summary>
-        public Uri OutOfSessionCallbackUrl { get; set; }
-        /// <summary>
-        /// The SID of the Chat Service Instance
-        /// </summary>
-        public string ChatInstanceSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (DefaultTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultTtl", DefaultTtl.ToString()));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (GeoMatchLevel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("GeoMatchLevel", GeoMatchLevel.ToString()));
-            }
-
-            if (NumberSelectionBehavior != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NumberSelectionBehavior", NumberSelectionBehavior.ToString()));
-            }
-
-            if (InterceptCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InterceptCallbackUrl", Serializers.Url(InterceptCallbackUrl)));
-            }
-
-            if (OutOfSessionCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("OutOfSessionCallbackUrl", Serializers.Url(OutOfSessionCallbackUrl)));
-            }
-
-            if (ChatInstanceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChatInstanceSid", ChatInstanceSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string UniqueName { get; }
+    /// <summary>
+    /// Default TTL for a Session, in seconds
+    /// </summary>
+    public int? DefaultTtl { get; set; }
+    /// <summary>
+    /// The URL we should call when the interaction status changes
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+    /// <summary>
+    /// Where a proxy number must be located relative to the participant identifier
+    /// </summary>
+    public ServiceResource.GeoMatchLevelEnum GeoMatchLevel { get; set; }
+    /// <summary>
+    /// The preference for Proxy Number selection for the Service instance
+    /// </summary>
+    public ServiceResource.NumberSelectionBehaviorEnum NumberSelectionBehavior { get; set; }
+    /// <summary>
+    /// The URL we call on each interaction
+    /// </summary>
+    public Uri InterceptCallbackUrl { get; set; }
+    /// <summary>
+    /// The URL we call when an inbound call or SMS action occurs on a closed or non-existent Session
+    /// </summary>
+    public Uri OutOfSessionCallbackUrl { get; set; }
+    /// <summary>
+    /// The SID of the Chat Service Instance
+    /// </summary>
+    public string ChatInstanceSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateServiceOptions
+    /// </summary>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    public CreateServiceOptions(string uniqueName)
+    {
+      UniqueName = uniqueName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (DefaultTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultTtl", DefaultTtl.ToString()));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (GeoMatchLevel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("GeoMatchLevel", GeoMatchLevel.ToString()));
+      }
+
+      if (NumberSelectionBehavior != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NumberSelectionBehavior", NumberSelectionBehavior.ToString()));
+      }
+
+      if (InterceptCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InterceptCallbackUrl", Serializers.Url(InterceptCallbackUrl)));
+      }
+
+      if (OutOfSessionCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("OutOfSessionCallbackUrl", Serializers.Url(OutOfSessionCallbackUrl)));
+      }
+
+      if (ChatInstanceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChatInstanceSid", ChatInstanceSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific Service.
+  /// </summary>
+  public class DeleteServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update a specific Service.
+  /// </summary>
+  public class UpdateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// Default TTL for a Session, in seconds
+    /// </summary>
+    public int? DefaultTtl { get; set; }
+    /// <summary>
+    /// The URL we should call when the interaction status changes
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+    /// <summary>
+    /// Where a proxy number must be located relative to the participant identifier
+    /// </summary>
+    public ServiceResource.GeoMatchLevelEnum GeoMatchLevel { get; set; }
+    /// <summary>
+    /// The preference for Proxy Number selection for the Service instance
+    /// </summary>
+    public ServiceResource.NumberSelectionBehaviorEnum NumberSelectionBehavior { get; set; }
+    /// <summary>
+    /// The URL we call on each interaction
+    /// </summary>
+    public Uri InterceptCallbackUrl { get; set; }
+    /// <summary>
+    /// The URL we call when an inbound call or SMS action occurs on a closed or non-existent Session
+    /// </summary>
+    public Uri OutOfSessionCallbackUrl { get; set; }
+    /// <summary>
+    /// The SID of the Chat Service Instance
+    /// </summary>
+    public string ChatInstanceSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (DefaultTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultTtl", DefaultTtl.ToString()));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (GeoMatchLevel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("GeoMatchLevel", GeoMatchLevel.ToString()));
+      }
+
+      if (NumberSelectionBehavior != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NumberSelectionBehavior", NumberSelectionBehavior.ToString()));
+      }
+
+      if (InterceptCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InterceptCallbackUrl", Serializers.Url(InterceptCallbackUrl)));
+      }
+
+      if (OutOfSessionCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("OutOfSessionCallbackUrl", Serializers.Url(OutOfSessionCallbackUrl)));
+      }
+
+      if (ChatInstanceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChatInstanceSid", ChatInstanceSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Proxy/V1/ServiceResource.cs b/src/Twilio/Rest/Proxy/V1/ServiceResource.cs
index de9b62480..bbaecb40a 100644
--- a/src/Twilio/Rest/Proxy/V1/ServiceResource.cs
+++ b/src/Twilio/Rest/Proxy/V1/ServiceResource.cs
@@ -19,595 +19,595 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Proxy.V1
-{
-
-    public class ServiceResource : Resource
-    {
-        public sealed class GeoMatchLevelEnum : StringEnum
-        {
-            private GeoMatchLevelEnum(string value) : base(value) {}
-            public GeoMatchLevelEnum() {}
-            public static implicit operator GeoMatchLevelEnum(string value)
-            {
-                return new GeoMatchLevelEnum(value);
-            }
-
-            public static readonly GeoMatchLevelEnum AreaCode = new GeoMatchLevelEnum("area-code");
-            public static readonly GeoMatchLevelEnum Overlay = new GeoMatchLevelEnum("overlay");
-            public static readonly GeoMatchLevelEnum Radius = new GeoMatchLevelEnum("radius");
-            public static readonly GeoMatchLevelEnum Country = new GeoMatchLevelEnum("country");
-        }
-
-        public sealed class NumberSelectionBehaviorEnum : StringEnum
-        {
-            private NumberSelectionBehaviorEnum(string value) : base(value) {}
-            public NumberSelectionBehaviorEnum() {}
-            public static implicit operator NumberSelectionBehaviorEnum(string value)
-            {
-                return new NumberSelectionBehaviorEnum(value);
-            }
-
-            public static readonly NumberSelectionBehaviorEnum AvoidSticky = new NumberSelectionBehaviorEnum("avoid-sticky");
-            public static readonly NumberSelectionBehaviorEnum PreferSticky = new NumberSelectionBehaviorEnum("prefer-sticky");
-        }
-
-        private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Service.
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Service.
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Service.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Service.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Proxy,
-                "/v1/Services",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Services for Twilio Proxy. A maximum of 100 records will be returned per page.
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Services for Twilio Proxy. A maximum of 100 records will be returned per page.
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Services for Twilio Proxy. A maximum of 100 records will be returned per page.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Services for Twilio Proxy. A maximum of 100 records will be returned per page.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Proxy)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Proxy,
-                "/v1/Services",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Service for Twilio Proxy
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Service for Twilio Proxy
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Service for Twilio Proxy
-        /// </summary>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="defaultTtl"> Default TTL for a Session, in seconds </param>
-        /// <param name="callbackUrl"> The URL we should call when the interaction status changes </param>
-        /// <param name="geoMatchLevel"> Where a proxy number must be located relative to the participant identifier </param>
-        /// <param name="numberSelectionBehavior"> The preference for Proxy Number selection for the Service instance </param>
-        /// <param name="interceptCallbackUrl"> The URL we call on each interaction </param>
-        /// <param name="outOfSessionCallbackUrl"> The URL we call when an inbound call or SMS action occurs on a closed or
-        ///                               non-existent Session </param>
-        /// <param name="chatInstanceSid"> The SID of the Chat Service Instance </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(string uniqueName,
-                                             int? defaultTtl = null,
-                                             Uri callbackUrl = null,
-                                             ServiceResource.GeoMatchLevelEnum geoMatchLevel = null,
-                                             ServiceResource.NumberSelectionBehaviorEnum numberSelectionBehavior = null,
-                                             Uri interceptCallbackUrl = null,
-                                             Uri outOfSessionCallbackUrl = null,
-                                             string chatInstanceSid = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(uniqueName){DefaultTtl = defaultTtl, CallbackUrl = callbackUrl, GeoMatchLevel = geoMatchLevel, NumberSelectionBehavior = numberSelectionBehavior, InterceptCallbackUrl = interceptCallbackUrl, OutOfSessionCallbackUrl = outOfSessionCallbackUrl, ChatInstanceSid = chatInstanceSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Service for Twilio Proxy
-        /// </summary>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="defaultTtl"> Default TTL for a Session, in seconds </param>
-        /// <param name="callbackUrl"> The URL we should call when the interaction status changes </param>
-        /// <param name="geoMatchLevel"> Where a proxy number must be located relative to the participant identifier </param>
-        /// <param name="numberSelectionBehavior"> The preference for Proxy Number selection for the Service instance </param>
-        /// <param name="interceptCallbackUrl"> The URL we call on each interaction </param>
-        /// <param name="outOfSessionCallbackUrl"> The URL we call when an inbound call or SMS action occurs on a closed or
-        ///                               non-existent Session </param>
-        /// <param name="chatInstanceSid"> The SID of the Chat Service Instance </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string uniqueName,
-                                                                                     int? defaultTtl = null,
-                                                                                     Uri callbackUrl = null,
-                                                                                     ServiceResource.GeoMatchLevelEnum geoMatchLevel = null,
-                                                                                     ServiceResource.NumberSelectionBehaviorEnum numberSelectionBehavior = null,
-                                                                                     Uri interceptCallbackUrl = null,
-                                                                                     Uri outOfSessionCallbackUrl = null,
-                                                                                     string chatInstanceSid = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(uniqueName){DefaultTtl = defaultTtl, CallbackUrl = callbackUrl, GeoMatchLevel = geoMatchLevel, NumberSelectionBehavior = numberSelectionBehavior, InterceptCallbackUrl = interceptCallbackUrl, OutOfSessionCallbackUrl = outOfSessionCallbackUrl, ChatInstanceSid = chatInstanceSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Service.
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Service.
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Service.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Service.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Proxy,
-                "/v1/Services/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Service.
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Service.
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Service.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="defaultTtl"> Default TTL for a Session, in seconds </param>
-        /// <param name="callbackUrl"> The URL we should call when the interaction status changes </param>
-        /// <param name="geoMatchLevel"> Where a proxy number must be located relative to the participant identifier </param>
-        /// <param name="numberSelectionBehavior"> The preference for Proxy Number selection for the Service instance </param>
-        /// <param name="interceptCallbackUrl"> The URL we call on each interaction </param>
-        /// <param name="outOfSessionCallbackUrl"> The URL we call when an inbound call or SMS action occurs on a closed or
-        ///                               non-existent Session </param>
-        /// <param name="chatInstanceSid"> The SID of the Chat Service Instance </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(string pathSid,
-                                             string uniqueName = null,
-                                             int? defaultTtl = null,
-                                             Uri callbackUrl = null,
-                                             ServiceResource.GeoMatchLevelEnum geoMatchLevel = null,
-                                             ServiceResource.NumberSelectionBehaviorEnum numberSelectionBehavior = null,
-                                             Uri interceptCallbackUrl = null,
-                                             Uri outOfSessionCallbackUrl = null,
-                                             string chatInstanceSid = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){UniqueName = uniqueName, DefaultTtl = defaultTtl, CallbackUrl = callbackUrl, GeoMatchLevel = geoMatchLevel, NumberSelectionBehavior = numberSelectionBehavior, InterceptCallbackUrl = interceptCallbackUrl, OutOfSessionCallbackUrl = outOfSessionCallbackUrl, ChatInstanceSid = chatInstanceSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Service.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="defaultTtl"> Default TTL for a Session, in seconds </param>
-        /// <param name="callbackUrl"> The URL we should call when the interaction status changes </param>
-        /// <param name="geoMatchLevel"> Where a proxy number must be located relative to the participant identifier </param>
-        /// <param name="numberSelectionBehavior"> The preference for Proxy Number selection for the Service instance </param>
-        /// <param name="interceptCallbackUrl"> The URL we call on each interaction </param>
-        /// <param name="outOfSessionCallbackUrl"> The URL we call when an inbound call or SMS action occurs on a closed or
-        ///                               non-existent Session </param>
-        /// <param name="chatInstanceSid"> The SID of the Chat Service Instance </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
-                                                                                     string uniqueName = null,
-                                                                                     int? defaultTtl = null,
-                                                                                     Uri callbackUrl = null,
-                                                                                     ServiceResource.GeoMatchLevelEnum geoMatchLevel = null,
-                                                                                     ServiceResource.NumberSelectionBehaviorEnum numberSelectionBehavior = null,
-                                                                                     Uri interceptCallbackUrl = null,
-                                                                                     Uri outOfSessionCallbackUrl = null,
-                                                                                     string chatInstanceSid = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){UniqueName = uniqueName, DefaultTtl = defaultTtl, CallbackUrl = callbackUrl, GeoMatchLevel = geoMatchLevel, NumberSelectionBehavior = numberSelectionBehavior, InterceptCallbackUrl = interceptCallbackUrl, OutOfSessionCallbackUrl = outOfSessionCallbackUrl, ChatInstanceSid = chatInstanceSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ServiceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ServiceResource object represented by the provided JSON </returns>
-        public static ServiceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ServiceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Chat Service Instance
-        /// </summary>
-        [JsonProperty("chat_instance_sid")]
-        public string ChatInstanceSid { get; private set; }
-        /// <summary>
-        /// The URL we call when the interaction status changes
-        /// </summary>
-        [JsonProperty("callback_url")]
-        public Uri CallbackUrl { get; private set; }
-        /// <summary>
-        /// Default TTL for a Session, in seconds
-        /// </summary>
-        [JsonProperty("default_ttl")]
-        public int? DefaultTtl { get; private set; }
-        /// <summary>
-        /// The preference for Proxy Number selection for the Service instance
-        /// </summary>
-        [JsonProperty("number_selection_behavior")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ServiceResource.NumberSelectionBehaviorEnum NumberSelectionBehavior { get; private set; }
-        /// <summary>
-        /// Where a proxy number must be located relative to the participant identifier
-        /// </summary>
-        [JsonProperty("geo_match_level")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ServiceResource.GeoMatchLevelEnum GeoMatchLevel { get; private set; }
-        /// <summary>
-        /// The URL we call on each interaction
-        /// </summary>
-        [JsonProperty("intercept_callback_url")]
-        public Uri InterceptCallbackUrl { get; private set; }
-        /// <summary>
-        /// The URL we call when an inbound call or SMS action occurs on a closed or non-existent Session
-        /// </summary>
-        [JsonProperty("out_of_session_callback_url")]
-        public Uri OutOfSessionCallbackUrl { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Service resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of resources related to the Service
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ServiceResource()
-        {
-
-        }
-    }
+{
+
+  public class ServiceResource : Resource
+  {
+    public sealed class GeoMatchLevelEnum : StringEnum
+    {
+      private GeoMatchLevelEnum(string value) : base(value) { }
+      public GeoMatchLevelEnum() { }
+      public static implicit operator GeoMatchLevelEnum(string value)
+      {
+        return new GeoMatchLevelEnum(value);
+      }
+
+      public static readonly GeoMatchLevelEnum AreaCode = new GeoMatchLevelEnum("area-code");
+      public static readonly GeoMatchLevelEnum Overlay = new GeoMatchLevelEnum("overlay");
+      public static readonly GeoMatchLevelEnum Radius = new GeoMatchLevelEnum("radius");
+      public static readonly GeoMatchLevelEnum Country = new GeoMatchLevelEnum("country");
+    }
+
+    public sealed class NumberSelectionBehaviorEnum : StringEnum
+    {
+      private NumberSelectionBehaviorEnum(string value) : base(value) { }
+      public NumberSelectionBehaviorEnum() { }
+      public static implicit operator NumberSelectionBehaviorEnum(string value)
+      {
+        return new NumberSelectionBehaviorEnum(value);
+      }
+
+      public static readonly NumberSelectionBehaviorEnum AvoidSticky = new NumberSelectionBehaviorEnum("avoid-sticky");
+      public static readonly NumberSelectionBehaviorEnum PreferSticky = new NumberSelectionBehaviorEnum("prefer-sticky");
+    }
+
+    private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Service.
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Service.
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Service.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Service.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Proxy,
+          "/v1/Services",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Services for Twilio Proxy. A maximum of 100 records will be returned per page.
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Services for Twilio Proxy. A maximum of 100 records will be returned per page.
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Services for Twilio Proxy. A maximum of 100 records will be returned per page.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Services for Twilio Proxy. A maximum of 100 records will be returned per page.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Proxy)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Proxy,
+          "/v1/Services",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Service for Twilio Proxy
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Service for Twilio Proxy
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Service for Twilio Proxy
+    /// </summary>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="defaultTtl"> Default TTL for a Session, in seconds </param>
+    /// <param name="callbackUrl"> The URL we should call when the interaction status changes </param>
+    /// <param name="geoMatchLevel"> Where a proxy number must be located relative to the participant identifier </param>
+    /// <param name="numberSelectionBehavior"> The preference for Proxy Number selection for the Service instance </param>
+    /// <param name="interceptCallbackUrl"> The URL we call on each interaction </param>
+    /// <param name="outOfSessionCallbackUrl"> The URL we call when an inbound call or SMS action occurs on a closed or
+    ///                               non-existent Session </param>
+    /// <param name="chatInstanceSid"> The SID of the Chat Service Instance </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(string uniqueName,
+                                         int? defaultTtl = null,
+                                         Uri callbackUrl = null,
+                                         ServiceResource.GeoMatchLevelEnum geoMatchLevel = null,
+                                         ServiceResource.NumberSelectionBehaviorEnum numberSelectionBehavior = null,
+                                         Uri interceptCallbackUrl = null,
+                                         Uri outOfSessionCallbackUrl = null,
+                                         string chatInstanceSid = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(uniqueName) { DefaultTtl = defaultTtl, CallbackUrl = callbackUrl, GeoMatchLevel = geoMatchLevel, NumberSelectionBehavior = numberSelectionBehavior, InterceptCallbackUrl = interceptCallbackUrl, OutOfSessionCallbackUrl = outOfSessionCallbackUrl, ChatInstanceSid = chatInstanceSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Service for Twilio Proxy
+    /// </summary>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="defaultTtl"> Default TTL for a Session, in seconds </param>
+    /// <param name="callbackUrl"> The URL we should call when the interaction status changes </param>
+    /// <param name="geoMatchLevel"> Where a proxy number must be located relative to the participant identifier </param>
+    /// <param name="numberSelectionBehavior"> The preference for Proxy Number selection for the Service instance </param>
+    /// <param name="interceptCallbackUrl"> The URL we call on each interaction </param>
+    /// <param name="outOfSessionCallbackUrl"> The URL we call when an inbound call or SMS action occurs on a closed or
+    ///                               non-existent Session </param>
+    /// <param name="chatInstanceSid"> The SID of the Chat Service Instance </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string uniqueName,
+                                                                                 int? defaultTtl = null,
+                                                                                 Uri callbackUrl = null,
+                                                                                 ServiceResource.GeoMatchLevelEnum geoMatchLevel = null,
+                                                                                 ServiceResource.NumberSelectionBehaviorEnum numberSelectionBehavior = null,
+                                                                                 Uri interceptCallbackUrl = null,
+                                                                                 Uri outOfSessionCallbackUrl = null,
+                                                                                 string chatInstanceSid = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(uniqueName) { DefaultTtl = defaultTtl, CallbackUrl = callbackUrl, GeoMatchLevel = geoMatchLevel, NumberSelectionBehavior = numberSelectionBehavior, InterceptCallbackUrl = interceptCallbackUrl, OutOfSessionCallbackUrl = outOfSessionCallbackUrl, ChatInstanceSid = chatInstanceSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Service.
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Service.
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Service.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Service.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Proxy,
+          "/v1/Services/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Service.
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Service.
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Service.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="defaultTtl"> Default TTL for a Session, in seconds </param>
+    /// <param name="callbackUrl"> The URL we should call when the interaction status changes </param>
+    /// <param name="geoMatchLevel"> Where a proxy number must be located relative to the participant identifier </param>
+    /// <param name="numberSelectionBehavior"> The preference for Proxy Number selection for the Service instance </param>
+    /// <param name="interceptCallbackUrl"> The URL we call on each interaction </param>
+    /// <param name="outOfSessionCallbackUrl"> The URL we call when an inbound call or SMS action occurs on a closed or
+    ///                               non-existent Session </param>
+    /// <param name="chatInstanceSid"> The SID of the Chat Service Instance </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(string pathSid,
+                                         string uniqueName = null,
+                                         int? defaultTtl = null,
+                                         Uri callbackUrl = null,
+                                         ServiceResource.GeoMatchLevelEnum geoMatchLevel = null,
+                                         ServiceResource.NumberSelectionBehaviorEnum numberSelectionBehavior = null,
+                                         Uri interceptCallbackUrl = null,
+                                         Uri outOfSessionCallbackUrl = null,
+                                         string chatInstanceSid = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { UniqueName = uniqueName, DefaultTtl = defaultTtl, CallbackUrl = callbackUrl, GeoMatchLevel = geoMatchLevel, NumberSelectionBehavior = numberSelectionBehavior, InterceptCallbackUrl = interceptCallbackUrl, OutOfSessionCallbackUrl = outOfSessionCallbackUrl, ChatInstanceSid = chatInstanceSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Service.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="defaultTtl"> Default TTL for a Session, in seconds </param>
+    /// <param name="callbackUrl"> The URL we should call when the interaction status changes </param>
+    /// <param name="geoMatchLevel"> Where a proxy number must be located relative to the participant identifier </param>
+    /// <param name="numberSelectionBehavior"> The preference for Proxy Number selection for the Service instance </param>
+    /// <param name="interceptCallbackUrl"> The URL we call on each interaction </param>
+    /// <param name="outOfSessionCallbackUrl"> The URL we call when an inbound call or SMS action occurs on a closed or
+    ///                               non-existent Session </param>
+    /// <param name="chatInstanceSid"> The SID of the Chat Service Instance </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
+                                                                                 string uniqueName = null,
+                                                                                 int? defaultTtl = null,
+                                                                                 Uri callbackUrl = null,
+                                                                                 ServiceResource.GeoMatchLevelEnum geoMatchLevel = null,
+                                                                                 ServiceResource.NumberSelectionBehaviorEnum numberSelectionBehavior = null,
+                                                                                 Uri interceptCallbackUrl = null,
+                                                                                 Uri outOfSessionCallbackUrl = null,
+                                                                                 string chatInstanceSid = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { UniqueName = uniqueName, DefaultTtl = defaultTtl, CallbackUrl = callbackUrl, GeoMatchLevel = geoMatchLevel, NumberSelectionBehavior = numberSelectionBehavior, InterceptCallbackUrl = interceptCallbackUrl, OutOfSessionCallbackUrl = outOfSessionCallbackUrl, ChatInstanceSid = chatInstanceSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ServiceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ServiceResource object represented by the provided JSON </returns>
+    public static ServiceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ServiceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Chat Service Instance
+    /// </summary>
+    [JsonProperty("chat_instance_sid")]
+    public string ChatInstanceSid { get; private set; }
+    /// <summary>
+    /// The URL we call when the interaction status changes
+    /// </summary>
+    [JsonProperty("callback_url")]
+    public Uri CallbackUrl { get; private set; }
+    /// <summary>
+    /// Default TTL for a Session, in seconds
+    /// </summary>
+    [JsonProperty("default_ttl")]
+    public int? DefaultTtl { get; private set; }
+    /// <summary>
+    /// The preference for Proxy Number selection for the Service instance
+    /// </summary>
+    [JsonProperty("number_selection_behavior")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ServiceResource.NumberSelectionBehaviorEnum NumberSelectionBehavior { get; private set; }
+    /// <summary>
+    /// Where a proxy number must be located relative to the participant identifier
+    /// </summary>
+    [JsonProperty("geo_match_level")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ServiceResource.GeoMatchLevelEnum GeoMatchLevel { get; private set; }
+    /// <summary>
+    /// The URL we call on each interaction
+    /// </summary>
+    [JsonProperty("intercept_callback_url")]
+    public Uri InterceptCallbackUrl { get; private set; }
+    /// <summary>
+    /// The URL we call when an inbound call or SMS action occurs on a closed or non-existent Session
+    /// </summary>
+    [JsonProperty("out_of_session_callback_url")]
+    public Uri OutOfSessionCallbackUrl { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Service resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of resources related to the Service
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ServiceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/Asset/AssetVersionOptions.cs b/src/Twilio/Rest/Serverless/V1/Service/Asset/AssetVersionOptions.cs
index cb4846b6d..2f337e8e5 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/Asset/AssetVersionOptions.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/Asset/AssetVersionOptions.cs
@@ -9,93 +9,93 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Serverless.V1.Service.Asset
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Asset Versions.
+  /// </summary>
+  public class ReadAssetVersionOptions : ReadOptions<AssetVersionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Asset Versions.
+    /// The SID of the Service to read the Asset Version resource from
     /// </summary>
-    public class ReadAssetVersionOptions : ReadOptions<AssetVersionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the Asset Version resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Asset resource that is the parent of the Asset Version resources to read
-        /// </summary>
-        public string PathAssetSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadAssetVersionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Asset Version resource from </param>
-        /// <param name="pathAssetSid"> The SID of the Asset resource that is the parent of the Asset Version resources to read
-        ///                    </param>
-        public ReadAssetVersionOptions(string pathServiceSid, string pathAssetSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathAssetSid = pathAssetSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a specific Asset Version.
+    /// The SID of the Asset resource that is the parent of the Asset Version resources to read
     /// </summary>
-    public class FetchAssetVersionOptions : IOptions<AssetVersionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the Asset Version resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Asset resource that is the parent of the Asset Version resource to fetch
-        /// </summary>
-        public string PathAssetSid { get; }
-        /// <summary>
-        /// The SID that identifies the Asset Version resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAssetVersionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Asset Version resource from </param>
-        /// <param name="pathAssetSid"> The SID of the Asset resource that is the parent of the Asset Version resource to fetch
-        ///                    </param>
-        /// <param name="pathSid"> The SID that identifies the Asset Version resource to fetch </param>
-        public FetchAssetVersionOptions(string pathServiceSid, string pathAssetSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathAssetSid = pathAssetSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathAssetSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadAssetVersionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Asset Version resource from </param>
+    /// <param name="pathAssetSid"> The SID of the Asset resource that is the parent of the Asset Version resources to read
+    ///                    </param>
+    public ReadAssetVersionOptions(string pathServiceSid, string pathAssetSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathAssetSid = pathAssetSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a specific Asset Version.
+  /// </summary>
+  public class FetchAssetVersionOptions : IOptions<AssetVersionResource>
+  {
+    /// <summary>
+    /// The SID of the Service to fetch the Asset Version resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Asset resource that is the parent of the Asset Version resource to fetch
+    /// </summary>
+    public string PathAssetSid { get; }
+    /// <summary>
+    /// The SID that identifies the Asset Version resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchAssetVersionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Asset Version resource from </param>
+    /// <param name="pathAssetSid"> The SID of the Asset resource that is the parent of the Asset Version resource to fetch
+    ///                    </param>
+    /// <param name="pathSid"> The SID that identifies the Asset Version resource to fetch </param>
+    public FetchAssetVersionOptions(string pathServiceSid, string pathAssetSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathAssetSid = pathAssetSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/Asset/AssetVersionResource.cs b/src/Twilio/Rest/Serverless/V1/Service/Asset/AssetVersionResource.cs
index f562d8202..05034db96 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/Asset/AssetVersionResource.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/Asset/AssetVersionResource.cs
@@ -19,306 +19,306 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Serverless.V1.Service.Asset
-{
-
-    public class AssetVersionResource : Resource
-    {
-        public sealed class VisibilityEnum : StringEnum
-        {
-            private VisibilityEnum(string value) : base(value) {}
-            public VisibilityEnum() {}
-            public static implicit operator VisibilityEnum(string value)
-            {
-                return new VisibilityEnum(value);
-            }
-
-            public static readonly VisibilityEnum Public = new VisibilityEnum("public");
-            public static readonly VisibilityEnum Private = new VisibilityEnum("private");
-            public static readonly VisibilityEnum Protected = new VisibilityEnum("protected");
-        }
-
-        private static Request BuildReadRequest(ReadAssetVersionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Assets/" + options.PathAssetSid + "/Versions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Asset Versions.
-        /// </summary>
-        /// <param name="options"> Read AssetVersion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssetVersion </returns>
-        public static ResourceSet<AssetVersionResource> Read(ReadAssetVersionOptions options,
-                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AssetVersionResource>.FromJson("asset_versions", response.Content);
-            return new ResourceSet<AssetVersionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Asset Versions.
-        /// </summary>
-        /// <param name="options"> Read AssetVersion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssetVersion </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AssetVersionResource>> ReadAsync(ReadAssetVersionOptions options,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AssetVersionResource>.FromJson("asset_versions", response.Content);
-            return new ResourceSet<AssetVersionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Asset Versions.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Asset Version resource from </param>
-        /// <param name="pathAssetSid"> The SID of the Asset resource that is the parent of the Asset Version resources to read
-        ///                    </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssetVersion </returns>
-        public static ResourceSet<AssetVersionResource> Read(string pathServiceSid,
-                                                             string pathAssetSid,
-                                                             int? pageSize = null,
-                                                             long? limit = null,
-                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadAssetVersionOptions(pathServiceSid, pathAssetSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Asset Versions.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Asset Version resource from </param>
-        /// <param name="pathAssetSid"> The SID of the Asset resource that is the parent of the Asset Version resources to read
-        ///                    </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssetVersion </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AssetVersionResource>> ReadAsync(string pathServiceSid,
-                                                                                                     string pathAssetSid,
-                                                                                                     int? pageSize = null,
-                                                                                                     long? limit = null,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadAssetVersionOptions(pathServiceSid, pathAssetSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AssetVersionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AssetVersionResource>.FromJson("asset_versions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AssetVersionResource> NextPage(Page<AssetVersionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<AssetVersionResource>.FromJson("asset_versions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AssetVersionResource> PreviousPage(Page<AssetVersionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<AssetVersionResource>.FromJson("asset_versions", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchAssetVersionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Assets/" + options.PathAssetSid + "/Versions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a specific Asset Version.
-        /// </summary>
-        /// <param name="options"> Fetch AssetVersion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssetVersion </returns>
-        public static AssetVersionResource Fetch(FetchAssetVersionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Asset Version.
-        /// </summary>
-        /// <param name="options"> Fetch AssetVersion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssetVersion </returns>
-        public static async System.Threading.Tasks.Task<AssetVersionResource> FetchAsync(FetchAssetVersionOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a specific Asset Version.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Asset Version resource from </param>
-        /// <param name="pathAssetSid"> The SID of the Asset resource that is the parent of the Asset Version resource to fetch
-        ///                    </param>
-        /// <param name="pathSid"> The SID that identifies the Asset Version resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AssetVersion </returns>
-        public static AssetVersionResource Fetch(string pathServiceSid,
-                                                 string pathAssetSid,
-                                                 string pathSid,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchAssetVersionOptions(pathServiceSid, pathAssetSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Asset Version.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Asset Version resource from </param>
-        /// <param name="pathAssetSid"> The SID of the Asset resource that is the parent of the Asset Version resource to fetch
-        ///                    </param>
-        /// <param name="pathSid"> The SID that identifies the Asset Version resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AssetVersion </returns>
-        public static async System.Threading.Tasks.Task<AssetVersionResource> FetchAsync(string pathServiceSid,
-                                                                                         string pathAssetSid,
-                                                                                         string pathSid,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchAssetVersionOptions(pathServiceSid, pathAssetSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AssetVersionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AssetVersionResource object represented by the provided JSON </returns>
-        public static AssetVersionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AssetVersionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Asset Version resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the Asset Version resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the Asset Version resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Asset resource that is the parent of the Asset Version
-        /// </summary>
-        [JsonProperty("asset_sid")]
-        public string AssetSid { get; private set; }
-        /// <summary>
-        /// The URL-friendly string by which the Asset Version can be referenced
-        /// </summary>
-        [JsonProperty("path")]
-        public string Path { get; private set; }
-        /// <summary>
-        /// The access control that determines how the Asset Version can be accessed
-        /// </summary>
-        [JsonProperty("visibility")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public AssetVersionResource.VisibilityEnum Visibility { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Asset Version resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Asset Version resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private AssetVersionResource()
-        {
-
-        }
-    }
+{
+
+  public class AssetVersionResource : Resource
+  {
+    public sealed class VisibilityEnum : StringEnum
+    {
+      private VisibilityEnum(string value) : base(value) { }
+      public VisibilityEnum() { }
+      public static implicit operator VisibilityEnum(string value)
+      {
+        return new VisibilityEnum(value);
+      }
+
+      public static readonly VisibilityEnum Public = new VisibilityEnum("public");
+      public static readonly VisibilityEnum Private = new VisibilityEnum("private");
+      public static readonly VisibilityEnum Protected = new VisibilityEnum("protected");
+    }
+
+    private static Request BuildReadRequest(ReadAssetVersionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Assets/" + options.PathAssetSid + "/Versions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Asset Versions.
+    /// </summary>
+    /// <param name="options"> Read AssetVersion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssetVersion </returns>
+    public static ResourceSet<AssetVersionResource> Read(ReadAssetVersionOptions options,
+                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AssetVersionResource>.FromJson("asset_versions", response.Content);
+      return new ResourceSet<AssetVersionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Asset Versions.
+    /// </summary>
+    /// <param name="options"> Read AssetVersion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssetVersion </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AssetVersionResource>> ReadAsync(ReadAssetVersionOptions options,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AssetVersionResource>.FromJson("asset_versions", response.Content);
+      return new ResourceSet<AssetVersionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Asset Versions.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Asset Version resource from </param>
+    /// <param name="pathAssetSid"> The SID of the Asset resource that is the parent of the Asset Version resources to read
+    ///                    </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssetVersion </returns>
+    public static ResourceSet<AssetVersionResource> Read(string pathServiceSid,
+                                                         string pathAssetSid,
+                                                         int? pageSize = null,
+                                                         long? limit = null,
+                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadAssetVersionOptions(pathServiceSid, pathAssetSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Asset Versions.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Asset Version resource from </param>
+    /// <param name="pathAssetSid"> The SID of the Asset resource that is the parent of the Asset Version resources to read
+    ///                    </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssetVersion </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AssetVersionResource>> ReadAsync(string pathServiceSid,
+                                                                                                 string pathAssetSid,
+                                                                                                 int? pageSize = null,
+                                                                                                 long? limit = null,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadAssetVersionOptions(pathServiceSid, pathAssetSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AssetVersionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AssetVersionResource>.FromJson("asset_versions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AssetVersionResource> NextPage(Page<AssetVersionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<AssetVersionResource>.FromJson("asset_versions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AssetVersionResource> PreviousPage(Page<AssetVersionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<AssetVersionResource>.FromJson("asset_versions", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchAssetVersionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Assets/" + options.PathAssetSid + "/Versions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a specific Asset Version.
+    /// </summary>
+    /// <param name="options"> Fetch AssetVersion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssetVersion </returns>
+    public static AssetVersionResource Fetch(FetchAssetVersionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Asset Version.
+    /// </summary>
+    /// <param name="options"> Fetch AssetVersion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssetVersion </returns>
+    public static async System.Threading.Tasks.Task<AssetVersionResource> FetchAsync(FetchAssetVersionOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a specific Asset Version.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Asset Version resource from </param>
+    /// <param name="pathAssetSid"> The SID of the Asset resource that is the parent of the Asset Version resource to fetch
+    ///                    </param>
+    /// <param name="pathSid"> The SID that identifies the Asset Version resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AssetVersion </returns>
+    public static AssetVersionResource Fetch(string pathServiceSid,
+                                             string pathAssetSid,
+                                             string pathSid,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchAssetVersionOptions(pathServiceSid, pathAssetSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Asset Version.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Asset Version resource from </param>
+    /// <param name="pathAssetSid"> The SID of the Asset resource that is the parent of the Asset Version resource to fetch
+    ///                    </param>
+    /// <param name="pathSid"> The SID that identifies the Asset Version resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AssetVersion </returns>
+    public static async System.Threading.Tasks.Task<AssetVersionResource> FetchAsync(string pathServiceSid,
+                                                                                     string pathAssetSid,
+                                                                                     string pathSid,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchAssetVersionOptions(pathServiceSid, pathAssetSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AssetVersionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AssetVersionResource object represented by the provided JSON </returns>
+    public static AssetVersionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AssetVersionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Asset Version resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the Asset Version resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the Asset Version resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Asset resource that is the parent of the Asset Version
+    /// </summary>
+    [JsonProperty("asset_sid")]
+    public string AssetSid { get; private set; }
+    /// <summary>
+    /// The URL-friendly string by which the Asset Version can be referenced
+    /// </summary>
+    [JsonProperty("path")]
+    public string Path { get; private set; }
+    /// <summary>
+    /// The access control that determines how the Asset Version can be accessed
+    /// </summary>
+    [JsonProperty("visibility")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public AssetVersionResource.VisibilityEnum Visibility { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Asset Version resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Asset Version resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private AssetVersionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/AssetOptions.cs b/src/Twilio/Rest/Serverless/V1/Service/AssetOptions.cs
index 3e33710db..f7228e08f 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/AssetOptions.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/AssetOptions.cs
@@ -9,206 +9,206 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Serverless.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Assets.
+  /// </summary>
+  public class ReadAssetOptions : ReadOptions<AssetResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Assets.
+    /// The SID of the Service to read the Asset resource from
     /// </summary>
-    public class ReadAssetOptions : ReadOptions<AssetResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the Asset resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadAssetOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Asset resource from </param>
-        public ReadAssetOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a specific Asset resource.
-    /// </summary>
-    public class FetchAssetOptions : IOptions<AssetResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the Asset resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID that identifies the Asset resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchAssetOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Asset resource from </param>
-        /// <param name="pathSid"> The SID that identifies the Asset resource to fetch </param>
-        public FetchAssetOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new ReadAssetOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Asset resource from </param>
+    public ReadAssetOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete an Asset resource.
-    /// </summary>
-    public class DeleteAssetOptions : IOptions<AssetResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the Asset resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID that identifies the Asset resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteAssetOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Asset resource from </param>
-        /// <param name="pathSid"> The SID that identifies the Asset resource to delete </param>
-        public DeleteAssetOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a specific Asset resource.
+  /// </summary>
+  public class FetchAssetOptions : IOptions<AssetResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Asset resource.
-    /// </summary>
-    public class CreateAssetOptions : IOptions<AssetResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the Asset resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// A string to describe the Asset resource
-        /// </summary>
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Construct a new CreateAssetOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Asset resource under </param>
-        /// <param name="friendlyName"> A string to describe the Asset resource </param>
-        public CreateAssetOptions(string pathServiceSid, string friendlyName)
-        {
-            PathServiceSid = pathServiceSid;
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Service to fetch the Asset resource from
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update a specific Asset resource.
-    /// </summary>
-    public class UpdateAssetOptions : IOptions<AssetResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the Asset resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID that identifies the Asset resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the Asset resource
-        /// </summary>
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Construct a new UpdateAssetOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the Asset resource from </param>
-        /// <param name="pathSid"> The SID that identifies the Asset resource to update </param>
-        /// <param name="friendlyName"> A string to describe the Asset resource </param>
-        public UpdateAssetOptions(string pathServiceSid, string pathSid, string friendlyName)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
+    /// The SID that identifies the Asset resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchAssetOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Asset resource from </param>
+    /// <param name="pathSid"> The SID that identifies the Asset resource to fetch </param>
+    public FetchAssetOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete an Asset resource.
+  /// </summary>
+  public class DeleteAssetOptions : IOptions<AssetResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the Asset resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID that identifies the Asset resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteAssetOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Asset resource from </param>
+    /// <param name="pathSid"> The SID that identifies the Asset resource to delete </param>
+    public DeleteAssetOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Asset resource.
+  /// </summary>
+  public class CreateAssetOptions : IOptions<AssetResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the Asset resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// A string to describe the Asset resource
+    /// </summary>
+    public string FriendlyName { get; }
+
+    /// <summary>
+    /// Construct a new CreateAssetOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Asset resource under </param>
+    /// <param name="friendlyName"> A string to describe the Asset resource </param>
+    public CreateAssetOptions(string pathServiceSid, string friendlyName)
+    {
+      PathServiceSid = pathServiceSid;
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update a specific Asset resource.
+  /// </summary>
+  public class UpdateAssetOptions : IOptions<AssetResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the Asset resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID that identifies the Asset resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the Asset resource
+    /// </summary>
+    public string FriendlyName { get; }
+
+    /// <summary>
+    /// Construct a new UpdateAssetOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the Asset resource from </param>
+    /// <param name="pathSid"> The SID that identifies the Asset resource to update </param>
+    /// <param name="friendlyName"> A string to describe the Asset resource </param>
+    public UpdateAssetOptions(string pathServiceSid, string pathSid, string friendlyName)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/AssetResource.cs b/src/Twilio/Rest/Serverless/V1/Service/AssetResource.cs
index 3605c9a9e..fcb0c4b7a 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/AssetResource.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/AssetResource.cs
@@ -18,492 +18,492 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Serverless.V1.Service
-{
-
-    public class AssetResource : Resource
-    {
-        private static Request BuildReadRequest(ReadAssetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Assets",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Assets.
-        /// </summary>
-        /// <param name="options"> Read Asset parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Asset </returns>
-        public static ResourceSet<AssetResource> Read(ReadAssetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<AssetResource>.FromJson("assets", response.Content);
-            return new ResourceSet<AssetResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Assets.
-        /// </summary>
-        /// <param name="options"> Read Asset parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Asset </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AssetResource>> ReadAsync(ReadAssetOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<AssetResource>.FromJson("assets", response.Content);
-            return new ResourceSet<AssetResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Assets.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Asset resource from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Asset </returns>
-        public static ResourceSet<AssetResource> Read(string pathServiceSid,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadAssetOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Assets.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Asset resource from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Asset </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<AssetResource>> ReadAsync(string pathServiceSid,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadAssetOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<AssetResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<AssetResource>.FromJson("assets", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<AssetResource> NextPage(Page<AssetResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<AssetResource>.FromJson("assets", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<AssetResource> PreviousPage(Page<AssetResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<AssetResource>.FromJson("assets", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchAssetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Assets/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a specific Asset resource.
-        /// </summary>
-        /// <param name="options"> Fetch Asset parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Asset </returns>
-        public static AssetResource Fetch(FetchAssetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Asset resource.
-        /// </summary>
-        /// <param name="options"> Fetch Asset parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Asset </returns>
-        public static async System.Threading.Tasks.Task<AssetResource> FetchAsync(FetchAssetOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a specific Asset resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Asset resource from </param>
-        /// <param name="pathSid"> The SID that identifies the Asset resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Asset </returns>
-        public static AssetResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchAssetOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Asset resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Asset resource from </param>
-        /// <param name="pathSid"> The SID that identifies the Asset resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Asset </returns>
-        public static async System.Threading.Tasks.Task<AssetResource> FetchAsync(string pathServiceSid,
-                                                                                  string pathSid,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchAssetOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteAssetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Assets/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete an Asset resource.
-        /// </summary>
-        /// <param name="options"> Delete Asset parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Asset </returns>
-        public static bool Delete(DeleteAssetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an Asset resource.
-        /// </summary>
-        /// <param name="options"> Delete Asset parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Asset </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAssetOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete an Asset resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Asset resource from </param>
-        /// <param name="pathSid"> The SID that identifies the Asset resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Asset </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteAssetOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an Asset resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Asset resource from </param>
-        /// <param name="pathSid"> The SID that identifies the Asset resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Asset </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteAssetOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateAssetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Assets",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Asset resource.
-        /// </summary>
-        /// <param name="options"> Create Asset parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Asset </returns>
-        public static AssetResource Create(CreateAssetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Asset resource.
-        /// </summary>
-        /// <param name="options"> Create Asset parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Asset </returns>
-        public static async System.Threading.Tasks.Task<AssetResource> CreateAsync(CreateAssetOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Asset resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Asset resource under </param>
-        /// <param name="friendlyName"> A string to describe the Asset resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Asset </returns>
-        public static AssetResource Create(string pathServiceSid, string friendlyName, ITwilioRestClient client = null)
-        {
-            var options = new CreateAssetOptions(pathServiceSid, friendlyName);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Asset resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Asset resource under </param>
-        /// <param name="friendlyName"> A string to describe the Asset resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Asset </returns>
-        public static async System.Threading.Tasks.Task<AssetResource> CreateAsync(string pathServiceSid,
-                                                                                   string friendlyName,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateAssetOptions(pathServiceSid, friendlyName);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateAssetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Assets/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Asset resource.
-        /// </summary>
-        /// <param name="options"> Update Asset parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Asset </returns>
-        public static AssetResource Update(UpdateAssetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Asset resource.
-        /// </summary>
-        /// <param name="options"> Update Asset parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Asset </returns>
-        public static async System.Threading.Tasks.Task<AssetResource> UpdateAsync(UpdateAssetOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Asset resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the Asset resource from </param>
-        /// <param name="pathSid"> The SID that identifies the Asset resource to update </param>
-        /// <param name="friendlyName"> A string to describe the Asset resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Asset </returns>
-        public static AssetResource Update(string pathServiceSid,
-                                           string pathSid,
-                                           string friendlyName,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new UpdateAssetOptions(pathServiceSid, pathSid, friendlyName);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Asset resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the Asset resource from </param>
-        /// <param name="pathSid"> The SID that identifies the Asset resource to update </param>
-        /// <param name="friendlyName"> A string to describe the Asset resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Asset </returns>
-        public static async System.Threading.Tasks.Task<AssetResource> UpdateAsync(string pathServiceSid,
-                                                                                   string pathSid,
-                                                                                   string friendlyName,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new UpdateAssetOptions(pathServiceSid, pathSid, friendlyName);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AssetResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AssetResource object represented by the provided JSON </returns>
-        public static AssetResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AssetResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Asset resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the Asset resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the Asset resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the Asset resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Asset resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Asset resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Asset resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of the Asset resource's nested resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private AssetResource()
-        {
-
-        }
-    }
+{
+
+  public class AssetResource : Resource
+  {
+    private static Request BuildReadRequest(ReadAssetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Assets",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Assets.
+    /// </summary>
+    /// <param name="options"> Read Asset parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Asset </returns>
+    public static ResourceSet<AssetResource> Read(ReadAssetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<AssetResource>.FromJson("assets", response.Content);
+      return new ResourceSet<AssetResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Assets.
+    /// </summary>
+    /// <param name="options"> Read Asset parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Asset </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AssetResource>> ReadAsync(ReadAssetOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<AssetResource>.FromJson("assets", response.Content);
+      return new ResourceSet<AssetResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Assets.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Asset resource from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Asset </returns>
+    public static ResourceSet<AssetResource> Read(string pathServiceSid,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadAssetOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Assets.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Asset resource from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Asset </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<AssetResource>> ReadAsync(string pathServiceSid,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadAssetOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<AssetResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<AssetResource>.FromJson("assets", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<AssetResource> NextPage(Page<AssetResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<AssetResource>.FromJson("assets", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<AssetResource> PreviousPage(Page<AssetResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<AssetResource>.FromJson("assets", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchAssetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Assets/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a specific Asset resource.
+    /// </summary>
+    /// <param name="options"> Fetch Asset parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Asset </returns>
+    public static AssetResource Fetch(FetchAssetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Asset resource.
+    /// </summary>
+    /// <param name="options"> Fetch Asset parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Asset </returns>
+    public static async System.Threading.Tasks.Task<AssetResource> FetchAsync(FetchAssetOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a specific Asset resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Asset resource from </param>
+    /// <param name="pathSid"> The SID that identifies the Asset resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Asset </returns>
+    public static AssetResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchAssetOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Asset resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Asset resource from </param>
+    /// <param name="pathSid"> The SID that identifies the Asset resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Asset </returns>
+    public static async System.Threading.Tasks.Task<AssetResource> FetchAsync(string pathServiceSid,
+                                                                              string pathSid,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchAssetOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteAssetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Assets/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete an Asset resource.
+    /// </summary>
+    /// <param name="options"> Delete Asset parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Asset </returns>
+    public static bool Delete(DeleteAssetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an Asset resource.
+    /// </summary>
+    /// <param name="options"> Delete Asset parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Asset </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteAssetOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete an Asset resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Asset resource from </param>
+    /// <param name="pathSid"> The SID that identifies the Asset resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Asset </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteAssetOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an Asset resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Asset resource from </param>
+    /// <param name="pathSid"> The SID that identifies the Asset resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Asset </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteAssetOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateAssetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Assets",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Asset resource.
+    /// </summary>
+    /// <param name="options"> Create Asset parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Asset </returns>
+    public static AssetResource Create(CreateAssetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Asset resource.
+    /// </summary>
+    /// <param name="options"> Create Asset parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Asset </returns>
+    public static async System.Threading.Tasks.Task<AssetResource> CreateAsync(CreateAssetOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Asset resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Asset resource under </param>
+    /// <param name="friendlyName"> A string to describe the Asset resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Asset </returns>
+    public static AssetResource Create(string pathServiceSid, string friendlyName, ITwilioRestClient client = null)
+    {
+      var options = new CreateAssetOptions(pathServiceSid, friendlyName);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Asset resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Asset resource under </param>
+    /// <param name="friendlyName"> A string to describe the Asset resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Asset </returns>
+    public static async System.Threading.Tasks.Task<AssetResource> CreateAsync(string pathServiceSid,
+                                                                               string friendlyName,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateAssetOptions(pathServiceSid, friendlyName);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateAssetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Assets/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Asset resource.
+    /// </summary>
+    /// <param name="options"> Update Asset parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Asset </returns>
+    public static AssetResource Update(UpdateAssetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Asset resource.
+    /// </summary>
+    /// <param name="options"> Update Asset parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Asset </returns>
+    public static async System.Threading.Tasks.Task<AssetResource> UpdateAsync(UpdateAssetOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Asset resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the Asset resource from </param>
+    /// <param name="pathSid"> The SID that identifies the Asset resource to update </param>
+    /// <param name="friendlyName"> A string to describe the Asset resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Asset </returns>
+    public static AssetResource Update(string pathServiceSid,
+                                       string pathSid,
+                                       string friendlyName,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new UpdateAssetOptions(pathServiceSid, pathSid, friendlyName);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Asset resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the Asset resource from </param>
+    /// <param name="pathSid"> The SID that identifies the Asset resource to update </param>
+    /// <param name="friendlyName"> A string to describe the Asset resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Asset </returns>
+    public static async System.Threading.Tasks.Task<AssetResource> UpdateAsync(string pathServiceSid,
+                                                                               string pathSid,
+                                                                               string friendlyName,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new UpdateAssetOptions(pathServiceSid, pathSid, friendlyName);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AssetResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AssetResource object represented by the provided JSON </returns>
+    public static AssetResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AssetResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Asset resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the Asset resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the Asset resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the Asset resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Asset resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Asset resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Asset resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of the Asset resource's nested resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private AssetResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/BuildOptions.cs b/src/Twilio/Rest/Serverless/V1/Service/BuildOptions.cs
index c47225a23..711c907cd 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/BuildOptions.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/BuildOptions.cs
@@ -10,185 +10,185 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Serverless.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Builds.
+  /// </summary>
+  public class ReadBuildOptions : ReadOptions<BuildResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Builds.
+    /// The SID of the Service to read the Build resources from
     /// </summary>
-    public class ReadBuildOptions : ReadOptions<BuildResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the Build resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadBuildOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Build resources from </param>
-        public ReadBuildOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a specific Build resource.
-    /// </summary>
-    public class FetchBuildOptions : IOptions<BuildResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the Build resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Build resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchBuildOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Build resource from </param>
-        /// <param name="pathSid"> The SID of the Build resource to fetch </param>
-        public FetchBuildOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new ReadBuildOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Build resources from </param>
+    public ReadBuildOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a Build resource.
-    /// </summary>
-    public class DeleteBuildOptions : IOptions<BuildResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the Build resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Build resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteBuildOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Build resource from </param>
-        /// <param name="pathSid"> The SID of the Build resource to delete </param>
-        public DeleteBuildOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a specific Build resource.
+  /// </summary>
+  public class FetchBuildOptions : IOptions<BuildResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Build resource. At least one function version or asset version is required.
-    /// </summary>
-    public class CreateBuildOptions : IOptions<BuildResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the Build resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The list of Asset Version resource SIDs to include in the Build
-        /// </summary>
-        public List<string> AssetVersions { get; set; }
-        /// <summary>
-        /// The list of the Function Version resource SIDs to include in the Build
-        /// </summary>
-        public List<string> FunctionVersions { get; set; }
-        /// <summary>
-        /// A list of objects that describe the Dependencies included in the Build
-        /// </summary>
-        public string Dependencies { get; set; }
-        /// <summary>
-        /// The Runtime version that will be used to run the Build.
-        /// </summary>
-        public string Runtime { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateBuildOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Build resource under </param>
-        public CreateBuildOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-            AssetVersions = new List<string>();
-            FunctionVersions = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AssetVersions != null)
-            {
-                p.AddRange(AssetVersions.Select(prop => new KeyValuePair<string, string>("AssetVersions", prop.ToString())));
-            }
-
-            if (FunctionVersions != null)
-            {
-                p.AddRange(FunctionVersions.Select(prop => new KeyValuePair<string, string>("FunctionVersions", prop.ToString())));
-            }
-
-            if (Dependencies != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Dependencies", Dependencies));
-            }
-
-            if (Runtime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Runtime", Runtime));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Service to fetch the Build resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Build resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchBuildOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Build resource from </param>
+    /// <param name="pathSid"> The SID of the Build resource to fetch </param>
+    public FetchBuildOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a Build resource.
+  /// </summary>
+  public class DeleteBuildOptions : IOptions<BuildResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the Build resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Build resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteBuildOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Build resource from </param>
+    /// <param name="pathSid"> The SID of the Build resource to delete </param>
+    public DeleteBuildOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Build resource. At least one function version or asset version is required.
+  /// </summary>
+  public class CreateBuildOptions : IOptions<BuildResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the Build resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The list of Asset Version resource SIDs to include in the Build
+    /// </summary>
+    public List<string> AssetVersions { get; set; }
+    /// <summary>
+    /// The list of the Function Version resource SIDs to include in the Build
+    /// </summary>
+    public List<string> FunctionVersions { get; set; }
+    /// <summary>
+    /// A list of objects that describe the Dependencies included in the Build
+    /// </summary>
+    public string Dependencies { get; set; }
+    /// <summary>
+    /// The Runtime version that will be used to run the Build.
+    /// </summary>
+    public string Runtime { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateBuildOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Build resource under </param>
+    public CreateBuildOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+      AssetVersions = new List<string>();
+      FunctionVersions = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AssetVersions != null)
+      {
+        p.AddRange(AssetVersions.Select(prop => new KeyValuePair<string, string>("AssetVersions", prop.ToString())));
+      }
+
+      if (FunctionVersions != null)
+      {
+        p.AddRange(FunctionVersions.Select(prop => new KeyValuePair<string, string>("FunctionVersions", prop.ToString())));
+      }
+
+      if (Dependencies != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Dependencies", Dependencies));
+      }
+
+      if (Runtime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Runtime", Runtime));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/BuildResource.cs b/src/Twilio/Rest/Serverless/V1/Service/BuildResource.cs
index 2502bdbc2..342b30e54 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/BuildResource.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/BuildResource.cs
@@ -19,481 +19,481 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Serverless.V1.Service
-{
-
-    public class BuildResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Building = new StatusEnum("building");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        public sealed class RuntimeEnum : StringEnum
-        {
-            private RuntimeEnum(string value) : base(value) {}
-            public RuntimeEnum() {}
-            public static implicit operator RuntimeEnum(string value)
-            {
-                return new RuntimeEnum(value);
-            }
-
-            public static readonly RuntimeEnum Node8 = new RuntimeEnum("node8");
-            public static readonly RuntimeEnum Node10 = new RuntimeEnum("node10");
-            public static readonly RuntimeEnum Node12 = new RuntimeEnum("node12");
-            public static readonly RuntimeEnum Node14 = new RuntimeEnum("node14");
-        }
-
-        private static Request BuildReadRequest(ReadBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Builds",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Builds.
-        /// </summary>
-        /// <param name="options"> Read Build parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Build </returns>
-        public static ResourceSet<BuildResource> Read(ReadBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<BuildResource>.FromJson("builds", response.Content);
-            return new ResourceSet<BuildResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Builds.
-        /// </summary>
-        /// <param name="options"> Read Build parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Build </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BuildResource>> ReadAsync(ReadBuildOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<BuildResource>.FromJson("builds", response.Content);
-            return new ResourceSet<BuildResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Builds.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Build resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Build </returns>
-        public static ResourceSet<BuildResource> Read(string pathServiceSid,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadBuildOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Builds.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Build resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Build </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BuildResource>> ReadAsync(string pathServiceSid,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadBuildOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<BuildResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<BuildResource>.FromJson("builds", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<BuildResource> NextPage(Page<BuildResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<BuildResource>.FromJson("builds", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<BuildResource> PreviousPage(Page<BuildResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<BuildResource>.FromJson("builds", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Builds/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a specific Build resource.
-        /// </summary>
-        /// <param name="options"> Fetch Build parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Build </returns>
-        public static BuildResource Fetch(FetchBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Build resource.
-        /// </summary>
-        /// <param name="options"> Fetch Build parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Build </returns>
-        public static async System.Threading.Tasks.Task<BuildResource> FetchAsync(FetchBuildOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a specific Build resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Build resource from </param>
-        /// <param name="pathSid"> The SID of the Build resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Build </returns>
-        public static BuildResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchBuildOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Build resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Build resource from </param>
-        /// <param name="pathSid"> The SID of the Build resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Build </returns>
-        public static async System.Threading.Tasks.Task<BuildResource> FetchAsync(string pathServiceSid,
-                                                                                  string pathSid,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchBuildOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Builds/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a Build resource.
-        /// </summary>
-        /// <param name="options"> Delete Build parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Build </returns>
-        public static bool Delete(DeleteBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Build resource.
-        /// </summary>
-        /// <param name="options"> Delete Build parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Build </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBuildOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a Build resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Build resource from </param>
-        /// <param name="pathSid"> The SID of the Build resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Build </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteBuildOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Build resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Build resource from </param>
-        /// <param name="pathSid"> The SID of the Build resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Build </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteBuildOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateBuildOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Builds",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Build resource. At least one function version or asset version is required.
-        /// </summary>
-        /// <param name="options"> Create Build parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Build </returns>
-        public static BuildResource Create(CreateBuildOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Build resource. At least one function version or asset version is required.
-        /// </summary>
-        /// <param name="options"> Create Build parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Build </returns>
-        public static async System.Threading.Tasks.Task<BuildResource> CreateAsync(CreateBuildOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Build resource. At least one function version or asset version is required.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Build resource under </param>
-        /// <param name="assetVersions"> The list of Asset Version resource SIDs to include in the Build </param>
-        /// <param name="functionVersions"> The list of the Function Version resource SIDs to include in the Build </param>
-        /// <param name="dependencies"> A list of objects that describe the Dependencies included in the Build </param>
-        /// <param name="runtime"> The Runtime version that will be used to run the Build. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Build </returns>
-        public static BuildResource Create(string pathServiceSid,
-                                           List<string> assetVersions = null,
-                                           List<string> functionVersions = null,
-                                           string dependencies = null,
-                                           string runtime = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateBuildOptions(pathServiceSid){AssetVersions = assetVersions, FunctionVersions = functionVersions, Dependencies = dependencies, Runtime = runtime};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Build resource. At least one function version or asset version is required.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Build resource under </param>
-        /// <param name="assetVersions"> The list of Asset Version resource SIDs to include in the Build </param>
-        /// <param name="functionVersions"> The list of the Function Version resource SIDs to include in the Build </param>
-        /// <param name="dependencies"> A list of objects that describe the Dependencies included in the Build </param>
-        /// <param name="runtime"> The Runtime version that will be used to run the Build. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Build </returns>
-        public static async System.Threading.Tasks.Task<BuildResource> CreateAsync(string pathServiceSid,
-                                                                                   List<string> assetVersions = null,
-                                                                                   List<string> functionVersions = null,
-                                                                                   string dependencies = null,
-                                                                                   string runtime = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateBuildOptions(pathServiceSid){AssetVersions = assetVersions, FunctionVersions = functionVersions, Dependencies = dependencies, Runtime = runtime};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a BuildResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BuildResource object represented by the provided JSON </returns>
-        public static BuildResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BuildResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Build resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the Build resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the Build resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The status of the Build
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public BuildResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The list of Asset Version resource SIDs that are included in the Build
-        /// </summary>
-        [JsonProperty("asset_versions")]
-        public List<object> AssetVersions { get; private set; }
-        /// <summary>
-        /// The list of Function Version resource SIDs that are included in the Build
-        /// </summary>
-        [JsonProperty("function_versions")]
-        public List<object> FunctionVersions { get; private set; }
-        /// <summary>
-        /// A list of objects that describe the Dependencies included in the Build
-        /// </summary>
-        [JsonProperty("dependencies")]
-        public List<object> Dependencies { get; private set; }
-        /// <summary>
-        /// The Runtime version that will be used to run the Build.
-        /// </summary>
-        [JsonProperty("runtime")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public BuildResource.RuntimeEnum Runtime { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Build resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Build resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Build resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private BuildResource()
-        {
-
-        }
-    }
+{
+
+  public class BuildResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Building = new StatusEnum("building");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    public sealed class RuntimeEnum : StringEnum
+    {
+      private RuntimeEnum(string value) : base(value) { }
+      public RuntimeEnum() { }
+      public static implicit operator RuntimeEnum(string value)
+      {
+        return new RuntimeEnum(value);
+      }
+
+      public static readonly RuntimeEnum Node8 = new RuntimeEnum("node8");
+      public static readonly RuntimeEnum Node10 = new RuntimeEnum("node10");
+      public static readonly RuntimeEnum Node12 = new RuntimeEnum("node12");
+      public static readonly RuntimeEnum Node14 = new RuntimeEnum("node14");
+    }
+
+    private static Request BuildReadRequest(ReadBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Builds",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Builds.
+    /// </summary>
+    /// <param name="options"> Read Build parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Build </returns>
+    public static ResourceSet<BuildResource> Read(ReadBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<BuildResource>.FromJson("builds", response.Content);
+      return new ResourceSet<BuildResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Builds.
+    /// </summary>
+    /// <param name="options"> Read Build parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Build </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BuildResource>> ReadAsync(ReadBuildOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<BuildResource>.FromJson("builds", response.Content);
+      return new ResourceSet<BuildResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Builds.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Build resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Build </returns>
+    public static ResourceSet<BuildResource> Read(string pathServiceSid,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadBuildOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Builds.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Build resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Build </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BuildResource>> ReadAsync(string pathServiceSid,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadBuildOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<BuildResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<BuildResource>.FromJson("builds", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<BuildResource> NextPage(Page<BuildResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<BuildResource>.FromJson("builds", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<BuildResource> PreviousPage(Page<BuildResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<BuildResource>.FromJson("builds", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Builds/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a specific Build resource.
+    /// </summary>
+    /// <param name="options"> Fetch Build parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Build </returns>
+    public static BuildResource Fetch(FetchBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Build resource.
+    /// </summary>
+    /// <param name="options"> Fetch Build parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Build </returns>
+    public static async System.Threading.Tasks.Task<BuildResource> FetchAsync(FetchBuildOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a specific Build resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Build resource from </param>
+    /// <param name="pathSid"> The SID of the Build resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Build </returns>
+    public static BuildResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchBuildOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Build resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Build resource from </param>
+    /// <param name="pathSid"> The SID of the Build resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Build </returns>
+    public static async System.Threading.Tasks.Task<BuildResource> FetchAsync(string pathServiceSid,
+                                                                              string pathSid,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchBuildOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Builds/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a Build resource.
+    /// </summary>
+    /// <param name="options"> Delete Build parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Build </returns>
+    public static bool Delete(DeleteBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Build resource.
+    /// </summary>
+    /// <param name="options"> Delete Build parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Build </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBuildOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a Build resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Build resource from </param>
+    /// <param name="pathSid"> The SID of the Build resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Build </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteBuildOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Build resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Build resource from </param>
+    /// <param name="pathSid"> The SID of the Build resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Build </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteBuildOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateBuildOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Builds",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Build resource. At least one function version or asset version is required.
+    /// </summary>
+    /// <param name="options"> Create Build parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Build </returns>
+    public static BuildResource Create(CreateBuildOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Build resource. At least one function version or asset version is required.
+    /// </summary>
+    /// <param name="options"> Create Build parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Build </returns>
+    public static async System.Threading.Tasks.Task<BuildResource> CreateAsync(CreateBuildOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Build resource. At least one function version or asset version is required.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Build resource under </param>
+    /// <param name="assetVersions"> The list of Asset Version resource SIDs to include in the Build </param>
+    /// <param name="functionVersions"> The list of the Function Version resource SIDs to include in the Build </param>
+    /// <param name="dependencies"> A list of objects that describe the Dependencies included in the Build </param>
+    /// <param name="runtime"> The Runtime version that will be used to run the Build. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Build </returns>
+    public static BuildResource Create(string pathServiceSid,
+                                       List<string> assetVersions = null,
+                                       List<string> functionVersions = null,
+                                       string dependencies = null,
+                                       string runtime = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateBuildOptions(pathServiceSid) { AssetVersions = assetVersions, FunctionVersions = functionVersions, Dependencies = dependencies, Runtime = runtime };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Build resource. At least one function version or asset version is required.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Build resource under </param>
+    /// <param name="assetVersions"> The list of Asset Version resource SIDs to include in the Build </param>
+    /// <param name="functionVersions"> The list of the Function Version resource SIDs to include in the Build </param>
+    /// <param name="dependencies"> A list of objects that describe the Dependencies included in the Build </param>
+    /// <param name="runtime"> The Runtime version that will be used to run the Build. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Build </returns>
+    public static async System.Threading.Tasks.Task<BuildResource> CreateAsync(string pathServiceSid,
+                                                                               List<string> assetVersions = null,
+                                                                               List<string> functionVersions = null,
+                                                                               string dependencies = null,
+                                                                               string runtime = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateBuildOptions(pathServiceSid) { AssetVersions = assetVersions, FunctionVersions = functionVersions, Dependencies = dependencies, Runtime = runtime };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a BuildResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BuildResource object represented by the provided JSON </returns>
+    public static BuildResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BuildResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Build resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the Build resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the Build resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The status of the Build
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public BuildResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The list of Asset Version resource SIDs that are included in the Build
+    /// </summary>
+    [JsonProperty("asset_versions")]
+    public List<object> AssetVersions { get; private set; }
+    /// <summary>
+    /// The list of Function Version resource SIDs that are included in the Build
+    /// </summary>
+    [JsonProperty("function_versions")]
+    public List<object> FunctionVersions { get; private set; }
+    /// <summary>
+    /// A list of objects that describe the Dependencies included in the Build
+    /// </summary>
+    [JsonProperty("dependencies")]
+    public List<object> Dependencies { get; private set; }
+    /// <summary>
+    /// The Runtime version that will be used to run the Build.
+    /// </summary>
+    [JsonProperty("runtime")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public BuildResource.RuntimeEnum Runtime { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Build resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Build resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Build resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private BuildResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/Environment/DeploymentOptions.cs b/src/Twilio/Rest/Serverless/V1/Service/Environment/DeploymentOptions.cs
index 89dd3d758..ad778af76 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/Environment/DeploymentOptions.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/Environment/DeploymentOptions.cs
@@ -9,137 +9,137 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Serverless.V1.Service.Environment
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Deployments.
+  /// </summary>
+  public class ReadDeploymentOptions : ReadOptions<DeploymentResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Deployments.
+    /// The SID of the Service to read the Deployment resources from
     /// </summary>
-    public class ReadDeploymentOptions : ReadOptions<DeploymentResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the Deployment resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Environment used by the Deployment resources to read
-        /// </summary>
-        public string PathEnvironmentSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadDeploymentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Deployment resources from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment used by the Deployment resources to read </param>
-        public ReadDeploymentOptions(string pathServiceSid, string pathEnvironmentSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathEnvironmentSid = pathEnvironmentSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a specific Deployment.
+    /// The SID of the Environment used by the Deployment resources to read
     /// </summary>
-    public class FetchDeploymentOptions : IOptions<DeploymentResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the Deployment resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Environment used by the Deployment to fetch
-        /// </summary>
-        public string PathEnvironmentSid { get; }
-        /// <summary>
-        /// The SID that identifies the Deployment resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchDeploymentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Deployment resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment used by the Deployment to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the Deployment resource to fetch </param>
-        public FetchDeploymentOptions(string pathServiceSid, string pathEnvironmentSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathEnvironmentSid = pathEnvironmentSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathEnvironmentSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Deployment.
+    /// Construct a new ReadDeploymentOptions
     /// </summary>
-    public class CreateDeploymentOptions : IOptions<DeploymentResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the Deployment resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Environment for the Deployment
-        /// </summary>
-        public string PathEnvironmentSid { get; }
-        /// <summary>
-        /// The SID of the Build for the Deployment
-        /// </summary>
-        public string BuildSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateDeploymentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Deployment resource under </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment for the Deployment </param>
-        public CreateDeploymentOptions(string pathServiceSid, string pathEnvironmentSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathEnvironmentSid = pathEnvironmentSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (BuildSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BuildSid", BuildSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathServiceSid"> The SID of the Service to read the Deployment resources from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment used by the Deployment resources to read </param>
+    public ReadDeploymentOptions(string pathServiceSid, string pathEnvironmentSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathEnvironmentSid = pathEnvironmentSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a specific Deployment.
+  /// </summary>
+  public class FetchDeploymentOptions : IOptions<DeploymentResource>
+  {
+    /// <summary>
+    /// The SID of the Service to fetch the Deployment resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Environment used by the Deployment to fetch
+    /// </summary>
+    public string PathEnvironmentSid { get; }
+    /// <summary>
+    /// The SID that identifies the Deployment resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchDeploymentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Deployment resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment used by the Deployment to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the Deployment resource to fetch </param>
+    public FetchDeploymentOptions(string pathServiceSid, string pathEnvironmentSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathEnvironmentSid = pathEnvironmentSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Deployment.
+  /// </summary>
+  public class CreateDeploymentOptions : IOptions<DeploymentResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the Deployment resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Environment for the Deployment
+    /// </summary>
+    public string PathEnvironmentSid { get; }
+    /// <summary>
+    /// The SID of the Build for the Deployment
+    /// </summary>
+    public string BuildSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateDeploymentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Deployment resource under </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment for the Deployment </param>
+    public CreateDeploymentOptions(string pathServiceSid, string pathEnvironmentSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathEnvironmentSid = pathEnvironmentSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (BuildSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BuildSid", BuildSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/Environment/DeploymentResource.cs b/src/Twilio/Rest/Serverless/V1/Service/Environment/DeploymentResource.cs
index e64caaf7a..708733df8 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/Environment/DeploymentResource.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/Environment/DeploymentResource.cs
@@ -18,362 +18,362 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Serverless.V1.Service.Environment
-{
-
-    public class DeploymentResource : Resource
-    {
-        private static Request BuildReadRequest(ReadDeploymentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Deployments",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Deployments.
-        /// </summary>
-        /// <param name="options"> Read Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static ResourceSet<DeploymentResource> Read(ReadDeploymentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DeploymentResource>.FromJson("deployments", response.Content);
-            return new ResourceSet<DeploymentResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Deployments.
-        /// </summary>
-        /// <param name="options"> Read Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DeploymentResource>> ReadAsync(ReadDeploymentOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DeploymentResource>.FromJson("deployments", response.Content);
-            return new ResourceSet<DeploymentResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Deployments.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Deployment resources from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment used by the Deployment resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static ResourceSet<DeploymentResource> Read(string pathServiceSid,
-                                                           string pathEnvironmentSid,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadDeploymentOptions(pathServiceSid, pathEnvironmentSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Deployments.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Deployment resources from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment used by the Deployment resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DeploymentResource>> ReadAsync(string pathServiceSid,
-                                                                                                   string pathEnvironmentSid,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadDeploymentOptions(pathServiceSid, pathEnvironmentSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DeploymentResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DeploymentResource>.FromJson("deployments", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DeploymentResource> NextPage(Page<DeploymentResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<DeploymentResource>.FromJson("deployments", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DeploymentResource> PreviousPage(Page<DeploymentResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<DeploymentResource>.FromJson("deployments", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchDeploymentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Deployments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a specific Deployment.
-        /// </summary>
-        /// <param name="options"> Fetch Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static DeploymentResource Fetch(FetchDeploymentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Deployment.
-        /// </summary>
-        /// <param name="options"> Fetch Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<DeploymentResource> FetchAsync(FetchDeploymentOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a specific Deployment.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Deployment resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment used by the Deployment to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the Deployment resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static DeploymentResource Fetch(string pathServiceSid,
-                                               string pathEnvironmentSid,
-                                               string pathSid,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchDeploymentOptions(pathServiceSid, pathEnvironmentSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Deployment.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Deployment resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment used by the Deployment to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the Deployment resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<DeploymentResource> FetchAsync(string pathServiceSid,
-                                                                                       string pathEnvironmentSid,
-                                                                                       string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchDeploymentOptions(pathServiceSid, pathEnvironmentSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateDeploymentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Deployments",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Deployment.
-        /// </summary>
-        /// <param name="options"> Create Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static DeploymentResource Create(CreateDeploymentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Deployment.
-        /// </summary>
-        /// <param name="options"> Create Deployment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<DeploymentResource> CreateAsync(CreateDeploymentOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Deployment.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Deployment resource under </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment for the Deployment </param>
-        /// <param name="buildSid"> The SID of the Build for the Deployment </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Deployment </returns>
-        public static DeploymentResource Create(string pathServiceSid,
-                                                string pathEnvironmentSid,
-                                                string buildSid = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateDeploymentOptions(pathServiceSid, pathEnvironmentSid){BuildSid = buildSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Deployment.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Deployment resource under </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment for the Deployment </param>
-        /// <param name="buildSid"> The SID of the Build for the Deployment </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Deployment </returns>
-        public static async System.Threading.Tasks.Task<DeploymentResource> CreateAsync(string pathServiceSid,
-                                                                                        string pathEnvironmentSid,
-                                                                                        string buildSid = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateDeploymentOptions(pathServiceSid, pathEnvironmentSid){BuildSid = buildSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a DeploymentResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DeploymentResource object represented by the provided JSON </returns>
-        public static DeploymentResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DeploymentResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Deployment resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the Deployment resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the Deployment resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Environment for the Deployment
-        /// </summary>
-        [JsonProperty("environment_sid")]
-        public string EnvironmentSid { get; private set; }
-        /// <summary>
-        /// The SID of the Build for the deployment
-        /// </summary>
-        [JsonProperty("build_sid")]
-        public string BuildSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Deployment resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Deployment resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Deployment resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private DeploymentResource()
-        {
-
-        }
-    }
+{
+
+  public class DeploymentResource : Resource
+  {
+    private static Request BuildReadRequest(ReadDeploymentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Deployments",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Deployments.
+    /// </summary>
+    /// <param name="options"> Read Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static ResourceSet<DeploymentResource> Read(ReadDeploymentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DeploymentResource>.FromJson("deployments", response.Content);
+      return new ResourceSet<DeploymentResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Deployments.
+    /// </summary>
+    /// <param name="options"> Read Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DeploymentResource>> ReadAsync(ReadDeploymentOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DeploymentResource>.FromJson("deployments", response.Content);
+      return new ResourceSet<DeploymentResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Deployments.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Deployment resources from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment used by the Deployment resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static ResourceSet<DeploymentResource> Read(string pathServiceSid,
+                                                       string pathEnvironmentSid,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadDeploymentOptions(pathServiceSid, pathEnvironmentSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Deployments.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Deployment resources from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment used by the Deployment resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DeploymentResource>> ReadAsync(string pathServiceSid,
+                                                                                               string pathEnvironmentSid,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadDeploymentOptions(pathServiceSid, pathEnvironmentSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DeploymentResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DeploymentResource>.FromJson("deployments", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DeploymentResource> NextPage(Page<DeploymentResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<DeploymentResource>.FromJson("deployments", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DeploymentResource> PreviousPage(Page<DeploymentResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<DeploymentResource>.FromJson("deployments", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchDeploymentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Deployments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a specific Deployment.
+    /// </summary>
+    /// <param name="options"> Fetch Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static DeploymentResource Fetch(FetchDeploymentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Deployment.
+    /// </summary>
+    /// <param name="options"> Fetch Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<DeploymentResource> FetchAsync(FetchDeploymentOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a specific Deployment.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Deployment resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment used by the Deployment to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the Deployment resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static DeploymentResource Fetch(string pathServiceSid,
+                                           string pathEnvironmentSid,
+                                           string pathSid,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchDeploymentOptions(pathServiceSid, pathEnvironmentSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Deployment.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Deployment resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment used by the Deployment to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the Deployment resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<DeploymentResource> FetchAsync(string pathServiceSid,
+                                                                                   string pathEnvironmentSid,
+                                                                                   string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchDeploymentOptions(pathServiceSid, pathEnvironmentSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateDeploymentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Deployments",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Deployment.
+    /// </summary>
+    /// <param name="options"> Create Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static DeploymentResource Create(CreateDeploymentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Deployment.
+    /// </summary>
+    /// <param name="options"> Create Deployment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<DeploymentResource> CreateAsync(CreateDeploymentOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Deployment.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Deployment resource under </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment for the Deployment </param>
+    /// <param name="buildSid"> The SID of the Build for the Deployment </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Deployment </returns>
+    public static DeploymentResource Create(string pathServiceSid,
+                                            string pathEnvironmentSid,
+                                            string buildSid = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateDeploymentOptions(pathServiceSid, pathEnvironmentSid) { BuildSid = buildSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Deployment.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Deployment resource under </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment for the Deployment </param>
+    /// <param name="buildSid"> The SID of the Build for the Deployment </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Deployment </returns>
+    public static async System.Threading.Tasks.Task<DeploymentResource> CreateAsync(string pathServiceSid,
+                                                                                    string pathEnvironmentSid,
+                                                                                    string buildSid = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateDeploymentOptions(pathServiceSid, pathEnvironmentSid) { BuildSid = buildSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a DeploymentResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DeploymentResource object represented by the provided JSON </returns>
+    public static DeploymentResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DeploymentResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Deployment resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the Deployment resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the Deployment resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Environment for the Deployment
+    /// </summary>
+    [JsonProperty("environment_sid")]
+    public string EnvironmentSid { get; private set; }
+    /// <summary>
+    /// The SID of the Build for the deployment
+    /// </summary>
+    [JsonProperty("build_sid")]
+    public string BuildSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Deployment resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Deployment resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Deployment resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private DeploymentResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/Environment/LogOptions.cs b/src/Twilio/Rest/Serverless/V1/Service/Environment/LogOptions.cs
index d2e0c1885..2fb5e80d1 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/Environment/LogOptions.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/Environment/LogOptions.cs
@@ -9,118 +9,118 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Serverless.V1.Service.Environment
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all logs.
+  /// </summary>
+  public class ReadLogOptions : ReadOptions<LogResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all logs.
+    /// The SID of the Service to read the Log resource from
     /// </summary>
-    public class ReadLogOptions : ReadOptions<LogResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the Log resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the environment with the Log resources to read
-        /// </summary>
-        public string PathEnvironmentSid { get; }
-        /// <summary>
-        /// The SID of the function whose invocation produced the Log resources to read
-        /// </summary>
-        public string FunctionSid { get; set; }
-        /// <summary>
-        /// The date and time after which the Log resources must have been created.
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// The date and time before which the Log resource must have been created.
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadLogOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Log resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the environment with the Log resources to read </param>
-        public ReadLogOptions(string pathServiceSid, string pathEnvironmentSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathEnvironmentSid = pathEnvironmentSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FunctionSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FunctionSid", FunctionSid.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a specific log.
+    /// The SID of the environment with the Log resources to read
     /// </summary>
-    public class FetchLogOptions : IOptions<LogResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the Log resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the environment with the Log resource to fetch
-        /// </summary>
-        public string PathEnvironmentSid { get; }
-        /// <summary>
-        /// The SID that identifies the Log resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchLogOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Log resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the environment with the Log resource to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the Log resource to fetch </param>
-        public FetchLogOptions(string pathServiceSid, string pathEnvironmentSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathEnvironmentSid = pathEnvironmentSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathEnvironmentSid { get; }
+    /// <summary>
+    /// The SID of the function whose invocation produced the Log resources to read
+    /// </summary>
+    public string FunctionSid { get; set; }
+    /// <summary>
+    /// The date and time after which the Log resources must have been created.
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// The date and time before which the Log resource must have been created.
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadLogOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Log resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the environment with the Log resources to read </param>
+    public ReadLogOptions(string pathServiceSid, string pathEnvironmentSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathEnvironmentSid = pathEnvironmentSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FunctionSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FunctionSid", FunctionSid.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a specific log.
+  /// </summary>
+  public class FetchLogOptions : IOptions<LogResource>
+  {
+    /// <summary>
+    /// The SID of the Service to fetch the Log resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the environment with the Log resource to fetch
+    /// </summary>
+    public string PathEnvironmentSid { get; }
+    /// <summary>
+    /// The SID that identifies the Log resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchLogOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Log resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the environment with the Log resource to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the Log resource to fetch </param>
+    public FetchLogOptions(string pathServiceSid, string pathEnvironmentSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathEnvironmentSid = pathEnvironmentSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/Environment/LogResource.cs b/src/Twilio/Rest/Serverless/V1/Service/Environment/LogResource.cs
index 63aa3c666..2447fd87f 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/Environment/LogResource.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/Environment/LogResource.cs
@@ -19,333 +19,333 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Serverless.V1.Service.Environment
-{
-
-    public class LogResource : Resource
-    {
-        public sealed class LevelEnum : StringEnum
-        {
-            private LevelEnum(string value) : base(value) {}
-            public LevelEnum() {}
-            public static implicit operator LevelEnum(string value)
-            {
-                return new LevelEnum(value);
-            }
-
-            public static readonly LevelEnum Info = new LevelEnum("info");
-            public static readonly LevelEnum Warn = new LevelEnum("warn");
-            public static readonly LevelEnum Error = new LevelEnum("error");
-        }
-
-        private static Request BuildReadRequest(ReadLogOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Logs",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all logs.
-        /// </summary>
-        /// <param name="options"> Read Log parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Log </returns>
-        public static ResourceSet<LogResource> Read(ReadLogOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<LogResource>.FromJson("logs", response.Content);
-            return new ResourceSet<LogResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all logs.
-        /// </summary>
-        /// <param name="options"> Read Log parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Log </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<LogResource>> ReadAsync(ReadLogOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<LogResource>.FromJson("logs", response.Content);
-            return new ResourceSet<LogResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all logs.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Log resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the environment with the Log resources to read </param>
-        /// <param name="functionSid"> The SID of the function whose invocation produced the Log resources to read </param>
-        /// <param name="startDate"> The date and time after which the Log resources must have been created. </param>
-        /// <param name="endDate"> The date and time before which the Log resource must have been created. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Log </returns>
-        public static ResourceSet<LogResource> Read(string pathServiceSid,
-                                                    string pathEnvironmentSid,
-                                                    string functionSid = null,
-                                                    DateTime? startDate = null,
-                                                    DateTime? endDate = null,
-                                                    int? pageSize = null,
-                                                    long? limit = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadLogOptions(pathServiceSid, pathEnvironmentSid){FunctionSid = functionSid, StartDate = startDate, EndDate = endDate, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all logs.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Log resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the environment with the Log resources to read </param>
-        /// <param name="functionSid"> The SID of the function whose invocation produced the Log resources to read </param>
-        /// <param name="startDate"> The date and time after which the Log resources must have been created. </param>
-        /// <param name="endDate"> The date and time before which the Log resource must have been created. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Log </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<LogResource>> ReadAsync(string pathServiceSid,
-                                                                                            string pathEnvironmentSid,
-                                                                                            string functionSid = null,
-                                                                                            DateTime? startDate = null,
-                                                                                            DateTime? endDate = null,
-                                                                                            int? pageSize = null,
-                                                                                            long? limit = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadLogOptions(pathServiceSid, pathEnvironmentSid){FunctionSid = functionSid, StartDate = startDate, EndDate = endDate, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<LogResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<LogResource>.FromJson("logs", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<LogResource> NextPage(Page<LogResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<LogResource>.FromJson("logs", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<LogResource> PreviousPage(Page<LogResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<LogResource>.FromJson("logs", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchLogOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Logs/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a specific log.
-        /// </summary>
-        /// <param name="options"> Fetch Log parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Log </returns>
-        public static LogResource Fetch(FetchLogOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific log.
-        /// </summary>
-        /// <param name="options"> Fetch Log parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Log </returns>
-        public static async System.Threading.Tasks.Task<LogResource> FetchAsync(FetchLogOptions options,
-                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a specific log.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Log resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the environment with the Log resource to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the Log resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Log </returns>
-        public static LogResource Fetch(string pathServiceSid,
-                                        string pathEnvironmentSid,
-                                        string pathSid,
-                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchLogOptions(pathServiceSid, pathEnvironmentSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific log.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Log resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the environment with the Log resource to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the Log resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Log </returns>
-        public static async System.Threading.Tasks.Task<LogResource> FetchAsync(string pathServiceSid,
-                                                                                string pathEnvironmentSid,
-                                                                                string pathSid,
-                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchLogOptions(pathServiceSid, pathEnvironmentSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a LogResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> LogResource object represented by the provided JSON </returns>
-        public static LogResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<LogResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Log resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the Log resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the Log resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the environment in which the log occurred
-        /// </summary>
-        [JsonProperty("environment_sid")]
-        public string EnvironmentSid { get; private set; }
-        /// <summary>
-        /// The SID of the build that corresponds to the log
-        /// </summary>
-        [JsonProperty("build_sid")]
-        public string BuildSid { get; private set; }
-        /// <summary>
-        /// The SID of the deployment that corresponds to the log
-        /// </summary>
-        [JsonProperty("deployment_sid")]
-        public string DeploymentSid { get; private set; }
-        /// <summary>
-        /// The SID of the function whose invocation produced the log
-        /// </summary>
-        [JsonProperty("function_sid")]
-        public string FunctionSid { get; private set; }
-        /// <summary>
-        /// The SID of the request associated with the log
-        /// </summary>
-        [JsonProperty("request_sid")]
-        public string RequestSid { get; private set; }
-        /// <summary>
-        /// The log level
-        /// </summary>
-        [JsonProperty("level")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public LogResource.LevelEnum Level { get; private set; }
-        /// <summary>
-        /// The log message
-        /// </summary>
-        [JsonProperty("message")]
-        public string Message { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Log resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Log resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private LogResource()
-        {
-
-        }
-    }
+{
+
+  public class LogResource : Resource
+  {
+    public sealed class LevelEnum : StringEnum
+    {
+      private LevelEnum(string value) : base(value) { }
+      public LevelEnum() { }
+      public static implicit operator LevelEnum(string value)
+      {
+        return new LevelEnum(value);
+      }
+
+      public static readonly LevelEnum Info = new LevelEnum("info");
+      public static readonly LevelEnum Warn = new LevelEnum("warn");
+      public static readonly LevelEnum Error = new LevelEnum("error");
+    }
+
+    private static Request BuildReadRequest(ReadLogOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Logs",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all logs.
+    /// </summary>
+    /// <param name="options"> Read Log parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Log </returns>
+    public static ResourceSet<LogResource> Read(ReadLogOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<LogResource>.FromJson("logs", response.Content);
+      return new ResourceSet<LogResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all logs.
+    /// </summary>
+    /// <param name="options"> Read Log parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Log </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<LogResource>> ReadAsync(ReadLogOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<LogResource>.FromJson("logs", response.Content);
+      return new ResourceSet<LogResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all logs.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Log resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the environment with the Log resources to read </param>
+    /// <param name="functionSid"> The SID of the function whose invocation produced the Log resources to read </param>
+    /// <param name="startDate"> The date and time after which the Log resources must have been created. </param>
+    /// <param name="endDate"> The date and time before which the Log resource must have been created. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Log </returns>
+    public static ResourceSet<LogResource> Read(string pathServiceSid,
+                                                string pathEnvironmentSid,
+                                                string functionSid = null,
+                                                DateTime? startDate = null,
+                                                DateTime? endDate = null,
+                                                int? pageSize = null,
+                                                long? limit = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadLogOptions(pathServiceSid, pathEnvironmentSid) { FunctionSid = functionSid, StartDate = startDate, EndDate = endDate, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all logs.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Log resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the environment with the Log resources to read </param>
+    /// <param name="functionSid"> The SID of the function whose invocation produced the Log resources to read </param>
+    /// <param name="startDate"> The date and time after which the Log resources must have been created. </param>
+    /// <param name="endDate"> The date and time before which the Log resource must have been created. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Log </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<LogResource>> ReadAsync(string pathServiceSid,
+                                                                                        string pathEnvironmentSid,
+                                                                                        string functionSid = null,
+                                                                                        DateTime? startDate = null,
+                                                                                        DateTime? endDate = null,
+                                                                                        int? pageSize = null,
+                                                                                        long? limit = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadLogOptions(pathServiceSid, pathEnvironmentSid) { FunctionSid = functionSid, StartDate = startDate, EndDate = endDate, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<LogResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<LogResource>.FromJson("logs", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<LogResource> NextPage(Page<LogResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<LogResource>.FromJson("logs", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<LogResource> PreviousPage(Page<LogResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<LogResource>.FromJson("logs", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchLogOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Logs/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a specific log.
+    /// </summary>
+    /// <param name="options"> Fetch Log parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Log </returns>
+    public static LogResource Fetch(FetchLogOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific log.
+    /// </summary>
+    /// <param name="options"> Fetch Log parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Log </returns>
+    public static async System.Threading.Tasks.Task<LogResource> FetchAsync(FetchLogOptions options,
+                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a specific log.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Log resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the environment with the Log resource to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the Log resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Log </returns>
+    public static LogResource Fetch(string pathServiceSid,
+                                    string pathEnvironmentSid,
+                                    string pathSid,
+                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchLogOptions(pathServiceSid, pathEnvironmentSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific log.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Log resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the environment with the Log resource to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the Log resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Log </returns>
+    public static async System.Threading.Tasks.Task<LogResource> FetchAsync(string pathServiceSid,
+                                                                            string pathEnvironmentSid,
+                                                                            string pathSid,
+                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchLogOptions(pathServiceSid, pathEnvironmentSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a LogResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> LogResource object represented by the provided JSON </returns>
+    public static LogResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<LogResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Log resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the Log resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the Log resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the environment in which the log occurred
+    /// </summary>
+    [JsonProperty("environment_sid")]
+    public string EnvironmentSid { get; private set; }
+    /// <summary>
+    /// The SID of the build that corresponds to the log
+    /// </summary>
+    [JsonProperty("build_sid")]
+    public string BuildSid { get; private set; }
+    /// <summary>
+    /// The SID of the deployment that corresponds to the log
+    /// </summary>
+    [JsonProperty("deployment_sid")]
+    public string DeploymentSid { get; private set; }
+    /// <summary>
+    /// The SID of the function whose invocation produced the log
+    /// </summary>
+    [JsonProperty("function_sid")]
+    public string FunctionSid { get; private set; }
+    /// <summary>
+    /// The SID of the request associated with the log
+    /// </summary>
+    [JsonProperty("request_sid")]
+    public string RequestSid { get; private set; }
+    /// <summary>
+    /// The log level
+    /// </summary>
+    [JsonProperty("level")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public LogResource.LevelEnum Level { get; private set; }
+    /// <summary>
+    /// The log message
+    /// </summary>
+    [JsonProperty("message")]
+    public string Message { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Log resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Log resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private LogResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/Environment/VariableOptions.cs b/src/Twilio/Rest/Serverless/V1/Service/Environment/VariableOptions.cs
index f788ad778..c8ab6ae43 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/Environment/VariableOptions.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/Environment/VariableOptions.cs
@@ -9,254 +9,254 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Serverless.V1.Service.Environment
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Variables.
+  /// </summary>
+  public class ReadVariableOptions : ReadOptions<VariableResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Variables.
+    /// The SID of the Service to read the Variable resources from
     /// </summary>
-    public class ReadVariableOptions : ReadOptions<VariableResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the Variable resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Environment with the Variable resources to read
-        /// </summary>
-        public string PathEnvironmentSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadVariableOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Variable resources from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resources to read </param>
-        public ReadVariableOptions(string pathServiceSid, string pathEnvironmentSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathEnvironmentSid = pathEnvironmentSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a specific Variable.
+    /// The SID of the Environment with the Variable resources to read
     /// </summary>
-    public class FetchVariableOptions : IOptions<VariableResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the Variable resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Environment with the Variable resource to fetch
-        /// </summary>
-        public string PathEnvironmentSid { get; }
-        /// <summary>
-        /// The SID of the Variable resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchVariableOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Variable resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Variable resource to fetch </param>
-        public FetchVariableOptions(string pathServiceSid, string pathEnvironmentSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathEnvironmentSid = pathEnvironmentSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathEnvironmentSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Variable.
+    /// Construct a new ReadVariableOptions
     /// </summary>
-    public class CreateVariableOptions : IOptions<VariableResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the Variable resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Environment in which the Variable exists
-        /// </summary>
-        public string PathEnvironmentSid { get; }
-        /// <summary>
-        /// A string by which the Variable resource can be referenced
-        /// </summary>
-        public string Key { get; }
-        /// <summary>
-        /// A string that contains the actual value of the Variable
-        /// </summary>
-        public string Value { get; }
-
-        /// <summary>
-        /// Construct a new CreateVariableOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Variable resource under </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment in which the Variable exists </param>
-        /// <param name="key"> A string by which the Variable resource can be referenced </param>
-        /// <param name="value"> A string that contains the actual value of the Variable </param>
-        public CreateVariableOptions(string pathServiceSid, string pathEnvironmentSid, string key, string value)
-        {
-            PathServiceSid = pathServiceSid;
-            PathEnvironmentSid = pathEnvironmentSid;
-            Key = key;
-            Value = value;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Key != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Key", Key));
-            }
-
-            if (Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Value", Value));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The SID of the Service to read the Variable resources from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resources to read </param>
+    public ReadVariableOptions(string pathServiceSid, string pathEnvironmentSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathEnvironmentSid = pathEnvironmentSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update a specific Variable.
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateVariableOptions : IOptions<VariableResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the Variable resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Environment with the Variable resource to update
-        /// </summary>
-        public string PathEnvironmentSid { get; }
-        /// <summary>
-        /// The SID of the Variable resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string by which the Variable resource can be referenced
-        /// </summary>
-        public string Key { get; set; }
-        /// <summary>
-        /// A string that contains the actual value of the Variable
-        /// </summary>
-        public string Value { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateVariableOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the Variable resource under </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resource to update </param>
-        /// <param name="pathSid"> The SID of the Variable resource to update </param>
-        public UpdateVariableOptions(string pathServiceSid, string pathEnvironmentSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathEnvironmentSid = pathEnvironmentSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Key != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Key", Key));
-            }
-
-            if (Value != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Value", Value));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a specific Variable.
+  /// </summary>
+  public class FetchVariableOptions : IOptions<VariableResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific Variable.
+    /// The SID of the Service to fetch the Variable resource from
     /// </summary>
-    public class DeleteVariableOptions : IOptions<VariableResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the Variable resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Environment with the Variables to delete
-        /// </summary>
-        public string PathEnvironmentSid { get; }
-        /// <summary>
-        /// The SID of the Variable resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteVariableOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Variable resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variables to delete </param>
-        /// <param name="pathSid"> The SID of the Variable resource to delete </param>
-        public DeleteVariableOptions(string pathServiceSid, string pathEnvironmentSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathEnvironmentSid = pathEnvironmentSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Environment with the Variable resource to fetch
+    /// </summary>
+    public string PathEnvironmentSid { get; }
+    /// <summary>
+    /// The SID of the Variable resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchVariableOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Variable resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Variable resource to fetch </param>
+    public FetchVariableOptions(string pathServiceSid, string pathEnvironmentSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathEnvironmentSid = pathEnvironmentSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Variable.
+  /// </summary>
+  public class CreateVariableOptions : IOptions<VariableResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the Variable resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Environment in which the Variable exists
+    /// </summary>
+    public string PathEnvironmentSid { get; }
+    /// <summary>
+    /// A string by which the Variable resource can be referenced
+    /// </summary>
+    public string Key { get; }
+    /// <summary>
+    /// A string that contains the actual value of the Variable
+    /// </summary>
+    public string Value { get; }
+
+    /// <summary>
+    /// Construct a new CreateVariableOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Variable resource under </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment in which the Variable exists </param>
+    /// <param name="key"> A string by which the Variable resource can be referenced </param>
+    /// <param name="value"> A string that contains the actual value of the Variable </param>
+    public CreateVariableOptions(string pathServiceSid, string pathEnvironmentSid, string key, string value)
+    {
+      PathServiceSid = pathServiceSid;
+      PathEnvironmentSid = pathEnvironmentSid;
+      Key = key;
+      Value = value;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Key != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Key", Key));
+      }
+
+      if (Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Value", Value));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update a specific Variable.
+  /// </summary>
+  public class UpdateVariableOptions : IOptions<VariableResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the Variable resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Environment with the Variable resource to update
+    /// </summary>
+    public string PathEnvironmentSid { get; }
+    /// <summary>
+    /// The SID of the Variable resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string by which the Variable resource can be referenced
+    /// </summary>
+    public string Key { get; set; }
+    /// <summary>
+    /// A string that contains the actual value of the Variable
+    /// </summary>
+    public string Value { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateVariableOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the Variable resource under </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resource to update </param>
+    /// <param name="pathSid"> The SID of the Variable resource to update </param>
+    public UpdateVariableOptions(string pathServiceSid, string pathEnvironmentSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathEnvironmentSid = pathEnvironmentSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Key != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Key", Key));
+      }
+
+      if (Value != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Value", Value));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific Variable.
+  /// </summary>
+  public class DeleteVariableOptions : IOptions<VariableResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the Variable resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Environment with the Variables to delete
+    /// </summary>
+    public string PathEnvironmentSid { get; }
+    /// <summary>
+    /// The SID of the Variable resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteVariableOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Variable resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variables to delete </param>
+    /// <param name="pathSid"> The SID of the Variable resource to delete </param>
+    public DeleteVariableOptions(string pathServiceSid, string pathEnvironmentSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathEnvironmentSid = pathEnvironmentSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/Environment/VariableResource.cs b/src/Twilio/Rest/Serverless/V1/Service/Environment/VariableResource.cs
index 5a6d09e2c..9dc75463e 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/Environment/VariableResource.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/Environment/VariableResource.cs
@@ -18,531 +18,531 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Serverless.V1.Service.Environment
-{
-
-    public class VariableResource : Resource
-    {
-        private static Request BuildReadRequest(ReadVariableOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Variables",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Variables.
-        /// </summary>
-        /// <param name="options"> Read Variable parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Variable </returns>
-        public static ResourceSet<VariableResource> Read(ReadVariableOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<VariableResource>.FromJson("variables", response.Content);
-            return new ResourceSet<VariableResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Variables.
-        /// </summary>
-        /// <param name="options"> Read Variable parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Variable </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<VariableResource>> ReadAsync(ReadVariableOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<VariableResource>.FromJson("variables", response.Content);
-            return new ResourceSet<VariableResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Variables.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Variable resources from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Variable </returns>
-        public static ResourceSet<VariableResource> Read(string pathServiceSid,
-                                                         string pathEnvironmentSid,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadVariableOptions(pathServiceSid, pathEnvironmentSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Variables.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Variable resources from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Variable </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<VariableResource>> ReadAsync(string pathServiceSid,
-                                                                                                 string pathEnvironmentSid,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadVariableOptions(pathServiceSid, pathEnvironmentSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<VariableResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<VariableResource>.FromJson("variables", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<VariableResource> NextPage(Page<VariableResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<VariableResource>.FromJson("variables", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<VariableResource> PreviousPage(Page<VariableResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<VariableResource>.FromJson("variables", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchVariableOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Variables/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a specific Variable.
-        /// </summary>
-        /// <param name="options"> Fetch Variable parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Variable </returns>
-        public static VariableResource Fetch(FetchVariableOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Variable.
-        /// </summary>
-        /// <param name="options"> Fetch Variable parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Variable </returns>
-        public static async System.Threading.Tasks.Task<VariableResource> FetchAsync(FetchVariableOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a specific Variable.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Variable resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Variable resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Variable </returns>
-        public static VariableResource Fetch(string pathServiceSid,
-                                             string pathEnvironmentSid,
-                                             string pathSid,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new FetchVariableOptions(pathServiceSid, pathEnvironmentSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Variable.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Variable resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Variable resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Variable </returns>
-        public static async System.Threading.Tasks.Task<VariableResource> FetchAsync(string pathServiceSid,
-                                                                                     string pathEnvironmentSid,
-                                                                                     string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchVariableOptions(pathServiceSid, pathEnvironmentSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateVariableOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Variables",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Variable.
-        /// </summary>
-        /// <param name="options"> Create Variable parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Variable </returns>
-        public static VariableResource Create(CreateVariableOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Variable.
-        /// </summary>
-        /// <param name="options"> Create Variable parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Variable </returns>
-        public static async System.Threading.Tasks.Task<VariableResource> CreateAsync(CreateVariableOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Variable.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Variable resource under </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment in which the Variable exists </param>
-        /// <param name="key"> A string by which the Variable resource can be referenced </param>
-        /// <param name="value"> A string that contains the actual value of the Variable </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Variable </returns>
-        public static VariableResource Create(string pathServiceSid,
-                                              string pathEnvironmentSid,
-                                              string key,
-                                              string value,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateVariableOptions(pathServiceSid, pathEnvironmentSid, key, value);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Variable.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Variable resource under </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment in which the Variable exists </param>
-        /// <param name="key"> A string by which the Variable resource can be referenced </param>
-        /// <param name="value"> A string that contains the actual value of the Variable </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Variable </returns>
-        public static async System.Threading.Tasks.Task<VariableResource> CreateAsync(string pathServiceSid,
-                                                                                      string pathEnvironmentSid,
-                                                                                      string key,
-                                                                                      string value,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateVariableOptions(pathServiceSid, pathEnvironmentSid, key, value);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateVariableOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Variables/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Variable.
-        /// </summary>
-        /// <param name="options"> Update Variable parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Variable </returns>
-        public static VariableResource Update(UpdateVariableOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Variable.
-        /// </summary>
-        /// <param name="options"> Update Variable parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Variable </returns>
-        public static async System.Threading.Tasks.Task<VariableResource> UpdateAsync(UpdateVariableOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Variable.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the Variable resource under </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resource to update </param>
-        /// <param name="pathSid"> The SID of the Variable resource to update </param>
-        /// <param name="key"> A string by which the Variable resource can be referenced </param>
-        /// <param name="value"> A string that contains the actual value of the Variable </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Variable </returns>
-        public static VariableResource Update(string pathServiceSid,
-                                              string pathEnvironmentSid,
-                                              string pathSid,
-                                              string key = null,
-                                              string value = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateVariableOptions(pathServiceSid, pathEnvironmentSid, pathSid){Key = key, Value = value};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Variable.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the Variable resource under </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resource to update </param>
-        /// <param name="pathSid"> The SID of the Variable resource to update </param>
-        /// <param name="key"> A string by which the Variable resource can be referenced </param>
-        /// <param name="value"> A string that contains the actual value of the Variable </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Variable </returns>
-        public static async System.Threading.Tasks.Task<VariableResource> UpdateAsync(string pathServiceSid,
-                                                                                      string pathEnvironmentSid,
-                                                                                      string pathSid,
-                                                                                      string key = null,
-                                                                                      string value = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateVariableOptions(pathServiceSid, pathEnvironmentSid, pathSid){Key = key, Value = value};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteVariableOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Variables/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Variable.
-        /// </summary>
-        /// <param name="options"> Delete Variable parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Variable </returns>
-        public static bool Delete(DeleteVariableOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Variable.
-        /// </summary>
-        /// <param name="options"> Delete Variable parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Variable </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteVariableOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Variable.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Variable resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variables to delete </param>
-        /// <param name="pathSid"> The SID of the Variable resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Variable </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathEnvironmentSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteVariableOptions(pathServiceSid, pathEnvironmentSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Variable.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Variable resource from </param>
-        /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variables to delete </param>
-        /// <param name="pathSid"> The SID of the Variable resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Variable </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathEnvironmentSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteVariableOptions(pathServiceSid, pathEnvironmentSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a VariableResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> VariableResource object represented by the provided JSON </returns>
-        public static VariableResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<VariableResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Variable resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the Variable resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the Variable resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Environment in which the Variable exists
-        /// </summary>
-        [JsonProperty("environment_sid")]
-        public string EnvironmentSid { get; private set; }
-        /// <summary>
-        /// A string by which the Variable resource can be referenced
-        /// </summary>
-        [JsonProperty("key")]
-        public string Key { get; private set; }
-        /// <summary>
-        /// A string that contains the actual value of the Variable
-        /// </summary>
-        [JsonProperty("value")]
-        public string Value { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Variable resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Variable resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Variable resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private VariableResource()
-        {
-
-        }
-    }
+{
+
+  public class VariableResource : Resource
+  {
+    private static Request BuildReadRequest(ReadVariableOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Variables",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Variables.
+    /// </summary>
+    /// <param name="options"> Read Variable parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Variable </returns>
+    public static ResourceSet<VariableResource> Read(ReadVariableOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<VariableResource>.FromJson("variables", response.Content);
+      return new ResourceSet<VariableResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Variables.
+    /// </summary>
+    /// <param name="options"> Read Variable parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Variable </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<VariableResource>> ReadAsync(ReadVariableOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<VariableResource>.FromJson("variables", response.Content);
+      return new ResourceSet<VariableResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Variables.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Variable resources from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Variable </returns>
+    public static ResourceSet<VariableResource> Read(string pathServiceSid,
+                                                     string pathEnvironmentSid,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadVariableOptions(pathServiceSid, pathEnvironmentSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Variables.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Variable resources from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Variable </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<VariableResource>> ReadAsync(string pathServiceSid,
+                                                                                             string pathEnvironmentSid,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadVariableOptions(pathServiceSid, pathEnvironmentSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<VariableResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<VariableResource>.FromJson("variables", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<VariableResource> NextPage(Page<VariableResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<VariableResource>.FromJson("variables", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<VariableResource> PreviousPage(Page<VariableResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<VariableResource>.FromJson("variables", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchVariableOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Variables/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a specific Variable.
+    /// </summary>
+    /// <param name="options"> Fetch Variable parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Variable </returns>
+    public static VariableResource Fetch(FetchVariableOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Variable.
+    /// </summary>
+    /// <param name="options"> Fetch Variable parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Variable </returns>
+    public static async System.Threading.Tasks.Task<VariableResource> FetchAsync(FetchVariableOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a specific Variable.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Variable resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Variable resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Variable </returns>
+    public static VariableResource Fetch(string pathServiceSid,
+                                         string pathEnvironmentSid,
+                                         string pathSid,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new FetchVariableOptions(pathServiceSid, pathEnvironmentSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Variable.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Variable resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Variable resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Variable </returns>
+    public static async System.Threading.Tasks.Task<VariableResource> FetchAsync(string pathServiceSid,
+                                                                                 string pathEnvironmentSid,
+                                                                                 string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchVariableOptions(pathServiceSid, pathEnvironmentSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateVariableOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Variables",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Variable.
+    /// </summary>
+    /// <param name="options"> Create Variable parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Variable </returns>
+    public static VariableResource Create(CreateVariableOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Variable.
+    /// </summary>
+    /// <param name="options"> Create Variable parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Variable </returns>
+    public static async System.Threading.Tasks.Task<VariableResource> CreateAsync(CreateVariableOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Variable.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Variable resource under </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment in which the Variable exists </param>
+    /// <param name="key"> A string by which the Variable resource can be referenced </param>
+    /// <param name="value"> A string that contains the actual value of the Variable </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Variable </returns>
+    public static VariableResource Create(string pathServiceSid,
+                                          string pathEnvironmentSid,
+                                          string key,
+                                          string value,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateVariableOptions(pathServiceSid, pathEnvironmentSid, key, value);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Variable.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Variable resource under </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment in which the Variable exists </param>
+    /// <param name="key"> A string by which the Variable resource can be referenced </param>
+    /// <param name="value"> A string that contains the actual value of the Variable </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Variable </returns>
+    public static async System.Threading.Tasks.Task<VariableResource> CreateAsync(string pathServiceSid,
+                                                                                  string pathEnvironmentSid,
+                                                                                  string key,
+                                                                                  string value,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateVariableOptions(pathServiceSid, pathEnvironmentSid, key, value);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateVariableOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Variables/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Variable.
+    /// </summary>
+    /// <param name="options"> Update Variable parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Variable </returns>
+    public static VariableResource Update(UpdateVariableOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Variable.
+    /// </summary>
+    /// <param name="options"> Update Variable parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Variable </returns>
+    public static async System.Threading.Tasks.Task<VariableResource> UpdateAsync(UpdateVariableOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Variable.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the Variable resource under </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resource to update </param>
+    /// <param name="pathSid"> The SID of the Variable resource to update </param>
+    /// <param name="key"> A string by which the Variable resource can be referenced </param>
+    /// <param name="value"> A string that contains the actual value of the Variable </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Variable </returns>
+    public static VariableResource Update(string pathServiceSid,
+                                          string pathEnvironmentSid,
+                                          string pathSid,
+                                          string key = null,
+                                          string value = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateVariableOptions(pathServiceSid, pathEnvironmentSid, pathSid) { Key = key, Value = value };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Variable.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the Variable resource under </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variable resource to update </param>
+    /// <param name="pathSid"> The SID of the Variable resource to update </param>
+    /// <param name="key"> A string by which the Variable resource can be referenced </param>
+    /// <param name="value"> A string that contains the actual value of the Variable </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Variable </returns>
+    public static async System.Threading.Tasks.Task<VariableResource> UpdateAsync(string pathServiceSid,
+                                                                                  string pathEnvironmentSid,
+                                                                                  string pathSid,
+                                                                                  string key = null,
+                                                                                  string value = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateVariableOptions(pathServiceSid, pathEnvironmentSid, pathSid) { Key = key, Value = value };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteVariableOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathEnvironmentSid + "/Variables/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Variable.
+    /// </summary>
+    /// <param name="options"> Delete Variable parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Variable </returns>
+    public static bool Delete(DeleteVariableOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Variable.
+    /// </summary>
+    /// <param name="options"> Delete Variable parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Variable </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteVariableOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Variable.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Variable resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variables to delete </param>
+    /// <param name="pathSid"> The SID of the Variable resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Variable </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathEnvironmentSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteVariableOptions(pathServiceSid, pathEnvironmentSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Variable.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Variable resource from </param>
+    /// <param name="pathEnvironmentSid"> The SID of the Environment with the Variables to delete </param>
+    /// <param name="pathSid"> The SID of the Variable resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Variable </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathEnvironmentSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteVariableOptions(pathServiceSid, pathEnvironmentSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a VariableResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> VariableResource object represented by the provided JSON </returns>
+    public static VariableResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<VariableResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Variable resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the Variable resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the Variable resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Environment in which the Variable exists
+    /// </summary>
+    [JsonProperty("environment_sid")]
+    public string EnvironmentSid { get; private set; }
+    /// <summary>
+    /// A string by which the Variable resource can be referenced
+    /// </summary>
+    [JsonProperty("key")]
+    public string Key { get; private set; }
+    /// <summary>
+    /// A string that contains the actual value of the Variable
+    /// </summary>
+    [JsonProperty("value")]
+    public string Value { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Variable resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Variable resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Variable resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private VariableResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/EnvironmentOptions.cs b/src/Twilio/Rest/Serverless/V1/Service/EnvironmentOptions.cs
index 562db0e47..51de80a25 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/EnvironmentOptions.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/EnvironmentOptions.cs
@@ -9,167 +9,167 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Serverless.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all environments.
+  /// </summary>
+  public class ReadEnvironmentOptions : ReadOptions<EnvironmentResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all environments.
+    /// The SID of the Service to read the Environment resources from
     /// </summary>
-    public class ReadEnvironmentOptions : ReadOptions<EnvironmentResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the Environment resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadEnvironmentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Environment resources from </param>
-        public ReadEnvironmentOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a specific environment.
-    /// </summary>
-    public class FetchEnvironmentOptions : IOptions<EnvironmentResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the Environment resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Environment resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchEnvironmentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Environment resource from </param>
-        /// <param name="pathSid"> The SID of the Environment resource to fetch </param>
-        public FetchEnvironmentOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new ReadEnvironmentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Environment resources from </param>
+    public ReadEnvironmentOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new environment.
-    /// </summary>
-    public class CreateEnvironmentOptions : IOptions<EnvironmentResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the Environment resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// A user-defined string that uniquely identifies the Environment resource
-        /// </summary>
-        public string UniqueName { get; }
-        /// <summary>
-        /// A URL-friendly name that represents the environment
-        /// </summary>
-        public string DomainSuffix { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateEnvironmentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Environment resource under </param>
-        /// <param name="uniqueName"> A user-defined string that uniquely identifies the Environment resource </param>
-        public CreateEnvironmentOptions(string pathServiceSid, string uniqueName)
-        {
-            PathServiceSid = pathServiceSid;
-            UniqueName = uniqueName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (DomainSuffix != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DomainSuffix", DomainSuffix));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a specific environment.
+  /// </summary>
+  public class FetchEnvironmentOptions : IOptions<EnvironmentResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific environment.
-    /// </summary>
-    public class DeleteEnvironmentOptions : IOptions<EnvironmentResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the Environment resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID that identifies the Environment resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteEnvironmentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Environment resource from </param>
-        /// <param name="pathSid"> The SID that identifies the Environment resource to delete </param>
-        public DeleteEnvironmentOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// The SID of the Service to fetch the Environment resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Environment resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchEnvironmentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Environment resource from </param>
+    /// <param name="pathSid"> The SID of the Environment resource to fetch </param>
+    public FetchEnvironmentOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new environment.
+  /// </summary>
+  public class CreateEnvironmentOptions : IOptions<EnvironmentResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the Environment resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// A user-defined string that uniquely identifies the Environment resource
+    /// </summary>
+    public string UniqueName { get; }
+    /// <summary>
+    /// A URL-friendly name that represents the environment
+    /// </summary>
+    public string DomainSuffix { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateEnvironmentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Environment resource under </param>
+    /// <param name="uniqueName"> A user-defined string that uniquely identifies the Environment resource </param>
+    public CreateEnvironmentOptions(string pathServiceSid, string uniqueName)
+    {
+      PathServiceSid = pathServiceSid;
+      UniqueName = uniqueName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (DomainSuffix != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DomainSuffix", DomainSuffix));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific environment.
+  /// </summary>
+  public class DeleteEnvironmentOptions : IOptions<EnvironmentResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the Environment resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID that identifies the Environment resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteEnvironmentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Environment resource from </param>
+    /// <param name="pathSid"> The SID that identifies the Environment resource to delete </param>
+    public DeleteEnvironmentOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/EnvironmentResource.cs b/src/Twilio/Rest/Serverless/V1/Service/EnvironmentResource.cs
index 1fdedec52..f5236784c 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/EnvironmentResource.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/EnvironmentResource.cs
@@ -18,437 +18,437 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Serverless.V1.Service
-{
-
-    public class EnvironmentResource : Resource
-    {
-        private static Request BuildReadRequest(ReadEnvironmentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all environments.
-        /// </summary>
-        /// <param name="options"> Read Environment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Environment </returns>
-        public static ResourceSet<EnvironmentResource> Read(ReadEnvironmentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<EnvironmentResource>.FromJson("environments", response.Content);
-            return new ResourceSet<EnvironmentResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all environments.
-        /// </summary>
-        /// <param name="options"> Read Environment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Environment </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EnvironmentResource>> ReadAsync(ReadEnvironmentOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<EnvironmentResource>.FromJson("environments", response.Content);
-            return new ResourceSet<EnvironmentResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all environments.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Environment resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Environment </returns>
-        public static ResourceSet<EnvironmentResource> Read(string pathServiceSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadEnvironmentOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all environments.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Environment resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Environment </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EnvironmentResource>> ReadAsync(string pathServiceSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadEnvironmentOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<EnvironmentResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<EnvironmentResource>.FromJson("environments", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<EnvironmentResource> NextPage(Page<EnvironmentResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<EnvironmentResource>.FromJson("environments", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<EnvironmentResource> PreviousPage(Page<EnvironmentResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<EnvironmentResource>.FromJson("environments", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchEnvironmentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a specific environment.
-        /// </summary>
-        /// <param name="options"> Fetch Environment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Environment </returns>
-        public static EnvironmentResource Fetch(FetchEnvironmentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific environment.
-        /// </summary>
-        /// <param name="options"> Fetch Environment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Environment </returns>
-        public static async System.Threading.Tasks.Task<EnvironmentResource> FetchAsync(FetchEnvironmentOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a specific environment.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Environment resource from </param>
-        /// <param name="pathSid"> The SID of the Environment resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Environment </returns>
-        public static EnvironmentResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchEnvironmentOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific environment.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Environment resource from </param>
-        /// <param name="pathSid"> The SID of the Environment resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Environment </returns>
-        public static async System.Threading.Tasks.Task<EnvironmentResource> FetchAsync(string pathServiceSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchEnvironmentOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateEnvironmentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new environment.
-        /// </summary>
-        /// <param name="options"> Create Environment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Environment </returns>
-        public static EnvironmentResource Create(CreateEnvironmentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new environment.
-        /// </summary>
-        /// <param name="options"> Create Environment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Environment </returns>
-        public static async System.Threading.Tasks.Task<EnvironmentResource> CreateAsync(CreateEnvironmentOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new environment.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Environment resource under </param>
-        /// <param name="uniqueName"> A user-defined string that uniquely identifies the Environment resource </param>
-        /// <param name="domainSuffix"> A URL-friendly name that represents the environment </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Environment </returns>
-        public static EnvironmentResource Create(string pathServiceSid,
-                                                 string uniqueName,
-                                                 string domainSuffix = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateEnvironmentOptions(pathServiceSid, uniqueName){DomainSuffix = domainSuffix};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new environment.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Environment resource under </param>
-        /// <param name="uniqueName"> A user-defined string that uniquely identifies the Environment resource </param>
-        /// <param name="domainSuffix"> A URL-friendly name that represents the environment </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Environment </returns>
-        public static async System.Threading.Tasks.Task<EnvironmentResource> CreateAsync(string pathServiceSid,
-                                                                                         string uniqueName,
-                                                                                         string domainSuffix = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateEnvironmentOptions(pathServiceSid, uniqueName){DomainSuffix = domainSuffix};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteEnvironmentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific environment.
-        /// </summary>
-        /// <param name="options"> Delete Environment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Environment </returns>
-        public static bool Delete(DeleteEnvironmentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific environment.
-        /// </summary>
-        /// <param name="options"> Delete Environment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Environment </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteEnvironmentOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific environment.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Environment resource from </param>
-        /// <param name="pathSid"> The SID that identifies the Environment resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Environment </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteEnvironmentOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific environment.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Environment resource from </param>
-        /// <param name="pathSid"> The SID that identifies the Environment resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Environment </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteEnvironmentOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a EnvironmentResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EnvironmentResource object represented by the provided JSON </returns>
-        public static EnvironmentResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EnvironmentResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Environment resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the Environment resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the Environment resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the build deployed in the environment
-        /// </summary>
-        [JsonProperty("build_sid")]
-        public string BuildSid { get; private set; }
-        /// <summary>
-        /// A user-defined string that uniquely identifies the Environment resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// A URL-friendly name that represents the environment
-        /// </summary>
-        [JsonProperty("domain_suffix")]
-        public string DomainSuffix { get; private set; }
-        /// <summary>
-        /// The domain name for all Functions and Assets deployed in the Environment
-        /// </summary>
-        [JsonProperty("domain_name")]
-        public string DomainName { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Environment resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Environment resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Environment resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of the Environment resource's nested resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private EnvironmentResource()
-        {
-
-        }
-    }
+{
+
+  public class EnvironmentResource : Resource
+  {
+    private static Request BuildReadRequest(ReadEnvironmentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all environments.
+    /// </summary>
+    /// <param name="options"> Read Environment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Environment </returns>
+    public static ResourceSet<EnvironmentResource> Read(ReadEnvironmentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<EnvironmentResource>.FromJson("environments", response.Content);
+      return new ResourceSet<EnvironmentResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all environments.
+    /// </summary>
+    /// <param name="options"> Read Environment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Environment </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EnvironmentResource>> ReadAsync(ReadEnvironmentOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<EnvironmentResource>.FromJson("environments", response.Content);
+      return new ResourceSet<EnvironmentResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all environments.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Environment resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Environment </returns>
+    public static ResourceSet<EnvironmentResource> Read(string pathServiceSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadEnvironmentOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all environments.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Environment resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Environment </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EnvironmentResource>> ReadAsync(string pathServiceSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadEnvironmentOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<EnvironmentResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<EnvironmentResource>.FromJson("environments", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<EnvironmentResource> NextPage(Page<EnvironmentResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<EnvironmentResource>.FromJson("environments", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<EnvironmentResource> PreviousPage(Page<EnvironmentResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<EnvironmentResource>.FromJson("environments", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchEnvironmentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a specific environment.
+    /// </summary>
+    /// <param name="options"> Fetch Environment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Environment </returns>
+    public static EnvironmentResource Fetch(FetchEnvironmentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific environment.
+    /// </summary>
+    /// <param name="options"> Fetch Environment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Environment </returns>
+    public static async System.Threading.Tasks.Task<EnvironmentResource> FetchAsync(FetchEnvironmentOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a specific environment.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Environment resource from </param>
+    /// <param name="pathSid"> The SID of the Environment resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Environment </returns>
+    public static EnvironmentResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchEnvironmentOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific environment.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Environment resource from </param>
+    /// <param name="pathSid"> The SID of the Environment resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Environment </returns>
+    public static async System.Threading.Tasks.Task<EnvironmentResource> FetchAsync(string pathServiceSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchEnvironmentOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateEnvironmentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new environment.
+    /// </summary>
+    /// <param name="options"> Create Environment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Environment </returns>
+    public static EnvironmentResource Create(CreateEnvironmentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new environment.
+    /// </summary>
+    /// <param name="options"> Create Environment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Environment </returns>
+    public static async System.Threading.Tasks.Task<EnvironmentResource> CreateAsync(CreateEnvironmentOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new environment.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Environment resource under </param>
+    /// <param name="uniqueName"> A user-defined string that uniquely identifies the Environment resource </param>
+    /// <param name="domainSuffix"> A URL-friendly name that represents the environment </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Environment </returns>
+    public static EnvironmentResource Create(string pathServiceSid,
+                                             string uniqueName,
+                                             string domainSuffix = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateEnvironmentOptions(pathServiceSid, uniqueName) { DomainSuffix = domainSuffix };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new environment.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Environment resource under </param>
+    /// <param name="uniqueName"> A user-defined string that uniquely identifies the Environment resource </param>
+    /// <param name="domainSuffix"> A URL-friendly name that represents the environment </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Environment </returns>
+    public static async System.Threading.Tasks.Task<EnvironmentResource> CreateAsync(string pathServiceSid,
+                                                                                     string uniqueName,
+                                                                                     string domainSuffix = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateEnvironmentOptions(pathServiceSid, uniqueName) { DomainSuffix = domainSuffix };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteEnvironmentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Environments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific environment.
+    /// </summary>
+    /// <param name="options"> Delete Environment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Environment </returns>
+    public static bool Delete(DeleteEnvironmentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific environment.
+    /// </summary>
+    /// <param name="options"> Delete Environment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Environment </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteEnvironmentOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific environment.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Environment resource from </param>
+    /// <param name="pathSid"> The SID that identifies the Environment resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Environment </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteEnvironmentOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific environment.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Environment resource from </param>
+    /// <param name="pathSid"> The SID that identifies the Environment resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Environment </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteEnvironmentOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a EnvironmentResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EnvironmentResource object represented by the provided JSON </returns>
+    public static EnvironmentResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EnvironmentResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Environment resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the Environment resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the Environment resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the build deployed in the environment
+    /// </summary>
+    [JsonProperty("build_sid")]
+    public string BuildSid { get; private set; }
+    /// <summary>
+    /// A user-defined string that uniquely identifies the Environment resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// A URL-friendly name that represents the environment
+    /// </summary>
+    [JsonProperty("domain_suffix")]
+    public string DomainSuffix { get; private set; }
+    /// <summary>
+    /// The domain name for all Functions and Assets deployed in the Environment
+    /// </summary>
+    [JsonProperty("domain_name")]
+    public string DomainName { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Environment resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Environment resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Environment resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of the Environment resource's nested resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private EnvironmentResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersion/FunctionVersionContentOptions.cs b/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersion/FunctionVersionContentOptions.cs
index 5a9aceb64..dc3f47839 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersion/FunctionVersionContentOptions.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersion/FunctionVersionContentOptions.cs
@@ -9,50 +9,50 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Serverless.V1.Service.Function.FunctionVersion
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a the content of a specific Function Version resource.
+  /// </summary>
+  public class FetchFunctionVersionContentOptions : IOptions<FunctionVersionContentResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a the content of a specific Function Version resource.
+    /// The SID of the Service to fetch the Function Version content from
     /// </summary>
-    public class FetchFunctionVersionContentOptions : IOptions<FunctionVersionContentResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the Function Version content from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Function that is the parent of the Function Version content to fetch
-        /// </summary>
-        public string PathFunctionSid { get; }
-        /// <summary>
-        /// The SID that identifies the Function Version content to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFunctionVersionContentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Function Version content from </param>
-        /// <param name="pathFunctionSid"> The SID of the Function that is the parent of the Function Version content to fetch
-        ///                       </param>
-        /// <param name="pathSid"> The SID that identifies the Function Version content to fetch </param>
-        public FetchFunctionVersionContentOptions(string pathServiceSid, string pathFunctionSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathFunctionSid = pathFunctionSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Function that is the parent of the Function Version content to fetch
+    /// </summary>
+    public string PathFunctionSid { get; }
+    /// <summary>
+    /// The SID that identifies the Function Version content to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchFunctionVersionContentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Function Version content from </param>
+    /// <param name="pathFunctionSid"> The SID of the Function that is the parent of the Function Version content to fetch
+    ///                       </param>
+    /// <param name="pathSid"> The SID that identifies the Function Version content to fetch </param>
+    public FetchFunctionVersionContentOptions(string pathServiceSid, string pathFunctionSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathFunctionSid = pathFunctionSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersion/FunctionVersionContentResource.cs b/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersion/FunctionVersionContentResource.cs
index f359448da..3033d30f4 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersion/FunctionVersionContentResource.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersion/FunctionVersionContentResource.cs
@@ -18,142 +18,142 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Serverless.V1.Service.Function.FunctionVersion
-{
-
-    public class FunctionVersionContentResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchFunctionVersionContentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Functions/" + options.PathFunctionSid + "/Versions/" + options.PathSid + "/Content",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a the content of a specific Function Version resource.
-        /// </summary>
-        /// <param name="options"> Fetch FunctionVersionContent parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FunctionVersionContent </returns>
-        public static FunctionVersionContentResource Fetch(FetchFunctionVersionContentOptions options,
-                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a the content of a specific Function Version resource.
-        /// </summary>
-        /// <param name="options"> Fetch FunctionVersionContent parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FunctionVersionContent </returns>
-        public static async System.Threading.Tasks.Task<FunctionVersionContentResource> FetchAsync(FetchFunctionVersionContentOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a the content of a specific Function Version resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Function Version content from </param>
-        /// <param name="pathFunctionSid"> The SID of the Function that is the parent of the Function Version content to fetch
-        ///                       </param>
-        /// <param name="pathSid"> The SID that identifies the Function Version content to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FunctionVersionContent </returns>
-        public static FunctionVersionContentResource Fetch(string pathServiceSid,
-                                                           string pathFunctionSid,
-                                                           string pathSid,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchFunctionVersionContentOptions(pathServiceSid, pathFunctionSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a the content of a specific Function Version resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Function Version content from </param>
-        /// <param name="pathFunctionSid"> The SID of the Function that is the parent of the Function Version content to fetch
-        ///                       </param>
-        /// <param name="pathSid"> The SID that identifies the Function Version content to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FunctionVersionContent </returns>
-        public static async System.Threading.Tasks.Task<FunctionVersionContentResource> FetchAsync(string pathServiceSid,
-                                                                                                   string pathFunctionSid,
-                                                                                                   string pathSid,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchFunctionVersionContentOptions(pathServiceSid, pathFunctionSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FunctionVersionContentResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FunctionVersionContentResource object represented by the provided JSON </returns>
-        public static FunctionVersionContentResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FunctionVersionContentResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Function Version resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the Function Version resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the Function Version resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Function that is the parent of the Function Version
-        /// </summary>
-        [JsonProperty("function_sid")]
-        public string FunctionSid { get; private set; }
-        /// <summary>
-        /// The content of the Function Version resource
-        /// </summary>
-        [JsonProperty("content")]
-        public string Content { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private FunctionVersionContentResource()
-        {
-
-        }
-    }
+{
+
+  public class FunctionVersionContentResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchFunctionVersionContentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Functions/" + options.PathFunctionSid + "/Versions/" + options.PathSid + "/Content",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a the content of a specific Function Version resource.
+    /// </summary>
+    /// <param name="options"> Fetch FunctionVersionContent parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FunctionVersionContent </returns>
+    public static FunctionVersionContentResource Fetch(FetchFunctionVersionContentOptions options,
+                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a the content of a specific Function Version resource.
+    /// </summary>
+    /// <param name="options"> Fetch FunctionVersionContent parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FunctionVersionContent </returns>
+    public static async System.Threading.Tasks.Task<FunctionVersionContentResource> FetchAsync(FetchFunctionVersionContentOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a the content of a specific Function Version resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Function Version content from </param>
+    /// <param name="pathFunctionSid"> The SID of the Function that is the parent of the Function Version content to fetch
+    ///                       </param>
+    /// <param name="pathSid"> The SID that identifies the Function Version content to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FunctionVersionContent </returns>
+    public static FunctionVersionContentResource Fetch(string pathServiceSid,
+                                                       string pathFunctionSid,
+                                                       string pathSid,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchFunctionVersionContentOptions(pathServiceSid, pathFunctionSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a the content of a specific Function Version resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Function Version content from </param>
+    /// <param name="pathFunctionSid"> The SID of the Function that is the parent of the Function Version content to fetch
+    ///                       </param>
+    /// <param name="pathSid"> The SID that identifies the Function Version content to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FunctionVersionContent </returns>
+    public static async System.Threading.Tasks.Task<FunctionVersionContentResource> FetchAsync(string pathServiceSid,
+                                                                                               string pathFunctionSid,
+                                                                                               string pathSid,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchFunctionVersionContentOptions(pathServiceSid, pathFunctionSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FunctionVersionContentResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FunctionVersionContentResource object represented by the provided JSON </returns>
+    public static FunctionVersionContentResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FunctionVersionContentResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Function Version resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the Function Version resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the Function Version resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Function that is the parent of the Function Version
+    /// </summary>
+    [JsonProperty("function_sid")]
+    public string FunctionSid { get; private set; }
+    /// <summary>
+    /// The content of the Function Version resource
+    /// </summary>
+    [JsonProperty("content")]
+    public string Content { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private FunctionVersionContentResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersionOptions.cs b/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersionOptions.cs
index 92b9373f8..fc85df21d 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersionOptions.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersionOptions.cs
@@ -9,93 +9,93 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Serverless.V1.Service.Function
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Function Version resources.
+  /// </summary>
+  public class ReadFunctionVersionOptions : ReadOptions<FunctionVersionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Function Version resources.
+    /// The SID of the Service to read the Function Version resources from
     /// </summary>
-    public class ReadFunctionVersionOptions : ReadOptions<FunctionVersionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the Function Version resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the function that is the parent of the Function Version resources to read
-        /// </summary>
-        public string PathFunctionSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadFunctionVersionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Function Version resources from </param>
-        /// <param name="pathFunctionSid"> The SID of the function that is the parent of the Function Version resources to read
-        ///                       </param>
-        public ReadFunctionVersionOptions(string pathServiceSid, string pathFunctionSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathFunctionSid = pathFunctionSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a specific Function Version resource.
+    /// The SID of the function that is the parent of the Function Version resources to read
     /// </summary>
-    public class FetchFunctionVersionOptions : IOptions<FunctionVersionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the Function Version resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the function that is the parent of the Function Version resource to fetch
-        /// </summary>
-        public string PathFunctionSid { get; }
-        /// <summary>
-        /// The SID that identifies the Function Version resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFunctionVersionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Function Version resource from </param>
-        /// <param name="pathFunctionSid"> The SID of the function that is the parent of the Function Version resource to fetch
-        ///                       </param>
-        /// <param name="pathSid"> The SID that identifies the Function Version resource to fetch </param>
-        public FetchFunctionVersionOptions(string pathServiceSid, string pathFunctionSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathFunctionSid = pathFunctionSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathFunctionSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadFunctionVersionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Function Version resources from </param>
+    /// <param name="pathFunctionSid"> The SID of the function that is the parent of the Function Version resources to read
+    ///                       </param>
+    public ReadFunctionVersionOptions(string pathServiceSid, string pathFunctionSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathFunctionSid = pathFunctionSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a specific Function Version resource.
+  /// </summary>
+  public class FetchFunctionVersionOptions : IOptions<FunctionVersionResource>
+  {
+    /// <summary>
+    /// The SID of the Service to fetch the Function Version resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the function that is the parent of the Function Version resource to fetch
+    /// </summary>
+    public string PathFunctionSid { get; }
+    /// <summary>
+    /// The SID that identifies the Function Version resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchFunctionVersionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Function Version resource from </param>
+    /// <param name="pathFunctionSid"> The SID of the function that is the parent of the Function Version resource to fetch
+    ///                       </param>
+    /// <param name="pathSid"> The SID that identifies the Function Version resource to fetch </param>
+    public FetchFunctionVersionOptions(string pathServiceSid, string pathFunctionSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathFunctionSid = pathFunctionSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersionResource.cs b/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersionResource.cs
index cefcd3fc3..9ea23e939 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersionResource.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/Function/FunctionVersionResource.cs
@@ -19,312 +19,312 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Serverless.V1.Service.Function
-{
-
-    public class FunctionVersionResource : Resource
-    {
-        public sealed class VisibilityEnum : StringEnum
-        {
-            private VisibilityEnum(string value) : base(value) {}
-            public VisibilityEnum() {}
-            public static implicit operator VisibilityEnum(string value)
-            {
-                return new VisibilityEnum(value);
-            }
-
-            public static readonly VisibilityEnum Public = new VisibilityEnum("public");
-            public static readonly VisibilityEnum Private = new VisibilityEnum("private");
-            public static readonly VisibilityEnum Protected = new VisibilityEnum("protected");
-        }
-
-        private static Request BuildReadRequest(ReadFunctionVersionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Functions/" + options.PathFunctionSid + "/Versions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Function Version resources.
-        /// </summary>
-        /// <param name="options"> Read FunctionVersion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FunctionVersion </returns>
-        public static ResourceSet<FunctionVersionResource> Read(ReadFunctionVersionOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FunctionVersionResource>.FromJson("function_versions", response.Content);
-            return new ResourceSet<FunctionVersionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Function Version resources.
-        /// </summary>
-        /// <param name="options"> Read FunctionVersion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FunctionVersion </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FunctionVersionResource>> ReadAsync(ReadFunctionVersionOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FunctionVersionResource>.FromJson("function_versions", response.Content);
-            return new ResourceSet<FunctionVersionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Function Version resources.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Function Version resources from </param>
-        /// <param name="pathFunctionSid"> The SID of the function that is the parent of the Function Version resources to read
-        ///                       </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FunctionVersion </returns>
-        public static ResourceSet<FunctionVersionResource> Read(string pathServiceSid,
-                                                                string pathFunctionSid,
-                                                                int? pageSize = null,
-                                                                long? limit = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadFunctionVersionOptions(pathServiceSid, pathFunctionSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Function Version resources.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Function Version resources from </param>
-        /// <param name="pathFunctionSid"> The SID of the function that is the parent of the Function Version resources to read
-        ///                       </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FunctionVersion </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FunctionVersionResource>> ReadAsync(string pathServiceSid,
-                                                                                                        string pathFunctionSid,
-                                                                                                        int? pageSize = null,
-                                                                                                        long? limit = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadFunctionVersionOptions(pathServiceSid, pathFunctionSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FunctionVersionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FunctionVersionResource>.FromJson("function_versions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FunctionVersionResource> NextPage(Page<FunctionVersionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<FunctionVersionResource>.FromJson("function_versions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FunctionVersionResource> PreviousPage(Page<FunctionVersionResource> page,
-                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<FunctionVersionResource>.FromJson("function_versions", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchFunctionVersionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Functions/" + options.PathFunctionSid + "/Versions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a specific Function Version resource.
-        /// </summary>
-        /// <param name="options"> Fetch FunctionVersion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FunctionVersion </returns>
-        public static FunctionVersionResource Fetch(FetchFunctionVersionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Function Version resource.
-        /// </summary>
-        /// <param name="options"> Fetch FunctionVersion parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FunctionVersion </returns>
-        public static async System.Threading.Tasks.Task<FunctionVersionResource> FetchAsync(FetchFunctionVersionOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a specific Function Version resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Function Version resource from </param>
-        /// <param name="pathFunctionSid"> The SID of the function that is the parent of the Function Version resource to fetch
-        ///                       </param>
-        /// <param name="pathSid"> The SID that identifies the Function Version resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FunctionVersion </returns>
-        public static FunctionVersionResource Fetch(string pathServiceSid,
-                                                    string pathFunctionSid,
-                                                    string pathSid,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchFunctionVersionOptions(pathServiceSid, pathFunctionSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Function Version resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Function Version resource from </param>
-        /// <param name="pathFunctionSid"> The SID of the function that is the parent of the Function Version resource to fetch
-        ///                       </param>
-        /// <param name="pathSid"> The SID that identifies the Function Version resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FunctionVersion </returns>
-        public static async System.Threading.Tasks.Task<FunctionVersionResource> FetchAsync(string pathServiceSid,
-                                                                                            string pathFunctionSid,
-                                                                                            string pathSid,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchFunctionVersionOptions(pathServiceSid, pathFunctionSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FunctionVersionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FunctionVersionResource object represented by the provided JSON </returns>
-        public static FunctionVersionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FunctionVersionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Function Version resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the Function Version resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the Function Version resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Function resource that is the parent of the Function Version resource
-        /// </summary>
-        [JsonProperty("function_sid")]
-        public string FunctionSid { get; private set; }
-        /// <summary>
-        /// The URL-friendly string by which the Function Version resource can be referenced
-        /// </summary>
-        [JsonProperty("path")]
-        public string Path { get; private set; }
-        /// <summary>
-        /// The access control that determines how the Function Version resource can be accessed
-        /// </summary>
-        [JsonProperty("visibility")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FunctionVersionResource.VisibilityEnum Visibility { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Function Version resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Function Version resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private FunctionVersionResource()
-        {
-
-        }
-    }
+{
+
+  public class FunctionVersionResource : Resource
+  {
+    public sealed class VisibilityEnum : StringEnum
+    {
+      private VisibilityEnum(string value) : base(value) { }
+      public VisibilityEnum() { }
+      public static implicit operator VisibilityEnum(string value)
+      {
+        return new VisibilityEnum(value);
+      }
+
+      public static readonly VisibilityEnum Public = new VisibilityEnum("public");
+      public static readonly VisibilityEnum Private = new VisibilityEnum("private");
+      public static readonly VisibilityEnum Protected = new VisibilityEnum("protected");
+    }
+
+    private static Request BuildReadRequest(ReadFunctionVersionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Functions/" + options.PathFunctionSid + "/Versions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Function Version resources.
+    /// </summary>
+    /// <param name="options"> Read FunctionVersion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FunctionVersion </returns>
+    public static ResourceSet<FunctionVersionResource> Read(ReadFunctionVersionOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FunctionVersionResource>.FromJson("function_versions", response.Content);
+      return new ResourceSet<FunctionVersionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Function Version resources.
+    /// </summary>
+    /// <param name="options"> Read FunctionVersion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FunctionVersion </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FunctionVersionResource>> ReadAsync(ReadFunctionVersionOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FunctionVersionResource>.FromJson("function_versions", response.Content);
+      return new ResourceSet<FunctionVersionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Function Version resources.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Function Version resources from </param>
+    /// <param name="pathFunctionSid"> The SID of the function that is the parent of the Function Version resources to read
+    ///                       </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FunctionVersion </returns>
+    public static ResourceSet<FunctionVersionResource> Read(string pathServiceSid,
+                                                            string pathFunctionSid,
+                                                            int? pageSize = null,
+                                                            long? limit = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadFunctionVersionOptions(pathServiceSid, pathFunctionSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Function Version resources.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Function Version resources from </param>
+    /// <param name="pathFunctionSid"> The SID of the function that is the parent of the Function Version resources to read
+    ///                       </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FunctionVersion </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FunctionVersionResource>> ReadAsync(string pathServiceSid,
+                                                                                                    string pathFunctionSid,
+                                                                                                    int? pageSize = null,
+                                                                                                    long? limit = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadFunctionVersionOptions(pathServiceSid, pathFunctionSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FunctionVersionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FunctionVersionResource>.FromJson("function_versions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FunctionVersionResource> NextPage(Page<FunctionVersionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<FunctionVersionResource>.FromJson("function_versions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FunctionVersionResource> PreviousPage(Page<FunctionVersionResource> page,
+                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<FunctionVersionResource>.FromJson("function_versions", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchFunctionVersionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Functions/" + options.PathFunctionSid + "/Versions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a specific Function Version resource.
+    /// </summary>
+    /// <param name="options"> Fetch FunctionVersion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FunctionVersion </returns>
+    public static FunctionVersionResource Fetch(FetchFunctionVersionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Function Version resource.
+    /// </summary>
+    /// <param name="options"> Fetch FunctionVersion parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FunctionVersion </returns>
+    public static async System.Threading.Tasks.Task<FunctionVersionResource> FetchAsync(FetchFunctionVersionOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a specific Function Version resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Function Version resource from </param>
+    /// <param name="pathFunctionSid"> The SID of the function that is the parent of the Function Version resource to fetch
+    ///                       </param>
+    /// <param name="pathSid"> The SID that identifies the Function Version resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FunctionVersion </returns>
+    public static FunctionVersionResource Fetch(string pathServiceSid,
+                                                string pathFunctionSid,
+                                                string pathSid,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchFunctionVersionOptions(pathServiceSid, pathFunctionSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Function Version resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Function Version resource from </param>
+    /// <param name="pathFunctionSid"> The SID of the function that is the parent of the Function Version resource to fetch
+    ///                       </param>
+    /// <param name="pathSid"> The SID that identifies the Function Version resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FunctionVersion </returns>
+    public static async System.Threading.Tasks.Task<FunctionVersionResource> FetchAsync(string pathServiceSid,
+                                                                                        string pathFunctionSid,
+                                                                                        string pathSid,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchFunctionVersionOptions(pathServiceSid, pathFunctionSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FunctionVersionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FunctionVersionResource object represented by the provided JSON </returns>
+    public static FunctionVersionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FunctionVersionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Function Version resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the Function Version resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the Function Version resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Function resource that is the parent of the Function Version resource
+    /// </summary>
+    [JsonProperty("function_sid")]
+    public string FunctionSid { get; private set; }
+    /// <summary>
+    /// The URL-friendly string by which the Function Version resource can be referenced
+    /// </summary>
+    [JsonProperty("path")]
+    public string Path { get; private set; }
+    /// <summary>
+    /// The access control that determines how the Function Version resource can be accessed
+    /// </summary>
+    [JsonProperty("visibility")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FunctionVersionResource.VisibilityEnum Visibility { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Function Version resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Function Version resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private FunctionVersionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/FunctionOptions.cs b/src/Twilio/Rest/Serverless/V1/Service/FunctionOptions.cs
index 72271ad89..e371d736b 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/FunctionOptions.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/FunctionOptions.cs
@@ -9,206 +9,206 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Serverless.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Functions.
+  /// </summary>
+  public class ReadFunctionOptions : ReadOptions<FunctionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Functions.
+    /// The SID of the Service to read the Function resources from
     /// </summary>
-    public class ReadFunctionOptions : ReadOptions<FunctionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to read the Function resources from
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadFunctionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Function resources from </param>
-        public ReadFunctionOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a specific Function resource.
-    /// </summary>
-    public class FetchFunctionOptions : IOptions<FunctionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to fetch the Function resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Function resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFunctionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Function resource from </param>
-        /// <param name="pathSid"> The SID of the Function resource to fetch </param>
-        public FetchFunctionOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new ReadFunctionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Function resources from </param>
+    public ReadFunctionOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a Function resource.
-    /// </summary>
-    public class DeleteFunctionOptions : IOptions<FunctionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to delete the Function resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Function resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFunctionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Function resource from </param>
-        /// <param name="pathSid"> The SID of the Function resource to delete </param>
-        public DeleteFunctionOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a specific Function resource.
+  /// </summary>
+  public class FetchFunctionOptions : IOptions<FunctionResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Function resource.
-    /// </summary>
-    public class CreateFunctionOptions : IOptions<FunctionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to create the Function resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// A string to describe the Function resource
-        /// </summary>
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Construct a new CreateFunctionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Function resource under </param>
-        /// <param name="friendlyName"> A string to describe the Function resource </param>
-        public CreateFunctionOptions(string pathServiceSid, string friendlyName)
-        {
-            PathServiceSid = pathServiceSid;
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Service to fetch the Function resource from
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update a specific Function resource.
-    /// </summary>
-    public class UpdateFunctionOptions : IOptions<FunctionResource>
-    {
-        /// <summary>
-        /// The SID of the Service to update the Function resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Function resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the Function resource
-        /// </summary>
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Construct a new UpdateFunctionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the Function resource from </param>
-        /// <param name="pathSid"> The SID of the Function resource to update </param>
-        /// <param name="friendlyName"> A string to describe the Function resource </param>
-        public UpdateFunctionOptions(string pathServiceSid, string pathSid, string friendlyName)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Function resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchFunctionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Function resource from </param>
+    /// <param name="pathSid"> The SID of the Function resource to fetch </param>
+    public FetchFunctionOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a Function resource.
+  /// </summary>
+  public class DeleteFunctionOptions : IOptions<FunctionResource>
+  {
+    /// <summary>
+    /// The SID of the Service to delete the Function resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Function resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteFunctionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Function resource from </param>
+    /// <param name="pathSid"> The SID of the Function resource to delete </param>
+    public DeleteFunctionOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Function resource.
+  /// </summary>
+  public class CreateFunctionOptions : IOptions<FunctionResource>
+  {
+    /// <summary>
+    /// The SID of the Service to create the Function resource under
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// A string to describe the Function resource
+    /// </summary>
+    public string FriendlyName { get; }
+
+    /// <summary>
+    /// Construct a new CreateFunctionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Function resource under </param>
+    /// <param name="friendlyName"> A string to describe the Function resource </param>
+    public CreateFunctionOptions(string pathServiceSid, string friendlyName)
+    {
+      PathServiceSid = pathServiceSid;
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update a specific Function resource.
+  /// </summary>
+  public class UpdateFunctionOptions : IOptions<FunctionResource>
+  {
+    /// <summary>
+    /// The SID of the Service to update the Function resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Function resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the Function resource
+    /// </summary>
+    public string FriendlyName { get; }
+
+    /// <summary>
+    /// Construct a new UpdateFunctionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the Function resource from </param>
+    /// <param name="pathSid"> The SID of the Function resource to update </param>
+    /// <param name="friendlyName"> A string to describe the Function resource </param>
+    public UpdateFunctionOptions(string pathServiceSid, string pathSid, string friendlyName)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/Service/FunctionResource.cs b/src/Twilio/Rest/Serverless/V1/Service/FunctionResource.cs
index 2c6df4f91..8109df4ed 100644
--- a/src/Twilio/Rest/Serverless/V1/Service/FunctionResource.cs
+++ b/src/Twilio/Rest/Serverless/V1/Service/FunctionResource.cs
@@ -18,492 +18,492 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Serverless.V1.Service
-{
-
-    public class FunctionResource : Resource
-    {
-        private static Request BuildReadRequest(ReadFunctionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Functions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Functions.
-        /// </summary>
-        /// <param name="options"> Read Function parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Function </returns>
-        public static ResourceSet<FunctionResource> Read(ReadFunctionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FunctionResource>.FromJson("functions", response.Content);
-            return new ResourceSet<FunctionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Functions.
-        /// </summary>
-        /// <param name="options"> Read Function parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Function </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FunctionResource>> ReadAsync(ReadFunctionOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FunctionResource>.FromJson("functions", response.Content);
-            return new ResourceSet<FunctionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Functions.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Function resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Function </returns>
-        public static ResourceSet<FunctionResource> Read(string pathServiceSid,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadFunctionOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Functions.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to read the Function resources from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Function </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FunctionResource>> ReadAsync(string pathServiceSid,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadFunctionOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FunctionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FunctionResource>.FromJson("functions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FunctionResource> NextPage(Page<FunctionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<FunctionResource>.FromJson("functions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FunctionResource> PreviousPage(Page<FunctionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<FunctionResource>.FromJson("functions", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchFunctionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Functions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a specific Function resource.
-        /// </summary>
-        /// <param name="options"> Fetch Function parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Function </returns>
-        public static FunctionResource Fetch(FetchFunctionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Function resource.
-        /// </summary>
-        /// <param name="options"> Fetch Function parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Function </returns>
-        public static async System.Threading.Tasks.Task<FunctionResource> FetchAsync(FetchFunctionOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a specific Function resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Function resource from </param>
-        /// <param name="pathSid"> The SID of the Function resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Function </returns>
-        public static FunctionResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchFunctionOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Function resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to fetch the Function resource from </param>
-        /// <param name="pathSid"> The SID of the Function resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Function </returns>
-        public static async System.Threading.Tasks.Task<FunctionResource> FetchAsync(string pathServiceSid,
-                                                                                     string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchFunctionOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteFunctionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Functions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a Function resource.
-        /// </summary>
-        /// <param name="options"> Delete Function parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Function </returns>
-        public static bool Delete(DeleteFunctionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Function resource.
-        /// </summary>
-        /// <param name="options"> Delete Function parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Function </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFunctionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a Function resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Function resource from </param>
-        /// <param name="pathSid"> The SID of the Function resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Function </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFunctionOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Function resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to delete the Function resource from </param>
-        /// <param name="pathSid"> The SID of the Function resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Function </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteFunctionOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateFunctionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Functions",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Function resource.
-        /// </summary>
-        /// <param name="options"> Create Function parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Function </returns>
-        public static FunctionResource Create(CreateFunctionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Function resource.
-        /// </summary>
-        /// <param name="options"> Create Function parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Function </returns>
-        public static async System.Threading.Tasks.Task<FunctionResource> CreateAsync(CreateFunctionOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Function resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Function resource under </param>
-        /// <param name="friendlyName"> A string to describe the Function resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Function </returns>
-        public static FunctionResource Create(string pathServiceSid, string friendlyName, ITwilioRestClient client = null)
-        {
-            var options = new CreateFunctionOptions(pathServiceSid, friendlyName);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Function resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to create the Function resource under </param>
-        /// <param name="friendlyName"> A string to describe the Function resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Function </returns>
-        public static async System.Threading.Tasks.Task<FunctionResource> CreateAsync(string pathServiceSid,
-                                                                                      string friendlyName,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateFunctionOptions(pathServiceSid, friendlyName);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateFunctionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathServiceSid + "/Functions/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Function resource.
-        /// </summary>
-        /// <param name="options"> Update Function parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Function </returns>
-        public static FunctionResource Update(UpdateFunctionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Function resource.
-        /// </summary>
-        /// <param name="options"> Update Function parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Function </returns>
-        public static async System.Threading.Tasks.Task<FunctionResource> UpdateAsync(UpdateFunctionOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Function resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the Function resource from </param>
-        /// <param name="pathSid"> The SID of the Function resource to update </param>
-        /// <param name="friendlyName"> A string to describe the Function resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Function </returns>
-        public static FunctionResource Update(string pathServiceSid,
-                                              string pathSid,
-                                              string friendlyName,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateFunctionOptions(pathServiceSid, pathSid, friendlyName);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Function resource.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service to update the Function resource from </param>
-        /// <param name="pathSid"> The SID of the Function resource to update </param>
-        /// <param name="friendlyName"> A string to describe the Function resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Function </returns>
-        public static async System.Threading.Tasks.Task<FunctionResource> UpdateAsync(string pathServiceSid,
-                                                                                      string pathSid,
-                                                                                      string friendlyName,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateFunctionOptions(pathServiceSid, pathSid, friendlyName);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FunctionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FunctionResource object represented by the provided JSON </returns>
-        public static FunctionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FunctionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Function resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the Function resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the Function resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the Function resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Function resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Function resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Function resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of nested resources of the Function resource
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private FunctionResource()
-        {
-
-        }
-    }
+{
+
+  public class FunctionResource : Resource
+  {
+    private static Request BuildReadRequest(ReadFunctionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Functions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Functions.
+    /// </summary>
+    /// <param name="options"> Read Function parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Function </returns>
+    public static ResourceSet<FunctionResource> Read(ReadFunctionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FunctionResource>.FromJson("functions", response.Content);
+      return new ResourceSet<FunctionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Functions.
+    /// </summary>
+    /// <param name="options"> Read Function parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Function </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FunctionResource>> ReadAsync(ReadFunctionOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FunctionResource>.FromJson("functions", response.Content);
+      return new ResourceSet<FunctionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Functions.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Function resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Function </returns>
+    public static ResourceSet<FunctionResource> Read(string pathServiceSid,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadFunctionOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Functions.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to read the Function resources from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Function </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FunctionResource>> ReadAsync(string pathServiceSid,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadFunctionOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FunctionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FunctionResource>.FromJson("functions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FunctionResource> NextPage(Page<FunctionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<FunctionResource>.FromJson("functions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FunctionResource> PreviousPage(Page<FunctionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<FunctionResource>.FromJson("functions", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchFunctionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Functions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a specific Function resource.
+    /// </summary>
+    /// <param name="options"> Fetch Function parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Function </returns>
+    public static FunctionResource Fetch(FetchFunctionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Function resource.
+    /// </summary>
+    /// <param name="options"> Fetch Function parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Function </returns>
+    public static async System.Threading.Tasks.Task<FunctionResource> FetchAsync(FetchFunctionOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a specific Function resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Function resource from </param>
+    /// <param name="pathSid"> The SID of the Function resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Function </returns>
+    public static FunctionResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchFunctionOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Function resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to fetch the Function resource from </param>
+    /// <param name="pathSid"> The SID of the Function resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Function </returns>
+    public static async System.Threading.Tasks.Task<FunctionResource> FetchAsync(string pathServiceSid,
+                                                                                 string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchFunctionOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteFunctionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Functions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a Function resource.
+    /// </summary>
+    /// <param name="options"> Delete Function parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Function </returns>
+    public static bool Delete(DeleteFunctionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Function resource.
+    /// </summary>
+    /// <param name="options"> Delete Function parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Function </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFunctionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a Function resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Function resource from </param>
+    /// <param name="pathSid"> The SID of the Function resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Function </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFunctionOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Function resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to delete the Function resource from </param>
+    /// <param name="pathSid"> The SID of the Function resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Function </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteFunctionOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateFunctionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Functions",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Function resource.
+    /// </summary>
+    /// <param name="options"> Create Function parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Function </returns>
+    public static FunctionResource Create(CreateFunctionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Function resource.
+    /// </summary>
+    /// <param name="options"> Create Function parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Function </returns>
+    public static async System.Threading.Tasks.Task<FunctionResource> CreateAsync(CreateFunctionOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Function resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Function resource under </param>
+    /// <param name="friendlyName"> A string to describe the Function resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Function </returns>
+    public static FunctionResource Create(string pathServiceSid, string friendlyName, ITwilioRestClient client = null)
+    {
+      var options = new CreateFunctionOptions(pathServiceSid, friendlyName);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Function resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to create the Function resource under </param>
+    /// <param name="friendlyName"> A string to describe the Function resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Function </returns>
+    public static async System.Threading.Tasks.Task<FunctionResource> CreateAsync(string pathServiceSid,
+                                                                                  string friendlyName,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateFunctionOptions(pathServiceSid, friendlyName);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateFunctionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathServiceSid + "/Functions/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Function resource.
+    /// </summary>
+    /// <param name="options"> Update Function parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Function </returns>
+    public static FunctionResource Update(UpdateFunctionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Function resource.
+    /// </summary>
+    /// <param name="options"> Update Function parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Function </returns>
+    public static async System.Threading.Tasks.Task<FunctionResource> UpdateAsync(UpdateFunctionOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Function resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the Function resource from </param>
+    /// <param name="pathSid"> The SID of the Function resource to update </param>
+    /// <param name="friendlyName"> A string to describe the Function resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Function </returns>
+    public static FunctionResource Update(string pathServiceSid,
+                                          string pathSid,
+                                          string friendlyName,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateFunctionOptions(pathServiceSid, pathSid, friendlyName);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Function resource.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service to update the Function resource from </param>
+    /// <param name="pathSid"> The SID of the Function resource to update </param>
+    /// <param name="friendlyName"> A string to describe the Function resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Function </returns>
+    public static async System.Threading.Tasks.Task<FunctionResource> UpdateAsync(string pathServiceSid,
+                                                                                  string pathSid,
+                                                                                  string friendlyName,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateFunctionOptions(pathServiceSid, pathSid, friendlyName);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FunctionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FunctionResource object represented by the provided JSON </returns>
+    public static FunctionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FunctionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Function resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the Function resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the Function resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the Function resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Function resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Function resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Function resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of nested resources of the Function resource
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private FunctionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/ServiceOptions.cs b/src/Twilio/Rest/Serverless/V1/ServiceOptions.cs
index 5bc44bdd8..6f4ca722c 100644
--- a/src/Twilio/Rest/Serverless/V1/ServiceOptions.cs
+++ b/src/Twilio/Rest/Serverless/V1/ServiceOptions.cs
@@ -9,213 +9,213 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Serverless.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Services.
+  /// </summary>
+  public class ReadServiceOptions : ReadOptions<ServiceResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Services.
-    /// </summary>
-    public class ReadServiceOptions : ReadOptions<ServiceResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a specific Service resource.
+  /// </summary>
+  public class FetchServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a specific Service resource.
+    /// The SID of the Service resource to fetch
     /// </summary>
-    public class FetchServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The SID of the Service resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to fetch </param>
-        public FetchServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a Service resource.
+    /// Construct a new FetchServiceOptions
     /// </summary>
-    public class DeleteServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The SID of the Service resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to delete </param>
-        public DeleteServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The SID of the Service resource to fetch </param>
+    public FetchServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Service resource.
-    /// </summary>
-    public class CreateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// A user-defined string that uniquely identifies the Service resource
-        /// </summary>
-        public string UniqueName { get; }
-        /// <summary>
-        /// A string to describe the Service resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// Whether to inject Account credentials into a function invocation context
-        /// </summary>
-        public bool? IncludeCredentials { get; set; }
-        /// <summary>
-        /// Whether the Service's properties and subresources can be edited via the UI
-        /// </summary>
-        public bool? UiEditable { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateServiceOptions
-        /// </summary>
-        /// <param name="uniqueName"> A user-defined string that uniquely identifies the Service resource </param>
-        /// <param name="friendlyName"> A string to describe the Service resource </param>
-        public CreateServiceOptions(string uniqueName, string friendlyName)
-        {
-            UniqueName = uniqueName;
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (IncludeCredentials != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeCredentials", IncludeCredentials.Value.ToString().ToLower()));
-            }
-
-            if (UiEditable != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UiEditable", UiEditable.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a Service resource.
+  /// </summary>
+  public class DeleteServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update a specific Service resource.
-    /// </summary>
-    public class UpdateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The SID of the Service resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// Whether to inject Account credentials into a function invocation context
-        /// </summary>
-        public bool? IncludeCredentials { get; set; }
-        /// <summary>
-        /// A string to describe the Service resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Whether the Service resource's properties and subresources can be edited via the UI
-        /// </summary>
-        public bool? UiEditable { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to update </param>
-        public UpdateServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IncludeCredentials != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeCredentials", IncludeCredentials.Value.ToString().ToLower()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UiEditable != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UiEditable", UiEditable.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Service resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to delete </param>
+    public DeleteServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Service resource.
+  /// </summary>
+  public class CreateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// A user-defined string that uniquely identifies the Service resource
+    /// </summary>
+    public string UniqueName { get; }
+    /// <summary>
+    /// A string to describe the Service resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// Whether to inject Account credentials into a function invocation context
+    /// </summary>
+    public bool? IncludeCredentials { get; set; }
+    /// <summary>
+    /// Whether the Service's properties and subresources can be edited via the UI
+    /// </summary>
+    public bool? UiEditable { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateServiceOptions
+    /// </summary>
+    /// <param name="uniqueName"> A user-defined string that uniquely identifies the Service resource </param>
+    /// <param name="friendlyName"> A string to describe the Service resource </param>
+    public CreateServiceOptions(string uniqueName, string friendlyName)
+    {
+      UniqueName = uniqueName;
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (IncludeCredentials != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeCredentials", IncludeCredentials.Value.ToString().ToLower()));
+      }
+
+      if (UiEditable != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UiEditable", UiEditable.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update a specific Service resource.
+  /// </summary>
+  public class UpdateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The SID of the Service resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// Whether to inject Account credentials into a function invocation context
+    /// </summary>
+    public bool? IncludeCredentials { get; set; }
+    /// <summary>
+    /// A string to describe the Service resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Whether the Service resource's properties and subresources can be edited via the UI
+    /// </summary>
+    public bool? UiEditable { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to update </param>
+    public UpdateServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IncludeCredentials != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeCredentials", IncludeCredentials.Value.ToString().ToLower()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UiEditable != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UiEditable", UiEditable.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Serverless/V1/ServiceResource.cs b/src/Twilio/Rest/Serverless/V1/ServiceResource.cs
index 17d276ae1..1689affc2 100644
--- a/src/Twilio/Rest/Serverless/V1/ServiceResource.cs
+++ b/src/Twilio/Rest/Serverless/V1/ServiceResource.cs
@@ -18,512 +18,512 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Serverless.V1
-{
-
-    public class ServiceResource : Resource
-    {
-        private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Services.
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Services.
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Services.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Services.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Serverless)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a specific Service resource.
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Service resource.
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a specific Service resource.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Service resource.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a Service resource.
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Service resource.
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a Service resource.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Service resource.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Serverless,
-                "/v1/Services",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Service resource.
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Service resource.
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Service resource.
-        /// </summary>
-        /// <param name="uniqueName"> A user-defined string that uniquely identifies the Service resource </param>
-        /// <param name="friendlyName"> A string to describe the Service resource </param>
-        /// <param name="includeCredentials"> Whether to inject Account credentials into a function invocation context </param>
-        /// <param name="uiEditable"> Whether the Service's properties and subresources can be edited via the UI </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(string uniqueName,
-                                             string friendlyName,
-                                             bool? includeCredentials = null,
-                                             bool? uiEditable = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(uniqueName, friendlyName){IncludeCredentials = includeCredentials, UiEditable = uiEditable};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Service resource.
-        /// </summary>
-        /// <param name="uniqueName"> A user-defined string that uniquely identifies the Service resource </param>
-        /// <param name="friendlyName"> A string to describe the Service resource </param>
-        /// <param name="includeCredentials"> Whether to inject Account credentials into a function invocation context </param>
-        /// <param name="uiEditable"> Whether the Service's properties and subresources can be edited via the UI </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string uniqueName,
-                                                                                     string friendlyName,
-                                                                                     bool? includeCredentials = null,
-                                                                                     bool? uiEditable = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(uniqueName, friendlyName){IncludeCredentials = includeCredentials, UiEditable = uiEditable};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Serverless,
-                "/v1/Services/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Service resource.
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Service resource.
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Service resource.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to update </param>
-        /// <param name="includeCredentials"> Whether to inject Account credentials into a function invocation context </param>
-        /// <param name="friendlyName"> A string to describe the Service resource </param>
-        /// <param name="uiEditable"> Whether the Service resource's properties and subresources can be edited via the UI
-        ///                  </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(string pathSid,
-                                             bool? includeCredentials = null,
-                                             string friendlyName = null,
-                                             bool? uiEditable = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){IncludeCredentials = includeCredentials, FriendlyName = friendlyName, UiEditable = uiEditable};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Service resource.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to update </param>
-        /// <param name="includeCredentials"> Whether to inject Account credentials into a function invocation context </param>
-        /// <param name="friendlyName"> A string to describe the Service resource </param>
-        /// <param name="uiEditable"> Whether the Service resource's properties and subresources can be edited via the UI
-        ///                  </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
-                                                                                     bool? includeCredentials = null,
-                                                                                     string friendlyName = null,
-                                                                                     bool? uiEditable = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){IncludeCredentials = includeCredentials, FriendlyName = friendlyName, UiEditable = uiEditable};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ServiceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ServiceResource object represented by the provided JSON </returns>
-        public static ServiceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ServiceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Service resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the Service resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the Service resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A user-defined string that uniquely identifies the Service resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// Whether to inject Account credentials into a function invocation context
-        /// </summary>
-        [JsonProperty("include_credentials")]
-        public bool? IncludeCredentials { get; private set; }
-        /// <summary>
-        /// Whether the Service resource's properties and subresources can be edited via the UI
-        /// </summary>
-        [JsonProperty("ui_editable")]
-        public bool? UiEditable { get; private set; }
-        /// <summary>
-        /// The base domain name for this Service, which is a combination of the unique name and a randomly generated string
-        /// </summary>
-        [JsonProperty("domain_base")]
-        public string DomainBase { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Service resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Service resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Service resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of the Service's nested resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ServiceResource()
-        {
-
-        }
-    }
+{
+
+  public class ServiceResource : Resource
+  {
+    private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Services.
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Services.
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Services.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Services.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Serverless)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a specific Service resource.
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Service resource.
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a specific Service resource.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Service resource.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a Service resource.
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Service resource.
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a Service resource.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Service resource.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Serverless,
+          "/v1/Services",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Service resource.
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Service resource.
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Service resource.
+    /// </summary>
+    /// <param name="uniqueName"> A user-defined string that uniquely identifies the Service resource </param>
+    /// <param name="friendlyName"> A string to describe the Service resource </param>
+    /// <param name="includeCredentials"> Whether to inject Account credentials into a function invocation context </param>
+    /// <param name="uiEditable"> Whether the Service's properties and subresources can be edited via the UI </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(string uniqueName,
+                                         string friendlyName,
+                                         bool? includeCredentials = null,
+                                         bool? uiEditable = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(uniqueName, friendlyName) { IncludeCredentials = includeCredentials, UiEditable = uiEditable };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Service resource.
+    /// </summary>
+    /// <param name="uniqueName"> A user-defined string that uniquely identifies the Service resource </param>
+    /// <param name="friendlyName"> A string to describe the Service resource </param>
+    /// <param name="includeCredentials"> Whether to inject Account credentials into a function invocation context </param>
+    /// <param name="uiEditable"> Whether the Service's properties and subresources can be edited via the UI </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string uniqueName,
+                                                                                 string friendlyName,
+                                                                                 bool? includeCredentials = null,
+                                                                                 bool? uiEditable = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(uniqueName, friendlyName) { IncludeCredentials = includeCredentials, UiEditable = uiEditable };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Serverless,
+          "/v1/Services/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Service resource.
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Service resource.
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Service resource.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to update </param>
+    /// <param name="includeCredentials"> Whether to inject Account credentials into a function invocation context </param>
+    /// <param name="friendlyName"> A string to describe the Service resource </param>
+    /// <param name="uiEditable"> Whether the Service resource's properties and subresources can be edited via the UI
+    ///                  </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(string pathSid,
+                                         bool? includeCredentials = null,
+                                         string friendlyName = null,
+                                         bool? uiEditable = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { IncludeCredentials = includeCredentials, FriendlyName = friendlyName, UiEditable = uiEditable };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Service resource.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to update </param>
+    /// <param name="includeCredentials"> Whether to inject Account credentials into a function invocation context </param>
+    /// <param name="friendlyName"> A string to describe the Service resource </param>
+    /// <param name="uiEditable"> Whether the Service resource's properties and subresources can be edited via the UI
+    ///                  </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
+                                                                                 bool? includeCredentials = null,
+                                                                                 string friendlyName = null,
+                                                                                 bool? uiEditable = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { IncludeCredentials = includeCredentials, FriendlyName = friendlyName, UiEditable = uiEditable };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ServiceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ServiceResource object represented by the provided JSON </returns>
+    public static ServiceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ServiceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Service resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the Service resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the Service resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A user-defined string that uniquely identifies the Service resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// Whether to inject Account credentials into a function invocation context
+    /// </summary>
+    [JsonProperty("include_credentials")]
+    public bool? IncludeCredentials { get; private set; }
+    /// <summary>
+    /// Whether the Service resource's properties and subresources can be edited via the UI
+    /// </summary>
+    [JsonProperty("ui_editable")]
+    public bool? UiEditable { get; private set; }
+    /// <summary>
+    /// The base domain name for this Service, which is a combination of the unique name and a randomly generated string
+    /// </summary>
+    [JsonProperty("domain_base")]
+    public string DomainBase { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Service resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Service resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Service resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of the Service's nested resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ServiceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/Engagement/EngagementContextOptions.cs b/src/Twilio/Rest/Studio/V1/Flow/Engagement/EngagementContextOptions.cs
index c0c5fa8ae..b3b96ba56 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/Engagement/EngagementContextOptions.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/Engagement/EngagementContextOptions.cs
@@ -9,41 +9,41 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V1.Flow.Engagement
-{
-
+{
+
+  /// <summary>
+  /// Retrieve the most recent context for an Engagement.
+  /// </summary>
+  public class FetchEngagementContextOptions : IOptions<EngagementContextResource>
+  {
     /// <summary>
-    /// Retrieve the most recent context for an Engagement.
+    /// Flow SID
     /// </summary>
-    public class FetchEngagementContextOptions : IOptions<EngagementContextResource>
-    {
-        /// <summary>
-        /// Flow SID
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// Engagement SID
-        /// </summary>
-        public string PathEngagementSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchEngagementContextOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> Flow SID </param>
-        /// <param name="pathEngagementSid"> Engagement SID </param>
-        public FetchEngagementContextOptions(string pathFlowSid, string pathEngagementSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathEngagementSid = pathEngagementSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// Engagement SID
+    /// </summary>
+    public string PathEngagementSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchEngagementContextOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> Flow SID </param>
+    /// <param name="pathEngagementSid"> Engagement SID </param>
+    public FetchEngagementContextOptions(string pathFlowSid, string pathEngagementSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathEngagementSid = pathEngagementSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/Engagement/EngagementContextResource.cs b/src/Twilio/Rest/Studio/V1/Flow/Engagement/EngagementContextResource.cs
index eebd21b2a..539be70e1 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/Engagement/EngagementContextResource.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/Engagement/EngagementContextResource.cs
@@ -16,130 +16,130 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Studio.V1.Flow.Engagement
-{
-
-    public class EngagementContextResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchEngagementContextOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Engagements/" + options.PathEngagementSid + "/Context",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve the most recent context for an Engagement.
-        /// </summary>
-        /// <param name="options"> Fetch EngagementContext parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EngagementContext </returns>
-        public static EngagementContextResource Fetch(FetchEngagementContextOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the most recent context for an Engagement.
-        /// </summary>
-        /// <param name="options"> Fetch EngagementContext parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EngagementContext </returns>
-        public static async System.Threading.Tasks.Task<EngagementContextResource> FetchAsync(FetchEngagementContextOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve the most recent context for an Engagement.
-        /// </summary>
-        /// <param name="pathFlowSid"> Flow SID </param>
-        /// <param name="pathEngagementSid"> Engagement SID </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EngagementContext </returns>
-        public static EngagementContextResource Fetch(string pathFlowSid,
-                                                      string pathEngagementSid,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchEngagementContextOptions(pathFlowSid, pathEngagementSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the most recent context for an Engagement.
-        /// </summary>
-        /// <param name="pathFlowSid"> Flow SID </param>
-        /// <param name="pathEngagementSid"> Engagement SID </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EngagementContext </returns>
-        public static async System.Threading.Tasks.Task<EngagementContextResource> FetchAsync(string pathFlowSid,
-                                                                                              string pathEngagementSid,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchEngagementContextOptions(pathFlowSid, pathEngagementSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a EngagementContextResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EngagementContextResource object represented by the provided JSON </returns>
-        public static EngagementContextResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EngagementContextResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Account SID
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Flow state
-        /// </summary>
-        [JsonProperty("context")]
-        public object Context { get; private set; }
-        /// <summary>
-        /// Engagement SID
-        /// </summary>
-        [JsonProperty("engagement_sid")]
-        public string EngagementSid { get; private set; }
-        /// <summary>
-        /// Flow SID
-        /// </summary>
-        [JsonProperty("flow_sid")]
-        public string FlowSid { get; private set; }
-        /// <summary>
-        /// The URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private EngagementContextResource()
-        {
-
-        }
-    }
+{
+
+  public class EngagementContextResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchEngagementContextOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Engagements/" + options.PathEngagementSid + "/Context",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve the most recent context for an Engagement.
+    /// </summary>
+    /// <param name="options"> Fetch EngagementContext parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EngagementContext </returns>
+    public static EngagementContextResource Fetch(FetchEngagementContextOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the most recent context for an Engagement.
+    /// </summary>
+    /// <param name="options"> Fetch EngagementContext parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EngagementContext </returns>
+    public static async System.Threading.Tasks.Task<EngagementContextResource> FetchAsync(FetchEngagementContextOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve the most recent context for an Engagement.
+    /// </summary>
+    /// <param name="pathFlowSid"> Flow SID </param>
+    /// <param name="pathEngagementSid"> Engagement SID </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EngagementContext </returns>
+    public static EngagementContextResource Fetch(string pathFlowSid,
+                                                  string pathEngagementSid,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchEngagementContextOptions(pathFlowSid, pathEngagementSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the most recent context for an Engagement.
+    /// </summary>
+    /// <param name="pathFlowSid"> Flow SID </param>
+    /// <param name="pathEngagementSid"> Engagement SID </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EngagementContext </returns>
+    public static async System.Threading.Tasks.Task<EngagementContextResource> FetchAsync(string pathFlowSid,
+                                                                                          string pathEngagementSid,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchEngagementContextOptions(pathFlowSid, pathEngagementSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a EngagementContextResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EngagementContextResource object represented by the provided JSON </returns>
+    public static EngagementContextResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EngagementContextResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Account SID
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Flow state
+    /// </summary>
+    [JsonProperty("context")]
+    public object Context { get; private set; }
+    /// <summary>
+    /// Engagement SID
+    /// </summary>
+    [JsonProperty("engagement_sid")]
+    public string EngagementSid { get; private set; }
+    /// <summary>
+    /// Flow SID
+    /// </summary>
+    [JsonProperty("flow_sid")]
+    public string FlowSid { get; private set; }
+    /// <summary>
+    /// The URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private EngagementContextResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/Engagement/Step/StepContextOptions.cs b/src/Twilio/Rest/Studio/V1/Flow/Engagement/Step/StepContextOptions.cs
index b2cc173cc..4d0d89b1f 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/Engagement/Step/StepContextOptions.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/Engagement/Step/StepContextOptions.cs
@@ -9,47 +9,47 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V1.Flow.Engagement.Step
-{
-
+{
+
+  /// <summary>
+  /// Retrieve the context for an Engagement Step.
+  /// </summary>
+  public class FetchStepContextOptions : IOptions<StepContextResource>
+  {
     /// <summary>
-    /// Retrieve the context for an Engagement Step.
+    /// The SID of the Flow
     /// </summary>
-    public class FetchStepContextOptions : IOptions<StepContextResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Engagement
-        /// </summary>
-        public string PathEngagementSid { get; }
-        /// <summary>
-        /// Step SID
-        /// </summary>
-        public string PathStepSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchStepContextOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathEngagementSid"> The SID of the Engagement </param>
-        /// <param name="pathStepSid"> Step SID </param>
-        public FetchStepContextOptions(string pathFlowSid, string pathEngagementSid, string pathStepSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathEngagementSid = pathEngagementSid;
-            PathStepSid = pathStepSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Engagement
+    /// </summary>
+    public string PathEngagementSid { get; }
+    /// <summary>
+    /// Step SID
+    /// </summary>
+    public string PathStepSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchStepContextOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathEngagementSid"> The SID of the Engagement </param>
+    /// <param name="pathStepSid"> Step SID </param>
+    public FetchStepContextOptions(string pathFlowSid, string pathEngagementSid, string pathStepSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathEngagementSid = pathEngagementSid;
+      PathStepSid = pathStepSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/Engagement/Step/StepContextResource.cs b/src/Twilio/Rest/Studio/V1/Flow/Engagement/Step/StepContextResource.cs
index 6c440e460..7a51dd25f 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/Engagement/Step/StepContextResource.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/Engagement/Step/StepContextResource.cs
@@ -16,139 +16,139 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Studio.V1.Flow.Engagement.Step
-{
-
-    public class StepContextResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchStepContextOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Engagements/" + options.PathEngagementSid + "/Steps/" + options.PathStepSid + "/Context",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve the context for an Engagement Step.
-        /// </summary>
-        /// <param name="options"> Fetch StepContext parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of StepContext </returns>
-        public static StepContextResource Fetch(FetchStepContextOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the context for an Engagement Step.
-        /// </summary>
-        /// <param name="options"> Fetch StepContext parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of StepContext </returns>
-        public static async System.Threading.Tasks.Task<StepContextResource> FetchAsync(FetchStepContextOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve the context for an Engagement Step.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathEngagementSid"> The SID of the Engagement </param>
-        /// <param name="pathStepSid"> Step SID </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of StepContext </returns>
-        public static StepContextResource Fetch(string pathFlowSid,
-                                                string pathEngagementSid,
-                                                string pathStepSid,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchStepContextOptions(pathFlowSid, pathEngagementSid, pathStepSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the context for an Engagement Step.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathEngagementSid"> The SID of the Engagement </param>
-        /// <param name="pathStepSid"> Step SID </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of StepContext </returns>
-        public static async System.Threading.Tasks.Task<StepContextResource> FetchAsync(string pathFlowSid,
-                                                                                        string pathEngagementSid,
-                                                                                        string pathStepSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchStepContextOptions(pathFlowSid, pathEngagementSid, pathStepSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a StepContextResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> StepContextResource object represented by the provided JSON </returns>
-        public static StepContextResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<StepContextResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The current state of the flow
-        /// </summary>
-        [JsonProperty("context")]
-        public object Context { get; private set; }
-        /// <summary>
-        /// The SID of the Engagement
-        /// </summary>
-        [JsonProperty("engagement_sid")]
-        public string EngagementSid { get; private set; }
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        [JsonProperty("flow_sid")]
-        public string FlowSid { get; private set; }
-        /// <summary>
-        /// Step SID
-        /// </summary>
-        [JsonProperty("step_sid")]
-        public string StepSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private StepContextResource()
-        {
-
-        }
-    }
+{
+
+  public class StepContextResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchStepContextOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Engagements/" + options.PathEngagementSid + "/Steps/" + options.PathStepSid + "/Context",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve the context for an Engagement Step.
+    /// </summary>
+    /// <param name="options"> Fetch StepContext parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of StepContext </returns>
+    public static StepContextResource Fetch(FetchStepContextOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the context for an Engagement Step.
+    /// </summary>
+    /// <param name="options"> Fetch StepContext parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of StepContext </returns>
+    public static async System.Threading.Tasks.Task<StepContextResource> FetchAsync(FetchStepContextOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve the context for an Engagement Step.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathEngagementSid"> The SID of the Engagement </param>
+    /// <param name="pathStepSid"> Step SID </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of StepContext </returns>
+    public static StepContextResource Fetch(string pathFlowSid,
+                                            string pathEngagementSid,
+                                            string pathStepSid,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchStepContextOptions(pathFlowSid, pathEngagementSid, pathStepSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the context for an Engagement Step.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathEngagementSid"> The SID of the Engagement </param>
+    /// <param name="pathStepSid"> Step SID </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of StepContext </returns>
+    public static async System.Threading.Tasks.Task<StepContextResource> FetchAsync(string pathFlowSid,
+                                                                                    string pathEngagementSid,
+                                                                                    string pathStepSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchStepContextOptions(pathFlowSid, pathEngagementSid, pathStepSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a StepContextResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> StepContextResource object represented by the provided JSON </returns>
+    public static StepContextResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<StepContextResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The current state of the flow
+    /// </summary>
+    [JsonProperty("context")]
+    public object Context { get; private set; }
+    /// <summary>
+    /// The SID of the Engagement
+    /// </summary>
+    [JsonProperty("engagement_sid")]
+    public string EngagementSid { get; private set; }
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    [JsonProperty("flow_sid")]
+    public string FlowSid { get; private set; }
+    /// <summary>
+    /// Step SID
+    /// </summary>
+    [JsonProperty("step_sid")]
+    public string StepSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private StepContextResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/Engagement/StepOptions.cs b/src/Twilio/Rest/Studio/V1/Flow/Engagement/StepOptions.cs
index 492ee6913..27703761d 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/Engagement/StepOptions.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/Engagement/StepOptions.cs
@@ -9,87 +9,87 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V1.Flow.Engagement
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Steps for an Engagement.
+  /// </summary>
+  public class ReadStepOptions : ReadOptions<StepResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Steps for an Engagement.
+    /// The SID of the Flow
     /// </summary>
-    public class ReadStepOptions : ReadOptions<StepResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Engagement
-        /// </summary>
-        public string PathEngagementSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadStepOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathEngagementSid"> The SID of the Engagement </param>
-        public ReadStepOptions(string pathFlowSid, string pathEngagementSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathEngagementSid = pathEngagementSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathFlowSid { get; }
     /// <summary>
-    /// Retrieve a Step.
+    /// The SID of the Engagement
     /// </summary>
-    public class FetchStepOptions : IOptions<StepResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Engagement
-        /// </summary>
-        public string PathEngagementSid { get; }
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchStepOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathEngagementSid"> The SID of the Engagement </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchStepOptions(string pathFlowSid, string pathEngagementSid, string pathSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathEngagementSid = pathEngagementSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathEngagementSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadStepOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathEngagementSid"> The SID of the Engagement </param>
+    public ReadStepOptions(string pathFlowSid, string pathEngagementSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathEngagementSid = pathEngagementSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a Step.
+  /// </summary>
+  public class FetchStepOptions : IOptions<StepResource>
+  {
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Engagement
+    /// </summary>
+    public string PathEngagementSid { get; }
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchStepOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathEngagementSid"> The SID of the Engagement </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchStepOptions(string pathFlowSid, string pathEngagementSid, string pathSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathEngagementSid = pathEngagementSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/Engagement/StepResource.cs b/src/Twilio/Rest/Studio/V1/Flow/Engagement/StepResource.cs
index c04d987b2..f822b586a 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/Engagement/StepResource.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/Engagement/StepResource.cs
@@ -16,306 +16,306 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Studio.V1.Flow.Engagement
-{
-
-    public class StepResource : Resource
-    {
-        private static Request BuildReadRequest(ReadStepOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Engagements/" + options.PathEngagementSid + "/Steps",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Steps for an Engagement.
-        /// </summary>
-        /// <param name="options"> Read Step parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Step </returns>
-        public static ResourceSet<StepResource> Read(ReadStepOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<StepResource>.FromJson("steps", response.Content);
-            return new ResourceSet<StepResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Steps for an Engagement.
-        /// </summary>
-        /// <param name="options"> Read Step parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Step </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<StepResource>> ReadAsync(ReadStepOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<StepResource>.FromJson("steps", response.Content);
-            return new ResourceSet<StepResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Steps for an Engagement.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathEngagementSid"> The SID of the Engagement </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Step </returns>
-        public static ResourceSet<StepResource> Read(string pathFlowSid,
-                                                     string pathEngagementSid,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadStepOptions(pathFlowSid, pathEngagementSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Steps for an Engagement.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathEngagementSid"> The SID of the Engagement </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Step </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<StepResource>> ReadAsync(string pathFlowSid,
-                                                                                             string pathEngagementSid,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadStepOptions(pathFlowSid, pathEngagementSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<StepResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<StepResource>.FromJson("steps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<StepResource> NextPage(Page<StepResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<StepResource>.FromJson("steps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<StepResource> PreviousPage(Page<StepResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<StepResource>.FromJson("steps", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchStepOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Engagements/" + options.PathEngagementSid + "/Steps/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a Step.
-        /// </summary>
-        /// <param name="options"> Fetch Step parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Step </returns>
-        public static StepResource Fetch(FetchStepOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a Step.
-        /// </summary>
-        /// <param name="options"> Fetch Step parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Step </returns>
-        public static async System.Threading.Tasks.Task<StepResource> FetchAsync(FetchStepOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a Step.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathEngagementSid"> The SID of the Engagement </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Step </returns>
-        public static StepResource Fetch(string pathFlowSid,
-                                         string pathEngagementSid,
-                                         string pathSid,
-                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchStepOptions(pathFlowSid, pathEngagementSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a Step.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathEngagementSid"> The SID of the Engagement </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Step </returns>
-        public static async System.Threading.Tasks.Task<StepResource> FetchAsync(string pathFlowSid,
-                                                                                 string pathEngagementSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchStepOptions(pathFlowSid, pathEngagementSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a StepResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> StepResource object represented by the provided JSON </returns>
-        public static StepResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<StepResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        [JsonProperty("flow_sid")]
-        public string FlowSid { get; private set; }
-        /// <summary>
-        /// The SID of the Engagement
-        /// </summary>
-        [JsonProperty("engagement_sid")]
-        public string EngagementSid { get; private set; }
-        /// <summary>
-        /// The event that caused the Flow to transition to the Step
-        /// </summary>
-        [JsonProperty("name")]
-        public string Name { get; private set; }
-        /// <summary>
-        /// The current state of the flow
-        /// </summary>
-        [JsonProperty("context")]
-        public object Context { get; private set; }
-        /// <summary>
-        /// The Widget that preceded the Widget for the Step
-        /// </summary>
-        [JsonProperty("transitioned_from")]
-        public string TransitionedFrom { get; private set; }
-        /// <summary>
-        /// The Widget that will follow the Widget for the Step
-        /// </summary>
-        [JsonProperty("transitioned_to")]
-        public string TransitionedTo { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private StepResource()
-        {
-
-        }
-    }
+{
+
+  public class StepResource : Resource
+  {
+    private static Request BuildReadRequest(ReadStepOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Engagements/" + options.PathEngagementSid + "/Steps",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Steps for an Engagement.
+    /// </summary>
+    /// <param name="options"> Read Step parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Step </returns>
+    public static ResourceSet<StepResource> Read(ReadStepOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<StepResource>.FromJson("steps", response.Content);
+      return new ResourceSet<StepResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Steps for an Engagement.
+    /// </summary>
+    /// <param name="options"> Read Step parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Step </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<StepResource>> ReadAsync(ReadStepOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<StepResource>.FromJson("steps", response.Content);
+      return new ResourceSet<StepResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Steps for an Engagement.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathEngagementSid"> The SID of the Engagement </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Step </returns>
+    public static ResourceSet<StepResource> Read(string pathFlowSid,
+                                                 string pathEngagementSid,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadStepOptions(pathFlowSid, pathEngagementSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Steps for an Engagement.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathEngagementSid"> The SID of the Engagement </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Step </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<StepResource>> ReadAsync(string pathFlowSid,
+                                                                                         string pathEngagementSid,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadStepOptions(pathFlowSid, pathEngagementSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<StepResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<StepResource>.FromJson("steps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<StepResource> NextPage(Page<StepResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<StepResource>.FromJson("steps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<StepResource> PreviousPage(Page<StepResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<StepResource>.FromJson("steps", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchStepOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Engagements/" + options.PathEngagementSid + "/Steps/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a Step.
+    /// </summary>
+    /// <param name="options"> Fetch Step parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Step </returns>
+    public static StepResource Fetch(FetchStepOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a Step.
+    /// </summary>
+    /// <param name="options"> Fetch Step parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Step </returns>
+    public static async System.Threading.Tasks.Task<StepResource> FetchAsync(FetchStepOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a Step.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathEngagementSid"> The SID of the Engagement </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Step </returns>
+    public static StepResource Fetch(string pathFlowSid,
+                                     string pathEngagementSid,
+                                     string pathSid,
+                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchStepOptions(pathFlowSid, pathEngagementSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a Step.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathEngagementSid"> The SID of the Engagement </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Step </returns>
+    public static async System.Threading.Tasks.Task<StepResource> FetchAsync(string pathFlowSid,
+                                                                             string pathEngagementSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchStepOptions(pathFlowSid, pathEngagementSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a StepResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> StepResource object represented by the provided JSON </returns>
+    public static StepResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<StepResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    [JsonProperty("flow_sid")]
+    public string FlowSid { get; private set; }
+    /// <summary>
+    /// The SID of the Engagement
+    /// </summary>
+    [JsonProperty("engagement_sid")]
+    public string EngagementSid { get; private set; }
+    /// <summary>
+    /// The event that caused the Flow to transition to the Step
+    /// </summary>
+    [JsonProperty("name")]
+    public string Name { get; private set; }
+    /// <summary>
+    /// The current state of the flow
+    /// </summary>
+    [JsonProperty("context")]
+    public object Context { get; private set; }
+    /// <summary>
+    /// The Widget that preceded the Widget for the Step
+    /// </summary>
+    [JsonProperty("transitioned_from")]
+    public string TransitionedFrom { get; private set; }
+    /// <summary>
+    /// The Widget that will follow the Widget for the Step
+    /// </summary>
+    [JsonProperty("transitioned_to")]
+    public string TransitionedTo { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private StepResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/EngagementOptions.cs b/src/Twilio/Rest/Studio/V1/Flow/EngagementOptions.cs
index ba235b699..276e016ee 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/EngagementOptions.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/EngagementOptions.cs
@@ -9,171 +9,171 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V1.Flow
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Engagements for the Flow.
+  /// </summary>
+  public class ReadEngagementOptions : ReadOptions<EngagementResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Engagements for the Flow.
+    /// The SID of the Flow to read Engagements from
     /// </summary>
-    public class ReadEngagementOptions : ReadOptions<EngagementResource>
-    {
-        /// <summary>
-        /// The SID of the Flow to read Engagements from
-        /// </summary>
-        public string PathFlowSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadEngagementOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow to read Engagements from </param>
-        public ReadEngagementOptions(string pathFlowSid)
-        {
-            PathFlowSid = pathFlowSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathFlowSid { get; }
+
     /// <summary>
-    /// Retrieve an Engagement
-    /// </summary>
-    public class FetchEngagementOptions : IOptions<EngagementResource>
-    {
-        /// <summary>
-        /// Flow SID
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Engagement resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchEngagementOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> Flow SID </param>
-        /// <param name="pathSid"> The SID of the Engagement resource to fetch </param>
-        public FetchEngagementOptions(string pathFlowSid, string pathSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new ReadEngagementOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow to read Engagements from </param>
+    public ReadEngagementOptions(string pathFlowSid)
+    {
+      PathFlowSid = pathFlowSid;
+    }
+
     /// <summary>
-    /// Triggers a new Engagement for the Flow
-    /// </summary>
-    public class CreateEngagementOptions : IOptions<EngagementResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The Contact phone number to start a Studio Flow Engagement
-        /// </summary>
-        public Types.PhoneNumber To { get; }
-        /// <summary>
-        /// The Twilio phone number to send messages or initiate calls from during the Flow Engagement
-        /// </summary>
-        public Types.PhoneNumber From { get; }
-        /// <summary>
-        /// A JSON string we will add to your flow's context and that you can access as variables inside your flow
-        /// </summary>
-        public object Parameters { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateEngagementOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="to"> The Contact phone number to start a Studio Flow Engagement </param>
-        /// <param name="from"> The Twilio phone number to send messages or initiate calls from during the Flow Engagement
-        ///            </param>
-        public CreateEngagementOptions(string pathFlowSid, Types.PhoneNumber to, Types.PhoneNumber from)
-        {
-            PathFlowSid = pathFlowSid;
-            To = to;
-            From = from;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To.ToString()));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From.ToString()));
-            }
-
-            if (Parameters != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameters", Serializers.JsonObject(Parameters)));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve an Engagement
+  /// </summary>
+  public class FetchEngagementOptions : IOptions<EngagementResource>
+  {
     /// <summary>
-    /// Delete this Engagement and all Steps relating to it.
-    /// </summary>
-    public class DeleteEngagementOptions : IOptions<EngagementResource>
-    {
-        /// <summary>
-        /// The SID of the Flow to delete Engagements from
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Engagement resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteEngagementOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow to delete Engagements from </param>
-        /// <param name="pathSid"> The SID of the Engagement resource to delete </param>
-        public DeleteEngagementOptions(string pathFlowSid, string pathSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Flow SID
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Engagement resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchEngagementOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> Flow SID </param>
+    /// <param name="pathSid"> The SID of the Engagement resource to fetch </param>
+    public FetchEngagementOptions(string pathFlowSid, string pathSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Triggers a new Engagement for the Flow
+  /// </summary>
+  public class CreateEngagementOptions : IOptions<EngagementResource>
+  {
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The Contact phone number to start a Studio Flow Engagement
+    /// </summary>
+    public Types.PhoneNumber To { get; }
+    /// <summary>
+    /// The Twilio phone number to send messages or initiate calls from during the Flow Engagement
+    /// </summary>
+    public Types.PhoneNumber From { get; }
+    /// <summary>
+    /// A JSON string we will add to your flow's context and that you can access as variables inside your flow
+    /// </summary>
+    public object Parameters { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateEngagementOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="to"> The Contact phone number to start a Studio Flow Engagement </param>
+    /// <param name="from"> The Twilio phone number to send messages or initiate calls from during the Flow Engagement
+    ///            </param>
+    public CreateEngagementOptions(string pathFlowSid, Types.PhoneNumber to, Types.PhoneNumber from)
+    {
+      PathFlowSid = pathFlowSid;
+      To = to;
+      From = from;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To.ToString()));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From.ToString()));
+      }
+
+      if (Parameters != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameters", Serializers.JsonObject(Parameters)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete this Engagement and all Steps relating to it.
+  /// </summary>
+  public class DeleteEngagementOptions : IOptions<EngagementResource>
+  {
+    /// <summary>
+    /// The SID of the Flow to delete Engagements from
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Engagement resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteEngagementOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow to delete Engagements from </param>
+    /// <param name="pathSid"> The SID of the Engagement resource to delete </param>
+    public DeleteEngagementOptions(string pathFlowSid, string pathSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/EngagementResource.cs b/src/Twilio/Rest/Studio/V1/Flow/EngagementResource.cs
index 51a5682ac..17f5a5f69 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/EngagementResource.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/EngagementResource.cs
@@ -17,459 +17,459 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Studio.V1.Flow
-{
-
-    public class EngagementResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Active = new StatusEnum("active");
-            public static readonly StatusEnum Ended = new StatusEnum("ended");
-        }
-
-        private static Request BuildReadRequest(ReadEngagementOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Engagements",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Engagements for the Flow.
-        /// </summary>
-        /// <param name="options"> Read Engagement parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Engagement </returns>
-        public static ResourceSet<EngagementResource> Read(ReadEngagementOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<EngagementResource>.FromJson("engagements", response.Content);
-            return new ResourceSet<EngagementResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Engagements for the Flow.
-        /// </summary>
-        /// <param name="options"> Read Engagement parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Engagement </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EngagementResource>> ReadAsync(ReadEngagementOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<EngagementResource>.FromJson("engagements", response.Content);
-            return new ResourceSet<EngagementResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Engagements for the Flow.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow to read Engagements from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Engagement </returns>
-        public static ResourceSet<EngagementResource> Read(string pathFlowSid,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadEngagementOptions(pathFlowSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Engagements for the Flow.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow to read Engagements from </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Engagement </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EngagementResource>> ReadAsync(string pathFlowSid,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadEngagementOptions(pathFlowSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<EngagementResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<EngagementResource>.FromJson("engagements", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<EngagementResource> NextPage(Page<EngagementResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<EngagementResource>.FromJson("engagements", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<EngagementResource> PreviousPage(Page<EngagementResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<EngagementResource>.FromJson("engagements", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchEngagementOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Engagements/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve an Engagement
-        /// </summary>
-        /// <param name="options"> Fetch Engagement parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Engagement </returns>
-        public static EngagementResource Fetch(FetchEngagementOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve an Engagement
-        /// </summary>
-        /// <param name="options"> Fetch Engagement parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Engagement </returns>
-        public static async System.Threading.Tasks.Task<EngagementResource> FetchAsync(FetchEngagementOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve an Engagement
-        /// </summary>
-        /// <param name="pathFlowSid"> Flow SID </param>
-        /// <param name="pathSid"> The SID of the Engagement resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Engagement </returns>
-        public static EngagementResource Fetch(string pathFlowSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchEngagementOptions(pathFlowSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve an Engagement
-        /// </summary>
-        /// <param name="pathFlowSid"> Flow SID </param>
-        /// <param name="pathSid"> The SID of the Engagement resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Engagement </returns>
-        public static async System.Threading.Tasks.Task<EngagementResource> FetchAsync(string pathFlowSid,
-                                                                                       string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchEngagementOptions(pathFlowSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateEngagementOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Engagements",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Triggers a new Engagement for the Flow
-        /// </summary>
-        /// <param name="options"> Create Engagement parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Engagement </returns>
-        public static EngagementResource Create(CreateEngagementOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Triggers a new Engagement for the Flow
-        /// </summary>
-        /// <param name="options"> Create Engagement parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Engagement </returns>
-        public static async System.Threading.Tasks.Task<EngagementResource> CreateAsync(CreateEngagementOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Triggers a new Engagement for the Flow
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="to"> The Contact phone number to start a Studio Flow Engagement </param>
-        /// <param name="from"> The Twilio phone number to send messages or initiate calls from during the Flow Engagement
-        ///            </param>
-        /// <param name="parameters"> A JSON string we will add to your flow's context and that you can access as variables
-        ///                  inside your flow </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Engagement </returns>
-        public static EngagementResource Create(string pathFlowSid,
-                                                Types.PhoneNumber to,
-                                                Types.PhoneNumber from,
-                                                object parameters = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateEngagementOptions(pathFlowSid, to, from){Parameters = parameters};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Triggers a new Engagement for the Flow
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="to"> The Contact phone number to start a Studio Flow Engagement </param>
-        /// <param name="from"> The Twilio phone number to send messages or initiate calls from during the Flow Engagement
-        ///            </param>
-        /// <param name="parameters"> A JSON string we will add to your flow's context and that you can access as variables
-        ///                  inside your flow </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Engagement </returns>
-        public static async System.Threading.Tasks.Task<EngagementResource> CreateAsync(string pathFlowSid,
-                                                                                        Types.PhoneNumber to,
-                                                                                        Types.PhoneNumber from,
-                                                                                        object parameters = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateEngagementOptions(pathFlowSid, to, from){Parameters = parameters};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteEngagementOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Engagements/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete this Engagement and all Steps relating to it.
-        /// </summary>
-        /// <param name="options"> Delete Engagement parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Engagement </returns>
-        public static bool Delete(DeleteEngagementOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete this Engagement and all Steps relating to it.
-        /// </summary>
-        /// <param name="options"> Delete Engagement parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Engagement </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteEngagementOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete this Engagement and all Steps relating to it.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow to delete Engagements from </param>
-        /// <param name="pathSid"> The SID of the Engagement resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Engagement </returns>
-        public static bool Delete(string pathFlowSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteEngagementOptions(pathFlowSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete this Engagement and all Steps relating to it.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow to delete Engagements from </param>
-        /// <param name="pathSid"> The SID of the Engagement resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Engagement </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFlowSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteEngagementOptions(pathFlowSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a EngagementResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EngagementResource object represented by the provided JSON </returns>
-        public static EngagementResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EngagementResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        [JsonProperty("flow_sid")]
-        public string FlowSid { get; private set; }
-        /// <summary>
-        /// The SID of the Contact
-        /// </summary>
-        [JsonProperty("contact_sid")]
-        public string ContactSid { get; private set; }
-        /// <summary>
-        /// The phone number, SIP address or Client identifier that triggered this Engagement
-        /// </summary>
-        [JsonProperty("contact_channel_address")]
-        public string ContactChannelAddress { get; private set; }
-        /// <summary>
-        /// The current state of the execution flow
-        /// </summary>
-        [JsonProperty("context")]
-        public object Context { get; private set; }
-        /// <summary>
-        /// The status of the Engagement
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public EngagementResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Engagement was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Engagement was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of the Engagement's nested resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private EngagementResource()
-        {
-
-        }
-    }
+{
+
+  public class EngagementResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Active = new StatusEnum("active");
+      public static readonly StatusEnum Ended = new StatusEnum("ended");
+    }
+
+    private static Request BuildReadRequest(ReadEngagementOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Engagements",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Engagements for the Flow.
+    /// </summary>
+    /// <param name="options"> Read Engagement parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Engagement </returns>
+    public static ResourceSet<EngagementResource> Read(ReadEngagementOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<EngagementResource>.FromJson("engagements", response.Content);
+      return new ResourceSet<EngagementResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Engagements for the Flow.
+    /// </summary>
+    /// <param name="options"> Read Engagement parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Engagement </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EngagementResource>> ReadAsync(ReadEngagementOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<EngagementResource>.FromJson("engagements", response.Content);
+      return new ResourceSet<EngagementResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Engagements for the Flow.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow to read Engagements from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Engagement </returns>
+    public static ResourceSet<EngagementResource> Read(string pathFlowSid,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadEngagementOptions(pathFlowSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Engagements for the Flow.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow to read Engagements from </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Engagement </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EngagementResource>> ReadAsync(string pathFlowSid,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadEngagementOptions(pathFlowSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<EngagementResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<EngagementResource>.FromJson("engagements", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<EngagementResource> NextPage(Page<EngagementResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<EngagementResource>.FromJson("engagements", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<EngagementResource> PreviousPage(Page<EngagementResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<EngagementResource>.FromJson("engagements", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchEngagementOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Engagements/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve an Engagement
+    /// </summary>
+    /// <param name="options"> Fetch Engagement parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Engagement </returns>
+    public static EngagementResource Fetch(FetchEngagementOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve an Engagement
+    /// </summary>
+    /// <param name="options"> Fetch Engagement parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Engagement </returns>
+    public static async System.Threading.Tasks.Task<EngagementResource> FetchAsync(FetchEngagementOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve an Engagement
+    /// </summary>
+    /// <param name="pathFlowSid"> Flow SID </param>
+    /// <param name="pathSid"> The SID of the Engagement resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Engagement </returns>
+    public static EngagementResource Fetch(string pathFlowSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchEngagementOptions(pathFlowSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve an Engagement
+    /// </summary>
+    /// <param name="pathFlowSid"> Flow SID </param>
+    /// <param name="pathSid"> The SID of the Engagement resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Engagement </returns>
+    public static async System.Threading.Tasks.Task<EngagementResource> FetchAsync(string pathFlowSid,
+                                                                                   string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchEngagementOptions(pathFlowSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateEngagementOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Engagements",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Triggers a new Engagement for the Flow
+    /// </summary>
+    /// <param name="options"> Create Engagement parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Engagement </returns>
+    public static EngagementResource Create(CreateEngagementOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Triggers a new Engagement for the Flow
+    /// </summary>
+    /// <param name="options"> Create Engagement parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Engagement </returns>
+    public static async System.Threading.Tasks.Task<EngagementResource> CreateAsync(CreateEngagementOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Triggers a new Engagement for the Flow
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="to"> The Contact phone number to start a Studio Flow Engagement </param>
+    /// <param name="from"> The Twilio phone number to send messages or initiate calls from during the Flow Engagement
+    ///            </param>
+    /// <param name="parameters"> A JSON string we will add to your flow's context and that you can access as variables
+    ///                  inside your flow </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Engagement </returns>
+    public static EngagementResource Create(string pathFlowSid,
+                                            Types.PhoneNumber to,
+                                            Types.PhoneNumber from,
+                                            object parameters = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateEngagementOptions(pathFlowSid, to, from) { Parameters = parameters };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Triggers a new Engagement for the Flow
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="to"> The Contact phone number to start a Studio Flow Engagement </param>
+    /// <param name="from"> The Twilio phone number to send messages or initiate calls from during the Flow Engagement
+    ///            </param>
+    /// <param name="parameters"> A JSON string we will add to your flow's context and that you can access as variables
+    ///                  inside your flow </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Engagement </returns>
+    public static async System.Threading.Tasks.Task<EngagementResource> CreateAsync(string pathFlowSid,
+                                                                                    Types.PhoneNumber to,
+                                                                                    Types.PhoneNumber from,
+                                                                                    object parameters = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateEngagementOptions(pathFlowSid, to, from) { Parameters = parameters };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteEngagementOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Engagements/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete this Engagement and all Steps relating to it.
+    /// </summary>
+    /// <param name="options"> Delete Engagement parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Engagement </returns>
+    public static bool Delete(DeleteEngagementOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete this Engagement and all Steps relating to it.
+    /// </summary>
+    /// <param name="options"> Delete Engagement parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Engagement </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteEngagementOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete this Engagement and all Steps relating to it.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow to delete Engagements from </param>
+    /// <param name="pathSid"> The SID of the Engagement resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Engagement </returns>
+    public static bool Delete(string pathFlowSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteEngagementOptions(pathFlowSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete this Engagement and all Steps relating to it.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow to delete Engagements from </param>
+    /// <param name="pathSid"> The SID of the Engagement resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Engagement </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFlowSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteEngagementOptions(pathFlowSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a EngagementResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EngagementResource object represented by the provided JSON </returns>
+    public static EngagementResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EngagementResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    [JsonProperty("flow_sid")]
+    public string FlowSid { get; private set; }
+    /// <summary>
+    /// The SID of the Contact
+    /// </summary>
+    [JsonProperty("contact_sid")]
+    public string ContactSid { get; private set; }
+    /// <summary>
+    /// The phone number, SIP address or Client identifier that triggered this Engagement
+    /// </summary>
+    [JsonProperty("contact_channel_address")]
+    public string ContactChannelAddress { get; private set; }
+    /// <summary>
+    /// The current state of the execution flow
+    /// </summary>
+    [JsonProperty("context")]
+    public object Context { get; private set; }
+    /// <summary>
+    /// The status of the Engagement
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public EngagementResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Engagement was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Engagement was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of the Engagement's nested resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private EngagementResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionContextOptions.cs b/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionContextOptions.cs
index 7234efc51..e79ed8b2a 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionContextOptions.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionContextOptions.cs
@@ -9,41 +9,41 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V1.Flow.Execution
-{
-
+{
+
+  /// <summary>
+  /// Retrieve the most recent context for an Execution.
+  /// </summary>
+  public class FetchExecutionContextOptions : IOptions<ExecutionContextResource>
+  {
     /// <summary>
-    /// Retrieve the most recent context for an Execution.
+    /// The SID of the Flow
     /// </summary>
-    public class FetchExecutionContextOptions : IOptions<ExecutionContextResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        public string PathExecutionSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchExecutionContextOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        public FetchExecutionContextOptions(string pathFlowSid, string pathExecutionSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathExecutionSid = pathExecutionSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Execution
+    /// </summary>
+    public string PathExecutionSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchExecutionContextOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    public FetchExecutionContextOptions(string pathFlowSid, string pathExecutionSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathExecutionSid = pathExecutionSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionContextResource.cs b/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionContextResource.cs
index 138d5dd64..edd1f1341 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionContextResource.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionContextResource.cs
@@ -16,130 +16,130 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Studio.V1.Flow.Execution
-{
-
-    public class ExecutionContextResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchExecutionContextOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Context",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve the most recent context for an Execution.
-        /// </summary>
-        /// <param name="options"> Fetch ExecutionContext parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionContext </returns>
-        public static ExecutionContextResource Fetch(FetchExecutionContextOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the most recent context for an Execution.
-        /// </summary>
-        /// <param name="options"> Fetch ExecutionContext parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionContext </returns>
-        public static async System.Threading.Tasks.Task<ExecutionContextResource> FetchAsync(FetchExecutionContextOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve the most recent context for an Execution.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionContext </returns>
-        public static ExecutionContextResource Fetch(string pathFlowSid,
-                                                     string pathExecutionSid,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionContextOptions(pathFlowSid, pathExecutionSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the most recent context for an Execution.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionContext </returns>
-        public static async System.Threading.Tasks.Task<ExecutionContextResource> FetchAsync(string pathFlowSid,
-                                                                                             string pathExecutionSid,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionContextOptions(pathFlowSid, pathExecutionSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExecutionContextResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExecutionContextResource object represented by the provided JSON </returns>
-        public static ExecutionContextResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExecutionContextResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The current state of the flow
-        /// </summary>
-        [JsonProperty("context")]
-        public object Context { get; private set; }
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        [JsonProperty("flow_sid")]
-        public string FlowSid { get; private set; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        [JsonProperty("execution_sid")]
-        public string ExecutionSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private ExecutionContextResource()
-        {
-
-        }
-    }
+{
+
+  public class ExecutionContextResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchExecutionContextOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Context",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve the most recent context for an Execution.
+    /// </summary>
+    /// <param name="options"> Fetch ExecutionContext parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionContext </returns>
+    public static ExecutionContextResource Fetch(FetchExecutionContextOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the most recent context for an Execution.
+    /// </summary>
+    /// <param name="options"> Fetch ExecutionContext parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionContext </returns>
+    public static async System.Threading.Tasks.Task<ExecutionContextResource> FetchAsync(FetchExecutionContextOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve the most recent context for an Execution.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionContext </returns>
+    public static ExecutionContextResource Fetch(string pathFlowSid,
+                                                 string pathExecutionSid,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionContextOptions(pathFlowSid, pathExecutionSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the most recent context for an Execution.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionContext </returns>
+    public static async System.Threading.Tasks.Task<ExecutionContextResource> FetchAsync(string pathFlowSid,
+                                                                                         string pathExecutionSid,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionContextOptions(pathFlowSid, pathExecutionSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExecutionContextResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExecutionContextResource object represented by the provided JSON </returns>
+    public static ExecutionContextResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExecutionContextResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The current state of the flow
+    /// </summary>
+    [JsonProperty("context")]
+    public object Context { get; private set; }
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    [JsonProperty("flow_sid")]
+    public string FlowSid { get; private set; }
+    /// <summary>
+    /// The SID of the Execution
+    /// </summary>
+    [JsonProperty("execution_sid")]
+    public string ExecutionSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private ExecutionContextResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStep/ExecutionStepContextOptions.cs b/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStep/ExecutionStepContextOptions.cs
index 2559337df..d34551d8b 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStep/ExecutionStepContextOptions.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStep/ExecutionStepContextOptions.cs
@@ -9,47 +9,47 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V1.Flow.Execution.ExecutionStep
-{
-
+{
+
+  /// <summary>
+  /// Retrieve the context for an Execution Step.
+  /// </summary>
+  public class FetchExecutionStepContextOptions : IOptions<ExecutionStepContextResource>
+  {
     /// <summary>
-    /// Retrieve the context for an Execution Step.
+    /// The SID of the Flow
     /// </summary>
-    public class FetchExecutionStepContextOptions : IOptions<ExecutionStepContextResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        public string PathExecutionSid { get; }
-        /// <summary>
-        /// Step SID
-        /// </summary>
-        public string PathStepSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchExecutionStepContextOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pathStepSid"> Step SID </param>
-        public FetchExecutionStepContextOptions(string pathFlowSid, string pathExecutionSid, string pathStepSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathExecutionSid = pathExecutionSid;
-            PathStepSid = pathStepSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Execution
+    /// </summary>
+    public string PathExecutionSid { get; }
+    /// <summary>
+    /// Step SID
+    /// </summary>
+    public string PathStepSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchExecutionStepContextOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pathStepSid"> Step SID </param>
+    public FetchExecutionStepContextOptions(string pathFlowSid, string pathExecutionSid, string pathStepSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathExecutionSid = pathExecutionSid;
+      PathStepSid = pathStepSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStep/ExecutionStepContextResource.cs b/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStep/ExecutionStepContextResource.cs
index 1b7eee366..3aec259bc 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStep/ExecutionStepContextResource.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStep/ExecutionStepContextResource.cs
@@ -16,140 +16,140 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Studio.V1.Flow.Execution.ExecutionStep
-{
-
-    public class ExecutionStepContextResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchExecutionStepContextOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Steps/" + options.PathStepSid + "/Context",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve the context for an Execution Step.
-        /// </summary>
-        /// <param name="options"> Fetch ExecutionStepContext parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionStepContext </returns>
-        public static ExecutionStepContextResource Fetch(FetchExecutionStepContextOptions options,
-                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the context for an Execution Step.
-        /// </summary>
-        /// <param name="options"> Fetch ExecutionStepContext parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionStepContext </returns>
-        public static async System.Threading.Tasks.Task<ExecutionStepContextResource> FetchAsync(FetchExecutionStepContextOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve the context for an Execution Step.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pathStepSid"> Step SID </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionStepContext </returns>
-        public static ExecutionStepContextResource Fetch(string pathFlowSid,
-                                                         string pathExecutionSid,
-                                                         string pathStepSid,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionStepContextOptions(pathFlowSid, pathExecutionSid, pathStepSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the context for an Execution Step.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pathStepSid"> Step SID </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionStepContext </returns>
-        public static async System.Threading.Tasks.Task<ExecutionStepContextResource> FetchAsync(string pathFlowSid,
-                                                                                                 string pathExecutionSid,
-                                                                                                 string pathStepSid,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionStepContextOptions(pathFlowSid, pathExecutionSid, pathStepSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExecutionStepContextResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExecutionStepContextResource object represented by the provided JSON </returns>
-        public static ExecutionStepContextResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExecutionStepContextResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The current state of the flow
-        /// </summary>
-        [JsonProperty("context")]
-        public object Context { get; private set; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        [JsonProperty("execution_sid")]
-        public string ExecutionSid { get; private set; }
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        [JsonProperty("flow_sid")]
-        public string FlowSid { get; private set; }
-        /// <summary>
-        /// Step SID
-        /// </summary>
-        [JsonProperty("step_sid")]
-        public string StepSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private ExecutionStepContextResource()
-        {
-
-        }
-    }
+{
+
+  public class ExecutionStepContextResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchExecutionStepContextOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Steps/" + options.PathStepSid + "/Context",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve the context for an Execution Step.
+    /// </summary>
+    /// <param name="options"> Fetch ExecutionStepContext parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionStepContext </returns>
+    public static ExecutionStepContextResource Fetch(FetchExecutionStepContextOptions options,
+                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the context for an Execution Step.
+    /// </summary>
+    /// <param name="options"> Fetch ExecutionStepContext parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionStepContext </returns>
+    public static async System.Threading.Tasks.Task<ExecutionStepContextResource> FetchAsync(FetchExecutionStepContextOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve the context for an Execution Step.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pathStepSid"> Step SID </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionStepContext </returns>
+    public static ExecutionStepContextResource Fetch(string pathFlowSid,
+                                                     string pathExecutionSid,
+                                                     string pathStepSid,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionStepContextOptions(pathFlowSid, pathExecutionSid, pathStepSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the context for an Execution Step.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pathStepSid"> Step SID </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionStepContext </returns>
+    public static async System.Threading.Tasks.Task<ExecutionStepContextResource> FetchAsync(string pathFlowSid,
+                                                                                             string pathExecutionSid,
+                                                                                             string pathStepSid,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionStepContextOptions(pathFlowSid, pathExecutionSid, pathStepSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExecutionStepContextResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExecutionStepContextResource object represented by the provided JSON </returns>
+    public static ExecutionStepContextResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExecutionStepContextResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The current state of the flow
+    /// </summary>
+    [JsonProperty("context")]
+    public object Context { get; private set; }
+    /// <summary>
+    /// The SID of the Execution
+    /// </summary>
+    [JsonProperty("execution_sid")]
+    public string ExecutionSid { get; private set; }
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    [JsonProperty("flow_sid")]
+    public string FlowSid { get; private set; }
+    /// <summary>
+    /// Step SID
+    /// </summary>
+    [JsonProperty("step_sid")]
+    public string StepSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private ExecutionStepContextResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStepOptions.cs b/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStepOptions.cs
index 829bdff0c..44303974d 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStepOptions.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStepOptions.cs
@@ -9,87 +9,87 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V1.Flow.Execution
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Steps for an Execution.
+  /// </summary>
+  public class ReadExecutionStepOptions : ReadOptions<ExecutionStepResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Steps for an Execution.
+    /// The SID of the Flow
     /// </summary>
-    public class ReadExecutionStepOptions : ReadOptions<ExecutionStepResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        public string PathExecutionSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadExecutionStepOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        public ReadExecutionStepOptions(string pathFlowSid, string pathExecutionSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathExecutionSid = pathExecutionSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathFlowSid { get; }
     /// <summary>
-    /// Retrieve a Step.
+    /// The SID of the Execution
     /// </summary>
-    public class FetchExecutionStepOptions : IOptions<ExecutionStepResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        public string PathExecutionSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchExecutionStepOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchExecutionStepOptions(string pathFlowSid, string pathExecutionSid, string pathSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathExecutionSid = pathExecutionSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathExecutionSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadExecutionStepOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    public ReadExecutionStepOptions(string pathFlowSid, string pathExecutionSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathExecutionSid = pathExecutionSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a Step.
+  /// </summary>
+  public class FetchExecutionStepOptions : IOptions<ExecutionStepResource>
+  {
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Execution
+    /// </summary>
+    public string PathExecutionSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchExecutionStepOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchExecutionStepOptions(string pathFlowSid, string pathExecutionSid, string pathSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathExecutionSid = pathExecutionSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStepResource.cs b/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStepResource.cs
index 0f3f15048..d1c80d3cc 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStepResource.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/Execution/ExecutionStepResource.cs
@@ -16,307 +16,307 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Studio.V1.Flow.Execution
-{
-
-    public class ExecutionStepResource : Resource
-    {
-        private static Request BuildReadRequest(ReadExecutionStepOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Steps",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Steps for an Execution.
-        /// </summary>
-        /// <param name="options"> Read ExecutionStep parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionStep </returns>
-        public static ResourceSet<ExecutionStepResource> Read(ReadExecutionStepOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ExecutionStepResource>.FromJson("steps", response.Content);
-            return new ResourceSet<ExecutionStepResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Steps for an Execution.
-        /// </summary>
-        /// <param name="options"> Read ExecutionStep parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ExecutionStepResource>> ReadAsync(ReadExecutionStepOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ExecutionStepResource>.FromJson("steps", response.Content);
-            return new ResourceSet<ExecutionStepResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Steps for an Execution.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionStep </returns>
-        public static ResourceSet<ExecutionStepResource> Read(string pathFlowSid,
-                                                              string pathExecutionSid,
-                                                              int? pageSize = null,
-                                                              long? limit = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadExecutionStepOptions(pathFlowSid, pathExecutionSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Steps for an Execution.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ExecutionStepResource>> ReadAsync(string pathFlowSid,
-                                                                                                      string pathExecutionSid,
-                                                                                                      int? pageSize = null,
-                                                                                                      long? limit = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadExecutionStepOptions(pathFlowSid, pathExecutionSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ExecutionStepResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ExecutionStepResource>.FromJson("steps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ExecutionStepResource> NextPage(Page<ExecutionStepResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<ExecutionStepResource>.FromJson("steps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ExecutionStepResource> PreviousPage(Page<ExecutionStepResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<ExecutionStepResource>.FromJson("steps", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchExecutionStepOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Steps/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a Step.
-        /// </summary>
-        /// <param name="options"> Fetch ExecutionStep parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionStep </returns>
-        public static ExecutionStepResource Fetch(FetchExecutionStepOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a Step.
-        /// </summary>
-        /// <param name="options"> Fetch ExecutionStep parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
-        public static async System.Threading.Tasks.Task<ExecutionStepResource> FetchAsync(FetchExecutionStepOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a Step.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionStep </returns>
-        public static ExecutionStepResource Fetch(string pathFlowSid,
-                                                  string pathExecutionSid,
-                                                  string pathSid,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionStepOptions(pathFlowSid, pathExecutionSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a Step.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
-        public static async System.Threading.Tasks.Task<ExecutionStepResource> FetchAsync(string pathFlowSid,
-                                                                                          string pathExecutionSid,
-                                                                                          string pathSid,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionStepOptions(pathFlowSid, pathExecutionSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExecutionStepResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExecutionStepResource object represented by the provided JSON </returns>
-        public static ExecutionStepResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExecutionStepResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        [JsonProperty("flow_sid")]
-        public string FlowSid { get; private set; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        [JsonProperty("execution_sid")]
-        public string ExecutionSid { get; private set; }
-        /// <summary>
-        /// The event that caused the Flow to transition to the Step
-        /// </summary>
-        [JsonProperty("name")]
-        public string Name { get; private set; }
-        /// <summary>
-        /// The current state of the flow
-        /// </summary>
-        [JsonProperty("context")]
-        public object Context { get; private set; }
-        /// <summary>
-        /// The Widget that preceded the Widget for the Step
-        /// </summary>
-        [JsonProperty("transitioned_from")]
-        public string TransitionedFrom { get; private set; }
-        /// <summary>
-        /// The Widget that will follow the Widget for the Step
-        /// </summary>
-        [JsonProperty("transitioned_to")]
-        public string TransitionedTo { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ExecutionStepResource()
-        {
-
-        }
-    }
+{
+
+  public class ExecutionStepResource : Resource
+  {
+    private static Request BuildReadRequest(ReadExecutionStepOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Steps",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Steps for an Execution.
+    /// </summary>
+    /// <param name="options"> Read ExecutionStep parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionStep </returns>
+    public static ResourceSet<ExecutionStepResource> Read(ReadExecutionStepOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ExecutionStepResource>.FromJson("steps", response.Content);
+      return new ResourceSet<ExecutionStepResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Steps for an Execution.
+    /// </summary>
+    /// <param name="options"> Read ExecutionStep parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ExecutionStepResource>> ReadAsync(ReadExecutionStepOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ExecutionStepResource>.FromJson("steps", response.Content);
+      return new ResourceSet<ExecutionStepResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Steps for an Execution.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionStep </returns>
+    public static ResourceSet<ExecutionStepResource> Read(string pathFlowSid,
+                                                          string pathExecutionSid,
+                                                          int? pageSize = null,
+                                                          long? limit = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadExecutionStepOptions(pathFlowSid, pathExecutionSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Steps for an Execution.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ExecutionStepResource>> ReadAsync(string pathFlowSid,
+                                                                                                  string pathExecutionSid,
+                                                                                                  int? pageSize = null,
+                                                                                                  long? limit = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadExecutionStepOptions(pathFlowSid, pathExecutionSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ExecutionStepResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ExecutionStepResource>.FromJson("steps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ExecutionStepResource> NextPage(Page<ExecutionStepResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<ExecutionStepResource>.FromJson("steps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ExecutionStepResource> PreviousPage(Page<ExecutionStepResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<ExecutionStepResource>.FromJson("steps", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchExecutionStepOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Steps/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a Step.
+    /// </summary>
+    /// <param name="options"> Fetch ExecutionStep parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionStep </returns>
+    public static ExecutionStepResource Fetch(FetchExecutionStepOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a Step.
+    /// </summary>
+    /// <param name="options"> Fetch ExecutionStep parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
+    public static async System.Threading.Tasks.Task<ExecutionStepResource> FetchAsync(FetchExecutionStepOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a Step.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionStep </returns>
+    public static ExecutionStepResource Fetch(string pathFlowSid,
+                                              string pathExecutionSid,
+                                              string pathSid,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionStepOptions(pathFlowSid, pathExecutionSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a Step.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
+    public static async System.Threading.Tasks.Task<ExecutionStepResource> FetchAsync(string pathFlowSid,
+                                                                                      string pathExecutionSid,
+                                                                                      string pathSid,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionStepOptions(pathFlowSid, pathExecutionSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExecutionStepResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExecutionStepResource object represented by the provided JSON </returns>
+    public static ExecutionStepResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExecutionStepResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    [JsonProperty("flow_sid")]
+    public string FlowSid { get; private set; }
+    /// <summary>
+    /// The SID of the Execution
+    /// </summary>
+    [JsonProperty("execution_sid")]
+    public string ExecutionSid { get; private set; }
+    /// <summary>
+    /// The event that caused the Flow to transition to the Step
+    /// </summary>
+    [JsonProperty("name")]
+    public string Name { get; private set; }
+    /// <summary>
+    /// The current state of the flow
+    /// </summary>
+    [JsonProperty("context")]
+    public object Context { get; private set; }
+    /// <summary>
+    /// The Widget that preceded the Widget for the Step
+    /// </summary>
+    [JsonProperty("transitioned_from")]
+    public string TransitionedFrom { get; private set; }
+    /// <summary>
+    /// The Widget that will follow the Widget for the Step
+    /// </summary>
+    [JsonProperty("transitioned_to")]
+    public string TransitionedTo { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ExecutionStepResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/ExecutionOptions.cs b/src/Twilio/Rest/Studio/V1/Flow/ExecutionOptions.cs
index 92772ee9e..dcc2e4602 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/ExecutionOptions.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/ExecutionOptions.cs
@@ -9,235 +9,235 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V1.Flow
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Executions for the Flow.
+  /// </summary>
+  public class ReadExecutionOptions : ReadOptions<ExecutionResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Executions for the Flow.
-    /// </summary>
-    public class ReadExecutionOptions : ReadOptions<ExecutionResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// Only show Executions that started on or after this ISO 8601 date-time
-        /// </summary>
-        public DateTime? DateCreatedFrom { get; set; }
-        /// <summary>
-        /// Only show Executions that started before this ISO 8601 date-time
-        /// </summary>
-        public DateTime? DateCreatedTo { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadExecutionOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        public ReadExecutionOptions(string pathFlowSid)
-        {
-            PathFlowSid = pathFlowSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DateCreatedFrom != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedFrom", Serializers.DateTimeIso8601(DateCreatedFrom)));
-            }
-
-            if (DateCreatedTo != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedTo", Serializers.DateTimeIso8601(DateCreatedTo)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
     /// <summary>
-    /// Retrieve an Execution
-    /// </summary>
-    public class FetchExecutionOptions : IOptions<ExecutionResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchExecutionOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to fetch </param>
-        public FetchExecutionOptions(string pathFlowSid, string pathSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Only show Executions that started on or after this ISO 8601 date-time
+    /// </summary>
+    public DateTime? DateCreatedFrom { get; set; }
     /// <summary>
-    /// Triggers a new Execution for the Flow
-    /// </summary>
-    public class CreateExecutionOptions : IOptions<ExecutionResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The Contact phone number to start a Studio Flow Execution
-        /// </summary>
-        public Types.PhoneNumber To { get; }
-        /// <summary>
-        /// The Twilio phone number or Messaging Service SID to send messages or initiate calls from during the Flow Execution
-        /// </summary>
-        public Types.PhoneNumber From { get; }
-        /// <summary>
-        /// JSON data that will be added to the Flow's context
-        /// </summary>
-        public object Parameters { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateExecutionOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="to"> The Contact phone number to start a Studio Flow Execution </param>
-        /// <param name="from"> The Twilio phone number or Messaging Service SID to send messages or initiate calls from during
-        ///            the Flow Execution </param>
-        public CreateExecutionOptions(string pathFlowSid, Types.PhoneNumber to, Types.PhoneNumber from)
-        {
-            PathFlowSid = pathFlowSid;
-            To = to;
-            From = from;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To.ToString()));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From.ToString()));
-            }
-
-            if (Parameters != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameters", Serializers.JsonObject(Parameters)));
-            }
-
-            return p;
-        }
-    }
-
+    /// Only show Executions that started before this ISO 8601 date-time
+    /// </summary>
+    public DateTime? DateCreatedTo { get; set; }
+
     /// <summary>
-    /// Delete the Execution and all Steps relating to it.
-    /// </summary>
-    public class DeleteExecutionOptions : IOptions<ExecutionResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteExecutionOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to delete </param>
-        public DeleteExecutionOptions(string pathFlowSid, string pathSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new ReadExecutionOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    public ReadExecutionOptions(string pathFlowSid)
+    {
+      PathFlowSid = pathFlowSid;
+    }
+
     /// <summary>
-    /// Update the status of an Execution to `ended`.
-    /// </summary>
-    public class UpdateExecutionOptions : IOptions<ExecutionResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The status of the Execution
-        /// </summary>
-        public ExecutionResource.StatusEnum Status { get; }
-
-        /// <summary>
-        /// Construct a new UpdateExecutionOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to update </param>
-        /// <param name="status"> The status of the Execution </param>
-        public UpdateExecutionOptions(string pathFlowSid, string pathSid, ExecutionResource.StatusEnum status)
-        {
-            PathFlowSid = pathFlowSid;
-            PathSid = pathSid;
-            Status = status;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DateCreatedFrom != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedFrom", Serializers.DateTimeIso8601(DateCreatedFrom)));
+      }
+
+      if (DateCreatedTo != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedTo", Serializers.DateTimeIso8601(DateCreatedTo)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve an Execution
+  /// </summary>
+  public class FetchExecutionOptions : IOptions<ExecutionResource>
+  {
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Execution resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchExecutionOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to fetch </param>
+    public FetchExecutionOptions(string pathFlowSid, string pathSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Triggers a new Execution for the Flow
+  /// </summary>
+  public class CreateExecutionOptions : IOptions<ExecutionResource>
+  {
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The Contact phone number to start a Studio Flow Execution
+    /// </summary>
+    public Types.PhoneNumber To { get; }
+    /// <summary>
+    /// The Twilio phone number or Messaging Service SID to send messages or initiate calls from during the Flow Execution
+    /// </summary>
+    public Types.PhoneNumber From { get; }
+    /// <summary>
+    /// JSON data that will be added to the Flow's context
+    /// </summary>
+    public object Parameters { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateExecutionOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="to"> The Contact phone number to start a Studio Flow Execution </param>
+    /// <param name="from"> The Twilio phone number or Messaging Service SID to send messages or initiate calls from during
+    ///            the Flow Execution </param>
+    public CreateExecutionOptions(string pathFlowSid, Types.PhoneNumber to, Types.PhoneNumber from)
+    {
+      PathFlowSid = pathFlowSid;
+      To = to;
+      From = from;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To.ToString()));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From.ToString()));
+      }
+
+      if (Parameters != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameters", Serializers.JsonObject(Parameters)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete the Execution and all Steps relating to it.
+  /// </summary>
+  public class DeleteExecutionOptions : IOptions<ExecutionResource>
+  {
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Execution resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteExecutionOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to delete </param>
+    public DeleteExecutionOptions(string pathFlowSid, string pathSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update the status of an Execution to `ended`.
+  /// </summary>
+  public class UpdateExecutionOptions : IOptions<ExecutionResource>
+  {
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Execution resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The status of the Execution
+    /// </summary>
+    public ExecutionResource.StatusEnum Status { get; }
+
+    /// <summary>
+    /// Construct a new UpdateExecutionOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to update </param>
+    /// <param name="status"> The status of the Execution </param>
+    public UpdateExecutionOptions(string pathFlowSid, string pathSid, ExecutionResource.StatusEnum status)
+    {
+      PathFlowSid = pathFlowSid;
+      PathSid = pathSid;
+      Status = status;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/Flow/ExecutionResource.cs b/src/Twilio/Rest/Studio/V1/Flow/ExecutionResource.cs
index 07bde698e..2fe70f221 100644
--- a/src/Twilio/Rest/Studio/V1/Flow/ExecutionResource.cs
+++ b/src/Twilio/Rest/Studio/V1/Flow/ExecutionResource.cs
@@ -17,541 +17,541 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Studio.V1.Flow
-{
-
-    public class ExecutionResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Active = new StatusEnum("active");
-            public static readonly StatusEnum Ended = new StatusEnum("ended");
-        }
-
-        private static Request BuildReadRequest(ReadExecutionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Executions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Executions for the Flow.
-        /// </summary>
-        /// <param name="options"> Read Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ResourceSet<ExecutionResource> Read(ReadExecutionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ExecutionResource>.FromJson("executions", response.Content);
-            return new ResourceSet<ExecutionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Executions for the Flow.
-        /// </summary>
-        /// <param name="options"> Read Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ExecutionResource>> ReadAsync(ReadExecutionOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ExecutionResource>.FromJson("executions", response.Content);
-            return new ResourceSet<ExecutionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Executions for the Flow.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="dateCreatedFrom"> Only show Executions that started on or after this ISO 8601 date-time </param>
-        /// <param name="dateCreatedTo"> Only show Executions that started before this ISO 8601 date-time </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ResourceSet<ExecutionResource> Read(string pathFlowSid,
-                                                          DateTime? dateCreatedFrom = null,
-                                                          DateTime? dateCreatedTo = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadExecutionOptions(pathFlowSid){DateCreatedFrom = dateCreatedFrom, DateCreatedTo = dateCreatedTo, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Executions for the Flow.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="dateCreatedFrom"> Only show Executions that started on or after this ISO 8601 date-time </param>
-        /// <param name="dateCreatedTo"> Only show Executions that started before this ISO 8601 date-time </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ExecutionResource>> ReadAsync(string pathFlowSid,
-                                                                                                  DateTime? dateCreatedFrom = null,
-                                                                                                  DateTime? dateCreatedTo = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadExecutionOptions(pathFlowSid){DateCreatedFrom = dateCreatedFrom, DateCreatedTo = dateCreatedTo, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ExecutionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ExecutionResource>.FromJson("executions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ExecutionResource> NextPage(Page<ExecutionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<ExecutionResource>.FromJson("executions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ExecutionResource> PreviousPage(Page<ExecutionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<ExecutionResource>.FromJson("executions", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchExecutionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve an Execution
-        /// </summary>
-        /// <param name="options"> Fetch Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ExecutionResource Fetch(FetchExecutionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve an Execution
-        /// </summary>
-        /// <param name="options"> Fetch Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ExecutionResource> FetchAsync(FetchExecutionOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve an Execution
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ExecutionResource Fetch(string pathFlowSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionOptions(pathFlowSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve an Execution
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ExecutionResource> FetchAsync(string pathFlowSid,
-                                                                                      string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionOptions(pathFlowSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateExecutionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Executions",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Triggers a new Execution for the Flow
-        /// </summary>
-        /// <param name="options"> Create Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ExecutionResource Create(CreateExecutionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Triggers a new Execution for the Flow
-        /// </summary>
-        /// <param name="options"> Create Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ExecutionResource> CreateAsync(CreateExecutionOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Triggers a new Execution for the Flow
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="to"> The Contact phone number to start a Studio Flow Execution </param>
-        /// <param name="from"> The Twilio phone number or Messaging Service SID to send messages or initiate calls from during
-        ///            the Flow Execution </param>
-        /// <param name="parameters"> JSON data that will be added to the Flow's context </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ExecutionResource Create(string pathFlowSid,
-                                               Types.PhoneNumber to,
-                                               Types.PhoneNumber from,
-                                               object parameters = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateExecutionOptions(pathFlowSid, to, from){Parameters = parameters};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Triggers a new Execution for the Flow
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="to"> The Contact phone number to start a Studio Flow Execution </param>
-        /// <param name="from"> The Twilio phone number or Messaging Service SID to send messages or initiate calls from during
-        ///            the Flow Execution </param>
-        /// <param name="parameters"> JSON data that will be added to the Flow's context </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ExecutionResource> CreateAsync(string pathFlowSid,
-                                                                                       Types.PhoneNumber to,
-                                                                                       Types.PhoneNumber from,
-                                                                                       object parameters = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateExecutionOptions(pathFlowSid, to, from){Parameters = parameters};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteExecutionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete the Execution and all Steps relating to it.
-        /// </summary>
-        /// <param name="options"> Delete Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static bool Delete(DeleteExecutionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete the Execution and all Steps relating to it.
-        /// </summary>
-        /// <param name="options"> Delete Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteExecutionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete the Execution and all Steps relating to it.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static bool Delete(string pathFlowSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteExecutionOptions(pathFlowSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete the Execution and all Steps relating to it.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFlowSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteExecutionOptions(pathFlowSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateExecutionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update the status of an Execution to `ended`.
-        /// </summary>
-        /// <param name="options"> Update Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ExecutionResource Update(UpdateExecutionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the status of an Execution to `ended`.
-        /// </summary>
-        /// <param name="options"> Update Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ExecutionResource> UpdateAsync(UpdateExecutionOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update the status of an Execution to `ended`.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to update </param>
-        /// <param name="status"> The status of the Execution </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ExecutionResource Update(string pathFlowSid,
-                                               string pathSid,
-                                               ExecutionResource.StatusEnum status,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateExecutionOptions(pathFlowSid, pathSid, status);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the status of an Execution to `ended`.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to update </param>
-        /// <param name="status"> The status of the Execution </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ExecutionResource> UpdateAsync(string pathFlowSid,
-                                                                                       string pathSid,
-                                                                                       ExecutionResource.StatusEnum status,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateExecutionOptions(pathFlowSid, pathSid, status);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExecutionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExecutionResource object represented by the provided JSON </returns>
-        public static ExecutionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExecutionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        [JsonProperty("flow_sid")]
-        public string FlowSid { get; private set; }
-        /// <summary>
-        /// The SID of the Contact
-        /// </summary>
-        [JsonProperty("contact_sid")]
-        public string ContactSid { get; private set; }
-        /// <summary>
-        /// The phone number, SIP address or Client identifier that triggered the Execution
-        /// </summary>
-        [JsonProperty("contact_channel_address")]
-        public string ContactChannelAddress { get; private set; }
-        /// <summary>
-        /// The current state of the flow
-        /// </summary>
-        [JsonProperty("context")]
-        public object Context { get; private set; }
-        /// <summary>
-        /// The status of the Execution
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ExecutionResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Nested resource URLs
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ExecutionResource()
-        {
-
-        }
-    }
+{
+
+  public class ExecutionResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Active = new StatusEnum("active");
+      public static readonly StatusEnum Ended = new StatusEnum("ended");
+    }
+
+    private static Request BuildReadRequest(ReadExecutionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Executions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Executions for the Flow.
+    /// </summary>
+    /// <param name="options"> Read Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ResourceSet<ExecutionResource> Read(ReadExecutionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ExecutionResource>.FromJson("executions", response.Content);
+      return new ResourceSet<ExecutionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Executions for the Flow.
+    /// </summary>
+    /// <param name="options"> Read Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ExecutionResource>> ReadAsync(ReadExecutionOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ExecutionResource>.FromJson("executions", response.Content);
+      return new ResourceSet<ExecutionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Executions for the Flow.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="dateCreatedFrom"> Only show Executions that started on or after this ISO 8601 date-time </param>
+    /// <param name="dateCreatedTo"> Only show Executions that started before this ISO 8601 date-time </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ResourceSet<ExecutionResource> Read(string pathFlowSid,
+                                                      DateTime? dateCreatedFrom = null,
+                                                      DateTime? dateCreatedTo = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadExecutionOptions(pathFlowSid) { DateCreatedFrom = dateCreatedFrom, DateCreatedTo = dateCreatedTo, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Executions for the Flow.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="dateCreatedFrom"> Only show Executions that started on or after this ISO 8601 date-time </param>
+    /// <param name="dateCreatedTo"> Only show Executions that started before this ISO 8601 date-time </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ExecutionResource>> ReadAsync(string pathFlowSid,
+                                                                                              DateTime? dateCreatedFrom = null,
+                                                                                              DateTime? dateCreatedTo = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadExecutionOptions(pathFlowSid) { DateCreatedFrom = dateCreatedFrom, DateCreatedTo = dateCreatedTo, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ExecutionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ExecutionResource>.FromJson("executions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ExecutionResource> NextPage(Page<ExecutionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<ExecutionResource>.FromJson("executions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ExecutionResource> PreviousPage(Page<ExecutionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<ExecutionResource>.FromJson("executions", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchExecutionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve an Execution
+    /// </summary>
+    /// <param name="options"> Fetch Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ExecutionResource Fetch(FetchExecutionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve an Execution
+    /// </summary>
+    /// <param name="options"> Fetch Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ExecutionResource> FetchAsync(FetchExecutionOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve an Execution
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ExecutionResource Fetch(string pathFlowSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionOptions(pathFlowSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve an Execution
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ExecutionResource> FetchAsync(string pathFlowSid,
+                                                                                  string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionOptions(pathFlowSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateExecutionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Executions",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Triggers a new Execution for the Flow
+    /// </summary>
+    /// <param name="options"> Create Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ExecutionResource Create(CreateExecutionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Triggers a new Execution for the Flow
+    /// </summary>
+    /// <param name="options"> Create Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ExecutionResource> CreateAsync(CreateExecutionOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Triggers a new Execution for the Flow
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="to"> The Contact phone number to start a Studio Flow Execution </param>
+    /// <param name="from"> The Twilio phone number or Messaging Service SID to send messages or initiate calls from during
+    ///            the Flow Execution </param>
+    /// <param name="parameters"> JSON data that will be added to the Flow's context </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ExecutionResource Create(string pathFlowSid,
+                                           Types.PhoneNumber to,
+                                           Types.PhoneNumber from,
+                                           object parameters = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateExecutionOptions(pathFlowSid, to, from) { Parameters = parameters };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Triggers a new Execution for the Flow
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="to"> The Contact phone number to start a Studio Flow Execution </param>
+    /// <param name="from"> The Twilio phone number or Messaging Service SID to send messages or initiate calls from during
+    ///            the Flow Execution </param>
+    /// <param name="parameters"> JSON data that will be added to the Flow's context </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ExecutionResource> CreateAsync(string pathFlowSid,
+                                                                                   Types.PhoneNumber to,
+                                                                                   Types.PhoneNumber from,
+                                                                                   object parameters = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateExecutionOptions(pathFlowSid, to, from) { Parameters = parameters };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteExecutionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete the Execution and all Steps relating to it.
+    /// </summary>
+    /// <param name="options"> Delete Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static bool Delete(DeleteExecutionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete the Execution and all Steps relating to it.
+    /// </summary>
+    /// <param name="options"> Delete Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteExecutionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete the Execution and all Steps relating to it.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static bool Delete(string pathFlowSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteExecutionOptions(pathFlowSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete the Execution and all Steps relating to it.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFlowSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteExecutionOptions(pathFlowSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateExecutionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathFlowSid + "/Executions/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update the status of an Execution to `ended`.
+    /// </summary>
+    /// <param name="options"> Update Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ExecutionResource Update(UpdateExecutionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the status of an Execution to `ended`.
+    /// </summary>
+    /// <param name="options"> Update Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ExecutionResource> UpdateAsync(UpdateExecutionOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update the status of an Execution to `ended`.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to update </param>
+    /// <param name="status"> The status of the Execution </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ExecutionResource Update(string pathFlowSid,
+                                           string pathSid,
+                                           ExecutionResource.StatusEnum status,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateExecutionOptions(pathFlowSid, pathSid, status);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the status of an Execution to `ended`.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to update </param>
+    /// <param name="status"> The status of the Execution </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ExecutionResource> UpdateAsync(string pathFlowSid,
+                                                                                   string pathSid,
+                                                                                   ExecutionResource.StatusEnum status,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateExecutionOptions(pathFlowSid, pathSid, status);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExecutionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExecutionResource object represented by the provided JSON </returns>
+    public static ExecutionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExecutionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    [JsonProperty("flow_sid")]
+    public string FlowSid { get; private set; }
+    /// <summary>
+    /// The SID of the Contact
+    /// </summary>
+    [JsonProperty("contact_sid")]
+    public string ContactSid { get; private set; }
+    /// <summary>
+    /// The phone number, SIP address or Client identifier that triggered the Execution
+    /// </summary>
+    [JsonProperty("contact_channel_address")]
+    public string ContactChannelAddress { get; private set; }
+    /// <summary>
+    /// The current state of the flow
+    /// </summary>
+    [JsonProperty("context")]
+    public object Context { get; private set; }
+    /// <summary>
+    /// The status of the Execution
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ExecutionResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Nested resource URLs
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ExecutionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/FlowOptions.cs b/src/Twilio/Rest/Studio/V1/FlowOptions.cs
index 96023ff9a..8051045d2 100644
--- a/src/Twilio/Rest/Studio/V1/FlowOptions.cs
+++ b/src/Twilio/Rest/Studio/V1/FlowOptions.cs
@@ -9,84 +9,84 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V1
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Flows.
+  /// </summary>
+  public class ReadFlowOptions : ReadOptions<FlowResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Flows.
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadFlowOptions : ReadOptions<FlowResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a specific Flow.
+  /// </summary>
+  public class FetchFlowOptions : IOptions<FlowResource>
+  {
     /// <summary>
-    /// Retrieve a specific Flow.
+    /// The SID that identifies the resource to fetch
     /// </summary>
-    public class FetchFlowOptions : IOptions<FlowResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFlowOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchFlowOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// Delete a specific Flow.
+    /// Construct a new FetchFlowOptions
     /// </summary>
-    public class DeleteFlowOptions : IOptions<FlowResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFlowOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeleteFlowOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchFlowOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Flow.
+  /// </summary>
+  public class DeleteFlowOptions : IOptions<FlowResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteFlowOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeleteFlowOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V1/FlowResource.cs b/src/Twilio/Rest/Studio/V1/FlowResource.cs
index 654bb0863..d7d512a1f 100644
--- a/src/Twilio/Rest/Studio/V1/FlowResource.cs
+++ b/src/Twilio/Rest/Studio/V1/FlowResource.cs
@@ -17,354 +17,354 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Studio.V1
-{
-
-    public class FlowResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Draft = new StatusEnum("draft");
-            public static readonly StatusEnum Published = new StatusEnum("published");
-        }
-
-        private static Request BuildReadRequest(ReadFlowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Flows.
-        /// </summary>
-        /// <param name="options"> Read Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static ResourceSet<FlowResource> Read(ReadFlowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FlowResource>.FromJson("flows", response.Content);
-            return new ResourceSet<FlowResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Flows.
-        /// </summary>
-        /// <param name="options"> Read Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FlowResource>> ReadAsync(ReadFlowOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FlowResource>.FromJson("flows", response.Content);
-            return new ResourceSet<FlowResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Flows.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static ResourceSet<FlowResource> Read(int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadFlowOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Flows.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FlowResource>> ReadAsync(int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadFlowOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FlowResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FlowResource>.FromJson("flows", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FlowResource> NextPage(Page<FlowResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<FlowResource>.FromJson("flows", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FlowResource> PreviousPage(Page<FlowResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<FlowResource>.FromJson("flows", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchFlowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a specific Flow.
-        /// </summary>
-        /// <param name="options"> Fetch Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static FlowResource Fetch(FetchFlowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Flow.
-        /// </summary>
-        /// <param name="options"> Fetch Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<FlowResource> FetchAsync(FetchFlowOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a specific Flow.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static FlowResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchFlowOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Flow.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<FlowResource> FetchAsync(string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchFlowOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteFlowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Studio,
-                "/v1/Flows/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Flow.
-        /// </summary>
-        /// <param name="options"> Delete Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static bool Delete(DeleteFlowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Flow.
-        /// </summary>
-        /// <param name="options"> Delete Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFlowOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Flow.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFlowOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Flow.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFlowOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FlowResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FlowResource object represented by the provided JSON </returns>
-        public static FlowResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FlowResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the Flow
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The status of the Flow
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FlowResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The latest version number of the Flow's definition
-        /// </summary>
-        [JsonProperty("version")]
-        public int? Version { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Nested resource URLs
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private FlowResource()
-        {
-
-        }
-    }
+{
+
+  public class FlowResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Draft = new StatusEnum("draft");
+      public static readonly StatusEnum Published = new StatusEnum("published");
+    }
+
+    private static Request BuildReadRequest(ReadFlowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Flows.
+    /// </summary>
+    /// <param name="options"> Read Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static ResourceSet<FlowResource> Read(ReadFlowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FlowResource>.FromJson("flows", response.Content);
+      return new ResourceSet<FlowResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Flows.
+    /// </summary>
+    /// <param name="options"> Read Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FlowResource>> ReadAsync(ReadFlowOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FlowResource>.FromJson("flows", response.Content);
+      return new ResourceSet<FlowResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Flows.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static ResourceSet<FlowResource> Read(int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadFlowOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Flows.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FlowResource>> ReadAsync(int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadFlowOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FlowResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FlowResource>.FromJson("flows", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FlowResource> NextPage(Page<FlowResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<FlowResource>.FromJson("flows", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FlowResource> PreviousPage(Page<FlowResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<FlowResource>.FromJson("flows", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchFlowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a specific Flow.
+    /// </summary>
+    /// <param name="options"> Fetch Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static FlowResource Fetch(FetchFlowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Flow.
+    /// </summary>
+    /// <param name="options"> Fetch Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<FlowResource> FetchAsync(FetchFlowOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a specific Flow.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static FlowResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchFlowOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Flow.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<FlowResource> FetchAsync(string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchFlowOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteFlowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Studio,
+          "/v1/Flows/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Flow.
+    /// </summary>
+    /// <param name="options"> Delete Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static bool Delete(DeleteFlowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Flow.
+    /// </summary>
+    /// <param name="options"> Delete Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFlowOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Flow.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFlowOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Flow.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFlowOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FlowResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FlowResource object represented by the provided JSON </returns>
+    public static FlowResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FlowResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the Flow
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The status of the Flow
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FlowResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The latest version number of the Flow's definition
+    /// </summary>
+    [JsonProperty("version")]
+    public int? Version { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Nested resource URLs
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private FlowResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionContextOptions.cs b/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionContextOptions.cs
index ec7879e18..44f4793f2 100644
--- a/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionContextOptions.cs
+++ b/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionContextOptions.cs
@@ -9,41 +9,41 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V2.Flow.Execution
-{
-
+{
+
+  /// <summary>
+  /// Retrieve the most recent context for an Execution.
+  /// </summary>
+  public class FetchExecutionContextOptions : IOptions<ExecutionContextResource>
+  {
     /// <summary>
-    /// Retrieve the most recent context for an Execution.
+    /// The SID of the Flow
     /// </summary>
-    public class FetchExecutionContextOptions : IOptions<ExecutionContextResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        public string PathExecutionSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchExecutionContextOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        public FetchExecutionContextOptions(string pathFlowSid, string pathExecutionSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathExecutionSid = pathExecutionSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Execution
+    /// </summary>
+    public string PathExecutionSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchExecutionContextOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    public FetchExecutionContextOptions(string pathFlowSid, string pathExecutionSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathExecutionSid = pathExecutionSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionContextResource.cs b/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionContextResource.cs
index 05d850306..5a286952a 100644
--- a/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionContextResource.cs
+++ b/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionContextResource.cs
@@ -16,130 +16,130 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Studio.V2.Flow.Execution
-{
-
-    public class ExecutionContextResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchExecutionContextOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Context",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve the most recent context for an Execution.
-        /// </summary>
-        /// <param name="options"> Fetch ExecutionContext parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionContext </returns>
-        public static ExecutionContextResource Fetch(FetchExecutionContextOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the most recent context for an Execution.
-        /// </summary>
-        /// <param name="options"> Fetch ExecutionContext parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionContext </returns>
-        public static async System.Threading.Tasks.Task<ExecutionContextResource> FetchAsync(FetchExecutionContextOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve the most recent context for an Execution.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionContext </returns>
-        public static ExecutionContextResource Fetch(string pathFlowSid,
-                                                     string pathExecutionSid,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionContextOptions(pathFlowSid, pathExecutionSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the most recent context for an Execution.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionContext </returns>
-        public static async System.Threading.Tasks.Task<ExecutionContextResource> FetchAsync(string pathFlowSid,
-                                                                                             string pathExecutionSid,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionContextOptions(pathFlowSid, pathExecutionSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExecutionContextResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExecutionContextResource object represented by the provided JSON </returns>
-        public static ExecutionContextResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExecutionContextResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The current state of the flow
-        /// </summary>
-        [JsonProperty("context")]
-        public object Context { get; private set; }
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        [JsonProperty("flow_sid")]
-        public string FlowSid { get; private set; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        [JsonProperty("execution_sid")]
-        public string ExecutionSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private ExecutionContextResource()
-        {
-
-        }
-    }
+{
+
+  public class ExecutionContextResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchExecutionContextOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Context",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve the most recent context for an Execution.
+    /// </summary>
+    /// <param name="options"> Fetch ExecutionContext parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionContext </returns>
+    public static ExecutionContextResource Fetch(FetchExecutionContextOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the most recent context for an Execution.
+    /// </summary>
+    /// <param name="options"> Fetch ExecutionContext parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionContext </returns>
+    public static async System.Threading.Tasks.Task<ExecutionContextResource> FetchAsync(FetchExecutionContextOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve the most recent context for an Execution.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionContext </returns>
+    public static ExecutionContextResource Fetch(string pathFlowSid,
+                                                 string pathExecutionSid,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionContextOptions(pathFlowSid, pathExecutionSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the most recent context for an Execution.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionContext </returns>
+    public static async System.Threading.Tasks.Task<ExecutionContextResource> FetchAsync(string pathFlowSid,
+                                                                                         string pathExecutionSid,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionContextOptions(pathFlowSid, pathExecutionSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExecutionContextResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExecutionContextResource object represented by the provided JSON </returns>
+    public static ExecutionContextResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExecutionContextResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The current state of the flow
+    /// </summary>
+    [JsonProperty("context")]
+    public object Context { get; private set; }
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    [JsonProperty("flow_sid")]
+    public string FlowSid { get; private set; }
+    /// <summary>
+    /// The SID of the Execution
+    /// </summary>
+    [JsonProperty("execution_sid")]
+    public string ExecutionSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private ExecutionContextResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStep/ExecutionStepContextOptions.cs b/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStep/ExecutionStepContextOptions.cs
index fc959ceed..2812b28b8 100644
--- a/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStep/ExecutionStepContextOptions.cs
+++ b/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStep/ExecutionStepContextOptions.cs
@@ -9,47 +9,47 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V2.Flow.Execution.ExecutionStep
-{
-
+{
+
+  /// <summary>
+  /// Retrieve the context for an Execution Step.
+  /// </summary>
+  public class FetchExecutionStepContextOptions : IOptions<ExecutionStepContextResource>
+  {
     /// <summary>
-    /// Retrieve the context for an Execution Step.
+    /// The SID of the Flow
     /// </summary>
-    public class FetchExecutionStepContextOptions : IOptions<ExecutionStepContextResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        public string PathExecutionSid { get; }
-        /// <summary>
-        /// Step SID
-        /// </summary>
-        public string PathStepSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchExecutionStepContextOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pathStepSid"> Step SID </param>
-        public FetchExecutionStepContextOptions(string pathFlowSid, string pathExecutionSid, string pathStepSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathExecutionSid = pathExecutionSid;
-            PathStepSid = pathStepSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Execution
+    /// </summary>
+    public string PathExecutionSid { get; }
+    /// <summary>
+    /// Step SID
+    /// </summary>
+    public string PathStepSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchExecutionStepContextOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pathStepSid"> Step SID </param>
+    public FetchExecutionStepContextOptions(string pathFlowSid, string pathExecutionSid, string pathStepSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathExecutionSid = pathExecutionSid;
+      PathStepSid = pathStepSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStep/ExecutionStepContextResource.cs b/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStep/ExecutionStepContextResource.cs
index 6862d1ac6..5f3a83c94 100644
--- a/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStep/ExecutionStepContextResource.cs
+++ b/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStep/ExecutionStepContextResource.cs
@@ -16,140 +16,140 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Studio.V2.Flow.Execution.ExecutionStep
-{
-
-    public class ExecutionStepContextResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchExecutionStepContextOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Steps/" + options.PathStepSid + "/Context",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve the context for an Execution Step.
-        /// </summary>
-        /// <param name="options"> Fetch ExecutionStepContext parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionStepContext </returns>
-        public static ExecutionStepContextResource Fetch(FetchExecutionStepContextOptions options,
-                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the context for an Execution Step.
-        /// </summary>
-        /// <param name="options"> Fetch ExecutionStepContext parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionStepContext </returns>
-        public static async System.Threading.Tasks.Task<ExecutionStepContextResource> FetchAsync(FetchExecutionStepContextOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve the context for an Execution Step.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pathStepSid"> Step SID </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionStepContext </returns>
-        public static ExecutionStepContextResource Fetch(string pathFlowSid,
-                                                         string pathExecutionSid,
-                                                         string pathStepSid,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionStepContextOptions(pathFlowSid, pathExecutionSid, pathStepSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve the context for an Execution Step.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pathStepSid"> Step SID </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionStepContext </returns>
-        public static async System.Threading.Tasks.Task<ExecutionStepContextResource> FetchAsync(string pathFlowSid,
-                                                                                                 string pathExecutionSid,
-                                                                                                 string pathStepSid,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionStepContextOptions(pathFlowSid, pathExecutionSid, pathStepSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExecutionStepContextResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExecutionStepContextResource object represented by the provided JSON </returns>
-        public static ExecutionStepContextResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExecutionStepContextResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The current state of the flow
-        /// </summary>
-        [JsonProperty("context")]
-        public object Context { get; private set; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        [JsonProperty("execution_sid")]
-        public string ExecutionSid { get; private set; }
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        [JsonProperty("flow_sid")]
-        public string FlowSid { get; private set; }
-        /// <summary>
-        /// Step SID
-        /// </summary>
-        [JsonProperty("step_sid")]
-        public string StepSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private ExecutionStepContextResource()
-        {
-
-        }
-    }
+{
+
+  public class ExecutionStepContextResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchExecutionStepContextOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Steps/" + options.PathStepSid + "/Context",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve the context for an Execution Step.
+    /// </summary>
+    /// <param name="options"> Fetch ExecutionStepContext parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionStepContext </returns>
+    public static ExecutionStepContextResource Fetch(FetchExecutionStepContextOptions options,
+                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the context for an Execution Step.
+    /// </summary>
+    /// <param name="options"> Fetch ExecutionStepContext parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionStepContext </returns>
+    public static async System.Threading.Tasks.Task<ExecutionStepContextResource> FetchAsync(FetchExecutionStepContextOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve the context for an Execution Step.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pathStepSid"> Step SID </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionStepContext </returns>
+    public static ExecutionStepContextResource Fetch(string pathFlowSid,
+                                                     string pathExecutionSid,
+                                                     string pathStepSid,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionStepContextOptions(pathFlowSid, pathExecutionSid, pathStepSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve the context for an Execution Step.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pathStepSid"> Step SID </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionStepContext </returns>
+    public static async System.Threading.Tasks.Task<ExecutionStepContextResource> FetchAsync(string pathFlowSid,
+                                                                                             string pathExecutionSid,
+                                                                                             string pathStepSid,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionStepContextOptions(pathFlowSid, pathExecutionSid, pathStepSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExecutionStepContextResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExecutionStepContextResource object represented by the provided JSON </returns>
+    public static ExecutionStepContextResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExecutionStepContextResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The current state of the flow
+    /// </summary>
+    [JsonProperty("context")]
+    public object Context { get; private set; }
+    /// <summary>
+    /// The SID of the Execution
+    /// </summary>
+    [JsonProperty("execution_sid")]
+    public string ExecutionSid { get; private set; }
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    [JsonProperty("flow_sid")]
+    public string FlowSid { get; private set; }
+    /// <summary>
+    /// Step SID
+    /// </summary>
+    [JsonProperty("step_sid")]
+    public string StepSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private ExecutionStepContextResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStepOptions.cs b/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStepOptions.cs
index 1529e6353..48c62c768 100644
--- a/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStepOptions.cs
+++ b/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStepOptions.cs
@@ -9,87 +9,87 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V2.Flow.Execution
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Steps for an Execution.
+  /// </summary>
+  public class ReadExecutionStepOptions : ReadOptions<ExecutionStepResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Steps for an Execution.
+    /// The SID of the Flow
     /// </summary>
-    public class ReadExecutionStepOptions : ReadOptions<ExecutionStepResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        public string PathExecutionSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadExecutionStepOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        public ReadExecutionStepOptions(string pathFlowSid, string pathExecutionSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathExecutionSid = pathExecutionSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathFlowSid { get; }
     /// <summary>
-    /// Retrieve a Step.
+    /// The SID of the Execution
     /// </summary>
-    public class FetchExecutionStepOptions : IOptions<ExecutionStepResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        public string PathExecutionSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchExecutionStepOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchExecutionStepOptions(string pathFlowSid, string pathExecutionSid, string pathSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathExecutionSid = pathExecutionSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathExecutionSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadExecutionStepOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    public ReadExecutionStepOptions(string pathFlowSid, string pathExecutionSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathExecutionSid = pathExecutionSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a Step.
+  /// </summary>
+  public class FetchExecutionStepOptions : IOptions<ExecutionStepResource>
+  {
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Execution
+    /// </summary>
+    public string PathExecutionSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchExecutionStepOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchExecutionStepOptions(string pathFlowSid, string pathExecutionSid, string pathSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathExecutionSid = pathExecutionSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStepResource.cs b/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStepResource.cs
index c61d396f0..51c8da820 100644
--- a/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStepResource.cs
+++ b/src/Twilio/Rest/Studio/V2/Flow/Execution/ExecutionStepResource.cs
@@ -16,307 +16,307 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Studio.V2.Flow.Execution
-{
-
-    public class ExecutionStepResource : Resource
-    {
-        private static Request BuildReadRequest(ReadExecutionStepOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Steps",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Steps for an Execution.
-        /// </summary>
-        /// <param name="options"> Read ExecutionStep parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionStep </returns>
-        public static ResourceSet<ExecutionStepResource> Read(ReadExecutionStepOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ExecutionStepResource>.FromJson("steps", response.Content);
-            return new ResourceSet<ExecutionStepResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Steps for an Execution.
-        /// </summary>
-        /// <param name="options"> Read ExecutionStep parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ExecutionStepResource>> ReadAsync(ReadExecutionStepOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ExecutionStepResource>.FromJson("steps", response.Content);
-            return new ResourceSet<ExecutionStepResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Steps for an Execution.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionStep </returns>
-        public static ResourceSet<ExecutionStepResource> Read(string pathFlowSid,
-                                                              string pathExecutionSid,
-                                                              int? pageSize = null,
-                                                              long? limit = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadExecutionStepOptions(pathFlowSid, pathExecutionSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Steps for an Execution.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ExecutionStepResource>> ReadAsync(string pathFlowSid,
-                                                                                                      string pathExecutionSid,
-                                                                                                      int? pageSize = null,
-                                                                                                      long? limit = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadExecutionStepOptions(pathFlowSid, pathExecutionSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ExecutionStepResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ExecutionStepResource>.FromJson("steps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ExecutionStepResource> NextPage(Page<ExecutionStepResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<ExecutionStepResource>.FromJson("steps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ExecutionStepResource> PreviousPage(Page<ExecutionStepResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<ExecutionStepResource>.FromJson("steps", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchExecutionStepOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Steps/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a Step.
-        /// </summary>
-        /// <param name="options"> Fetch ExecutionStep parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionStep </returns>
-        public static ExecutionStepResource Fetch(FetchExecutionStepOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a Step.
-        /// </summary>
-        /// <param name="options"> Fetch ExecutionStep parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
-        public static async System.Threading.Tasks.Task<ExecutionStepResource> FetchAsync(FetchExecutionStepOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a Step.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ExecutionStep </returns>
-        public static ExecutionStepResource Fetch(string pathFlowSid,
-                                                  string pathExecutionSid,
-                                                  string pathSid,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionStepOptions(pathFlowSid, pathExecutionSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a Step.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathExecutionSid"> The SID of the Execution </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
-        public static async System.Threading.Tasks.Task<ExecutionStepResource> FetchAsync(string pathFlowSid,
-                                                                                          string pathExecutionSid,
-                                                                                          string pathSid,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionStepOptions(pathFlowSid, pathExecutionSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExecutionStepResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExecutionStepResource object represented by the provided JSON </returns>
-        public static ExecutionStepResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExecutionStepResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        [JsonProperty("flow_sid")]
-        public string FlowSid { get; private set; }
-        /// <summary>
-        /// The SID of the Execution
-        /// </summary>
-        [JsonProperty("execution_sid")]
-        public string ExecutionSid { get; private set; }
-        /// <summary>
-        /// The event that caused the Flow to transition to the Step
-        /// </summary>
-        [JsonProperty("name")]
-        public string Name { get; private set; }
-        /// <summary>
-        /// The current state of the flow
-        /// </summary>
-        [JsonProperty("context")]
-        public object Context { get; private set; }
-        /// <summary>
-        /// The Widget that preceded the Widget for the Step
-        /// </summary>
-        [JsonProperty("transitioned_from")]
-        public string TransitionedFrom { get; private set; }
-        /// <summary>
-        /// The Widget that will follow the Widget for the Step
-        /// </summary>
-        [JsonProperty("transitioned_to")]
-        public string TransitionedTo { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ExecutionStepResource()
-        {
-
-        }
-    }
+{
+
+  public class ExecutionStepResource : Resource
+  {
+    private static Request BuildReadRequest(ReadExecutionStepOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Steps",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Steps for an Execution.
+    /// </summary>
+    /// <param name="options"> Read ExecutionStep parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionStep </returns>
+    public static ResourceSet<ExecutionStepResource> Read(ReadExecutionStepOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ExecutionStepResource>.FromJson("steps", response.Content);
+      return new ResourceSet<ExecutionStepResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Steps for an Execution.
+    /// </summary>
+    /// <param name="options"> Read ExecutionStep parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ExecutionStepResource>> ReadAsync(ReadExecutionStepOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ExecutionStepResource>.FromJson("steps", response.Content);
+      return new ResourceSet<ExecutionStepResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Steps for an Execution.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionStep </returns>
+    public static ResourceSet<ExecutionStepResource> Read(string pathFlowSid,
+                                                          string pathExecutionSid,
+                                                          int? pageSize = null,
+                                                          long? limit = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadExecutionStepOptions(pathFlowSid, pathExecutionSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Steps for an Execution.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ExecutionStepResource>> ReadAsync(string pathFlowSid,
+                                                                                                  string pathExecutionSid,
+                                                                                                  int? pageSize = null,
+                                                                                                  long? limit = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadExecutionStepOptions(pathFlowSid, pathExecutionSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ExecutionStepResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ExecutionStepResource>.FromJson("steps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ExecutionStepResource> NextPage(Page<ExecutionStepResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<ExecutionStepResource>.FromJson("steps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ExecutionStepResource> PreviousPage(Page<ExecutionStepResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<ExecutionStepResource>.FromJson("steps", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchExecutionStepOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathExecutionSid + "/Steps/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a Step.
+    /// </summary>
+    /// <param name="options"> Fetch ExecutionStep parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionStep </returns>
+    public static ExecutionStepResource Fetch(FetchExecutionStepOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a Step.
+    /// </summary>
+    /// <param name="options"> Fetch ExecutionStep parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
+    public static async System.Threading.Tasks.Task<ExecutionStepResource> FetchAsync(FetchExecutionStepOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a Step.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ExecutionStep </returns>
+    public static ExecutionStepResource Fetch(string pathFlowSid,
+                                              string pathExecutionSid,
+                                              string pathSid,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionStepOptions(pathFlowSid, pathExecutionSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a Step.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathExecutionSid"> The SID of the Execution </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ExecutionStep </returns>
+    public static async System.Threading.Tasks.Task<ExecutionStepResource> FetchAsync(string pathFlowSid,
+                                                                                      string pathExecutionSid,
+                                                                                      string pathSid,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionStepOptions(pathFlowSid, pathExecutionSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExecutionStepResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExecutionStepResource object represented by the provided JSON </returns>
+    public static ExecutionStepResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExecutionStepResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    [JsonProperty("flow_sid")]
+    public string FlowSid { get; private set; }
+    /// <summary>
+    /// The SID of the Execution
+    /// </summary>
+    [JsonProperty("execution_sid")]
+    public string ExecutionSid { get; private set; }
+    /// <summary>
+    /// The event that caused the Flow to transition to the Step
+    /// </summary>
+    [JsonProperty("name")]
+    public string Name { get; private set; }
+    /// <summary>
+    /// The current state of the flow
+    /// </summary>
+    [JsonProperty("context")]
+    public object Context { get; private set; }
+    /// <summary>
+    /// The Widget that preceded the Widget for the Step
+    /// </summary>
+    [JsonProperty("transitioned_from")]
+    public string TransitionedFrom { get; private set; }
+    /// <summary>
+    /// The Widget that will follow the Widget for the Step
+    /// </summary>
+    [JsonProperty("transitioned_to")]
+    public string TransitionedTo { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ExecutionStepResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/Flow/ExecutionOptions.cs b/src/Twilio/Rest/Studio/V2/Flow/ExecutionOptions.cs
index 6f20b063f..f52eec831 100644
--- a/src/Twilio/Rest/Studio/V2/Flow/ExecutionOptions.cs
+++ b/src/Twilio/Rest/Studio/V2/Flow/ExecutionOptions.cs
@@ -9,235 +9,235 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V2.Flow
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Executions for the Flow.
+  /// </summary>
+  public class ReadExecutionOptions : ReadOptions<ExecutionResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Executions for the Flow.
-    /// </summary>
-    public class ReadExecutionOptions : ReadOptions<ExecutionResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// Only show Executions that started on or after this ISO 8601 date-time
-        /// </summary>
-        public DateTime? DateCreatedFrom { get; set; }
-        /// <summary>
-        /// Only show Executions that started before this ISO 8601 date-time
-        /// </summary>
-        public DateTime? DateCreatedTo { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadExecutionOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        public ReadExecutionOptions(string pathFlowSid)
-        {
-            PathFlowSid = pathFlowSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DateCreatedFrom != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedFrom", Serializers.DateTimeIso8601(DateCreatedFrom)));
-            }
-
-            if (DateCreatedTo != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedTo", Serializers.DateTimeIso8601(DateCreatedTo)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
     /// <summary>
-    /// Retrieve an Execution
-    /// </summary>
-    public class FetchExecutionOptions : IOptions<ExecutionResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchExecutionOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to fetch </param>
-        public FetchExecutionOptions(string pathFlowSid, string pathSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Only show Executions that started on or after this ISO 8601 date-time
+    /// </summary>
+    public DateTime? DateCreatedFrom { get; set; }
     /// <summary>
-    /// Triggers a new Execution for the Flow
-    /// </summary>
-    public class CreateExecutionOptions : IOptions<ExecutionResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The Contact phone number to start a Studio Flow Execution
-        /// </summary>
-        public Types.PhoneNumber To { get; }
-        /// <summary>
-        /// The Twilio phone number or Messaging Service SID to send messages or initiate calls from during the Flow Execution
-        /// </summary>
-        public Types.PhoneNumber From { get; }
-        /// <summary>
-        /// JSON data that will be added to the Flow's context
-        /// </summary>
-        public object Parameters { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateExecutionOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="to"> The Contact phone number to start a Studio Flow Execution </param>
-        /// <param name="from"> The Twilio phone number or Messaging Service SID to send messages or initiate calls from during
-        ///            the Flow Execution </param>
-        public CreateExecutionOptions(string pathFlowSid, Types.PhoneNumber to, Types.PhoneNumber from)
-        {
-            PathFlowSid = pathFlowSid;
-            To = to;
-            From = from;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To.ToString()));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From.ToString()));
-            }
-
-            if (Parameters != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Parameters", Serializers.JsonObject(Parameters)));
-            }
-
-            return p;
-        }
-    }
-
+    /// Only show Executions that started before this ISO 8601 date-time
+    /// </summary>
+    public DateTime? DateCreatedTo { get; set; }
+
     /// <summary>
-    /// Delete the Execution and all Steps relating to it.
-    /// </summary>
-    public class DeleteExecutionOptions : IOptions<ExecutionResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteExecutionOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to delete </param>
-        public DeleteExecutionOptions(string pathFlowSid, string pathSid)
-        {
-            PathFlowSid = pathFlowSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new ReadExecutionOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    public ReadExecutionOptions(string pathFlowSid)
+    {
+      PathFlowSid = pathFlowSid;
+    }
+
     /// <summary>
-    /// Update the status of an Execution to `ended`.
-    /// </summary>
-    public class UpdateExecutionOptions : IOptions<ExecutionResource>
-    {
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        public string PathFlowSid { get; }
-        /// <summary>
-        /// The SID of the Execution resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The status of the Execution
-        /// </summary>
-        public ExecutionResource.StatusEnum Status { get; }
-
-        /// <summary>
-        /// Construct a new UpdateExecutionOptions
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to update </param>
-        /// <param name="status"> The status of the Execution </param>
-        public UpdateExecutionOptions(string pathFlowSid, string pathSid, ExecutionResource.StatusEnum status)
-        {
-            PathFlowSid = pathFlowSid;
-            PathSid = pathSid;
-            Status = status;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DateCreatedFrom != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedFrom", Serializers.DateTimeIso8601(DateCreatedFrom)));
+      }
+
+      if (DateCreatedTo != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedTo", Serializers.DateTimeIso8601(DateCreatedTo)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve an Execution
+  /// </summary>
+  public class FetchExecutionOptions : IOptions<ExecutionResource>
+  {
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Execution resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchExecutionOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to fetch </param>
+    public FetchExecutionOptions(string pathFlowSid, string pathSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Triggers a new Execution for the Flow
+  /// </summary>
+  public class CreateExecutionOptions : IOptions<ExecutionResource>
+  {
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The Contact phone number to start a Studio Flow Execution
+    /// </summary>
+    public Types.PhoneNumber To { get; }
+    /// <summary>
+    /// The Twilio phone number or Messaging Service SID to send messages or initiate calls from during the Flow Execution
+    /// </summary>
+    public Types.PhoneNumber From { get; }
+    /// <summary>
+    /// JSON data that will be added to the Flow's context
+    /// </summary>
+    public object Parameters { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateExecutionOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="to"> The Contact phone number to start a Studio Flow Execution </param>
+    /// <param name="from"> The Twilio phone number or Messaging Service SID to send messages or initiate calls from during
+    ///            the Flow Execution </param>
+    public CreateExecutionOptions(string pathFlowSid, Types.PhoneNumber to, Types.PhoneNumber from)
+    {
+      PathFlowSid = pathFlowSid;
+      To = to;
+      From = from;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To.ToString()));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From.ToString()));
+      }
+
+      if (Parameters != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Parameters", Serializers.JsonObject(Parameters)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete the Execution and all Steps relating to it.
+  /// </summary>
+  public class DeleteExecutionOptions : IOptions<ExecutionResource>
+  {
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Execution resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteExecutionOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to delete </param>
+    public DeleteExecutionOptions(string pathFlowSid, string pathSid)
+    {
+      PathFlowSid = pathFlowSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update the status of an Execution to `ended`.
+  /// </summary>
+  public class UpdateExecutionOptions : IOptions<ExecutionResource>
+  {
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    public string PathFlowSid { get; }
+    /// <summary>
+    /// The SID of the Execution resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The status of the Execution
+    /// </summary>
+    public ExecutionResource.StatusEnum Status { get; }
+
+    /// <summary>
+    /// Construct a new UpdateExecutionOptions
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to update </param>
+    /// <param name="status"> The status of the Execution </param>
+    public UpdateExecutionOptions(string pathFlowSid, string pathSid, ExecutionResource.StatusEnum status)
+    {
+      PathFlowSid = pathFlowSid;
+      PathSid = pathSid;
+      Status = status;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/Flow/ExecutionResource.cs b/src/Twilio/Rest/Studio/V2/Flow/ExecutionResource.cs
index 814f71d65..0b1503d16 100644
--- a/src/Twilio/Rest/Studio/V2/Flow/ExecutionResource.cs
+++ b/src/Twilio/Rest/Studio/V2/Flow/ExecutionResource.cs
@@ -17,536 +17,536 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Studio.V2.Flow
-{
-
-    public class ExecutionResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Active = new StatusEnum("active");
-            public static readonly StatusEnum Ended = new StatusEnum("ended");
-        }
-
-        private static Request BuildReadRequest(ReadExecutionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathFlowSid + "/Executions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Executions for the Flow.
-        /// </summary>
-        /// <param name="options"> Read Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ResourceSet<ExecutionResource> Read(ReadExecutionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ExecutionResource>.FromJson("executions", response.Content);
-            return new ResourceSet<ExecutionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Executions for the Flow.
-        /// </summary>
-        /// <param name="options"> Read Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ExecutionResource>> ReadAsync(ReadExecutionOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ExecutionResource>.FromJson("executions", response.Content);
-            return new ResourceSet<ExecutionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Executions for the Flow.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="dateCreatedFrom"> Only show Executions that started on or after this ISO 8601 date-time </param>
-        /// <param name="dateCreatedTo"> Only show Executions that started before this ISO 8601 date-time </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ResourceSet<ExecutionResource> Read(string pathFlowSid,
-                                                          DateTime? dateCreatedFrom = null,
-                                                          DateTime? dateCreatedTo = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadExecutionOptions(pathFlowSid){DateCreatedFrom = dateCreatedFrom, DateCreatedTo = dateCreatedTo, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Executions for the Flow.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="dateCreatedFrom"> Only show Executions that started on or after this ISO 8601 date-time </param>
-        /// <param name="dateCreatedTo"> Only show Executions that started before this ISO 8601 date-time </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ExecutionResource>> ReadAsync(string pathFlowSid,
-                                                                                                  DateTime? dateCreatedFrom = null,
-                                                                                                  DateTime? dateCreatedTo = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadExecutionOptions(pathFlowSid){DateCreatedFrom = dateCreatedFrom, DateCreatedTo = dateCreatedTo, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ExecutionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ExecutionResource>.FromJson("executions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ExecutionResource> NextPage(Page<ExecutionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<ExecutionResource>.FromJson("executions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ExecutionResource> PreviousPage(Page<ExecutionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<ExecutionResource>.FromJson("executions", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchExecutionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve an Execution
-        /// </summary>
-        /// <param name="options"> Fetch Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ExecutionResource Fetch(FetchExecutionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve an Execution
-        /// </summary>
-        /// <param name="options"> Fetch Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ExecutionResource> FetchAsync(FetchExecutionOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve an Execution
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ExecutionResource Fetch(string pathFlowSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionOptions(pathFlowSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve an Execution
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ExecutionResource> FetchAsync(string pathFlowSid,
-                                                                                      string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchExecutionOptions(pathFlowSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateExecutionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathFlowSid + "/Executions",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Triggers a new Execution for the Flow
-        /// </summary>
-        /// <param name="options"> Create Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ExecutionResource Create(CreateExecutionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Triggers a new Execution for the Flow
-        /// </summary>
-        /// <param name="options"> Create Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ExecutionResource> CreateAsync(CreateExecutionOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Triggers a new Execution for the Flow
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="to"> The Contact phone number to start a Studio Flow Execution </param>
-        /// <param name="from"> The Twilio phone number or Messaging Service SID to send messages or initiate calls from during
-        ///            the Flow Execution </param>
-        /// <param name="parameters"> JSON data that will be added to the Flow's context </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ExecutionResource Create(string pathFlowSid,
-                                               Types.PhoneNumber to,
-                                               Types.PhoneNumber from,
-                                               object parameters = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateExecutionOptions(pathFlowSid, to, from){Parameters = parameters};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Triggers a new Execution for the Flow
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="to"> The Contact phone number to start a Studio Flow Execution </param>
-        /// <param name="from"> The Twilio phone number or Messaging Service SID to send messages or initiate calls from during
-        ///            the Flow Execution </param>
-        /// <param name="parameters"> JSON data that will be added to the Flow's context </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ExecutionResource> CreateAsync(string pathFlowSid,
-                                                                                       Types.PhoneNumber to,
-                                                                                       Types.PhoneNumber from,
-                                                                                       object parameters = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateExecutionOptions(pathFlowSid, to, from){Parameters = parameters};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteExecutionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete the Execution and all Steps relating to it.
-        /// </summary>
-        /// <param name="options"> Delete Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static bool Delete(DeleteExecutionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete the Execution and all Steps relating to it.
-        /// </summary>
-        /// <param name="options"> Delete Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteExecutionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete the Execution and all Steps relating to it.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static bool Delete(string pathFlowSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteExecutionOptions(pathFlowSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete the Execution and all Steps relating to it.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFlowSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteExecutionOptions(pathFlowSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateExecutionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update the status of an Execution to `ended`.
-        /// </summary>
-        /// <param name="options"> Update Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ExecutionResource Update(UpdateExecutionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the status of an Execution to `ended`.
-        /// </summary>
-        /// <param name="options"> Update Execution parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ExecutionResource> UpdateAsync(UpdateExecutionOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update the status of an Execution to `ended`.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to update </param>
-        /// <param name="status"> The status of the Execution </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Execution </returns>
-        public static ExecutionResource Update(string pathFlowSid,
-                                               string pathSid,
-                                               ExecutionResource.StatusEnum status,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateExecutionOptions(pathFlowSid, pathSid, status);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the status of an Execution to `ended`.
-        /// </summary>
-        /// <param name="pathFlowSid"> The SID of the Flow </param>
-        /// <param name="pathSid"> The SID of the Execution resource to update </param>
-        /// <param name="status"> The status of the Execution </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Execution </returns>
-        public static async System.Threading.Tasks.Task<ExecutionResource> UpdateAsync(string pathFlowSid,
-                                                                                       string pathSid,
-                                                                                       ExecutionResource.StatusEnum status,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateExecutionOptions(pathFlowSid, pathSid, status);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ExecutionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ExecutionResource object represented by the provided JSON </returns>
-        public static ExecutionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ExecutionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Flow
-        /// </summary>
-        [JsonProperty("flow_sid")]
-        public string FlowSid { get; private set; }
-        /// <summary>
-        /// The phone number, SIP address or Client identifier that triggered the Execution
-        /// </summary>
-        [JsonProperty("contact_channel_address")]
-        public string ContactChannelAddress { get; private set; }
-        /// <summary>
-        /// The current state of the flow
-        /// </summary>
-        [JsonProperty("context")]
-        public object Context { get; private set; }
-        /// <summary>
-        /// The status of the Execution
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ExecutionResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Nested resource URLs
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ExecutionResource()
-        {
-
-        }
-    }
+{
+
+  public class ExecutionResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Active = new StatusEnum("active");
+      public static readonly StatusEnum Ended = new StatusEnum("ended");
+    }
+
+    private static Request BuildReadRequest(ReadExecutionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathFlowSid + "/Executions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Executions for the Flow.
+    /// </summary>
+    /// <param name="options"> Read Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ResourceSet<ExecutionResource> Read(ReadExecutionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ExecutionResource>.FromJson("executions", response.Content);
+      return new ResourceSet<ExecutionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Executions for the Flow.
+    /// </summary>
+    /// <param name="options"> Read Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ExecutionResource>> ReadAsync(ReadExecutionOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ExecutionResource>.FromJson("executions", response.Content);
+      return new ResourceSet<ExecutionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Executions for the Flow.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="dateCreatedFrom"> Only show Executions that started on or after this ISO 8601 date-time </param>
+    /// <param name="dateCreatedTo"> Only show Executions that started before this ISO 8601 date-time </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ResourceSet<ExecutionResource> Read(string pathFlowSid,
+                                                      DateTime? dateCreatedFrom = null,
+                                                      DateTime? dateCreatedTo = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadExecutionOptions(pathFlowSid) { DateCreatedFrom = dateCreatedFrom, DateCreatedTo = dateCreatedTo, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Executions for the Flow.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="dateCreatedFrom"> Only show Executions that started on or after this ISO 8601 date-time </param>
+    /// <param name="dateCreatedTo"> Only show Executions that started before this ISO 8601 date-time </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ExecutionResource>> ReadAsync(string pathFlowSid,
+                                                                                              DateTime? dateCreatedFrom = null,
+                                                                                              DateTime? dateCreatedTo = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadExecutionOptions(pathFlowSid) { DateCreatedFrom = dateCreatedFrom, DateCreatedTo = dateCreatedTo, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ExecutionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ExecutionResource>.FromJson("executions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ExecutionResource> NextPage(Page<ExecutionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<ExecutionResource>.FromJson("executions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ExecutionResource> PreviousPage(Page<ExecutionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<ExecutionResource>.FromJson("executions", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchExecutionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve an Execution
+    /// </summary>
+    /// <param name="options"> Fetch Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ExecutionResource Fetch(FetchExecutionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve an Execution
+    /// </summary>
+    /// <param name="options"> Fetch Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ExecutionResource> FetchAsync(FetchExecutionOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve an Execution
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ExecutionResource Fetch(string pathFlowSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionOptions(pathFlowSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve an Execution
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ExecutionResource> FetchAsync(string pathFlowSid,
+                                                                                  string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchExecutionOptions(pathFlowSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateExecutionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathFlowSid + "/Executions",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Triggers a new Execution for the Flow
+    /// </summary>
+    /// <param name="options"> Create Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ExecutionResource Create(CreateExecutionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Triggers a new Execution for the Flow
+    /// </summary>
+    /// <param name="options"> Create Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ExecutionResource> CreateAsync(CreateExecutionOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Triggers a new Execution for the Flow
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="to"> The Contact phone number to start a Studio Flow Execution </param>
+    /// <param name="from"> The Twilio phone number or Messaging Service SID to send messages or initiate calls from during
+    ///            the Flow Execution </param>
+    /// <param name="parameters"> JSON data that will be added to the Flow's context </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ExecutionResource Create(string pathFlowSid,
+                                           Types.PhoneNumber to,
+                                           Types.PhoneNumber from,
+                                           object parameters = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateExecutionOptions(pathFlowSid, to, from) { Parameters = parameters };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Triggers a new Execution for the Flow
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="to"> The Contact phone number to start a Studio Flow Execution </param>
+    /// <param name="from"> The Twilio phone number or Messaging Service SID to send messages or initiate calls from during
+    ///            the Flow Execution </param>
+    /// <param name="parameters"> JSON data that will be added to the Flow's context </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ExecutionResource> CreateAsync(string pathFlowSid,
+                                                                                   Types.PhoneNumber to,
+                                                                                   Types.PhoneNumber from,
+                                                                                   object parameters = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateExecutionOptions(pathFlowSid, to, from) { Parameters = parameters };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteExecutionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete the Execution and all Steps relating to it.
+    /// </summary>
+    /// <param name="options"> Delete Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static bool Delete(DeleteExecutionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete the Execution and all Steps relating to it.
+    /// </summary>
+    /// <param name="options"> Delete Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteExecutionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete the Execution and all Steps relating to it.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static bool Delete(string pathFlowSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteExecutionOptions(pathFlowSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete the Execution and all Steps relating to it.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathFlowSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteExecutionOptions(pathFlowSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateExecutionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathFlowSid + "/Executions/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update the status of an Execution to `ended`.
+    /// </summary>
+    /// <param name="options"> Update Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ExecutionResource Update(UpdateExecutionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the status of an Execution to `ended`.
+    /// </summary>
+    /// <param name="options"> Update Execution parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ExecutionResource> UpdateAsync(UpdateExecutionOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update the status of an Execution to `ended`.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to update </param>
+    /// <param name="status"> The status of the Execution </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Execution </returns>
+    public static ExecutionResource Update(string pathFlowSid,
+                                           string pathSid,
+                                           ExecutionResource.StatusEnum status,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateExecutionOptions(pathFlowSid, pathSid, status);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the status of an Execution to `ended`.
+    /// </summary>
+    /// <param name="pathFlowSid"> The SID of the Flow </param>
+    /// <param name="pathSid"> The SID of the Execution resource to update </param>
+    /// <param name="status"> The status of the Execution </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Execution </returns>
+    public static async System.Threading.Tasks.Task<ExecutionResource> UpdateAsync(string pathFlowSid,
+                                                                                   string pathSid,
+                                                                                   ExecutionResource.StatusEnum status,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateExecutionOptions(pathFlowSid, pathSid, status);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ExecutionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ExecutionResource object represented by the provided JSON </returns>
+    public static ExecutionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ExecutionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Flow
+    /// </summary>
+    [JsonProperty("flow_sid")]
+    public string FlowSid { get; private set; }
+    /// <summary>
+    /// The phone number, SIP address or Client identifier that triggered the Execution
+    /// </summary>
+    [JsonProperty("contact_channel_address")]
+    public string ContactChannelAddress { get; private set; }
+    /// <summary>
+    /// The current state of the flow
+    /// </summary>
+    [JsonProperty("context")]
+    public object Context { get; private set; }
+    /// <summary>
+    /// The status of the Execution
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ExecutionResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Nested resource URLs
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ExecutionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/Flow/FlowRevisionOptions.cs b/src/Twilio/Rest/Studio/V2/Flow/FlowRevisionOptions.cs
index 184153a9e..39eba09e0 100644
--- a/src/Twilio/Rest/Studio/V2/Flow/FlowRevisionOptions.cs
+++ b/src/Twilio/Rest/Studio/V2/Flow/FlowRevisionOptions.cs
@@ -9,75 +9,75 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V2.Flow
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Flows revisions.
+  /// </summary>
+  public class ReadFlowRevisionOptions : ReadOptions<FlowRevisionResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Flows revisions.
+    /// The SID that identifies the resource to fetch
     /// </summary>
-    public class ReadFlowRevisionOptions : ReadOptions<FlowRevisionResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadFlowRevisionOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public ReadFlowRevisionOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// Retrieve a specific Flow revision.
+    /// Construct a new ReadFlowRevisionOptions
     /// </summary>
-    public class FetchFlowRevisionOptions : IOptions<FlowRevisionResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// Specific Revision number or can be `LatestPublished` and `LatestRevision`
-        /// </summary>
-        public string PathRevision { get; }
-
-        /// <summary>
-        /// Construct a new FetchFlowRevisionOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="pathRevision"> Specific Revision number or can be `LatestPublished` and `LatestRevision` </param>
-        public FetchFlowRevisionOptions(string pathSid, string pathRevision)
-        {
-            PathSid = pathSid;
-            PathRevision = pathRevision;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public ReadFlowRevisionOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a specific Flow revision.
+  /// </summary>
+  public class FetchFlowRevisionOptions : IOptions<FlowRevisionResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// Specific Revision number or can be `LatestPublished` and `LatestRevision`
+    /// </summary>
+    public string PathRevision { get; }
+
+    /// <summary>
+    /// Construct a new FetchFlowRevisionOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="pathRevision"> Specific Revision number or can be `LatestPublished` and `LatestRevision` </param>
+    public FetchFlowRevisionOptions(string pathSid, string pathRevision)
+    {
+      PathSid = pathSid;
+      PathRevision = pathRevision;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/Flow/FlowRevisionResource.cs b/src/Twilio/Rest/Studio/V2/Flow/FlowRevisionResource.cs
index 8d17570a6..abccd413b 100644
--- a/src/Twilio/Rest/Studio/V2/Flow/FlowRevisionResource.cs
+++ b/src/Twilio/Rest/Studio/V2/Flow/FlowRevisionResource.cs
@@ -17,311 +17,311 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Studio.V2.Flow
-{
-
-    public class FlowRevisionResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Draft = new StatusEnum("draft");
-            public static readonly StatusEnum Published = new StatusEnum("published");
-        }
-
-        private static Request BuildReadRequest(ReadFlowRevisionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathSid + "/Revisions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Flows revisions.
-        /// </summary>
-        /// <param name="options"> Read FlowRevision parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlowRevision </returns>
-        public static ResourceSet<FlowRevisionResource> Read(ReadFlowRevisionOptions options,
-                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FlowRevisionResource>.FromJson("revisions", response.Content);
-            return new ResourceSet<FlowRevisionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Flows revisions.
-        /// </summary>
-        /// <param name="options"> Read FlowRevision parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlowRevision </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FlowRevisionResource>> ReadAsync(ReadFlowRevisionOptions options,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FlowRevisionResource>.FromJson("revisions", response.Content);
-            return new ResourceSet<FlowRevisionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Flows revisions.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlowRevision </returns>
-        public static ResourceSet<FlowRevisionResource> Read(string pathSid,
-                                                             int? pageSize = null,
-                                                             long? limit = null,
-                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadFlowRevisionOptions(pathSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Flows revisions.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlowRevision </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FlowRevisionResource>> ReadAsync(string pathSid,
-                                                                                                     int? pageSize = null,
-                                                                                                     long? limit = null,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadFlowRevisionOptions(pathSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FlowRevisionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FlowRevisionResource>.FromJson("revisions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FlowRevisionResource> NextPage(Page<FlowRevisionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<FlowRevisionResource>.FromJson("revisions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FlowRevisionResource> PreviousPage(Page<FlowRevisionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<FlowRevisionResource>.FromJson("revisions", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchFlowRevisionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathSid + "/Revisions/" + options.PathRevision + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a specific Flow revision.
-        /// </summary>
-        /// <param name="options"> Fetch FlowRevision parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlowRevision </returns>
-        public static FlowRevisionResource Fetch(FetchFlowRevisionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Flow revision.
-        /// </summary>
-        /// <param name="options"> Fetch FlowRevision parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlowRevision </returns>
-        public static async System.Threading.Tasks.Task<FlowRevisionResource> FetchAsync(FetchFlowRevisionOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a specific Flow revision.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="pathRevision"> Specific Revision number or can be `LatestPublished` and `LatestRevision` </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlowRevision </returns>
-        public static FlowRevisionResource Fetch(string pathSid, string pathRevision, ITwilioRestClient client = null)
-        {
-            var options = new FetchFlowRevisionOptions(pathSid, pathRevision);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Flow revision.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="pathRevision"> Specific Revision number or can be `LatestPublished` and `LatestRevision` </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlowRevision </returns>
-        public static async System.Threading.Tasks.Task<FlowRevisionResource> FetchAsync(string pathSid,
-                                                                                         string pathRevision,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchFlowRevisionOptions(pathSid, pathRevision);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FlowRevisionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FlowRevisionResource object represented by the provided JSON </returns>
-        public static FlowRevisionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FlowRevisionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the Flow
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// JSON representation of flow definition
-        /// </summary>
-        [JsonProperty("definition")]
-        public object Definition { get; private set; }
-        /// <summary>
-        /// The status of the Flow
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FlowRevisionResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The latest revision number of the Flow's definition
-        /// </summary>
-        [JsonProperty("revision")]
-        public int? Revision { get; private set; }
-        /// <summary>
-        /// Description of change made in the revision
-        /// </summary>
-        [JsonProperty("commit_message")]
-        public string CommitMessage { get; private set; }
-        /// <summary>
-        /// Boolean if the flow definition is valid
-        /// </summary>
-        [JsonProperty("valid")]
-        public bool? Valid { get; private set; }
-        /// <summary>
-        /// List of error in the flow definition
-        /// </summary>
-        [JsonProperty("errors")]
-        public List<object> Errors { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private FlowRevisionResource()
-        {
-
-        }
-    }
+{
+
+  public class FlowRevisionResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Draft = new StatusEnum("draft");
+      public static readonly StatusEnum Published = new StatusEnum("published");
+    }
+
+    private static Request BuildReadRequest(ReadFlowRevisionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathSid + "/Revisions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Flows revisions.
+    /// </summary>
+    /// <param name="options"> Read FlowRevision parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlowRevision </returns>
+    public static ResourceSet<FlowRevisionResource> Read(ReadFlowRevisionOptions options,
+                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FlowRevisionResource>.FromJson("revisions", response.Content);
+      return new ResourceSet<FlowRevisionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Flows revisions.
+    /// </summary>
+    /// <param name="options"> Read FlowRevision parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlowRevision </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FlowRevisionResource>> ReadAsync(ReadFlowRevisionOptions options,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FlowRevisionResource>.FromJson("revisions", response.Content);
+      return new ResourceSet<FlowRevisionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Flows revisions.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlowRevision </returns>
+    public static ResourceSet<FlowRevisionResource> Read(string pathSid,
+                                                         int? pageSize = null,
+                                                         long? limit = null,
+                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadFlowRevisionOptions(pathSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Flows revisions.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlowRevision </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FlowRevisionResource>> ReadAsync(string pathSid,
+                                                                                                 int? pageSize = null,
+                                                                                                 long? limit = null,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadFlowRevisionOptions(pathSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FlowRevisionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FlowRevisionResource>.FromJson("revisions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FlowRevisionResource> NextPage(Page<FlowRevisionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<FlowRevisionResource>.FromJson("revisions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FlowRevisionResource> PreviousPage(Page<FlowRevisionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<FlowRevisionResource>.FromJson("revisions", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchFlowRevisionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathSid + "/Revisions/" + options.PathRevision + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a specific Flow revision.
+    /// </summary>
+    /// <param name="options"> Fetch FlowRevision parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlowRevision </returns>
+    public static FlowRevisionResource Fetch(FetchFlowRevisionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Flow revision.
+    /// </summary>
+    /// <param name="options"> Fetch FlowRevision parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlowRevision </returns>
+    public static async System.Threading.Tasks.Task<FlowRevisionResource> FetchAsync(FetchFlowRevisionOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a specific Flow revision.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="pathRevision"> Specific Revision number or can be `LatestPublished` and `LatestRevision` </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlowRevision </returns>
+    public static FlowRevisionResource Fetch(string pathSid, string pathRevision, ITwilioRestClient client = null)
+    {
+      var options = new FetchFlowRevisionOptions(pathSid, pathRevision);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Flow revision.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="pathRevision"> Specific Revision number or can be `LatestPublished` and `LatestRevision` </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlowRevision </returns>
+    public static async System.Threading.Tasks.Task<FlowRevisionResource> FetchAsync(string pathSid,
+                                                                                     string pathRevision,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchFlowRevisionOptions(pathSid, pathRevision);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FlowRevisionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FlowRevisionResource object represented by the provided JSON </returns>
+    public static FlowRevisionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FlowRevisionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the Flow
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// JSON representation of flow definition
+    /// </summary>
+    [JsonProperty("definition")]
+    public object Definition { get; private set; }
+    /// <summary>
+    /// The status of the Flow
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FlowRevisionResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The latest revision number of the Flow's definition
+    /// </summary>
+    [JsonProperty("revision")]
+    public int? Revision { get; private set; }
+    /// <summary>
+    /// Description of change made in the revision
+    /// </summary>
+    [JsonProperty("commit_message")]
+    public string CommitMessage { get; private set; }
+    /// <summary>
+    /// Boolean if the flow definition is valid
+    /// </summary>
+    [JsonProperty("valid")]
+    public bool? Valid { get; private set; }
+    /// <summary>
+    /// List of error in the flow definition
+    /// </summary>
+    [JsonProperty("errors")]
+    public List<object> Errors { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private FlowRevisionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/Flow/FlowTestUserOptions.cs b/src/Twilio/Rest/Studio/V2/Flow/FlowTestUserOptions.cs
index 53ab2cab4..039369f55 100644
--- a/src/Twilio/Rest/Studio/V2/Flow/FlowTestUserOptions.cs
+++ b/src/Twilio/Rest/Studio/V2/Flow/FlowTestUserOptions.cs
@@ -10,75 +10,75 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V2.Flow
-{
-
+{
+
+  /// <summary>
+  /// Fetch flow test users
+  /// </summary>
+  public class FetchFlowTestUserOptions : IOptions<FlowTestUserResource>
+  {
     /// <summary>
-    /// Fetch flow test users
+    /// Unique identifier of the flow.
     /// </summary>
-    public class FetchFlowTestUserOptions : IOptions<FlowTestUserResource>
-    {
-        /// <summary>
-        /// Unique identifier of the flow.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFlowTestUserOptions
-        /// </summary>
-        /// <param name="pathSid"> Unique identifier of the flow. </param>
-        public FetchFlowTestUserOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// Update flow test users
+    /// Construct a new FetchFlowTestUserOptions
     /// </summary>
-    public class UpdateFlowTestUserOptions : IOptions<FlowTestUserResource>
-    {
-        /// <summary>
-        /// Unique identifier of the flow.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// List of test user identities that can test draft versions of the flow.
-        /// </summary>
-        public List<string> TestUsers { get; }
-
-        /// <summary>
-        /// Construct a new UpdateFlowTestUserOptions
-        /// </summary>
-        /// <param name="pathSid"> Unique identifier of the flow. </param>
-        /// <param name="testUsers"> List of test user identities that can test draft versions of the flow. </param>
-        public UpdateFlowTestUserOptions(string pathSid, List<string> testUsers)
-        {
-            PathSid = pathSid;
-            TestUsers = testUsers;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (TestUsers != null)
-            {
-                p.AddRange(TestUsers.Select(prop => new KeyValuePair<string, string>("TestUsers", prop)));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathSid"> Unique identifier of the flow. </param>
+    public FetchFlowTestUserOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update flow test users
+  /// </summary>
+  public class UpdateFlowTestUserOptions : IOptions<FlowTestUserResource>
+  {
+    /// <summary>
+    /// Unique identifier of the flow.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// List of test user identities that can test draft versions of the flow.
+    /// </summary>
+    public List<string> TestUsers { get; }
+
+    /// <summary>
+    /// Construct a new UpdateFlowTestUserOptions
+    /// </summary>
+    /// <param name="pathSid"> Unique identifier of the flow. </param>
+    /// <param name="testUsers"> List of test user identities that can test draft versions of the flow. </param>
+    public UpdateFlowTestUserOptions(string pathSid, List<string> testUsers)
+    {
+      PathSid = pathSid;
+      TestUsers = testUsers;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (TestUsers != null)
+      {
+        p.AddRange(TestUsers.Select(prop => new KeyValuePair<string, string>("TestUsers", prop)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/Flow/FlowTestUserResource.cs b/src/Twilio/Rest/Studio/V2/Flow/FlowTestUserResource.cs
index 9f797bfca..c7ac9cbb4 100644
--- a/src/Twilio/Rest/Studio/V2/Flow/FlowTestUserResource.cs
+++ b/src/Twilio/Rest/Studio/V2/Flow/FlowTestUserResource.cs
@@ -16,185 +16,185 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Studio.V2.Flow
-{
-
-    public class FlowTestUserResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchFlowTestUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathSid + "/TestUsers",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch flow test users
-        /// </summary>
-        /// <param name="options"> Fetch FlowTestUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlowTestUser </returns>
-        public static FlowTestUserResource Fetch(FetchFlowTestUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch flow test users
-        /// </summary>
-        /// <param name="options"> Fetch FlowTestUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlowTestUser </returns>
-        public static async System.Threading.Tasks.Task<FlowTestUserResource> FetchAsync(FetchFlowTestUserOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch flow test users
-        /// </summary>
-        /// <param name="pathSid"> Unique identifier of the flow. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlowTestUser </returns>
-        public static FlowTestUserResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchFlowTestUserOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch flow test users
-        /// </summary>
-        /// <param name="pathSid"> Unique identifier of the flow. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlowTestUser </returns>
-        public static async System.Threading.Tasks.Task<FlowTestUserResource> FetchAsync(string pathSid,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchFlowTestUserOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateFlowTestUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathSid + "/TestUsers",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update flow test users
-        /// </summary>
-        /// <param name="options"> Update FlowTestUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlowTestUser </returns>
-        public static FlowTestUserResource Update(UpdateFlowTestUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update flow test users
-        /// </summary>
-        /// <param name="options"> Update FlowTestUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlowTestUser </returns>
-        public static async System.Threading.Tasks.Task<FlowTestUserResource> UpdateAsync(UpdateFlowTestUserOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update flow test users
-        /// </summary>
-        /// <param name="pathSid"> Unique identifier of the flow. </param>
-        /// <param name="testUsers"> List of test user identities that can test draft versions of the flow. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlowTestUser </returns>
-        public static FlowTestUserResource Update(string pathSid, List<string> testUsers, ITwilioRestClient client = null)
-        {
-            var options = new UpdateFlowTestUserOptions(pathSid, testUsers);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update flow test users
-        /// </summary>
-        /// <param name="pathSid"> Unique identifier of the flow. </param>
-        /// <param name="testUsers"> List of test user identities that can test draft versions of the flow. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlowTestUser </returns>
-        public static async System.Threading.Tasks.Task<FlowTestUserResource> UpdateAsync(string pathSid,
-                                                                                          List<string> testUsers,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateFlowTestUserOptions(pathSid, testUsers);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FlowTestUserResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FlowTestUserResource object represented by the provided JSON </returns>
-        public static FlowTestUserResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FlowTestUserResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Unique identifier of the flow.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// List of test user identities that can test draft versions of the flow.
-        /// </summary>
-        [JsonProperty("test_users")]
-        public List<string> TestUsers { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private FlowTestUserResource()
-        {
-
-        }
-    }
+{
+
+  public class FlowTestUserResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchFlowTestUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathSid + "/TestUsers",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch flow test users
+    /// </summary>
+    /// <param name="options"> Fetch FlowTestUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlowTestUser </returns>
+    public static FlowTestUserResource Fetch(FetchFlowTestUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch flow test users
+    /// </summary>
+    /// <param name="options"> Fetch FlowTestUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlowTestUser </returns>
+    public static async System.Threading.Tasks.Task<FlowTestUserResource> FetchAsync(FetchFlowTestUserOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch flow test users
+    /// </summary>
+    /// <param name="pathSid"> Unique identifier of the flow. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlowTestUser </returns>
+    public static FlowTestUserResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchFlowTestUserOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch flow test users
+    /// </summary>
+    /// <param name="pathSid"> Unique identifier of the flow. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlowTestUser </returns>
+    public static async System.Threading.Tasks.Task<FlowTestUserResource> FetchAsync(string pathSid,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchFlowTestUserOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateFlowTestUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathSid + "/TestUsers",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update flow test users
+    /// </summary>
+    /// <param name="options"> Update FlowTestUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlowTestUser </returns>
+    public static FlowTestUserResource Update(UpdateFlowTestUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update flow test users
+    /// </summary>
+    /// <param name="options"> Update FlowTestUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlowTestUser </returns>
+    public static async System.Threading.Tasks.Task<FlowTestUserResource> UpdateAsync(UpdateFlowTestUserOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update flow test users
+    /// </summary>
+    /// <param name="pathSid"> Unique identifier of the flow. </param>
+    /// <param name="testUsers"> List of test user identities that can test draft versions of the flow. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlowTestUser </returns>
+    public static FlowTestUserResource Update(string pathSid, List<string> testUsers, ITwilioRestClient client = null)
+    {
+      var options = new UpdateFlowTestUserOptions(pathSid, testUsers);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update flow test users
+    /// </summary>
+    /// <param name="pathSid"> Unique identifier of the flow. </param>
+    /// <param name="testUsers"> List of test user identities that can test draft versions of the flow. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlowTestUser </returns>
+    public static async System.Threading.Tasks.Task<FlowTestUserResource> UpdateAsync(string pathSid,
+                                                                                      List<string> testUsers,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateFlowTestUserOptions(pathSid, testUsers);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FlowTestUserResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FlowTestUserResource object represented by the provided JSON </returns>
+    public static FlowTestUserResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FlowTestUserResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Unique identifier of the flow.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// List of test user identities that can test draft versions of the flow.
+    /// </summary>
+    [JsonProperty("test_users")]
+    public List<string> TestUsers { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private FlowTestUserResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/FlowOptions.cs b/src/Twilio/Rest/Studio/V2/FlowOptions.cs
index 86289aeab..4f80f9d8c 100644
--- a/src/Twilio/Rest/Studio/V2/FlowOptions.cs
+++ b/src/Twilio/Rest/Studio/V2/FlowOptions.cs
@@ -9,216 +9,216 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V2
-{
-
+{
+
+  /// <summary>
+  /// Create a Flow.
+  /// </summary>
+  public class CreateFlowOptions : IOptions<FlowResource>
+  {
     /// <summary>
-    /// Create a Flow.
-    /// </summary>
-    public class CreateFlowOptions : IOptions<FlowResource>
-    {
-        /// <summary>
-        /// The string that you assigned to describe the Flow
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The status of the Flow
-        /// </summary>
-        public FlowResource.StatusEnum Status { get; }
-        /// <summary>
-        /// JSON representation of flow definition
-        /// </summary>
-        public object Definition { get; }
-        /// <summary>
-        /// Description of change made in the revision
-        /// </summary>
-        public string CommitMessage { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateFlowOptions
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
-        /// <param name="status"> The status of the Flow </param>
-        /// <param name="definition"> JSON representation of flow definition </param>
-        public CreateFlowOptions(string friendlyName, FlowResource.StatusEnum status, object definition)
-        {
-            FriendlyName = friendlyName;
-            Status = status;
-            Definition = definition;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Definition != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Definition", Serializers.JsonObject(Definition)));
-            }
-
-            if (CommitMessage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommitMessage", CommitMessage));
-            }
-
-            return p;
-        }
-    }
-
+    /// The string that you assigned to describe the Flow
+    /// </summary>
+    public string FriendlyName { get; }
     /// <summary>
-    /// Update a Flow.
-    /// </summary>
-    public class UpdateFlowOptions : IOptions<FlowResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The status of the Flow
-        /// </summary>
-        public FlowResource.StatusEnum Status { get; }
-        /// <summary>
-        /// The string that you assigned to describe the Flow
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// JSON representation of flow definition
-        /// </summary>
-        public object Definition { get; set; }
-        /// <summary>
-        /// Description of change made in the revision
-        /// </summary>
-        public string CommitMessage { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateFlowOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="status"> The status of the Flow </param>
-        public UpdateFlowOptions(string pathSid, FlowResource.StatusEnum status)
-        {
-            PathSid = pathSid;
-            Status = status;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Definition != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Definition", Serializers.JsonObject(Definition)));
-            }
-
-            if (CommitMessage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommitMessage", CommitMessage));
-            }
-
-            return p;
-        }
-    }
-
+    /// The status of the Flow
+    /// </summary>
+    public FlowResource.StatusEnum Status { get; }
     /// <summary>
-    /// Retrieve a list of all Flows.
-    /// </summary>
-    public class ReadFlowOptions : ReadOptions<FlowResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// JSON representation of flow definition
+    /// </summary>
+    public object Definition { get; }
     /// <summary>
-    /// Retrieve a specific Flow.
+    /// Description of change made in the revision
     /// </summary>
-    public class FetchFlowOptions : IOptions<FlowResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFlowOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchFlowOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string CommitMessage { get; set; }
+
     /// <summary>
-    /// Delete a specific Flow.
+    /// Construct a new CreateFlowOptions
     /// </summary>
-    public class DeleteFlowOptions : IOptions<FlowResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFlowOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeleteFlowOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
+    /// <param name="status"> The status of the Flow </param>
+    /// <param name="definition"> JSON representation of flow definition </param>
+    public CreateFlowOptions(string friendlyName, FlowResource.StatusEnum status, object definition)
+    {
+      FriendlyName = friendlyName;
+      Status = status;
+      Definition = definition;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Definition != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Definition", Serializers.JsonObject(Definition)));
+      }
+
+      if (CommitMessage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommitMessage", CommitMessage));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update a Flow.
+  /// </summary>
+  public class UpdateFlowOptions : IOptions<FlowResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The status of the Flow
+    /// </summary>
+    public FlowResource.StatusEnum Status { get; }
+    /// <summary>
+    /// The string that you assigned to describe the Flow
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// JSON representation of flow definition
+    /// </summary>
+    public object Definition { get; set; }
+    /// <summary>
+    /// Description of change made in the revision
+    /// </summary>
+    public string CommitMessage { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateFlowOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="status"> The status of the Flow </param>
+    public UpdateFlowOptions(string pathSid, FlowResource.StatusEnum status)
+    {
+      PathSid = pathSid;
+      Status = status;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Definition != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Definition", Serializers.JsonObject(Definition)));
+      }
+
+      if (CommitMessage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommitMessage", CommitMessage));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Flows.
+  /// </summary>
+  public class ReadFlowOptions : ReadOptions<FlowResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a specific Flow.
+  /// </summary>
+  public class FetchFlowOptions : IOptions<FlowResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchFlowOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchFlowOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Flow.
+  /// </summary>
+  public class DeleteFlowOptions : IOptions<FlowResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteFlowOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeleteFlowOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/FlowResource.cs b/src/Twilio/Rest/Studio/V2/FlowResource.cs
index b35f7d232..415c0a22f 100644
--- a/src/Twilio/Rest/Studio/V2/FlowResource.cs
+++ b/src/Twilio/Rest/Studio/V2/FlowResource.cs
@@ -17,548 +17,548 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Studio.V2
-{
-
-    public class FlowResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Draft = new StatusEnum("draft");
-            public static readonly StatusEnum Published = new StatusEnum("published");
-        }
-
-        private static Request BuildCreateRequest(CreateFlowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Studio,
-                "/v2/Flows",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a Flow.
-        /// </summary>
-        /// <param name="options"> Create Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static FlowResource Create(CreateFlowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a Flow.
-        /// </summary>
-        /// <param name="options"> Create Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<FlowResource> CreateAsync(CreateFlowOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a Flow.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
-        /// <param name="status"> The status of the Flow </param>
-        /// <param name="definition"> JSON representation of flow definition </param>
-        /// <param name="commitMessage"> Description of change made in the revision </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static FlowResource Create(string friendlyName,
-                                          FlowResource.StatusEnum status,
-                                          object definition,
-                                          string commitMessage = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateFlowOptions(friendlyName, status, definition){CommitMessage = commitMessage};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a Flow.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
-        /// <param name="status"> The status of the Flow </param>
-        /// <param name="definition"> JSON representation of flow definition </param>
-        /// <param name="commitMessage"> Description of change made in the revision </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<FlowResource> CreateAsync(string friendlyName,
-                                                                                  FlowResource.StatusEnum status,
-                                                                                  object definition,
-                                                                                  string commitMessage = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateFlowOptions(friendlyName, status, definition){CommitMessage = commitMessage};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateFlowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a Flow.
-        /// </summary>
-        /// <param name="options"> Update Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static FlowResource Update(UpdateFlowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a Flow.
-        /// </summary>
-        /// <param name="options"> Update Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<FlowResource> UpdateAsync(UpdateFlowOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a Flow.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="status"> The status of the Flow </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
-        /// <param name="definition"> JSON representation of flow definition </param>
-        /// <param name="commitMessage"> Description of change made in the revision </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static FlowResource Update(string pathSid,
-                                          FlowResource.StatusEnum status,
-                                          string friendlyName = null,
-                                          object definition = null,
-                                          string commitMessage = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateFlowOptions(pathSid, status){FriendlyName = friendlyName, Definition = definition, CommitMessage = commitMessage};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a Flow.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="status"> The status of the Flow </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
-        /// <param name="definition"> JSON representation of flow definition </param>
-        /// <param name="commitMessage"> Description of change made in the revision </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<FlowResource> UpdateAsync(string pathSid,
-                                                                                  FlowResource.StatusEnum status,
-                                                                                  string friendlyName = null,
-                                                                                  object definition = null,
-                                                                                  string commitMessage = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateFlowOptions(pathSid, status){FriendlyName = friendlyName, Definition = definition, CommitMessage = commitMessage};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadFlowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v2/Flows",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Flows.
-        /// </summary>
-        /// <param name="options"> Read Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static ResourceSet<FlowResource> Read(ReadFlowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FlowResource>.FromJson("flows", response.Content);
-            return new ResourceSet<FlowResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Flows.
-        /// </summary>
-        /// <param name="options"> Read Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FlowResource>> ReadAsync(ReadFlowOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FlowResource>.FromJson("flows", response.Content);
-            return new ResourceSet<FlowResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Flows.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static ResourceSet<FlowResource> Read(int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadFlowOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Flows.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FlowResource>> ReadAsync(int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadFlowOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FlowResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FlowResource>.FromJson("flows", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FlowResource> NextPage(Page<FlowResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<FlowResource>.FromJson("flows", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FlowResource> PreviousPage(Page<FlowResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Studio)
-            );
-
-            var response = client.Request(request);
-            return Page<FlowResource>.FromJson("flows", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchFlowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a specific Flow.
-        /// </summary>
-        /// <param name="options"> Fetch Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static FlowResource Fetch(FetchFlowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Flow.
-        /// </summary>
-        /// <param name="options"> Fetch Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<FlowResource> FetchAsync(FetchFlowOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a specific Flow.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static FlowResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchFlowOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a specific Flow.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<FlowResource> FetchAsync(string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchFlowOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteFlowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Studio,
-                "/v2/Flows/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Flow.
-        /// </summary>
-        /// <param name="options"> Delete Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static bool Delete(DeleteFlowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Flow.
-        /// </summary>
-        /// <param name="options"> Delete Flow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFlowOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Flow.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Flow </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFlowOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Flow.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Flow </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteFlowOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FlowResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FlowResource object represented by the provided JSON </returns>
-        public static FlowResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FlowResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the Flow
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// JSON representation of flow definition
-        /// </summary>
-        [JsonProperty("definition")]
-        public object Definition { get; private set; }
-        /// <summary>
-        /// The status of the Flow
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FlowResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The latest revision number of the Flow's definition
-        /// </summary>
-        [JsonProperty("revision")]
-        public int? Revision { get; private set; }
-        /// <summary>
-        /// Description of change made in the revision
-        /// </summary>
-        [JsonProperty("commit_message")]
-        public string CommitMessage { get; private set; }
-        /// <summary>
-        /// Boolean if the flow definition is valid
-        /// </summary>
-        [JsonProperty("valid")]
-        public bool? Valid { get; private set; }
-        /// <summary>
-        /// List of error in the flow definition
-        /// </summary>
-        [JsonProperty("errors")]
-        public List<object> Errors { get; private set; }
-        /// <summary>
-        /// List of warnings in the flow definition
-        /// </summary>
-        [JsonProperty("warnings")]
-        public List<object> Warnings { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The webhook_url
-        /// </summary>
-        [JsonProperty("webhook_url")]
-        public Uri WebhookUrl { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Nested resource URLs
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private FlowResource()
-        {
-
-        }
-    }
+{
+
+  public class FlowResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Draft = new StatusEnum("draft");
+      public static readonly StatusEnum Published = new StatusEnum("published");
+    }
+
+    private static Request BuildCreateRequest(CreateFlowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Studio,
+          "/v2/Flows",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a Flow.
+    /// </summary>
+    /// <param name="options"> Create Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static FlowResource Create(CreateFlowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a Flow.
+    /// </summary>
+    /// <param name="options"> Create Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<FlowResource> CreateAsync(CreateFlowOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a Flow.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
+    /// <param name="status"> The status of the Flow </param>
+    /// <param name="definition"> JSON representation of flow definition </param>
+    /// <param name="commitMessage"> Description of change made in the revision </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static FlowResource Create(string friendlyName,
+                                      FlowResource.StatusEnum status,
+                                      object definition,
+                                      string commitMessage = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateFlowOptions(friendlyName, status, definition) { CommitMessage = commitMessage };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a Flow.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
+    /// <param name="status"> The status of the Flow </param>
+    /// <param name="definition"> JSON representation of flow definition </param>
+    /// <param name="commitMessage"> Description of change made in the revision </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<FlowResource> CreateAsync(string friendlyName,
+                                                                              FlowResource.StatusEnum status,
+                                                                              object definition,
+                                                                              string commitMessage = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateFlowOptions(friendlyName, status, definition) { CommitMessage = commitMessage };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateFlowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a Flow.
+    /// </summary>
+    /// <param name="options"> Update Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static FlowResource Update(UpdateFlowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a Flow.
+    /// </summary>
+    /// <param name="options"> Update Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<FlowResource> UpdateAsync(UpdateFlowOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a Flow.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="status"> The status of the Flow </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
+    /// <param name="definition"> JSON representation of flow definition </param>
+    /// <param name="commitMessage"> Description of change made in the revision </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static FlowResource Update(string pathSid,
+                                      FlowResource.StatusEnum status,
+                                      string friendlyName = null,
+                                      object definition = null,
+                                      string commitMessage = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateFlowOptions(pathSid, status) { FriendlyName = friendlyName, Definition = definition, CommitMessage = commitMessage };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a Flow.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="status"> The status of the Flow </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
+    /// <param name="definition"> JSON representation of flow definition </param>
+    /// <param name="commitMessage"> Description of change made in the revision </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<FlowResource> UpdateAsync(string pathSid,
+                                                                              FlowResource.StatusEnum status,
+                                                                              string friendlyName = null,
+                                                                              object definition = null,
+                                                                              string commitMessage = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateFlowOptions(pathSid, status) { FriendlyName = friendlyName, Definition = definition, CommitMessage = commitMessage };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadFlowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v2/Flows",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Flows.
+    /// </summary>
+    /// <param name="options"> Read Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static ResourceSet<FlowResource> Read(ReadFlowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FlowResource>.FromJson("flows", response.Content);
+      return new ResourceSet<FlowResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Flows.
+    /// </summary>
+    /// <param name="options"> Read Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FlowResource>> ReadAsync(ReadFlowOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FlowResource>.FromJson("flows", response.Content);
+      return new ResourceSet<FlowResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Flows.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static ResourceSet<FlowResource> Read(int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadFlowOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Flows.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FlowResource>> ReadAsync(int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadFlowOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FlowResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FlowResource>.FromJson("flows", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FlowResource> NextPage(Page<FlowResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<FlowResource>.FromJson("flows", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FlowResource> PreviousPage(Page<FlowResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Studio)
+      );
+
+      var response = client.Request(request);
+      return Page<FlowResource>.FromJson("flows", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchFlowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a specific Flow.
+    /// </summary>
+    /// <param name="options"> Fetch Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static FlowResource Fetch(FetchFlowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Flow.
+    /// </summary>
+    /// <param name="options"> Fetch Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<FlowResource> FetchAsync(FetchFlowOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a specific Flow.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static FlowResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchFlowOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a specific Flow.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<FlowResource> FetchAsync(string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchFlowOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteFlowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Studio,
+          "/v2/Flows/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Flow.
+    /// </summary>
+    /// <param name="options"> Delete Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static bool Delete(DeleteFlowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Flow.
+    /// </summary>
+    /// <param name="options"> Delete Flow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFlowOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Flow.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Flow </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFlowOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Flow.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Flow </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteFlowOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FlowResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FlowResource object represented by the provided JSON </returns>
+    public static FlowResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FlowResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the Flow
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// JSON representation of flow definition
+    /// </summary>
+    [JsonProperty("definition")]
+    public object Definition { get; private set; }
+    /// <summary>
+    /// The status of the Flow
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FlowResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The latest revision number of the Flow's definition
+    /// </summary>
+    [JsonProperty("revision")]
+    public int? Revision { get; private set; }
+    /// <summary>
+    /// Description of change made in the revision
+    /// </summary>
+    [JsonProperty("commit_message")]
+    public string CommitMessage { get; private set; }
+    /// <summary>
+    /// Boolean if the flow definition is valid
+    /// </summary>
+    [JsonProperty("valid")]
+    public bool? Valid { get; private set; }
+    /// <summary>
+    /// List of error in the flow definition
+    /// </summary>
+    [JsonProperty("errors")]
+    public List<object> Errors { get; private set; }
+    /// <summary>
+    /// List of warnings in the flow definition
+    /// </summary>
+    [JsonProperty("warnings")]
+    public List<object> Warnings { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The webhook_url
+    /// </summary>
+    [JsonProperty("webhook_url")]
+    public Uri WebhookUrl { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Nested resource URLs
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private FlowResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/FlowValidateOptions.cs b/src/Twilio/Rest/Studio/V2/FlowValidateOptions.cs
index c05fe6180..d2f099ca5 100644
--- a/src/Twilio/Rest/Studio/V2/FlowValidateOptions.cs
+++ b/src/Twilio/Rest/Studio/V2/FlowValidateOptions.cs
@@ -9,71 +9,71 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Studio.V2
-{
-
+{
+
+  /// <summary>
+  /// Validate flow JSON definition
+  /// </summary>
+  public class UpdateFlowValidateOptions : IOptions<FlowValidateResource>
+  {
     /// <summary>
-    /// Validate flow JSON definition
+    /// The string that you assigned to describe the Flow
     /// </summary>
-    public class UpdateFlowValidateOptions : IOptions<FlowValidateResource>
-    {
-        /// <summary>
-        /// The string that you assigned to describe the Flow
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The status of the Flow
-        /// </summary>
-        public FlowValidateResource.StatusEnum Status { get; }
-        /// <summary>
-        /// JSON representation of flow definition
-        /// </summary>
-        public object Definition { get; }
-        /// <summary>
-        /// Description of change made in the revision
-        /// </summary>
-        public string CommitMessage { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateFlowValidateOptions
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
-        /// <param name="status"> The status of the Flow </param>
-        /// <param name="definition"> JSON representation of flow definition </param>
-        public UpdateFlowValidateOptions(string friendlyName, FlowValidateResource.StatusEnum status, object definition)
-        {
-            FriendlyName = friendlyName;
-            Status = status;
-            Definition = definition;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Definition != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Definition", Serializers.JsonObject(Definition)));
-            }
-
-            if (CommitMessage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommitMessage", CommitMessage));
-            }
-
-            return p;
-        }
-    }
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The status of the Flow
+    /// </summary>
+    public FlowValidateResource.StatusEnum Status { get; }
+    /// <summary>
+    /// JSON representation of flow definition
+    /// </summary>
+    public object Definition { get; }
+    /// <summary>
+    /// Description of change made in the revision
+    /// </summary>
+    public string CommitMessage { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateFlowValidateOptions
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
+    /// <param name="status"> The status of the Flow </param>
+    /// <param name="definition"> JSON representation of flow definition </param>
+    public UpdateFlowValidateOptions(string friendlyName, FlowValidateResource.StatusEnum status, object definition)
+    {
+      FriendlyName = friendlyName;
+      Status = status;
+      Definition = definition;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Definition != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Definition", Serializers.JsonObject(Definition)));
+      }
+
+      if (CommitMessage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommitMessage", CommitMessage));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Studio/V2/FlowValidateResource.cs b/src/Twilio/Rest/Studio/V2/FlowValidateResource.cs
index 91090516d..ea22714c4 100644
--- a/src/Twilio/Rest/Studio/V2/FlowValidateResource.cs
+++ b/src/Twilio/Rest/Studio/V2/FlowValidateResource.cs
@@ -17,131 +17,131 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Studio.V2
-{
-
-    public class FlowValidateResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Draft = new StatusEnum("draft");
-            public static readonly StatusEnum Published = new StatusEnum("published");
-        }
-
-        private static Request BuildUpdateRequest(UpdateFlowValidateOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Studio,
-                "/v2/Flows/Validate",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Validate flow JSON definition
-        /// </summary>
-        /// <param name="options"> Update FlowValidate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlowValidate </returns>
-        public static FlowValidateResource Update(UpdateFlowValidateOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Validate flow JSON definition
-        /// </summary>
-        /// <param name="options"> Update FlowValidate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlowValidate </returns>
-        public static async System.Threading.Tasks.Task<FlowValidateResource> UpdateAsync(UpdateFlowValidateOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Validate flow JSON definition
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
-        /// <param name="status"> The status of the Flow </param>
-        /// <param name="definition"> JSON representation of flow definition </param>
-        /// <param name="commitMessage"> Description of change made in the revision </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of FlowValidate </returns>
-        public static FlowValidateResource Update(string friendlyName,
-                                                  FlowValidateResource.StatusEnum status,
-                                                  object definition,
-                                                  string commitMessage = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateFlowValidateOptions(friendlyName, status, definition){CommitMessage = commitMessage};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Validate flow JSON definition
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
-        /// <param name="status"> The status of the Flow </param>
-        /// <param name="definition"> JSON representation of flow definition </param>
-        /// <param name="commitMessage"> Description of change made in the revision </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of FlowValidate </returns>
-        public static async System.Threading.Tasks.Task<FlowValidateResource> UpdateAsync(string friendlyName,
-                                                                                          FlowValidateResource.StatusEnum status,
-                                                                                          object definition,
-                                                                                          string commitMessage = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateFlowValidateOptions(friendlyName, status, definition){CommitMessage = commitMessage};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FlowValidateResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FlowValidateResource object represented by the provided JSON </returns>
-        public static FlowValidateResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FlowValidateResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Boolean if the flow definition is valid
-        /// </summary>
-        [JsonProperty("valid")]
-        public bool? Valid { get; private set; }
-
-        private FlowValidateResource()
-        {
-
-        }
-    }
+{
+
+  public class FlowValidateResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Draft = new StatusEnum("draft");
+      public static readonly StatusEnum Published = new StatusEnum("published");
+    }
+
+    private static Request BuildUpdateRequest(UpdateFlowValidateOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Studio,
+          "/v2/Flows/Validate",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Validate flow JSON definition
+    /// </summary>
+    /// <param name="options"> Update FlowValidate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlowValidate </returns>
+    public static FlowValidateResource Update(UpdateFlowValidateOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Validate flow JSON definition
+    /// </summary>
+    /// <param name="options"> Update FlowValidate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlowValidate </returns>
+    public static async System.Threading.Tasks.Task<FlowValidateResource> UpdateAsync(UpdateFlowValidateOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Validate flow JSON definition
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
+    /// <param name="status"> The status of the Flow </param>
+    /// <param name="definition"> JSON representation of flow definition </param>
+    /// <param name="commitMessage"> Description of change made in the revision </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of FlowValidate </returns>
+    public static FlowValidateResource Update(string friendlyName,
+                                              FlowValidateResource.StatusEnum status,
+                                              object definition,
+                                              string commitMessage = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateFlowValidateOptions(friendlyName, status, definition) { CommitMessage = commitMessage };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Validate flow JSON definition
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the Flow </param>
+    /// <param name="status"> The status of the Flow </param>
+    /// <param name="definition"> JSON representation of flow definition </param>
+    /// <param name="commitMessage"> Description of change made in the revision </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of FlowValidate </returns>
+    public static async System.Threading.Tasks.Task<FlowValidateResource> UpdateAsync(string friendlyName,
+                                                                                      FlowValidateResource.StatusEnum status,
+                                                                                      object definition,
+                                                                                      string commitMessage = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateFlowValidateOptions(friendlyName, status, definition) { CommitMessage = commitMessage };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FlowValidateResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FlowValidateResource object represented by the provided JSON </returns>
+    public static FlowValidateResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FlowValidateResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Boolean if the flow definition is valid
+    /// </summary>
+    [JsonProperty("valid")]
+    public bool? Valid { get; private set; }
+
+    private FlowValidateResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/CommandOptions.cs b/src/Twilio/Rest/Supersim/V1/CommandOptions.cs
index fbd5487e7..021d7cc41 100644
--- a/src/Twilio/Rest/Supersim/V1/CommandOptions.cs
+++ b/src/Twilio/Rest/Supersim/V1/CommandOptions.cs
@@ -9,152 +9,152 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Send a Command to a Sim.
+  /// </summary>
+  public class CreateCommandOptions : IOptions<CommandResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Send a Command to a Sim.
+    /// The sid or unique_name of the SIM to send the Command to
     /// </summary>
-    public class CreateCommandOptions : IOptions<CommandResource>
-    {
-        /// <summary>
-        /// The sid or unique_name of the SIM to send the Command to
-        /// </summary>
-        public string Sim { get; }
-        /// <summary>
-        /// The message body of the command
-        /// </summary>
-        public string Command { get; }
-        /// <summary>
-        /// The HTTP method we should use to call callback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod CallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we should call after we have sent the command
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCommandOptions
-        /// </summary>
-        /// <param name="sim"> The sid or unique_name of the SIM to send the Command to </param>
-        /// <param name="command"> The message body of the command </param>
-        public CreateCommandOptions(string sim, string command)
-        {
-            Sim = sim;
-            Command = command;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Sim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sim", Sim.ToString()));
-            }
-
-            if (Command != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Command", Command));
-            }
-
-            if (CallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            return p;
-        }
-    }
-
+    public string Sim { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a Command instance from your account.
+    /// The message body of the command
     /// </summary>
-    public class FetchCommandOptions : IOptions<CommandResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCommandOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchCommandOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string Command { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of Commands from your account.
+    /// The HTTP method we should use to call callback_url
     /// </summary>
-    public class ReadCommandOptions : ReadOptions<CommandResource>
-    {
-        /// <summary>
-        /// The SID or unique name of the Sim that Command was sent to or from.
-        /// </summary>
-        public string Sim { get; set; }
-        /// <summary>
-        /// The status of the Command
-        /// </summary>
-        public CommandResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The direction of the Command
-        /// </summary>
-        public CommandResource.DirectionEnum Direction { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Sim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sim", Sim.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Direction != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Direction", Direction.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public Twilio.Http.HttpMethod CallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we should call after we have sent the command
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCommandOptions
+    /// </summary>
+    /// <param name="sim"> The sid or unique_name of the SIM to send the Command to </param>
+    /// <param name="command"> The message body of the command </param>
+    public CreateCommandOptions(string sim, string command)
+    {
+      Sim = sim;
+      Command = command;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Sim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sim", Sim.ToString()));
+      }
+
+      if (Command != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Command", Command));
+      }
+
+      if (CallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a Command instance from your account.
+  /// </summary>
+  public class FetchCommandOptions : IOptions<CommandResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCommandOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchCommandOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of Commands from your account.
+  /// </summary>
+  public class ReadCommandOptions : ReadOptions<CommandResource>
+  {
+    /// <summary>
+    /// The SID or unique name of the Sim that Command was sent to or from.
+    /// </summary>
+    public string Sim { get; set; }
+    /// <summary>
+    /// The status of the Command
+    /// </summary>
+    public CommandResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The direction of the Command
+    /// </summary>
+    public CommandResource.DirectionEnum Direction { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Sim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sim", Sim.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Direction != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Direction", Direction.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/CommandResource.cs b/src/Twilio/Rest/Supersim/V1/CommandResource.cs
index 04607ee43..ea9cc119d 100644
--- a/src/Twilio/Rest/Supersim/V1/CommandResource.cs
+++ b/src/Twilio/Rest/Supersim/V1/CommandResource.cs
@@ -19,397 +19,397 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
-    public class CommandResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Queued = new StatusEnum("queued");
-            public static readonly StatusEnum Sent = new StatusEnum("sent");
-            public static readonly StatusEnum Delivered = new StatusEnum("delivered");
-            public static readonly StatusEnum Received = new StatusEnum("received");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        public sealed class DirectionEnum : StringEnum
-        {
-            private DirectionEnum(string value) : base(value) {}
-            public DirectionEnum() {}
-            public static implicit operator DirectionEnum(string value)
-            {
-                return new DirectionEnum(value);
-            }
-
-            public static readonly DirectionEnum ToSim = new DirectionEnum("to_sim");
-            public static readonly DirectionEnum FromSim = new DirectionEnum("from_sim");
-        }
-
-        private static Request BuildCreateRequest(CreateCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Supersim,
-                "/v1/Commands",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Send a Command to a Sim.
-        /// </summary>
-        /// <param name="options"> Create Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static CommandResource Create(CreateCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Send a Command to a Sim.
-        /// </summary>
-        /// <param name="options"> Create Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<CommandResource> CreateAsync(CreateCommandOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Send a Command to a Sim.
-        /// </summary>
-        /// <param name="sim"> The sid or unique_name of the SIM to send the Command to </param>
-        /// <param name="command"> The message body of the command </param>
-        /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
-        /// <param name="callbackUrl"> The URL we should call after we have sent the command </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static CommandResource Create(string sim,
-                                             string command,
-                                             Twilio.Http.HttpMethod callbackMethod = null,
-                                             Uri callbackUrl = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateCommandOptions(sim, command){CallbackMethod = callbackMethod, CallbackUrl = callbackUrl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Send a Command to a Sim.
-        /// </summary>
-        /// <param name="sim"> The sid or unique_name of the SIM to send the Command to </param>
-        /// <param name="command"> The message body of the command </param>
-        /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
-        /// <param name="callbackUrl"> The URL we should call after we have sent the command </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<CommandResource> CreateAsync(string sim,
-                                                                                     string command,
-                                                                                     Twilio.Http.HttpMethod callbackMethod = null,
-                                                                                     Uri callbackUrl = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateCommandOptions(sim, command){CallbackMethod = callbackMethod, CallbackUrl = callbackUrl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/Commands/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a Command instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static CommandResource Fetch(FetchCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Command instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<CommandResource> FetchAsync(FetchCommandOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a Command instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static CommandResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCommandOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Command instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<CommandResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchCommandOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/Commands",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Commands from your account.
-        /// </summary>
-        /// <param name="options"> Read Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static ResourceSet<CommandResource> Read(ReadCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CommandResource>.FromJson("commands", response.Content);
-            return new ResourceSet<CommandResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Commands from your account.
-        /// </summary>
-        /// <param name="options"> Read Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CommandResource>> ReadAsync(ReadCommandOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CommandResource>.FromJson("commands", response.Content);
-            return new ResourceSet<CommandResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Commands from your account.
-        /// </summary>
-        /// <param name="sim"> The SID or unique name of the Sim that Command was sent to or from. </param>
-        /// <param name="status"> The status of the Command </param>
-        /// <param name="direction"> The direction of the Command </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static ResourceSet<CommandResource> Read(string sim = null,
-                                                        CommandResource.StatusEnum status = null,
-                                                        CommandResource.DirectionEnum direction = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadCommandOptions(){Sim = sim, Status = status, Direction = direction, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Commands from your account.
-        /// </summary>
-        /// <param name="sim"> The SID or unique name of the Sim that Command was sent to or from. </param>
-        /// <param name="status"> The status of the Command </param>
-        /// <param name="direction"> The direction of the Command </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CommandResource>> ReadAsync(string sim = null,
-                                                                                                CommandResource.StatusEnum status = null,
-                                                                                                CommandResource.DirectionEnum direction = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadCommandOptions(){Sim = sim, Status = status, Direction = direction, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CommandResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CommandResource>.FromJson("commands", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CommandResource> NextPage(Page<CommandResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<CommandResource>.FromJson("commands", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CommandResource> PreviousPage(Page<CommandResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<CommandResource>.FromJson("commands", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a CommandResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CommandResource object represented by the provided JSON </returns>
-        public static CommandResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CommandResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the SIM that this Command was sent to or from
-        /// </summary>
-        [JsonProperty("sim_sid")]
-        public string SimSid { get; private set; }
-        /// <summary>
-        /// The message body of the command sent to or from the SIM
-        /// </summary>
-        [JsonProperty("command")]
-        public string Command { get; private set; }
-        /// <summary>
-        /// The status of the Command
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CommandResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The direction of the Command
-        /// </summary>
-        [JsonProperty("direction")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CommandResource.DirectionEnum Direction { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Command resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CommandResource()
-        {
-
-        }
-    }
+{
+
+  public class CommandResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Queued = new StatusEnum("queued");
+      public static readonly StatusEnum Sent = new StatusEnum("sent");
+      public static readonly StatusEnum Delivered = new StatusEnum("delivered");
+      public static readonly StatusEnum Received = new StatusEnum("received");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    public sealed class DirectionEnum : StringEnum
+    {
+      private DirectionEnum(string value) : base(value) { }
+      public DirectionEnum() { }
+      public static implicit operator DirectionEnum(string value)
+      {
+        return new DirectionEnum(value);
+      }
+
+      public static readonly DirectionEnum ToSim = new DirectionEnum("to_sim");
+      public static readonly DirectionEnum FromSim = new DirectionEnum("from_sim");
+    }
+
+    private static Request BuildCreateRequest(CreateCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Supersim,
+          "/v1/Commands",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Send a Command to a Sim.
+    /// </summary>
+    /// <param name="options"> Create Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static CommandResource Create(CreateCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Send a Command to a Sim.
+    /// </summary>
+    /// <param name="options"> Create Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<CommandResource> CreateAsync(CreateCommandOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Send a Command to a Sim.
+    /// </summary>
+    /// <param name="sim"> The sid or unique_name of the SIM to send the Command to </param>
+    /// <param name="command"> The message body of the command </param>
+    /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
+    /// <param name="callbackUrl"> The URL we should call after we have sent the command </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static CommandResource Create(string sim,
+                                         string command,
+                                         Twilio.Http.HttpMethod callbackMethod = null,
+                                         Uri callbackUrl = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateCommandOptions(sim, command) { CallbackMethod = callbackMethod, CallbackUrl = callbackUrl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Send a Command to a Sim.
+    /// </summary>
+    /// <param name="sim"> The sid or unique_name of the SIM to send the Command to </param>
+    /// <param name="command"> The message body of the command </param>
+    /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
+    /// <param name="callbackUrl"> The URL we should call after we have sent the command </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<CommandResource> CreateAsync(string sim,
+                                                                                 string command,
+                                                                                 Twilio.Http.HttpMethod callbackMethod = null,
+                                                                                 Uri callbackUrl = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateCommandOptions(sim, command) { CallbackMethod = callbackMethod, CallbackUrl = callbackUrl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/Commands/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a Command instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static CommandResource Fetch(FetchCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Command instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<CommandResource> FetchAsync(FetchCommandOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a Command instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static CommandResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCommandOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Command instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<CommandResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchCommandOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/Commands",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Commands from your account.
+    /// </summary>
+    /// <param name="options"> Read Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static ResourceSet<CommandResource> Read(ReadCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CommandResource>.FromJson("commands", response.Content);
+      return new ResourceSet<CommandResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Commands from your account.
+    /// </summary>
+    /// <param name="options"> Read Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CommandResource>> ReadAsync(ReadCommandOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CommandResource>.FromJson("commands", response.Content);
+      return new ResourceSet<CommandResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Commands from your account.
+    /// </summary>
+    /// <param name="sim"> The SID or unique name of the Sim that Command was sent to or from. </param>
+    /// <param name="status"> The status of the Command </param>
+    /// <param name="direction"> The direction of the Command </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static ResourceSet<CommandResource> Read(string sim = null,
+                                                    CommandResource.StatusEnum status = null,
+                                                    CommandResource.DirectionEnum direction = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadCommandOptions() { Sim = sim, Status = status, Direction = direction, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Commands from your account.
+    /// </summary>
+    /// <param name="sim"> The SID or unique name of the Sim that Command was sent to or from. </param>
+    /// <param name="status"> The status of the Command </param>
+    /// <param name="direction"> The direction of the Command </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CommandResource>> ReadAsync(string sim = null,
+                                                                                            CommandResource.StatusEnum status = null,
+                                                                                            CommandResource.DirectionEnum direction = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadCommandOptions() { Sim = sim, Status = status, Direction = direction, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CommandResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CommandResource>.FromJson("commands", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CommandResource> NextPage(Page<CommandResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<CommandResource>.FromJson("commands", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CommandResource> PreviousPage(Page<CommandResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<CommandResource>.FromJson("commands", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a CommandResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CommandResource object represented by the provided JSON </returns>
+    public static CommandResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CommandResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the SIM that this Command was sent to or from
+    /// </summary>
+    [JsonProperty("sim_sid")]
+    public string SimSid { get; private set; }
+    /// <summary>
+    /// The message body of the command sent to or from the SIM
+    /// </summary>
+    [JsonProperty("command")]
+    public string Command { get; private set; }
+    /// <summary>
+    /// The status of the Command
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CommandResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The direction of the Command
+    /// </summary>
+    [JsonProperty("direction")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CommandResource.DirectionEnum Direction { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Command resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CommandResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/FleetOptions.cs b/src/Twilio/Rest/Supersim/V1/FleetOptions.cs
index 8f02fd73f..c0fa7f642 100644
--- a/src/Twilio/Rest/Supersim/V1/FleetOptions.cs
+++ b/src/Twilio/Rest/Supersim/V1/FleetOptions.cs
@@ -9,271 +9,271 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a Fleet
+  /// </summary>
+  public class CreateFleetOptions : IOptions<FleetResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a Fleet
+    /// The SID or unique name of the Network Access Profile of the Fleet
     /// </summary>
-    public class CreateFleetOptions : IOptions<FleetResource>
-    {
-        /// <summary>
-        /// The SID or unique name of the Network Access Profile of the Fleet
-        /// </summary>
-        public string NetworkAccessProfile { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// Defines whether SIMs in the Fleet are capable of using data connectivity
-        /// </summary>
-        public bool? DataEnabled { get; set; }
-        /// <summary>
-        /// The total data usage (download and upload combined) in Megabytes that each Sim resource assigned to the Fleet resource can consume
-        /// </summary>
-        public int? DataLimit { get; set; }
-        /// <summary>
-        /// Defines whether SIMs in the Fleet are capable of sending and receiving machine-to-machine SMS via Commands
-        /// </summary>
-        public bool? CommandsEnabled { get; set; }
-        /// <summary>
-        /// The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS from your device to the Commands number
-        /// </summary>
-        public Uri CommandsUrl { get; set; }
-        /// <summary>
-        /// A string representing the HTTP method to use when making a request to `commands_url`
-        /// </summary>
-        public Twilio.Http.HttpMethod CommandsMethod { get; set; }
-        /// <summary>
-        /// Defines whether SIMs in the Fleet are capable of sending and receiving machine-to-machine SMS via Commands
-        /// </summary>
-        public bool? SmsCommandsEnabled { get; set; }
-        /// <summary>
-        /// The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS from your device to the SMS Commands number
-        /// </summary>
-        public Uri SmsCommandsUrl { get; set; }
-        /// <summary>
-        /// A string representing the HTTP method to use when making a request to `sms_commands_url`
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsCommandsMethod { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateFleetOptions
-        /// </summary>
-        /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
-        public CreateFleetOptions(string networkAccessProfile)
-        {
-            NetworkAccessProfile = networkAccessProfile;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (NetworkAccessProfile != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NetworkAccessProfile", NetworkAccessProfile.ToString()));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (DataEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DataEnabled", DataEnabled.Value.ToString().ToLower()));
-            }
-
-            if (DataLimit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DataLimit", DataLimit.ToString()));
-            }
-
-            if (CommandsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommandsEnabled", CommandsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (CommandsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommandsUrl", Serializers.Url(CommandsUrl)));
-            }
-
-            if (CommandsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommandsMethod", CommandsMethod.ToString()));
-            }
-
-            if (SmsCommandsEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsCommandsEnabled", SmsCommandsEnabled.Value.ToString().ToLower()));
-            }
-
-            if (SmsCommandsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsCommandsUrl", Serializers.Url(SmsCommandsUrl)));
-            }
-
-            if (SmsCommandsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsCommandsMethod", SmsCommandsMethod.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string NetworkAccessProfile { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a Fleet instance from your account.
+    /// An application-defined string that uniquely identifies the resource
     /// </summary>
-    public class FetchFleetOptions : IOptions<FleetResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFleetOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchFleetOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string UniqueName { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of Fleets from your account.
+    /// Defines whether SIMs in the Fleet are capable of using data connectivity
     /// </summary>
-    public class ReadFleetOptions : ReadOptions<FleetResource>
-    {
-        /// <summary>
-        /// The SID or unique name of the Network Access Profile of the Fleet
-        /// </summary>
-        public string NetworkAccessProfile { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (NetworkAccessProfile != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NetworkAccessProfile", NetworkAccessProfile.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public bool? DataEnabled { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Updates the given properties of a Super SIM Fleet instance from your account.
+    /// The total data usage (download and upload combined) in Megabytes that each Sim resource assigned to the Fleet resource can consume
     /// </summary>
-    public class UpdateFleetOptions : IOptions<FleetResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The SID or unique name of the Network Access Profile of the Fleet
-        /// </summary>
-        public string NetworkAccessProfile { get; set; }
-        /// <summary>
-        /// The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS from your device to the Commands number
-        /// </summary>
-        public Uri CommandsUrl { get; set; }
-        /// <summary>
-        /// A string representing the HTTP method to use when making a request to `commands_url`
-        /// </summary>
-        public Twilio.Http.HttpMethod CommandsMethod { get; set; }
-        /// <summary>
-        /// The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS from your device to the SMS Commands number
-        /// </summary>
-        public Uri SmsCommandsUrl { get; set; }
-        /// <summary>
-        /// A string representing the HTTP method to use when making a request to `sms_commands_url`
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsCommandsMethod { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateFleetOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        public UpdateFleetOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (NetworkAccessProfile != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NetworkAccessProfile", NetworkAccessProfile.ToString()));
-            }
-
-            if (CommandsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommandsUrl", Serializers.Url(CommandsUrl)));
-            }
-
-            if (CommandsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommandsMethod", CommandsMethod.ToString()));
-            }
-
-            if (SmsCommandsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsCommandsUrl", Serializers.Url(SmsCommandsUrl)));
-            }
-
-            if (SmsCommandsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsCommandsMethod", SmsCommandsMethod.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public int? DataLimit { get; set; }
+    /// <summary>
+    /// Defines whether SIMs in the Fleet are capable of sending and receiving machine-to-machine SMS via Commands
+    /// </summary>
+    public bool? CommandsEnabled { get; set; }
+    /// <summary>
+    /// The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS from your device to the Commands number
+    /// </summary>
+    public Uri CommandsUrl { get; set; }
+    /// <summary>
+    /// A string representing the HTTP method to use when making a request to `commands_url`
+    /// </summary>
+    public Twilio.Http.HttpMethod CommandsMethod { get; set; }
+    /// <summary>
+    /// Defines whether SIMs in the Fleet are capable of sending and receiving machine-to-machine SMS via Commands
+    /// </summary>
+    public bool? SmsCommandsEnabled { get; set; }
+    /// <summary>
+    /// The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS from your device to the SMS Commands number
+    /// </summary>
+    public Uri SmsCommandsUrl { get; set; }
+    /// <summary>
+    /// A string representing the HTTP method to use when making a request to `sms_commands_url`
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsCommandsMethod { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateFleetOptions
+    /// </summary>
+    /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
+    public CreateFleetOptions(string networkAccessProfile)
+    {
+      NetworkAccessProfile = networkAccessProfile;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (NetworkAccessProfile != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NetworkAccessProfile", NetworkAccessProfile.ToString()));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (DataEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DataEnabled", DataEnabled.Value.ToString().ToLower()));
+      }
+
+      if (DataLimit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DataLimit", DataLimit.ToString()));
+      }
+
+      if (CommandsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommandsEnabled", CommandsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (CommandsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommandsUrl", Serializers.Url(CommandsUrl)));
+      }
+
+      if (CommandsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommandsMethod", CommandsMethod.ToString()));
+      }
+
+      if (SmsCommandsEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsCommandsEnabled", SmsCommandsEnabled.Value.ToString().ToLower()));
+      }
+
+      if (SmsCommandsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsCommandsUrl", Serializers.Url(SmsCommandsUrl)));
+      }
+
+      if (SmsCommandsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsCommandsMethod", SmsCommandsMethod.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a Fleet instance from your account.
+  /// </summary>
+  public class FetchFleetOptions : IOptions<FleetResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchFleetOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchFleetOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of Fleets from your account.
+  /// </summary>
+  public class ReadFleetOptions : ReadOptions<FleetResource>
+  {
+    /// <summary>
+    /// The SID or unique name of the Network Access Profile of the Fleet
+    /// </summary>
+    public string NetworkAccessProfile { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (NetworkAccessProfile != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NetworkAccessProfile", NetworkAccessProfile.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Updates the given properties of a Super SIM Fleet instance from your account.
+  /// </summary>
+  public class UpdateFleetOptions : IOptions<FleetResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The SID or unique name of the Network Access Profile of the Fleet
+    /// </summary>
+    public string NetworkAccessProfile { get; set; }
+    /// <summary>
+    /// The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS from your device to the Commands number
+    /// </summary>
+    public Uri CommandsUrl { get; set; }
+    /// <summary>
+    /// A string representing the HTTP method to use when making a request to `commands_url`
+    /// </summary>
+    public Twilio.Http.HttpMethod CommandsMethod { get; set; }
+    /// <summary>
+    /// The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS from your device to the SMS Commands number
+    /// </summary>
+    public Uri SmsCommandsUrl { get; set; }
+    /// <summary>
+    /// A string representing the HTTP method to use when making a request to `sms_commands_url`
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsCommandsMethod { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateFleetOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    public UpdateFleetOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (NetworkAccessProfile != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NetworkAccessProfile", NetworkAccessProfile.ToString()));
+      }
+
+      if (CommandsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommandsUrl", Serializers.Url(CommandsUrl)));
+      }
+
+      if (CommandsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommandsMethod", CommandsMethod.ToString()));
+      }
+
+      if (SmsCommandsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsCommandsUrl", Serializers.Url(SmsCommandsUrl)));
+      }
+
+      if (SmsCommandsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsCommandsMethod", SmsCommandsMethod.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/FleetResource.cs b/src/Twilio/Rest/Supersim/V1/FleetResource.cs
index 12961e68f..9f2425c72 100644
--- a/src/Twilio/Rest/Supersim/V1/FleetResource.cs
+++ b/src/Twilio/Rest/Supersim/V1/FleetResource.cs
@@ -19,546 +19,546 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
-    public class FleetResource : Resource
-    {
-        public sealed class DataMeteringEnum : StringEnum
-        {
-            private DataMeteringEnum(string value) : base(value) {}
-            public DataMeteringEnum() {}
-            public static implicit operator DataMeteringEnum(string value)
-            {
-                return new DataMeteringEnum(value);
-            }
-
-            public static readonly DataMeteringEnum Payg = new DataMeteringEnum("payg");
-        }
-
-        private static Request BuildCreateRequest(CreateFleetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Supersim,
-                "/v1/Fleets",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a Fleet
-        /// </summary>
-        /// <param name="options"> Create Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static FleetResource Create(CreateFleetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a Fleet
-        /// </summary>
-        /// <param name="options"> Create Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<FleetResource> CreateAsync(CreateFleetOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a Fleet
-        /// </summary>
-        /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="dataEnabled"> Defines whether SIMs in the Fleet are capable of using data connectivity </param>
-        /// <param name="dataLimit"> The total data usage (download and upload combined) in Megabytes that each Sim resource
-        ///                 assigned to the Fleet resource can consume </param>
-        /// <param name="commandsEnabled"> Defines whether SIMs in the Fleet are capable of sending and receiving
-        ///                       machine-to-machine SMS via Commands </param>
-        /// <param name="commandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS
-        ///                   from your device to the Commands number </param>
-        /// <param name="commandsMethod"> A string representing the HTTP method to use when making a request to `commands_url`
-        ///                      </param>
-        /// <param name="smsCommandsEnabled"> Defines whether SIMs in the Fleet are capable of sending and receiving
-        ///                          machine-to-machine SMS via Commands </param>
-        /// <param name="smsCommandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an
-        ///                      SMS from your device to the SMS Commands number </param>
-        /// <param name="smsCommandsMethod"> A string representing the HTTP method to use when making a request to
-        ///                         `sms_commands_url` </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static FleetResource Create(string networkAccessProfile,
-                                           string uniqueName = null,
-                                           bool? dataEnabled = null,
-                                           int? dataLimit = null,
-                                           bool? commandsEnabled = null,
-                                           Uri commandsUrl = null,
-                                           Twilio.Http.HttpMethod commandsMethod = null,
-                                           bool? smsCommandsEnabled = null,
-                                           Uri smsCommandsUrl = null,
-                                           Twilio.Http.HttpMethod smsCommandsMethod = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateFleetOptions(networkAccessProfile){UniqueName = uniqueName, DataEnabled = dataEnabled, DataLimit = dataLimit, CommandsEnabled = commandsEnabled, CommandsUrl = commandsUrl, CommandsMethod = commandsMethod, SmsCommandsEnabled = smsCommandsEnabled, SmsCommandsUrl = smsCommandsUrl, SmsCommandsMethod = smsCommandsMethod};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a Fleet
-        /// </summary>
-        /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="dataEnabled"> Defines whether SIMs in the Fleet are capable of using data connectivity </param>
-        /// <param name="dataLimit"> The total data usage (download and upload combined) in Megabytes that each Sim resource
-        ///                 assigned to the Fleet resource can consume </param>
-        /// <param name="commandsEnabled"> Defines whether SIMs in the Fleet are capable of sending and receiving
-        ///                       machine-to-machine SMS via Commands </param>
-        /// <param name="commandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS
-        ///                   from your device to the Commands number </param>
-        /// <param name="commandsMethod"> A string representing the HTTP method to use when making a request to `commands_url`
-        ///                      </param>
-        /// <param name="smsCommandsEnabled"> Defines whether SIMs in the Fleet are capable of sending and receiving
-        ///                          machine-to-machine SMS via Commands </param>
-        /// <param name="smsCommandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an
-        ///                      SMS from your device to the SMS Commands number </param>
-        /// <param name="smsCommandsMethod"> A string representing the HTTP method to use when making a request to
-        ///                         `sms_commands_url` </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<FleetResource> CreateAsync(string networkAccessProfile,
-                                                                                   string uniqueName = null,
-                                                                                   bool? dataEnabled = null,
-                                                                                   int? dataLimit = null,
-                                                                                   bool? commandsEnabled = null,
-                                                                                   Uri commandsUrl = null,
-                                                                                   Twilio.Http.HttpMethod commandsMethod = null,
-                                                                                   bool? smsCommandsEnabled = null,
-                                                                                   Uri smsCommandsUrl = null,
-                                                                                   Twilio.Http.HttpMethod smsCommandsMethod = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateFleetOptions(networkAccessProfile){UniqueName = uniqueName, DataEnabled = dataEnabled, DataLimit = dataLimit, CommandsEnabled = commandsEnabled, CommandsUrl = commandsUrl, CommandsMethod = commandsMethod, SmsCommandsEnabled = smsCommandsEnabled, SmsCommandsUrl = smsCommandsUrl, SmsCommandsMethod = smsCommandsMethod};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchFleetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/Fleets/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a Fleet instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static FleetResource Fetch(FetchFleetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Fleet instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<FleetResource> FetchAsync(FetchFleetOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a Fleet instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static FleetResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchFleetOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Fleet instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<FleetResource> FetchAsync(string pathSid,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchFleetOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadFleetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/Fleets",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Fleets from your account.
-        /// </summary>
-        /// <param name="options"> Read Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static ResourceSet<FleetResource> Read(ReadFleetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FleetResource>.FromJson("fleets", response.Content);
-            return new ResourceSet<FleetResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Fleets from your account.
-        /// </summary>
-        /// <param name="options"> Read Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FleetResource>> ReadAsync(ReadFleetOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FleetResource>.FromJson("fleets", response.Content);
-            return new ResourceSet<FleetResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Fleets from your account.
-        /// </summary>
-        /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static ResourceSet<FleetResource> Read(string networkAccessProfile = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadFleetOptions(){NetworkAccessProfile = networkAccessProfile, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Fleets from your account.
-        /// </summary>
-        /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FleetResource>> ReadAsync(string networkAccessProfile = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadFleetOptions(){NetworkAccessProfile = networkAccessProfile, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FleetResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FleetResource>.FromJson("fleets", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FleetResource> NextPage(Page<FleetResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<FleetResource>.FromJson("fleets", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FleetResource> PreviousPage(Page<FleetResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<FleetResource>.FromJson("fleets", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateFleetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Supersim,
-                "/v1/Fleets/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates the given properties of a Super SIM Fleet instance from your account.
-        /// </summary>
-        /// <param name="options"> Update Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static FleetResource Update(UpdateFleetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the given properties of a Super SIM Fleet instance from your account.
-        /// </summary>
-        /// <param name="options"> Update Fleet parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<FleetResource> UpdateAsync(UpdateFleetOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates the given properties of a Super SIM Fleet instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
-        /// <param name="commandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS
-        ///                   from your device to the Commands number </param>
-        /// <param name="commandsMethod"> A string representing the HTTP method to use when making a request to `commands_url`
-        ///                      </param>
-        /// <param name="smsCommandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an
-        ///                      SMS from your device to the SMS Commands number </param>
-        /// <param name="smsCommandsMethod"> A string representing the HTTP method to use when making a request to
-        ///                         `sms_commands_url` </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Fleet </returns>
-        public static FleetResource Update(string pathSid,
-                                           string uniqueName = null,
-                                           string networkAccessProfile = null,
-                                           Uri commandsUrl = null,
-                                           Twilio.Http.HttpMethod commandsMethod = null,
-                                           Uri smsCommandsUrl = null,
-                                           Twilio.Http.HttpMethod smsCommandsMethod = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new UpdateFleetOptions(pathSid){UniqueName = uniqueName, NetworkAccessProfile = networkAccessProfile, CommandsUrl = commandsUrl, CommandsMethod = commandsMethod, SmsCommandsUrl = smsCommandsUrl, SmsCommandsMethod = smsCommandsMethod};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the given properties of a Super SIM Fleet instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
-        /// <param name="commandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS
-        ///                   from your device to the Commands number </param>
-        /// <param name="commandsMethod"> A string representing the HTTP method to use when making a request to `commands_url`
-        ///                      </param>
-        /// <param name="smsCommandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an
-        ///                      SMS from your device to the SMS Commands number </param>
-        /// <param name="smsCommandsMethod"> A string representing the HTTP method to use when making a request to
-        ///                         `sms_commands_url` </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Fleet </returns>
-        public static async System.Threading.Tasks.Task<FleetResource> UpdateAsync(string pathSid,
-                                                                                   string uniqueName = null,
-                                                                                   string networkAccessProfile = null,
-                                                                                   Uri commandsUrl = null,
-                                                                                   Twilio.Http.HttpMethod commandsMethod = null,
-                                                                                   Uri smsCommandsUrl = null,
-                                                                                   Twilio.Http.HttpMethod smsCommandsMethod = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new UpdateFleetOptions(pathSid){UniqueName = uniqueName, NetworkAccessProfile = networkAccessProfile, CommandsUrl = commandsUrl, CommandsMethod = commandsMethod, SmsCommandsUrl = smsCommandsUrl, SmsCommandsMethod = smsCommandsMethod};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FleetResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FleetResource object represented by the provided JSON </returns>
-        public static FleetResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FleetResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Fleet resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Defines whether SIMs in the Fleet are capable of using data connectivity
-        /// </summary>
-        [JsonProperty("data_enabled")]
-        public bool? DataEnabled { get; private set; }
-        /// <summary>
-        /// The total data usage (download and upload combined) in Megabytes that each Sim resource assigned to the Fleet resource can consume
-        /// </summary>
-        [JsonProperty("data_limit")]
-        public int? DataLimit { get; private set; }
-        /// <summary>
-        /// The model by which a SIM is metered and billed
-        /// </summary>
-        [JsonProperty("data_metering")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FleetResource.DataMeteringEnum DataMetering { get; private set; }
-        /// <summary>
-        /// Defines whether SIMs in the Fleet are capable of sending and receiving machine-to-machine SMS via Commands
-        /// </summary>
-        [JsonProperty("commands_enabled")]
-        public bool? CommandsEnabled { get; private set; }
-        /// <summary>
-        /// The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS from your device to the Commands number
-        /// </summary>
-        [JsonProperty("commands_url")]
-        public Uri CommandsUrl { get; private set; }
-        /// <summary>
-        /// A string representing the HTTP method to use when making a request to `commands_url`
-        /// </summary>
-        [JsonProperty("commands_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod CommandsMethod { get; private set; }
-        /// <summary>
-        /// Defines whether SIMs in the Fleet are capable of sending and receiving machine-to-machine SMS via Commands
-        /// </summary>
-        [JsonProperty("sms_commands_enabled")]
-        public bool? SmsCommandsEnabled { get; private set; }
-        /// <summary>
-        /// The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS from your device to the SMS Commands number
-        /// </summary>
-        [JsonProperty("sms_commands_url")]
-        public Uri SmsCommandsUrl { get; private set; }
-        /// <summary>
-        /// A string representing the HTTP method to use when making a request to `sms_commands_url`
-        /// </summary>
-        [JsonProperty("sms_commands_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsCommandsMethod { get; private set; }
-        /// <summary>
-        /// The SID of the Network Access Profile of the Fleet
-        /// </summary>
-        [JsonProperty("network_access_profile_sid")]
-        public string NetworkAccessProfileSid { get; private set; }
-
-        private FleetResource()
-        {
-
-        }
-    }
+{
+
+  public class FleetResource : Resource
+  {
+    public sealed class DataMeteringEnum : StringEnum
+    {
+      private DataMeteringEnum(string value) : base(value) { }
+      public DataMeteringEnum() { }
+      public static implicit operator DataMeteringEnum(string value)
+      {
+        return new DataMeteringEnum(value);
+      }
+
+      public static readonly DataMeteringEnum Payg = new DataMeteringEnum("payg");
+    }
+
+    private static Request BuildCreateRequest(CreateFleetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Supersim,
+          "/v1/Fleets",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a Fleet
+    /// </summary>
+    /// <param name="options"> Create Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static FleetResource Create(CreateFleetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a Fleet
+    /// </summary>
+    /// <param name="options"> Create Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<FleetResource> CreateAsync(CreateFleetOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a Fleet
+    /// </summary>
+    /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="dataEnabled"> Defines whether SIMs in the Fleet are capable of using data connectivity </param>
+    /// <param name="dataLimit"> The total data usage (download and upload combined) in Megabytes that each Sim resource
+    ///                 assigned to the Fleet resource can consume </param>
+    /// <param name="commandsEnabled"> Defines whether SIMs in the Fleet are capable of sending and receiving
+    ///                       machine-to-machine SMS via Commands </param>
+    /// <param name="commandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS
+    ///                   from your device to the Commands number </param>
+    /// <param name="commandsMethod"> A string representing the HTTP method to use when making a request to `commands_url`
+    ///                      </param>
+    /// <param name="smsCommandsEnabled"> Defines whether SIMs in the Fleet are capable of sending and receiving
+    ///                          machine-to-machine SMS via Commands </param>
+    /// <param name="smsCommandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an
+    ///                      SMS from your device to the SMS Commands number </param>
+    /// <param name="smsCommandsMethod"> A string representing the HTTP method to use when making a request to
+    ///                         `sms_commands_url` </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static FleetResource Create(string networkAccessProfile,
+                                       string uniqueName = null,
+                                       bool? dataEnabled = null,
+                                       int? dataLimit = null,
+                                       bool? commandsEnabled = null,
+                                       Uri commandsUrl = null,
+                                       Twilio.Http.HttpMethod commandsMethod = null,
+                                       bool? smsCommandsEnabled = null,
+                                       Uri smsCommandsUrl = null,
+                                       Twilio.Http.HttpMethod smsCommandsMethod = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateFleetOptions(networkAccessProfile) { UniqueName = uniqueName, DataEnabled = dataEnabled, DataLimit = dataLimit, CommandsEnabled = commandsEnabled, CommandsUrl = commandsUrl, CommandsMethod = commandsMethod, SmsCommandsEnabled = smsCommandsEnabled, SmsCommandsUrl = smsCommandsUrl, SmsCommandsMethod = smsCommandsMethod };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a Fleet
+    /// </summary>
+    /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="dataEnabled"> Defines whether SIMs in the Fleet are capable of using data connectivity </param>
+    /// <param name="dataLimit"> The total data usage (download and upload combined) in Megabytes that each Sim resource
+    ///                 assigned to the Fleet resource can consume </param>
+    /// <param name="commandsEnabled"> Defines whether SIMs in the Fleet are capable of sending and receiving
+    ///                       machine-to-machine SMS via Commands </param>
+    /// <param name="commandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS
+    ///                   from your device to the Commands number </param>
+    /// <param name="commandsMethod"> A string representing the HTTP method to use when making a request to `commands_url`
+    ///                      </param>
+    /// <param name="smsCommandsEnabled"> Defines whether SIMs in the Fleet are capable of sending and receiving
+    ///                          machine-to-machine SMS via Commands </param>
+    /// <param name="smsCommandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an
+    ///                      SMS from your device to the SMS Commands number </param>
+    /// <param name="smsCommandsMethod"> A string representing the HTTP method to use when making a request to
+    ///                         `sms_commands_url` </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<FleetResource> CreateAsync(string networkAccessProfile,
+                                                                               string uniqueName = null,
+                                                                               bool? dataEnabled = null,
+                                                                               int? dataLimit = null,
+                                                                               bool? commandsEnabled = null,
+                                                                               Uri commandsUrl = null,
+                                                                               Twilio.Http.HttpMethod commandsMethod = null,
+                                                                               bool? smsCommandsEnabled = null,
+                                                                               Uri smsCommandsUrl = null,
+                                                                               Twilio.Http.HttpMethod smsCommandsMethod = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateFleetOptions(networkAccessProfile) { UniqueName = uniqueName, DataEnabled = dataEnabled, DataLimit = dataLimit, CommandsEnabled = commandsEnabled, CommandsUrl = commandsUrl, CommandsMethod = commandsMethod, SmsCommandsEnabled = smsCommandsEnabled, SmsCommandsUrl = smsCommandsUrl, SmsCommandsMethod = smsCommandsMethod };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchFleetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/Fleets/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a Fleet instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static FleetResource Fetch(FetchFleetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Fleet instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<FleetResource> FetchAsync(FetchFleetOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a Fleet instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static FleetResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchFleetOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Fleet instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<FleetResource> FetchAsync(string pathSid,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchFleetOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadFleetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/Fleets",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Fleets from your account.
+    /// </summary>
+    /// <param name="options"> Read Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static ResourceSet<FleetResource> Read(ReadFleetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FleetResource>.FromJson("fleets", response.Content);
+      return new ResourceSet<FleetResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Fleets from your account.
+    /// </summary>
+    /// <param name="options"> Read Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FleetResource>> ReadAsync(ReadFleetOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FleetResource>.FromJson("fleets", response.Content);
+      return new ResourceSet<FleetResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Fleets from your account.
+    /// </summary>
+    /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static ResourceSet<FleetResource> Read(string networkAccessProfile = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadFleetOptions() { NetworkAccessProfile = networkAccessProfile, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Fleets from your account.
+    /// </summary>
+    /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FleetResource>> ReadAsync(string networkAccessProfile = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadFleetOptions() { NetworkAccessProfile = networkAccessProfile, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FleetResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FleetResource>.FromJson("fleets", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FleetResource> NextPage(Page<FleetResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<FleetResource>.FromJson("fleets", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FleetResource> PreviousPage(Page<FleetResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<FleetResource>.FromJson("fleets", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateFleetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Supersim,
+          "/v1/Fleets/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates the given properties of a Super SIM Fleet instance from your account.
+    /// </summary>
+    /// <param name="options"> Update Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static FleetResource Update(UpdateFleetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the given properties of a Super SIM Fleet instance from your account.
+    /// </summary>
+    /// <param name="options"> Update Fleet parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<FleetResource> UpdateAsync(UpdateFleetOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates the given properties of a Super SIM Fleet instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
+    /// <param name="commandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS
+    ///                   from your device to the Commands number </param>
+    /// <param name="commandsMethod"> A string representing the HTTP method to use when making a request to `commands_url`
+    ///                      </param>
+    /// <param name="smsCommandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an
+    ///                      SMS from your device to the SMS Commands number </param>
+    /// <param name="smsCommandsMethod"> A string representing the HTTP method to use when making a request to
+    ///                         `sms_commands_url` </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Fleet </returns>
+    public static FleetResource Update(string pathSid,
+                                       string uniqueName = null,
+                                       string networkAccessProfile = null,
+                                       Uri commandsUrl = null,
+                                       Twilio.Http.HttpMethod commandsMethod = null,
+                                       Uri smsCommandsUrl = null,
+                                       Twilio.Http.HttpMethod smsCommandsMethod = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new UpdateFleetOptions(pathSid) { UniqueName = uniqueName, NetworkAccessProfile = networkAccessProfile, CommandsUrl = commandsUrl, CommandsMethod = commandsMethod, SmsCommandsUrl = smsCommandsUrl, SmsCommandsMethod = smsCommandsMethod };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the given properties of a Super SIM Fleet instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="networkAccessProfile"> The SID or unique name of the Network Access Profile of the Fleet </param>
+    /// <param name="commandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS
+    ///                   from your device to the Commands number </param>
+    /// <param name="commandsMethod"> A string representing the HTTP method to use when making a request to `commands_url`
+    ///                      </param>
+    /// <param name="smsCommandsUrl"> The URL that will receive a webhook when a Super SIM in the Fleet is used to send an
+    ///                      SMS from your device to the SMS Commands number </param>
+    /// <param name="smsCommandsMethod"> A string representing the HTTP method to use when making a request to
+    ///                         `sms_commands_url` </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Fleet </returns>
+    public static async System.Threading.Tasks.Task<FleetResource> UpdateAsync(string pathSid,
+                                                                               string uniqueName = null,
+                                                                               string networkAccessProfile = null,
+                                                                               Uri commandsUrl = null,
+                                                                               Twilio.Http.HttpMethod commandsMethod = null,
+                                                                               Uri smsCommandsUrl = null,
+                                                                               Twilio.Http.HttpMethod smsCommandsMethod = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new UpdateFleetOptions(pathSid) { UniqueName = uniqueName, NetworkAccessProfile = networkAccessProfile, CommandsUrl = commandsUrl, CommandsMethod = commandsMethod, SmsCommandsUrl = smsCommandsUrl, SmsCommandsMethod = smsCommandsMethod };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FleetResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FleetResource object represented by the provided JSON </returns>
+    public static FleetResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FleetResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Fleet resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Defines whether SIMs in the Fleet are capable of using data connectivity
+    /// </summary>
+    [JsonProperty("data_enabled")]
+    public bool? DataEnabled { get; private set; }
+    /// <summary>
+    /// The total data usage (download and upload combined) in Megabytes that each Sim resource assigned to the Fleet resource can consume
+    /// </summary>
+    [JsonProperty("data_limit")]
+    public int? DataLimit { get; private set; }
+    /// <summary>
+    /// The model by which a SIM is metered and billed
+    /// </summary>
+    [JsonProperty("data_metering")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FleetResource.DataMeteringEnum DataMetering { get; private set; }
+    /// <summary>
+    /// Defines whether SIMs in the Fleet are capable of sending and receiving machine-to-machine SMS via Commands
+    /// </summary>
+    [JsonProperty("commands_enabled")]
+    public bool? CommandsEnabled { get; private set; }
+    /// <summary>
+    /// The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS from your device to the Commands number
+    /// </summary>
+    [JsonProperty("commands_url")]
+    public Uri CommandsUrl { get; private set; }
+    /// <summary>
+    /// A string representing the HTTP method to use when making a request to `commands_url`
+    /// </summary>
+    [JsonProperty("commands_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod CommandsMethod { get; private set; }
+    /// <summary>
+    /// Defines whether SIMs in the Fleet are capable of sending and receiving machine-to-machine SMS via Commands
+    /// </summary>
+    [JsonProperty("sms_commands_enabled")]
+    public bool? SmsCommandsEnabled { get; private set; }
+    /// <summary>
+    /// The URL that will receive a webhook when a Super SIM in the Fleet is used to send an SMS from your device to the SMS Commands number
+    /// </summary>
+    [JsonProperty("sms_commands_url")]
+    public Uri SmsCommandsUrl { get; private set; }
+    /// <summary>
+    /// A string representing the HTTP method to use when making a request to `sms_commands_url`
+    /// </summary>
+    [JsonProperty("sms_commands_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsCommandsMethod { get; private set; }
+    /// <summary>
+    /// The SID of the Network Access Profile of the Fleet
+    /// </summary>
+    [JsonProperty("network_access_profile_sid")]
+    public string NetworkAccessProfileSid { get; private set; }
+
+    private FleetResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/IpCommandOptions.cs b/src/Twilio/Rest/Supersim/V1/IpCommandOptions.cs
index a0784ff44..d4a7a0e96 100644
--- a/src/Twilio/Rest/Supersim/V1/IpCommandOptions.cs
+++ b/src/Twilio/Rest/Supersim/V1/IpCommandOptions.cs
@@ -9,181 +9,181 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Send an IP Command to a Super SIM.
+  /// </summary>
+  public class CreateIpCommandOptions : IOptions<IpCommandResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Send an IP Command to a Super SIM.
-    /// </summary>
-    public class CreateIpCommandOptions : IOptions<IpCommandResource>
-    {
-        /// <summary>
-        /// The sid or unique_name of the Super SIM to send the IP Command to
-        /// </summary>
-        public string Sim { get; }
-        /// <summary>
-        /// The payload to be delivered to the device
-        /// </summary>
-        public string Payload { get; }
-        /// <summary>
-        /// The device port to which the IP Command will be sent
-        /// </summary>
-        public int? DevicePort { get; }
-        /// <summary>
-        /// Indicates how the payload is encoded
-        /// </summary>
-        public IpCommandResource.PayloadTypeEnum PayloadType { get; set; }
-        /// <summary>
-        /// The URL we should call after we have sent the IP Command
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call callback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod CallbackMethod { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateIpCommandOptions
-        /// </summary>
-        /// <param name="sim"> The sid or unique_name of the Super SIM to send the IP Command to </param>
-        /// <param name="payload"> The payload to be delivered to the device </param>
-        /// <param name="devicePort"> The device port to which the IP Command will be sent </param>
-        public CreateIpCommandOptions(string sim, string payload, int? devicePort)
-        {
-            Sim = sim;
-            Payload = payload;
-            DevicePort = devicePort;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Sim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sim", Sim));
-            }
-
-            if (Payload != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Payload", Payload));
-            }
-
-            if (DevicePort != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DevicePort", DevicePort.ToString()));
-            }
-
-            if (PayloadType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PayloadType", PayloadType.ToString()));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (CallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The sid or unique_name of the Super SIM to send the IP Command to
+    /// </summary>
+    public string Sim { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch IP Command instance from your account.
+    /// The payload to be delivered to the device
     /// </summary>
-    public class FetchIpCommandOptions : IOptions<IpCommandResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchIpCommandOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchIpCommandOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string Payload { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of IP Commands from your account.
-    /// </summary>
-    public class ReadIpCommandOptions : ReadOptions<IpCommandResource>
-    {
-        /// <summary>
-        /// The SID or unique name of the Sim resource that IP Command was sent to or from.
-        /// </summary>
-        public string Sim { get; set; }
-        /// <summary>
-        /// The ICCID of the Sim resource that IP Command was sent to or from.
-        /// </summary>
-        public string SimIccid { get; set; }
-        /// <summary>
-        /// The status of the IP Command
-        /// </summary>
-        public IpCommandResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The direction of the IP Command
-        /// </summary>
-        public IpCommandResource.DirectionEnum Direction { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Sim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sim", Sim.ToString()));
-            }
-
-            if (SimIccid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SimIccid", SimIccid));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Direction != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Direction", Direction.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The device port to which the IP Command will be sent
+    /// </summary>
+    public int? DevicePort { get; }
+    /// <summary>
+    /// Indicates how the payload is encoded
+    /// </summary>
+    public IpCommandResource.PayloadTypeEnum PayloadType { get; set; }
+    /// <summary>
+    /// The URL we should call after we have sent the IP Command
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call callback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod CallbackMethod { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateIpCommandOptions
+    /// </summary>
+    /// <param name="sim"> The sid or unique_name of the Super SIM to send the IP Command to </param>
+    /// <param name="payload"> The payload to be delivered to the device </param>
+    /// <param name="devicePort"> The device port to which the IP Command will be sent </param>
+    public CreateIpCommandOptions(string sim, string payload, int? devicePort)
+    {
+      Sim = sim;
+      Payload = payload;
+      DevicePort = devicePort;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Sim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sim", Sim));
+      }
+
+      if (Payload != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Payload", Payload));
+      }
+
+      if (DevicePort != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DevicePort", DevicePort.ToString()));
+      }
+
+      if (PayloadType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PayloadType", PayloadType.ToString()));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (CallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch IP Command instance from your account.
+  /// </summary>
+  public class FetchIpCommandOptions : IOptions<IpCommandResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchIpCommandOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchIpCommandOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of IP Commands from your account.
+  /// </summary>
+  public class ReadIpCommandOptions : ReadOptions<IpCommandResource>
+  {
+    /// <summary>
+    /// The SID or unique name of the Sim resource that IP Command was sent to or from.
+    /// </summary>
+    public string Sim { get; set; }
+    /// <summary>
+    /// The ICCID of the Sim resource that IP Command was sent to or from.
+    /// </summary>
+    public string SimIccid { get; set; }
+    /// <summary>
+    /// The status of the IP Command
+    /// </summary>
+    public IpCommandResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The direction of the IP Command
+    /// </summary>
+    public IpCommandResource.DirectionEnum Direction { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Sim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sim", Sim.ToString()));
+      }
+
+      if (SimIccid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SimIccid", SimIccid));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Direction != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Direction", Direction.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/IpCommandResource.cs b/src/Twilio/Rest/Supersim/V1/IpCommandResource.cs
index b7d209c69..38fb92439 100644
--- a/src/Twilio/Rest/Supersim/V1/IpCommandResource.cs
+++ b/src/Twilio/Rest/Supersim/V1/IpCommandResource.cs
@@ -19,442 +19,442 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
-    public class IpCommandResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Queued = new StatusEnum("queued");
-            public static readonly StatusEnum Sent = new StatusEnum("sent");
-            public static readonly StatusEnum Received = new StatusEnum("received");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        public sealed class DirectionEnum : StringEnum
-        {
-            private DirectionEnum(string value) : base(value) {}
-            public DirectionEnum() {}
-            public static implicit operator DirectionEnum(string value)
-            {
-                return new DirectionEnum(value);
-            }
-
-            public static readonly DirectionEnum ToSim = new DirectionEnum("to_sim");
-            public static readonly DirectionEnum FromSim = new DirectionEnum("from_sim");
-        }
-
-        public sealed class PayloadTypeEnum : StringEnum
-        {
-            private PayloadTypeEnum(string value) : base(value) {}
-            public PayloadTypeEnum() {}
-            public static implicit operator PayloadTypeEnum(string value)
-            {
-                return new PayloadTypeEnum(value);
-            }
-
-            public static readonly PayloadTypeEnum Text = new PayloadTypeEnum("text");
-            public static readonly PayloadTypeEnum Binary = new PayloadTypeEnum("binary");
-        }
-
-        private static Request BuildCreateRequest(CreateIpCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Supersim,
-                "/v1/IpCommands",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Send an IP Command to a Super SIM.
-        /// </summary>
-        /// <param name="options"> Create IpCommand parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpCommand </returns>
-        public static IpCommandResource Create(CreateIpCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Send an IP Command to a Super SIM.
-        /// </summary>
-        /// <param name="options"> Create IpCommand parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpCommand </returns>
-        public static async System.Threading.Tasks.Task<IpCommandResource> CreateAsync(CreateIpCommandOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Send an IP Command to a Super SIM.
-        /// </summary>
-        /// <param name="sim"> The sid or unique_name of the Super SIM to send the IP Command to </param>
-        /// <param name="payload"> The payload to be delivered to the device </param>
-        /// <param name="devicePort"> The device port to which the IP Command will be sent </param>
-        /// <param name="payloadType"> Indicates how the payload is encoded </param>
-        /// <param name="callbackUrl"> The URL we should call after we have sent the IP Command </param>
-        /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpCommand </returns>
-        public static IpCommandResource Create(string sim,
-                                               string payload,
-                                               int? devicePort,
-                                               IpCommandResource.PayloadTypeEnum payloadType = null,
-                                               Uri callbackUrl = null,
-                                               Twilio.Http.HttpMethod callbackMethod = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateIpCommandOptions(sim, payload, devicePort){PayloadType = payloadType, CallbackUrl = callbackUrl, CallbackMethod = callbackMethod};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Send an IP Command to a Super SIM.
-        /// </summary>
-        /// <param name="sim"> The sid or unique_name of the Super SIM to send the IP Command to </param>
-        /// <param name="payload"> The payload to be delivered to the device </param>
-        /// <param name="devicePort"> The device port to which the IP Command will be sent </param>
-        /// <param name="payloadType"> Indicates how the payload is encoded </param>
-        /// <param name="callbackUrl"> The URL we should call after we have sent the IP Command </param>
-        /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpCommand </returns>
-        public static async System.Threading.Tasks.Task<IpCommandResource> CreateAsync(string sim,
-                                                                                       string payload,
-                                                                                       int? devicePort,
-                                                                                       IpCommandResource.PayloadTypeEnum payloadType = null,
-                                                                                       Uri callbackUrl = null,
-                                                                                       Twilio.Http.HttpMethod callbackMethod = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateIpCommandOptions(sim, payload, devicePort){PayloadType = payloadType, CallbackUrl = callbackUrl, CallbackMethod = callbackMethod};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchIpCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/IpCommands/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch IP Command instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch IpCommand parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpCommand </returns>
-        public static IpCommandResource Fetch(FetchIpCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch IP Command instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch IpCommand parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpCommand </returns>
-        public static async System.Threading.Tasks.Task<IpCommandResource> FetchAsync(FetchIpCommandOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch IP Command instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpCommand </returns>
-        public static IpCommandResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchIpCommandOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch IP Command instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpCommand </returns>
-        public static async System.Threading.Tasks.Task<IpCommandResource> FetchAsync(string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchIpCommandOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadIpCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/IpCommands",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of IP Commands from your account.
-        /// </summary>
-        /// <param name="options"> Read IpCommand parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpCommand </returns>
-        public static ResourceSet<IpCommandResource> Read(ReadIpCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<IpCommandResource>.FromJson("ip_commands", response.Content);
-            return new ResourceSet<IpCommandResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of IP Commands from your account.
-        /// </summary>
-        /// <param name="options"> Read IpCommand parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpCommand </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IpCommandResource>> ReadAsync(ReadIpCommandOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<IpCommandResource>.FromJson("ip_commands", response.Content);
-            return new ResourceSet<IpCommandResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of IP Commands from your account.
-        /// </summary>
-        /// <param name="sim"> The SID or unique name of the Sim resource that IP Command was sent to or from. </param>
-        /// <param name="simIccid"> The ICCID of the Sim resource that IP Command was sent to or from. </param>
-        /// <param name="status"> The status of the IP Command </param>
-        /// <param name="direction"> The direction of the IP Command </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpCommand </returns>
-        public static ResourceSet<IpCommandResource> Read(string sim = null,
-                                                          string simIccid = null,
-                                                          IpCommandResource.StatusEnum status = null,
-                                                          IpCommandResource.DirectionEnum direction = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadIpCommandOptions(){Sim = sim, SimIccid = simIccid, Status = status, Direction = direction, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of IP Commands from your account.
-        /// </summary>
-        /// <param name="sim"> The SID or unique name of the Sim resource that IP Command was sent to or from. </param>
-        /// <param name="simIccid"> The ICCID of the Sim resource that IP Command was sent to or from. </param>
-        /// <param name="status"> The status of the IP Command </param>
-        /// <param name="direction"> The direction of the IP Command </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpCommand </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IpCommandResource>> ReadAsync(string sim = null,
-                                                                                                  string simIccid = null,
-                                                                                                  IpCommandResource.StatusEnum status = null,
-                                                                                                  IpCommandResource.DirectionEnum direction = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadIpCommandOptions(){Sim = sim, SimIccid = simIccid, Status = status, Direction = direction, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<IpCommandResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<IpCommandResource>.FromJson("ip_commands", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<IpCommandResource> NextPage(Page<IpCommandResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<IpCommandResource>.FromJson("ip_commands", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<IpCommandResource> PreviousPage(Page<IpCommandResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<IpCommandResource>.FromJson("ip_commands", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a IpCommandResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> IpCommandResource object represented by the provided JSON </returns>
-        public static IpCommandResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<IpCommandResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Super SIM that this IP Command was sent to or from
-        /// </summary>
-        [JsonProperty("sim_sid")]
-        public string SimSid { get; private set; }
-        /// <summary>
-        /// The ICCID of the Super SIM that this IP Command was sent to or from
-        /// </summary>
-        [JsonProperty("sim_iccid")]
-        public string SimIccid { get; private set; }
-        /// <summary>
-        /// The status of the IP Command
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public IpCommandResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The direction of the IP Command
-        /// </summary>
-        [JsonProperty("direction")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public IpCommandResource.DirectionEnum Direction { get; private set; }
-        /// <summary>
-        /// The IP address of the device that the IP Command was sent to or received from
-        /// </summary>
-        [JsonProperty("device_ip")]
-        public string DeviceIp { get; private set; }
-        /// <summary>
-        /// The port that the IP Command either originated from or was sent to
-        /// </summary>
-        [JsonProperty("device_port")]
-        public int? DevicePort { get; private set; }
-        /// <summary>
-        /// The payload type of the IP Command
-        /// </summary>
-        [JsonProperty("payload_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public IpCommandResource.PayloadTypeEnum PayloadType { get; private set; }
-        /// <summary>
-        /// The payload of the IP Command sent to or from the Super SIM
-        /// </summary>
-        [JsonProperty("payload")]
-        public string Payload { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the IP Command resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private IpCommandResource()
-        {
-
-        }
-    }
+{
+
+  public class IpCommandResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Queued = new StatusEnum("queued");
+      public static readonly StatusEnum Sent = new StatusEnum("sent");
+      public static readonly StatusEnum Received = new StatusEnum("received");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    public sealed class DirectionEnum : StringEnum
+    {
+      private DirectionEnum(string value) : base(value) { }
+      public DirectionEnum() { }
+      public static implicit operator DirectionEnum(string value)
+      {
+        return new DirectionEnum(value);
+      }
+
+      public static readonly DirectionEnum ToSim = new DirectionEnum("to_sim");
+      public static readonly DirectionEnum FromSim = new DirectionEnum("from_sim");
+    }
+
+    public sealed class PayloadTypeEnum : StringEnum
+    {
+      private PayloadTypeEnum(string value) : base(value) { }
+      public PayloadTypeEnum() { }
+      public static implicit operator PayloadTypeEnum(string value)
+      {
+        return new PayloadTypeEnum(value);
+      }
+
+      public static readonly PayloadTypeEnum Text = new PayloadTypeEnum("text");
+      public static readonly PayloadTypeEnum Binary = new PayloadTypeEnum("binary");
+    }
+
+    private static Request BuildCreateRequest(CreateIpCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Supersim,
+          "/v1/IpCommands",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Send an IP Command to a Super SIM.
+    /// </summary>
+    /// <param name="options"> Create IpCommand parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpCommand </returns>
+    public static IpCommandResource Create(CreateIpCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Send an IP Command to a Super SIM.
+    /// </summary>
+    /// <param name="options"> Create IpCommand parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpCommand </returns>
+    public static async System.Threading.Tasks.Task<IpCommandResource> CreateAsync(CreateIpCommandOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Send an IP Command to a Super SIM.
+    /// </summary>
+    /// <param name="sim"> The sid or unique_name of the Super SIM to send the IP Command to </param>
+    /// <param name="payload"> The payload to be delivered to the device </param>
+    /// <param name="devicePort"> The device port to which the IP Command will be sent </param>
+    /// <param name="payloadType"> Indicates how the payload is encoded </param>
+    /// <param name="callbackUrl"> The URL we should call after we have sent the IP Command </param>
+    /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpCommand </returns>
+    public static IpCommandResource Create(string sim,
+                                           string payload,
+                                           int? devicePort,
+                                           IpCommandResource.PayloadTypeEnum payloadType = null,
+                                           Uri callbackUrl = null,
+                                           Twilio.Http.HttpMethod callbackMethod = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateIpCommandOptions(sim, payload, devicePort) { PayloadType = payloadType, CallbackUrl = callbackUrl, CallbackMethod = callbackMethod };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Send an IP Command to a Super SIM.
+    /// </summary>
+    /// <param name="sim"> The sid or unique_name of the Super SIM to send the IP Command to </param>
+    /// <param name="payload"> The payload to be delivered to the device </param>
+    /// <param name="devicePort"> The device port to which the IP Command will be sent </param>
+    /// <param name="payloadType"> Indicates how the payload is encoded </param>
+    /// <param name="callbackUrl"> The URL we should call after we have sent the IP Command </param>
+    /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpCommand </returns>
+    public static async System.Threading.Tasks.Task<IpCommandResource> CreateAsync(string sim,
+                                                                                   string payload,
+                                                                                   int? devicePort,
+                                                                                   IpCommandResource.PayloadTypeEnum payloadType = null,
+                                                                                   Uri callbackUrl = null,
+                                                                                   Twilio.Http.HttpMethod callbackMethod = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateIpCommandOptions(sim, payload, devicePort) { PayloadType = payloadType, CallbackUrl = callbackUrl, CallbackMethod = callbackMethod };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchIpCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/IpCommands/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch IP Command instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch IpCommand parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpCommand </returns>
+    public static IpCommandResource Fetch(FetchIpCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch IP Command instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch IpCommand parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpCommand </returns>
+    public static async System.Threading.Tasks.Task<IpCommandResource> FetchAsync(FetchIpCommandOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch IP Command instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpCommand </returns>
+    public static IpCommandResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchIpCommandOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch IP Command instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpCommand </returns>
+    public static async System.Threading.Tasks.Task<IpCommandResource> FetchAsync(string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchIpCommandOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadIpCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/IpCommands",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of IP Commands from your account.
+    /// </summary>
+    /// <param name="options"> Read IpCommand parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpCommand </returns>
+    public static ResourceSet<IpCommandResource> Read(ReadIpCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<IpCommandResource>.FromJson("ip_commands", response.Content);
+      return new ResourceSet<IpCommandResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of IP Commands from your account.
+    /// </summary>
+    /// <param name="options"> Read IpCommand parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpCommand </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IpCommandResource>> ReadAsync(ReadIpCommandOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<IpCommandResource>.FromJson("ip_commands", response.Content);
+      return new ResourceSet<IpCommandResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of IP Commands from your account.
+    /// </summary>
+    /// <param name="sim"> The SID or unique name of the Sim resource that IP Command was sent to or from. </param>
+    /// <param name="simIccid"> The ICCID of the Sim resource that IP Command was sent to or from. </param>
+    /// <param name="status"> The status of the IP Command </param>
+    /// <param name="direction"> The direction of the IP Command </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpCommand </returns>
+    public static ResourceSet<IpCommandResource> Read(string sim = null,
+                                                      string simIccid = null,
+                                                      IpCommandResource.StatusEnum status = null,
+                                                      IpCommandResource.DirectionEnum direction = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadIpCommandOptions() { Sim = sim, SimIccid = simIccid, Status = status, Direction = direction, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of IP Commands from your account.
+    /// </summary>
+    /// <param name="sim"> The SID or unique name of the Sim resource that IP Command was sent to or from. </param>
+    /// <param name="simIccid"> The ICCID of the Sim resource that IP Command was sent to or from. </param>
+    /// <param name="status"> The status of the IP Command </param>
+    /// <param name="direction"> The direction of the IP Command </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpCommand </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IpCommandResource>> ReadAsync(string sim = null,
+                                                                                              string simIccid = null,
+                                                                                              IpCommandResource.StatusEnum status = null,
+                                                                                              IpCommandResource.DirectionEnum direction = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadIpCommandOptions() { Sim = sim, SimIccid = simIccid, Status = status, Direction = direction, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<IpCommandResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<IpCommandResource>.FromJson("ip_commands", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<IpCommandResource> NextPage(Page<IpCommandResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<IpCommandResource>.FromJson("ip_commands", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<IpCommandResource> PreviousPage(Page<IpCommandResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<IpCommandResource>.FromJson("ip_commands", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a IpCommandResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> IpCommandResource object represented by the provided JSON </returns>
+    public static IpCommandResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<IpCommandResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Super SIM that this IP Command was sent to or from
+    /// </summary>
+    [JsonProperty("sim_sid")]
+    public string SimSid { get; private set; }
+    /// <summary>
+    /// The ICCID of the Super SIM that this IP Command was sent to or from
+    /// </summary>
+    [JsonProperty("sim_iccid")]
+    public string SimIccid { get; private set; }
+    /// <summary>
+    /// The status of the IP Command
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public IpCommandResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The direction of the IP Command
+    /// </summary>
+    [JsonProperty("direction")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public IpCommandResource.DirectionEnum Direction { get; private set; }
+    /// <summary>
+    /// The IP address of the device that the IP Command was sent to or received from
+    /// </summary>
+    [JsonProperty("device_ip")]
+    public string DeviceIp { get; private set; }
+    /// <summary>
+    /// The port that the IP Command either originated from or was sent to
+    /// </summary>
+    [JsonProperty("device_port")]
+    public int? DevicePort { get; private set; }
+    /// <summary>
+    /// The payload type of the IP Command
+    /// </summary>
+    [JsonProperty("payload_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public IpCommandResource.PayloadTypeEnum PayloadType { get; private set; }
+    /// <summary>
+    /// The payload of the IP Command sent to or from the Super SIM
+    /// </summary>
+    [JsonProperty("payload")]
+    public string Payload { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the IP Command resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private IpCommandResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/NetworkAccessProfile/NetworkAccessProfileNetworkOptions.cs b/src/Twilio/Rest/Supersim/V1/NetworkAccessProfile/NetworkAccessProfileNetworkOptions.cs
index bdf82d117..e4d96053d 100644
--- a/src/Twilio/Rest/Supersim/V1/NetworkAccessProfile/NetworkAccessProfileNetworkOptions.cs
+++ b/src/Twilio/Rest/Supersim/V1/NetworkAccessProfile/NetworkAccessProfileNetworkOptions.cs
@@ -9,162 +9,162 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Supersim.V1.NetworkAccessProfile
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of Network Access Profile resource's Network resource.
+  /// </summary>
+  public class ReadNetworkAccessProfileNetworkOptions : ReadOptions<NetworkAccessProfileNetworkResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of Network Access Profile resource's Network resource.
+    /// The unique string that identifies the Network Access Profile resource
     /// </summary>
-    public class ReadNetworkAccessProfileNetworkOptions : ReadOptions<NetworkAccessProfileNetworkResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the Network Access Profile resource
-        /// </summary>
-        public string PathNetworkAccessProfileSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadNetworkAccessProfileNetworkOptions
-        /// </summary>
-        /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
-        ///                                   </param>
-        public ReadNetworkAccessProfileNetworkOptions(string pathNetworkAccessProfileSid)
-        {
-            PathNetworkAccessProfileSid = pathNetworkAccessProfileSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathNetworkAccessProfileSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Add a Network resource to the Network Access Profile resource.
+    /// Construct a new ReadNetworkAccessProfileNetworkOptions
     /// </summary>
-    public class CreateNetworkAccessProfileNetworkOptions : IOptions<NetworkAccessProfileNetworkResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the Network Access Profile resource
-        /// </summary>
-        public string PathNetworkAccessProfileSid { get; }
-        /// <summary>
-        /// The SID that identifies the Network resource
-        /// </summary>
-        public string Network { get; }
-
-        /// <summary>
-        /// Construct a new CreateNetworkAccessProfileNetworkOptions
-        /// </summary>
-        /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
-        ///                                   </param>
-        /// <param name="network"> The SID that identifies the Network resource </param>
-        public CreateNetworkAccessProfileNetworkOptions(string pathNetworkAccessProfileSid, string network)
-        {
-            PathNetworkAccessProfileSid = pathNetworkAccessProfileSid;
-            Network = network;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Network != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Network", Network.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
+    ///                                   </param>
+    public ReadNetworkAccessProfileNetworkOptions(string pathNetworkAccessProfileSid)
+    {
+      PathNetworkAccessProfileSid = pathNetworkAccessProfileSid;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Remove a Network resource from the Network Access Profile resource's.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteNetworkAccessProfileNetworkOptions : IOptions<NetworkAccessProfileNetworkResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the Network Access Profile resource
-        /// </summary>
-        public string PathNetworkAccessProfileSid { get; }
-        /// <summary>
-        /// The SID that identifies the Network resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteNetworkAccessProfileNetworkOptions
-        /// </summary>
-        /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
-        ///                                   </param>
-        /// <param name="pathSid"> The SID that identifies the Network resource </param>
-        public DeleteNetworkAccessProfileNetworkOptions(string pathNetworkAccessProfileSid, string pathSid)
-        {
-            PathNetworkAccessProfileSid = pathNetworkAccessProfileSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Add a Network resource to the Network Access Profile resource.
+  /// </summary>
+  public class CreateNetworkAccessProfileNetworkOptions : IOptions<NetworkAccessProfileNetworkResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a Network Access Profile resource's Network resource.
+    /// The unique string that identifies the Network Access Profile resource
     /// </summary>
-    public class FetchNetworkAccessProfileNetworkOptions : IOptions<NetworkAccessProfileNetworkResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the Network Access Profile resource
-        /// </summary>
-        public string PathNetworkAccessProfileSid { get; }
-        /// <summary>
-        /// The SID of the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchNetworkAccessProfileNetworkOptions
-        /// </summary>
-        /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
-        ///                                   </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        public FetchNetworkAccessProfileNetworkOptions(string pathNetworkAccessProfileSid, string pathSid)
-        {
-            PathNetworkAccessProfileSid = pathNetworkAccessProfileSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathNetworkAccessProfileSid { get; }
+    /// <summary>
+    /// The SID that identifies the Network resource
+    /// </summary>
+    public string Network { get; }
+
+    /// <summary>
+    /// Construct a new CreateNetworkAccessProfileNetworkOptions
+    /// </summary>
+    /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
+    ///                                   </param>
+    /// <param name="network"> The SID that identifies the Network resource </param>
+    public CreateNetworkAccessProfileNetworkOptions(string pathNetworkAccessProfileSid, string network)
+    {
+      PathNetworkAccessProfileSid = pathNetworkAccessProfileSid;
+      Network = network;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Network != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Network", Network.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Remove a Network resource from the Network Access Profile resource's.
+  /// </summary>
+  public class DeleteNetworkAccessProfileNetworkOptions : IOptions<NetworkAccessProfileNetworkResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the Network Access Profile resource
+    /// </summary>
+    public string PathNetworkAccessProfileSid { get; }
+    /// <summary>
+    /// The SID that identifies the Network resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteNetworkAccessProfileNetworkOptions
+    /// </summary>
+    /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
+    ///                                   </param>
+    /// <param name="pathSid"> The SID that identifies the Network resource </param>
+    public DeleteNetworkAccessProfileNetworkOptions(string pathNetworkAccessProfileSid, string pathSid)
+    {
+      PathNetworkAccessProfileSid = pathNetworkAccessProfileSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a Network Access Profile resource's Network resource.
+  /// </summary>
+  public class FetchNetworkAccessProfileNetworkOptions : IOptions<NetworkAccessProfileNetworkResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the Network Access Profile resource
+    /// </summary>
+    public string PathNetworkAccessProfileSid { get; }
+    /// <summary>
+    /// The SID of the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchNetworkAccessProfileNetworkOptions
+    /// </summary>
+    /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
+    ///                                   </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    public FetchNetworkAccessProfileNetworkOptions(string pathNetworkAccessProfileSid, string pathSid)
+    {
+      PathNetworkAccessProfileSid = pathNetworkAccessProfileSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/NetworkAccessProfile/NetworkAccessProfileNetworkResource.cs b/src/Twilio/Rest/Supersim/V1/NetworkAccessProfile/NetworkAccessProfileNetworkResource.cs
index c98a4f973..b695ea79d 100644
--- a/src/Twilio/Rest/Supersim/V1/NetworkAccessProfile/NetworkAccessProfileNetworkResource.cs
+++ b/src/Twilio/Rest/Supersim/V1/NetworkAccessProfile/NetworkAccessProfileNetworkResource.cs
@@ -18,423 +18,423 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Supersim.V1.NetworkAccessProfile
-{
-
-    public class NetworkAccessProfileNetworkResource : Resource
-    {
-        private static Request BuildReadRequest(ReadNetworkAccessProfileNetworkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/NetworkAccessProfiles/" + options.PathNetworkAccessProfileSid + "/Networks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Network Access Profile resource's Network resource.
-        /// </summary>
-        /// <param name="options"> Read NetworkAccessProfileNetwork parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
-        public static ResourceSet<NetworkAccessProfileNetworkResource> Read(ReadNetworkAccessProfileNetworkOptions options,
-                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<NetworkAccessProfileNetworkResource>.FromJson("networks", response.Content);
-            return new ResourceSet<NetworkAccessProfileNetworkResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Network Access Profile resource's Network resource.
-        /// </summary>
-        /// <param name="options"> Read NetworkAccessProfileNetwork parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<NetworkAccessProfileNetworkResource>> ReadAsync(ReadNetworkAccessProfileNetworkOptions options,
-                                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<NetworkAccessProfileNetworkResource>.FromJson("networks", response.Content);
-            return new ResourceSet<NetworkAccessProfileNetworkResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Network Access Profile resource's Network resource.
-        /// </summary>
-        /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
-        ///                                   </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
-        public static ResourceSet<NetworkAccessProfileNetworkResource> Read(string pathNetworkAccessProfileSid,
-                                                                            int? pageSize = null,
-                                                                            long? limit = null,
-                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Network Access Profile resource's Network resource.
-        /// </summary>
-        /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
-        ///                                   </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<NetworkAccessProfileNetworkResource>> ReadAsync(string pathNetworkAccessProfileSid,
-                                                                                                                    int? pageSize = null,
-                                                                                                                    long? limit = null,
-                                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<NetworkAccessProfileNetworkResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<NetworkAccessProfileNetworkResource>.FromJson("networks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<NetworkAccessProfileNetworkResource> NextPage(Page<NetworkAccessProfileNetworkResource> page,
-                                                                         ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<NetworkAccessProfileNetworkResource>.FromJson("networks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<NetworkAccessProfileNetworkResource> PreviousPage(Page<NetworkAccessProfileNetworkResource> page,
-                                                                             ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<NetworkAccessProfileNetworkResource>.FromJson("networks", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateNetworkAccessProfileNetworkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Supersim,
-                "/v1/NetworkAccessProfiles/" + options.PathNetworkAccessProfileSid + "/Networks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Add a Network resource to the Network Access Profile resource.
-        /// </summary>
-        /// <param name="options"> Create NetworkAccessProfileNetwork parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
-        public static NetworkAccessProfileNetworkResource Create(CreateNetworkAccessProfileNetworkOptions options,
-                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a Network resource to the Network Access Profile resource.
-        /// </summary>
-        /// <param name="options"> Create NetworkAccessProfileNetwork parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
-        public static async System.Threading.Tasks.Task<NetworkAccessProfileNetworkResource> CreateAsync(CreateNetworkAccessProfileNetworkOptions options,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Add a Network resource to the Network Access Profile resource.
-        /// </summary>
-        /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
-        ///                                   </param>
-        /// <param name="network"> The SID that identifies the Network resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
-        public static NetworkAccessProfileNetworkResource Create(string pathNetworkAccessProfileSid,
-                                                                 string network,
-                                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid, network);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Add a Network resource to the Network Access Profile resource.
-        /// </summary>
-        /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
-        ///                                   </param>
-        /// <param name="network"> The SID that identifies the Network resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
-        public static async System.Threading.Tasks.Task<NetworkAccessProfileNetworkResource> CreateAsync(string pathNetworkAccessProfileSid,
-                                                                                                         string network,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid, network);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteNetworkAccessProfileNetworkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Supersim,
-                "/v1/NetworkAccessProfiles/" + options.PathNetworkAccessProfileSid + "/Networks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove a Network resource from the Network Access Profile resource's.
-        /// </summary>
-        /// <param name="options"> Delete NetworkAccessProfileNetwork parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
-        public static bool Delete(DeleteNetworkAccessProfileNetworkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a Network resource from the Network Access Profile resource's.
-        /// </summary>
-        /// <param name="options"> Delete NetworkAccessProfileNetwork parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteNetworkAccessProfileNetworkOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove a Network resource from the Network Access Profile resource's.
-        /// </summary>
-        /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
-        ///                                   </param>
-        /// <param name="pathSid"> The SID that identifies the Network resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
-        public static bool Delete(string pathNetworkAccessProfileSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove a Network resource from the Network Access Profile resource's.
-        /// </summary>
-        /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
-        ///                                   </param>
-        /// <param name="pathSid"> The SID that identifies the Network resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathNetworkAccessProfileSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchNetworkAccessProfileNetworkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/NetworkAccessProfiles/" + options.PathNetworkAccessProfileSid + "/Networks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a Network Access Profile resource's Network resource.
-        /// </summary>
-        /// <param name="options"> Fetch NetworkAccessProfileNetwork parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
-        public static NetworkAccessProfileNetworkResource Fetch(FetchNetworkAccessProfileNetworkOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Network Access Profile resource's Network resource.
-        /// </summary>
-        /// <param name="options"> Fetch NetworkAccessProfileNetwork parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
-        public static async System.Threading.Tasks.Task<NetworkAccessProfileNetworkResource> FetchAsync(FetchNetworkAccessProfileNetworkOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a Network Access Profile resource's Network resource.
-        /// </summary>
-        /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
-        ///                                   </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
-        public static NetworkAccessProfileNetworkResource Fetch(string pathNetworkAccessProfileSid,
-                                                                string pathSid,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Network Access Profile resource's Network resource.
-        /// </summary>
-        /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
-        ///                                   </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
-        public static async System.Threading.Tasks.Task<NetworkAccessProfileNetworkResource> FetchAsync(string pathNetworkAccessProfileSid,
-                                                                                                        string pathSid,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a NetworkAccessProfileNetworkResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NetworkAccessProfileNetworkResource object represented by the provided JSON </returns>
-        public static NetworkAccessProfileNetworkResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NetworkAccessProfileNetworkResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the Network Access Profile resource
-        /// </summary>
-        [JsonProperty("network_access_profile_sid")]
-        public string NetworkAccessProfileSid { get; private set; }
-        /// <summary>
-        /// A human readable identifier of this resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The ISO country code of the Network resource
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The MCC/MNCs included in the resource
-        /// </summary>
-        [JsonProperty("identifiers")]
-        public List<object> Identifiers { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private NetworkAccessProfileNetworkResource()
-        {
-
-        }
-    }
+{
+
+  public class NetworkAccessProfileNetworkResource : Resource
+  {
+    private static Request BuildReadRequest(ReadNetworkAccessProfileNetworkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/NetworkAccessProfiles/" + options.PathNetworkAccessProfileSid + "/Networks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Network Access Profile resource's Network resource.
+    /// </summary>
+    /// <param name="options"> Read NetworkAccessProfileNetwork parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
+    public static ResourceSet<NetworkAccessProfileNetworkResource> Read(ReadNetworkAccessProfileNetworkOptions options,
+                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<NetworkAccessProfileNetworkResource>.FromJson("networks", response.Content);
+      return new ResourceSet<NetworkAccessProfileNetworkResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Network Access Profile resource's Network resource.
+    /// </summary>
+    /// <param name="options"> Read NetworkAccessProfileNetwork parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<NetworkAccessProfileNetworkResource>> ReadAsync(ReadNetworkAccessProfileNetworkOptions options,
+                                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<NetworkAccessProfileNetworkResource>.FromJson("networks", response.Content);
+      return new ResourceSet<NetworkAccessProfileNetworkResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Network Access Profile resource's Network resource.
+    /// </summary>
+    /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
+    ///                                   </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
+    public static ResourceSet<NetworkAccessProfileNetworkResource> Read(string pathNetworkAccessProfileSid,
+                                                                        int? pageSize = null,
+                                                                        long? limit = null,
+                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Network Access Profile resource's Network resource.
+    /// </summary>
+    /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
+    ///                                   </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<NetworkAccessProfileNetworkResource>> ReadAsync(string pathNetworkAccessProfileSid,
+                                                                                                                int? pageSize = null,
+                                                                                                                long? limit = null,
+                                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<NetworkAccessProfileNetworkResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<NetworkAccessProfileNetworkResource>.FromJson("networks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<NetworkAccessProfileNetworkResource> NextPage(Page<NetworkAccessProfileNetworkResource> page,
+                                                                     ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<NetworkAccessProfileNetworkResource>.FromJson("networks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<NetworkAccessProfileNetworkResource> PreviousPage(Page<NetworkAccessProfileNetworkResource> page,
+                                                                         ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<NetworkAccessProfileNetworkResource>.FromJson("networks", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateNetworkAccessProfileNetworkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Supersim,
+          "/v1/NetworkAccessProfiles/" + options.PathNetworkAccessProfileSid + "/Networks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Add a Network resource to the Network Access Profile resource.
+    /// </summary>
+    /// <param name="options"> Create NetworkAccessProfileNetwork parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
+    public static NetworkAccessProfileNetworkResource Create(CreateNetworkAccessProfileNetworkOptions options,
+                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a Network resource to the Network Access Profile resource.
+    /// </summary>
+    /// <param name="options"> Create NetworkAccessProfileNetwork parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
+    public static async System.Threading.Tasks.Task<NetworkAccessProfileNetworkResource> CreateAsync(CreateNetworkAccessProfileNetworkOptions options,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Add a Network resource to the Network Access Profile resource.
+    /// </summary>
+    /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
+    ///                                   </param>
+    /// <param name="network"> The SID that identifies the Network resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
+    public static NetworkAccessProfileNetworkResource Create(string pathNetworkAccessProfileSid,
+                                                             string network,
+                                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid, network);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Add a Network resource to the Network Access Profile resource.
+    /// </summary>
+    /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
+    ///                                   </param>
+    /// <param name="network"> The SID that identifies the Network resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
+    public static async System.Threading.Tasks.Task<NetworkAccessProfileNetworkResource> CreateAsync(string pathNetworkAccessProfileSid,
+                                                                                                     string network,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid, network);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteNetworkAccessProfileNetworkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Supersim,
+          "/v1/NetworkAccessProfiles/" + options.PathNetworkAccessProfileSid + "/Networks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove a Network resource from the Network Access Profile resource's.
+    /// </summary>
+    /// <param name="options"> Delete NetworkAccessProfileNetwork parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
+    public static bool Delete(DeleteNetworkAccessProfileNetworkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a Network resource from the Network Access Profile resource's.
+    /// </summary>
+    /// <param name="options"> Delete NetworkAccessProfileNetwork parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteNetworkAccessProfileNetworkOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove a Network resource from the Network Access Profile resource's.
+    /// </summary>
+    /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
+    ///                                   </param>
+    /// <param name="pathSid"> The SID that identifies the Network resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
+    public static bool Delete(string pathNetworkAccessProfileSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove a Network resource from the Network Access Profile resource's.
+    /// </summary>
+    /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
+    ///                                   </param>
+    /// <param name="pathSid"> The SID that identifies the Network resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathNetworkAccessProfileSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchNetworkAccessProfileNetworkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/NetworkAccessProfiles/" + options.PathNetworkAccessProfileSid + "/Networks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a Network Access Profile resource's Network resource.
+    /// </summary>
+    /// <param name="options"> Fetch NetworkAccessProfileNetwork parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
+    public static NetworkAccessProfileNetworkResource Fetch(FetchNetworkAccessProfileNetworkOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Network Access Profile resource's Network resource.
+    /// </summary>
+    /// <param name="options"> Fetch NetworkAccessProfileNetwork parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
+    public static async System.Threading.Tasks.Task<NetworkAccessProfileNetworkResource> FetchAsync(FetchNetworkAccessProfileNetworkOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a Network Access Profile resource's Network resource.
+    /// </summary>
+    /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
+    ///                                   </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfileNetwork </returns>
+    public static NetworkAccessProfileNetworkResource Fetch(string pathNetworkAccessProfileSid,
+                                                            string pathSid,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Network Access Profile resource's Network resource.
+    /// </summary>
+    /// <param name="pathNetworkAccessProfileSid"> The unique string that identifies the Network Access Profile resource
+    ///                                   </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfileNetwork </returns>
+    public static async System.Threading.Tasks.Task<NetworkAccessProfileNetworkResource> FetchAsync(string pathNetworkAccessProfileSid,
+                                                                                                    string pathSid,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchNetworkAccessProfileNetworkOptions(pathNetworkAccessProfileSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a NetworkAccessProfileNetworkResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NetworkAccessProfileNetworkResource object represented by the provided JSON </returns>
+    public static NetworkAccessProfileNetworkResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NetworkAccessProfileNetworkResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the Network Access Profile resource
+    /// </summary>
+    [JsonProperty("network_access_profile_sid")]
+    public string NetworkAccessProfileSid { get; private set; }
+    /// <summary>
+    /// A human readable identifier of this resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The ISO country code of the Network resource
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The MCC/MNCs included in the resource
+    /// </summary>
+    [JsonProperty("identifiers")]
+    public List<object> Identifiers { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private NetworkAccessProfileNetworkResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/NetworkAccessProfileOptions.cs b/src/Twilio/Rest/Supersim/V1/NetworkAccessProfileOptions.cs
index 7e8d3e3ee..026516fd8 100644
--- a/src/Twilio/Rest/Supersim/V1/NetworkAccessProfileOptions.cs
+++ b/src/Twilio/Rest/Supersim/V1/NetworkAccessProfileOptions.cs
@@ -10,143 +10,143 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Network Access Profile
+  /// </summary>
+  public class CreateNetworkAccessProfileOptions : IOptions<NetworkAccessProfileResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Network Access Profile
+    /// An application-defined string that uniquely identifies the resource
     /// </summary>
-    public class CreateNetworkAccessProfileOptions : IOptions<NetworkAccessProfileResource>
-    {
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// List of Network SIDs that this Network Access Profile will allow connections to
-        /// </summary>
-        public List<string> Networks { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateNetworkAccessProfileOptions
-        /// </summary>
-        public CreateNetworkAccessProfileOptions()
-        {
-            Networks = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Networks != null)
-            {
-                p.AddRange(Networks.Select(prop => new KeyValuePair<string, string>("Networks", prop.ToString())));
-            }
-
-            return p;
-        }
-    }
-
+    public string UniqueName { get; set; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a Network Access Profile instance from your account.
+    /// List of Network SIDs that this Network Access Profile will allow connections to
     /// </summary>
-    public class FetchNetworkAccessProfileOptions : IOptions<NetworkAccessProfileResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchNetworkAccessProfileOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchNetworkAccessProfileOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<string> Networks { get; set; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Updates the given properties of a Network Access Profile in your account.
+    /// Construct a new CreateNetworkAccessProfileOptions
     /// </summary>
-    public class UpdateNetworkAccessProfileOptions : IOptions<NetworkAccessProfileResource>
-    {
-        /// <summary>
-        /// The SID of the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The new unique name of the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateNetworkAccessProfileOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        public UpdateNetworkAccessProfileOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            return p;
-        }
-    }
-
+    public CreateNetworkAccessProfileOptions()
+    {
+      Networks = new List<string>();
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of Network Access Profiles from your account.
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadNetworkAccessProfileOptions : ReadOptions<NetworkAccessProfileResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Networks != null)
+      {
+        p.AddRange(Networks.Select(prop => new KeyValuePair<string, string>("Networks", prop.ToString())));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a Network Access Profile instance from your account.
+  /// </summary>
+  public class FetchNetworkAccessProfileOptions : IOptions<NetworkAccessProfileResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchNetworkAccessProfileOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchNetworkAccessProfileOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Updates the given properties of a Network Access Profile in your account.
+  /// </summary>
+  public class UpdateNetworkAccessProfileOptions : IOptions<NetworkAccessProfileResource>
+  {
+    /// <summary>
+    /// The SID of the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The new unique name of the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateNetworkAccessProfileOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    public UpdateNetworkAccessProfileOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of Network Access Profiles from your account.
+  /// </summary>
+  public class ReadNetworkAccessProfileOptions : ReadOptions<NetworkAccessProfileResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/NetworkAccessProfileResource.cs b/src/Twilio/Rest/Supersim/V1/NetworkAccessProfileResource.cs
index ae9d7fff1..179a1d592 100644
--- a/src/Twilio/Rest/Supersim/V1/NetworkAccessProfileResource.cs
+++ b/src/Twilio/Rest/Supersim/V1/NetworkAccessProfileResource.cs
@@ -18,414 +18,414 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
-    public class NetworkAccessProfileResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateNetworkAccessProfileOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Supersim,
-                "/v1/NetworkAccessProfiles",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Network Access Profile
-        /// </summary>
-        /// <param name="options"> Create NetworkAccessProfile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfile </returns>
-        public static NetworkAccessProfileResource Create(CreateNetworkAccessProfileOptions options,
-                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Network Access Profile
-        /// </summary>
-        /// <param name="options"> Create NetworkAccessProfile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
-        public static async System.Threading.Tasks.Task<NetworkAccessProfileResource> CreateAsync(CreateNetworkAccessProfileOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Network Access Profile
-        /// </summary>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="networks"> List of Network SIDs that this Network Access Profile will allow connections to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfile </returns>
-        public static NetworkAccessProfileResource Create(string uniqueName = null,
-                                                          List<string> networks = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateNetworkAccessProfileOptions(){UniqueName = uniqueName, Networks = networks};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Network Access Profile
-        /// </summary>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="networks"> List of Network SIDs that this Network Access Profile will allow connections to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
-        public static async System.Threading.Tasks.Task<NetworkAccessProfileResource> CreateAsync(string uniqueName = null,
-                                                                                                  List<string> networks = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateNetworkAccessProfileOptions(){UniqueName = uniqueName, Networks = networks};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchNetworkAccessProfileOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/NetworkAccessProfiles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a Network Access Profile instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch NetworkAccessProfile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfile </returns>
-        public static NetworkAccessProfileResource Fetch(FetchNetworkAccessProfileOptions options,
-                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Network Access Profile instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch NetworkAccessProfile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
-        public static async System.Threading.Tasks.Task<NetworkAccessProfileResource> FetchAsync(FetchNetworkAccessProfileOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a Network Access Profile instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfile </returns>
-        public static NetworkAccessProfileResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchNetworkAccessProfileOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Network Access Profile instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
-        public static async System.Threading.Tasks.Task<NetworkAccessProfileResource> FetchAsync(string pathSid,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchNetworkAccessProfileOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateNetworkAccessProfileOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Supersim,
-                "/v1/NetworkAccessProfiles/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates the given properties of a Network Access Profile in your account.
-        /// </summary>
-        /// <param name="options"> Update NetworkAccessProfile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfile </returns>
-        public static NetworkAccessProfileResource Update(UpdateNetworkAccessProfileOptions options,
-                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the given properties of a Network Access Profile in your account.
-        /// </summary>
-        /// <param name="options"> Update NetworkAccessProfile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
-        public static async System.Threading.Tasks.Task<NetworkAccessProfileResource> UpdateAsync(UpdateNetworkAccessProfileOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates the given properties of a Network Access Profile in your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        /// <param name="uniqueName"> The new unique name of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfile </returns>
-        public static NetworkAccessProfileResource Update(string pathSid,
-                                                          string uniqueName = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateNetworkAccessProfileOptions(pathSid){UniqueName = uniqueName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the given properties of a Network Access Profile in your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        /// <param name="uniqueName"> The new unique name of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
-        public static async System.Threading.Tasks.Task<NetworkAccessProfileResource> UpdateAsync(string pathSid,
-                                                                                                  string uniqueName = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateNetworkAccessProfileOptions(pathSid){UniqueName = uniqueName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadNetworkAccessProfileOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/NetworkAccessProfiles",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Network Access Profiles from your account.
-        /// </summary>
-        /// <param name="options"> Read NetworkAccessProfile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfile </returns>
-        public static ResourceSet<NetworkAccessProfileResource> Read(ReadNetworkAccessProfileOptions options,
-                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<NetworkAccessProfileResource>.FromJson("network_access_profiles", response.Content);
-            return new ResourceSet<NetworkAccessProfileResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Network Access Profiles from your account.
-        /// </summary>
-        /// <param name="options"> Read NetworkAccessProfile parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<NetworkAccessProfileResource>> ReadAsync(ReadNetworkAccessProfileOptions options,
-                                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<NetworkAccessProfileResource>.FromJson("network_access_profiles", response.Content);
-            return new ResourceSet<NetworkAccessProfileResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Network Access Profiles from your account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NetworkAccessProfile </returns>
-        public static ResourceSet<NetworkAccessProfileResource> Read(int? pageSize = null,
-                                                                     long? limit = null,
-                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadNetworkAccessProfileOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Network Access Profiles from your account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<NetworkAccessProfileResource>> ReadAsync(int? pageSize = null,
-                                                                                                             long? limit = null,
-                                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadNetworkAccessProfileOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<NetworkAccessProfileResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<NetworkAccessProfileResource>.FromJson("network_access_profiles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<NetworkAccessProfileResource> NextPage(Page<NetworkAccessProfileResource> page,
-                                                                  ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<NetworkAccessProfileResource>.FromJson("network_access_profiles", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<NetworkAccessProfileResource> PreviousPage(Page<NetworkAccessProfileResource> page,
-                                                                      ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<NetworkAccessProfileResource>.FromJson("network_access_profiles", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a NetworkAccessProfileResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NetworkAccessProfileResource object represented by the provided JSON </returns>
-        public static NetworkAccessProfileResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NetworkAccessProfileResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The SID of the Account that the Network Access Profile belongs to
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private NetworkAccessProfileResource()
-        {
-
-        }
-    }
+{
+
+  public class NetworkAccessProfileResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateNetworkAccessProfileOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Supersim,
+          "/v1/NetworkAccessProfiles",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Network Access Profile
+    /// </summary>
+    /// <param name="options"> Create NetworkAccessProfile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfile </returns>
+    public static NetworkAccessProfileResource Create(CreateNetworkAccessProfileOptions options,
+                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Network Access Profile
+    /// </summary>
+    /// <param name="options"> Create NetworkAccessProfile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
+    public static async System.Threading.Tasks.Task<NetworkAccessProfileResource> CreateAsync(CreateNetworkAccessProfileOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Network Access Profile
+    /// </summary>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="networks"> List of Network SIDs that this Network Access Profile will allow connections to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfile </returns>
+    public static NetworkAccessProfileResource Create(string uniqueName = null,
+                                                      List<string> networks = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateNetworkAccessProfileOptions() { UniqueName = uniqueName, Networks = networks };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Network Access Profile
+    /// </summary>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="networks"> List of Network SIDs that this Network Access Profile will allow connections to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
+    public static async System.Threading.Tasks.Task<NetworkAccessProfileResource> CreateAsync(string uniqueName = null,
+                                                                                              List<string> networks = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateNetworkAccessProfileOptions() { UniqueName = uniqueName, Networks = networks };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchNetworkAccessProfileOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/NetworkAccessProfiles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a Network Access Profile instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch NetworkAccessProfile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfile </returns>
+    public static NetworkAccessProfileResource Fetch(FetchNetworkAccessProfileOptions options,
+                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Network Access Profile instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch NetworkAccessProfile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
+    public static async System.Threading.Tasks.Task<NetworkAccessProfileResource> FetchAsync(FetchNetworkAccessProfileOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a Network Access Profile instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfile </returns>
+    public static NetworkAccessProfileResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchNetworkAccessProfileOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Network Access Profile instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
+    public static async System.Threading.Tasks.Task<NetworkAccessProfileResource> FetchAsync(string pathSid,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchNetworkAccessProfileOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateNetworkAccessProfileOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Supersim,
+          "/v1/NetworkAccessProfiles/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates the given properties of a Network Access Profile in your account.
+    /// </summary>
+    /// <param name="options"> Update NetworkAccessProfile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfile </returns>
+    public static NetworkAccessProfileResource Update(UpdateNetworkAccessProfileOptions options,
+                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the given properties of a Network Access Profile in your account.
+    /// </summary>
+    /// <param name="options"> Update NetworkAccessProfile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
+    public static async System.Threading.Tasks.Task<NetworkAccessProfileResource> UpdateAsync(UpdateNetworkAccessProfileOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates the given properties of a Network Access Profile in your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    /// <param name="uniqueName"> The new unique name of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfile </returns>
+    public static NetworkAccessProfileResource Update(string pathSid,
+                                                      string uniqueName = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateNetworkAccessProfileOptions(pathSid) { UniqueName = uniqueName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the given properties of a Network Access Profile in your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    /// <param name="uniqueName"> The new unique name of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
+    public static async System.Threading.Tasks.Task<NetworkAccessProfileResource> UpdateAsync(string pathSid,
+                                                                                              string uniqueName = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateNetworkAccessProfileOptions(pathSid) { UniqueName = uniqueName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadNetworkAccessProfileOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/NetworkAccessProfiles",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Network Access Profiles from your account.
+    /// </summary>
+    /// <param name="options"> Read NetworkAccessProfile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfile </returns>
+    public static ResourceSet<NetworkAccessProfileResource> Read(ReadNetworkAccessProfileOptions options,
+                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<NetworkAccessProfileResource>.FromJson("network_access_profiles", response.Content);
+      return new ResourceSet<NetworkAccessProfileResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Network Access Profiles from your account.
+    /// </summary>
+    /// <param name="options"> Read NetworkAccessProfile parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<NetworkAccessProfileResource>> ReadAsync(ReadNetworkAccessProfileOptions options,
+                                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<NetworkAccessProfileResource>.FromJson("network_access_profiles", response.Content);
+      return new ResourceSet<NetworkAccessProfileResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Network Access Profiles from your account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NetworkAccessProfile </returns>
+    public static ResourceSet<NetworkAccessProfileResource> Read(int? pageSize = null,
+                                                                 long? limit = null,
+                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadNetworkAccessProfileOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Network Access Profiles from your account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NetworkAccessProfile </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<NetworkAccessProfileResource>> ReadAsync(int? pageSize = null,
+                                                                                                         long? limit = null,
+                                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadNetworkAccessProfileOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<NetworkAccessProfileResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<NetworkAccessProfileResource>.FromJson("network_access_profiles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<NetworkAccessProfileResource> NextPage(Page<NetworkAccessProfileResource> page,
+                                                              ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<NetworkAccessProfileResource>.FromJson("network_access_profiles", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<NetworkAccessProfileResource> PreviousPage(Page<NetworkAccessProfileResource> page,
+                                                                  ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<NetworkAccessProfileResource>.FromJson("network_access_profiles", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a NetworkAccessProfileResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NetworkAccessProfileResource object represented by the provided JSON </returns>
+    public static NetworkAccessProfileResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NetworkAccessProfileResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The SID of the Account that the Network Access Profile belongs to
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private NetworkAccessProfileResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/NetworkOptions.cs b/src/Twilio/Rest/Supersim/V1/NetworkOptions.cs
index 48be0ff43..70f742472 100644
--- a/src/Twilio/Rest/Supersim/V1/NetworkOptions.cs
+++ b/src/Twilio/Rest/Supersim/V1/NetworkOptions.cs
@@ -9,87 +9,87 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a Network resource.
+  /// </summary>
+  public class FetchNetworkOptions : IOptions<NetworkResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a Network resource.
+    /// The SID of the Network resource to fetch
     /// </summary>
-    public class FetchNetworkOptions : IOptions<NetworkResource>
-    {
-        /// <summary>
-        /// The SID of the Network resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchNetworkOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Network resource to fetch </param>
-        public FetchNetworkOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of Network resources.
+    /// Construct a new FetchNetworkOptions
     /// </summary>
-    public class ReadNetworkOptions : ReadOptions<NetworkResource>
-    {
-        /// <summary>
-        /// The ISO country code of the Network resources to read
-        /// </summary>
-        public string IsoCountry { get; set; }
-        /// <summary>
-        /// The MCC of Network resource identifiers to be read
-        /// </summary>
-        public string Mcc { get; set; }
-        /// <summary>
-        /// The MNC of Network resource identifiers to be read
-        /// </summary>
-        public string Mnc { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IsoCountry != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry));
-            }
-
-            if (Mcc != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Mcc", Mcc));
-            }
-
-            if (Mnc != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Mnc", Mnc));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathSid"> The SID of the Network resource to fetch </param>
+    public FetchNetworkOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of Network resources.
+  /// </summary>
+  public class ReadNetworkOptions : ReadOptions<NetworkResource>
+  {
+    /// <summary>
+    /// The ISO country code of the Network resources to read
+    /// </summary>
+    public string IsoCountry { get; set; }
+    /// <summary>
+    /// The MCC of Network resource identifiers to be read
+    /// </summary>
+    public string Mcc { get; set; }
+    /// <summary>
+    /// The MNC of Network resource identifiers to be read
+    /// </summary>
+    public string Mnc { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IsoCountry != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry));
+      }
+
+      if (Mcc != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Mcc", Mcc));
+      }
+
+      if (Mnc != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Mnc", Mnc));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/NetworkResource.cs b/src/Twilio/Rest/Supersim/V1/NetworkResource.cs
index 13ed3606e..43310ab52 100644
--- a/src/Twilio/Rest/Supersim/V1/NetworkResource.cs
+++ b/src/Twilio/Rest/Supersim/V1/NetworkResource.cs
@@ -18,266 +18,266 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
-    public class NetworkResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchNetworkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/Networks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a Network resource.
-        /// </summary>
-        /// <param name="options"> Fetch Network parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Network </returns>
-        public static NetworkResource Fetch(FetchNetworkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Network resource.
-        /// </summary>
-        /// <param name="options"> Fetch Network parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Network </returns>
-        public static async System.Threading.Tasks.Task<NetworkResource> FetchAsync(FetchNetworkOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a Network resource.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Network resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Network </returns>
-        public static NetworkResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchNetworkOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Network resource.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Network resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Network </returns>
-        public static async System.Threading.Tasks.Task<NetworkResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchNetworkOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadNetworkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/Networks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Network resources.
-        /// </summary>
-        /// <param name="options"> Read Network parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Network </returns>
-        public static ResourceSet<NetworkResource> Read(ReadNetworkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<NetworkResource>.FromJson("networks", response.Content);
-            return new ResourceSet<NetworkResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Network resources.
-        /// </summary>
-        /// <param name="options"> Read Network parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Network </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<NetworkResource>> ReadAsync(ReadNetworkOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<NetworkResource>.FromJson("networks", response.Content);
-            return new ResourceSet<NetworkResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Network resources.
-        /// </summary>
-        /// <param name="isoCountry"> The ISO country code of the Network resources to read </param>
-        /// <param name="mcc"> The MCC of Network resource identifiers to be read </param>
-        /// <param name="mnc"> The MNC of Network resource identifiers to be read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Network </returns>
-        public static ResourceSet<NetworkResource> Read(string isoCountry = null,
-                                                        string mcc = null,
-                                                        string mnc = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadNetworkOptions(){IsoCountry = isoCountry, Mcc = mcc, Mnc = mnc, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Network resources.
-        /// </summary>
-        /// <param name="isoCountry"> The ISO country code of the Network resources to read </param>
-        /// <param name="mcc"> The MCC of Network resource identifiers to be read </param>
-        /// <param name="mnc"> The MNC of Network resource identifiers to be read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Network </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<NetworkResource>> ReadAsync(string isoCountry = null,
-                                                                                                string mcc = null,
-                                                                                                string mnc = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadNetworkOptions(){IsoCountry = isoCountry, Mcc = mcc, Mnc = mnc, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<NetworkResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<NetworkResource>.FromJson("networks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<NetworkResource> NextPage(Page<NetworkResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<NetworkResource>.FromJson("networks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<NetworkResource> PreviousPage(Page<NetworkResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<NetworkResource>.FromJson("networks", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a NetworkResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NetworkResource object represented by the provided JSON </returns>
-        public static NetworkResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NetworkResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A human readable identifier of this resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Network resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The ISO country code of the Network resource
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The MCC/MNCs included in the Network resource
-        /// </summary>
-        [JsonProperty("identifiers")]
-        public List<object> Identifiers { get; private set; }
-
-        private NetworkResource()
-        {
-
-        }
-    }
+{
+
+  public class NetworkResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchNetworkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/Networks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a Network resource.
+    /// </summary>
+    /// <param name="options"> Fetch Network parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Network </returns>
+    public static NetworkResource Fetch(FetchNetworkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Network resource.
+    /// </summary>
+    /// <param name="options"> Fetch Network parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Network </returns>
+    public static async System.Threading.Tasks.Task<NetworkResource> FetchAsync(FetchNetworkOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a Network resource.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Network resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Network </returns>
+    public static NetworkResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchNetworkOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Network resource.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Network resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Network </returns>
+    public static async System.Threading.Tasks.Task<NetworkResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchNetworkOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadNetworkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/Networks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Network resources.
+    /// </summary>
+    /// <param name="options"> Read Network parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Network </returns>
+    public static ResourceSet<NetworkResource> Read(ReadNetworkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<NetworkResource>.FromJson("networks", response.Content);
+      return new ResourceSet<NetworkResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Network resources.
+    /// </summary>
+    /// <param name="options"> Read Network parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Network </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<NetworkResource>> ReadAsync(ReadNetworkOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<NetworkResource>.FromJson("networks", response.Content);
+      return new ResourceSet<NetworkResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Network resources.
+    /// </summary>
+    /// <param name="isoCountry"> The ISO country code of the Network resources to read </param>
+    /// <param name="mcc"> The MCC of Network resource identifiers to be read </param>
+    /// <param name="mnc"> The MNC of Network resource identifiers to be read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Network </returns>
+    public static ResourceSet<NetworkResource> Read(string isoCountry = null,
+                                                    string mcc = null,
+                                                    string mnc = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadNetworkOptions() { IsoCountry = isoCountry, Mcc = mcc, Mnc = mnc, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Network resources.
+    /// </summary>
+    /// <param name="isoCountry"> The ISO country code of the Network resources to read </param>
+    /// <param name="mcc"> The MCC of Network resource identifiers to be read </param>
+    /// <param name="mnc"> The MNC of Network resource identifiers to be read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Network </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<NetworkResource>> ReadAsync(string isoCountry = null,
+                                                                                            string mcc = null,
+                                                                                            string mnc = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadNetworkOptions() { IsoCountry = isoCountry, Mcc = mcc, Mnc = mnc, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<NetworkResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<NetworkResource>.FromJson("networks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<NetworkResource> NextPage(Page<NetworkResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<NetworkResource>.FromJson("networks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<NetworkResource> PreviousPage(Page<NetworkResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<NetworkResource>.FromJson("networks", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a NetworkResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NetworkResource object represented by the provided JSON </returns>
+    public static NetworkResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NetworkResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A human readable identifier of this resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Network resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The ISO country code of the Network resource
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The MCC/MNCs included in the Network resource
+    /// </summary>
+    [JsonProperty("identifiers")]
+    public List<object> Identifiers { get; private set; }
+
+    private NetworkResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/Sim/BillingPeriodOptions.cs b/src/Twilio/Rest/Supersim/V1/Sim/BillingPeriodOptions.cs
index 87fd77519..7836ed30b 100644
--- a/src/Twilio/Rest/Supersim/V1/Sim/BillingPeriodOptions.cs
+++ b/src/Twilio/Rest/Supersim/V1/Sim/BillingPeriodOptions.cs
@@ -9,40 +9,40 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Supersim.V1.Sim
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of Billing Periods for a Super SIM.
+  /// </summary>
+  public class ReadBillingPeriodOptions : ReadOptions<BillingPeriodResource>
+  {
     /// <summary>
-    /// Retrieve a list of Billing Periods for a Super SIM.
+    /// The SID of the Super SIM to list Billing Periods for.
     /// </summary>
-    public class ReadBillingPeriodOptions : ReadOptions<BillingPeriodResource>
-    {
-        /// <summary>
-        /// The SID of the Super SIM to list Billing Periods for.
-        /// </summary>
-        public string PathSimSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadBillingPeriodOptions
-        /// </summary>
-        /// <param name="pathSimSid"> The SID of the Super SIM to list Billing Periods for. </param>
-        public ReadBillingPeriodOptions(string pathSimSid)
-        {
-            PathSimSid = pathSimSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathSimSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadBillingPeriodOptions
+    /// </summary>
+    /// <param name="pathSimSid"> The SID of the Super SIM to list Billing Periods for. </param>
+    public ReadBillingPeriodOptions(string pathSimSid)
+    {
+      PathSimSid = pathSimSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/Sim/BillingPeriodResource.cs b/src/Twilio/Rest/Supersim/V1/Sim/BillingPeriodResource.cs
index f54f95fa5..7c540b3a7 100644
--- a/src/Twilio/Rest/Supersim/V1/Sim/BillingPeriodResource.cs
+++ b/src/Twilio/Rest/Supersim/V1/Sim/BillingPeriodResource.cs
@@ -17,221 +17,221 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Supersim.V1.Sim
-{
-
-    public class BillingPeriodResource : Resource
-    {
-        public sealed class BpTypeEnum : StringEnum
-        {
-            private BpTypeEnum(string value) : base(value) {}
-            public BpTypeEnum() {}
-            public static implicit operator BpTypeEnum(string value)
-            {
-                return new BpTypeEnum(value);
-            }
-
-            public static readonly BpTypeEnum Ready = new BpTypeEnum("ready");
-            public static readonly BpTypeEnum Active = new BpTypeEnum("active");
-        }
-
-        private static Request BuildReadRequest(ReadBillingPeriodOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/Sims/" + options.PathSimSid + "/BillingPeriods",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Billing Periods for a Super SIM.
-        /// </summary>
-        /// <param name="options"> Read BillingPeriod parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BillingPeriod </returns>
-        public static ResourceSet<BillingPeriodResource> Read(ReadBillingPeriodOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<BillingPeriodResource>.FromJson("billing_periods", response.Content);
-            return new ResourceSet<BillingPeriodResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Billing Periods for a Super SIM.
-        /// </summary>
-        /// <param name="options"> Read BillingPeriod parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BillingPeriod </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BillingPeriodResource>> ReadAsync(ReadBillingPeriodOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<BillingPeriodResource>.FromJson("billing_periods", response.Content);
-            return new ResourceSet<BillingPeriodResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Billing Periods for a Super SIM.
-        /// </summary>
-        /// <param name="pathSimSid"> The SID of the Super SIM to list Billing Periods for. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BillingPeriod </returns>
-        public static ResourceSet<BillingPeriodResource> Read(string pathSimSid,
-                                                              int? pageSize = null,
-                                                              long? limit = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadBillingPeriodOptions(pathSimSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Billing Periods for a Super SIM.
-        /// </summary>
-        /// <param name="pathSimSid"> The SID of the Super SIM to list Billing Periods for. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BillingPeriod </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BillingPeriodResource>> ReadAsync(string pathSimSid,
-                                                                                                      int? pageSize = null,
-                                                                                                      long? limit = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadBillingPeriodOptions(pathSimSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<BillingPeriodResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<BillingPeriodResource>.FromJson("billing_periods", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<BillingPeriodResource> NextPage(Page<BillingPeriodResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<BillingPeriodResource>.FromJson("billing_periods", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<BillingPeriodResource> PreviousPage(Page<BillingPeriodResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<BillingPeriodResource>.FromJson("billing_periods", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a BillingPeriodResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BillingPeriodResource object represented by the provided JSON </returns>
-        public static BillingPeriodResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BillingPeriodResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Billing Period
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account the Super SIM belongs to
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Super SIM the Billing Period belongs to
-        /// </summary>
-        [JsonProperty("sim_sid")]
-        public string SimSid { get; private set; }
-        /// <summary>
-        /// The start time of the Billing Period
-        /// </summary>
-        [JsonProperty("start_time")]
-        public DateTime? StartTime { get; private set; }
-        /// <summary>
-        /// The end time of the Billing Period
-        /// </summary>
-        [JsonProperty("end_time")]
-        public DateTime? EndTime { get; private set; }
-        /// <summary>
-        /// The type of the Billing Period
-        /// </summary>
-        [JsonProperty("period_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public BillingPeriodResource.BpTypeEnum PeriodType { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private BillingPeriodResource()
-        {
-
-        }
-    }
+{
+
+  public class BillingPeriodResource : Resource
+  {
+    public sealed class BpTypeEnum : StringEnum
+    {
+      private BpTypeEnum(string value) : base(value) { }
+      public BpTypeEnum() { }
+      public static implicit operator BpTypeEnum(string value)
+      {
+        return new BpTypeEnum(value);
+      }
+
+      public static readonly BpTypeEnum Ready = new BpTypeEnum("ready");
+      public static readonly BpTypeEnum Active = new BpTypeEnum("active");
+    }
+
+    private static Request BuildReadRequest(ReadBillingPeriodOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/Sims/" + options.PathSimSid + "/BillingPeriods",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Billing Periods for a Super SIM.
+    /// </summary>
+    /// <param name="options"> Read BillingPeriod parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BillingPeriod </returns>
+    public static ResourceSet<BillingPeriodResource> Read(ReadBillingPeriodOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<BillingPeriodResource>.FromJson("billing_periods", response.Content);
+      return new ResourceSet<BillingPeriodResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Billing Periods for a Super SIM.
+    /// </summary>
+    /// <param name="options"> Read BillingPeriod parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BillingPeriod </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BillingPeriodResource>> ReadAsync(ReadBillingPeriodOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<BillingPeriodResource>.FromJson("billing_periods", response.Content);
+      return new ResourceSet<BillingPeriodResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Billing Periods for a Super SIM.
+    /// </summary>
+    /// <param name="pathSimSid"> The SID of the Super SIM to list Billing Periods for. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BillingPeriod </returns>
+    public static ResourceSet<BillingPeriodResource> Read(string pathSimSid,
+                                                          int? pageSize = null,
+                                                          long? limit = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadBillingPeriodOptions(pathSimSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Billing Periods for a Super SIM.
+    /// </summary>
+    /// <param name="pathSimSid"> The SID of the Super SIM to list Billing Periods for. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BillingPeriod </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BillingPeriodResource>> ReadAsync(string pathSimSid,
+                                                                                                  int? pageSize = null,
+                                                                                                  long? limit = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadBillingPeriodOptions(pathSimSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<BillingPeriodResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<BillingPeriodResource>.FromJson("billing_periods", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<BillingPeriodResource> NextPage(Page<BillingPeriodResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<BillingPeriodResource>.FromJson("billing_periods", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<BillingPeriodResource> PreviousPage(Page<BillingPeriodResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<BillingPeriodResource>.FromJson("billing_periods", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a BillingPeriodResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BillingPeriodResource object represented by the provided JSON </returns>
+    public static BillingPeriodResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BillingPeriodResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Billing Period
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account the Super SIM belongs to
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Super SIM the Billing Period belongs to
+    /// </summary>
+    [JsonProperty("sim_sid")]
+    public string SimSid { get; private set; }
+    /// <summary>
+    /// The start time of the Billing Period
+    /// </summary>
+    [JsonProperty("start_time")]
+    public DateTime? StartTime { get; private set; }
+    /// <summary>
+    /// The end time of the Billing Period
+    /// </summary>
+    [JsonProperty("end_time")]
+    public DateTime? EndTime { get; private set; }
+    /// <summary>
+    /// The type of the Billing Period
+    /// </summary>
+    [JsonProperty("period_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public BillingPeriodResource.BpTypeEnum PeriodType { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private BillingPeriodResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/SimOptions.cs b/src/Twilio/Rest/Supersim/V1/SimOptions.cs
index 4e94cc018..5e8e82fb8 100644
--- a/src/Twilio/Rest/Supersim/V1/SimOptions.cs
+++ b/src/Twilio/Rest/Supersim/V1/SimOptions.cs
@@ -9,220 +9,220 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Register a Super SIM to your Account
+  /// </summary>
+  public class CreateSimOptions : IOptions<SimResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Register a Super SIM to your Account
-    /// </summary>
-    public class CreateSimOptions : IOptions<SimResource>
-    {
-        /// <summary>
-        /// The [ICCID](https://en.wikipedia.org/wiki/Subscriber_identity_module#ICCID) of the Super SIM to be added to your Account
-        /// </summary>
-        public string Iccid { get; }
-        /// <summary>
-        /// The 10-digit code required to claim the Super SIM for your Account
-        /// </summary>
-        public string RegistrationCode { get; }
-
-        /// <summary>
-        /// Construct a new CreateSimOptions
-        /// </summary>
-        /// <param name="iccid"> The [ICCID](https://en.wikipedia.org/wiki/Subscriber_identity_module#ICCID) of the Super SIM
-        ///             to be added to your Account </param>
-        /// <param name="registrationCode"> The 10-digit code required to claim the Super SIM for your Account </param>
-        public CreateSimOptions(string iccid, string registrationCode)
-        {
-            Iccid = iccid;
-            RegistrationCode = registrationCode;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Iccid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Iccid", Iccid));
-            }
-
-            if (RegistrationCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RegistrationCode", RegistrationCode));
-            }
-
-            return p;
-        }
-    }
-
+    /// The [ICCID](https://en.wikipedia.org/wiki/Subscriber_identity_module#ICCID) of the Super SIM to be added to your Account
+    /// </summary>
+    public string Iccid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a Super SIM instance from your account.
+    /// The 10-digit code required to claim the Super SIM for your Account
     /// </summary>
-    public class FetchSimOptions : IOptions<SimResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSimOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchSimOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string RegistrationCode { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Updates the given properties of a Super SIM instance from your account.
-    /// </summary>
-    public class UpdateSimOptions : IOptions<SimResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The new status of the Super SIM
-        /// </summary>
-        public SimResource.StatusUpdateEnum Status { get; set; }
-        /// <summary>
-        /// The SID or unique name of the Fleet to which the SIM resource should be assigned
-        /// </summary>
-        public string Fleet { get; set; }
-        /// <summary>
-        /// The URL we should call after the update has finished
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call callback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod CallbackMethod { get; set; }
-        /// <summary>
-        /// The SID of the Account to which the Sim resource should belong
-        /// </summary>
-        public string AccountSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSimOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        public UpdateSimOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Fleet != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Fleet", Fleet.ToString()));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (CallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
-            }
-
-            if (AccountSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AccountSid", AccountSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new CreateSimOptions
+    /// </summary>
+    /// <param name="iccid"> The [ICCID](https://en.wikipedia.org/wiki/Subscriber_identity_module#ICCID) of the Super SIM
+    ///             to be added to your Account </param>
+    /// <param name="registrationCode"> The 10-digit code required to claim the Super SIM for your Account </param>
+    public CreateSimOptions(string iccid, string registrationCode)
+    {
+      Iccid = iccid;
+      RegistrationCode = registrationCode;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of Super SIMs from your account.
-    /// </summary>
-    public class ReadSimOptions : ReadOptions<SimResource>
-    {
-        /// <summary>
-        /// The status of the Sim resources to read
-        /// </summary>
-        public SimResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The SID or unique name of the Fleet to which a list of Sims are assigned
-        /// </summary>
-        public string Fleet { get; set; }
-        /// <summary>
-        /// The ICCID associated with a Super SIM to filter the list by
-        /// </summary>
-        public string Iccid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Fleet != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Fleet", Fleet.ToString()));
-            }
-
-            if (Iccid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Iccid", Iccid));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Iccid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Iccid", Iccid));
+      }
+
+      if (RegistrationCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RegistrationCode", RegistrationCode));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a Super SIM instance from your account.
+  /// </summary>
+  public class FetchSimOptions : IOptions<SimResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchSimOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchSimOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Updates the given properties of a Super SIM instance from your account.
+  /// </summary>
+  public class UpdateSimOptions : IOptions<SimResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The new status of the Super SIM
+    /// </summary>
+    public SimResource.StatusUpdateEnum Status { get; set; }
+    /// <summary>
+    /// The SID or unique name of the Fleet to which the SIM resource should be assigned
+    /// </summary>
+    public string Fleet { get; set; }
+    /// <summary>
+    /// The URL we should call after the update has finished
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call callback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod CallbackMethod { get; set; }
+    /// <summary>
+    /// The SID of the Account to which the Sim resource should belong
+    /// </summary>
+    public string AccountSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSimOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    public UpdateSimOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Fleet != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Fleet", Fleet.ToString()));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (CallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
+      }
+
+      if (AccountSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AccountSid", AccountSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of Super SIMs from your account.
+  /// </summary>
+  public class ReadSimOptions : ReadOptions<SimResource>
+  {
+    /// <summary>
+    /// The status of the Sim resources to read
+    /// </summary>
+    public SimResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The SID or unique name of the Fleet to which a list of Sims are assigned
+    /// </summary>
+    public string Fleet { get; set; }
+    /// <summary>
+    /// The ICCID associated with a Super SIM to filter the list by
+    /// </summary>
+    public string Iccid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Fleet != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Fleet", Fleet.ToString()));
+      }
+
+      if (Iccid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Iccid", Iccid));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/SimResource.cs b/src/Twilio/Rest/Supersim/V1/SimResource.cs
index 5c87552d6..06eb5f603 100644
--- a/src/Twilio/Rest/Supersim/V1/SimResource.cs
+++ b/src/Twilio/Rest/Supersim/V1/SimResource.cs
@@ -19,486 +19,486 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
-    public class SimResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum New = new StatusEnum("new");
-            public static readonly StatusEnum Ready = new StatusEnum("ready");
-            public static readonly StatusEnum Active = new StatusEnum("active");
-            public static readonly StatusEnum Inactive = new StatusEnum("inactive");
-            public static readonly StatusEnum Scheduled = new StatusEnum("scheduled");
-        }
-
-        public sealed class StatusUpdateEnum : StringEnum
-        {
-            private StatusUpdateEnum(string value) : base(value) {}
-            public StatusUpdateEnum() {}
-            public static implicit operator StatusUpdateEnum(string value)
-            {
-                return new StatusUpdateEnum(value);
-            }
-
-            public static readonly StatusUpdateEnum Ready = new StatusUpdateEnum("ready");
-            public static readonly StatusUpdateEnum Active = new StatusUpdateEnum("active");
-            public static readonly StatusUpdateEnum Inactive = new StatusUpdateEnum("inactive");
-        }
-
-        private static Request BuildCreateRequest(CreateSimOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Supersim,
-                "/v1/Sims",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Register a Super SIM to your Account
-        /// </summary>
-        /// <param name="options"> Create Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Create(CreateSimOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Register a Super SIM to your Account
-        /// </summary>
-        /// <param name="options"> Create Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> CreateAsync(CreateSimOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Register a Super SIM to your Account
-        /// </summary>
-        /// <param name="iccid"> The [ICCID](https://en.wikipedia.org/wiki/Subscriber_identity_module#ICCID) of the Super SIM
-        ///             to be added to your Account </param>
-        /// <param name="registrationCode"> The 10-digit code required to claim the Super SIM for your Account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Create(string iccid, string registrationCode, ITwilioRestClient client = null)
-        {
-            var options = new CreateSimOptions(iccid, registrationCode);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Register a Super SIM to your Account
-        /// </summary>
-        /// <param name="iccid"> The [ICCID](https://en.wikipedia.org/wiki/Subscriber_identity_module#ICCID) of the Super SIM
-        ///             to be added to your Account </param>
-        /// <param name="registrationCode"> The 10-digit code required to claim the Super SIM for your Account </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> CreateAsync(string iccid,
-                                                                                 string registrationCode,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateSimOptions(iccid, registrationCode);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchSimOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/Sims/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a Super SIM instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Fetch(FetchSimOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Super SIM instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> FetchAsync(FetchSimOptions options,
-                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a Super SIM instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSimOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Super SIM instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> FetchAsync(string pathSid,
-                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchSimOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSimOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Supersim,
-                "/v1/Sims/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates the given properties of a Super SIM instance from your account.
-        /// </summary>
-        /// <param name="options"> Update Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Update(UpdateSimOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the given properties of a Super SIM instance from your account.
-        /// </summary>
-        /// <param name="options"> Update Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> UpdateAsync(UpdateSimOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates the given properties of a Super SIM instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="status"> The new status of the Super SIM </param>
-        /// <param name="fleet"> The SID or unique name of the Fleet to which the SIM resource should be assigned </param>
-        /// <param name="callbackUrl"> The URL we should call after the update has finished </param>
-        /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
-        /// <param name="accountSid"> The SID of the Account to which the Sim resource should belong </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Update(string pathSid,
-                                         string uniqueName = null,
-                                         SimResource.StatusUpdateEnum status = null,
-                                         string fleet = null,
-                                         Uri callbackUrl = null,
-                                         Twilio.Http.HttpMethod callbackMethod = null,
-                                         string accountSid = null,
-                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateSimOptions(pathSid){UniqueName = uniqueName, Status = status, Fleet = fleet, CallbackUrl = callbackUrl, CallbackMethod = callbackMethod, AccountSid = accountSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the given properties of a Super SIM instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="status"> The new status of the Super SIM </param>
-        /// <param name="fleet"> The SID or unique name of the Fleet to which the SIM resource should be assigned </param>
-        /// <param name="callbackUrl"> The URL we should call after the update has finished </param>
-        /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
-        /// <param name="accountSid"> The SID of the Account to which the Sim resource should belong </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> UpdateAsync(string pathSid,
-                                                                                 string uniqueName = null,
-                                                                                 SimResource.StatusUpdateEnum status = null,
-                                                                                 string fleet = null,
-                                                                                 Uri callbackUrl = null,
-                                                                                 Twilio.Http.HttpMethod callbackMethod = null,
-                                                                                 string accountSid = null,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateSimOptions(pathSid){UniqueName = uniqueName, Status = status, Fleet = fleet, CallbackUrl = callbackUrl, CallbackMethod = callbackMethod, AccountSid = accountSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSimOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/Sims",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Super SIMs from your account.
-        /// </summary>
-        /// <param name="options"> Read Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static ResourceSet<SimResource> Read(ReadSimOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SimResource>.FromJson("sims", response.Content);
-            return new ResourceSet<SimResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Super SIMs from your account.
-        /// </summary>
-        /// <param name="options"> Read Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SimResource>> ReadAsync(ReadSimOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SimResource>.FromJson("sims", response.Content);
-            return new ResourceSet<SimResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Super SIMs from your account.
-        /// </summary>
-        /// <param name="status"> The status of the Sim resources to read </param>
-        /// <param name="fleet"> The SID or unique name of the Fleet to which a list of Sims are assigned </param>
-        /// <param name="iccid"> The ICCID associated with a Super SIM to filter the list by </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static ResourceSet<SimResource> Read(SimResource.StatusEnum status = null,
-                                                    string fleet = null,
-                                                    string iccid = null,
-                                                    int? pageSize = null,
-                                                    long? limit = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadSimOptions(){Status = status, Fleet = fleet, Iccid = iccid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Super SIMs from your account.
-        /// </summary>
-        /// <param name="status"> The status of the Sim resources to read </param>
-        /// <param name="fleet"> The SID or unique name of the Fleet to which a list of Sims are assigned </param>
-        /// <param name="iccid"> The ICCID associated with a Super SIM to filter the list by </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SimResource>> ReadAsync(SimResource.StatusEnum status = null,
-                                                                                            string fleet = null,
-                                                                                            string iccid = null,
-                                                                                            int? pageSize = null,
-                                                                                            long? limit = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadSimOptions(){Status = status, Fleet = fleet, Iccid = iccid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SimResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SimResource>.FromJson("sims", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SimResource> NextPage(Page<SimResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<SimResource>.FromJson("sims", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SimResource> PreviousPage(Page<SimResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<SimResource>.FromJson("sims", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a SimResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SimResource object represented by the provided JSON </returns>
-        public static SimResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SimResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The SID of the Account that the Super SIM belongs to
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The ICCID associated with the SIM
-        /// </summary>
-        [JsonProperty("iccid")]
-        public string Iccid { get; private set; }
-        /// <summary>
-        /// The status of the Super SIM
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SimResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The unique ID of the Fleet configured for this SIM
-        /// </summary>
-        [JsonProperty("fleet_sid")]
-        public string FleetSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Sim Resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private SimResource()
-        {
-
-        }
-    }
+{
+
+  public class SimResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum New = new StatusEnum("new");
+      public static readonly StatusEnum Ready = new StatusEnum("ready");
+      public static readonly StatusEnum Active = new StatusEnum("active");
+      public static readonly StatusEnum Inactive = new StatusEnum("inactive");
+      public static readonly StatusEnum Scheduled = new StatusEnum("scheduled");
+    }
+
+    public sealed class StatusUpdateEnum : StringEnum
+    {
+      private StatusUpdateEnum(string value) : base(value) { }
+      public StatusUpdateEnum() { }
+      public static implicit operator StatusUpdateEnum(string value)
+      {
+        return new StatusUpdateEnum(value);
+      }
+
+      public static readonly StatusUpdateEnum Ready = new StatusUpdateEnum("ready");
+      public static readonly StatusUpdateEnum Active = new StatusUpdateEnum("active");
+      public static readonly StatusUpdateEnum Inactive = new StatusUpdateEnum("inactive");
+    }
+
+    private static Request BuildCreateRequest(CreateSimOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Supersim,
+          "/v1/Sims",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Register a Super SIM to your Account
+    /// </summary>
+    /// <param name="options"> Create Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Create(CreateSimOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Register a Super SIM to your Account
+    /// </summary>
+    /// <param name="options"> Create Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> CreateAsync(CreateSimOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Register a Super SIM to your Account
+    /// </summary>
+    /// <param name="iccid"> The [ICCID](https://en.wikipedia.org/wiki/Subscriber_identity_module#ICCID) of the Super SIM
+    ///             to be added to your Account </param>
+    /// <param name="registrationCode"> The 10-digit code required to claim the Super SIM for your Account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Create(string iccid, string registrationCode, ITwilioRestClient client = null)
+    {
+      var options = new CreateSimOptions(iccid, registrationCode);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Register a Super SIM to your Account
+    /// </summary>
+    /// <param name="iccid"> The [ICCID](https://en.wikipedia.org/wiki/Subscriber_identity_module#ICCID) of the Super SIM
+    ///             to be added to your Account </param>
+    /// <param name="registrationCode"> The 10-digit code required to claim the Super SIM for your Account </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> CreateAsync(string iccid,
+                                                                             string registrationCode,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateSimOptions(iccid, registrationCode);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchSimOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/Sims/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a Super SIM instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Fetch(FetchSimOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Super SIM instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> FetchAsync(FetchSimOptions options,
+                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a Super SIM instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSimOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Super SIM instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> FetchAsync(string pathSid,
+                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchSimOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSimOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Supersim,
+          "/v1/Sims/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates the given properties of a Super SIM instance from your account.
+    /// </summary>
+    /// <param name="options"> Update Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Update(UpdateSimOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the given properties of a Super SIM instance from your account.
+    /// </summary>
+    /// <param name="options"> Update Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> UpdateAsync(UpdateSimOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates the given properties of a Super SIM instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="status"> The new status of the Super SIM </param>
+    /// <param name="fleet"> The SID or unique name of the Fleet to which the SIM resource should be assigned </param>
+    /// <param name="callbackUrl"> The URL we should call after the update has finished </param>
+    /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
+    /// <param name="accountSid"> The SID of the Account to which the Sim resource should belong </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Update(string pathSid,
+                                     string uniqueName = null,
+                                     SimResource.StatusUpdateEnum status = null,
+                                     string fleet = null,
+                                     Uri callbackUrl = null,
+                                     Twilio.Http.HttpMethod callbackMethod = null,
+                                     string accountSid = null,
+                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateSimOptions(pathSid) { UniqueName = uniqueName, Status = status, Fleet = fleet, CallbackUrl = callbackUrl, CallbackMethod = callbackMethod, AccountSid = accountSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the given properties of a Super SIM instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="status"> The new status of the Super SIM </param>
+    /// <param name="fleet"> The SID or unique name of the Fleet to which the SIM resource should be assigned </param>
+    /// <param name="callbackUrl"> The URL we should call after the update has finished </param>
+    /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
+    /// <param name="accountSid"> The SID of the Account to which the Sim resource should belong </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> UpdateAsync(string pathSid,
+                                                                             string uniqueName = null,
+                                                                             SimResource.StatusUpdateEnum status = null,
+                                                                             string fleet = null,
+                                                                             Uri callbackUrl = null,
+                                                                             Twilio.Http.HttpMethod callbackMethod = null,
+                                                                             string accountSid = null,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateSimOptions(pathSid) { UniqueName = uniqueName, Status = status, Fleet = fleet, CallbackUrl = callbackUrl, CallbackMethod = callbackMethod, AccountSid = accountSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSimOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/Sims",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Super SIMs from your account.
+    /// </summary>
+    /// <param name="options"> Read Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static ResourceSet<SimResource> Read(ReadSimOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SimResource>.FromJson("sims", response.Content);
+      return new ResourceSet<SimResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Super SIMs from your account.
+    /// </summary>
+    /// <param name="options"> Read Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SimResource>> ReadAsync(ReadSimOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SimResource>.FromJson("sims", response.Content);
+      return new ResourceSet<SimResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Super SIMs from your account.
+    /// </summary>
+    /// <param name="status"> The status of the Sim resources to read </param>
+    /// <param name="fleet"> The SID or unique name of the Fleet to which a list of Sims are assigned </param>
+    /// <param name="iccid"> The ICCID associated with a Super SIM to filter the list by </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static ResourceSet<SimResource> Read(SimResource.StatusEnum status = null,
+                                                string fleet = null,
+                                                string iccid = null,
+                                                int? pageSize = null,
+                                                long? limit = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadSimOptions() { Status = status, Fleet = fleet, Iccid = iccid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Super SIMs from your account.
+    /// </summary>
+    /// <param name="status"> The status of the Sim resources to read </param>
+    /// <param name="fleet"> The SID or unique name of the Fleet to which a list of Sims are assigned </param>
+    /// <param name="iccid"> The ICCID associated with a Super SIM to filter the list by </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SimResource>> ReadAsync(SimResource.StatusEnum status = null,
+                                                                                        string fleet = null,
+                                                                                        string iccid = null,
+                                                                                        int? pageSize = null,
+                                                                                        long? limit = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadSimOptions() { Status = status, Fleet = fleet, Iccid = iccid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SimResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SimResource>.FromJson("sims", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SimResource> NextPage(Page<SimResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<SimResource>.FromJson("sims", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SimResource> PreviousPage(Page<SimResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<SimResource>.FromJson("sims", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a SimResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SimResource object represented by the provided JSON </returns>
+    public static SimResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SimResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The SID of the Account that the Super SIM belongs to
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The ICCID associated with the SIM
+    /// </summary>
+    [JsonProperty("iccid")]
+    public string Iccid { get; private set; }
+    /// <summary>
+    /// The status of the Super SIM
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public SimResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The unique ID of the Fleet configured for this SIM
+    /// </summary>
+    [JsonProperty("fleet_sid")]
+    public string FleetSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Sim Resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private SimResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/SmsCommandOptions.cs b/src/Twilio/Rest/Supersim/V1/SmsCommandOptions.cs
index a32aae2ed..c647ae7d0 100644
--- a/src/Twilio/Rest/Supersim/V1/SmsCommandOptions.cs
+++ b/src/Twilio/Rest/Supersim/V1/SmsCommandOptions.cs
@@ -9,152 +9,152 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Send SMS Command to a Sim.
+  /// </summary>
+  public class CreateSmsCommandOptions : IOptions<SmsCommandResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Send SMS Command to a Sim.
+    /// The sid or unique_name of the SIM to send the SMS Command to
     /// </summary>
-    public class CreateSmsCommandOptions : IOptions<SmsCommandResource>
-    {
-        /// <summary>
-        /// The sid or unique_name of the SIM to send the SMS Command to
-        /// </summary>
-        public string Sim { get; }
-        /// <summary>
-        /// The message body of the SMS Command
-        /// </summary>
-        public string Payload { get; }
-        /// <summary>
-        /// The HTTP method we should use to call callback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod CallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we should call after we have sent the command
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSmsCommandOptions
-        /// </summary>
-        /// <param name="sim"> The sid or unique_name of the SIM to send the SMS Command to </param>
-        /// <param name="payload"> The message body of the SMS Command </param>
-        public CreateSmsCommandOptions(string sim, string payload)
-        {
-            Sim = sim;
-            Payload = payload;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Sim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sim", Sim.ToString()));
-            }
-
-            if (Payload != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Payload", Payload));
-            }
-
-            if (CallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            return p;
-        }
-    }
-
+    public string Sim { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch SMS Command instance from your account.
+    /// The message body of the SMS Command
     /// </summary>
-    public class FetchSmsCommandOptions : IOptions<SmsCommandResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSmsCommandOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchSmsCommandOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string Payload { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of SMS Commands from your account.
+    /// The HTTP method we should use to call callback_url
     /// </summary>
-    public class ReadSmsCommandOptions : ReadOptions<SmsCommandResource>
-    {
-        /// <summary>
-        /// The SID or unique name of the Sim resource that SMS Command was sent to or from.
-        /// </summary>
-        public string Sim { get; set; }
-        /// <summary>
-        /// The status of the SMS Command
-        /// </summary>
-        public SmsCommandResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The direction of the SMS Command
-        /// </summary>
-        public SmsCommandResource.DirectionEnum Direction { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Sim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sim", Sim.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Direction != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Direction", Direction.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public Twilio.Http.HttpMethod CallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we should call after we have sent the command
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateSmsCommandOptions
+    /// </summary>
+    /// <param name="sim"> The sid or unique_name of the SIM to send the SMS Command to </param>
+    /// <param name="payload"> The message body of the SMS Command </param>
+    public CreateSmsCommandOptions(string sim, string payload)
+    {
+      Sim = sim;
+      Payload = payload;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Sim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sim", Sim.ToString()));
+      }
+
+      if (Payload != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Payload", Payload));
+      }
+
+      if (CallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch SMS Command instance from your account.
+  /// </summary>
+  public class FetchSmsCommandOptions : IOptions<SmsCommandResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchSmsCommandOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchSmsCommandOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of SMS Commands from your account.
+  /// </summary>
+  public class ReadSmsCommandOptions : ReadOptions<SmsCommandResource>
+  {
+    /// <summary>
+    /// The SID or unique name of the Sim resource that SMS Command was sent to or from.
+    /// </summary>
+    public string Sim { get; set; }
+    /// <summary>
+    /// The status of the SMS Command
+    /// </summary>
+    public SmsCommandResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The direction of the SMS Command
+    /// </summary>
+    public SmsCommandResource.DirectionEnum Direction { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Sim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sim", Sim.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Direction != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Direction", Direction.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/SmsCommandResource.cs b/src/Twilio/Rest/Supersim/V1/SmsCommandResource.cs
index 499b109ed..be6fe8f28 100644
--- a/src/Twilio/Rest/Supersim/V1/SmsCommandResource.cs
+++ b/src/Twilio/Rest/Supersim/V1/SmsCommandResource.cs
@@ -19,397 +19,397 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
-    public class SmsCommandResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Queued = new StatusEnum("queued");
-            public static readonly StatusEnum Sent = new StatusEnum("sent");
-            public static readonly StatusEnum Delivered = new StatusEnum("delivered");
-            public static readonly StatusEnum Received = new StatusEnum("received");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        public sealed class DirectionEnum : StringEnum
-        {
-            private DirectionEnum(string value) : base(value) {}
-            public DirectionEnum() {}
-            public static implicit operator DirectionEnum(string value)
-            {
-                return new DirectionEnum(value);
-            }
-
-            public static readonly DirectionEnum ToSim = new DirectionEnum("to_sim");
-            public static readonly DirectionEnum FromSim = new DirectionEnum("from_sim");
-        }
-
-        private static Request BuildCreateRequest(CreateSmsCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Supersim,
-                "/v1/SmsCommands",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Send SMS Command to a Sim.
-        /// </summary>
-        /// <param name="options"> Create SmsCommand parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SmsCommand </returns>
-        public static SmsCommandResource Create(CreateSmsCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Send SMS Command to a Sim.
-        /// </summary>
-        /// <param name="options"> Create SmsCommand parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SmsCommand </returns>
-        public static async System.Threading.Tasks.Task<SmsCommandResource> CreateAsync(CreateSmsCommandOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Send SMS Command to a Sim.
-        /// </summary>
-        /// <param name="sim"> The sid or unique_name of the SIM to send the SMS Command to </param>
-        /// <param name="payload"> The message body of the SMS Command </param>
-        /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
-        /// <param name="callbackUrl"> The URL we should call after we have sent the command </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SmsCommand </returns>
-        public static SmsCommandResource Create(string sim,
-                                                string payload,
-                                                Twilio.Http.HttpMethod callbackMethod = null,
-                                                Uri callbackUrl = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateSmsCommandOptions(sim, payload){CallbackMethod = callbackMethod, CallbackUrl = callbackUrl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Send SMS Command to a Sim.
-        /// </summary>
-        /// <param name="sim"> The sid or unique_name of the SIM to send the SMS Command to </param>
-        /// <param name="payload"> The message body of the SMS Command </param>
-        /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
-        /// <param name="callbackUrl"> The URL we should call after we have sent the command </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SmsCommand </returns>
-        public static async System.Threading.Tasks.Task<SmsCommandResource> CreateAsync(string sim,
-                                                                                        string payload,
-                                                                                        Twilio.Http.HttpMethod callbackMethod = null,
-                                                                                        Uri callbackUrl = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateSmsCommandOptions(sim, payload){CallbackMethod = callbackMethod, CallbackUrl = callbackUrl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchSmsCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/SmsCommands/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch SMS Command instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch SmsCommand parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SmsCommand </returns>
-        public static SmsCommandResource Fetch(FetchSmsCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch SMS Command instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch SmsCommand parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SmsCommand </returns>
-        public static async System.Threading.Tasks.Task<SmsCommandResource> FetchAsync(FetchSmsCommandOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch SMS Command instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SmsCommand </returns>
-        public static SmsCommandResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSmsCommandOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch SMS Command instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SmsCommand </returns>
-        public static async System.Threading.Tasks.Task<SmsCommandResource> FetchAsync(string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchSmsCommandOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSmsCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/SmsCommands",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of SMS Commands from your account.
-        /// </summary>
-        /// <param name="options"> Read SmsCommand parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SmsCommand </returns>
-        public static ResourceSet<SmsCommandResource> Read(ReadSmsCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SmsCommandResource>.FromJson("sms_commands", response.Content);
-            return new ResourceSet<SmsCommandResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of SMS Commands from your account.
-        /// </summary>
-        /// <param name="options"> Read SmsCommand parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SmsCommand </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SmsCommandResource>> ReadAsync(ReadSmsCommandOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SmsCommandResource>.FromJson("sms_commands", response.Content);
-            return new ResourceSet<SmsCommandResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of SMS Commands from your account.
-        /// </summary>
-        /// <param name="sim"> The SID or unique name of the Sim resource that SMS Command was sent to or from. </param>
-        /// <param name="status"> The status of the SMS Command </param>
-        /// <param name="direction"> The direction of the SMS Command </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SmsCommand </returns>
-        public static ResourceSet<SmsCommandResource> Read(string sim = null,
-                                                           SmsCommandResource.StatusEnum status = null,
-                                                           SmsCommandResource.DirectionEnum direction = null,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadSmsCommandOptions(){Sim = sim, Status = status, Direction = direction, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of SMS Commands from your account.
-        /// </summary>
-        /// <param name="sim"> The SID or unique name of the Sim resource that SMS Command was sent to or from. </param>
-        /// <param name="status"> The status of the SMS Command </param>
-        /// <param name="direction"> The direction of the SMS Command </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SmsCommand </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SmsCommandResource>> ReadAsync(string sim = null,
-                                                                                                   SmsCommandResource.StatusEnum status = null,
-                                                                                                   SmsCommandResource.DirectionEnum direction = null,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadSmsCommandOptions(){Sim = sim, Status = status, Direction = direction, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SmsCommandResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SmsCommandResource>.FromJson("sms_commands", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SmsCommandResource> NextPage(Page<SmsCommandResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<SmsCommandResource>.FromJson("sms_commands", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SmsCommandResource> PreviousPage(Page<SmsCommandResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<SmsCommandResource>.FromJson("sms_commands", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a SmsCommandResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SmsCommandResource object represented by the provided JSON </returns>
-        public static SmsCommandResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SmsCommandResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the SIM that this SMS Command was sent to or from
-        /// </summary>
-        [JsonProperty("sim_sid")]
-        public string SimSid { get; private set; }
-        /// <summary>
-        /// The message body of the SMS Command sent to or from the SIM
-        /// </summary>
-        [JsonProperty("payload")]
-        public string Payload { get; private set; }
-        /// <summary>
-        /// The status of the SMS Command
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SmsCommandResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The direction of the SMS Command
-        /// </summary>
-        [JsonProperty("direction")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SmsCommandResource.DirectionEnum Direction { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the SMS Command resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SmsCommandResource()
-        {
-
-        }
-    }
+{
+
+  public class SmsCommandResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Queued = new StatusEnum("queued");
+      public static readonly StatusEnum Sent = new StatusEnum("sent");
+      public static readonly StatusEnum Delivered = new StatusEnum("delivered");
+      public static readonly StatusEnum Received = new StatusEnum("received");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    public sealed class DirectionEnum : StringEnum
+    {
+      private DirectionEnum(string value) : base(value) { }
+      public DirectionEnum() { }
+      public static implicit operator DirectionEnum(string value)
+      {
+        return new DirectionEnum(value);
+      }
+
+      public static readonly DirectionEnum ToSim = new DirectionEnum("to_sim");
+      public static readonly DirectionEnum FromSim = new DirectionEnum("from_sim");
+    }
+
+    private static Request BuildCreateRequest(CreateSmsCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Supersim,
+          "/v1/SmsCommands",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Send SMS Command to a Sim.
+    /// </summary>
+    /// <param name="options"> Create SmsCommand parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SmsCommand </returns>
+    public static SmsCommandResource Create(CreateSmsCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Send SMS Command to a Sim.
+    /// </summary>
+    /// <param name="options"> Create SmsCommand parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SmsCommand </returns>
+    public static async System.Threading.Tasks.Task<SmsCommandResource> CreateAsync(CreateSmsCommandOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Send SMS Command to a Sim.
+    /// </summary>
+    /// <param name="sim"> The sid or unique_name of the SIM to send the SMS Command to </param>
+    /// <param name="payload"> The message body of the SMS Command </param>
+    /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
+    /// <param name="callbackUrl"> The URL we should call after we have sent the command </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SmsCommand </returns>
+    public static SmsCommandResource Create(string sim,
+                                            string payload,
+                                            Twilio.Http.HttpMethod callbackMethod = null,
+                                            Uri callbackUrl = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateSmsCommandOptions(sim, payload) { CallbackMethod = callbackMethod, CallbackUrl = callbackUrl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Send SMS Command to a Sim.
+    /// </summary>
+    /// <param name="sim"> The sid or unique_name of the SIM to send the SMS Command to </param>
+    /// <param name="payload"> The message body of the SMS Command </param>
+    /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
+    /// <param name="callbackUrl"> The URL we should call after we have sent the command </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SmsCommand </returns>
+    public static async System.Threading.Tasks.Task<SmsCommandResource> CreateAsync(string sim,
+                                                                                    string payload,
+                                                                                    Twilio.Http.HttpMethod callbackMethod = null,
+                                                                                    Uri callbackUrl = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateSmsCommandOptions(sim, payload) { CallbackMethod = callbackMethod, CallbackUrl = callbackUrl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchSmsCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/SmsCommands/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch SMS Command instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch SmsCommand parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SmsCommand </returns>
+    public static SmsCommandResource Fetch(FetchSmsCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch SMS Command instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch SmsCommand parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SmsCommand </returns>
+    public static async System.Threading.Tasks.Task<SmsCommandResource> FetchAsync(FetchSmsCommandOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch SMS Command instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SmsCommand </returns>
+    public static SmsCommandResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSmsCommandOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch SMS Command instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SmsCommand </returns>
+    public static async System.Threading.Tasks.Task<SmsCommandResource> FetchAsync(string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchSmsCommandOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSmsCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/SmsCommands",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of SMS Commands from your account.
+    /// </summary>
+    /// <param name="options"> Read SmsCommand parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SmsCommand </returns>
+    public static ResourceSet<SmsCommandResource> Read(ReadSmsCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SmsCommandResource>.FromJson("sms_commands", response.Content);
+      return new ResourceSet<SmsCommandResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of SMS Commands from your account.
+    /// </summary>
+    /// <param name="options"> Read SmsCommand parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SmsCommand </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SmsCommandResource>> ReadAsync(ReadSmsCommandOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SmsCommandResource>.FromJson("sms_commands", response.Content);
+      return new ResourceSet<SmsCommandResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of SMS Commands from your account.
+    /// </summary>
+    /// <param name="sim"> The SID or unique name of the Sim resource that SMS Command was sent to or from. </param>
+    /// <param name="status"> The status of the SMS Command </param>
+    /// <param name="direction"> The direction of the SMS Command </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SmsCommand </returns>
+    public static ResourceSet<SmsCommandResource> Read(string sim = null,
+                                                       SmsCommandResource.StatusEnum status = null,
+                                                       SmsCommandResource.DirectionEnum direction = null,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadSmsCommandOptions() { Sim = sim, Status = status, Direction = direction, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of SMS Commands from your account.
+    /// </summary>
+    /// <param name="sim"> The SID or unique name of the Sim resource that SMS Command was sent to or from. </param>
+    /// <param name="status"> The status of the SMS Command </param>
+    /// <param name="direction"> The direction of the SMS Command </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SmsCommand </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SmsCommandResource>> ReadAsync(string sim = null,
+                                                                                               SmsCommandResource.StatusEnum status = null,
+                                                                                               SmsCommandResource.DirectionEnum direction = null,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadSmsCommandOptions() { Sim = sim, Status = status, Direction = direction, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SmsCommandResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SmsCommandResource>.FromJson("sms_commands", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SmsCommandResource> NextPage(Page<SmsCommandResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<SmsCommandResource>.FromJson("sms_commands", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SmsCommandResource> PreviousPage(Page<SmsCommandResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<SmsCommandResource>.FromJson("sms_commands", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a SmsCommandResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SmsCommandResource object represented by the provided JSON </returns>
+    public static SmsCommandResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SmsCommandResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the SIM that this SMS Command was sent to or from
+    /// </summary>
+    [JsonProperty("sim_sid")]
+    public string SimSid { get; private set; }
+    /// <summary>
+    /// The message body of the SMS Command sent to or from the SIM
+    /// </summary>
+    [JsonProperty("payload")]
+    public string Payload { get; private set; }
+    /// <summary>
+    /// The status of the SMS Command
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public SmsCommandResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The direction of the SMS Command
+    /// </summary>
+    [JsonProperty("direction")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public SmsCommandResource.DirectionEnum Direction { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the SMS Command resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SmsCommandResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/UsageRecordOptions.cs b/src/Twilio/Rest/Supersim/V1/UsageRecordOptions.cs
index d10913171..5f2fe3120 100644
--- a/src/Twilio/Rest/Supersim/V1/UsageRecordOptions.cs
+++ b/src/Twilio/Rest/Supersim/V1/UsageRecordOptions.cs
@@ -9,101 +9,101 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// List UsageRecords
+  /// </summary>
+  public class ReadUsageRecordOptions : ReadOptions<UsageRecordResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// List UsageRecords
+    /// SID or unique name of a Sim resource. Only show UsageRecords representing usage incurred by this Super SIM.
     /// </summary>
-    public class ReadUsageRecordOptions : ReadOptions<UsageRecordResource>
-    {
-        /// <summary>
-        /// SID or unique name of a Sim resource. Only show UsageRecords representing usage incurred by this Super SIM.
-        /// </summary>
-        public string Sim { get; set; }
-        /// <summary>
-        /// SID or unique name of a Fleet resource. Only show UsageRecords representing usage for Super SIMs belonging to this Fleet resource at the time the usage occurred.
-        /// </summary>
-        public string Fleet { get; set; }
-        /// <summary>
-        /// SID of a Network resource. Only show UsageRecords representing usage on this network.
-        /// </summary>
-        public string Network { get; set; }
-        /// <summary>
-        /// Alpha-2 ISO Country Code. Only show UsageRecords representing usage in this country.
-        /// </summary>
-        public string IsoCountry { get; set; }
-        /// <summary>
-        /// Dimension over which to aggregate usage records.
-        /// </summary>
-        public UsageRecordResource.GroupEnum Group { get; set; }
-        /// <summary>
-        /// Time-based grouping that UsageRecords should be aggregated by. Can be: `hour`, `day`, or `all`. Default is `all`.
-        /// </summary>
-        public UsageRecordResource.GranularityEnum Granularity { get; set; }
-        /// <summary>
-        /// Only include usage that occurred at or after this time.
-        /// </summary>
-        public DateTime? StartTime { get; set; }
-        /// <summary>
-        /// Only include usage that occurred before this time.
-        /// </summary>
-        public DateTime? EndTime { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Sim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sim", Sim.ToString()));
-            }
-
-            if (Fleet != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Fleet", Fleet.ToString()));
-            }
-
-            if (Network != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Network", Network.ToString()));
-            }
-
-            if (IsoCountry != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry.ToString()));
-            }
-
-            if (Group != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Group", Group.ToString()));
-            }
-
-            if (Granularity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Granularity", Granularity.ToString()));
-            }
-
-            if (StartTime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartTime", Serializers.DateTimeIso8601(StartTime)));
-            }
-
-            if (EndTime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndTime", Serializers.DateTimeIso8601(EndTime)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string Sim { get; set; }
+    /// <summary>
+    /// SID or unique name of a Fleet resource. Only show UsageRecords representing usage for Super SIMs belonging to this Fleet resource at the time the usage occurred.
+    /// </summary>
+    public string Fleet { get; set; }
+    /// <summary>
+    /// SID of a Network resource. Only show UsageRecords representing usage on this network.
+    /// </summary>
+    public string Network { get; set; }
+    /// <summary>
+    /// Alpha-2 ISO Country Code. Only show UsageRecords representing usage in this country.
+    /// </summary>
+    public string IsoCountry { get; set; }
+    /// <summary>
+    /// Dimension over which to aggregate usage records.
+    /// </summary>
+    public UsageRecordResource.GroupEnum Group { get; set; }
+    /// <summary>
+    /// Time-based grouping that UsageRecords should be aggregated by. Can be: `hour`, `day`, or `all`. Default is `all`.
+    /// </summary>
+    public UsageRecordResource.GranularityEnum Granularity { get; set; }
+    /// <summary>
+    /// Only include usage that occurred at or after this time.
+    /// </summary>
+    public DateTime? StartTime { get; set; }
+    /// <summary>
+    /// Only include usage that occurred before this time.
+    /// </summary>
+    public DateTime? EndTime { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Sim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sim", Sim.ToString()));
+      }
+
+      if (Fleet != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Fleet", Fleet.ToString()));
+      }
+
+      if (Network != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Network", Network.ToString()));
+      }
+
+      if (IsoCountry != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IsoCountry", IsoCountry.ToString()));
+      }
+
+      if (Group != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Group", Group.ToString()));
+      }
+
+      if (Granularity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Granularity", Granularity.ToString()));
+      }
+
+      if (StartTime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartTime", Serializers.DateTimeIso8601(StartTime)));
+      }
+
+      if (EndTime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndTime", Serializers.DateTimeIso8601(EndTime)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Supersim/V1/UsageRecordResource.cs b/src/Twilio/Rest/Supersim/V1/UsageRecordResource.cs
index 97deaf9f3..7c3a75672 100644
--- a/src/Twilio/Rest/Supersim/V1/UsageRecordResource.cs
+++ b/src/Twilio/Rest/Supersim/V1/UsageRecordResource.cs
@@ -19,290 +19,290 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Supersim.V1
-{
-
-    public class UsageRecordResource : Resource
-    {
-        public sealed class GranularityEnum : StringEnum
-        {
-            private GranularityEnum(string value) : base(value) {}
-            public GranularityEnum() {}
-            public static implicit operator GranularityEnum(string value)
-            {
-                return new GranularityEnum(value);
-            }
-
-            public static readonly GranularityEnum Hour = new GranularityEnum("hour");
-            public static readonly GranularityEnum Day = new GranularityEnum("day");
-            public static readonly GranularityEnum All = new GranularityEnum("all");
-        }
-
-        public sealed class GroupEnum : StringEnum
-        {
-            private GroupEnum(string value) : base(value) {}
-            public GroupEnum() {}
-            public static implicit operator GroupEnum(string value)
-            {
-                return new GroupEnum(value);
-            }
-
-            public static readonly GroupEnum Sim = new GroupEnum("sim");
-            public static readonly GroupEnum Fleet = new GroupEnum("fleet");
-            public static readonly GroupEnum Network = new GroupEnum("network");
-            public static readonly GroupEnum Isocountry = new GroupEnum("isoCountry");
-        }
-
-        public sealed class SortByEnum : StringEnum
-        {
-            private SortByEnum(string value) : base(value) {}
-            public SortByEnum() {}
-            public static implicit operator SortByEnum(string value)
-            {
-                return new SortByEnum(value);
-            }
-
-            public static readonly SortByEnum Time = new SortByEnum("time");
-        }
-
-        private static Request BuildReadRequest(ReadUsageRecordOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Supersim,
-                "/v1/UsageRecords",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// List UsageRecords
-        /// </summary>
-        /// <param name="options"> Read UsageRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsageRecord </returns>
-        public static ResourceSet<UsageRecordResource> Read(ReadUsageRecordOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<UsageRecordResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List UsageRecords
-        /// </summary>
-        /// <param name="options"> Read UsageRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsageRecord </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UsageRecordResource>> ReadAsync(ReadUsageRecordOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<UsageRecordResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// List UsageRecords
-        /// </summary>
-        /// <param name="sim"> SID or unique name of a Sim resource. Only show UsageRecords representing usage incurred by this
-        ///           Super SIM. </param>
-        /// <param name="fleet"> SID or unique name of a Fleet resource. Only show UsageRecords representing usage for Super
-        ///             SIMs belonging to this Fleet resource at the time the usage occurred. </param>
-        /// <param name="network"> SID of a Network resource. Only show UsageRecords representing usage on this network.
-        ///               </param>
-        /// <param name="isoCountry"> Alpha-2 ISO Country Code. Only show UsageRecords representing usage in this country.
-        ///                  </param>
-        /// <param name="group"> Dimension over which to aggregate usage records. </param>
-        /// <param name="granularity"> Time-based grouping that UsageRecords should be aggregated by. Can be: `hour`, `day`, or
-        ///                   `all`. Default is `all`. </param>
-        /// <param name="startTime"> Only include usage that occurred at or after this time. </param>
-        /// <param name="endTime"> Only include usage that occurred before this time. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsageRecord </returns>
-        public static ResourceSet<UsageRecordResource> Read(string sim = null,
-                                                            string fleet = null,
-                                                            string network = null,
-                                                            string isoCountry = null,
-                                                            UsageRecordResource.GroupEnum group = null,
-                                                            UsageRecordResource.GranularityEnum granularity = null,
-                                                            DateTime? startTime = null,
-                                                            DateTime? endTime = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadUsageRecordOptions(){Sim = sim, Fleet = fleet, Network = network, IsoCountry = isoCountry, Group = group, Granularity = granularity, StartTime = startTime, EndTime = endTime, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List UsageRecords
-        /// </summary>
-        /// <param name="sim"> SID or unique name of a Sim resource. Only show UsageRecords representing usage incurred by this
-        ///           Super SIM. </param>
-        /// <param name="fleet"> SID or unique name of a Fleet resource. Only show UsageRecords representing usage for Super
-        ///             SIMs belonging to this Fleet resource at the time the usage occurred. </param>
-        /// <param name="network"> SID of a Network resource. Only show UsageRecords representing usage on this network.
-        ///               </param>
-        /// <param name="isoCountry"> Alpha-2 ISO Country Code. Only show UsageRecords representing usage in this country.
-        ///                  </param>
-        /// <param name="group"> Dimension over which to aggregate usage records. </param>
-        /// <param name="granularity"> Time-based grouping that UsageRecords should be aggregated by. Can be: `hour`, `day`, or
-        ///                   `all`. Default is `all`. </param>
-        /// <param name="startTime"> Only include usage that occurred at or after this time. </param>
-        /// <param name="endTime"> Only include usage that occurred before this time. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsageRecord </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UsageRecordResource>> ReadAsync(string sim = null,
-                                                                                                    string fleet = null,
-                                                                                                    string network = null,
-                                                                                                    string isoCountry = null,
-                                                                                                    UsageRecordResource.GroupEnum group = null,
-                                                                                                    UsageRecordResource.GranularityEnum granularity = null,
-                                                                                                    DateTime? startTime = null,
-                                                                                                    DateTime? endTime = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadUsageRecordOptions(){Sim = sim, Fleet = fleet, Network = network, IsoCountry = isoCountry, Group = group, Granularity = granularity, StartTime = startTime, EndTime = endTime, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UsageRecordResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UsageRecordResource> NextPage(Page<UsageRecordResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UsageRecordResource> PreviousPage(Page<UsageRecordResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Supersim)
-            );
-
-            var response = client.Request(request);
-            return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a UsageRecordResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UsageRecordResource object represented by the provided JSON </returns>
-        public static UsageRecordResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UsageRecordResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that incurred the usage.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// SID of a Sim resource to which the UsageRecord belongs.
-        /// </summary>
-        [JsonProperty("sim_sid")]
-        public string SimSid { get; private set; }
-        /// <summary>
-        /// SID of the Network resource on which the usage occurred.
-        /// </summary>
-        [JsonProperty("network_sid")]
-        public string NetworkSid { get; private set; }
-        /// <summary>
-        /// SID of the Fleet resource on which the usage occurred.
-        /// </summary>
-        [JsonProperty("fleet_sid")]
-        public string FleetSid { get; private set; }
-        /// <summary>
-        /// Alpha-2 ISO Country Code of the country the usage occurred in.
-        /// </summary>
-        [JsonProperty("iso_country")]
-        public string IsoCountry { get; private set; }
-        /// <summary>
-        /// The time period for which the usage is reported.
-        /// </summary>
-        [JsonProperty("period")]
-        public object Period { get; private set; }
-        /// <summary>
-        /// Total data uploaded in bytes, aggregated by the query parameters.
-        /// </summary>
-        [JsonProperty("data_upload")]
-        public long? DataUpload { get; private set; }
-        /// <summary>
-        /// Total data downloaded in bytes, aggregated by the query parameters.
-        /// </summary>
-        [JsonProperty("data_download")]
-        public long? DataDownload { get; private set; }
-        /// <summary>
-        /// Total of data_upload and data_download.
-        /// </summary>
-        [JsonProperty("data_total")]
-        public long? DataTotal { get; private set; }
-
-        private UsageRecordResource()
-        {
-
-        }
-    }
+{
+
+  public class UsageRecordResource : Resource
+  {
+    public sealed class GranularityEnum : StringEnum
+    {
+      private GranularityEnum(string value) : base(value) { }
+      public GranularityEnum() { }
+      public static implicit operator GranularityEnum(string value)
+      {
+        return new GranularityEnum(value);
+      }
+
+      public static readonly GranularityEnum Hour = new GranularityEnum("hour");
+      public static readonly GranularityEnum Day = new GranularityEnum("day");
+      public static readonly GranularityEnum All = new GranularityEnum("all");
+    }
+
+    public sealed class GroupEnum : StringEnum
+    {
+      private GroupEnum(string value) : base(value) { }
+      public GroupEnum() { }
+      public static implicit operator GroupEnum(string value)
+      {
+        return new GroupEnum(value);
+      }
+
+      public static readonly GroupEnum Sim = new GroupEnum("sim");
+      public static readonly GroupEnum Fleet = new GroupEnum("fleet");
+      public static readonly GroupEnum Network = new GroupEnum("network");
+      public static readonly GroupEnum Isocountry = new GroupEnum("isoCountry");
+    }
+
+    public sealed class SortByEnum : StringEnum
+    {
+      private SortByEnum(string value) : base(value) { }
+      public SortByEnum() { }
+      public static implicit operator SortByEnum(string value)
+      {
+        return new SortByEnum(value);
+      }
+
+      public static readonly SortByEnum Time = new SortByEnum("time");
+    }
+
+    private static Request BuildReadRequest(ReadUsageRecordOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Supersim,
+          "/v1/UsageRecords",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// List UsageRecords
+    /// </summary>
+    /// <param name="options"> Read UsageRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsageRecord </returns>
+    public static ResourceSet<UsageRecordResource> Read(ReadUsageRecordOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<UsageRecordResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List UsageRecords
+    /// </summary>
+    /// <param name="options"> Read UsageRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsageRecord </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UsageRecordResource>> ReadAsync(ReadUsageRecordOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<UsageRecordResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// List UsageRecords
+    /// </summary>
+    /// <param name="sim"> SID or unique name of a Sim resource. Only show UsageRecords representing usage incurred by this
+    ///           Super SIM. </param>
+    /// <param name="fleet"> SID or unique name of a Fleet resource. Only show UsageRecords representing usage for Super
+    ///             SIMs belonging to this Fleet resource at the time the usage occurred. </param>
+    /// <param name="network"> SID of a Network resource. Only show UsageRecords representing usage on this network.
+    ///               </param>
+    /// <param name="isoCountry"> Alpha-2 ISO Country Code. Only show UsageRecords representing usage in this country.
+    ///                  </param>
+    /// <param name="group"> Dimension over which to aggregate usage records. </param>
+    /// <param name="granularity"> Time-based grouping that UsageRecords should be aggregated by. Can be: `hour`, `day`, or
+    ///                   `all`. Default is `all`. </param>
+    /// <param name="startTime"> Only include usage that occurred at or after this time. </param>
+    /// <param name="endTime"> Only include usage that occurred before this time. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsageRecord </returns>
+    public static ResourceSet<UsageRecordResource> Read(string sim = null,
+                                                        string fleet = null,
+                                                        string network = null,
+                                                        string isoCountry = null,
+                                                        UsageRecordResource.GroupEnum group = null,
+                                                        UsageRecordResource.GranularityEnum granularity = null,
+                                                        DateTime? startTime = null,
+                                                        DateTime? endTime = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadUsageRecordOptions() { Sim = sim, Fleet = fleet, Network = network, IsoCountry = isoCountry, Group = group, Granularity = granularity, StartTime = startTime, EndTime = endTime, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List UsageRecords
+    /// </summary>
+    /// <param name="sim"> SID or unique name of a Sim resource. Only show UsageRecords representing usage incurred by this
+    ///           Super SIM. </param>
+    /// <param name="fleet"> SID or unique name of a Fleet resource. Only show UsageRecords representing usage for Super
+    ///             SIMs belonging to this Fleet resource at the time the usage occurred. </param>
+    /// <param name="network"> SID of a Network resource. Only show UsageRecords representing usage on this network.
+    ///               </param>
+    /// <param name="isoCountry"> Alpha-2 ISO Country Code. Only show UsageRecords representing usage in this country.
+    ///                  </param>
+    /// <param name="group"> Dimension over which to aggregate usage records. </param>
+    /// <param name="granularity"> Time-based grouping that UsageRecords should be aggregated by. Can be: `hour`, `day`, or
+    ///                   `all`. Default is `all`. </param>
+    /// <param name="startTime"> Only include usage that occurred at or after this time. </param>
+    /// <param name="endTime"> Only include usage that occurred before this time. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsageRecord </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UsageRecordResource>> ReadAsync(string sim = null,
+                                                                                                string fleet = null,
+                                                                                                string network = null,
+                                                                                                string isoCountry = null,
+                                                                                                UsageRecordResource.GroupEnum group = null,
+                                                                                                UsageRecordResource.GranularityEnum granularity = null,
+                                                                                                DateTime? startTime = null,
+                                                                                                DateTime? endTime = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadUsageRecordOptions() { Sim = sim, Fleet = fleet, Network = network, IsoCountry = isoCountry, Group = group, Granularity = granularity, StartTime = startTime, EndTime = endTime, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UsageRecordResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UsageRecordResource> NextPage(Page<UsageRecordResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UsageRecordResource> PreviousPage(Page<UsageRecordResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Supersim)
+      );
+
+      var response = client.Request(request);
+      return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a UsageRecordResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UsageRecordResource object represented by the provided JSON </returns>
+    public static UsageRecordResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UsageRecordResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that incurred the usage.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// SID of a Sim resource to which the UsageRecord belongs.
+    /// </summary>
+    [JsonProperty("sim_sid")]
+    public string SimSid { get; private set; }
+    /// <summary>
+    /// SID of the Network resource on which the usage occurred.
+    /// </summary>
+    [JsonProperty("network_sid")]
+    public string NetworkSid { get; private set; }
+    /// <summary>
+    /// SID of the Fleet resource on which the usage occurred.
+    /// </summary>
+    [JsonProperty("fleet_sid")]
+    public string FleetSid { get; private set; }
+    /// <summary>
+    /// Alpha-2 ISO Country Code of the country the usage occurred in.
+    /// </summary>
+    [JsonProperty("iso_country")]
+    public string IsoCountry { get; private set; }
+    /// <summary>
+    /// The time period for which the usage is reported.
+    /// </summary>
+    [JsonProperty("period")]
+    public object Period { get; private set; }
+    /// <summary>
+    /// Total data uploaded in bytes, aggregated by the query parameters.
+    /// </summary>
+    [JsonProperty("data_upload")]
+    public long? DataUpload { get; private set; }
+    /// <summary>
+    /// Total data downloaded in bytes, aggregated by the query parameters.
+    /// </summary>
+    [JsonProperty("data_download")]
+    public long? DataDownload { get; private set; }
+    /// <summary>
+    /// Total of data_upload and data_download.
+    /// </summary>
+    [JsonProperty("data_total")]
+    public long? DataTotal { get; private set; }
+
+    private UsageRecordResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/Document/DocumentPermissionOptions.cs b/src/Twilio/Rest/Sync/V1/Service/Document/DocumentPermissionOptions.cs
index 3dbf5f766..82cb4ecbc 100644
--- a/src/Twilio/Rest/Sync/V1/Service/Document/DocumentPermissionOptions.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/Document/DocumentPermissionOptions.cs
@@ -9,210 +9,210 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Sync.V1.Service.Document
-{
-
+{
+
+  /// <summary>
+  /// Fetch a specific Sync Document Permission.
+  /// </summary>
+  public class FetchDocumentPermissionOptions : IOptions<DocumentPermissionResource>
+  {
     /// <summary>
-    /// Fetch a specific Sync Document Permission.
-    /// </summary>
-    public class FetchDocumentPermissionOptions : IOptions<DocumentPermissionResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Document Permission resource to fetch
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Document with the Document Permission resource to fetch
-        /// </summary>
-        public string PathDocumentSid { get; }
-        /// <summary>
-        /// The application-defined string that uniquely identifies the User's Document Permission resource to fetch
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new FetchDocumentPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to fetch </param>
-        /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to fetch </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
-        ///                    resource to fetch </param>
-        public FetchDocumentPermissionOptions(string pathServiceSid, string pathDocumentSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathDocumentSid = pathDocumentSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync Service with the Document Permission resource to fetch
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// Delete a specific Sync Document Permission.
-    /// </summary>
-    public class DeleteDocumentPermissionOptions : IOptions<DocumentPermissionResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Document Permission resource to delete
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Document with the Document Permission resource to delete
-        /// </summary>
-        public string PathDocumentSid { get; }
-        /// <summary>
-        /// The application-defined string that uniquely identifies the User's Document Permission resource to delete
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new DeleteDocumentPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to delete </param>
-        /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to delete </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
-        ///                    resource to delete </param>
-        public DeleteDocumentPermissionOptions(string pathServiceSid, string pathDocumentSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathDocumentSid = pathDocumentSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync Document with the Document Permission resource to fetch
+    /// </summary>
+    public string PathDocumentSid { get; }
     /// <summary>
-    /// Retrieve a list of all Permissions applying to a Sync Document.
-    /// </summary>
-    public class ReadDocumentPermissionOptions : ReadOptions<DocumentPermissionResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Document Permission resources to read
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Document with the Document Permission resources to read
-        /// </summary>
-        public string PathDocumentSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadDocumentPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resources to read </param>
-        /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resources to read </param>
-        public ReadDocumentPermissionOptions(string pathServiceSid, string pathDocumentSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathDocumentSid = pathDocumentSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The application-defined string that uniquely identifies the User's Document Permission resource to fetch
+    /// </summary>
+    public string PathIdentity { get; }
+
     /// <summary>
-    /// Update an identity's access to a specific Sync Document.
-    /// </summary>
-    public class UpdateDocumentPermissionOptions : IOptions<DocumentPermissionResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Document Permission resource to update
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Document with the Document Permission resource to update
-        /// </summary>
-        public string PathDocumentSid { get; }
-        /// <summary>
-        /// The application-defined string that uniquely identifies the User's Document Permission resource to update
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// Read access
-        /// </summary>
-        public bool? Read { get; }
-        /// <summary>
-        /// Write access
-        /// </summary>
-        public bool? Write { get; }
-        /// <summary>
-        /// Manage access
-        /// </summary>
-        public bool? Manage { get; }
-
-        /// <summary>
-        /// Construct a new UpdateDocumentPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to update </param>
-        /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to update </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
-        ///                    resource to update </param>
-        /// <param name="read"> Read access </param>
-        /// <param name="write"> Write access </param>
-        /// <param name="manage"> Manage access </param>
-        public UpdateDocumentPermissionOptions(string pathServiceSid,
-                                               string pathDocumentSid,
-                                               string pathIdentity,
-                                               bool? read,
-                                               bool? write,
-                                               bool? manage)
-        {
-            PathServiceSid = pathServiceSid;
-            PathDocumentSid = pathDocumentSid;
-            PathIdentity = pathIdentity;
-            Read = read;
-            Write = write;
-            Manage = manage;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Read != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Read", Read.Value.ToString().ToLower()));
-            }
-
-            if (Write != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Write", Write.Value.ToString().ToLower()));
-            }
-
-            if (Manage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Manage", Manage.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new FetchDocumentPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to fetch </param>
+    /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to fetch </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
+    ///                    resource to fetch </param>
+    public FetchDocumentPermissionOptions(string pathServiceSid, string pathDocumentSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathDocumentSid = pathDocumentSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Sync Document Permission.
+  /// </summary>
+  public class DeleteDocumentPermissionOptions : IOptions<DocumentPermissionResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Document Permission resource to delete
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync Document with the Document Permission resource to delete
+    /// </summary>
+    public string PathDocumentSid { get; }
+    /// <summary>
+    /// The application-defined string that uniquely identifies the User's Document Permission resource to delete
+    /// </summary>
+    public string PathIdentity { get; }
+
+    /// <summary>
+    /// Construct a new DeleteDocumentPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to delete </param>
+    /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to delete </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
+    ///                    resource to delete </param>
+    public DeleteDocumentPermissionOptions(string pathServiceSid, string pathDocumentSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathDocumentSid = pathDocumentSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Permissions applying to a Sync Document.
+  /// </summary>
+  public class ReadDocumentPermissionOptions : ReadOptions<DocumentPermissionResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Document Permission resources to read
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync Document with the Document Permission resources to read
+    /// </summary>
+    public string PathDocumentSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadDocumentPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resources to read </param>
+    /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resources to read </param>
+    public ReadDocumentPermissionOptions(string pathServiceSid, string pathDocumentSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathDocumentSid = pathDocumentSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an identity's access to a specific Sync Document.
+  /// </summary>
+  public class UpdateDocumentPermissionOptions : IOptions<DocumentPermissionResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Document Permission resource to update
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync Document with the Document Permission resource to update
+    /// </summary>
+    public string PathDocumentSid { get; }
+    /// <summary>
+    /// The application-defined string that uniquely identifies the User's Document Permission resource to update
+    /// </summary>
+    public string PathIdentity { get; }
+    /// <summary>
+    /// Read access
+    /// </summary>
+    public bool? Read { get; }
+    /// <summary>
+    /// Write access
+    /// </summary>
+    public bool? Write { get; }
+    /// <summary>
+    /// Manage access
+    /// </summary>
+    public bool? Manage { get; }
+
+    /// <summary>
+    /// Construct a new UpdateDocumentPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to update </param>
+    /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to update </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
+    ///                    resource to update </param>
+    /// <param name="read"> Read access </param>
+    /// <param name="write"> Write access </param>
+    /// <param name="manage"> Manage access </param>
+    public UpdateDocumentPermissionOptions(string pathServiceSid,
+                                           string pathDocumentSid,
+                                           string pathIdentity,
+                                           bool? read,
+                                           bool? write,
+                                           bool? manage)
+    {
+      PathServiceSid = pathServiceSid;
+      PathDocumentSid = pathDocumentSid;
+      PathIdentity = pathIdentity;
+      Read = read;
+      Write = write;
+      Manage = manage;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Read != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Read", Read.Value.ToString().ToLower()));
+      }
+
+      if (Write != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Write", Write.Value.ToString().ToLower()));
+      }
+
+      if (Manage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Manage", Manage.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/Document/DocumentPermissionResource.cs b/src/Twilio/Rest/Sync/V1/Service/Document/DocumentPermissionResource.cs
index ddcff7900..332c70378 100644
--- a/src/Twilio/Rest/Sync/V1/Service/Document/DocumentPermissionResource.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/Document/DocumentPermissionResource.cs
@@ -16,461 +16,461 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Sync.V1.Service.Document
-{
-
-    public class DocumentPermissionResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchDocumentPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="options"> Fetch DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static DocumentPermissionResource Fetch(FetchDocumentPermissionOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="options"> Fetch DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<DocumentPermissionResource> FetchAsync(FetchDocumentPermissionOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to fetch </param>
-        /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to fetch </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
-        ///                    resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static DocumentPermissionResource Fetch(string pathServiceSid,
-                                                       string pathDocumentSid,
-                                                       string pathIdentity,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to fetch </param>
-        /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to fetch </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
-        ///                    resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<DocumentPermissionResource> FetchAsync(string pathServiceSid,
-                                                                                               string pathDocumentSid,
-                                                                                               string pathIdentity,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteDocumentPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="options"> Delete DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static bool Delete(DeleteDocumentPermissionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="options"> Delete DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDocumentPermissionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to delete </param>
-        /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to delete </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
-        ///                    resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathDocumentSid,
-                                  string pathIdentity,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sync Document Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to delete </param>
-        /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to delete </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
-        ///                    resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathDocumentSid,
-                                                                          string pathIdentity,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadDocumentPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Document.
-        /// </summary>
-        /// <param name="options"> Read DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static ResourceSet<DocumentPermissionResource> Read(ReadDocumentPermissionOptions options,
-                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
-            return new ResourceSet<DocumentPermissionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Document.
-        /// </summary>
-        /// <param name="options"> Read DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DocumentPermissionResource>> ReadAsync(ReadDocumentPermissionOptions options,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
-            return new ResourceSet<DocumentPermissionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Document.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resources to read </param>
-        /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static ResourceSet<DocumentPermissionResource> Read(string pathServiceSid,
-                                                                   string pathDocumentSid,
-                                                                   int? pageSize = null,
-                                                                   long? limit = null,
-                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadDocumentPermissionOptions(pathServiceSid, pathDocumentSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Document.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resources to read </param>
-        /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DocumentPermissionResource>> ReadAsync(string pathServiceSid,
-                                                                                                           string pathDocumentSid,
-                                                                                                           int? pageSize = null,
-                                                                                                           long? limit = null,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadDocumentPermissionOptions(pathServiceSid, pathDocumentSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DocumentPermissionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DocumentPermissionResource> NextPage(Page<DocumentPermissionResource> page,
-                                                                ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DocumentPermissionResource> PreviousPage(Page<DocumentPermissionResource> page,
-                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateDocumentPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions/" + options.PathIdentity + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an identity's access to a specific Sync Document.
-        /// </summary>
-        /// <param name="options"> Update DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static DocumentPermissionResource Update(UpdateDocumentPermissionOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an identity's access to a specific Sync Document.
-        /// </summary>
-        /// <param name="options"> Update DocumentPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<DocumentPermissionResource> UpdateAsync(UpdateDocumentPermissionOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an identity's access to a specific Sync Document.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to update </param>
-        /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to update </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
-        ///                    resource to update </param>
-        /// <param name="read"> Read access </param>
-        /// <param name="write"> Write access </param>
-        /// <param name="manage"> Manage access </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DocumentPermission </returns>
-        public static DocumentPermissionResource Update(string pathServiceSid,
-                                                        string pathDocumentSid,
-                                                        string pathIdentity,
-                                                        bool? read,
-                                                        bool? write,
-                                                        bool? manage,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity, read, write, manage);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an identity's access to a specific Sync Document.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to update </param>
-        /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to update </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
-        ///                    resource to update </param>
-        /// <param name="read"> Read access </param>
-        /// <param name="write"> Write access </param>
-        /// <param name="manage"> Manage access </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
-        public static async System.Threading.Tasks.Task<DocumentPermissionResource> UpdateAsync(string pathServiceSid,
-                                                                                                string pathDocumentSid,
-                                                                                                string pathIdentity,
-                                                                                                bool? read,
-                                                                                                bool? write,
-                                                                                                bool? manage,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity, read, write, manage);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a DocumentPermissionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DocumentPermissionResource object represented by the provided JSON </returns>
-        public static DocumentPermissionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DocumentPermissionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Sync Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The Sync Document SID
-        /// </summary>
-        [JsonProperty("document_sid")]
-        public string DocumentSid { get; private set; }
-        /// <summary>
-        /// The identity of the user to whom the Sync Document Permission applies
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// Read access
-        /// </summary>
-        [JsonProperty("read")]
-        public bool? _Read { get; private set; }
-        /// <summary>
-        /// Write access
-        /// </summary>
-        [JsonProperty("write")]
-        public bool? Write { get; private set; }
-        /// <summary>
-        /// Manage access
-        /// </summary>
-        [JsonProperty("manage")]
-        public bool? Manage { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Sync Document Permission resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private DocumentPermissionResource()
-        {
-
-        }
-    }
+{
+
+  public class DocumentPermissionResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchDocumentPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="options"> Fetch DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static DocumentPermissionResource Fetch(FetchDocumentPermissionOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="options"> Fetch DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<DocumentPermissionResource> FetchAsync(FetchDocumentPermissionOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to fetch </param>
+    /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to fetch </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
+    ///                    resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static DocumentPermissionResource Fetch(string pathServiceSid,
+                                                   string pathDocumentSid,
+                                                   string pathIdentity,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to fetch </param>
+    /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to fetch </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
+    ///                    resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<DocumentPermissionResource> FetchAsync(string pathServiceSid,
+                                                                                           string pathDocumentSid,
+                                                                                           string pathIdentity,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteDocumentPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="options"> Delete DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static bool Delete(DeleteDocumentPermissionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="options"> Delete DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDocumentPermissionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to delete </param>
+    /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to delete </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
+    ///                    resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathDocumentSid,
+                              string pathIdentity,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sync Document Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to delete </param>
+    /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to delete </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
+    ///                    resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathDocumentSid,
+                                                                      string pathIdentity,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadDocumentPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Document.
+    /// </summary>
+    /// <param name="options"> Read DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static ResourceSet<DocumentPermissionResource> Read(ReadDocumentPermissionOptions options,
+                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
+      return new ResourceSet<DocumentPermissionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Document.
+    /// </summary>
+    /// <param name="options"> Read DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DocumentPermissionResource>> ReadAsync(ReadDocumentPermissionOptions options,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
+      return new ResourceSet<DocumentPermissionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Document.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resources to read </param>
+    /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static ResourceSet<DocumentPermissionResource> Read(string pathServiceSid,
+                                                               string pathDocumentSid,
+                                                               int? pageSize = null,
+                                                               long? limit = null,
+                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadDocumentPermissionOptions(pathServiceSid, pathDocumentSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Document.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resources to read </param>
+    /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DocumentPermissionResource>> ReadAsync(string pathServiceSid,
+                                                                                                       string pathDocumentSid,
+                                                                                                       int? pageSize = null,
+                                                                                                       long? limit = null,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadDocumentPermissionOptions(pathServiceSid, pathDocumentSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DocumentPermissionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DocumentPermissionResource> NextPage(Page<DocumentPermissionResource> page,
+                                                            ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DocumentPermissionResource> PreviousPage(Page<DocumentPermissionResource> page,
+                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<DocumentPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateDocumentPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathDocumentSid + "/Permissions/" + options.PathIdentity + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an identity's access to a specific Sync Document.
+    /// </summary>
+    /// <param name="options"> Update DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static DocumentPermissionResource Update(UpdateDocumentPermissionOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an identity's access to a specific Sync Document.
+    /// </summary>
+    /// <param name="options"> Update DocumentPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<DocumentPermissionResource> UpdateAsync(UpdateDocumentPermissionOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an identity's access to a specific Sync Document.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to update </param>
+    /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to update </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
+    ///                    resource to update </param>
+    /// <param name="read"> Read access </param>
+    /// <param name="write"> Write access </param>
+    /// <param name="manage"> Manage access </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DocumentPermission </returns>
+    public static DocumentPermissionResource Update(string pathServiceSid,
+                                                    string pathDocumentSid,
+                                                    string pathIdentity,
+                                                    bool? read,
+                                                    bool? write,
+                                                    bool? manage,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity, read, write, manage);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an identity's access to a specific Sync Document.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document Permission resource to update </param>
+    /// <param name="pathDocumentSid"> The SID of the Sync Document with the Document Permission resource to update </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Document Permission
+    ///                    resource to update </param>
+    /// <param name="read"> Read access </param>
+    /// <param name="write"> Write access </param>
+    /// <param name="manage"> Manage access </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DocumentPermission </returns>
+    public static async System.Threading.Tasks.Task<DocumentPermissionResource> UpdateAsync(string pathServiceSid,
+                                                                                            string pathDocumentSid,
+                                                                                            string pathIdentity,
+                                                                                            bool? read,
+                                                                                            bool? write,
+                                                                                            bool? manage,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateDocumentPermissionOptions(pathServiceSid, pathDocumentSid, pathIdentity, read, write, manage);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a DocumentPermissionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DocumentPermissionResource object represented by the provided JSON </returns>
+    public static DocumentPermissionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DocumentPermissionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Sync Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The Sync Document SID
+    /// </summary>
+    [JsonProperty("document_sid")]
+    public string DocumentSid { get; private set; }
+    /// <summary>
+    /// The identity of the user to whom the Sync Document Permission applies
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// Read access
+    /// </summary>
+    [JsonProperty("read")]
+    public bool? _Read { get; private set; }
+    /// <summary>
+    /// Write access
+    /// </summary>
+    [JsonProperty("write")]
+    public bool? Write { get; private set; }
+    /// <summary>
+    /// Manage access
+    /// </summary>
+    [JsonProperty("manage")]
+    public bool? Manage { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Sync Document Permission resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private DocumentPermissionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/DocumentOptions.cs b/src/Twilio/Rest/Sync/V1/Service/DocumentOptions.cs
index 5369dd0ae..410b5b2db 100644
--- a/src/Twilio/Rest/Sync/V1/Service/DocumentOptions.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/DocumentOptions.cs
@@ -9,237 +9,237 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Sync.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchDocumentOptions
+  /// </summary>
+  public class FetchDocumentOptions : IOptions<DocumentResource>
+  {
     /// <summary>
-    /// FetchDocumentOptions
-    /// </summary>
-    public class FetchDocumentOptions : IOptions<DocumentResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Document resource to fetch
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Document resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchDocumentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Document resource to fetch </param>
-        public FetchDocumentOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync Service with the Document resource to fetch
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteDocumentOptions
-    /// </summary>
-    public class DeleteDocumentOptions : IOptions<DocumentResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Document resource to delete
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Document resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteDocumentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to delete </param>
-        /// <param name="pathSid"> The SID of the Document resource to delete </param>
-        public DeleteDocumentOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Document resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateDocumentOptions
-    /// </summary>
-    public class CreateDocumentOptions : IOptions<DocumentResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service to associate the Document resource to create with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the Sync Document
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// A JSON string that represents an arbitrary, schema-less object that the Sync Document stores
-        /// </summary>
-        public object Data { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the Sync Document expires and is deleted
-        /// </summary>
-        public int? Ttl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateDocumentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to associate the Document resource to create with </param>
-        public CreateDocumentOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchDocumentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Document resource to fetch </param>
+    public FetchDocumentOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadDocumentOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadDocumentOptions : ReadOptions<DocumentResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Document resources to read
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadDocumentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resources to read </param>
-        public ReadDocumentOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteDocumentOptions
+  /// </summary>
+  public class DeleteDocumentOptions : IOptions<DocumentResource>
+  {
     /// <summary>
-    /// UpdateDocumentOptions
-    /// </summary>
-    public class UpdateDocumentOptions : IOptions<DocumentResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Document resource to update
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Document resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A JSON string that represents an arbitrary, schema-less object that the Sync Document stores
-        /// </summary>
-        public object Data { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the Document resource expires and is deleted
-        /// </summary>
-        public int? Ttl { get; set; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateDocumentOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to update </param>
-        /// <param name="pathSid"> The SID of the Document resource to update </param>
-        public UpdateDocumentOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Sync Service with the Document resource to delete
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Document resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteDocumentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to delete </param>
+    /// <param name="pathSid"> The SID of the Document resource to delete </param>
+    public DeleteDocumentOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateDocumentOptions
+  /// </summary>
+  public class CreateDocumentOptions : IOptions<DocumentResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service to associate the Document resource to create with
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the Sync Document
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// A JSON string that represents an arbitrary, schema-less object that the Sync Document stores
+    /// </summary>
+    public object Data { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the Sync Document expires and is deleted
+    /// </summary>
+    public int? Ttl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateDocumentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to associate the Document resource to create with </param>
+    public CreateDocumentOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadDocumentOptions
+  /// </summary>
+  public class ReadDocumentOptions : ReadOptions<DocumentResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Document resources to read
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadDocumentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resources to read </param>
+    public ReadDocumentOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateDocumentOptions
+  /// </summary>
+  public class UpdateDocumentOptions : IOptions<DocumentResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Document resource to update
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Document resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A JSON string that represents an arbitrary, schema-less object that the Sync Document stores
+    /// </summary>
+    public object Data { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the Document resource expires and is deleted
+    /// </summary>
+    public int? Ttl { get; set; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateDocumentOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to update </param>
+    /// <param name="pathSid"> The SID of the Document resource to update </param>
+    public UpdateDocumentOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/DocumentResource.cs b/src/Twilio/Rest/Sync/V1/Service/DocumentResource.cs
index 130b9bc88..261536f95 100644
--- a/src/Twilio/Rest/Sync/V1/Service/DocumentResource.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/DocumentResource.cs
@@ -16,534 +16,534 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Sync.V1.Service
-{
-
-    public class DocumentResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static DocumentResource Fetch(FetchDocumentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<DocumentResource> FetchAsync(FetchDocumentOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Document resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static DocumentResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchDocumentOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Document resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<DocumentResource> FetchAsync(string pathServiceSid,
-                                                                                     string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchDocumentOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static bool Delete(DeleteDocumentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDocumentOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to delete </param>
-        /// <param name="pathSid"> The SID of the Document resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteDocumentOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to delete </param>
-        /// <param name="pathSid"> The SID of the Document resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteDocumentOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Documents",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static DocumentResource Create(CreateDocumentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<DocumentResource> CreateAsync(CreateDocumentOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to associate the Document resource to create with </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the Sync Document </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Sync Document stores
-        ///            </param>
-        /// <param name="ttl"> How long, in seconds, before the Sync Document expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static DocumentResource Create(string pathServiceSid,
-                                              string uniqueName = null,
-                                              object data = null,
-                                              int? ttl = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateDocumentOptions(pathServiceSid){UniqueName = uniqueName, Data = data, Ttl = ttl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to associate the Document resource to create with </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the Sync Document </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Sync Document stores
-        ///            </param>
-        /// <param name="ttl"> How long, in seconds, before the Sync Document expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<DocumentResource> CreateAsync(string pathServiceSid,
-                                                                                      string uniqueName = null,
-                                                                                      object data = null,
-                                                                                      int? ttl = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateDocumentOptions(pathServiceSid){UniqueName = uniqueName, Data = data, Ttl = ttl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Documents",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static ResourceSet<DocumentResource> Read(ReadDocumentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DocumentResource>.FromJson("documents", response.Content);
-            return new ResourceSet<DocumentResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DocumentResource>> ReadAsync(ReadDocumentOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DocumentResource>.FromJson("documents", response.Content);
-            return new ResourceSet<DocumentResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static ResourceSet<DocumentResource> Read(string pathServiceSid,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadDocumentOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DocumentResource>> ReadAsync(string pathServiceSid,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadDocumentOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DocumentResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DocumentResource>.FromJson("documents", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DocumentResource> NextPage(Page<DocumentResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<DocumentResource>.FromJson("documents", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DocumentResource> PreviousPage(Page<DocumentResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<DocumentResource>.FromJson("documents", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static DocumentResource Update(UpdateDocumentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Document parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<DocumentResource> UpdateAsync(UpdateDocumentOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to update </param>
-        /// <param name="pathSid"> The SID of the Document resource to update </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Sync Document stores
-        ///            </param>
-        /// <param name="ttl"> How long, in seconds, before the Document resource expires and is deleted </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Document </returns>
-        public static DocumentResource Update(string pathServiceSid,
-                                              string pathSid,
-                                              object data = null,
-                                              int? ttl = null,
-                                              string ifMatch = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateDocumentOptions(pathServiceSid, pathSid){Data = data, Ttl = ttl, IfMatch = ifMatch};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to update </param>
-        /// <param name="pathSid"> The SID of the Document resource to update </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Sync Document stores
-        ///            </param>
-        /// <param name="ttl"> How long, in seconds, before the Document resource expires and is deleted </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Document </returns>
-        public static async System.Threading.Tasks.Task<DocumentResource> UpdateAsync(string pathServiceSid,
-                                                                                      string pathSid,
-                                                                                      object data = null,
-                                                                                      int? ttl = null,
-                                                                                      string ifMatch = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateDocumentOptions(pathServiceSid, pathSid){Data = data, Ttl = ttl, IfMatch = ifMatch};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a DocumentResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DocumentResource object represented by the provided JSON </returns>
-        public static DocumentResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DocumentResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Sync Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Document resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of resources related to the Sync Document
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The current revision of the Sync Document, represented by a string identifier
-        /// </summary>
-        [JsonProperty("revision")]
-        public string Revision { get; private set; }
-        /// <summary>
-        /// An arbitrary, schema-less object that the Sync Document stores
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Sync Document expires
-        /// </summary>
-        [JsonProperty("date_expires")]
-        public DateTime? DateExpires { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The identity of the Sync Document's creator
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-
-        private DocumentResource()
-        {
-
-        }
-    }
+{
+
+  public class DocumentResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static DocumentResource Fetch(FetchDocumentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<DocumentResource> FetchAsync(FetchDocumentOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Document resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static DocumentResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchDocumentOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Document resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<DocumentResource> FetchAsync(string pathServiceSid,
+                                                                                 string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchDocumentOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static bool Delete(DeleteDocumentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteDocumentOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to delete </param>
+    /// <param name="pathSid"> The SID of the Document resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteDocumentOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to delete </param>
+    /// <param name="pathSid"> The SID of the Document resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteDocumentOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Documents",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static DocumentResource Create(CreateDocumentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<DocumentResource> CreateAsync(CreateDocumentOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to associate the Document resource to create with </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the Sync Document </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Sync Document stores
+    ///            </param>
+    /// <param name="ttl"> How long, in seconds, before the Sync Document expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static DocumentResource Create(string pathServiceSid,
+                                          string uniqueName = null,
+                                          object data = null,
+                                          int? ttl = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateDocumentOptions(pathServiceSid) { UniqueName = uniqueName, Data = data, Ttl = ttl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to associate the Document resource to create with </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the Sync Document </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Sync Document stores
+    ///            </param>
+    /// <param name="ttl"> How long, in seconds, before the Sync Document expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<DocumentResource> CreateAsync(string pathServiceSid,
+                                                                                  string uniqueName = null,
+                                                                                  object data = null,
+                                                                                  int? ttl = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateDocumentOptions(pathServiceSid) { UniqueName = uniqueName, Data = data, Ttl = ttl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Documents",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static ResourceSet<DocumentResource> Read(ReadDocumentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DocumentResource>.FromJson("documents", response.Content);
+      return new ResourceSet<DocumentResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DocumentResource>> ReadAsync(ReadDocumentOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DocumentResource>.FromJson("documents", response.Content);
+      return new ResourceSet<DocumentResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static ResourceSet<DocumentResource> Read(string pathServiceSid,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadDocumentOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DocumentResource>> ReadAsync(string pathServiceSid,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadDocumentOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DocumentResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DocumentResource>.FromJson("documents", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DocumentResource> NextPage(Page<DocumentResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<DocumentResource>.FromJson("documents", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DocumentResource> PreviousPage(Page<DocumentResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<DocumentResource>.FromJson("documents", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Documents/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static DocumentResource Update(UpdateDocumentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Document parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<DocumentResource> UpdateAsync(UpdateDocumentOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to update </param>
+    /// <param name="pathSid"> The SID of the Document resource to update </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Sync Document stores
+    ///            </param>
+    /// <param name="ttl"> How long, in seconds, before the Document resource expires and is deleted </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Document </returns>
+    public static DocumentResource Update(string pathServiceSid,
+                                          string pathSid,
+                                          object data = null,
+                                          int? ttl = null,
+                                          string ifMatch = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateDocumentOptions(pathServiceSid, pathSid) { Data = data, Ttl = ttl, IfMatch = ifMatch };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Document resource to update </param>
+    /// <param name="pathSid"> The SID of the Document resource to update </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Sync Document stores
+    ///            </param>
+    /// <param name="ttl"> How long, in seconds, before the Document resource expires and is deleted </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Document </returns>
+    public static async System.Threading.Tasks.Task<DocumentResource> UpdateAsync(string pathServiceSid,
+                                                                                  string pathSid,
+                                                                                  object data = null,
+                                                                                  int? ttl = null,
+                                                                                  string ifMatch = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateDocumentOptions(pathServiceSid, pathSid) { Data = data, Ttl = ttl, IfMatch = ifMatch };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a DocumentResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DocumentResource object represented by the provided JSON </returns>
+    public static DocumentResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DocumentResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Sync Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Document resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of resources related to the Sync Document
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The current revision of the Sync Document, represented by a string identifier
+    /// </summary>
+    [JsonProperty("revision")]
+    public string Revision { get; private set; }
+    /// <summary>
+    /// An arbitrary, schema-less object that the Sync Document stores
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Sync Document expires
+    /// </summary>
+    [JsonProperty("date_expires")]
+    public DateTime? DateExpires { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The identity of the Sync Document's creator
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+
+    private DocumentResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListItemOptions.cs b/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListItemOptions.cs
index 70afcface..ecaf35aa8 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListItemOptions.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListItemOptions.cs
@@ -9,342 +9,342 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Sync.V1.Service.SyncList
-{
-
+{
+
+  /// <summary>
+  /// FetchSyncListItemOptions
+  /// </summary>
+  public class FetchSyncListItemOptions : IOptions<SyncListItemResource>
+  {
     /// <summary>
-    /// FetchSyncListItemOptions
-    /// </summary>
-    public class FetchSyncListItemOptions : IOptions<SyncListItemResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync List Item resource to fetch
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync List with the Sync List Item resource to fetch
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// The index of the Sync List Item resource to fetch
-        /// </summary>
-        public int? PathIndex { get; }
-
-        /// <summary>
-        /// Construct a new FetchSyncListItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to fetch </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to fetch </param>
-        /// <param name="pathIndex"> The index of the Sync List Item resource to fetch </param>
-        public FetchSyncListItemOptions(string pathServiceSid, string pathListSid, int? pathIndex)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            PathIndex = pathIndex;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync Service with the Sync List Item resource to fetch
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteSyncListItemOptions
-    /// </summary>
-    public class DeleteSyncListItemOptions : IOptions<SyncListItemResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync List Item resource to delete
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync List with the Sync List Item resource to delete
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// The index of the Sync List Item resource to delete
-        /// </summary>
-        public int? PathIndex { get; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteSyncListItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to delete </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to delete </param>
-        /// <param name="pathIndex"> The index of the Sync List Item resource to delete </param>
-        public DeleteSyncListItemOptions(string pathServiceSid, string pathListSid, int? pathIndex)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            PathIndex = pathIndex;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Sync List with the Sync List Item resource to fetch
+    /// </summary>
+    public string PathListSid { get; }
     /// <summary>
-    /// CreateSyncListItemOptions
-    /// </summary>
-    public class CreateSyncListItemOptions : IOptions<SyncListItemResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service to create the List Item in
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync List to add the new List Item to
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// A JSON string that represents an arbitrary, schema-less object that the List Item stores
-        /// </summary>
-        public object Data { get; }
-        /// <summary>
-        /// An alias for item_ttl
-        /// </summary>
-        public int? Ttl { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the List Item expires
-        /// </summary>
-        public int? ItemTtl { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the List Item's parent Sync List expires
-        /// </summary>
-        public int? CollectionTtl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSyncListItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the List Item in </param>
-        /// <param name="pathListSid"> The SID of the Sync List to add the new List Item to </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the List Item stores
-        ///            </param>
-        public CreateSyncListItemOptions(string pathServiceSid, string pathListSid, object data)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            Data = data;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            if (ItemTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ItemTtl", ItemTtl.ToString()));
-            }
-
-            if (CollectionTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The index of the Sync List Item resource to fetch
+    /// </summary>
+    public int? PathIndex { get; }
+
     /// <summary>
-    /// ReadSyncListItemOptions
-    /// </summary>
-    public class ReadSyncListItemOptions : ReadOptions<SyncListItemResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the List Item resources to read
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync List with the List Items to read
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// The order to return the List Items
-        /// </summary>
-        public SyncListItemResource.QueryResultOrderEnum Order { get; set; }
-        /// <summary>
-        /// The index of the first Sync List Item resource to read
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// Whether to include the List Item referenced by the from parameter
-        /// </summary>
-        public SyncListItemResource.QueryFromBoundTypeEnum Bounds { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadSyncListItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the List Item resources to read </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the List Items to read </param>
-        public ReadSyncListItemOptions(string pathServiceSid, string pathListSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Order != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            if (Bounds != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Bounds", Bounds.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchSyncListItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to fetch </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to fetch </param>
+    /// <param name="pathIndex"> The index of the Sync List Item resource to fetch </param>
+    public FetchSyncListItemOptions(string pathServiceSid, string pathListSid, int? pathIndex)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      PathIndex = pathIndex;
+    }
+
     /// <summary>
-    /// UpdateSyncListItemOptions
-    /// </summary>
-    public class UpdateSyncListItemOptions : IOptions<SyncListItemResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync List Item resource to update
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync List with the Sync List Item resource to update
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// The index of the Sync List Item resource to update
-        /// </summary>
-        public int? PathIndex { get; }
-        /// <summary>
-        /// A JSON string that represents an arbitrary, schema-less object that the List Item stores
-        /// </summary>
-        public object Data { get; set; }
-        /// <summary>
-        /// An alias for item_ttl
-        /// </summary>
-        public int? Ttl { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the List Item expires
-        /// </summary>
-        public int? ItemTtl { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the List Item's parent Sync List expires
-        /// </summary>
-        public int? CollectionTtl { get; set; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSyncListItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to update </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to update </param>
-        /// <param name="pathIndex"> The index of the Sync List Item resource to update </param>
-        public UpdateSyncListItemOptions(string pathServiceSid, string pathListSid, int? pathIndex)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            PathIndex = pathIndex;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            if (ItemTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ItemTtl", ItemTtl.ToString()));
-            }
-
-            if (CollectionTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteSyncListItemOptions
+  /// </summary>
+  public class DeleteSyncListItemOptions : IOptions<SyncListItemResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync List Item resource to delete
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync List with the Sync List Item resource to delete
+    /// </summary>
+    public string PathListSid { get; }
+    /// <summary>
+    /// The index of the Sync List Item resource to delete
+    /// </summary>
+    public int? PathIndex { get; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteSyncListItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to delete </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to delete </param>
+    /// <param name="pathIndex"> The index of the Sync List Item resource to delete </param>
+    public DeleteSyncListItemOptions(string pathServiceSid, string pathListSid, int? pathIndex)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      PathIndex = pathIndex;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateSyncListItemOptions
+  /// </summary>
+  public class CreateSyncListItemOptions : IOptions<SyncListItemResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service to create the List Item in
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync List to add the new List Item to
+    /// </summary>
+    public string PathListSid { get; }
+    /// <summary>
+    /// A JSON string that represents an arbitrary, schema-less object that the List Item stores
+    /// </summary>
+    public object Data { get; }
+    /// <summary>
+    /// An alias for item_ttl
+    /// </summary>
+    public int? Ttl { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the List Item expires
+    /// </summary>
+    public int? ItemTtl { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the List Item's parent Sync List expires
+    /// </summary>
+    public int? CollectionTtl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateSyncListItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the List Item in </param>
+    /// <param name="pathListSid"> The SID of the Sync List to add the new List Item to </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the List Item stores
+    ///            </param>
+    public CreateSyncListItemOptions(string pathServiceSid, string pathListSid, object data)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      Data = data;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      if (ItemTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ItemTtl", ItemTtl.ToString()));
+      }
+
+      if (CollectionTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadSyncListItemOptions
+  /// </summary>
+  public class ReadSyncListItemOptions : ReadOptions<SyncListItemResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the List Item resources to read
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync List with the List Items to read
+    /// </summary>
+    public string PathListSid { get; }
+    /// <summary>
+    /// The order to return the List Items
+    /// </summary>
+    public SyncListItemResource.QueryResultOrderEnum Order { get; set; }
+    /// <summary>
+    /// The index of the first Sync List Item resource to read
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// Whether to include the List Item referenced by the from parameter
+    /// </summary>
+    public SyncListItemResource.QueryFromBoundTypeEnum Bounds { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadSyncListItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the List Item resources to read </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the List Items to read </param>
+    public ReadSyncListItemOptions(string pathServiceSid, string pathListSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Order != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      if (Bounds != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Bounds", Bounds.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateSyncListItemOptions
+  /// </summary>
+  public class UpdateSyncListItemOptions : IOptions<SyncListItemResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync List Item resource to update
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync List with the Sync List Item resource to update
+    /// </summary>
+    public string PathListSid { get; }
+    /// <summary>
+    /// The index of the Sync List Item resource to update
+    /// </summary>
+    public int? PathIndex { get; }
+    /// <summary>
+    /// A JSON string that represents an arbitrary, schema-less object that the List Item stores
+    /// </summary>
+    public object Data { get; set; }
+    /// <summary>
+    /// An alias for item_ttl
+    /// </summary>
+    public int? Ttl { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the List Item expires
+    /// </summary>
+    public int? ItemTtl { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the List Item's parent Sync List expires
+    /// </summary>
+    public int? CollectionTtl { get; set; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSyncListItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to update </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to update </param>
+    /// <param name="pathIndex"> The index of the Sync List Item resource to update </param>
+    public UpdateSyncListItemOptions(string pathServiceSid, string pathListSid, int? pathIndex)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      PathIndex = pathIndex;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      if (ItemTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ItemTtl", ItemTtl.ToString()));
+      }
+
+      if (CollectionTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListItemResource.cs b/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListItemResource.cs
index bf81857dd..87c2571be 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListItemResource.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListItemResource.cs
@@ -17,608 +17,608 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Sync.V1.Service.SyncList
-{
-
-    public class SyncListItemResource : Resource
-    {
-        public sealed class QueryResultOrderEnum : StringEnum
-        {
-            private QueryResultOrderEnum(string value) : base(value) {}
-            public QueryResultOrderEnum() {}
-            public static implicit operator QueryResultOrderEnum(string value)
-            {
-                return new QueryResultOrderEnum(value);
-            }
-
-            public static readonly QueryResultOrderEnum Asc = new QueryResultOrderEnum("asc");
-            public static readonly QueryResultOrderEnum Desc = new QueryResultOrderEnum("desc");
-        }
-
-        public sealed class QueryFromBoundTypeEnum : StringEnum
-        {
-            private QueryFromBoundTypeEnum(string value) : base(value) {}
-            public QueryFromBoundTypeEnum() {}
-            public static implicit operator QueryFromBoundTypeEnum(string value)
-            {
-                return new QueryFromBoundTypeEnum(value);
-            }
-
-            public static readonly QueryFromBoundTypeEnum Inclusive = new QueryFromBoundTypeEnum("inclusive");
-            public static readonly QueryFromBoundTypeEnum Exclusive = new QueryFromBoundTypeEnum("exclusive");
-        }
-
-        private static Request BuildFetchRequest(FetchSyncListItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items/" + options.PathIndex + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static SyncListItemResource Fetch(FetchSyncListItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<SyncListItemResource> FetchAsync(FetchSyncListItemOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to fetch </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to fetch </param>
-        /// <param name="pathIndex"> The index of the Sync List Item resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static SyncListItemResource Fetch(string pathServiceSid,
-                                                 string pathListSid,
-                                                 int? pathIndex,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncListItemOptions(pathServiceSid, pathListSid, pathIndex);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to fetch </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to fetch </param>
-        /// <param name="pathIndex"> The index of the Sync List Item resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<SyncListItemResource> FetchAsync(string pathServiceSid,
-                                                                                         string pathListSid,
-                                                                                         int? pathIndex,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncListItemOptions(pathServiceSid, pathListSid, pathIndex);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSyncListItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items/" + options.PathIndex + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static bool Delete(DeleteSyncListItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncListItemOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to delete </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to delete </param>
-        /// <param name="pathIndex"> The index of the Sync List Item resource to delete </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathListSid,
-                                  int? pathIndex,
-                                  string ifMatch = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncListItemOptions(pathServiceSid, pathListSid, pathIndex){IfMatch = ifMatch};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to delete </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to delete </param>
-        /// <param name="pathIndex"> The index of the Sync List Item resource to delete </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathListSid,
-                                                                          int? pathIndex,
-                                                                          string ifMatch = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncListItemOptions(pathServiceSid, pathListSid, pathIndex){IfMatch = ifMatch};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateSyncListItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static SyncListItemResource Create(CreateSyncListItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<SyncListItemResource> CreateAsync(CreateSyncListItemOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the List Item in </param>
-        /// <param name="pathListSid"> The SID of the Sync List to add the new List Item to </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the List Item stores
-        ///            </param>
-        /// <param name="ttl"> An alias for item_ttl </param>
-        /// <param name="itemTtl"> How long, in seconds, before the List Item expires </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the List Item's parent Sync List expires </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static SyncListItemResource Create(string pathServiceSid,
-                                                  string pathListSid,
-                                                  object data,
-                                                  int? ttl = null,
-                                                  int? itemTtl = null,
-                                                  int? collectionTtl = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncListItemOptions(pathServiceSid, pathListSid, data){Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the List Item in </param>
-        /// <param name="pathListSid"> The SID of the Sync List to add the new List Item to </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the List Item stores
-        ///            </param>
-        /// <param name="ttl"> An alias for item_ttl </param>
-        /// <param name="itemTtl"> How long, in seconds, before the List Item expires </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the List Item's parent Sync List expires </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<SyncListItemResource> CreateAsync(string pathServiceSid,
-                                                                                          string pathListSid,
-                                                                                          object data,
-                                                                                          int? ttl = null,
-                                                                                          int? itemTtl = null,
-                                                                                          int? collectionTtl = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncListItemOptions(pathServiceSid, pathListSid, data){Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSyncListItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static ResourceSet<SyncListItemResource> Read(ReadSyncListItemOptions options,
-                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SyncListItemResource>.FromJson("items", response.Content);
-            return new ResourceSet<SyncListItemResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncListItemResource>> ReadAsync(ReadSyncListItemOptions options,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SyncListItemResource>.FromJson("items", response.Content);
-            return new ResourceSet<SyncListItemResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the List Item resources to read </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the List Items to read </param>
-        /// <param name="order"> The order to return the List Items </param>
-        /// <param name="from"> The index of the first Sync List Item resource to read </param>
-        /// <param name="bounds"> Whether to include the List Item referenced by the from parameter </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static ResourceSet<SyncListItemResource> Read(string pathServiceSid,
-                                                             string pathListSid,
-                                                             SyncListItemResource.QueryResultOrderEnum order = null,
-                                                             string from = null,
-                                                             SyncListItemResource.QueryFromBoundTypeEnum bounds = null,
-                                                             int? pageSize = null,
-                                                             long? limit = null,
-                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncListItemOptions(pathServiceSid, pathListSid){Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the List Item resources to read </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the List Items to read </param>
-        /// <param name="order"> The order to return the List Items </param>
-        /// <param name="from"> The index of the first Sync List Item resource to read </param>
-        /// <param name="bounds"> Whether to include the List Item referenced by the from parameter </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncListItemResource>> ReadAsync(string pathServiceSid,
-                                                                                                     string pathListSid,
-                                                                                                     SyncListItemResource.QueryResultOrderEnum order = null,
-                                                                                                     string from = null,
-                                                                                                     SyncListItemResource.QueryFromBoundTypeEnum bounds = null,
-                                                                                                     int? pageSize = null,
-                                                                                                     long? limit = null,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncListItemOptions(pathServiceSid, pathListSid){Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SyncListItemResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListItemResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SyncListItemResource> NextPage(Page<SyncListItemResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListItemResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SyncListItemResource> PreviousPage(Page<SyncListItemResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListItemResource>.FromJson("items", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateSyncListItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items/" + options.PathIndex + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static SyncListItemResource Update(UpdateSyncListItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SyncListItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<SyncListItemResource> UpdateAsync(UpdateSyncListItemOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to update </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to update </param>
-        /// <param name="pathIndex"> The index of the Sync List Item resource to update </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the List Item stores
-        ///            </param>
-        /// <param name="ttl"> An alias for item_ttl </param>
-        /// <param name="itemTtl"> How long, in seconds, before the List Item expires </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the List Item's parent Sync List expires </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListItem </returns>
-        public static SyncListItemResource Update(string pathServiceSid,
-                                                  string pathListSid,
-                                                  int? pathIndex,
-                                                  object data = null,
-                                                  int? ttl = null,
-                                                  int? itemTtl = null,
-                                                  int? collectionTtl = null,
-                                                  string ifMatch = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncListItemOptions(pathServiceSid, pathListSid, pathIndex){Data = data, Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl, IfMatch = ifMatch};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to update </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to update </param>
-        /// <param name="pathIndex"> The index of the Sync List Item resource to update </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the List Item stores
-        ///            </param>
-        /// <param name="ttl"> An alias for item_ttl </param>
-        /// <param name="itemTtl"> How long, in seconds, before the List Item expires </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the List Item's parent Sync List expires </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListItem </returns>
-        public static async System.Threading.Tasks.Task<SyncListItemResource> UpdateAsync(string pathServiceSid,
-                                                                                          string pathListSid,
-                                                                                          int? pathIndex,
-                                                                                          object data = null,
-                                                                                          int? ttl = null,
-                                                                                          int? itemTtl = null,
-                                                                                          int? collectionTtl = null,
-                                                                                          string ifMatch = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncListItemOptions(pathServiceSid, pathListSid, pathIndex){Data = data, Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl, IfMatch = ifMatch};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SyncListItemResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SyncListItemResource object represented by the provided JSON </returns>
-        public static SyncListItemResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SyncListItemResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The automatically generated index of the List Item
-        /// </summary>
-        [JsonProperty("index")]
-        public int? Index { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Sync Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Sync List that contains the List Item
-        /// </summary>
-        [JsonProperty("list_sid")]
-        public string ListSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the List Item resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The current revision of the item, represented as a string
-        /// </summary>
-        [JsonProperty("revision")]
-        public string Revision { get; private set; }
-        /// <summary>
-        /// An arbitrary, schema-less object that the List Item stores
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the List Item expires
-        /// </summary>
-        [JsonProperty("date_expires")]
-        public DateTime? DateExpires { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The identity of the List Item's creator
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-
-        private SyncListItemResource()
-        {
-
-        }
-    }
+{
+
+  public class SyncListItemResource : Resource
+  {
+    public sealed class QueryResultOrderEnum : StringEnum
+    {
+      private QueryResultOrderEnum(string value) : base(value) { }
+      public QueryResultOrderEnum() { }
+      public static implicit operator QueryResultOrderEnum(string value)
+      {
+        return new QueryResultOrderEnum(value);
+      }
+
+      public static readonly QueryResultOrderEnum Asc = new QueryResultOrderEnum("asc");
+      public static readonly QueryResultOrderEnum Desc = new QueryResultOrderEnum("desc");
+    }
+
+    public sealed class QueryFromBoundTypeEnum : StringEnum
+    {
+      private QueryFromBoundTypeEnum(string value) : base(value) { }
+      public QueryFromBoundTypeEnum() { }
+      public static implicit operator QueryFromBoundTypeEnum(string value)
+      {
+        return new QueryFromBoundTypeEnum(value);
+      }
+
+      public static readonly QueryFromBoundTypeEnum Inclusive = new QueryFromBoundTypeEnum("inclusive");
+      public static readonly QueryFromBoundTypeEnum Exclusive = new QueryFromBoundTypeEnum("exclusive");
+    }
+
+    private static Request BuildFetchRequest(FetchSyncListItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items/" + options.PathIndex + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static SyncListItemResource Fetch(FetchSyncListItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<SyncListItemResource> FetchAsync(FetchSyncListItemOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to fetch </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to fetch </param>
+    /// <param name="pathIndex"> The index of the Sync List Item resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static SyncListItemResource Fetch(string pathServiceSid,
+                                             string pathListSid,
+                                             int? pathIndex,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncListItemOptions(pathServiceSid, pathListSid, pathIndex);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to fetch </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to fetch </param>
+    /// <param name="pathIndex"> The index of the Sync List Item resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<SyncListItemResource> FetchAsync(string pathServiceSid,
+                                                                                     string pathListSid,
+                                                                                     int? pathIndex,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncListItemOptions(pathServiceSid, pathListSid, pathIndex);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSyncListItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items/" + options.PathIndex + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static bool Delete(DeleteSyncListItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncListItemOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to delete </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to delete </param>
+    /// <param name="pathIndex"> The index of the Sync List Item resource to delete </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathListSid,
+                              int? pathIndex,
+                              string ifMatch = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncListItemOptions(pathServiceSid, pathListSid, pathIndex) { IfMatch = ifMatch };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to delete </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to delete </param>
+    /// <param name="pathIndex"> The index of the Sync List Item resource to delete </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathListSid,
+                                                                      int? pathIndex,
+                                                                      string ifMatch = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncListItemOptions(pathServiceSid, pathListSid, pathIndex) { IfMatch = ifMatch };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateSyncListItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static SyncListItemResource Create(CreateSyncListItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<SyncListItemResource> CreateAsync(CreateSyncListItemOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the List Item in </param>
+    /// <param name="pathListSid"> The SID of the Sync List to add the new List Item to </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the List Item stores
+    ///            </param>
+    /// <param name="ttl"> An alias for item_ttl </param>
+    /// <param name="itemTtl"> How long, in seconds, before the List Item expires </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the List Item's parent Sync List expires </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static SyncListItemResource Create(string pathServiceSid,
+                                              string pathListSid,
+                                              object data,
+                                              int? ttl = null,
+                                              int? itemTtl = null,
+                                              int? collectionTtl = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncListItemOptions(pathServiceSid, pathListSid, data) { Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the List Item in </param>
+    /// <param name="pathListSid"> The SID of the Sync List to add the new List Item to </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the List Item stores
+    ///            </param>
+    /// <param name="ttl"> An alias for item_ttl </param>
+    /// <param name="itemTtl"> How long, in seconds, before the List Item expires </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the List Item's parent Sync List expires </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<SyncListItemResource> CreateAsync(string pathServiceSid,
+                                                                                      string pathListSid,
+                                                                                      object data,
+                                                                                      int? ttl = null,
+                                                                                      int? itemTtl = null,
+                                                                                      int? collectionTtl = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncListItemOptions(pathServiceSid, pathListSid, data) { Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSyncListItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static ResourceSet<SyncListItemResource> Read(ReadSyncListItemOptions options,
+                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SyncListItemResource>.FromJson("items", response.Content);
+      return new ResourceSet<SyncListItemResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncListItemResource>> ReadAsync(ReadSyncListItemOptions options,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SyncListItemResource>.FromJson("items", response.Content);
+      return new ResourceSet<SyncListItemResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the List Item resources to read </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the List Items to read </param>
+    /// <param name="order"> The order to return the List Items </param>
+    /// <param name="from"> The index of the first Sync List Item resource to read </param>
+    /// <param name="bounds"> Whether to include the List Item referenced by the from parameter </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static ResourceSet<SyncListItemResource> Read(string pathServiceSid,
+                                                         string pathListSid,
+                                                         SyncListItemResource.QueryResultOrderEnum order = null,
+                                                         string from = null,
+                                                         SyncListItemResource.QueryFromBoundTypeEnum bounds = null,
+                                                         int? pageSize = null,
+                                                         long? limit = null,
+                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncListItemOptions(pathServiceSid, pathListSid) { Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the List Item resources to read </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the List Items to read </param>
+    /// <param name="order"> The order to return the List Items </param>
+    /// <param name="from"> The index of the first Sync List Item resource to read </param>
+    /// <param name="bounds"> Whether to include the List Item referenced by the from parameter </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncListItemResource>> ReadAsync(string pathServiceSid,
+                                                                                                 string pathListSid,
+                                                                                                 SyncListItemResource.QueryResultOrderEnum order = null,
+                                                                                                 string from = null,
+                                                                                                 SyncListItemResource.QueryFromBoundTypeEnum bounds = null,
+                                                                                                 int? pageSize = null,
+                                                                                                 long? limit = null,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncListItemOptions(pathServiceSid, pathListSid) { Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SyncListItemResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListItemResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SyncListItemResource> NextPage(Page<SyncListItemResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListItemResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SyncListItemResource> PreviousPage(Page<SyncListItemResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListItemResource>.FromJson("items", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateSyncListItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Items/" + options.PathIndex + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static SyncListItemResource Update(UpdateSyncListItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SyncListItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<SyncListItemResource> UpdateAsync(UpdateSyncListItemOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to update </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to update </param>
+    /// <param name="pathIndex"> The index of the Sync List Item resource to update </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the List Item stores
+    ///            </param>
+    /// <param name="ttl"> An alias for item_ttl </param>
+    /// <param name="itemTtl"> How long, in seconds, before the List Item expires </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the List Item's parent Sync List expires </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListItem </returns>
+    public static SyncListItemResource Update(string pathServiceSid,
+                                              string pathListSid,
+                                              int? pathIndex,
+                                              object data = null,
+                                              int? ttl = null,
+                                              int? itemTtl = null,
+                                              int? collectionTtl = null,
+                                              string ifMatch = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncListItemOptions(pathServiceSid, pathListSid, pathIndex) { Data = data, Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl, IfMatch = ifMatch };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Item resource to update </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Item resource to update </param>
+    /// <param name="pathIndex"> The index of the Sync List Item resource to update </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the List Item stores
+    ///            </param>
+    /// <param name="ttl"> An alias for item_ttl </param>
+    /// <param name="itemTtl"> How long, in seconds, before the List Item expires </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the List Item's parent Sync List expires </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListItem </returns>
+    public static async System.Threading.Tasks.Task<SyncListItemResource> UpdateAsync(string pathServiceSid,
+                                                                                      string pathListSid,
+                                                                                      int? pathIndex,
+                                                                                      object data = null,
+                                                                                      int? ttl = null,
+                                                                                      int? itemTtl = null,
+                                                                                      int? collectionTtl = null,
+                                                                                      string ifMatch = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncListItemOptions(pathServiceSid, pathListSid, pathIndex) { Data = data, Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl, IfMatch = ifMatch };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SyncListItemResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SyncListItemResource object represented by the provided JSON </returns>
+    public static SyncListItemResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SyncListItemResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The automatically generated index of the List Item
+    /// </summary>
+    [JsonProperty("index")]
+    public int? Index { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Sync Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Sync List that contains the List Item
+    /// </summary>
+    [JsonProperty("list_sid")]
+    public string ListSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the List Item resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The current revision of the item, represented as a string
+    /// </summary>
+    [JsonProperty("revision")]
+    public string Revision { get; private set; }
+    /// <summary>
+    /// An arbitrary, schema-less object that the List Item stores
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the List Item expires
+    /// </summary>
+    [JsonProperty("date_expires")]
+    public DateTime? DateExpires { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The identity of the List Item's creator
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+
+    private SyncListItemResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListPermissionOptions.cs b/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListPermissionOptions.cs
index 31c4511fe..c7101bb0f 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListPermissionOptions.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListPermissionOptions.cs
@@ -9,210 +9,210 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Sync.V1.Service.SyncList
-{
-
+{
+
+  /// <summary>
+  /// Fetch a specific Sync List Permission.
+  /// </summary>
+  public class FetchSyncListPermissionOptions : IOptions<SyncListPermissionResource>
+  {
     /// <summary>
-    /// Fetch a specific Sync List Permission.
-    /// </summary>
-    public class FetchSyncListPermissionOptions : IOptions<SyncListPermissionResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync List Permission resource to fetch
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync List with the Sync List Permission resource to fetch
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// The application-defined string that uniquely identifies the User's Sync List Permission resource to fetch
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new FetchSyncListPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to fetch </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to fetch </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
-        ///                    resource to fetch </param>
-        public FetchSyncListPermissionOptions(string pathServiceSid, string pathListSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync Service with the Sync List Permission resource to fetch
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// Delete a specific Sync List Permission.
-    /// </summary>
-    public class DeleteSyncListPermissionOptions : IOptions<SyncListPermissionResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync List Permission resource to delete
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync List with the Sync List Permission resource to delete
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// The application-defined string that uniquely identifies the User's Sync List Permission resource to delete
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSyncListPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to delete </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to delete </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
-        ///                    resource to delete </param>
-        public DeleteSyncListPermissionOptions(string pathServiceSid, string pathListSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync List with the Sync List Permission resource to fetch
+    /// </summary>
+    public string PathListSid { get; }
     /// <summary>
-    /// Retrieve a list of all Permissions applying to a Sync List.
-    /// </summary>
-    public class ReadSyncListPermissionOptions : ReadOptions<SyncListPermissionResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync List Permission resources to read
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync List with the Sync List Permission resources to read
-        /// </summary>
-        public string PathListSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadSyncListPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resources to read </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resources to read </param>
-        public ReadSyncListPermissionOptions(string pathServiceSid, string pathListSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The application-defined string that uniquely identifies the User's Sync List Permission resource to fetch
+    /// </summary>
+    public string PathIdentity { get; }
+
     /// <summary>
-    /// Update an identity's access to a specific Sync List.
-    /// </summary>
-    public class UpdateSyncListPermissionOptions : IOptions<SyncListPermissionResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync List Permission resource to update
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync List with the Sync List Permission resource to update
-        /// </summary>
-        public string PathListSid { get; }
-        /// <summary>
-        /// The application-defined string that uniquely identifies the User's Sync List Permission resource to update
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// Read access
-        /// </summary>
-        public bool? Read { get; }
-        /// <summary>
-        /// Write access
-        /// </summary>
-        public bool? Write { get; }
-        /// <summary>
-        /// Manage access
-        /// </summary>
-        public bool? Manage { get; }
-
-        /// <summary>
-        /// Construct a new UpdateSyncListPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to update </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to update </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
-        ///                    resource to update </param>
-        /// <param name="read"> Read access </param>
-        /// <param name="write"> Write access </param>
-        /// <param name="manage"> Manage access </param>
-        public UpdateSyncListPermissionOptions(string pathServiceSid,
-                                               string pathListSid,
-                                               string pathIdentity,
-                                               bool? read,
-                                               bool? write,
-                                               bool? manage)
-        {
-            PathServiceSid = pathServiceSid;
-            PathListSid = pathListSid;
-            PathIdentity = pathIdentity;
-            Read = read;
-            Write = write;
-            Manage = manage;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Read != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Read", Read.Value.ToString().ToLower()));
-            }
-
-            if (Write != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Write", Write.Value.ToString().ToLower()));
-            }
-
-            if (Manage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Manage", Manage.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new FetchSyncListPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to fetch </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to fetch </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
+    ///                    resource to fetch </param>
+    public FetchSyncListPermissionOptions(string pathServiceSid, string pathListSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Sync List Permission.
+  /// </summary>
+  public class DeleteSyncListPermissionOptions : IOptions<SyncListPermissionResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync List Permission resource to delete
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync List with the Sync List Permission resource to delete
+    /// </summary>
+    public string PathListSid { get; }
+    /// <summary>
+    /// The application-defined string that uniquely identifies the User's Sync List Permission resource to delete
+    /// </summary>
+    public string PathIdentity { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSyncListPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to delete </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to delete </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
+    ///                    resource to delete </param>
+    public DeleteSyncListPermissionOptions(string pathServiceSid, string pathListSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Permissions applying to a Sync List.
+  /// </summary>
+  public class ReadSyncListPermissionOptions : ReadOptions<SyncListPermissionResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync List Permission resources to read
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync List with the Sync List Permission resources to read
+    /// </summary>
+    public string PathListSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadSyncListPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resources to read </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resources to read </param>
+    public ReadSyncListPermissionOptions(string pathServiceSid, string pathListSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an identity's access to a specific Sync List.
+  /// </summary>
+  public class UpdateSyncListPermissionOptions : IOptions<SyncListPermissionResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync List Permission resource to update
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync List with the Sync List Permission resource to update
+    /// </summary>
+    public string PathListSid { get; }
+    /// <summary>
+    /// The application-defined string that uniquely identifies the User's Sync List Permission resource to update
+    /// </summary>
+    public string PathIdentity { get; }
+    /// <summary>
+    /// Read access
+    /// </summary>
+    public bool? Read { get; }
+    /// <summary>
+    /// Write access
+    /// </summary>
+    public bool? Write { get; }
+    /// <summary>
+    /// Manage access
+    /// </summary>
+    public bool? Manage { get; }
+
+    /// <summary>
+    /// Construct a new UpdateSyncListPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to update </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to update </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
+    ///                    resource to update </param>
+    /// <param name="read"> Read access </param>
+    /// <param name="write"> Write access </param>
+    /// <param name="manage"> Manage access </param>
+    public UpdateSyncListPermissionOptions(string pathServiceSid,
+                                           string pathListSid,
+                                           string pathIdentity,
+                                           bool? read,
+                                           bool? write,
+                                           bool? manage)
+    {
+      PathServiceSid = pathServiceSid;
+      PathListSid = pathListSid;
+      PathIdentity = pathIdentity;
+      Read = read;
+      Write = write;
+      Manage = manage;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Read != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Read", Read.Value.ToString().ToLower()));
+      }
+
+      if (Write != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Write", Write.Value.ToString().ToLower()));
+      }
+
+      if (Manage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Manage", Manage.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListPermissionResource.cs b/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListPermissionResource.cs
index 312491fe6..40c240af2 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListPermissionResource.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncList/SyncListPermissionResource.cs
@@ -16,461 +16,461 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Sync.V1.Service.SyncList
-{
-
-    public class SyncListPermissionResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSyncListPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Sync List Permission.
-        /// </summary>
-        /// <param name="options"> Fetch SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static SyncListPermissionResource Fetch(FetchSyncListPermissionOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sync List Permission.
-        /// </summary>
-        /// <param name="options"> Fetch SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncListPermissionResource> FetchAsync(FetchSyncListPermissionOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Sync List Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to fetch </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to fetch </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
-        ///                    resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static SyncListPermissionResource Fetch(string pathServiceSid,
-                                                       string pathListSid,
-                                                       string pathIdentity,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sync List Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to fetch </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to fetch </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
-        ///                    resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncListPermissionResource> FetchAsync(string pathServiceSid,
-                                                                                               string pathListSid,
-                                                                                               string pathIdentity,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSyncListPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Sync List Permission.
-        /// </summary>
-        /// <param name="options"> Delete SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static bool Delete(DeleteSyncListPermissionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sync List Permission.
-        /// </summary>
-        /// <param name="options"> Delete SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncListPermissionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Sync List Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to delete </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to delete </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
-        ///                    resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathListSid,
-                                  string pathIdentity,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sync List Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to delete </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to delete </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
-        ///                    resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathListSid,
-                                                                          string pathIdentity,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSyncListPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync List.
-        /// </summary>
-        /// <param name="options"> Read SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static ResourceSet<SyncListPermissionResource> Read(ReadSyncListPermissionOptions options,
-                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
-            return new ResourceSet<SyncListPermissionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync List.
-        /// </summary>
-        /// <param name="options"> Read SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncListPermissionResource>> ReadAsync(ReadSyncListPermissionOptions options,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
-            return new ResourceSet<SyncListPermissionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync List.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resources to read </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static ResourceSet<SyncListPermissionResource> Read(string pathServiceSid,
-                                                                   string pathListSid,
-                                                                   int? pageSize = null,
-                                                                   long? limit = null,
-                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncListPermissionOptions(pathServiceSid, pathListSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync List.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resources to read </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncListPermissionResource>> ReadAsync(string pathServiceSid,
-                                                                                                           string pathListSid,
-                                                                                                           int? pageSize = null,
-                                                                                                           long? limit = null,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncListPermissionOptions(pathServiceSid, pathListSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SyncListPermissionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SyncListPermissionResource> NextPage(Page<SyncListPermissionResource> page,
-                                                                ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SyncListPermissionResource> PreviousPage(Page<SyncListPermissionResource> page,
-                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateSyncListPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions/" + options.PathIdentity + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an identity's access to a specific Sync List.
-        /// </summary>
-        /// <param name="options"> Update SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static SyncListPermissionResource Update(UpdateSyncListPermissionOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an identity's access to a specific Sync List.
-        /// </summary>
-        /// <param name="options"> Update SyncListPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncListPermissionResource> UpdateAsync(UpdateSyncListPermissionOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an identity's access to a specific Sync List.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to update </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to update </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
-        ///                    resource to update </param>
-        /// <param name="read"> Read access </param>
-        /// <param name="write"> Write access </param>
-        /// <param name="manage"> Manage access </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncListPermission </returns>
-        public static SyncListPermissionResource Update(string pathServiceSid,
-                                                        string pathListSid,
-                                                        string pathIdentity,
-                                                        bool? read,
-                                                        bool? write,
-                                                        bool? manage,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity, read, write, manage);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an identity's access to a specific Sync List.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to update </param>
-        /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to update </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
-        ///                    resource to update </param>
-        /// <param name="read"> Read access </param>
-        /// <param name="write"> Write access </param>
-        /// <param name="manage"> Manage access </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncListPermissionResource> UpdateAsync(string pathServiceSid,
-                                                                                                string pathListSid,
-                                                                                                string pathIdentity,
-                                                                                                bool? read,
-                                                                                                bool? write,
-                                                                                                bool? manage,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity, read, write, manage);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SyncListPermissionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SyncListPermissionResource object represented by the provided JSON </returns>
-        public static SyncListPermissionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SyncListPermissionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Sync Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Sync List to which the Permission applies
-        /// </summary>
-        [JsonProperty("list_sid")]
-        public string ListSid { get; private set; }
-        /// <summary>
-        /// The identity of the user to whom the Sync List Permission applies
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// Read access
-        /// </summary>
-        [JsonProperty("read")]
-        public bool? _Read { get; private set; }
-        /// <summary>
-        /// Write access
-        /// </summary>
-        [JsonProperty("write")]
-        public bool? Write { get; private set; }
-        /// <summary>
-        /// Manage access
-        /// </summary>
-        [JsonProperty("manage")]
-        public bool? Manage { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Sync List Permission resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SyncListPermissionResource()
-        {
-
-        }
-    }
+{
+
+  public class SyncListPermissionResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSyncListPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Sync List Permission.
+    /// </summary>
+    /// <param name="options"> Fetch SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static SyncListPermissionResource Fetch(FetchSyncListPermissionOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sync List Permission.
+    /// </summary>
+    /// <param name="options"> Fetch SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncListPermissionResource> FetchAsync(FetchSyncListPermissionOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Sync List Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to fetch </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to fetch </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
+    ///                    resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static SyncListPermissionResource Fetch(string pathServiceSid,
+                                                   string pathListSid,
+                                                   string pathIdentity,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sync List Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to fetch </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to fetch </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
+    ///                    resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncListPermissionResource> FetchAsync(string pathServiceSid,
+                                                                                           string pathListSid,
+                                                                                           string pathIdentity,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSyncListPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Sync List Permission.
+    /// </summary>
+    /// <param name="options"> Delete SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static bool Delete(DeleteSyncListPermissionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sync List Permission.
+    /// </summary>
+    /// <param name="options"> Delete SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncListPermissionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Sync List Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to delete </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to delete </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
+    ///                    resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathListSid,
+                              string pathIdentity,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sync List Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to delete </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to delete </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
+    ///                    resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathListSid,
+                                                                      string pathIdentity,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSyncListPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync List.
+    /// </summary>
+    /// <param name="options"> Read SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static ResourceSet<SyncListPermissionResource> Read(ReadSyncListPermissionOptions options,
+                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
+      return new ResourceSet<SyncListPermissionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync List.
+    /// </summary>
+    /// <param name="options"> Read SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncListPermissionResource>> ReadAsync(ReadSyncListPermissionOptions options,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
+      return new ResourceSet<SyncListPermissionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync List.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resources to read </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static ResourceSet<SyncListPermissionResource> Read(string pathServiceSid,
+                                                               string pathListSid,
+                                                               int? pageSize = null,
+                                                               long? limit = null,
+                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncListPermissionOptions(pathServiceSid, pathListSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync List.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resources to read </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncListPermissionResource>> ReadAsync(string pathServiceSid,
+                                                                                                       string pathListSid,
+                                                                                                       int? pageSize = null,
+                                                                                                       long? limit = null,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncListPermissionOptions(pathServiceSid, pathListSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SyncListPermissionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SyncListPermissionResource> NextPage(Page<SyncListPermissionResource> page,
+                                                            ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SyncListPermissionResource> PreviousPage(Page<SyncListPermissionResource> page,
+                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateSyncListPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathListSid + "/Permissions/" + options.PathIdentity + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an identity's access to a specific Sync List.
+    /// </summary>
+    /// <param name="options"> Update SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static SyncListPermissionResource Update(UpdateSyncListPermissionOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an identity's access to a specific Sync List.
+    /// </summary>
+    /// <param name="options"> Update SyncListPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncListPermissionResource> UpdateAsync(UpdateSyncListPermissionOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an identity's access to a specific Sync List.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to update </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to update </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
+    ///                    resource to update </param>
+    /// <param name="read"> Read access </param>
+    /// <param name="write"> Write access </param>
+    /// <param name="manage"> Manage access </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncListPermission </returns>
+    public static SyncListPermissionResource Update(string pathServiceSid,
+                                                    string pathListSid,
+                                                    string pathIdentity,
+                                                    bool? read,
+                                                    bool? write,
+                                                    bool? manage,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity, read, write, manage);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an identity's access to a specific Sync List.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List Permission resource to update </param>
+    /// <param name="pathListSid"> The SID of the Sync List with the Sync List Permission resource to update </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync List Permission
+    ///                    resource to update </param>
+    /// <param name="read"> Read access </param>
+    /// <param name="write"> Write access </param>
+    /// <param name="manage"> Manage access </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncListPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncListPermissionResource> UpdateAsync(string pathServiceSid,
+                                                                                            string pathListSid,
+                                                                                            string pathIdentity,
+                                                                                            bool? read,
+                                                                                            bool? write,
+                                                                                            bool? manage,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncListPermissionOptions(pathServiceSid, pathListSid, pathIdentity, read, write, manage);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SyncListPermissionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SyncListPermissionResource object represented by the provided JSON </returns>
+    public static SyncListPermissionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SyncListPermissionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Sync Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Sync List to which the Permission applies
+    /// </summary>
+    [JsonProperty("list_sid")]
+    public string ListSid { get; private set; }
+    /// <summary>
+    /// The identity of the user to whom the Sync List Permission applies
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// Read access
+    /// </summary>
+    [JsonProperty("read")]
+    public bool? _Read { get; private set; }
+    /// <summary>
+    /// Write access
+    /// </summary>
+    [JsonProperty("write")]
+    public bool? Write { get; private set; }
+    /// <summary>
+    /// Manage access
+    /// </summary>
+    [JsonProperty("manage")]
+    public bool? Manage { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Sync List Permission resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SyncListPermissionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncListOptions.cs b/src/Twilio/Rest/Sync/V1/Service/SyncListOptions.cs
index 29ff4fe43..1dc371483 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncListOptions.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncListOptions.cs
@@ -9,219 +9,219 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Sync.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchSyncListOptions
+  /// </summary>
+  public class FetchSyncListOptions : IOptions<SyncListResource>
+  {
     /// <summary>
-    /// FetchSyncListOptions
-    /// </summary>
-    public class FetchSyncListOptions : IOptions<SyncListResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync List resource to fetch
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync List resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSyncListOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Sync List resource to fetch </param>
-        public FetchSyncListOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync Service with the Sync List resource to fetch
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteSyncListOptions
-    /// </summary>
-    public class DeleteSyncListOptions : IOptions<SyncListResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync List resource to delete
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync List resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSyncListOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to delete </param>
-        /// <param name="pathSid"> The SID of the Sync List resource to delete </param>
-        public DeleteSyncListOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync List resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateSyncListOptions
-    /// </summary>
-    public class CreateSyncListOptions : IOptions<SyncListResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service  to create the new Sync List in
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// Alias for collection_ttl
-        /// </summary>
-        public int? Ttl { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the Sync List expires and is deleted
-        /// </summary>
-        public int? CollectionTtl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSyncListOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service  to create the new Sync List in </param>
-        public CreateSyncListOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            if (CollectionTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchSyncListOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Sync List resource to fetch </param>
+    public FetchSyncListOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// UpdateSyncListOptions
-    /// </summary>
-    public class UpdateSyncListOptions : IOptions<SyncListResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync List resource to update
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync List resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// An alias for collection_ttl
-        /// </summary>
-        public int? Ttl { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the Sync List expires and is deleted
-        /// </summary>
-        public int? CollectionTtl { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSyncListOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to update </param>
-        /// <param name="pathSid"> The SID of the Sync List resource to update </param>
-        public UpdateSyncListOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            if (CollectionTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteSyncListOptions
+  /// </summary>
+  public class DeleteSyncListOptions : IOptions<SyncListResource>
+  {
     /// <summary>
-    /// ReadSyncListOptions
+    /// The SID of the Sync Service with the Sync List resource to delete
     /// </summary>
-    public class ReadSyncListOptions : ReadOptions<SyncListResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync List resources to read
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadSyncListOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resources to read </param>
-        public ReadSyncListOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync List resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSyncListOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to delete </param>
+    /// <param name="pathSid"> The SID of the Sync List resource to delete </param>
+    public DeleteSyncListOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateSyncListOptions
+  /// </summary>
+  public class CreateSyncListOptions : IOptions<SyncListResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service  to create the new Sync List in
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// Alias for collection_ttl
+    /// </summary>
+    public int? Ttl { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the Sync List expires and is deleted
+    /// </summary>
+    public int? CollectionTtl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateSyncListOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service  to create the new Sync List in </param>
+    public CreateSyncListOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      if (CollectionTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateSyncListOptions
+  /// </summary>
+  public class UpdateSyncListOptions : IOptions<SyncListResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync List resource to update
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync List resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// An alias for collection_ttl
+    /// </summary>
+    public int? Ttl { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the Sync List expires and is deleted
+    /// </summary>
+    public int? CollectionTtl { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSyncListOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to update </param>
+    /// <param name="pathSid"> The SID of the Sync List resource to update </param>
+    public UpdateSyncListOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      if (CollectionTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadSyncListOptions
+  /// </summary>
+  public class ReadSyncListOptions : ReadOptions<SyncListResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync List resources to read
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadSyncListOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resources to read </param>
+    public ReadSyncListOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncListResource.cs b/src/Twilio/Rest/Sync/V1/Service/SyncListResource.cs
index 2ab8d3a5f..83571c14d 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncListResource.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncListResource.cs
@@ -16,521 +16,521 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Sync.V1.Service
-{
-
-    public class SyncListResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSyncListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static SyncListResource Fetch(FetchSyncListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<SyncListResource> FetchAsync(FetchSyncListOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Sync List resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static SyncListResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncListOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Sync List resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<SyncListResource> FetchAsync(string pathServiceSid,
-                                                                                     string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncListOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSyncListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static bool Delete(DeleteSyncListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncListOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to delete </param>
-        /// <param name="pathSid"> The SID of the Sync List resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncListOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to delete </param>
-        /// <param name="pathSid"> The SID of the Sync List resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncListOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateSyncListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static SyncListResource Create(CreateSyncListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<SyncListResource> CreateAsync(CreateSyncListOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service  to create the new Sync List in </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="ttl"> Alias for collection_ttl </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the Sync List expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static SyncListResource Create(string pathServiceSid,
-                                              string uniqueName = null,
-                                              int? ttl = null,
-                                              int? collectionTtl = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncListOptions(pathServiceSid){UniqueName = uniqueName, Ttl = ttl, CollectionTtl = collectionTtl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service  to create the new Sync List in </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="ttl"> Alias for collection_ttl </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the Sync List expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<SyncListResource> CreateAsync(string pathServiceSid,
-                                                                                      string uniqueName = null,
-                                                                                      int? ttl = null,
-                                                                                      int? collectionTtl = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncListOptions(pathServiceSid){UniqueName = uniqueName, Ttl = ttl, CollectionTtl = collectionTtl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSyncListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static SyncListResource Update(UpdateSyncListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<SyncListResource> UpdateAsync(UpdateSyncListOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to update </param>
-        /// <param name="pathSid"> The SID of the Sync List resource to update </param>
-        /// <param name="ttl"> An alias for collection_ttl </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the Sync List expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static SyncListResource Update(string pathServiceSid,
-                                              string pathSid,
-                                              int? ttl = null,
-                                              int? collectionTtl = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncListOptions(pathServiceSid, pathSid){Ttl = ttl, CollectionTtl = collectionTtl};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to update </param>
-        /// <param name="pathSid"> The SID of the Sync List resource to update </param>
-        /// <param name="ttl"> An alias for collection_ttl </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the Sync List expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<SyncListResource> UpdateAsync(string pathServiceSid,
-                                                                                      string pathSid,
-                                                                                      int? ttl = null,
-                                                                                      int? collectionTtl = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncListOptions(pathServiceSid, pathSid){Ttl = ttl, CollectionTtl = collectionTtl};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSyncListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Lists",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static ResourceSet<SyncListResource> Read(ReadSyncListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SyncListResource>.FromJson("lists", response.Content);
-            return new ResourceSet<SyncListResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncListResource>> ReadAsync(ReadSyncListOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SyncListResource>.FromJson("lists", response.Content);
-            return new ResourceSet<SyncListResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncList </returns>
-        public static ResourceSet<SyncListResource> Read(string pathServiceSid,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncListOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncList </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncListResource>> ReadAsync(string pathServiceSid,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncListOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SyncListResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListResource>.FromJson("lists", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SyncListResource> NextPage(Page<SyncListResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListResource>.FromJson("lists", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SyncListResource> PreviousPage(Page<SyncListResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncListResource>.FromJson("lists", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a SyncListResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SyncListResource object represented by the provided JSON </returns>
-        public static SyncListResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SyncListResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Sync Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Sync List resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of the Sync List's nested resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The current revision of the Sync List, represented as a string
-        /// </summary>
-        [JsonProperty("revision")]
-        public string Revision { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Sync List expires
-        /// </summary>
-        [JsonProperty("date_expires")]
-        public DateTime? DateExpires { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The identity of the Sync List's creator
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-
-        private SyncListResource()
-        {
-
-        }
-    }
+{
+
+  public class SyncListResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSyncListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static SyncListResource Fetch(FetchSyncListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<SyncListResource> FetchAsync(FetchSyncListOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Sync List resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static SyncListResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncListOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Sync List resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<SyncListResource> FetchAsync(string pathServiceSid,
+                                                                                 string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncListOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSyncListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static bool Delete(DeleteSyncListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncListOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to delete </param>
+    /// <param name="pathSid"> The SID of the Sync List resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncListOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to delete </param>
+    /// <param name="pathSid"> The SID of the Sync List resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncListOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateSyncListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static SyncListResource Create(CreateSyncListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<SyncListResource> CreateAsync(CreateSyncListOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service  to create the new Sync List in </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="ttl"> Alias for collection_ttl </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the Sync List expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static SyncListResource Create(string pathServiceSid,
+                                          string uniqueName = null,
+                                          int? ttl = null,
+                                          int? collectionTtl = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncListOptions(pathServiceSid) { UniqueName = uniqueName, Ttl = ttl, CollectionTtl = collectionTtl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service  to create the new Sync List in </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="ttl"> Alias for collection_ttl </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the Sync List expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<SyncListResource> CreateAsync(string pathServiceSid,
+                                                                                  string uniqueName = null,
+                                                                                  int? ttl = null,
+                                                                                  int? collectionTtl = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncListOptions(pathServiceSid) { UniqueName = uniqueName, Ttl = ttl, CollectionTtl = collectionTtl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSyncListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static SyncListResource Update(UpdateSyncListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<SyncListResource> UpdateAsync(UpdateSyncListOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to update </param>
+    /// <param name="pathSid"> The SID of the Sync List resource to update </param>
+    /// <param name="ttl"> An alias for collection_ttl </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the Sync List expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static SyncListResource Update(string pathServiceSid,
+                                          string pathSid,
+                                          int? ttl = null,
+                                          int? collectionTtl = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncListOptions(pathServiceSid, pathSid) { Ttl = ttl, CollectionTtl = collectionTtl };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resource to update </param>
+    /// <param name="pathSid"> The SID of the Sync List resource to update </param>
+    /// <param name="ttl"> An alias for collection_ttl </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the Sync List expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<SyncListResource> UpdateAsync(string pathServiceSid,
+                                                                                  string pathSid,
+                                                                                  int? ttl = null,
+                                                                                  int? collectionTtl = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncListOptions(pathServiceSid, pathSid) { Ttl = ttl, CollectionTtl = collectionTtl };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSyncListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Lists",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static ResourceSet<SyncListResource> Read(ReadSyncListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SyncListResource>.FromJson("lists", response.Content);
+      return new ResourceSet<SyncListResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncListResource>> ReadAsync(ReadSyncListOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SyncListResource>.FromJson("lists", response.Content);
+      return new ResourceSet<SyncListResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncList </returns>
+    public static ResourceSet<SyncListResource> Read(string pathServiceSid,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncListOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync List resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncList </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncListResource>> ReadAsync(string pathServiceSid,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncListOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SyncListResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListResource>.FromJson("lists", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SyncListResource> NextPage(Page<SyncListResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListResource>.FromJson("lists", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SyncListResource> PreviousPage(Page<SyncListResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncListResource>.FromJson("lists", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a SyncListResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SyncListResource object represented by the provided JSON </returns>
+    public static SyncListResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SyncListResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Sync Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Sync List resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of the Sync List's nested resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The current revision of the Sync List, represented as a string
+    /// </summary>
+    [JsonProperty("revision")]
+    public string Revision { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Sync List expires
+    /// </summary>
+    [JsonProperty("date_expires")]
+    public DateTime? DateExpires { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The identity of the Sync List's creator
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+
+    private SyncListResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapItemOptions.cs b/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapItemOptions.cs
index b029fb5e3..d17dd9905 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapItemOptions.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapItemOptions.cs
@@ -9,352 +9,352 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Sync.V1.Service.SyncMap
-{
-
+{
+
+  /// <summary>
+  /// FetchSyncMapItemOptions
+  /// </summary>
+  public class FetchSyncMapItemOptions : IOptions<SyncMapItemResource>
+  {
     /// <summary>
-    /// FetchSyncMapItemOptions
-    /// </summary>
-    public class FetchSyncMapItemOptions : IOptions<SyncMapItemResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Map Item resource to fetch
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Map with the Sync Map Item resource to fetch
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// The key value of the Sync Map Item resource to fetch
-        /// </summary>
-        public string PathKey { get; }
-
-        /// <summary>
-        /// Construct a new FetchSyncMapItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to fetch </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to fetch </param>
-        /// <param name="pathKey"> The key value of the Sync Map Item resource to fetch </param>
-        public FetchSyncMapItemOptions(string pathServiceSid, string pathMapSid, string pathKey)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            PathKey = pathKey;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync Service with the Sync Map Item resource to fetch
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteSyncMapItemOptions
-    /// </summary>
-    public class DeleteSyncMapItemOptions : IOptions<SyncMapItemResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Map Item resource to delete
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Map with the Sync Map Item resource to delete
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// The key value of the Sync Map Item resource to delete
-        /// </summary>
-        public string PathKey { get; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteSyncMapItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to delete </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to delete </param>
-        /// <param name="pathKey"> The key value of the Sync Map Item resource to delete </param>
-        public DeleteSyncMapItemOptions(string pathServiceSid, string pathMapSid, string pathKey)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            PathKey = pathKey;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Sync Map with the Sync Map Item resource to fetch
+    /// </summary>
+    public string PathMapSid { get; }
     /// <summary>
-    /// CreateSyncMapItemOptions
-    /// </summary>
-    public class CreateSyncMapItemOptions : IOptions<SyncMapItemResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service to create the Map Item in
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Map to add the new Map Item to
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// The unique, user-defined key for the Map Item
-        /// </summary>
-        public string Key { get; }
-        /// <summary>
-        /// A JSON string that represents an arbitrary, schema-less object that the Map Item stores
-        /// </summary>
-        public object Data { get; }
-        /// <summary>
-        /// An alias for item_ttl
-        /// </summary>
-        public int? Ttl { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the Map Item expires
-        /// </summary>
-        public int? ItemTtl { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the Map Item's parent Sync Map expires and is deleted
-        /// </summary>
-        public int? CollectionTtl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSyncMapItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the Map Item in </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map to add the new Map Item to </param>
-        /// <param name="key"> The unique, user-defined key for the Map Item </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Map Item stores </param>
-        public CreateSyncMapItemOptions(string pathServiceSid, string pathMapSid, string key, object data)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            Key = key;
-            Data = data;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Key != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Key", Key));
-            }
-
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            if (ItemTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ItemTtl", ItemTtl.ToString()));
-            }
-
-            if (CollectionTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The key value of the Sync Map Item resource to fetch
+    /// </summary>
+    public string PathKey { get; }
+
     /// <summary>
-    /// ReadSyncMapItemOptions
-    /// </summary>
-    public class ReadSyncMapItemOptions : ReadOptions<SyncMapItemResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Map Item resources to read
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Map with the Sync Map Item resource to fetch
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// How to order the Map Items returned by their key value
-        /// </summary>
-        public SyncMapItemResource.QueryResultOrderEnum Order { get; set; }
-        /// <summary>
-        /// The index of the first Sync Map Item resource to read
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// Whether to include the Map Item referenced by the from parameter
-        /// </summary>
-        public SyncMapItemResource.QueryFromBoundTypeEnum Bounds { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadSyncMapItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Map Item resources to read </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to fetch </param>
-        public ReadSyncMapItemOptions(string pathServiceSid, string pathMapSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Order != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            if (Bounds != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Bounds", Bounds.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchSyncMapItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to fetch </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to fetch </param>
+    /// <param name="pathKey"> The key value of the Sync Map Item resource to fetch </param>
+    public FetchSyncMapItemOptions(string pathServiceSid, string pathMapSid, string pathKey)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      PathKey = pathKey;
+    }
+
     /// <summary>
-    /// UpdateSyncMapItemOptions
-    /// </summary>
-    public class UpdateSyncMapItemOptions : IOptions<SyncMapItemResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Map Item resource to update
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Map with the Sync Map Item resource to update
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// The key value of the Sync Map Item resource to update
-        /// </summary>
-        public string PathKey { get; }
-        /// <summary>
-        /// A JSON string that represents an arbitrary, schema-less object that the Map Item stores
-        /// </summary>
-        public object Data { get; set; }
-        /// <summary>
-        /// An alias for item_ttl
-        /// </summary>
-        public int? Ttl { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the Map Item expires
-        /// </summary>
-        public int? ItemTtl { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the Map Item's parent Sync Map expires and is deleted
-        /// </summary>
-        public int? CollectionTtl { get; set; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSyncMapItemOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to update </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to update </param>
-        /// <param name="pathKey"> The key value of the Sync Map Item resource to update </param>
-        public UpdateSyncMapItemOptions(string pathServiceSid, string pathMapSid, string pathKey)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            PathKey = pathKey;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            if (ItemTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ItemTtl", ItemTtl.ToString()));
-            }
-
-            if (CollectionTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteSyncMapItemOptions
+  /// </summary>
+  public class DeleteSyncMapItemOptions : IOptions<SyncMapItemResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync Map Item resource to delete
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync Map with the Sync Map Item resource to delete
+    /// </summary>
+    public string PathMapSid { get; }
+    /// <summary>
+    /// The key value of the Sync Map Item resource to delete
+    /// </summary>
+    public string PathKey { get; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteSyncMapItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to delete </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to delete </param>
+    /// <param name="pathKey"> The key value of the Sync Map Item resource to delete </param>
+    public DeleteSyncMapItemOptions(string pathServiceSid, string pathMapSid, string pathKey)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      PathKey = pathKey;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateSyncMapItemOptions
+  /// </summary>
+  public class CreateSyncMapItemOptions : IOptions<SyncMapItemResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service to create the Map Item in
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync Map to add the new Map Item to
+    /// </summary>
+    public string PathMapSid { get; }
+    /// <summary>
+    /// The unique, user-defined key for the Map Item
+    /// </summary>
+    public string Key { get; }
+    /// <summary>
+    /// A JSON string that represents an arbitrary, schema-less object that the Map Item stores
+    /// </summary>
+    public object Data { get; }
+    /// <summary>
+    /// An alias for item_ttl
+    /// </summary>
+    public int? Ttl { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the Map Item expires
+    /// </summary>
+    public int? ItemTtl { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the Map Item's parent Sync Map expires and is deleted
+    /// </summary>
+    public int? CollectionTtl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateSyncMapItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the Map Item in </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map to add the new Map Item to </param>
+    /// <param name="key"> The unique, user-defined key for the Map Item </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Map Item stores </param>
+    public CreateSyncMapItemOptions(string pathServiceSid, string pathMapSid, string key, object data)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      Key = key;
+      Data = data;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Key != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Key", Key));
+      }
+
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      if (ItemTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ItemTtl", ItemTtl.ToString()));
+      }
+
+      if (CollectionTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadSyncMapItemOptions
+  /// </summary>
+  public class ReadSyncMapItemOptions : ReadOptions<SyncMapItemResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Map Item resources to read
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync Map with the Sync Map Item resource to fetch
+    /// </summary>
+    public string PathMapSid { get; }
+    /// <summary>
+    /// How to order the Map Items returned by their key value
+    /// </summary>
+    public SyncMapItemResource.QueryResultOrderEnum Order { get; set; }
+    /// <summary>
+    /// The index of the first Sync Map Item resource to read
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// Whether to include the Map Item referenced by the from parameter
+    /// </summary>
+    public SyncMapItemResource.QueryFromBoundTypeEnum Bounds { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadSyncMapItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Map Item resources to read </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to fetch </param>
+    public ReadSyncMapItemOptions(string pathServiceSid, string pathMapSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Order != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      if (Bounds != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Bounds", Bounds.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateSyncMapItemOptions
+  /// </summary>
+  public class UpdateSyncMapItemOptions : IOptions<SyncMapItemResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync Map Item resource to update
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync Map with the Sync Map Item resource to update
+    /// </summary>
+    public string PathMapSid { get; }
+    /// <summary>
+    /// The key value of the Sync Map Item resource to update
+    /// </summary>
+    public string PathKey { get; }
+    /// <summary>
+    /// A JSON string that represents an arbitrary, schema-less object that the Map Item stores
+    /// </summary>
+    public object Data { get; set; }
+    /// <summary>
+    /// An alias for item_ttl
+    /// </summary>
+    public int? Ttl { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the Map Item expires
+    /// </summary>
+    public int? ItemTtl { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the Map Item's parent Sync Map expires and is deleted
+    /// </summary>
+    public int? CollectionTtl { get; set; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSyncMapItemOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to update </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to update </param>
+    /// <param name="pathKey"> The key value of the Sync Map Item resource to update </param>
+    public UpdateSyncMapItemOptions(string pathServiceSid, string pathMapSid, string pathKey)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      PathKey = pathKey;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      if (ItemTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ItemTtl", ItemTtl.ToString()));
+      }
+
+      if (CollectionTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapItemResource.cs b/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapItemResource.cs
index 8560834a9..2dea0dc4e 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapItemResource.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapItemResource.cs
@@ -17,611 +17,611 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Sync.V1.Service.SyncMap
-{
-
-    public class SyncMapItemResource : Resource
-    {
-        public sealed class QueryResultOrderEnum : StringEnum
-        {
-            private QueryResultOrderEnum(string value) : base(value) {}
-            public QueryResultOrderEnum() {}
-            public static implicit operator QueryResultOrderEnum(string value)
-            {
-                return new QueryResultOrderEnum(value);
-            }
-
-            public static readonly QueryResultOrderEnum Asc = new QueryResultOrderEnum("asc");
-            public static readonly QueryResultOrderEnum Desc = new QueryResultOrderEnum("desc");
-        }
-
-        public sealed class QueryFromBoundTypeEnum : StringEnum
-        {
-            private QueryFromBoundTypeEnum(string value) : base(value) {}
-            public QueryFromBoundTypeEnum() {}
-            public static implicit operator QueryFromBoundTypeEnum(string value)
-            {
-                return new QueryFromBoundTypeEnum(value);
-            }
-
-            public static readonly QueryFromBoundTypeEnum Inclusive = new QueryFromBoundTypeEnum("inclusive");
-            public static readonly QueryFromBoundTypeEnum Exclusive = new QueryFromBoundTypeEnum("exclusive");
-        }
-
-        private static Request BuildFetchRequest(FetchSyncMapItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items/" + options.PathKey + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static SyncMapItemResource Fetch(FetchSyncMapItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<SyncMapItemResource> FetchAsync(FetchSyncMapItemOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to fetch </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to fetch </param>
-        /// <param name="pathKey"> The key value of the Sync Map Item resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static SyncMapItemResource Fetch(string pathServiceSid,
-                                                string pathMapSid,
-                                                string pathKey,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to fetch </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to fetch </param>
-        /// <param name="pathKey"> The key value of the Sync Map Item resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<SyncMapItemResource> FetchAsync(string pathServiceSid,
-                                                                                        string pathMapSid,
-                                                                                        string pathKey,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSyncMapItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items/" + options.PathKey + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static bool Delete(DeleteSyncMapItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncMapItemOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to delete </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to delete </param>
-        /// <param name="pathKey"> The key value of the Sync Map Item resource to delete </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathMapSid,
-                                  string pathKey,
-                                  string ifMatch = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey){IfMatch = ifMatch};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to delete </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to delete </param>
-        /// <param name="pathKey"> The key value of the Sync Map Item resource to delete </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathMapSid,
-                                                                          string pathKey,
-                                                                          string ifMatch = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey){IfMatch = ifMatch};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateSyncMapItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static SyncMapItemResource Create(CreateSyncMapItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<SyncMapItemResource> CreateAsync(CreateSyncMapItemOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the Map Item in </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map to add the new Map Item to </param>
-        /// <param name="key"> The unique, user-defined key for the Map Item </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Map Item stores </param>
-        /// <param name="ttl"> An alias for item_ttl </param>
-        /// <param name="itemTtl"> How long, in seconds, before the Map Item expires </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the Map Item's parent Sync Map expires and is deleted
-        ///                     </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static SyncMapItemResource Create(string pathServiceSid,
-                                                 string pathMapSid,
-                                                 string key,
-                                                 object data,
-                                                 int? ttl = null,
-                                                 int? itemTtl = null,
-                                                 int? collectionTtl = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncMapItemOptions(pathServiceSid, pathMapSid, key, data){Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the Map Item in </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map to add the new Map Item to </param>
-        /// <param name="key"> The unique, user-defined key for the Map Item </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Map Item stores </param>
-        /// <param name="ttl"> An alias for item_ttl </param>
-        /// <param name="itemTtl"> How long, in seconds, before the Map Item expires </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the Map Item's parent Sync Map expires and is deleted
-        ///                     </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<SyncMapItemResource> CreateAsync(string pathServiceSid,
-                                                                                         string pathMapSid,
-                                                                                         string key,
-                                                                                         object data,
-                                                                                         int? ttl = null,
-                                                                                         int? itemTtl = null,
-                                                                                         int? collectionTtl = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncMapItemOptions(pathServiceSid, pathMapSid, key, data){Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSyncMapItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static ResourceSet<SyncMapItemResource> Read(ReadSyncMapItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SyncMapItemResource>.FromJson("items", response.Content);
-            return new ResourceSet<SyncMapItemResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncMapItemResource>> ReadAsync(ReadSyncMapItemOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SyncMapItemResource>.FromJson("items", response.Content);
-            return new ResourceSet<SyncMapItemResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Map Item resources to read </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to fetch </param>
-        /// <param name="order"> How to order the Map Items returned by their key value </param>
-        /// <param name="from"> The index of the first Sync Map Item resource to read </param>
-        /// <param name="bounds"> Whether to include the Map Item referenced by the from parameter </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static ResourceSet<SyncMapItemResource> Read(string pathServiceSid,
-                                                            string pathMapSid,
-                                                            SyncMapItemResource.QueryResultOrderEnum order = null,
-                                                            string from = null,
-                                                            SyncMapItemResource.QueryFromBoundTypeEnum bounds = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncMapItemOptions(pathServiceSid, pathMapSid){Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Map Item resources to read </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to fetch </param>
-        /// <param name="order"> How to order the Map Items returned by their key value </param>
-        /// <param name="from"> The index of the first Sync Map Item resource to read </param>
-        /// <param name="bounds"> Whether to include the Map Item referenced by the from parameter </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncMapItemResource>> ReadAsync(string pathServiceSid,
-                                                                                                    string pathMapSid,
-                                                                                                    SyncMapItemResource.QueryResultOrderEnum order = null,
-                                                                                                    string from = null,
-                                                                                                    SyncMapItemResource.QueryFromBoundTypeEnum bounds = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncMapItemOptions(pathServiceSid, pathMapSid){Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SyncMapItemResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapItemResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SyncMapItemResource> NextPage(Page<SyncMapItemResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapItemResource>.FromJson("items", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SyncMapItemResource> PreviousPage(Page<SyncMapItemResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapItemResource>.FromJson("items", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateSyncMapItemOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items/" + options.PathKey + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static SyncMapItemResource Update(UpdateSyncMapItemOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SyncMapItem parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<SyncMapItemResource> UpdateAsync(UpdateSyncMapItemOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to update </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to update </param>
-        /// <param name="pathKey"> The key value of the Sync Map Item resource to update </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Map Item stores </param>
-        /// <param name="ttl"> An alias for item_ttl </param>
-        /// <param name="itemTtl"> How long, in seconds, before the Map Item expires </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the Map Item's parent Sync Map expires and is deleted
-        ///                     </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapItem </returns>
-        public static SyncMapItemResource Update(string pathServiceSid,
-                                                 string pathMapSid,
-                                                 string pathKey,
-                                                 object data = null,
-                                                 int? ttl = null,
-                                                 int? itemTtl = null,
-                                                 int? collectionTtl = null,
-                                                 string ifMatch = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey){Data = data, Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl, IfMatch = ifMatch};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to update </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to update </param>
-        /// <param name="pathKey"> The key value of the Sync Map Item resource to update </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Map Item stores </param>
-        /// <param name="ttl"> An alias for item_ttl </param>
-        /// <param name="itemTtl"> How long, in seconds, before the Map Item expires </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the Map Item's parent Sync Map expires and is deleted
-        ///                     </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
-        public static async System.Threading.Tasks.Task<SyncMapItemResource> UpdateAsync(string pathServiceSid,
-                                                                                         string pathMapSid,
-                                                                                         string pathKey,
-                                                                                         object data = null,
-                                                                                         int? ttl = null,
-                                                                                         int? itemTtl = null,
-                                                                                         int? collectionTtl = null,
-                                                                                         string ifMatch = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey){Data = data, Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl, IfMatch = ifMatch};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SyncMapItemResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SyncMapItemResource object represented by the provided JSON </returns>
-        public static SyncMapItemResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SyncMapItemResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique, user-defined key for the Map Item
-        /// </summary>
-        [JsonProperty("key")]
-        public string Key { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Sync Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Sync Map that contains the Map Item
-        /// </summary>
-        [JsonProperty("map_sid")]
-        public string MapSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Map Item resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The current revision of the Map Item, represented as a string
-        /// </summary>
-        [JsonProperty("revision")]
-        public string Revision { get; private set; }
-        /// <summary>
-        /// An arbitrary, schema-less object that the Map Item stores
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Map Item expires
-        /// </summary>
-        [JsonProperty("date_expires")]
-        public DateTime? DateExpires { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The identity of the Map Item's creator
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-
-        private SyncMapItemResource()
-        {
-
-        }
-    }
+{
+
+  public class SyncMapItemResource : Resource
+  {
+    public sealed class QueryResultOrderEnum : StringEnum
+    {
+      private QueryResultOrderEnum(string value) : base(value) { }
+      public QueryResultOrderEnum() { }
+      public static implicit operator QueryResultOrderEnum(string value)
+      {
+        return new QueryResultOrderEnum(value);
+      }
+
+      public static readonly QueryResultOrderEnum Asc = new QueryResultOrderEnum("asc");
+      public static readonly QueryResultOrderEnum Desc = new QueryResultOrderEnum("desc");
+    }
+
+    public sealed class QueryFromBoundTypeEnum : StringEnum
+    {
+      private QueryFromBoundTypeEnum(string value) : base(value) { }
+      public QueryFromBoundTypeEnum() { }
+      public static implicit operator QueryFromBoundTypeEnum(string value)
+      {
+        return new QueryFromBoundTypeEnum(value);
+      }
+
+      public static readonly QueryFromBoundTypeEnum Inclusive = new QueryFromBoundTypeEnum("inclusive");
+      public static readonly QueryFromBoundTypeEnum Exclusive = new QueryFromBoundTypeEnum("exclusive");
+    }
+
+    private static Request BuildFetchRequest(FetchSyncMapItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items/" + options.PathKey + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static SyncMapItemResource Fetch(FetchSyncMapItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<SyncMapItemResource> FetchAsync(FetchSyncMapItemOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to fetch </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to fetch </param>
+    /// <param name="pathKey"> The key value of the Sync Map Item resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static SyncMapItemResource Fetch(string pathServiceSid,
+                                            string pathMapSid,
+                                            string pathKey,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to fetch </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to fetch </param>
+    /// <param name="pathKey"> The key value of the Sync Map Item resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<SyncMapItemResource> FetchAsync(string pathServiceSid,
+                                                                                    string pathMapSid,
+                                                                                    string pathKey,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSyncMapItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items/" + options.PathKey + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static bool Delete(DeleteSyncMapItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncMapItemOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to delete </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to delete </param>
+    /// <param name="pathKey"> The key value of the Sync Map Item resource to delete </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathMapSid,
+                              string pathKey,
+                              string ifMatch = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey) { IfMatch = ifMatch };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to delete </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to delete </param>
+    /// <param name="pathKey"> The key value of the Sync Map Item resource to delete </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathMapSid,
+                                                                      string pathKey,
+                                                                      string ifMatch = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey) { IfMatch = ifMatch };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateSyncMapItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static SyncMapItemResource Create(CreateSyncMapItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<SyncMapItemResource> CreateAsync(CreateSyncMapItemOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the Map Item in </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map to add the new Map Item to </param>
+    /// <param name="key"> The unique, user-defined key for the Map Item </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Map Item stores </param>
+    /// <param name="ttl"> An alias for item_ttl </param>
+    /// <param name="itemTtl"> How long, in seconds, before the Map Item expires </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the Map Item's parent Sync Map expires and is deleted
+    ///                     </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static SyncMapItemResource Create(string pathServiceSid,
+                                             string pathMapSid,
+                                             string key,
+                                             object data,
+                                             int? ttl = null,
+                                             int? itemTtl = null,
+                                             int? collectionTtl = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncMapItemOptions(pathServiceSid, pathMapSid, key, data) { Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the Map Item in </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map to add the new Map Item to </param>
+    /// <param name="key"> The unique, user-defined key for the Map Item </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Map Item stores </param>
+    /// <param name="ttl"> An alias for item_ttl </param>
+    /// <param name="itemTtl"> How long, in seconds, before the Map Item expires </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the Map Item's parent Sync Map expires and is deleted
+    ///                     </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<SyncMapItemResource> CreateAsync(string pathServiceSid,
+                                                                                     string pathMapSid,
+                                                                                     string key,
+                                                                                     object data,
+                                                                                     int? ttl = null,
+                                                                                     int? itemTtl = null,
+                                                                                     int? collectionTtl = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncMapItemOptions(pathServiceSid, pathMapSid, key, data) { Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSyncMapItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static ResourceSet<SyncMapItemResource> Read(ReadSyncMapItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SyncMapItemResource>.FromJson("items", response.Content);
+      return new ResourceSet<SyncMapItemResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncMapItemResource>> ReadAsync(ReadSyncMapItemOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SyncMapItemResource>.FromJson("items", response.Content);
+      return new ResourceSet<SyncMapItemResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Map Item resources to read </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to fetch </param>
+    /// <param name="order"> How to order the Map Items returned by their key value </param>
+    /// <param name="from"> The index of the first Sync Map Item resource to read </param>
+    /// <param name="bounds"> Whether to include the Map Item referenced by the from parameter </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static ResourceSet<SyncMapItemResource> Read(string pathServiceSid,
+                                                        string pathMapSid,
+                                                        SyncMapItemResource.QueryResultOrderEnum order = null,
+                                                        string from = null,
+                                                        SyncMapItemResource.QueryFromBoundTypeEnum bounds = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncMapItemOptions(pathServiceSid, pathMapSid) { Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Map Item resources to read </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to fetch </param>
+    /// <param name="order"> How to order the Map Items returned by their key value </param>
+    /// <param name="from"> The index of the first Sync Map Item resource to read </param>
+    /// <param name="bounds"> Whether to include the Map Item referenced by the from parameter </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncMapItemResource>> ReadAsync(string pathServiceSid,
+                                                                                                string pathMapSid,
+                                                                                                SyncMapItemResource.QueryResultOrderEnum order = null,
+                                                                                                string from = null,
+                                                                                                SyncMapItemResource.QueryFromBoundTypeEnum bounds = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncMapItemOptions(pathServiceSid, pathMapSid) { Order = order, From = from, Bounds = bounds, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SyncMapItemResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapItemResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SyncMapItemResource> NextPage(Page<SyncMapItemResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapItemResource>.FromJson("items", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SyncMapItemResource> PreviousPage(Page<SyncMapItemResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapItemResource>.FromJson("items", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateSyncMapItemOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Items/" + options.PathKey + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static SyncMapItemResource Update(UpdateSyncMapItemOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SyncMapItem parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<SyncMapItemResource> UpdateAsync(UpdateSyncMapItemOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to update </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to update </param>
+    /// <param name="pathKey"> The key value of the Sync Map Item resource to update </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Map Item stores </param>
+    /// <param name="ttl"> An alias for item_ttl </param>
+    /// <param name="itemTtl"> How long, in seconds, before the Map Item expires </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the Map Item's parent Sync Map expires and is deleted
+    ///                     </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapItem </returns>
+    public static SyncMapItemResource Update(string pathServiceSid,
+                                             string pathMapSid,
+                                             string pathKey,
+                                             object data = null,
+                                             int? ttl = null,
+                                             int? itemTtl = null,
+                                             int? collectionTtl = null,
+                                             string ifMatch = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey) { Data = data, Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl, IfMatch = ifMatch };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Item resource to update </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Item resource to update </param>
+    /// <param name="pathKey"> The key value of the Sync Map Item resource to update </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that the Map Item stores </param>
+    /// <param name="ttl"> An alias for item_ttl </param>
+    /// <param name="itemTtl"> How long, in seconds, before the Map Item expires </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the Map Item's parent Sync Map expires and is deleted
+    ///                     </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapItem </returns>
+    public static async System.Threading.Tasks.Task<SyncMapItemResource> UpdateAsync(string pathServiceSid,
+                                                                                     string pathMapSid,
+                                                                                     string pathKey,
+                                                                                     object data = null,
+                                                                                     int? ttl = null,
+                                                                                     int? itemTtl = null,
+                                                                                     int? collectionTtl = null,
+                                                                                     string ifMatch = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncMapItemOptions(pathServiceSid, pathMapSid, pathKey) { Data = data, Ttl = ttl, ItemTtl = itemTtl, CollectionTtl = collectionTtl, IfMatch = ifMatch };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SyncMapItemResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SyncMapItemResource object represented by the provided JSON </returns>
+    public static SyncMapItemResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SyncMapItemResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique, user-defined key for the Map Item
+    /// </summary>
+    [JsonProperty("key")]
+    public string Key { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Sync Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Sync Map that contains the Map Item
+    /// </summary>
+    [JsonProperty("map_sid")]
+    public string MapSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Map Item resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The current revision of the Map Item, represented as a string
+    /// </summary>
+    [JsonProperty("revision")]
+    public string Revision { get; private set; }
+    /// <summary>
+    /// An arbitrary, schema-less object that the Map Item stores
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Map Item expires
+    /// </summary>
+    [JsonProperty("date_expires")]
+    public DateTime? DateExpires { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The identity of the Map Item's creator
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+
+    private SyncMapItemResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapPermissionOptions.cs b/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapPermissionOptions.cs
index 8385d63ac..3c64ef58c 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapPermissionOptions.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapPermissionOptions.cs
@@ -9,210 +9,210 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Sync.V1.Service.SyncMap
-{
-
+{
+
+  /// <summary>
+  /// Fetch a specific Sync Map Permission.
+  /// </summary>
+  public class FetchSyncMapPermissionOptions : IOptions<SyncMapPermissionResource>
+  {
     /// <summary>
-    /// Fetch a specific Sync Map Permission.
-    /// </summary>
-    public class FetchSyncMapPermissionOptions : IOptions<SyncMapPermissionResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Map Permission resource to fetch
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Map with the Sync Map Permission resource to fetch
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// The application-defined string that uniquely identifies the User's Sync Map Permission resource to fetch
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new FetchSyncMapPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to fetch </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to fetch </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
-        ///                    resource to fetch </param>
-        public FetchSyncMapPermissionOptions(string pathServiceSid, string pathMapSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync Service with the Sync Map Permission resource to fetch
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// Delete a specific Sync Map Permission.
-    /// </summary>
-    public class DeleteSyncMapPermissionOptions : IOptions<SyncMapPermissionResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Map Permission resource to delete
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Map with the Sync Map Permission resource to delete
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// The application-defined string that uniquely identifies the User's Sync Map Permission resource to delete
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSyncMapPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to delete </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to delete </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
-        ///                    resource to delete </param>
-        public DeleteSyncMapPermissionOptions(string pathServiceSid, string pathMapSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync Map with the Sync Map Permission resource to fetch
+    /// </summary>
+    public string PathMapSid { get; }
     /// <summary>
-    /// Retrieve a list of all Permissions applying to a Sync Map.
-    /// </summary>
-    public class ReadSyncMapPermissionOptions : ReadOptions<SyncMapPermissionResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Map Permission resources to read
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Map with the Permission resources to read
-        /// </summary>
-        public string PathMapSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadSyncMapPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resources to read </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Permission resources to read </param>
-        public ReadSyncMapPermissionOptions(string pathServiceSid, string pathMapSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The application-defined string that uniquely identifies the User's Sync Map Permission resource to fetch
+    /// </summary>
+    public string PathIdentity { get; }
+
     /// <summary>
-    /// Update an identity's access to a specific Sync Map.
-    /// </summary>
-    public class UpdateSyncMapPermissionOptions : IOptions<SyncMapPermissionResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Map Permission resource to update
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Map with the Sync Map Permission resource to update
-        /// </summary>
-        public string PathMapSid { get; }
-        /// <summary>
-        /// The application-defined string that uniquely identifies the User's Sync Map Permission resource to update
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// Read access
-        /// </summary>
-        public bool? Read { get; }
-        /// <summary>
-        /// Write access
-        /// </summary>
-        public bool? Write { get; }
-        /// <summary>
-        /// Manage access
-        /// </summary>
-        public bool? Manage { get; }
-
-        /// <summary>
-        /// Construct a new UpdateSyncMapPermissionOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to update </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to update </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
-        ///                    resource to update </param>
-        /// <param name="read"> Read access </param>
-        /// <param name="write"> Write access </param>
-        /// <param name="manage"> Manage access </param>
-        public UpdateSyncMapPermissionOptions(string pathServiceSid,
-                                              string pathMapSid,
-                                              string pathIdentity,
-                                              bool? read,
-                                              bool? write,
-                                              bool? manage)
-        {
-            PathServiceSid = pathServiceSid;
-            PathMapSid = pathMapSid;
-            PathIdentity = pathIdentity;
-            Read = read;
-            Write = write;
-            Manage = manage;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Read != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Read", Read.Value.ToString().ToLower()));
-            }
-
-            if (Write != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Write", Write.Value.ToString().ToLower()));
-            }
-
-            if (Manage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Manage", Manage.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new FetchSyncMapPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to fetch </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to fetch </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
+    ///                    resource to fetch </param>
+    public FetchSyncMapPermissionOptions(string pathServiceSid, string pathMapSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Sync Map Permission.
+  /// </summary>
+  public class DeleteSyncMapPermissionOptions : IOptions<SyncMapPermissionResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync Map Permission resource to delete
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync Map with the Sync Map Permission resource to delete
+    /// </summary>
+    public string PathMapSid { get; }
+    /// <summary>
+    /// The application-defined string that uniquely identifies the User's Sync Map Permission resource to delete
+    /// </summary>
+    public string PathIdentity { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSyncMapPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to delete </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to delete </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
+    ///                    resource to delete </param>
+    public DeleteSyncMapPermissionOptions(string pathServiceSid, string pathMapSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Permissions applying to a Sync Map.
+  /// </summary>
+  public class ReadSyncMapPermissionOptions : ReadOptions<SyncMapPermissionResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync Map Permission resources to read
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync Map with the Permission resources to read
+    /// </summary>
+    public string PathMapSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadSyncMapPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resources to read </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Permission resources to read </param>
+    public ReadSyncMapPermissionOptions(string pathServiceSid, string pathMapSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an identity's access to a specific Sync Map.
+  /// </summary>
+  public class UpdateSyncMapPermissionOptions : IOptions<SyncMapPermissionResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync Map Permission resource to update
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync Map with the Sync Map Permission resource to update
+    /// </summary>
+    public string PathMapSid { get; }
+    /// <summary>
+    /// The application-defined string that uniquely identifies the User's Sync Map Permission resource to update
+    /// </summary>
+    public string PathIdentity { get; }
+    /// <summary>
+    /// Read access
+    /// </summary>
+    public bool? Read { get; }
+    /// <summary>
+    /// Write access
+    /// </summary>
+    public bool? Write { get; }
+    /// <summary>
+    /// Manage access
+    /// </summary>
+    public bool? Manage { get; }
+
+    /// <summary>
+    /// Construct a new UpdateSyncMapPermissionOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to update </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to update </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
+    ///                    resource to update </param>
+    /// <param name="read"> Read access </param>
+    /// <param name="write"> Write access </param>
+    /// <param name="manage"> Manage access </param>
+    public UpdateSyncMapPermissionOptions(string pathServiceSid,
+                                          string pathMapSid,
+                                          string pathIdentity,
+                                          bool? read,
+                                          bool? write,
+                                          bool? manage)
+    {
+      PathServiceSid = pathServiceSid;
+      PathMapSid = pathMapSid;
+      PathIdentity = pathIdentity;
+      Read = read;
+      Write = write;
+      Manage = manage;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Read != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Read", Read.Value.ToString().ToLower()));
+      }
+
+      if (Write != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Write", Write.Value.ToString().ToLower()));
+      }
+
+      if (Manage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Manage", Manage.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapPermissionResource.cs b/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapPermissionResource.cs
index 9d76ec14e..3f258643c 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapPermissionResource.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncMap/SyncMapPermissionResource.cs
@@ -16,460 +16,460 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Sync.V1.Service.SyncMap
-{
-
-    public class SyncMapPermissionResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSyncMapPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="options"> Fetch SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static SyncMapPermissionResource Fetch(FetchSyncMapPermissionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="options"> Fetch SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncMapPermissionResource> FetchAsync(FetchSyncMapPermissionOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to fetch </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to fetch </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
-        ///                    resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static SyncMapPermissionResource Fetch(string pathServiceSid,
-                                                      string pathMapSid,
-                                                      string pathIdentity,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to fetch </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to fetch </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
-        ///                    resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncMapPermissionResource> FetchAsync(string pathServiceSid,
-                                                                                              string pathMapSid,
-                                                                                              string pathIdentity,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSyncMapPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="options"> Delete SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static bool Delete(DeleteSyncMapPermissionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="options"> Delete SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncMapPermissionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to delete </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to delete </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
-        ///                    resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathMapSid,
-                                  string pathIdentity,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Sync Map Permission.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to delete </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to delete </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
-        ///                    resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathMapSid,
-                                                                          string pathIdentity,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSyncMapPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Map.
-        /// </summary>
-        /// <param name="options"> Read SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static ResourceSet<SyncMapPermissionResource> Read(ReadSyncMapPermissionOptions options,
-                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
-            return new ResourceSet<SyncMapPermissionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Map.
-        /// </summary>
-        /// <param name="options"> Read SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncMapPermissionResource>> ReadAsync(ReadSyncMapPermissionOptions options,
-                                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
-            return new ResourceSet<SyncMapPermissionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Map.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resources to read </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Permission resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static ResourceSet<SyncMapPermissionResource> Read(string pathServiceSid,
-                                                                  string pathMapSid,
-                                                                  int? pageSize = null,
-                                                                  long? limit = null,
-                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncMapPermissionOptions(pathServiceSid, pathMapSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Permissions applying to a Sync Map.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resources to read </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Permission resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncMapPermissionResource>> ReadAsync(string pathServiceSid,
-                                                                                                          string pathMapSid,
-                                                                                                          int? pageSize = null,
-                                                                                                          long? limit = null,
-                                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncMapPermissionOptions(pathServiceSid, pathMapSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SyncMapPermissionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SyncMapPermissionResource> NextPage(Page<SyncMapPermissionResource> page,
-                                                               ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SyncMapPermissionResource> PreviousPage(Page<SyncMapPermissionResource> page,
-                                                                   ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateSyncMapPermissionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions/" + options.PathIdentity + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an identity's access to a specific Sync Map.
-        /// </summary>
-        /// <param name="options"> Update SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static SyncMapPermissionResource Update(UpdateSyncMapPermissionOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an identity's access to a specific Sync Map.
-        /// </summary>
-        /// <param name="options"> Update SyncMapPermission parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncMapPermissionResource> UpdateAsync(UpdateSyncMapPermissionOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an identity's access to a specific Sync Map.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to update </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to update </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
-        ///                    resource to update </param>
-        /// <param name="read"> Read access </param>
-        /// <param name="write"> Write access </param>
-        /// <param name="manage"> Manage access </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMapPermission </returns>
-        public static SyncMapPermissionResource Update(string pathServiceSid,
-                                                       string pathMapSid,
-                                                       string pathIdentity,
-                                                       bool? read,
-                                                       bool? write,
-                                                       bool? manage,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity, read, write, manage);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an identity's access to a specific Sync Map.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to update </param>
-        /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to update </param>
-        /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
-        ///                    resource to update </param>
-        /// <param name="read"> Read access </param>
-        /// <param name="write"> Write access </param>
-        /// <param name="manage"> Manage access </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
-        public static async System.Threading.Tasks.Task<SyncMapPermissionResource> UpdateAsync(string pathServiceSid,
-                                                                                               string pathMapSid,
-                                                                                               string pathIdentity,
-                                                                                               bool? read,
-                                                                                               bool? write,
-                                                                                               bool? manage,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity, read, write, manage);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SyncMapPermissionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SyncMapPermissionResource object represented by the provided JSON </returns>
-        public static SyncMapPermissionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SyncMapPermissionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Sync Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// Sync Map SID
-        /// </summary>
-        [JsonProperty("map_sid")]
-        public string MapSid { get; private set; }
-        /// <summary>
-        /// The identity of the user to whom the Sync Document Permission applies
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// Read access
-        /// </summary>
-        [JsonProperty("read")]
-        public bool? _Read { get; private set; }
-        /// <summary>
-        /// Write access
-        /// </summary>
-        [JsonProperty("write")]
-        public bool? Write { get; private set; }
-        /// <summary>
-        /// Manage access
-        /// </summary>
-        [JsonProperty("manage")]
-        public bool? Manage { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Sync Map Permission resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SyncMapPermissionResource()
-        {
-
-        }
-    }
+{
+
+  public class SyncMapPermissionResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSyncMapPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="options"> Fetch SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static SyncMapPermissionResource Fetch(FetchSyncMapPermissionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="options"> Fetch SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncMapPermissionResource> FetchAsync(FetchSyncMapPermissionOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to fetch </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to fetch </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
+    ///                    resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static SyncMapPermissionResource Fetch(string pathServiceSid,
+                                                  string pathMapSid,
+                                                  string pathIdentity,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to fetch </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to fetch </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
+    ///                    resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncMapPermissionResource> FetchAsync(string pathServiceSid,
+                                                                                          string pathMapSid,
+                                                                                          string pathIdentity,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSyncMapPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="options"> Delete SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static bool Delete(DeleteSyncMapPermissionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="options"> Delete SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncMapPermissionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to delete </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to delete </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
+    ///                    resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathMapSid,
+                              string pathIdentity,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Sync Map Permission.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to delete </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to delete </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
+    ///                    resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathMapSid,
+                                                                      string pathIdentity,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSyncMapPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Map.
+    /// </summary>
+    /// <param name="options"> Read SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static ResourceSet<SyncMapPermissionResource> Read(ReadSyncMapPermissionOptions options,
+                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
+      return new ResourceSet<SyncMapPermissionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Map.
+    /// </summary>
+    /// <param name="options"> Read SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncMapPermissionResource>> ReadAsync(ReadSyncMapPermissionOptions options,
+                                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
+      return new ResourceSet<SyncMapPermissionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Map.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resources to read </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Permission resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static ResourceSet<SyncMapPermissionResource> Read(string pathServiceSid,
+                                                              string pathMapSid,
+                                                              int? pageSize = null,
+                                                              long? limit = null,
+                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncMapPermissionOptions(pathServiceSid, pathMapSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Permissions applying to a Sync Map.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resources to read </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Permission resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncMapPermissionResource>> ReadAsync(string pathServiceSid,
+                                                                                                      string pathMapSid,
+                                                                                                      int? pageSize = null,
+                                                                                                      long? limit = null,
+                                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncMapPermissionOptions(pathServiceSid, pathMapSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SyncMapPermissionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SyncMapPermissionResource> NextPage(Page<SyncMapPermissionResource> page,
+                                                           ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SyncMapPermissionResource> PreviousPage(Page<SyncMapPermissionResource> page,
+                                                               ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapPermissionResource>.FromJson("permissions", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateSyncMapPermissionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathMapSid + "/Permissions/" + options.PathIdentity + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an identity's access to a specific Sync Map.
+    /// </summary>
+    /// <param name="options"> Update SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static SyncMapPermissionResource Update(UpdateSyncMapPermissionOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an identity's access to a specific Sync Map.
+    /// </summary>
+    /// <param name="options"> Update SyncMapPermission parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncMapPermissionResource> UpdateAsync(UpdateSyncMapPermissionOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an identity's access to a specific Sync Map.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to update </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to update </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
+    ///                    resource to update </param>
+    /// <param name="read"> Read access </param>
+    /// <param name="write"> Write access </param>
+    /// <param name="manage"> Manage access </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMapPermission </returns>
+    public static SyncMapPermissionResource Update(string pathServiceSid,
+                                                   string pathMapSid,
+                                                   string pathIdentity,
+                                                   bool? read,
+                                                   bool? write,
+                                                   bool? manage,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity, read, write, manage);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an identity's access to a specific Sync Map.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map Permission resource to update </param>
+    /// <param name="pathMapSid"> The SID of the Sync Map with the Sync Map Permission resource to update </param>
+    /// <param name="pathIdentity"> The application-defined string that uniquely identifies the User's Sync Map Permission
+    ///                    resource to update </param>
+    /// <param name="read"> Read access </param>
+    /// <param name="write"> Write access </param>
+    /// <param name="manage"> Manage access </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMapPermission </returns>
+    public static async System.Threading.Tasks.Task<SyncMapPermissionResource> UpdateAsync(string pathServiceSid,
+                                                                                           string pathMapSid,
+                                                                                           string pathIdentity,
+                                                                                           bool? read,
+                                                                                           bool? write,
+                                                                                           bool? manage,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncMapPermissionOptions(pathServiceSid, pathMapSid, pathIdentity, read, write, manage);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SyncMapPermissionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SyncMapPermissionResource object represented by the provided JSON </returns>
+    public static SyncMapPermissionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SyncMapPermissionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Sync Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// Sync Map SID
+    /// </summary>
+    [JsonProperty("map_sid")]
+    public string MapSid { get; private set; }
+    /// <summary>
+    /// The identity of the user to whom the Sync Document Permission applies
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// Read access
+    /// </summary>
+    [JsonProperty("read")]
+    public bool? _Read { get; private set; }
+    /// <summary>
+    /// Write access
+    /// </summary>
+    [JsonProperty("write")]
+    public bool? Write { get; private set; }
+    /// <summary>
+    /// Manage access
+    /// </summary>
+    [JsonProperty("manage")]
+    public bool? Manage { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Sync Map Permission resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SyncMapPermissionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncMapOptions.cs b/src/Twilio/Rest/Sync/V1/Service/SyncMapOptions.cs
index 49c98c669..c6856af17 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncMapOptions.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncMapOptions.cs
@@ -9,219 +9,219 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Sync.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// FetchSyncMapOptions
+  /// </summary>
+  public class FetchSyncMapOptions : IOptions<SyncMapResource>
+  {
     /// <summary>
-    /// FetchSyncMapOptions
-    /// </summary>
-    public class FetchSyncMapOptions : IOptions<SyncMapResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Map resource to fetch
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Map resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSyncMapOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Sync Map resource to fetch </param>
-        public FetchSyncMapOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync Service with the Sync Map resource to fetch
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// DeleteSyncMapOptions
-    /// </summary>
-    public class DeleteSyncMapOptions : IOptions<SyncMapResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Map resource to delete
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Map resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSyncMapOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to delete </param>
-        /// <param name="pathSid"> The SID of the Sync Map resource to delete </param>
-        public DeleteSyncMapOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync Map resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateSyncMapOptions
-    /// </summary>
-    public class CreateSyncMapOptions : IOptions<SyncMapResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service to create the Sync Map in
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// An alias for collection_ttl
-        /// </summary>
-        public int? Ttl { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the Sync Map expires and is deleted
-        /// </summary>
-        public int? CollectionTtl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSyncMapOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the Sync Map in </param>
-        public CreateSyncMapOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            if (CollectionTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchSyncMapOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Sync Map resource to fetch </param>
+    public FetchSyncMapOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// UpdateSyncMapOptions
-    /// </summary>
-    public class UpdateSyncMapOptions : IOptions<SyncMapResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Map resource to update
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Map resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// An alias for collection_ttl
-        /// </summary>
-        public int? Ttl { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the Sync Map expires and is deleted
-        /// </summary>
-        public int? CollectionTtl { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSyncMapOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to update </param>
-        /// <param name="pathSid"> The SID of the Sync Map resource to update </param>
-        public UpdateSyncMapOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            if (CollectionTtl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteSyncMapOptions
+  /// </summary>
+  public class DeleteSyncMapOptions : IOptions<SyncMapResource>
+  {
     /// <summary>
-    /// ReadSyncMapOptions
+    /// The SID of the Sync Service with the Sync Map resource to delete
     /// </summary>
-    public class ReadSyncMapOptions : ReadOptions<SyncMapResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Map resources to read
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadSyncMapOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resources to read </param>
-        public ReadSyncMapOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync Map resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSyncMapOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to delete </param>
+    /// <param name="pathSid"> The SID of the Sync Map resource to delete </param>
+    public DeleteSyncMapOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateSyncMapOptions
+  /// </summary>
+  public class CreateSyncMapOptions : IOptions<SyncMapResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service to create the Sync Map in
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// An alias for collection_ttl
+    /// </summary>
+    public int? Ttl { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the Sync Map expires and is deleted
+    /// </summary>
+    public int? CollectionTtl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateSyncMapOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the Sync Map in </param>
+    public CreateSyncMapOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      if (CollectionTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateSyncMapOptions
+  /// </summary>
+  public class UpdateSyncMapOptions : IOptions<SyncMapResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync Map resource to update
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync Map resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// An alias for collection_ttl
+    /// </summary>
+    public int? Ttl { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the Sync Map expires and is deleted
+    /// </summary>
+    public int? CollectionTtl { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSyncMapOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to update </param>
+    /// <param name="pathSid"> The SID of the Sync Map resource to update </param>
+    public UpdateSyncMapOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      if (CollectionTtl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CollectionTtl", CollectionTtl.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadSyncMapOptions
+  /// </summary>
+  public class ReadSyncMapOptions : ReadOptions<SyncMapResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync Map resources to read
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadSyncMapOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resources to read </param>
+    public ReadSyncMapOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncMapResource.cs b/src/Twilio/Rest/Sync/V1/Service/SyncMapResource.cs
index c3601b892..60ed77ce4 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncMapResource.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncMapResource.cs
@@ -16,521 +16,521 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Sync.V1.Service
-{
-
-    public class SyncMapResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSyncMapOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static SyncMapResource Fetch(FetchSyncMapOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<SyncMapResource> FetchAsync(FetchSyncMapOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Sync Map resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static SyncMapResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncMapOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Sync Map resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<SyncMapResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncMapOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSyncMapOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static bool Delete(DeleteSyncMapOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncMapOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to delete </param>
-        /// <param name="pathSid"> The SID of the Sync Map resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncMapOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to delete </param>
-        /// <param name="pathSid"> The SID of the Sync Map resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncMapOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateSyncMapOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static SyncMapResource Create(CreateSyncMapOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<SyncMapResource> CreateAsync(CreateSyncMapOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the Sync Map in </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="ttl"> An alias for collection_ttl </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the Sync Map expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static SyncMapResource Create(string pathServiceSid,
-                                             string uniqueName = null,
-                                             int? ttl = null,
-                                             int? collectionTtl = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncMapOptions(pathServiceSid){UniqueName = uniqueName, Ttl = ttl, CollectionTtl = collectionTtl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the Sync Map in </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="ttl"> An alias for collection_ttl </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the Sync Map expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<SyncMapResource> CreateAsync(string pathServiceSid,
-                                                                                     string uniqueName = null,
-                                                                                     int? ttl = null,
-                                                                                     int? collectionTtl = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncMapOptions(pathServiceSid){UniqueName = uniqueName, Ttl = ttl, CollectionTtl = collectionTtl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSyncMapOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static SyncMapResource Update(UpdateSyncMapOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<SyncMapResource> UpdateAsync(UpdateSyncMapOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to update </param>
-        /// <param name="pathSid"> The SID of the Sync Map resource to update </param>
-        /// <param name="ttl"> An alias for collection_ttl </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the Sync Map expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static SyncMapResource Update(string pathServiceSid,
-                                             string pathSid,
-                                             int? ttl = null,
-                                             int? collectionTtl = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncMapOptions(pathServiceSid, pathSid){Ttl = ttl, CollectionTtl = collectionTtl};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to update </param>
-        /// <param name="pathSid"> The SID of the Sync Map resource to update </param>
-        /// <param name="ttl"> An alias for collection_ttl </param>
-        /// <param name="collectionTtl"> How long, in seconds, before the Sync Map expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<SyncMapResource> UpdateAsync(string pathServiceSid,
-                                                                                     string pathSid,
-                                                                                     int? ttl = null,
-                                                                                     int? collectionTtl = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncMapOptions(pathServiceSid, pathSid){Ttl = ttl, CollectionTtl = collectionTtl};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSyncMapOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Maps",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static ResourceSet<SyncMapResource> Read(ReadSyncMapOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SyncMapResource>.FromJson("maps", response.Content);
-            return new ResourceSet<SyncMapResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SyncMap parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncMapResource>> ReadAsync(ReadSyncMapOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SyncMapResource>.FromJson("maps", response.Content);
-            return new ResourceSet<SyncMapResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncMap </returns>
-        public static ResourceSet<SyncMapResource> Read(string pathServiceSid,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncMapOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncMap </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncMapResource>> ReadAsync(string pathServiceSid,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncMapOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SyncMapResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapResource>.FromJson("maps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SyncMapResource> NextPage(Page<SyncMapResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapResource>.FromJson("maps", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SyncMapResource> PreviousPage(Page<SyncMapResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncMapResource>.FromJson("maps", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a SyncMapResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SyncMapResource object represented by the provided JSON </returns>
-        public static SyncMapResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SyncMapResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Sync Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Sync Map resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of the Sync Map's nested resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The current revision of the Sync Map, represented as a string
-        /// </summary>
-        [JsonProperty("revision")]
-        public string Revision { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Sync Map expires
-        /// </summary>
-        [JsonProperty("date_expires")]
-        public DateTime? DateExpires { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The identity of the Sync Map's creator
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-
-        private SyncMapResource()
-        {
-
-        }
-    }
+{
+
+  public class SyncMapResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSyncMapOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static SyncMapResource Fetch(FetchSyncMapOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<SyncMapResource> FetchAsync(FetchSyncMapOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Sync Map resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static SyncMapResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncMapOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Sync Map resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<SyncMapResource> FetchAsync(string pathServiceSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncMapOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSyncMapOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static bool Delete(DeleteSyncMapOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncMapOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to delete </param>
+    /// <param name="pathSid"> The SID of the Sync Map resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncMapOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to delete </param>
+    /// <param name="pathSid"> The SID of the Sync Map resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncMapOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateSyncMapOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static SyncMapResource Create(CreateSyncMapOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<SyncMapResource> CreateAsync(CreateSyncMapOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the Sync Map in </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="ttl"> An alias for collection_ttl </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the Sync Map expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static SyncMapResource Create(string pathServiceSid,
+                                         string uniqueName = null,
+                                         int? ttl = null,
+                                         int? collectionTtl = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncMapOptions(pathServiceSid) { UniqueName = uniqueName, Ttl = ttl, CollectionTtl = collectionTtl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the Sync Map in </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="ttl"> An alias for collection_ttl </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the Sync Map expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<SyncMapResource> CreateAsync(string pathServiceSid,
+                                                                                 string uniqueName = null,
+                                                                                 int? ttl = null,
+                                                                                 int? collectionTtl = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncMapOptions(pathServiceSid) { UniqueName = uniqueName, Ttl = ttl, CollectionTtl = collectionTtl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSyncMapOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static SyncMapResource Update(UpdateSyncMapOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<SyncMapResource> UpdateAsync(UpdateSyncMapOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to update </param>
+    /// <param name="pathSid"> The SID of the Sync Map resource to update </param>
+    /// <param name="ttl"> An alias for collection_ttl </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the Sync Map expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static SyncMapResource Update(string pathServiceSid,
+                                         string pathSid,
+                                         int? ttl = null,
+                                         int? collectionTtl = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncMapOptions(pathServiceSid, pathSid) { Ttl = ttl, CollectionTtl = collectionTtl };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resource to update </param>
+    /// <param name="pathSid"> The SID of the Sync Map resource to update </param>
+    /// <param name="ttl"> An alias for collection_ttl </param>
+    /// <param name="collectionTtl"> How long, in seconds, before the Sync Map expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<SyncMapResource> UpdateAsync(string pathServiceSid,
+                                                                                 string pathSid,
+                                                                                 int? ttl = null,
+                                                                                 int? collectionTtl = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncMapOptions(pathServiceSid, pathSid) { Ttl = ttl, CollectionTtl = collectionTtl };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSyncMapOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Maps",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static ResourceSet<SyncMapResource> Read(ReadSyncMapOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SyncMapResource>.FromJson("maps", response.Content);
+      return new ResourceSet<SyncMapResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SyncMap parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncMapResource>> ReadAsync(ReadSyncMapOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SyncMapResource>.FromJson("maps", response.Content);
+      return new ResourceSet<SyncMapResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncMap </returns>
+    public static ResourceSet<SyncMapResource> Read(string pathServiceSid,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncMapOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Map resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncMap </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncMapResource>> ReadAsync(string pathServiceSid,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncMapOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SyncMapResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapResource>.FromJson("maps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SyncMapResource> NextPage(Page<SyncMapResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapResource>.FromJson("maps", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SyncMapResource> PreviousPage(Page<SyncMapResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncMapResource>.FromJson("maps", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a SyncMapResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SyncMapResource object represented by the provided JSON </returns>
+    public static SyncMapResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SyncMapResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Sync Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Sync Map resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of the Sync Map's nested resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The current revision of the Sync Map, represented as a string
+    /// </summary>
+    [JsonProperty("revision")]
+    public string Revision { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Sync Map expires
+    /// </summary>
+    [JsonProperty("date_expires")]
+    public DateTime? DateExpires { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The identity of the Sync Map's creator
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+
+    private SyncMapResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncStream/StreamMessageOptions.cs b/src/Twilio/Rest/Sync/V1/Service/SyncStream/StreamMessageOptions.cs
index cfc5f497e..9e550e37c 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncStream/StreamMessageOptions.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncStream/StreamMessageOptions.cs
@@ -9,53 +9,53 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Sync.V1.Service.SyncStream
-{
-
+{
+
+  /// <summary>
+  /// Create a new Stream Message.
+  /// </summary>
+  public class CreateStreamMessageOptions : IOptions<StreamMessageResource>
+  {
     /// <summary>
-    /// Create a new Stream Message.
+    /// The SID of the Sync Service to create the new Stream Message in
     /// </summary>
-    public class CreateStreamMessageOptions : IOptions<StreamMessageResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service to create the new Stream Message in
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Sync Stream to create the new Stream Message resource for
-        /// </summary>
-        public string PathStreamSid { get; }
-        /// <summary>
-        /// A JSON string that represents an arbitrary, schema-less object that makes up the Stream Message body
-        /// </summary>
-        public object Data { get; }
-
-        /// <summary>
-        /// Construct a new CreateStreamMessageOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the new Stream Message in </param>
-        /// <param name="pathStreamSid"> The SID of the Sync Stream to create the new Stream Message resource for </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that makes up the Stream Message
-        ///            body </param>
-        public CreateStreamMessageOptions(string pathServiceSid, string pathStreamSid, object data)
-        {
-            PathServiceSid = pathServiceSid;
-            PathStreamSid = pathStreamSid;
-            Data = data;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Data != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Sync Stream to create the new Stream Message resource for
+    /// </summary>
+    public string PathStreamSid { get; }
+    /// <summary>
+    /// A JSON string that represents an arbitrary, schema-less object that makes up the Stream Message body
+    /// </summary>
+    public object Data { get; }
+
+    /// <summary>
+    /// Construct a new CreateStreamMessageOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the new Stream Message in </param>
+    /// <param name="pathStreamSid"> The SID of the Sync Stream to create the new Stream Message resource for </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that makes up the Stream Message
+    ///            body </param>
+    public CreateStreamMessageOptions(string pathServiceSid, string pathStreamSid, object data)
+    {
+      PathServiceSid = pathServiceSid;
+      PathStreamSid = pathStreamSid;
+      Data = data;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Data != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Data", Serializers.JsonObject(Data)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncStream/StreamMessageResource.cs b/src/Twilio/Rest/Sync/V1/Service/SyncStream/StreamMessageResource.cs
index 92b48471c..798bfb318 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncStream/StreamMessageResource.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncStream/StreamMessageResource.cs
@@ -16,121 +16,121 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Sync.V1.Service.SyncStream
-{
-
-    public class StreamMessageResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateStreamMessageOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Streams/" + options.PathStreamSid + "/Messages",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Stream Message.
-        /// </summary>
-        /// <param name="options"> Create StreamMessage parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of StreamMessage </returns>
-        public static StreamMessageResource Create(CreateStreamMessageOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Stream Message.
-        /// </summary>
-        /// <param name="options"> Create StreamMessage parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of StreamMessage </returns>
-        public static async System.Threading.Tasks.Task<StreamMessageResource> CreateAsync(CreateStreamMessageOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Stream Message.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the new Stream Message in </param>
-        /// <param name="pathStreamSid"> The SID of the Sync Stream to create the new Stream Message resource for </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that makes up the Stream Message
-        ///            body </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of StreamMessage </returns>
-        public static StreamMessageResource Create(string pathServiceSid,
-                                                   string pathStreamSid,
-                                                   object data,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateStreamMessageOptions(pathServiceSid, pathStreamSid, data);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Stream Message.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the new Stream Message in </param>
-        /// <param name="pathStreamSid"> The SID of the Sync Stream to create the new Stream Message resource for </param>
-        /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that makes up the Stream Message
-        ///            body </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of StreamMessage </returns>
-        public static async System.Threading.Tasks.Task<StreamMessageResource> CreateAsync(string pathServiceSid,
-                                                                                           string pathStreamSid,
-                                                                                           object data,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateStreamMessageOptions(pathServiceSid, pathStreamSid, data);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a StreamMessageResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> StreamMessageResource object represented by the provided JSON </returns>
-        public static StreamMessageResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<StreamMessageResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Stream Message body
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-
-        private StreamMessageResource()
-        {
-
-        }
-    }
+{
+
+  public class StreamMessageResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateStreamMessageOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Streams/" + options.PathStreamSid + "/Messages",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Stream Message.
+    /// </summary>
+    /// <param name="options"> Create StreamMessage parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of StreamMessage </returns>
+    public static StreamMessageResource Create(CreateStreamMessageOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Stream Message.
+    /// </summary>
+    /// <param name="options"> Create StreamMessage parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of StreamMessage </returns>
+    public static async System.Threading.Tasks.Task<StreamMessageResource> CreateAsync(CreateStreamMessageOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Stream Message.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the new Stream Message in </param>
+    /// <param name="pathStreamSid"> The SID of the Sync Stream to create the new Stream Message resource for </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that makes up the Stream Message
+    ///            body </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of StreamMessage </returns>
+    public static StreamMessageResource Create(string pathServiceSid,
+                                               string pathStreamSid,
+                                               object data,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateStreamMessageOptions(pathServiceSid, pathStreamSid, data);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Stream Message.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the new Stream Message in </param>
+    /// <param name="pathStreamSid"> The SID of the Sync Stream to create the new Stream Message resource for </param>
+    /// <param name="data"> A JSON string that represents an arbitrary, schema-less object that makes up the Stream Message
+    ///            body </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of StreamMessage </returns>
+    public static async System.Threading.Tasks.Task<StreamMessageResource> CreateAsync(string pathServiceSid,
+                                                                                       string pathStreamSid,
+                                                                                       object data,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateStreamMessageOptions(pathServiceSid, pathStreamSid, data);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a StreamMessageResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> StreamMessageResource object represented by the provided JSON </returns>
+    public static StreamMessageResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<StreamMessageResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Stream Message body
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+
+    private StreamMessageResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncStreamOptions.cs b/src/Twilio/Rest/Sync/V1/Service/SyncStreamOptions.cs
index 74174fd74..1688ed47e 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncStreamOptions.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncStreamOptions.cs
@@ -9,201 +9,201 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Sync.V1.Service
-{
-
+{
+
+  /// <summary>
+  /// Fetch a specific Stream.
+  /// </summary>
+  public class FetchSyncStreamOptions : IOptions<SyncStreamResource>
+  {
     /// <summary>
-    /// Fetch a specific Stream.
-    /// </summary>
-    public class FetchSyncStreamOptions : IOptions<SyncStreamResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Stream resource to fetch
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Stream resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSyncStreamOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Stream resource to fetch </param>
-        public FetchSyncStreamOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Sync Service with the Sync Stream resource to fetch
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// Delete a specific Stream.
-    /// </summary>
-    public class DeleteSyncStreamOptions : IOptions<SyncStreamResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Stream resource to delete
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Stream resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSyncStreamOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to delete </param>
-        /// <param name="pathSid"> The SID of the Stream resource to delete </param>
-        public DeleteSyncStreamOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Stream resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// Create a new Stream.
-    /// </summary>
-    public class CreateSyncStreamOptions : IOptions<SyncStreamResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service to create the new Stream in
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// How long, in seconds, before the Stream expires and is deleted
-        /// </summary>
-        public int? Ttl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSyncStreamOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the new Stream in </param>
-        public CreateSyncStreamOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchSyncStreamOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Stream resource to fetch </param>
+    public FetchSyncStreamOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// Update a specific Stream.
-    /// </summary>
-    public class UpdateSyncStreamOptions : IOptions<SyncStreamResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Sync Stream resource to update
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The SID of the Stream resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// How long, in seconds, before the Stream expires and is deleted
-        /// </summary>
-        public int? Ttl { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSyncStreamOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to update </param>
-        /// <param name="pathSid"> The SID of the Stream resource to update </param>
-        public UpdateSyncStreamOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Stream.
+  /// </summary>
+  public class DeleteSyncStreamOptions : IOptions<SyncStreamResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Streams in a Service Instance.
+    /// The SID of the Sync Service with the Sync Stream resource to delete
     /// </summary>
-    public class ReadSyncStreamOptions : ReadOptions<SyncStreamResource>
-    {
-        /// <summary>
-        /// The SID of the Sync Service with the Stream resources to read
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadSyncStreamOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Stream resources to read </param>
-        public ReadSyncStreamOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Stream resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSyncStreamOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to delete </param>
+    /// <param name="pathSid"> The SID of the Stream resource to delete </param>
+    public DeleteSyncStreamOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Create a new Stream.
+  /// </summary>
+  public class CreateSyncStreamOptions : IOptions<SyncStreamResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service to create the new Stream in
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// How long, in seconds, before the Stream expires and is deleted
+    /// </summary>
+    public int? Ttl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateSyncStreamOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the new Stream in </param>
+    public CreateSyncStreamOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update a specific Stream.
+  /// </summary>
+  public class UpdateSyncStreamOptions : IOptions<SyncStreamResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Sync Stream resource to update
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The SID of the Stream resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// How long, in seconds, before the Stream expires and is deleted
+    /// </summary>
+    public int? Ttl { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSyncStreamOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to update </param>
+    /// <param name="pathSid"> The SID of the Stream resource to update </param>
+    public UpdateSyncStreamOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Streams in a Service Instance.
+  /// </summary>
+  public class ReadSyncStreamOptions : ReadOptions<SyncStreamResource>
+  {
+    /// <summary>
+    /// The SID of the Sync Service with the Stream resources to read
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadSyncStreamOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Stream resources to read </param>
+    public ReadSyncStreamOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/Service/SyncStreamResource.cs b/src/Twilio/Rest/Sync/V1/Service/SyncStreamResource.cs
index 6a7f5c656..74d9b8ac6 100644
--- a/src/Twilio/Rest/Sync/V1/Service/SyncStreamResource.cs
+++ b/src/Twilio/Rest/Sync/V1/Service/SyncStreamResource.cs
@@ -16,508 +16,508 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Sync.V1.Service
-{
-
-    public class SyncStreamResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSyncStreamOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Streams/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Stream.
-        /// </summary>
-        /// <param name="options"> Fetch SyncStream parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncStream </returns>
-        public static SyncStreamResource Fetch(FetchSyncStreamOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Stream.
-        /// </summary>
-        /// <param name="options"> Fetch SyncStream parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncStream </returns>
-        public static async System.Threading.Tasks.Task<SyncStreamResource> FetchAsync(FetchSyncStreamOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Stream.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Stream resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncStream </returns>
-        public static SyncStreamResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncStreamOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Stream.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to fetch </param>
-        /// <param name="pathSid"> The SID of the Stream resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncStream </returns>
-        public static async System.Threading.Tasks.Task<SyncStreamResource> FetchAsync(string pathServiceSid,
-                                                                                       string pathSid,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchSyncStreamOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSyncStreamOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Streams/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Stream.
-        /// </summary>
-        /// <param name="options"> Delete SyncStream parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncStream </returns>
-        public static bool Delete(DeleteSyncStreamOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Stream.
-        /// </summary>
-        /// <param name="options"> Delete SyncStream parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncStream </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncStreamOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Stream.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to delete </param>
-        /// <param name="pathSid"> The SID of the Stream resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncStream </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncStreamOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Stream.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to delete </param>
-        /// <param name="pathSid"> The SID of the Stream resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncStream </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteSyncStreamOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateSyncStreamOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Streams",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Stream.
-        /// </summary>
-        /// <param name="options"> Create SyncStream parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncStream </returns>
-        public static SyncStreamResource Create(CreateSyncStreamOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Stream.
-        /// </summary>
-        /// <param name="options"> Create SyncStream parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncStream </returns>
-        public static async System.Threading.Tasks.Task<SyncStreamResource> CreateAsync(CreateSyncStreamOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Stream.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the new Stream in </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="ttl"> How long, in seconds, before the Stream expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncStream </returns>
-        public static SyncStreamResource Create(string pathServiceSid,
-                                                string uniqueName = null,
-                                                int? ttl = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncStreamOptions(pathServiceSid){UniqueName = uniqueName, Ttl = ttl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Stream.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service to create the new Stream in </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="ttl"> How long, in seconds, before the Stream expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncStream </returns>
-        public static async System.Threading.Tasks.Task<SyncStreamResource> CreateAsync(string pathServiceSid,
-                                                                                        string uniqueName = null,
-                                                                                        int? ttl = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateSyncStreamOptions(pathServiceSid){UniqueName = uniqueName, Ttl = ttl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSyncStreamOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Streams/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Stream.
-        /// </summary>
-        /// <param name="options"> Update SyncStream parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncStream </returns>
-        public static SyncStreamResource Update(UpdateSyncStreamOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Stream.
-        /// </summary>
-        /// <param name="options"> Update SyncStream parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncStream </returns>
-        public static async System.Threading.Tasks.Task<SyncStreamResource> UpdateAsync(UpdateSyncStreamOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Stream.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to update </param>
-        /// <param name="pathSid"> The SID of the Stream resource to update </param>
-        /// <param name="ttl"> How long, in seconds, before the Stream expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncStream </returns>
-        public static SyncStreamResource Update(string pathServiceSid,
-                                                string pathSid,
-                                                int? ttl = null,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncStreamOptions(pathServiceSid, pathSid){Ttl = ttl};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Stream.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to update </param>
-        /// <param name="pathSid"> The SID of the Stream resource to update </param>
-        /// <param name="ttl"> How long, in seconds, before the Stream expires and is deleted </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncStream </returns>
-        public static async System.Threading.Tasks.Task<SyncStreamResource> UpdateAsync(string pathServiceSid,
-                                                                                        string pathSid,
-                                                                                        int? ttl = null,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateSyncStreamOptions(pathServiceSid, pathSid){Ttl = ttl};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSyncStreamOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathServiceSid + "/Streams",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Streams in a Service Instance.
-        /// </summary>
-        /// <param name="options"> Read SyncStream parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncStream </returns>
-        public static ResourceSet<SyncStreamResource> Read(ReadSyncStreamOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SyncStreamResource>.FromJson("streams", response.Content);
-            return new ResourceSet<SyncStreamResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Streams in a Service Instance.
-        /// </summary>
-        /// <param name="options"> Read SyncStream parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncStream </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncStreamResource>> ReadAsync(ReadSyncStreamOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SyncStreamResource>.FromJson("streams", response.Content);
-            return new ResourceSet<SyncStreamResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Streams in a Service Instance.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Stream resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SyncStream </returns>
-        public static ResourceSet<SyncStreamResource> Read(string pathServiceSid,
-                                                           int? pageSize = null,
-                                                           long? limit = null,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncStreamOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Streams in a Service Instance.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Sync Service with the Stream resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SyncStream </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SyncStreamResource>> ReadAsync(string pathServiceSid,
-                                                                                                   int? pageSize = null,
-                                                                                                   long? limit = null,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadSyncStreamOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SyncStreamResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SyncStreamResource>.FromJson("streams", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SyncStreamResource> NextPage(Page<SyncStreamResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncStreamResource>.FromJson("streams", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SyncStreamResource> PreviousPage(Page<SyncStreamResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<SyncStreamResource>.FromJson("streams", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a SyncStreamResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SyncStreamResource object represented by the provided JSON </returns>
-        public static SyncStreamResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SyncStreamResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Sync Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Message Stream resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of the Stream's nested resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Message Stream expires
-        /// </summary>
-        [JsonProperty("date_expires")]
-        public DateTime? DateExpires { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The Identity of the Stream's creator
-        /// </summary>
-        [JsonProperty("created_by")]
-        public string CreatedBy { get; private set; }
-
-        private SyncStreamResource()
-        {
-
-        }
-    }
+{
+
+  public class SyncStreamResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSyncStreamOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Streams/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Stream.
+    /// </summary>
+    /// <param name="options"> Fetch SyncStream parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncStream </returns>
+    public static SyncStreamResource Fetch(FetchSyncStreamOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Stream.
+    /// </summary>
+    /// <param name="options"> Fetch SyncStream parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncStream </returns>
+    public static async System.Threading.Tasks.Task<SyncStreamResource> FetchAsync(FetchSyncStreamOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Stream.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Stream resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncStream </returns>
+    public static SyncStreamResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncStreamOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Stream.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to fetch </param>
+    /// <param name="pathSid"> The SID of the Stream resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncStream </returns>
+    public static async System.Threading.Tasks.Task<SyncStreamResource> FetchAsync(string pathServiceSid,
+                                                                                   string pathSid,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchSyncStreamOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSyncStreamOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Streams/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Stream.
+    /// </summary>
+    /// <param name="options"> Delete SyncStream parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncStream </returns>
+    public static bool Delete(DeleteSyncStreamOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Stream.
+    /// </summary>
+    /// <param name="options"> Delete SyncStream parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncStream </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSyncStreamOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Stream.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to delete </param>
+    /// <param name="pathSid"> The SID of the Stream resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncStream </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncStreamOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Stream.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to delete </param>
+    /// <param name="pathSid"> The SID of the Stream resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncStream </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteSyncStreamOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateSyncStreamOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Streams",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Stream.
+    /// </summary>
+    /// <param name="options"> Create SyncStream parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncStream </returns>
+    public static SyncStreamResource Create(CreateSyncStreamOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Stream.
+    /// </summary>
+    /// <param name="options"> Create SyncStream parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncStream </returns>
+    public static async System.Threading.Tasks.Task<SyncStreamResource> CreateAsync(CreateSyncStreamOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Stream.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the new Stream in </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="ttl"> How long, in seconds, before the Stream expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncStream </returns>
+    public static SyncStreamResource Create(string pathServiceSid,
+                                            string uniqueName = null,
+                                            int? ttl = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncStreamOptions(pathServiceSid) { UniqueName = uniqueName, Ttl = ttl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Stream.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service to create the new Stream in </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="ttl"> How long, in seconds, before the Stream expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncStream </returns>
+    public static async System.Threading.Tasks.Task<SyncStreamResource> CreateAsync(string pathServiceSid,
+                                                                                    string uniqueName = null,
+                                                                                    int? ttl = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateSyncStreamOptions(pathServiceSid) { UniqueName = uniqueName, Ttl = ttl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSyncStreamOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Streams/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Stream.
+    /// </summary>
+    /// <param name="options"> Update SyncStream parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncStream </returns>
+    public static SyncStreamResource Update(UpdateSyncStreamOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Stream.
+    /// </summary>
+    /// <param name="options"> Update SyncStream parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncStream </returns>
+    public static async System.Threading.Tasks.Task<SyncStreamResource> UpdateAsync(UpdateSyncStreamOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Stream.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to update </param>
+    /// <param name="pathSid"> The SID of the Stream resource to update </param>
+    /// <param name="ttl"> How long, in seconds, before the Stream expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncStream </returns>
+    public static SyncStreamResource Update(string pathServiceSid,
+                                            string pathSid,
+                                            int? ttl = null,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncStreamOptions(pathServiceSid, pathSid) { Ttl = ttl };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Stream.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Sync Stream resource to update </param>
+    /// <param name="pathSid"> The SID of the Stream resource to update </param>
+    /// <param name="ttl"> How long, in seconds, before the Stream expires and is deleted </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncStream </returns>
+    public static async System.Threading.Tasks.Task<SyncStreamResource> UpdateAsync(string pathServiceSid,
+                                                                                    string pathSid,
+                                                                                    int? ttl = null,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateSyncStreamOptions(pathServiceSid, pathSid) { Ttl = ttl };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSyncStreamOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathServiceSid + "/Streams",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Streams in a Service Instance.
+    /// </summary>
+    /// <param name="options"> Read SyncStream parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncStream </returns>
+    public static ResourceSet<SyncStreamResource> Read(ReadSyncStreamOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SyncStreamResource>.FromJson("streams", response.Content);
+      return new ResourceSet<SyncStreamResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Streams in a Service Instance.
+    /// </summary>
+    /// <param name="options"> Read SyncStream parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncStream </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncStreamResource>> ReadAsync(ReadSyncStreamOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SyncStreamResource>.FromJson("streams", response.Content);
+      return new ResourceSet<SyncStreamResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Streams in a Service Instance.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Stream resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SyncStream </returns>
+    public static ResourceSet<SyncStreamResource> Read(string pathServiceSid,
+                                                       int? pageSize = null,
+                                                       long? limit = null,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncStreamOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Streams in a Service Instance.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Sync Service with the Stream resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SyncStream </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SyncStreamResource>> ReadAsync(string pathServiceSid,
+                                                                                               int? pageSize = null,
+                                                                                               long? limit = null,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadSyncStreamOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SyncStreamResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SyncStreamResource>.FromJson("streams", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SyncStreamResource> NextPage(Page<SyncStreamResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncStreamResource>.FromJson("streams", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SyncStreamResource> PreviousPage(Page<SyncStreamResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<SyncStreamResource>.FromJson("streams", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a SyncStreamResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SyncStreamResource object represented by the provided JSON </returns>
+    public static SyncStreamResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SyncStreamResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Sync Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Message Stream resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of the Stream's nested resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Message Stream expires
+    /// </summary>
+    [JsonProperty("date_expires")]
+    public DateTime? DateExpires { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The Identity of the Stream's creator
+    /// </summary>
+    [JsonProperty("created_by")]
+    public string CreatedBy { get; private set; }
+
+    private SyncStreamResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/ServiceOptions.cs b/src/Twilio/Rest/Sync/V1/ServiceOptions.cs
index 0903118ed..419a8d280 100644
--- a/src/Twilio/Rest/Sync/V1/ServiceOptions.cs
+++ b/src/Twilio/Rest/Sync/V1/ServiceOptions.cs
@@ -9,255 +9,255 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Sync.V1
-{
-
+{
+
+  /// <summary>
+  /// FetchServiceOptions
+  /// </summary>
+  public class FetchServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// FetchServiceOptions
+    /// The SID of the Service resource to fetch
     /// </summary>
-    public class FetchServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The SID of the Service resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to fetch </param>
-        public FetchServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteServiceOptions
+    /// Construct a new FetchServiceOptions
     /// </summary>
-    public class DeleteServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The SID of the Service resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to delete </param>
-        public DeleteServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The SID of the Service resource to fetch </param>
+    public FetchServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// CreateServiceOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// A string that you assign to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The URL we should call when Sync objects are manipulated
-        /// </summary>
-        public Uri WebhookUrl { get; set; }
-        /// <summary>
-        /// Whether the service instance should call webhook_url when client endpoints connect to Sync
-        /// </summary>
-        public bool? ReachabilityWebhooksEnabled { get; set; }
-        /// <summary>
-        /// Whether token identities in the Service must be granted access to Sync objects by using the Permissions resource
-        /// </summary>
-        public bool? AclEnabled { get; set; }
-        /// <summary>
-        /// Whether every endpoint_disconnected event occurs after a configurable delay
-        /// </summary>
-        public bool? ReachabilityDebouncingEnabled { get; set; }
-        /// <summary>
-        /// The reachability event delay in milliseconds
-        /// </summary>
-        public int? ReachabilityDebouncingWindow { get; set; }
-        /// <summary>
-        /// Whether the Service instance should call webhook_url when the REST API is used to update Sync objects
-        /// </summary>
-        public bool? WebhooksFromRestEnabled { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (WebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
-            }
-
-            if (ReachabilityWebhooksEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReachabilityWebhooksEnabled", ReachabilityWebhooksEnabled.Value.ToString().ToLower()));
-            }
-
-            if (AclEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AclEnabled", AclEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ReachabilityDebouncingEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReachabilityDebouncingEnabled", ReachabilityDebouncingEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ReachabilityDebouncingWindow != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReachabilityDebouncingWindow", ReachabilityDebouncingWindow.ToString()));
-            }
-
-            if (WebhooksFromRestEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhooksFromRestEnabled", WebhooksFromRestEnabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteServiceOptions
+  /// </summary>
+  public class DeleteServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// ReadServiceOptions
+    /// The SID of the Service resource to delete
     /// </summary>
-    public class ReadServiceOptions : ReadOptions<ServiceResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// UpdateServiceOptions
+    /// Construct a new DeleteServiceOptions
     /// </summary>
-    public class UpdateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The SID of the Service resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The URL we should call when Sync objects are manipulated
-        /// </summary>
-        public Uri WebhookUrl { get; set; }
-        /// <summary>
-        /// A string that you assign to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Whether the service instance should call webhook_url when client endpoints connect to Sync
-        /// </summary>
-        public bool? ReachabilityWebhooksEnabled { get; set; }
-        /// <summary>
-        /// Whether token identities in the Service must be granted access to Sync objects by using the Permissions resource
-        /// </summary>
-        public bool? AclEnabled { get; set; }
-        /// <summary>
-        /// Whether every endpoint_disconnected event occurs after a configurable delay
-        /// </summary>
-        public bool? ReachabilityDebouncingEnabled { get; set; }
-        /// <summary>
-        /// The reachability event delay in milliseconds
-        /// </summary>
-        public int? ReachabilityDebouncingWindow { get; set; }
-        /// <summary>
-        /// Whether the Service instance should call webhook_url when the REST API is used to update Sync objects
-        /// </summary>
-        public bool? WebhooksFromRestEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to update </param>
-        public UpdateServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (WebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (ReachabilityWebhooksEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReachabilityWebhooksEnabled", ReachabilityWebhooksEnabled.Value.ToString().ToLower()));
-            }
-
-            if (AclEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AclEnabled", AclEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ReachabilityDebouncingEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReachabilityDebouncingEnabled", ReachabilityDebouncingEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ReachabilityDebouncingWindow != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReachabilityDebouncingWindow", ReachabilityDebouncingWindow.ToString()));
-            }
-
-            if (WebhooksFromRestEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhooksFromRestEnabled", WebhooksFromRestEnabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathSid"> The SID of the Service resource to delete </param>
+    public DeleteServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateServiceOptions
+  /// </summary>
+  public class CreateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// A string that you assign to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The URL we should call when Sync objects are manipulated
+    /// </summary>
+    public Uri WebhookUrl { get; set; }
+    /// <summary>
+    /// Whether the service instance should call webhook_url when client endpoints connect to Sync
+    /// </summary>
+    public bool? ReachabilityWebhooksEnabled { get; set; }
+    /// <summary>
+    /// Whether token identities in the Service must be granted access to Sync objects by using the Permissions resource
+    /// </summary>
+    public bool? AclEnabled { get; set; }
+    /// <summary>
+    /// Whether every endpoint_disconnected event occurs after a configurable delay
+    /// </summary>
+    public bool? ReachabilityDebouncingEnabled { get; set; }
+    /// <summary>
+    /// The reachability event delay in milliseconds
+    /// </summary>
+    public int? ReachabilityDebouncingWindow { get; set; }
+    /// <summary>
+    /// Whether the Service instance should call webhook_url when the REST API is used to update Sync objects
+    /// </summary>
+    public bool? WebhooksFromRestEnabled { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (WebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
+      }
+
+      if (ReachabilityWebhooksEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReachabilityWebhooksEnabled", ReachabilityWebhooksEnabled.Value.ToString().ToLower()));
+      }
+
+      if (AclEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AclEnabled", AclEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ReachabilityDebouncingEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReachabilityDebouncingEnabled", ReachabilityDebouncingEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ReachabilityDebouncingWindow != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReachabilityDebouncingWindow", ReachabilityDebouncingWindow.ToString()));
+      }
+
+      if (WebhooksFromRestEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhooksFromRestEnabled", WebhooksFromRestEnabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadServiceOptions
+  /// </summary>
+  public class ReadServiceOptions : ReadOptions<ServiceResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateServiceOptions
+  /// </summary>
+  public class UpdateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The SID of the Service resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The URL we should call when Sync objects are manipulated
+    /// </summary>
+    public Uri WebhookUrl { get; set; }
+    /// <summary>
+    /// A string that you assign to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Whether the service instance should call webhook_url when client endpoints connect to Sync
+    /// </summary>
+    public bool? ReachabilityWebhooksEnabled { get; set; }
+    /// <summary>
+    /// Whether token identities in the Service must be granted access to Sync objects by using the Permissions resource
+    /// </summary>
+    public bool? AclEnabled { get; set; }
+    /// <summary>
+    /// Whether every endpoint_disconnected event occurs after a configurable delay
+    /// </summary>
+    public bool? ReachabilityDebouncingEnabled { get; set; }
+    /// <summary>
+    /// The reachability event delay in milliseconds
+    /// </summary>
+    public int? ReachabilityDebouncingWindow { get; set; }
+    /// <summary>
+    /// Whether the Service instance should call webhook_url when the REST API is used to update Sync objects
+    /// </summary>
+    public bool? WebhooksFromRestEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to update </param>
+    public UpdateServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (WebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookUrl", Serializers.Url(WebhookUrl)));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (ReachabilityWebhooksEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReachabilityWebhooksEnabled", ReachabilityWebhooksEnabled.Value.ToString().ToLower()));
+      }
+
+      if (AclEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AclEnabled", AclEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ReachabilityDebouncingEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReachabilityDebouncingEnabled", ReachabilityDebouncingEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ReachabilityDebouncingWindow != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReachabilityDebouncingWindow", ReachabilityDebouncingWindow.ToString()));
+      }
+
+      if (WebhooksFromRestEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhooksFromRestEnabled", WebhooksFromRestEnabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Sync/V1/ServiceResource.cs b/src/Twilio/Rest/Sync/V1/ServiceResource.cs
index 84435cdb4..10b1ff04b 100644
--- a/src/Twilio/Rest/Sync/V1/ServiceResource.cs
+++ b/src/Twilio/Rest/Sync/V1/ServiceResource.cs
@@ -16,569 +16,569 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Sync.V1
-{
-
-    public class ServiceResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string that you assign to describe the resource </param>
-        /// <param name="webhookUrl"> The URL we should call when Sync objects are manipulated </param>
-        /// <param name="reachabilityWebhooksEnabled"> Whether the service instance should call webhook_url when client
-        ///                                   endpoints connect to Sync </param>
-        /// <param name="aclEnabled"> Whether token identities in the Service must be granted access to Sync objects by using
-        ///                  the Permissions resource </param>
-        /// <param name="reachabilityDebouncingEnabled"> Whether every endpoint_disconnected event occurs after a configurable
-        ///                                     delay </param>
-        /// <param name="reachabilityDebouncingWindow"> The reachability event delay in milliseconds </param>
-        /// <param name="webhooksFromRestEnabled"> Whether the Service instance should call webhook_url when the REST API is
-        ///                               used to update Sync objects </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(string friendlyName = null,
-                                             Uri webhookUrl = null,
-                                             bool? reachabilityWebhooksEnabled = null,
-                                             bool? aclEnabled = null,
-                                             bool? reachabilityDebouncingEnabled = null,
-                                             int? reachabilityDebouncingWindow = null,
-                                             bool? webhooksFromRestEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(){FriendlyName = friendlyName, WebhookUrl = webhookUrl, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled, ReachabilityDebouncingEnabled = reachabilityDebouncingEnabled, ReachabilityDebouncingWindow = reachabilityDebouncingWindow, WebhooksFromRestEnabled = webhooksFromRestEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string that you assign to describe the resource </param>
-        /// <param name="webhookUrl"> The URL we should call when Sync objects are manipulated </param>
-        /// <param name="reachabilityWebhooksEnabled"> Whether the service instance should call webhook_url when client
-        ///                                   endpoints connect to Sync </param>
-        /// <param name="aclEnabled"> Whether token identities in the Service must be granted access to Sync objects by using
-        ///                  the Permissions resource </param>
-        /// <param name="reachabilityDebouncingEnabled"> Whether every endpoint_disconnected event occurs after a configurable
-        ///                                     delay </param>
-        /// <param name="reachabilityDebouncingWindow"> The reachability event delay in milliseconds </param>
-        /// <param name="webhooksFromRestEnabled"> Whether the Service instance should call webhook_url when the REST API is
-        ///                               used to update Sync objects </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName = null,
-                                                                                     Uri webhookUrl = null,
-                                                                                     bool? reachabilityWebhooksEnabled = null,
-                                                                                     bool? aclEnabled = null,
-                                                                                     bool? reachabilityDebouncingEnabled = null,
-                                                                                     int? reachabilityDebouncingWindow = null,
-                                                                                     bool? webhooksFromRestEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(){FriendlyName = friendlyName, WebhookUrl = webhookUrl, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled, ReachabilityDebouncingEnabled = reachabilityDebouncingEnabled, ReachabilityDebouncingWindow = reachabilityDebouncingWindow, WebhooksFromRestEnabled = webhooksFromRestEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Sync,
-                "/v1/Services",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Sync)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Sync,
-                "/v1/Services/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to update </param>
-        /// <param name="webhookUrl"> The URL we should call when Sync objects are manipulated </param>
-        /// <param name="friendlyName"> A string that you assign to describe the resource </param>
-        /// <param name="reachabilityWebhooksEnabled"> Whether the service instance should call webhook_url when client
-        ///                                   endpoints connect to Sync </param>
-        /// <param name="aclEnabled"> Whether token identities in the Service must be granted access to Sync objects by using
-        ///                  the Permissions resource </param>
-        /// <param name="reachabilityDebouncingEnabled"> Whether every endpoint_disconnected event occurs after a configurable
-        ///                                     delay </param>
-        /// <param name="reachabilityDebouncingWindow"> The reachability event delay in milliseconds </param>
-        /// <param name="webhooksFromRestEnabled"> Whether the Service instance should call webhook_url when the REST API is
-        ///                               used to update Sync objects </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(string pathSid,
-                                             Uri webhookUrl = null,
-                                             string friendlyName = null,
-                                             bool? reachabilityWebhooksEnabled = null,
-                                             bool? aclEnabled = null,
-                                             bool? reachabilityDebouncingEnabled = null,
-                                             int? reachabilityDebouncingWindow = null,
-                                             bool? webhooksFromRestEnabled = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){WebhookUrl = webhookUrl, FriendlyName = friendlyName, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled, ReachabilityDebouncingEnabled = reachabilityDebouncingEnabled, ReachabilityDebouncingWindow = reachabilityDebouncingWindow, WebhooksFromRestEnabled = webhooksFromRestEnabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Service resource to update </param>
-        /// <param name="webhookUrl"> The URL we should call when Sync objects are manipulated </param>
-        /// <param name="friendlyName"> A string that you assign to describe the resource </param>
-        /// <param name="reachabilityWebhooksEnabled"> Whether the service instance should call webhook_url when client
-        ///                                   endpoints connect to Sync </param>
-        /// <param name="aclEnabled"> Whether token identities in the Service must be granted access to Sync objects by using
-        ///                  the Permissions resource </param>
-        /// <param name="reachabilityDebouncingEnabled"> Whether every endpoint_disconnected event occurs after a configurable
-        ///                                     delay </param>
-        /// <param name="reachabilityDebouncingWindow"> The reachability event delay in milliseconds </param>
-        /// <param name="webhooksFromRestEnabled"> Whether the Service instance should call webhook_url when the REST API is
-        ///                               used to update Sync objects </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
-                                                                                     Uri webhookUrl = null,
-                                                                                     string friendlyName = null,
-                                                                                     bool? reachabilityWebhooksEnabled = null,
-                                                                                     bool? aclEnabled = null,
-                                                                                     bool? reachabilityDebouncingEnabled = null,
-                                                                                     int? reachabilityDebouncingWindow = null,
-                                                                                     bool? webhooksFromRestEnabled = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){WebhookUrl = webhookUrl, FriendlyName = friendlyName, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled, ReachabilityDebouncingEnabled = reachabilityDebouncingEnabled, ReachabilityDebouncingWindow = reachabilityDebouncingWindow, WebhooksFromRestEnabled = webhooksFromRestEnabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ServiceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ServiceResource object represented by the provided JSON </returns>
-        public static ServiceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ServiceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Service resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URL we call when Sync objects are manipulated
-        /// </summary>
-        [JsonProperty("webhook_url")]
-        public Uri WebhookUrl { get; private set; }
-        /// <summary>
-        /// Whether the Service instance should call webhook_url when the REST API is used to update Sync objects
-        /// </summary>
-        [JsonProperty("webhooks_from_rest_enabled")]
-        public bool? WebhooksFromRestEnabled { get; private set; }
-        /// <summary>
-        /// Whether the service instance calls webhook_url when client endpoints connect to Sync
-        /// </summary>
-        [JsonProperty("reachability_webhooks_enabled")]
-        public bool? ReachabilityWebhooksEnabled { get; private set; }
-        /// <summary>
-        /// Whether token identities in the Service must be granted access to Sync objects by using the Permissions resource
-        /// </summary>
-        [JsonProperty("acl_enabled")]
-        public bool? AclEnabled { get; private set; }
-        /// <summary>
-        /// Whether every endpoint_disconnected event occurs after a configurable delay
-        /// </summary>
-        [JsonProperty("reachability_debouncing_enabled")]
-        public bool? ReachabilityDebouncingEnabled { get; private set; }
-        /// <summary>
-        /// The reachability event delay in milliseconds
-        /// </summary>
-        [JsonProperty("reachability_debouncing_window")]
-        public int? ReachabilityDebouncingWindow { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ServiceResource()
-        {
-
-        }
-    }
+{
+
+  public class ServiceResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string that you assign to describe the resource </param>
+    /// <param name="webhookUrl"> The URL we should call when Sync objects are manipulated </param>
+    /// <param name="reachabilityWebhooksEnabled"> Whether the service instance should call webhook_url when client
+    ///                                   endpoints connect to Sync </param>
+    /// <param name="aclEnabled"> Whether token identities in the Service must be granted access to Sync objects by using
+    ///                  the Permissions resource </param>
+    /// <param name="reachabilityDebouncingEnabled"> Whether every endpoint_disconnected event occurs after a configurable
+    ///                                     delay </param>
+    /// <param name="reachabilityDebouncingWindow"> The reachability event delay in milliseconds </param>
+    /// <param name="webhooksFromRestEnabled"> Whether the Service instance should call webhook_url when the REST API is
+    ///                               used to update Sync objects </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(string friendlyName = null,
+                                         Uri webhookUrl = null,
+                                         bool? reachabilityWebhooksEnabled = null,
+                                         bool? aclEnabled = null,
+                                         bool? reachabilityDebouncingEnabled = null,
+                                         int? reachabilityDebouncingWindow = null,
+                                         bool? webhooksFromRestEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions() { FriendlyName = friendlyName, WebhookUrl = webhookUrl, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled, ReachabilityDebouncingEnabled = reachabilityDebouncingEnabled, ReachabilityDebouncingWindow = reachabilityDebouncingWindow, WebhooksFromRestEnabled = webhooksFromRestEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string that you assign to describe the resource </param>
+    /// <param name="webhookUrl"> The URL we should call when Sync objects are manipulated </param>
+    /// <param name="reachabilityWebhooksEnabled"> Whether the service instance should call webhook_url when client
+    ///                                   endpoints connect to Sync </param>
+    /// <param name="aclEnabled"> Whether token identities in the Service must be granted access to Sync objects by using
+    ///                  the Permissions resource </param>
+    /// <param name="reachabilityDebouncingEnabled"> Whether every endpoint_disconnected event occurs after a configurable
+    ///                                     delay </param>
+    /// <param name="reachabilityDebouncingWindow"> The reachability event delay in milliseconds </param>
+    /// <param name="webhooksFromRestEnabled"> Whether the Service instance should call webhook_url when the REST API is
+    ///                               used to update Sync objects </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName = null,
+                                                                                 Uri webhookUrl = null,
+                                                                                 bool? reachabilityWebhooksEnabled = null,
+                                                                                 bool? aclEnabled = null,
+                                                                                 bool? reachabilityDebouncingEnabled = null,
+                                                                                 int? reachabilityDebouncingWindow = null,
+                                                                                 bool? webhooksFromRestEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions() { FriendlyName = friendlyName, WebhookUrl = webhookUrl, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled, ReachabilityDebouncingEnabled = reachabilityDebouncingEnabled, ReachabilityDebouncingWindow = reachabilityDebouncingWindow, WebhooksFromRestEnabled = webhooksFromRestEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Sync,
+          "/v1/Services",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Sync)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Sync,
+          "/v1/Services/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to update </param>
+    /// <param name="webhookUrl"> The URL we should call when Sync objects are manipulated </param>
+    /// <param name="friendlyName"> A string that you assign to describe the resource </param>
+    /// <param name="reachabilityWebhooksEnabled"> Whether the service instance should call webhook_url when client
+    ///                                   endpoints connect to Sync </param>
+    /// <param name="aclEnabled"> Whether token identities in the Service must be granted access to Sync objects by using
+    ///                  the Permissions resource </param>
+    /// <param name="reachabilityDebouncingEnabled"> Whether every endpoint_disconnected event occurs after a configurable
+    ///                                     delay </param>
+    /// <param name="reachabilityDebouncingWindow"> The reachability event delay in milliseconds </param>
+    /// <param name="webhooksFromRestEnabled"> Whether the Service instance should call webhook_url when the REST API is
+    ///                               used to update Sync objects </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(string pathSid,
+                                         Uri webhookUrl = null,
+                                         string friendlyName = null,
+                                         bool? reachabilityWebhooksEnabled = null,
+                                         bool? aclEnabled = null,
+                                         bool? reachabilityDebouncingEnabled = null,
+                                         int? reachabilityDebouncingWindow = null,
+                                         bool? webhooksFromRestEnabled = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { WebhookUrl = webhookUrl, FriendlyName = friendlyName, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled, ReachabilityDebouncingEnabled = reachabilityDebouncingEnabled, ReachabilityDebouncingWindow = reachabilityDebouncingWindow, WebhooksFromRestEnabled = webhooksFromRestEnabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Service resource to update </param>
+    /// <param name="webhookUrl"> The URL we should call when Sync objects are manipulated </param>
+    /// <param name="friendlyName"> A string that you assign to describe the resource </param>
+    /// <param name="reachabilityWebhooksEnabled"> Whether the service instance should call webhook_url when client
+    ///                                   endpoints connect to Sync </param>
+    /// <param name="aclEnabled"> Whether token identities in the Service must be granted access to Sync objects by using
+    ///                  the Permissions resource </param>
+    /// <param name="reachabilityDebouncingEnabled"> Whether every endpoint_disconnected event occurs after a configurable
+    ///                                     delay </param>
+    /// <param name="reachabilityDebouncingWindow"> The reachability event delay in milliseconds </param>
+    /// <param name="webhooksFromRestEnabled"> Whether the Service instance should call webhook_url when the REST API is
+    ///                               used to update Sync objects </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
+                                                                                 Uri webhookUrl = null,
+                                                                                 string friendlyName = null,
+                                                                                 bool? reachabilityWebhooksEnabled = null,
+                                                                                 bool? aclEnabled = null,
+                                                                                 bool? reachabilityDebouncingEnabled = null,
+                                                                                 int? reachabilityDebouncingWindow = null,
+                                                                                 bool? webhooksFromRestEnabled = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { WebhookUrl = webhookUrl, FriendlyName = friendlyName, ReachabilityWebhooksEnabled = reachabilityWebhooksEnabled, AclEnabled = aclEnabled, ReachabilityDebouncingEnabled = reachabilityDebouncingEnabled, ReachabilityDebouncingWindow = reachabilityDebouncingWindow, WebhooksFromRestEnabled = webhooksFromRestEnabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ServiceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ServiceResource object represented by the provided JSON </returns>
+    public static ServiceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ServiceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Service resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URL we call when Sync objects are manipulated
+    /// </summary>
+    [JsonProperty("webhook_url")]
+    public Uri WebhookUrl { get; private set; }
+    /// <summary>
+    /// Whether the Service instance should call webhook_url when the REST API is used to update Sync objects
+    /// </summary>
+    [JsonProperty("webhooks_from_rest_enabled")]
+    public bool? WebhooksFromRestEnabled { get; private set; }
+    /// <summary>
+    /// Whether the service instance calls webhook_url when client endpoints connect to Sync
+    /// </summary>
+    [JsonProperty("reachability_webhooks_enabled")]
+    public bool? ReachabilityWebhooksEnabled { get; private set; }
+    /// <summary>
+    /// Whether token identities in the Service must be granted access to Sync objects by using the Permissions resource
+    /// </summary>
+    [JsonProperty("acl_enabled")]
+    public bool? AclEnabled { get; private set; }
+    /// <summary>
+    /// Whether every endpoint_disconnected event occurs after a configurable delay
+    /// </summary>
+    [JsonProperty("reachability_debouncing_enabled")]
+    public bool? ReachabilityDebouncingEnabled { get; private set; }
+    /// <summary>
+    /// The reachability event delay in milliseconds
+    /// </summary>
+    [JsonProperty("reachability_debouncing_window")]
+    public int? ReachabilityDebouncingWindow { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ServiceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/ActivityOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/ActivityOptions.cs
index 025d96f17..e1be97d16 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/ActivityOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/ActivityOptions.cs
@@ -9,221 +9,221 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
+{
+
+  /// <summary>
+  /// FetchActivityOptions
+  /// </summary>
+  public class FetchActivityOptions : IOptions<ActivityResource>
+  {
     /// <summary>
-    /// FetchActivityOptions
-    /// </summary>
-    public class FetchActivityOptions : IOptions<ActivityResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Activity resources to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchActivityOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        public FetchActivityOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Workspace with the Activity resources to fetch
+    /// </summary>
+    public string PathWorkspaceSid { get; }
     /// <summary>
-    /// UpdateActivityOptions
-    /// </summary>
-    public class UpdateActivityOptions : IOptions<ActivityResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Activity resources to update
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the Activity resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the Activity resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateActivityOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to update </param>
-        /// <param name="pathSid"> The SID of the Activity resource to update </param>
-        public UpdateActivityOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteActivityOptions
-    /// </summary>
-    public class DeleteActivityOptions : IOptions<ActivityResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Activity resources to delete
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the Activity resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteActivityOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to delete </param>
-        /// <param name="pathSid"> The SID of the Activity resource to delete </param>
-        public DeleteActivityOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Construct a new FetchActivityOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    public FetchActivityOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadActivityOptions
-    /// </summary>
-    public class ReadActivityOptions : ReadOptions<ActivityResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Activity resources to read
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The friendly_name of the Activity resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Whether to return activities that are available or unavailable
-        /// </summary>
-        public string Available { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadActivityOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to read </param>
-        public ReadActivityOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Available != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Available", Available));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateActivityOptions
+  /// </summary>
+  public class UpdateActivityOptions : IOptions<ActivityResource>
+  {
     /// <summary>
-    /// CreateActivityOptions
-    /// </summary>
-    public class CreateActivityOptions : IOptions<ActivityResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace that the new Activity belongs to
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// A string to describe the Activity resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// Whether the Worker should be eligible to receive a Task when it occupies the Activity
-        /// </summary>
-        public bool? Available { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateActivityOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Activity belongs to </param>
-        /// <param name="friendlyName"> A string to describe the Activity resource </param>
-        public CreateActivityOptions(string pathWorkspaceSid, string friendlyName)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Available != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Available", Available.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Workspace with the Activity resources to update
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the Activity resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the Activity resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateActivityOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to update </param>
+    /// <param name="pathSid"> The SID of the Activity resource to update </param>
+    public UpdateActivityOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteActivityOptions
+  /// </summary>
+  public class DeleteActivityOptions : IOptions<ActivityResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the Activity resources to delete
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the Activity resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteActivityOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to delete </param>
+    /// <param name="pathSid"> The SID of the Activity resource to delete </param>
+    public DeleteActivityOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadActivityOptions
+  /// </summary>
+  public class ReadActivityOptions : ReadOptions<ActivityResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the Activity resources to read
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The friendly_name of the Activity resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Whether to return activities that are available or unavailable
+    /// </summary>
+    public string Available { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadActivityOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to read </param>
+    public ReadActivityOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Available != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Available", Available));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateActivityOptions
+  /// </summary>
+  public class CreateActivityOptions : IOptions<ActivityResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace that the new Activity belongs to
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// A string to describe the Activity resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// Whether the Worker should be eligible to receive a Task when it occupies the Activity
+    /// </summary>
+    public bool? Available { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateActivityOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Activity belongs to </param>
+    /// <param name="friendlyName"> A string to describe the Activity resource </param>
+    public CreateActivityOptions(string pathWorkspaceSid, string friendlyName)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Available != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Available", Available.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/ActivityResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/ActivityResource.cs
index b47304a6f..342f00c04 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/ActivityResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/ActivityResource.cs
@@ -16,513 +16,513 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
-    public class ActivityResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchActivityOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Activities/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Activity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Activity </returns>
-        public static ActivityResource Fetch(FetchActivityOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Activity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Activity </returns>
-        public static async System.Threading.Tasks.Task<ActivityResource> FetchAsync(FetchActivityOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Activity </returns>
-        public static ActivityResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchActivityOptions(pathWorkspaceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Activity </returns>
-        public static async System.Threading.Tasks.Task<ActivityResource> FetchAsync(string pathWorkspaceSid,
-                                                                                     string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchActivityOptions(pathWorkspaceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateActivityOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Activities/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Activity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Activity </returns>
-        public static ActivityResource Update(UpdateActivityOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Activity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Activity </returns>
-        public static async System.Threading.Tasks.Task<ActivityResource> UpdateAsync(UpdateActivityOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to update </param>
-        /// <param name="pathSid"> The SID of the Activity resource to update </param>
-        /// <param name="friendlyName"> A string to describe the Activity resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Activity </returns>
-        public static ActivityResource Update(string pathWorkspaceSid,
-                                              string pathSid,
-                                              string friendlyName = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateActivityOptions(pathWorkspaceSid, pathSid){FriendlyName = friendlyName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to update </param>
-        /// <param name="pathSid"> The SID of the Activity resource to update </param>
-        /// <param name="friendlyName"> A string to describe the Activity resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Activity </returns>
-        public static async System.Threading.Tasks.Task<ActivityResource> UpdateAsync(string pathWorkspaceSid,
-                                                                                      string pathSid,
-                                                                                      string friendlyName = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateActivityOptions(pathWorkspaceSid, pathSid){FriendlyName = friendlyName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteActivityOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Activities/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Activity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Activity </returns>
-        public static bool Delete(DeleteActivityOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Activity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Activity </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteActivityOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to delete </param>
-        /// <param name="pathSid"> The SID of the Activity resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Activity </returns>
-        public static bool Delete(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteActivityOptions(pathWorkspaceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to delete </param>
-        /// <param name="pathSid"> The SID of the Activity resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Activity </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathWorkspaceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteActivityOptions(pathWorkspaceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadActivityOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Activities",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Activity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Activity </returns>
-        public static ResourceSet<ActivityResource> Read(ReadActivityOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ActivityResource>.FromJson("activities", response.Content);
-            return new ResourceSet<ActivityResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Activity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Activity </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ActivityResource>> ReadAsync(ReadActivityOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ActivityResource>.FromJson("activities", response.Content);
-            return new ResourceSet<ActivityResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to read </param>
-        /// <param name="friendlyName"> The friendly_name of the Activity resources to read </param>
-        /// <param name="available"> Whether to return activities that are available or unavailable </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Activity </returns>
-        public static ResourceSet<ActivityResource> Read(string pathWorkspaceSid,
-                                                         string friendlyName = null,
-                                                         string available = null,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadActivityOptions(pathWorkspaceSid){FriendlyName = friendlyName, Available = available, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to read </param>
-        /// <param name="friendlyName"> The friendly_name of the Activity resources to read </param>
-        /// <param name="available"> Whether to return activities that are available or unavailable </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Activity </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ActivityResource>> ReadAsync(string pathWorkspaceSid,
-                                                                                                 string friendlyName = null,
-                                                                                                 string available = null,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadActivityOptions(pathWorkspaceSid){FriendlyName = friendlyName, Available = available, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ActivityResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ActivityResource>.FromJson("activities", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ActivityResource> NextPage(Page<ActivityResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<ActivityResource>.FromJson("activities", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ActivityResource> PreviousPage(Page<ActivityResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<ActivityResource>.FromJson("activities", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateActivityOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Activities",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Activity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Activity </returns>
-        public static ActivityResource Create(CreateActivityOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Activity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Activity </returns>
-        public static async System.Threading.Tasks.Task<ActivityResource> CreateAsync(CreateActivityOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Activity belongs to </param>
-        /// <param name="friendlyName"> A string to describe the Activity resource </param>
-        /// <param name="available"> Whether the Worker should be eligible to receive a Task when it occupies the Activity
-        ///                 </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Activity </returns>
-        public static ActivityResource Create(string pathWorkspaceSid,
-                                              string friendlyName,
-                                              bool? available = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateActivityOptions(pathWorkspaceSid, friendlyName){Available = available};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Activity belongs to </param>
-        /// <param name="friendlyName"> A string to describe the Activity resource </param>
-        /// <param name="available"> Whether the Worker should be eligible to receive a Task when it occupies the Activity
-        ///                 </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Activity </returns>
-        public static async System.Threading.Tasks.Task<ActivityResource> CreateAsync(string pathWorkspaceSid,
-                                                                                      string friendlyName,
-                                                                                      bool? available = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateActivityOptions(pathWorkspaceSid, friendlyName){Available = available};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ActivityResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ActivityResource object represented by the provided JSON </returns>
-        public static ActivityResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ActivityResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Whether the Worker should be eligible to receive a Task when it occupies the Activity
-        /// </summary>
-        [JsonProperty("available")]
-        public bool? Available { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the Activity resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the Activity
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Activity resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The links
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ActivityResource()
-        {
-
-        }
-    }
+{
+
+  public class ActivityResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchActivityOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Activities/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Activity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Activity </returns>
+    public static ActivityResource Fetch(FetchActivityOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Activity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Activity </returns>
+    public static async System.Threading.Tasks.Task<ActivityResource> FetchAsync(FetchActivityOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Activity </returns>
+    public static ActivityResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchActivityOptions(pathWorkspaceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Activity </returns>
+    public static async System.Threading.Tasks.Task<ActivityResource> FetchAsync(string pathWorkspaceSid,
+                                                                                 string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchActivityOptions(pathWorkspaceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateActivityOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Activities/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Activity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Activity </returns>
+    public static ActivityResource Update(UpdateActivityOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Activity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Activity </returns>
+    public static async System.Threading.Tasks.Task<ActivityResource> UpdateAsync(UpdateActivityOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to update </param>
+    /// <param name="pathSid"> The SID of the Activity resource to update </param>
+    /// <param name="friendlyName"> A string to describe the Activity resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Activity </returns>
+    public static ActivityResource Update(string pathWorkspaceSid,
+                                          string pathSid,
+                                          string friendlyName = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateActivityOptions(pathWorkspaceSid, pathSid) { FriendlyName = friendlyName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to update </param>
+    /// <param name="pathSid"> The SID of the Activity resource to update </param>
+    /// <param name="friendlyName"> A string to describe the Activity resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Activity </returns>
+    public static async System.Threading.Tasks.Task<ActivityResource> UpdateAsync(string pathWorkspaceSid,
+                                                                                  string pathSid,
+                                                                                  string friendlyName = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateActivityOptions(pathWorkspaceSid, pathSid) { FriendlyName = friendlyName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteActivityOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Activities/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Activity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Activity </returns>
+    public static bool Delete(DeleteActivityOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Activity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Activity </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteActivityOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to delete </param>
+    /// <param name="pathSid"> The SID of the Activity resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Activity </returns>
+    public static bool Delete(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteActivityOptions(pathWorkspaceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to delete </param>
+    /// <param name="pathSid"> The SID of the Activity resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Activity </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathWorkspaceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteActivityOptions(pathWorkspaceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadActivityOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Activities",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Activity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Activity </returns>
+    public static ResourceSet<ActivityResource> Read(ReadActivityOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ActivityResource>.FromJson("activities", response.Content);
+      return new ResourceSet<ActivityResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Activity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Activity </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ActivityResource>> ReadAsync(ReadActivityOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ActivityResource>.FromJson("activities", response.Content);
+      return new ResourceSet<ActivityResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to read </param>
+    /// <param name="friendlyName"> The friendly_name of the Activity resources to read </param>
+    /// <param name="available"> Whether to return activities that are available or unavailable </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Activity </returns>
+    public static ResourceSet<ActivityResource> Read(string pathWorkspaceSid,
+                                                     string friendlyName = null,
+                                                     string available = null,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadActivityOptions(pathWorkspaceSid) { FriendlyName = friendlyName, Available = available, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Activity resources to read </param>
+    /// <param name="friendlyName"> The friendly_name of the Activity resources to read </param>
+    /// <param name="available"> Whether to return activities that are available or unavailable </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Activity </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ActivityResource>> ReadAsync(string pathWorkspaceSid,
+                                                                                             string friendlyName = null,
+                                                                                             string available = null,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadActivityOptions(pathWorkspaceSid) { FriendlyName = friendlyName, Available = available, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ActivityResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ActivityResource>.FromJson("activities", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ActivityResource> NextPage(Page<ActivityResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<ActivityResource>.FromJson("activities", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ActivityResource> PreviousPage(Page<ActivityResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<ActivityResource>.FromJson("activities", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateActivityOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Activities",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Activity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Activity </returns>
+    public static ActivityResource Create(CreateActivityOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Activity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Activity </returns>
+    public static async System.Threading.Tasks.Task<ActivityResource> CreateAsync(CreateActivityOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Activity belongs to </param>
+    /// <param name="friendlyName"> A string to describe the Activity resource </param>
+    /// <param name="available"> Whether the Worker should be eligible to receive a Task when it occupies the Activity
+    ///                 </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Activity </returns>
+    public static ActivityResource Create(string pathWorkspaceSid,
+                                          string friendlyName,
+                                          bool? available = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateActivityOptions(pathWorkspaceSid, friendlyName) { Available = available };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Activity belongs to </param>
+    /// <param name="friendlyName"> A string to describe the Activity resource </param>
+    /// <param name="available"> Whether the Worker should be eligible to receive a Task when it occupies the Activity
+    ///                 </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Activity </returns>
+    public static async System.Threading.Tasks.Task<ActivityResource> CreateAsync(string pathWorkspaceSid,
+                                                                                  string friendlyName,
+                                                                                  bool? available = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateActivityOptions(pathWorkspaceSid, friendlyName) { Available = available };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ActivityResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ActivityResource object represented by the provided JSON </returns>
+    public static ActivityResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ActivityResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Whether the Worker should be eligible to receive a Task when it occupies the Activity
+    /// </summary>
+    [JsonProperty("available")]
+    public bool? Available { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the Activity resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the Activity
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Activity resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The links
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ActivityResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/EventOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/EventOptions.cs
index 5504e75a6..2a799cd9d 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/EventOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/EventOptions.cs
@@ -9,174 +9,174 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
+{
+
+  /// <summary>
+  /// FetchEventOptions
+  /// </summary>
+  public class FetchEventOptions : IOptions<EventResource>
+  {
     /// <summary>
-    /// FetchEventOptions
-    /// </summary>
-    public class FetchEventOptions : IOptions<EventResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Event to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchEventOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Event to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        public FetchEventOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Workspace with the Event to fetch
+    /// </summary>
+    public string PathWorkspaceSid { get; }
     /// <summary>
-    /// ReadEventOptions
-    /// </summary>
-    public class ReadEventOptions : ReadOptions<EventResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Events to read
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// The type of Events to read
-        /// </summary>
-        public string EventType { get; set; }
-        /// <summary>
-        /// The period of events to read in minutes
-        /// </summary>
-        public int? Minutes { get; set; }
-        /// <summary>
-        /// The SID of the Reservation with the Events to read
-        /// </summary>
-        public string ReservationSid { get; set; }
-        /// <summary>
-        /// Only include Events from on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// The SID of the TaskQueue with the Events to read
-        /// </summary>
-        public string TaskQueueSid { get; set; }
-        /// <summary>
-        /// The SID of the Task with the Events to read
-        /// </summary>
-        public string TaskSid { get; set; }
-        /// <summary>
-        /// The SID of the Worker with the Events to read
-        /// </summary>
-        public string WorkerSid { get; set; }
-        /// <summary>
-        /// The SID of the Worker with the Events to read
-        /// </summary>
-        public string WorkflowSid { get; set; }
-        /// <summary>
-        /// The TaskChannel with the Events to read
-        /// </summary>
-        public string TaskChannel { get; set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string Sid { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadEventOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Events to read </param>
-        public ReadEventOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (EventType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EventType", EventType));
-            }
-
-            if (Minutes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
-            }
-
-            if (ReservationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReservationSid", ReservationSid.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (TaskQueueSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskQueueSid", TaskQueueSid.ToString()));
-            }
-
-            if (TaskSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskSid", TaskSid.ToString()));
-            }
-
-            if (WorkerSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WorkerSid", WorkerSid.ToString()));
-            }
-
-            if (WorkflowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WorkflowSid", WorkflowSid.ToString()));
-            }
-
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            if (Sid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sid", Sid.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchEventOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Event to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    public FetchEventOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadEventOptions
+  /// </summary>
+  public class ReadEventOptions : ReadOptions<EventResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the Events to read
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// The type of Events to read
+    /// </summary>
+    public string EventType { get; set; }
+    /// <summary>
+    /// The period of events to read in minutes
+    /// </summary>
+    public int? Minutes { get; set; }
+    /// <summary>
+    /// The SID of the Reservation with the Events to read
+    /// </summary>
+    public string ReservationSid { get; set; }
+    /// <summary>
+    /// Only include Events from on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// The SID of the TaskQueue with the Events to read
+    /// </summary>
+    public string TaskQueueSid { get; set; }
+    /// <summary>
+    /// The SID of the Task with the Events to read
+    /// </summary>
+    public string TaskSid { get; set; }
+    /// <summary>
+    /// The SID of the Worker with the Events to read
+    /// </summary>
+    public string WorkerSid { get; set; }
+    /// <summary>
+    /// The SID of the Worker with the Events to read
+    /// </summary>
+    public string WorkflowSid { get; set; }
+    /// <summary>
+    /// The TaskChannel with the Events to read
+    /// </summary>
+    public string TaskChannel { get; set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string Sid { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadEventOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Events to read </param>
+    public ReadEventOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (EventType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EventType", EventType));
+      }
+
+      if (Minutes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
+      }
+
+      if (ReservationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReservationSid", ReservationSid.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (TaskQueueSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskQueueSid", TaskQueueSid.ToString()));
+      }
+
+      if (TaskSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskSid", TaskSid.ToString()));
+      }
+
+      if (WorkerSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WorkerSid", WorkerSid.ToString()));
+      }
+
+      if (WorkflowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WorkflowSid", WorkflowSid.ToString()));
+      }
+
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      if (Sid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sid", Sid.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/EventResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/EventResource.cs
index 8ef5ff780..612de8690 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/EventResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/EventResource.cs
@@ -16,365 +16,365 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
-    public class EventResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchEventOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Events/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Event parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Event </returns>
-        public static EventResource Fetch(FetchEventOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Event parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Event </returns>
-        public static async System.Threading.Tasks.Task<EventResource> FetchAsync(FetchEventOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Event to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Event </returns>
-        public static EventResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchEventOptions(pathWorkspaceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Event to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Event </returns>
-        public static async System.Threading.Tasks.Task<EventResource> FetchAsync(string pathWorkspaceSid,
-                                                                                  string pathSid,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchEventOptions(pathWorkspaceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadEventOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Events",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Event parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Event </returns>
-        public static ResourceSet<EventResource> Read(ReadEventOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<EventResource>.FromJson("events", response.Content);
-            return new ResourceSet<EventResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Event parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Event </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(ReadEventOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<EventResource>.FromJson("events", response.Content);
-            return new ResourceSet<EventResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Events to read </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="eventType"> The type of Events to read </param>
-        /// <param name="minutes"> The period of events to read in minutes </param>
-        /// <param name="reservationSid"> The SID of the Reservation with the Events to read </param>
-        /// <param name="startDate"> Only include Events from on or after this date </param>
-        /// <param name="taskQueueSid"> The SID of the TaskQueue with the Events to read </param>
-        /// <param name="taskSid"> The SID of the Task with the Events to read </param>
-        /// <param name="workerSid"> The SID of the Worker with the Events to read </param>
-        /// <param name="workflowSid"> The SID of the Worker with the Events to read </param>
-        /// <param name="taskChannel"> The TaskChannel with the Events to read </param>
-        /// <param name="sid"> The unique string that identifies the resource </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Event </returns>
-        public static ResourceSet<EventResource> Read(string pathWorkspaceSid,
-                                                      DateTime? endDate = null,
-                                                      string eventType = null,
-                                                      int? minutes = null,
-                                                      string reservationSid = null,
-                                                      DateTime? startDate = null,
-                                                      string taskQueueSid = null,
-                                                      string taskSid = null,
-                                                      string workerSid = null,
-                                                      string workflowSid = null,
-                                                      string taskChannel = null,
-                                                      string sid = null,
-                                                      int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadEventOptions(pathWorkspaceSid){EndDate = endDate, EventType = eventType, Minutes = minutes, ReservationSid = reservationSid, StartDate = startDate, TaskQueueSid = taskQueueSid, TaskSid = taskSid, WorkerSid = workerSid, WorkflowSid = workflowSid, TaskChannel = taskChannel, Sid = sid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Events to read </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="eventType"> The type of Events to read </param>
-        /// <param name="minutes"> The period of events to read in minutes </param>
-        /// <param name="reservationSid"> The SID of the Reservation with the Events to read </param>
-        /// <param name="startDate"> Only include Events from on or after this date </param>
-        /// <param name="taskQueueSid"> The SID of the TaskQueue with the Events to read </param>
-        /// <param name="taskSid"> The SID of the Task with the Events to read </param>
-        /// <param name="workerSid"> The SID of the Worker with the Events to read </param>
-        /// <param name="workflowSid"> The SID of the Worker with the Events to read </param>
-        /// <param name="taskChannel"> The TaskChannel with the Events to read </param>
-        /// <param name="sid"> The unique string that identifies the resource </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Event </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(string pathWorkspaceSid,
-                                                                                              DateTime? endDate = null,
-                                                                                              string eventType = null,
-                                                                                              int? minutes = null,
-                                                                                              string reservationSid = null,
-                                                                                              DateTime? startDate = null,
-                                                                                              string taskQueueSid = null,
-                                                                                              string taskSid = null,
-                                                                                              string workerSid = null,
-                                                                                              string workflowSid = null,
-                                                                                              string taskChannel = null,
-                                                                                              string sid = null,
-                                                                                              int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadEventOptions(pathWorkspaceSid){EndDate = endDate, EventType = eventType, Minutes = minutes, ReservationSid = reservationSid, StartDate = startDate, TaskQueueSid = taskQueueSid, TaskSid = taskSid, WorkerSid = workerSid, WorkflowSid = workflowSid, TaskChannel = taskChannel, Sid = sid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<EventResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<EventResource>.FromJson("events", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<EventResource> NextPage(Page<EventResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<EventResource>.FromJson("events", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<EventResource> PreviousPage(Page<EventResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<EventResource>.FromJson("events", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a EventResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EventResource object represented by the provided JSON </returns>
-        public static EventResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EventResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the resource that triggered the event
-        /// </summary>
-        [JsonProperty("actor_sid")]
-        public string ActorSid { get; private set; }
-        /// <summary>
-        /// The type of resource that triggered the event
-        /// </summary>
-        [JsonProperty("actor_type")]
-        public string ActorType { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource that triggered the event
-        /// </summary>
-        [JsonProperty("actor_url")]
-        public Uri ActorUrl { get; private set; }
-        /// <summary>
-        /// A description of the event
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// Data about the event
-        /// </summary>
-        [JsonProperty("event_data")]
-        public object EventData { get; private set; }
-        /// <summary>
-        /// The time the event was sent
-        /// </summary>
-        [JsonProperty("event_date")]
-        public DateTime? EventDate { get; private set; }
-        /// <summary>
-        /// The time the event was sent in milliseconds
-        /// </summary>
-        [JsonProperty("event_date_ms")]
-        public long? EventDateMs { get; private set; }
-        /// <summary>
-        /// The identifier for the event
-        /// </summary>
-        [JsonProperty("event_type")]
-        public string EventType { get; private set; }
-        /// <summary>
-        /// The SID of the object the event is most relevant to
-        /// </summary>
-        [JsonProperty("resource_sid")]
-        public string ResourceSid { get; private set; }
-        /// <summary>
-        /// The type of object the event is most relevant to
-        /// </summary>
-        [JsonProperty("resource_type")]
-        public string ResourceType { get; private set; }
-        /// <summary>
-        /// The URL of the resource the event is most relevant to
-        /// </summary>
-        [JsonProperty("resource_url")]
-        public Uri ResourceUrl { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Where the Event originated
-        /// </summary>
-        [JsonProperty("source")]
-        public string Source { get; private set; }
-        /// <summary>
-        /// The IP from which the Event originated
-        /// </summary>
-        [JsonProperty("source_ip_address")]
-        public string SourceIpAddress { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Event resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the Event
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-
-        private EventResource()
-        {
-
-        }
-    }
+{
+
+  public class EventResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchEventOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Events/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Event parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Event </returns>
+    public static EventResource Fetch(FetchEventOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Event parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Event </returns>
+    public static async System.Threading.Tasks.Task<EventResource> FetchAsync(FetchEventOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Event to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Event </returns>
+    public static EventResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchEventOptions(pathWorkspaceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Event to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Event </returns>
+    public static async System.Threading.Tasks.Task<EventResource> FetchAsync(string pathWorkspaceSid,
+                                                                              string pathSid,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchEventOptions(pathWorkspaceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadEventOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Events",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Event parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Event </returns>
+    public static ResourceSet<EventResource> Read(ReadEventOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<EventResource>.FromJson("events", response.Content);
+      return new ResourceSet<EventResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Event parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Event </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(ReadEventOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<EventResource>.FromJson("events", response.Content);
+      return new ResourceSet<EventResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Events to read </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="eventType"> The type of Events to read </param>
+    /// <param name="minutes"> The period of events to read in minutes </param>
+    /// <param name="reservationSid"> The SID of the Reservation with the Events to read </param>
+    /// <param name="startDate"> Only include Events from on or after this date </param>
+    /// <param name="taskQueueSid"> The SID of the TaskQueue with the Events to read </param>
+    /// <param name="taskSid"> The SID of the Task with the Events to read </param>
+    /// <param name="workerSid"> The SID of the Worker with the Events to read </param>
+    /// <param name="workflowSid"> The SID of the Worker with the Events to read </param>
+    /// <param name="taskChannel"> The TaskChannel with the Events to read </param>
+    /// <param name="sid"> The unique string that identifies the resource </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Event </returns>
+    public static ResourceSet<EventResource> Read(string pathWorkspaceSid,
+                                                  DateTime? endDate = null,
+                                                  string eventType = null,
+                                                  int? minutes = null,
+                                                  string reservationSid = null,
+                                                  DateTime? startDate = null,
+                                                  string taskQueueSid = null,
+                                                  string taskSid = null,
+                                                  string workerSid = null,
+                                                  string workflowSid = null,
+                                                  string taskChannel = null,
+                                                  string sid = null,
+                                                  int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadEventOptions(pathWorkspaceSid) { EndDate = endDate, EventType = eventType, Minutes = minutes, ReservationSid = reservationSid, StartDate = startDate, TaskQueueSid = taskQueueSid, TaskSid = taskSid, WorkerSid = workerSid, WorkflowSid = workflowSid, TaskChannel = taskChannel, Sid = sid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Events to read </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="eventType"> The type of Events to read </param>
+    /// <param name="minutes"> The period of events to read in minutes </param>
+    /// <param name="reservationSid"> The SID of the Reservation with the Events to read </param>
+    /// <param name="startDate"> Only include Events from on or after this date </param>
+    /// <param name="taskQueueSid"> The SID of the TaskQueue with the Events to read </param>
+    /// <param name="taskSid"> The SID of the Task with the Events to read </param>
+    /// <param name="workerSid"> The SID of the Worker with the Events to read </param>
+    /// <param name="workflowSid"> The SID of the Worker with the Events to read </param>
+    /// <param name="taskChannel"> The TaskChannel with the Events to read </param>
+    /// <param name="sid"> The unique string that identifies the resource </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Event </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EventResource>> ReadAsync(string pathWorkspaceSid,
+                                                                                          DateTime? endDate = null,
+                                                                                          string eventType = null,
+                                                                                          int? minutes = null,
+                                                                                          string reservationSid = null,
+                                                                                          DateTime? startDate = null,
+                                                                                          string taskQueueSid = null,
+                                                                                          string taskSid = null,
+                                                                                          string workerSid = null,
+                                                                                          string workflowSid = null,
+                                                                                          string taskChannel = null,
+                                                                                          string sid = null,
+                                                                                          int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadEventOptions(pathWorkspaceSid) { EndDate = endDate, EventType = eventType, Minutes = minutes, ReservationSid = reservationSid, StartDate = startDate, TaskQueueSid = taskQueueSid, TaskSid = taskSid, WorkerSid = workerSid, WorkflowSid = workflowSid, TaskChannel = taskChannel, Sid = sid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<EventResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<EventResource>.FromJson("events", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<EventResource> NextPage(Page<EventResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<EventResource>.FromJson("events", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<EventResource> PreviousPage(Page<EventResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<EventResource>.FromJson("events", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a EventResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EventResource object represented by the provided JSON </returns>
+    public static EventResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EventResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the resource that triggered the event
+    /// </summary>
+    [JsonProperty("actor_sid")]
+    public string ActorSid { get; private set; }
+    /// <summary>
+    /// The type of resource that triggered the event
+    /// </summary>
+    [JsonProperty("actor_type")]
+    public string ActorType { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource that triggered the event
+    /// </summary>
+    [JsonProperty("actor_url")]
+    public Uri ActorUrl { get; private set; }
+    /// <summary>
+    /// A description of the event
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// Data about the event
+    /// </summary>
+    [JsonProperty("event_data")]
+    public object EventData { get; private set; }
+    /// <summary>
+    /// The time the event was sent
+    /// </summary>
+    [JsonProperty("event_date")]
+    public DateTime? EventDate { get; private set; }
+    /// <summary>
+    /// The time the event was sent in milliseconds
+    /// </summary>
+    [JsonProperty("event_date_ms")]
+    public long? EventDateMs { get; private set; }
+    /// <summary>
+    /// The identifier for the event
+    /// </summary>
+    [JsonProperty("event_type")]
+    public string EventType { get; private set; }
+    /// <summary>
+    /// The SID of the object the event is most relevant to
+    /// </summary>
+    [JsonProperty("resource_sid")]
+    public string ResourceSid { get; private set; }
+    /// <summary>
+    /// The type of object the event is most relevant to
+    /// </summary>
+    [JsonProperty("resource_type")]
+    public string ResourceType { get; private set; }
+    /// <summary>
+    /// The URL of the resource the event is most relevant to
+    /// </summary>
+    [JsonProperty("resource_url")]
+    public Uri ResourceUrl { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Where the Event originated
+    /// </summary>
+    [JsonProperty("source")]
+    public string Source { get; private set; }
+    /// <summary>
+    /// The IP from which the Event originated
+    /// </summary>
+    [JsonProperty("source_ip_address")]
+    public string SourceIpAddress { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Event resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the Event
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+
+    private EventResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Task/ReservationOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Task/ReservationOptions.cs
index b0b56406e..4f7bcb970 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Task/ReservationOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Task/ReservationOptions.cs
@@ -10,636 +10,636 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Task
-{
-
+{
+
+  /// <summary>
+  /// ReadReservationOptions
+  /// </summary>
+  public class ReadReservationOptions : ReadOptions<ReservationResource>
+  {
     /// <summary>
-    /// ReadReservationOptions
-    /// </summary>
-    public class ReadReservationOptions : ReadOptions<ReservationResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the TaskReservation resources to read
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the reserved Task resource with the TaskReservation resources to read
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// Returns the list of reservations for a task with a specified ReservationStatus
-        /// </summary>
-        public ReservationResource.StatusEnum ReservationStatus { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadReservationOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resources to read </param>
-        /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resources to read </param>
-        public ReadReservationOptions(string pathWorkspaceSid, string pathTaskSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathTaskSid = pathTaskSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ReservationStatus != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReservationStatus", ReservationStatus.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Workspace with the TaskReservation resources to read
+    /// </summary>
+    public string PathWorkspaceSid { get; }
     /// <summary>
-    /// FetchReservationOptions
-    /// </summary>
-    public class FetchReservationOptions : IOptions<ReservationResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the TaskReservation resource to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the reserved Task resource with the TaskReservation resource to fetch
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// The SID of the TaskReservation resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchReservationOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resource to fetch </param>
-        /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resource to fetch </param>
-        /// <param name="pathSid"> The SID of the TaskReservation resource to fetch </param>
-        public FetchReservationOptions(string pathWorkspaceSid, string pathTaskSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathTaskSid = pathTaskSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the reserved Task resource with the TaskReservation resources to read
+    /// </summary>
+    public string PathTaskSid { get; }
     /// <summary>
-    /// UpdateReservationOptions
-    /// </summary>
-    public class UpdateReservationOptions : IOptions<ReservationResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the TaskReservation resources to update
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the reserved Task resource with the TaskReservation resources to update
-        /// </summary>
-        public string PathTaskSid { get; }
-        /// <summary>
-        /// The SID of the TaskReservation resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The new status of the reservation
-        /// </summary>
-        public ReservationResource.StatusEnum ReservationStatus { get; set; }
-        /// <summary>
-        /// The new worker activity SID if rejecting a reservation
-        /// </summary>
-        public string WorkerActivitySid { get; set; }
-        /// <summary>
-        /// The assignment instruction for reservation
-        /// </summary>
-        public string Instruction { get; set; }
-        /// <summary>
-        /// The SID of the Activity resource to start after executing a Dequeue instruction
-        /// </summary>
-        public string DequeuePostWorkActivitySid { get; set; }
-        /// <summary>
-        /// The Caller ID of the call to the worker when executing a Dequeue instruction
-        /// </summary>
-        public string DequeueFrom { get; set; }
-        /// <summary>
-        /// Whether to record both legs of a call when executing a Dequeue instruction
-        /// </summary>
-        public string DequeueRecord { get; set; }
-        /// <summary>
-        /// Timeout for call when executing a Dequeue instruction
-        /// </summary>
-        public int? DequeueTimeout { get; set; }
-        /// <summary>
-        /// The Contact URI of the worker when executing a Dequeue instruction
-        /// </summary>
-        public string DequeueTo { get; set; }
-        /// <summary>
-        /// The Callback URL for completed call event when executing a Dequeue instruction
-        /// </summary>
-        public Uri DequeueStatusCallbackUrl { get; set; }
-        /// <summary>
-        /// The Caller ID of the outbound call when executing a Call instruction
-        /// </summary>
-        public string CallFrom { get; set; }
-        /// <summary>
-        /// Whether to record both legs of a call when executing a Call instruction
-        /// </summary>
-        public string CallRecord { get; set; }
-        /// <summary>
-        /// Timeout for call when executing a Call instruction
-        /// </summary>
-        public int? CallTimeout { get; set; }
-        /// <summary>
-        /// The Contact URI of the worker when executing a Call instruction
-        /// </summary>
-        public string CallTo { get; set; }
-        /// <summary>
-        /// TwiML URI executed on answering the worker's leg as a result of the Call instruction
-        /// </summary>
-        public Uri CallUrl { get; set; }
-        /// <summary>
-        /// The URL to call  for the completed call event when executing a Call instruction
-        /// </summary>
-        public Uri CallStatusCallbackUrl { get; set; }
-        /// <summary>
-        /// Whether to accept a reservation when executing a Call instruction
-        /// </summary>
-        public bool? CallAccept { get; set; }
-        /// <summary>
-        /// The Call SID of the call parked in the queue when executing a Redirect instruction
-        /// </summary>
-        public string RedirectCallSid { get; set; }
-        /// <summary>
-        /// Whether the reservation should be accepted when executing a Redirect instruction
-        /// </summary>
-        public bool? RedirectAccept { get; set; }
-        /// <summary>
-        /// TwiML URI to redirect the call to when executing the Redirect instruction
-        /// </summary>
-        public Uri RedirectUrl { get; set; }
-        /// <summary>
-        /// The Contact URI of the worker when executing a Conference instruction
-        /// </summary>
-        public string To { get; set; }
-        /// <summary>
-        /// The Caller ID of the call to the worker when executing a Conference instruction
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The call progress events that we will send to status_callback
-        /// </summary>
-        public List<ReservationResource.CallStatusEnum> StatusCallbackEvent { get; set; }
-        /// <summary>
-        /// Timeout for call when executing a Conference instruction
-        /// </summary>
-        public int? Timeout { get; set; }
-        /// <summary>
-        /// Whether to record the participant and their conferences
-        /// </summary>
-        public bool? Record { get; set; }
-        /// <summary>
-        /// Whether to mute the agent
-        /// </summary>
-        public bool? Muted { get; set; }
-        /// <summary>
-        /// Whether to play a notification beep when the participant joins
-        /// </summary>
-        public string Beep { get; set; }
-        /// <summary>
-        /// Whether the conference starts when the participant joins the conference
-        /// </summary>
-        public bool? StartConferenceOnEnter { get; set; }
-        /// <summary>
-        /// Whether to end the conference when the agent leaves
-        /// </summary>
-        public bool? EndConferenceOnExit { get; set; }
-        /// <summary>
-        /// URL that hosts pre-conference hold music
-        /// </summary>
-        public Uri WaitUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call `wait_url`
-        /// </summary>
-        public Twilio.Http.HttpMethod WaitMethod { get; set; }
-        /// <summary>
-        /// Whether agents can hear the state of the outbound call
-        /// </summary>
-        public bool? EarlyMedia { get; set; }
-        /// <summary>
-        /// The maximum number of agent conference participants
-        /// </summary>
-        public int? MaxParticipants { get; set; }
-        /// <summary>
-        /// The callback URL for conference events
-        /// </summary>
-        public Uri ConferenceStatusCallback { get; set; }
-        /// <summary>
-        /// HTTP method for requesting `conference_status_callback` URL
-        /// </summary>
-        public Twilio.Http.HttpMethod ConferenceStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The conference status events that we will send to conference_status_callback
-        /// </summary>
-        public List<ReservationResource.ConferenceEventEnum> ConferenceStatusCallbackEvent { get; set; }
-        /// <summary>
-        /// Whether to record the conference the participant is joining
-        /// </summary>
-        public string ConferenceRecord { get; set; }
-        /// <summary>
-        /// How to trim leading and trailing silence from your recorded conference audio files
-        /// </summary>
-        public string ConferenceTrim { get; set; }
-        /// <summary>
-        /// Specify `mono` or `dual` recording channels
-        /// </summary>
-        public string RecordingChannels { get; set; }
-        /// <summary>
-        /// The URL that we should call using the `recording_status_callback_method` when the recording status changes
-        /// </summary>
-        public Uri RecordingStatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use when we call `recording_status_callback`
-        /// </summary>
-        public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we should call using the `conference_recording_status_callback_method` when the conference recording is available
-        /// </summary>
-        public Uri ConferenceRecordingStatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call `conference_recording_status_callback`
-        /// </summary>
-        public Twilio.Http.HttpMethod ConferenceRecordingStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The region where we should mix the conference audio
-        /// </summary>
-        public string Region { get; set; }
-        /// <summary>
-        /// The SIP username used for authentication
-        /// </summary>
-        public string SipAuthUsername { get; set; }
-        /// <summary>
-        /// The SIP password for authentication
-        /// </summary>
-        public string SipAuthPassword { get; set; }
-        /// <summary>
-        /// The Call progress events sent via webhooks as a result of a Dequeue instruction
-        /// </summary>
-        public List<string> DequeueStatusCallbackEvent { get; set; }
-        /// <summary>
-        /// The new worker activity SID after executing a Conference instruction
-        /// </summary>
-        public string PostWorkActivitySid { get; set; }
-        /// <summary>
-        /// The Supervisor mode when executing the Supervise instruction
-        /// </summary>
-        public ReservationResource.SupervisorModeEnum SupervisorMode { get; set; }
-        /// <summary>
-        /// The Supervisor SID/URI when executing the Supervise instruction
-        /// </summary>
-        public string Supervisor { get; set; }
-        /// <summary>
-        /// Whether to end the conference when the customer leaves
-        /// </summary>
-        public bool? EndConferenceOnCustomerExit { get; set; }
-        /// <summary>
-        /// Whether to play a notification beep when the customer joins
-        /// </summary>
-        public bool? BeepOnCustomerEntrance { get; set; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateReservationOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resources to update </param>
-        /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resources to update
-        ///                   </param>
-        /// <param name="pathSid"> The SID of the TaskReservation resource to update </param>
-        public UpdateReservationOptions(string pathWorkspaceSid, string pathTaskSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathTaskSid = pathTaskSid;
-            PathSid = pathSid;
-            StatusCallbackEvent = new List<ReservationResource.CallStatusEnum>();
-            ConferenceStatusCallbackEvent = new List<ReservationResource.ConferenceEventEnum>();
-            DequeueStatusCallbackEvent = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ReservationStatus != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReservationStatus", ReservationStatus.ToString()));
-            }
-
-            if (WorkerActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WorkerActivitySid", WorkerActivitySid.ToString()));
-            }
-
-            if (Instruction != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Instruction", Instruction));
-            }
-
-            if (DequeuePostWorkActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DequeuePostWorkActivitySid", DequeuePostWorkActivitySid.ToString()));
-            }
-
-            if (DequeueFrom != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DequeueFrom", DequeueFrom));
-            }
-
-            if (DequeueRecord != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DequeueRecord", DequeueRecord));
-            }
-
-            if (DequeueTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DequeueTimeout", DequeueTimeout.ToString()));
-            }
-
-            if (DequeueTo != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DequeueTo", DequeueTo));
-            }
-
-            if (DequeueStatusCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DequeueStatusCallbackUrl", Serializers.Url(DequeueStatusCallbackUrl)));
-            }
-
-            if (CallFrom != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallFrom", CallFrom));
-            }
-
-            if (CallRecord != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallRecord", CallRecord));
-            }
-
-            if (CallTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallTimeout", CallTimeout.ToString()));
-            }
-
-            if (CallTo != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallTo", CallTo));
-            }
-
-            if (CallUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallUrl", Serializers.Url(CallUrl)));
-            }
-
-            if (CallStatusCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallStatusCallbackUrl", Serializers.Url(CallStatusCallbackUrl)));
-            }
-
-            if (CallAccept != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallAccept", CallAccept.Value.ToString().ToLower()));
-            }
-
-            if (RedirectCallSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RedirectCallSid", RedirectCallSid.ToString()));
-            }
-
-            if (RedirectAccept != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RedirectAccept", RedirectAccept.Value.ToString().ToLower()));
-            }
-
-            if (RedirectUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RedirectUrl", Serializers.Url(RedirectUrl)));
-            }
-
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (StatusCallbackEvent != null)
-            {
-                p.AddRange(StatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("StatusCallbackEvent", prop.ToString())));
-            }
-
-            if (Timeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timeout", Timeout.ToString()));
-            }
-
-            if (Record != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Record", Record.Value.ToString().ToLower()));
-            }
-
-            if (Muted != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Muted", Muted.Value.ToString().ToLower()));
-            }
-
-            if (Beep != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beep", Beep));
-            }
-
-            if (StartConferenceOnEnter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartConferenceOnEnter", StartConferenceOnEnter.Value.ToString().ToLower()));
-            }
-
-            if (EndConferenceOnExit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndConferenceOnExit", EndConferenceOnExit.Value.ToString().ToLower()));
-            }
-
-            if (WaitUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WaitUrl", Serializers.Url(WaitUrl)));
-            }
-
-            if (WaitMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WaitMethod", WaitMethod.ToString()));
-            }
-
-            if (EarlyMedia != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EarlyMedia", EarlyMedia.Value.ToString().ToLower()));
-            }
-
-            if (MaxParticipants != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MaxParticipants", MaxParticipants.ToString()));
-            }
-
-            if (ConferenceStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceStatusCallback", Serializers.Url(ConferenceStatusCallback)));
-            }
-
-            if (ConferenceStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceStatusCallbackMethod", ConferenceStatusCallbackMethod.ToString()));
-            }
-
-            if (ConferenceStatusCallbackEvent != null)
-            {
-                p.AddRange(ConferenceStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("ConferenceStatusCallbackEvent", prop.ToString())));
-            }
-
-            if (ConferenceRecord != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceRecord", ConferenceRecord));
-            }
-
-            if (ConferenceTrim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceTrim", ConferenceTrim));
-            }
-
-            if (RecordingChannels != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingChannels", RecordingChannels));
-            }
-
-            if (RecordingStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingStatusCallback", Serializers.Url(RecordingStatusCallback)));
-            }
-
-            if (RecordingStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingStatusCallbackMethod", RecordingStatusCallbackMethod.ToString()));
-            }
-
-            if (ConferenceRecordingStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceRecordingStatusCallback", Serializers.Url(ConferenceRecordingStatusCallback)));
-            }
-
-            if (ConferenceRecordingStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceRecordingStatusCallbackMethod", ConferenceRecordingStatusCallbackMethod.ToString()));
-            }
-
-            if (Region != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Region", Region));
-            }
-
-            if (SipAuthUsername != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipAuthUsername", SipAuthUsername));
-            }
-
-            if (SipAuthPassword != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipAuthPassword", SipAuthPassword));
-            }
-
-            if (DequeueStatusCallbackEvent != null)
-            {
-                p.AddRange(DequeueStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("DequeueStatusCallbackEvent", prop)));
-            }
-
-            if (PostWorkActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostWorkActivitySid", PostWorkActivitySid.ToString()));
-            }
-
-            if (SupervisorMode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SupervisorMode", SupervisorMode.ToString()));
-            }
-
-            if (Supervisor != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Supervisor", Supervisor));
-            }
-
-            if (EndConferenceOnCustomerExit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndConferenceOnCustomerExit", EndConferenceOnCustomerExit.Value.ToString().ToLower()));
-            }
-
-            if (BeepOnCustomerEntrance != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BeepOnCustomerEntrance", BeepOnCustomerEntrance.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
+    /// Returns the list of reservations for a task with a specified ReservationStatus
+    /// </summary>
+    public ReservationResource.StatusEnum ReservationStatus { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadReservationOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resources to read </param>
+    /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resources to read </param>
+    public ReadReservationOptions(string pathWorkspaceSid, string pathTaskSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathTaskSid = pathTaskSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ReservationStatus != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReservationStatus", ReservationStatus.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchReservationOptions
+  /// </summary>
+  public class FetchReservationOptions : IOptions<ReservationResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the TaskReservation resource to fetch
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the reserved Task resource with the TaskReservation resource to fetch
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// The SID of the TaskReservation resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchReservationOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resource to fetch </param>
+    /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resource to fetch </param>
+    /// <param name="pathSid"> The SID of the TaskReservation resource to fetch </param>
+    public FetchReservationOptions(string pathWorkspaceSid, string pathTaskSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathTaskSid = pathTaskSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateReservationOptions
+  /// </summary>
+  public class UpdateReservationOptions : IOptions<ReservationResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the TaskReservation resources to update
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the reserved Task resource with the TaskReservation resources to update
+    /// </summary>
+    public string PathTaskSid { get; }
+    /// <summary>
+    /// The SID of the TaskReservation resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The new status of the reservation
+    /// </summary>
+    public ReservationResource.StatusEnum ReservationStatus { get; set; }
+    /// <summary>
+    /// The new worker activity SID if rejecting a reservation
+    /// </summary>
+    public string WorkerActivitySid { get; set; }
+    /// <summary>
+    /// The assignment instruction for reservation
+    /// </summary>
+    public string Instruction { get; set; }
+    /// <summary>
+    /// The SID of the Activity resource to start after executing a Dequeue instruction
+    /// </summary>
+    public string DequeuePostWorkActivitySid { get; set; }
+    /// <summary>
+    /// The Caller ID of the call to the worker when executing a Dequeue instruction
+    /// </summary>
+    public string DequeueFrom { get; set; }
+    /// <summary>
+    /// Whether to record both legs of a call when executing a Dequeue instruction
+    /// </summary>
+    public string DequeueRecord { get; set; }
+    /// <summary>
+    /// Timeout for call when executing a Dequeue instruction
+    /// </summary>
+    public int? DequeueTimeout { get; set; }
+    /// <summary>
+    /// The Contact URI of the worker when executing a Dequeue instruction
+    /// </summary>
+    public string DequeueTo { get; set; }
+    /// <summary>
+    /// The Callback URL for completed call event when executing a Dequeue instruction
+    /// </summary>
+    public Uri DequeueStatusCallbackUrl { get; set; }
+    /// <summary>
+    /// The Caller ID of the outbound call when executing a Call instruction
+    /// </summary>
+    public string CallFrom { get; set; }
+    /// <summary>
+    /// Whether to record both legs of a call when executing a Call instruction
+    /// </summary>
+    public string CallRecord { get; set; }
+    /// <summary>
+    /// Timeout for call when executing a Call instruction
+    /// </summary>
+    public int? CallTimeout { get; set; }
+    /// <summary>
+    /// The Contact URI of the worker when executing a Call instruction
+    /// </summary>
+    public string CallTo { get; set; }
+    /// <summary>
+    /// TwiML URI executed on answering the worker's leg as a result of the Call instruction
+    /// </summary>
+    public Uri CallUrl { get; set; }
+    /// <summary>
+    /// The URL to call  for the completed call event when executing a Call instruction
+    /// </summary>
+    public Uri CallStatusCallbackUrl { get; set; }
+    /// <summary>
+    /// Whether to accept a reservation when executing a Call instruction
+    /// </summary>
+    public bool? CallAccept { get; set; }
+    /// <summary>
+    /// The Call SID of the call parked in the queue when executing a Redirect instruction
+    /// </summary>
+    public string RedirectCallSid { get; set; }
+    /// <summary>
+    /// Whether the reservation should be accepted when executing a Redirect instruction
+    /// </summary>
+    public bool? RedirectAccept { get; set; }
+    /// <summary>
+    /// TwiML URI to redirect the call to when executing the Redirect instruction
+    /// </summary>
+    public Uri RedirectUrl { get; set; }
+    /// <summary>
+    /// The Contact URI of the worker when executing a Conference instruction
+    /// </summary>
+    public string To { get; set; }
+    /// <summary>
+    /// The Caller ID of the call to the worker when executing a Conference instruction
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The call progress events that we will send to status_callback
+    /// </summary>
+    public List<ReservationResource.CallStatusEnum> StatusCallbackEvent { get; set; }
+    /// <summary>
+    /// Timeout for call when executing a Conference instruction
+    /// </summary>
+    public int? Timeout { get; set; }
+    /// <summary>
+    /// Whether to record the participant and their conferences
+    /// </summary>
+    public bool? Record { get; set; }
+    /// <summary>
+    /// Whether to mute the agent
+    /// </summary>
+    public bool? Muted { get; set; }
+    /// <summary>
+    /// Whether to play a notification beep when the participant joins
+    /// </summary>
+    public string Beep { get; set; }
+    /// <summary>
+    /// Whether the conference starts when the participant joins the conference
+    /// </summary>
+    public bool? StartConferenceOnEnter { get; set; }
+    /// <summary>
+    /// Whether to end the conference when the agent leaves
+    /// </summary>
+    public bool? EndConferenceOnExit { get; set; }
+    /// <summary>
+    /// URL that hosts pre-conference hold music
+    /// </summary>
+    public Uri WaitUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call `wait_url`
+    /// </summary>
+    public Twilio.Http.HttpMethod WaitMethod { get; set; }
+    /// <summary>
+    /// Whether agents can hear the state of the outbound call
+    /// </summary>
+    public bool? EarlyMedia { get; set; }
+    /// <summary>
+    /// The maximum number of agent conference participants
+    /// </summary>
+    public int? MaxParticipants { get; set; }
+    /// <summary>
+    /// The callback URL for conference events
+    /// </summary>
+    public Uri ConferenceStatusCallback { get; set; }
+    /// <summary>
+    /// HTTP method for requesting `conference_status_callback` URL
+    /// </summary>
+    public Twilio.Http.HttpMethod ConferenceStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The conference status events that we will send to conference_status_callback
+    /// </summary>
+    public List<ReservationResource.ConferenceEventEnum> ConferenceStatusCallbackEvent { get; set; }
+    /// <summary>
+    /// Whether to record the conference the participant is joining
+    /// </summary>
+    public string ConferenceRecord { get; set; }
+    /// <summary>
+    /// How to trim leading and trailing silence from your recorded conference audio files
+    /// </summary>
+    public string ConferenceTrim { get; set; }
+    /// <summary>
+    /// Specify `mono` or `dual` recording channels
+    /// </summary>
+    public string RecordingChannels { get; set; }
+    /// <summary>
+    /// The URL that we should call using the `recording_status_callback_method` when the recording status changes
+    /// </summary>
+    public Uri RecordingStatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use when we call `recording_status_callback`
+    /// </summary>
+    public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we should call using the `conference_recording_status_callback_method` when the conference recording is available
+    /// </summary>
+    public Uri ConferenceRecordingStatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call `conference_recording_status_callback`
+    /// </summary>
+    public Twilio.Http.HttpMethod ConferenceRecordingStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The region where we should mix the conference audio
+    /// </summary>
+    public string Region { get; set; }
+    /// <summary>
+    /// The SIP username used for authentication
+    /// </summary>
+    public string SipAuthUsername { get; set; }
+    /// <summary>
+    /// The SIP password for authentication
+    /// </summary>
+    public string SipAuthPassword { get; set; }
+    /// <summary>
+    /// The Call progress events sent via webhooks as a result of a Dequeue instruction
+    /// </summary>
+    public List<string> DequeueStatusCallbackEvent { get; set; }
+    /// <summary>
+    /// The new worker activity SID after executing a Conference instruction
+    /// </summary>
+    public string PostWorkActivitySid { get; set; }
+    /// <summary>
+    /// The Supervisor mode when executing the Supervise instruction
+    /// </summary>
+    public ReservationResource.SupervisorModeEnum SupervisorMode { get; set; }
+    /// <summary>
+    /// The Supervisor SID/URI when executing the Supervise instruction
+    /// </summary>
+    public string Supervisor { get; set; }
+    /// <summary>
+    /// Whether to end the conference when the customer leaves
+    /// </summary>
+    public bool? EndConferenceOnCustomerExit { get; set; }
+    /// <summary>
+    /// Whether to play a notification beep when the customer joins
+    /// </summary>
+    public bool? BeepOnCustomerEntrance { get; set; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateReservationOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resources to update </param>
+    /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resources to update
+    ///                   </param>
+    /// <param name="pathSid"> The SID of the TaskReservation resource to update </param>
+    public UpdateReservationOptions(string pathWorkspaceSid, string pathTaskSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathTaskSid = pathTaskSid;
+      PathSid = pathSid;
+      StatusCallbackEvent = new List<ReservationResource.CallStatusEnum>();
+      ConferenceStatusCallbackEvent = new List<ReservationResource.ConferenceEventEnum>();
+      DequeueStatusCallbackEvent = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ReservationStatus != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReservationStatus", ReservationStatus.ToString()));
+      }
+
+      if (WorkerActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WorkerActivitySid", WorkerActivitySid.ToString()));
+      }
+
+      if (Instruction != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Instruction", Instruction));
+      }
+
+      if (DequeuePostWorkActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DequeuePostWorkActivitySid", DequeuePostWorkActivitySid.ToString()));
+      }
+
+      if (DequeueFrom != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DequeueFrom", DequeueFrom));
+      }
+
+      if (DequeueRecord != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DequeueRecord", DequeueRecord));
+      }
+
+      if (DequeueTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DequeueTimeout", DequeueTimeout.ToString()));
+      }
+
+      if (DequeueTo != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DequeueTo", DequeueTo));
+      }
+
+      if (DequeueStatusCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DequeueStatusCallbackUrl", Serializers.Url(DequeueStatusCallbackUrl)));
+      }
+
+      if (CallFrom != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallFrom", CallFrom));
+      }
+
+      if (CallRecord != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallRecord", CallRecord));
+      }
+
+      if (CallTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallTimeout", CallTimeout.ToString()));
+      }
+
+      if (CallTo != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallTo", CallTo));
+      }
+
+      if (CallUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallUrl", Serializers.Url(CallUrl)));
+      }
+
+      if (CallStatusCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallStatusCallbackUrl", Serializers.Url(CallStatusCallbackUrl)));
+      }
+
+      if (CallAccept != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallAccept", CallAccept.Value.ToString().ToLower()));
+      }
+
+      if (RedirectCallSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RedirectCallSid", RedirectCallSid.ToString()));
+      }
+
+      if (RedirectAccept != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RedirectAccept", RedirectAccept.Value.ToString().ToLower()));
+      }
+
+      if (RedirectUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RedirectUrl", Serializers.Url(RedirectUrl)));
+      }
+
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (StatusCallbackEvent != null)
+      {
+        p.AddRange(StatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("StatusCallbackEvent", prop.ToString())));
+      }
+
+      if (Timeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timeout", Timeout.ToString()));
+      }
+
+      if (Record != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Record", Record.Value.ToString().ToLower()));
+      }
+
+      if (Muted != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Muted", Muted.Value.ToString().ToLower()));
+      }
+
+      if (Beep != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beep", Beep));
+      }
+
+      if (StartConferenceOnEnter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartConferenceOnEnter", StartConferenceOnEnter.Value.ToString().ToLower()));
+      }
+
+      if (EndConferenceOnExit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndConferenceOnExit", EndConferenceOnExit.Value.ToString().ToLower()));
+      }
+
+      if (WaitUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WaitUrl", Serializers.Url(WaitUrl)));
+      }
+
+      if (WaitMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WaitMethod", WaitMethod.ToString()));
+      }
+
+      if (EarlyMedia != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EarlyMedia", EarlyMedia.Value.ToString().ToLower()));
+      }
+
+      if (MaxParticipants != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MaxParticipants", MaxParticipants.ToString()));
+      }
+
+      if (ConferenceStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceStatusCallback", Serializers.Url(ConferenceStatusCallback)));
+      }
+
+      if (ConferenceStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceStatusCallbackMethod", ConferenceStatusCallbackMethod.ToString()));
+      }
+
+      if (ConferenceStatusCallbackEvent != null)
+      {
+        p.AddRange(ConferenceStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("ConferenceStatusCallbackEvent", prop.ToString())));
+      }
+
+      if (ConferenceRecord != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceRecord", ConferenceRecord));
+      }
+
+      if (ConferenceTrim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceTrim", ConferenceTrim));
+      }
+
+      if (RecordingChannels != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingChannels", RecordingChannels));
+      }
+
+      if (RecordingStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingStatusCallback", Serializers.Url(RecordingStatusCallback)));
+      }
+
+      if (RecordingStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingStatusCallbackMethod", RecordingStatusCallbackMethod.ToString()));
+      }
+
+      if (ConferenceRecordingStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceRecordingStatusCallback", Serializers.Url(ConferenceRecordingStatusCallback)));
+      }
+
+      if (ConferenceRecordingStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceRecordingStatusCallbackMethod", ConferenceRecordingStatusCallbackMethod.ToString()));
+      }
+
+      if (Region != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Region", Region));
+      }
+
+      if (SipAuthUsername != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipAuthUsername", SipAuthUsername));
+      }
+
+      if (SipAuthPassword != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipAuthPassword", SipAuthPassword));
+      }
+
+      if (DequeueStatusCallbackEvent != null)
+      {
+        p.AddRange(DequeueStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("DequeueStatusCallbackEvent", prop)));
+      }
+
+      if (PostWorkActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostWorkActivitySid", PostWorkActivitySid.ToString()));
+      }
+
+      if (SupervisorMode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SupervisorMode", SupervisorMode.ToString()));
+      }
+
+      if (Supervisor != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Supervisor", Supervisor));
+      }
+
+      if (EndConferenceOnCustomerExit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndConferenceOnCustomerExit", EndConferenceOnCustomerExit.Value.ToString().ToLower()));
+      }
+
+      if (BeepOnCustomerEntrance != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BeepOnCustomerEntrance", BeepOnCustomerEntrance.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Task/ReservationResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Task/ReservationResource.cs
index fe8dc7a0e..117f2af92 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Task/ReservationResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Task/ReservationResource.cs
@@ -17,696 +17,696 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Task
-{
-
-    public class ReservationResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Pending = new StatusEnum("pending");
-            public static readonly StatusEnum Accepted = new StatusEnum("accepted");
-            public static readonly StatusEnum Rejected = new StatusEnum("rejected");
-            public static readonly StatusEnum Timeout = new StatusEnum("timeout");
-            public static readonly StatusEnum Canceled = new StatusEnum("canceled");
-            public static readonly StatusEnum Rescinded = new StatusEnum("rescinded");
-            public static readonly StatusEnum Wrapping = new StatusEnum("wrapping");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-        }
-
-        public sealed class CallStatusEnum : StringEnum
-        {
-            private CallStatusEnum(string value) : base(value) {}
-            public CallStatusEnum() {}
-            public static implicit operator CallStatusEnum(string value)
-            {
-                return new CallStatusEnum(value);
-            }
-
-            public static readonly CallStatusEnum Initiated = new CallStatusEnum("initiated");
-            public static readonly CallStatusEnum Ringing = new CallStatusEnum("ringing");
-            public static readonly CallStatusEnum Answered = new CallStatusEnum("answered");
-            public static readonly CallStatusEnum Completed = new CallStatusEnum("completed");
-        }
-
-        public sealed class ConferenceEventEnum : StringEnum
-        {
-            private ConferenceEventEnum(string value) : base(value) {}
-            public ConferenceEventEnum() {}
-            public static implicit operator ConferenceEventEnum(string value)
-            {
-                return new ConferenceEventEnum(value);
-            }
-
-            public static readonly ConferenceEventEnum Start = new ConferenceEventEnum("start");
-            public static readonly ConferenceEventEnum End = new ConferenceEventEnum("end");
-            public static readonly ConferenceEventEnum Join = new ConferenceEventEnum("join");
-            public static readonly ConferenceEventEnum Leave = new ConferenceEventEnum("leave");
-            public static readonly ConferenceEventEnum Mute = new ConferenceEventEnum("mute");
-            public static readonly ConferenceEventEnum Hold = new ConferenceEventEnum("hold");
-            public static readonly ConferenceEventEnum Speaker = new ConferenceEventEnum("speaker");
-        }
-
-        public sealed class SupervisorModeEnum : StringEnum
-        {
-            private SupervisorModeEnum(string value) : base(value) {}
-            public SupervisorModeEnum() {}
-            public static implicit operator SupervisorModeEnum(string value)
-            {
-                return new SupervisorModeEnum(value);
-            }
-
-            public static readonly SupervisorModeEnum Monitor = new SupervisorModeEnum("monitor");
-            public static readonly SupervisorModeEnum Whisper = new SupervisorModeEnum("whisper");
-            public static readonly SupervisorModeEnum Barge = new SupervisorModeEnum("barge");
-        }
-
-        private static Request BuildReadRequest(ReadReservationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks/" + options.PathTaskSid + "/Reservations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Reservation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Reservation </returns>
-        public static ResourceSet<ReservationResource> Read(ReadReservationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ReservationResource>.FromJson("reservations", response.Content);
-            return new ResourceSet<ReservationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Reservation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Reservation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ReservationResource>> ReadAsync(ReadReservationOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ReservationResource>.FromJson("reservations", response.Content);
-            return new ResourceSet<ReservationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resources to read </param>
-        /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resources to read </param>
-        /// <param name="reservationStatus"> Returns the list of reservations for a task with a specified ReservationStatus
-        ///                         </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Reservation </returns>
-        public static ResourceSet<ReservationResource> Read(string pathWorkspaceSid,
-                                                            string pathTaskSid,
-                                                            ReservationResource.StatusEnum reservationStatus = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadReservationOptions(pathWorkspaceSid, pathTaskSid){ReservationStatus = reservationStatus, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resources to read </param>
-        /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resources to read </param>
-        /// <param name="reservationStatus"> Returns the list of reservations for a task with a specified ReservationStatus
-        ///                         </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Reservation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ReservationResource>> ReadAsync(string pathWorkspaceSid,
-                                                                                                    string pathTaskSid,
-                                                                                                    ReservationResource.StatusEnum reservationStatus = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadReservationOptions(pathWorkspaceSid, pathTaskSid){ReservationStatus = reservationStatus, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ReservationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ReservationResource>.FromJson("reservations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ReservationResource> NextPage(Page<ReservationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<ReservationResource>.FromJson("reservations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ReservationResource> PreviousPage(Page<ReservationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<ReservationResource>.FromJson("reservations", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchReservationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks/" + options.PathTaskSid + "/Reservations/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Reservation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Reservation </returns>
-        public static ReservationResource Fetch(FetchReservationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Reservation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Reservation </returns>
-        public static async System.Threading.Tasks.Task<ReservationResource> FetchAsync(FetchReservationOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resource to fetch </param>
-        /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resource to fetch </param>
-        /// <param name="pathSid"> The SID of the TaskReservation resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Reservation </returns>
-        public static ReservationResource Fetch(string pathWorkspaceSid,
-                                                string pathTaskSid,
-                                                string pathSid,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchReservationOptions(pathWorkspaceSid, pathTaskSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resource to fetch </param>
-        /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resource to fetch </param>
-        /// <param name="pathSid"> The SID of the TaskReservation resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Reservation </returns>
-        public static async System.Threading.Tasks.Task<ReservationResource> FetchAsync(string pathWorkspaceSid,
-                                                                                        string pathTaskSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchReservationOptions(pathWorkspaceSid, pathTaskSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateReservationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks/" + options.PathTaskSid + "/Reservations/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Reservation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Reservation </returns>
-        public static ReservationResource Update(UpdateReservationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Reservation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Reservation </returns>
-        public static async System.Threading.Tasks.Task<ReservationResource> UpdateAsync(UpdateReservationOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resources to update </param>
-        /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resources to update
-        ///                   </param>
-        /// <param name="pathSid"> The SID of the TaskReservation resource to update </param>
-        /// <param name="reservationStatus"> The new status of the reservation </param>
-        /// <param name="workerActivitySid"> The new worker activity SID if rejecting a reservation </param>
-        /// <param name="instruction"> The assignment instruction for reservation </param>
-        /// <param name="dequeuePostWorkActivitySid"> The SID of the Activity resource to start after executing a Dequeue
-        ///                                  instruction </param>
-        /// <param name="dequeueFrom"> The Caller ID of the call to the worker when executing a Dequeue instruction </param>
-        /// <param name="dequeueRecord"> Whether to record both legs of a call when executing a Dequeue instruction </param>
-        /// <param name="dequeueTimeout"> Timeout for call when executing a Dequeue instruction </param>
-        /// <param name="dequeueTo"> The Contact URI of the worker when executing a Dequeue instruction </param>
-        /// <param name="dequeueStatusCallbackUrl"> The Callback URL for completed call event when executing a Dequeue
-        ///                                instruction </param>
-        /// <param name="callFrom"> The Caller ID of the outbound call when executing a Call instruction </param>
-        /// <param name="callRecord"> Whether to record both legs of a call when executing a Call instruction </param>
-        /// <param name="callTimeout"> Timeout for call when executing a Call instruction </param>
-        /// <param name="callTo"> The Contact URI of the worker when executing a Call instruction </param>
-        /// <param name="callUrl"> TwiML URI executed on answering the worker's leg as a result of the Call instruction </param>
-        /// <param name="callStatusCallbackUrl"> The URL to call  for the completed call event when executing a Call
-        ///                             instruction </param>
-        /// <param name="callAccept"> Whether to accept a reservation when executing a Call instruction </param>
-        /// <param name="redirectCallSid"> The Call SID of the call parked in the queue when executing a Redirect instruction
-        ///                       </param>
-        /// <param name="redirectAccept"> Whether the reservation should be accepted when executing a Redirect instruction
-        ///                      </param>
-        /// <param name="redirectUrl"> TwiML URI to redirect the call to when executing the Redirect instruction </param>
-        /// <param name="to"> The Contact URI of the worker when executing a Conference instruction </param>
-        /// <param name="from"> The Caller ID of the call to the worker when executing a Conference instruction </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="statusCallbackEvent"> The call progress events that we will send to status_callback </param>
-        /// <param name="timeout"> Timeout for call when executing a Conference instruction </param>
-        /// <param name="record"> Whether to record the participant and their conferences </param>
-        /// <param name="muted"> Whether to mute the agent </param>
-        /// <param name="beep"> Whether to play a notification beep when the participant joins </param>
-        /// <param name="startConferenceOnEnter"> Whether the conference starts when the participant joins the conference
-        ///                              </param>
-        /// <param name="endConferenceOnExit"> Whether to end the conference when the agent leaves </param>
-        /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
-        /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
-        /// <param name="earlyMedia"> Whether agents can hear the state of the outbound call </param>
-        /// <param name="maxParticipants"> The maximum number of agent conference participants </param>
-        /// <param name="conferenceStatusCallback"> The callback URL for conference events </param>
-        /// <param name="conferenceStatusCallbackMethod"> HTTP method for requesting `conference_status_callback` URL </param>
-        /// <param name="conferenceStatusCallbackEvent"> The conference status events that we will send to
-        ///                                     conference_status_callback </param>
-        /// <param name="conferenceRecord"> Whether to record the conference the participant is joining </param>
-        /// <param name="conferenceTrim"> How to trim leading and trailing silence from your recorded conference audio files
-        ///                      </param>
-        /// <param name="recordingChannels"> Specify `mono` or `dual` recording channels </param>
-        /// <param name="recordingStatusCallback"> The URL that we should call using the `recording_status_callback_method`
-        ///                               when the recording status changes </param>
-        /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when we call `recording_status_callback`
-        ///                                     </param>
-        /// <param name="conferenceRecordingStatusCallback"> The URL we should call using the
-        ///                                         `conference_recording_status_callback_method` when the conference recording
-        ///                                         is available </param>
-        /// <param name="conferenceRecordingStatusCallbackMethod"> The HTTP method we should use to call
-        ///                                               `conference_recording_status_callback` </param>
-        /// <param name="region"> The region where we should mix the conference audio </param>
-        /// <param name="sipAuthUsername"> The SIP username used for authentication </param>
-        /// <param name="sipAuthPassword"> The SIP password for authentication </param>
-        /// <param name="dequeueStatusCallbackEvent"> The Call progress events sent via webhooks as a result of a Dequeue
-        ///                                  instruction </param>
-        /// <param name="postWorkActivitySid"> The new worker activity SID after executing a Conference instruction </param>
-        /// <param name="supervisorMode"> The Supervisor mode when executing the Supervise instruction </param>
-        /// <param name="supervisor"> The Supervisor SID/URI when executing the Supervise instruction </param>
-        /// <param name="endConferenceOnCustomerExit"> Whether to end the conference when the customer leaves </param>
-        /// <param name="beepOnCustomerEntrance"> Whether to play a notification beep when the customer joins </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Reservation </returns>
-        public static ReservationResource Update(string pathWorkspaceSid,
-                                                 string pathTaskSid,
-                                                 string pathSid,
-                                                 ReservationResource.StatusEnum reservationStatus = null,
-                                                 string workerActivitySid = null,
-                                                 string instruction = null,
-                                                 string dequeuePostWorkActivitySid = null,
-                                                 string dequeueFrom = null,
-                                                 string dequeueRecord = null,
-                                                 int? dequeueTimeout = null,
-                                                 string dequeueTo = null,
-                                                 Uri dequeueStatusCallbackUrl = null,
-                                                 string callFrom = null,
-                                                 string callRecord = null,
-                                                 int? callTimeout = null,
-                                                 string callTo = null,
-                                                 Uri callUrl = null,
-                                                 Uri callStatusCallbackUrl = null,
-                                                 bool? callAccept = null,
-                                                 string redirectCallSid = null,
-                                                 bool? redirectAccept = null,
-                                                 Uri redirectUrl = null,
-                                                 string to = null,
-                                                 string from = null,
-                                                 Uri statusCallback = null,
-                                                 Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                 List<ReservationResource.CallStatusEnum> statusCallbackEvent = null,
-                                                 int? timeout = null,
-                                                 bool? record = null,
-                                                 bool? muted = null,
-                                                 string beep = null,
-                                                 bool? startConferenceOnEnter = null,
-                                                 bool? endConferenceOnExit = null,
-                                                 Uri waitUrl = null,
-                                                 Twilio.Http.HttpMethod waitMethod = null,
-                                                 bool? earlyMedia = null,
-                                                 int? maxParticipants = null,
-                                                 Uri conferenceStatusCallback = null,
-                                                 Twilio.Http.HttpMethod conferenceStatusCallbackMethod = null,
-                                                 List<ReservationResource.ConferenceEventEnum> conferenceStatusCallbackEvent = null,
-                                                 string conferenceRecord = null,
-                                                 string conferenceTrim = null,
-                                                 string recordingChannels = null,
-                                                 Uri recordingStatusCallback = null,
-                                                 Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                                                 Uri conferenceRecordingStatusCallback = null,
-                                                 Twilio.Http.HttpMethod conferenceRecordingStatusCallbackMethod = null,
-                                                 string region = null,
-                                                 string sipAuthUsername = null,
-                                                 string sipAuthPassword = null,
-                                                 List<string> dequeueStatusCallbackEvent = null,
-                                                 string postWorkActivitySid = null,
-                                                 ReservationResource.SupervisorModeEnum supervisorMode = null,
-                                                 string supervisor = null,
-                                                 bool? endConferenceOnCustomerExit = null,
-                                                 bool? beepOnCustomerEntrance = null,
-                                                 string ifMatch = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateReservationOptions(pathWorkspaceSid, pathTaskSid, pathSid){ReservationStatus = reservationStatus, WorkerActivitySid = workerActivitySid, Instruction = instruction, DequeuePostWorkActivitySid = dequeuePostWorkActivitySid, DequeueFrom = dequeueFrom, DequeueRecord = dequeueRecord, DequeueTimeout = dequeueTimeout, DequeueTo = dequeueTo, DequeueStatusCallbackUrl = dequeueStatusCallbackUrl, CallFrom = callFrom, CallRecord = callRecord, CallTimeout = callTimeout, CallTo = callTo, CallUrl = callUrl, CallStatusCallbackUrl = callStatusCallbackUrl, CallAccept = callAccept, RedirectCallSid = redirectCallSid, RedirectAccept = redirectAccept, RedirectUrl = redirectUrl, To = to, From = from, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, StatusCallbackEvent = statusCallbackEvent, Timeout = timeout, Record = record, Muted = muted, Beep = beep, StartConferenceOnEnter = startConferenceOnEnter, EndConferenceOnExit = endConferenceOnExit, WaitUrl = waitUrl, WaitMethod = waitMethod, EarlyMedia = earlyMedia, MaxParticipants = maxParticipants, ConferenceStatusCallback = conferenceStatusCallback, ConferenceStatusCallbackMethod = conferenceStatusCallbackMethod, ConferenceStatusCallbackEvent = conferenceStatusCallbackEvent, ConferenceRecord = conferenceRecord, ConferenceTrim = conferenceTrim, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, ConferenceRecordingStatusCallback = conferenceRecordingStatusCallback, ConferenceRecordingStatusCallbackMethod = conferenceRecordingStatusCallbackMethod, Region = region, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, DequeueStatusCallbackEvent = dequeueStatusCallbackEvent, PostWorkActivitySid = postWorkActivitySid, SupervisorMode = supervisorMode, Supervisor = supervisor, EndConferenceOnCustomerExit = endConferenceOnCustomerExit, BeepOnCustomerEntrance = beepOnCustomerEntrance, IfMatch = ifMatch};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resources to update </param>
-        /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resources to update
-        ///                   </param>
-        /// <param name="pathSid"> The SID of the TaskReservation resource to update </param>
-        /// <param name="reservationStatus"> The new status of the reservation </param>
-        /// <param name="workerActivitySid"> The new worker activity SID if rejecting a reservation </param>
-        /// <param name="instruction"> The assignment instruction for reservation </param>
-        /// <param name="dequeuePostWorkActivitySid"> The SID of the Activity resource to start after executing a Dequeue
-        ///                                  instruction </param>
-        /// <param name="dequeueFrom"> The Caller ID of the call to the worker when executing a Dequeue instruction </param>
-        /// <param name="dequeueRecord"> Whether to record both legs of a call when executing a Dequeue instruction </param>
-        /// <param name="dequeueTimeout"> Timeout for call when executing a Dequeue instruction </param>
-        /// <param name="dequeueTo"> The Contact URI of the worker when executing a Dequeue instruction </param>
-        /// <param name="dequeueStatusCallbackUrl"> The Callback URL for completed call event when executing a Dequeue
-        ///                                instruction </param>
-        /// <param name="callFrom"> The Caller ID of the outbound call when executing a Call instruction </param>
-        /// <param name="callRecord"> Whether to record both legs of a call when executing a Call instruction </param>
-        /// <param name="callTimeout"> Timeout for call when executing a Call instruction </param>
-        /// <param name="callTo"> The Contact URI of the worker when executing a Call instruction </param>
-        /// <param name="callUrl"> TwiML URI executed on answering the worker's leg as a result of the Call instruction </param>
-        /// <param name="callStatusCallbackUrl"> The URL to call  for the completed call event when executing a Call
-        ///                             instruction </param>
-        /// <param name="callAccept"> Whether to accept a reservation when executing a Call instruction </param>
-        /// <param name="redirectCallSid"> The Call SID of the call parked in the queue when executing a Redirect instruction
-        ///                       </param>
-        /// <param name="redirectAccept"> Whether the reservation should be accepted when executing a Redirect instruction
-        ///                      </param>
-        /// <param name="redirectUrl"> TwiML URI to redirect the call to when executing the Redirect instruction </param>
-        /// <param name="to"> The Contact URI of the worker when executing a Conference instruction </param>
-        /// <param name="from"> The Caller ID of the call to the worker when executing a Conference instruction </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="statusCallbackEvent"> The call progress events that we will send to status_callback </param>
-        /// <param name="timeout"> Timeout for call when executing a Conference instruction </param>
-        /// <param name="record"> Whether to record the participant and their conferences </param>
-        /// <param name="muted"> Whether to mute the agent </param>
-        /// <param name="beep"> Whether to play a notification beep when the participant joins </param>
-        /// <param name="startConferenceOnEnter"> Whether the conference starts when the participant joins the conference
-        ///                              </param>
-        /// <param name="endConferenceOnExit"> Whether to end the conference when the agent leaves </param>
-        /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
-        /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
-        /// <param name="earlyMedia"> Whether agents can hear the state of the outbound call </param>
-        /// <param name="maxParticipants"> The maximum number of agent conference participants </param>
-        /// <param name="conferenceStatusCallback"> The callback URL for conference events </param>
-        /// <param name="conferenceStatusCallbackMethod"> HTTP method for requesting `conference_status_callback` URL </param>
-        /// <param name="conferenceStatusCallbackEvent"> The conference status events that we will send to
-        ///                                     conference_status_callback </param>
-        /// <param name="conferenceRecord"> Whether to record the conference the participant is joining </param>
-        /// <param name="conferenceTrim"> How to trim leading and trailing silence from your recorded conference audio files
-        ///                      </param>
-        /// <param name="recordingChannels"> Specify `mono` or `dual` recording channels </param>
-        /// <param name="recordingStatusCallback"> The URL that we should call using the `recording_status_callback_method`
-        ///                               when the recording status changes </param>
-        /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when we call `recording_status_callback`
-        ///                                     </param>
-        /// <param name="conferenceRecordingStatusCallback"> The URL we should call using the
-        ///                                         `conference_recording_status_callback_method` when the conference recording
-        ///                                         is available </param>
-        /// <param name="conferenceRecordingStatusCallbackMethod"> The HTTP method we should use to call
-        ///                                               `conference_recording_status_callback` </param>
-        /// <param name="region"> The region where we should mix the conference audio </param>
-        /// <param name="sipAuthUsername"> The SIP username used for authentication </param>
-        /// <param name="sipAuthPassword"> The SIP password for authentication </param>
-        /// <param name="dequeueStatusCallbackEvent"> The Call progress events sent via webhooks as a result of a Dequeue
-        ///                                  instruction </param>
-        /// <param name="postWorkActivitySid"> The new worker activity SID after executing a Conference instruction </param>
-        /// <param name="supervisorMode"> The Supervisor mode when executing the Supervise instruction </param>
-        /// <param name="supervisor"> The Supervisor SID/URI when executing the Supervise instruction </param>
-        /// <param name="endConferenceOnCustomerExit"> Whether to end the conference when the customer leaves </param>
-        /// <param name="beepOnCustomerEntrance"> Whether to play a notification beep when the customer joins </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Reservation </returns>
-        public static async System.Threading.Tasks.Task<ReservationResource> UpdateAsync(string pathWorkspaceSid,
-                                                                                         string pathTaskSid,
-                                                                                         string pathSid,
-                                                                                         ReservationResource.StatusEnum reservationStatus = null,
-                                                                                         string workerActivitySid = null,
-                                                                                         string instruction = null,
-                                                                                         string dequeuePostWorkActivitySid = null,
-                                                                                         string dequeueFrom = null,
-                                                                                         string dequeueRecord = null,
-                                                                                         int? dequeueTimeout = null,
-                                                                                         string dequeueTo = null,
-                                                                                         Uri dequeueStatusCallbackUrl = null,
-                                                                                         string callFrom = null,
-                                                                                         string callRecord = null,
-                                                                                         int? callTimeout = null,
-                                                                                         string callTo = null,
-                                                                                         Uri callUrl = null,
-                                                                                         Uri callStatusCallbackUrl = null,
-                                                                                         bool? callAccept = null,
-                                                                                         string redirectCallSid = null,
-                                                                                         bool? redirectAccept = null,
-                                                                                         Uri redirectUrl = null,
-                                                                                         string to = null,
-                                                                                         string from = null,
-                                                                                         Uri statusCallback = null,
-                                                                                         Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                         List<ReservationResource.CallStatusEnum> statusCallbackEvent = null,
-                                                                                         int? timeout = null,
-                                                                                         bool? record = null,
-                                                                                         bool? muted = null,
-                                                                                         string beep = null,
-                                                                                         bool? startConferenceOnEnter = null,
-                                                                                         bool? endConferenceOnExit = null,
-                                                                                         Uri waitUrl = null,
-                                                                                         Twilio.Http.HttpMethod waitMethod = null,
-                                                                                         bool? earlyMedia = null,
-                                                                                         int? maxParticipants = null,
-                                                                                         Uri conferenceStatusCallback = null,
-                                                                                         Twilio.Http.HttpMethod conferenceStatusCallbackMethod = null,
-                                                                                         List<ReservationResource.ConferenceEventEnum> conferenceStatusCallbackEvent = null,
-                                                                                         string conferenceRecord = null,
-                                                                                         string conferenceTrim = null,
-                                                                                         string recordingChannels = null,
-                                                                                         Uri recordingStatusCallback = null,
-                                                                                         Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                                                                                         Uri conferenceRecordingStatusCallback = null,
-                                                                                         Twilio.Http.HttpMethod conferenceRecordingStatusCallbackMethod = null,
-                                                                                         string region = null,
-                                                                                         string sipAuthUsername = null,
-                                                                                         string sipAuthPassword = null,
-                                                                                         List<string> dequeueStatusCallbackEvent = null,
-                                                                                         string postWorkActivitySid = null,
-                                                                                         ReservationResource.SupervisorModeEnum supervisorMode = null,
-                                                                                         string supervisor = null,
-                                                                                         bool? endConferenceOnCustomerExit = null,
-                                                                                         bool? beepOnCustomerEntrance = null,
-                                                                                         string ifMatch = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateReservationOptions(pathWorkspaceSid, pathTaskSid, pathSid){ReservationStatus = reservationStatus, WorkerActivitySid = workerActivitySid, Instruction = instruction, DequeuePostWorkActivitySid = dequeuePostWorkActivitySid, DequeueFrom = dequeueFrom, DequeueRecord = dequeueRecord, DequeueTimeout = dequeueTimeout, DequeueTo = dequeueTo, DequeueStatusCallbackUrl = dequeueStatusCallbackUrl, CallFrom = callFrom, CallRecord = callRecord, CallTimeout = callTimeout, CallTo = callTo, CallUrl = callUrl, CallStatusCallbackUrl = callStatusCallbackUrl, CallAccept = callAccept, RedirectCallSid = redirectCallSid, RedirectAccept = redirectAccept, RedirectUrl = redirectUrl, To = to, From = from, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, StatusCallbackEvent = statusCallbackEvent, Timeout = timeout, Record = record, Muted = muted, Beep = beep, StartConferenceOnEnter = startConferenceOnEnter, EndConferenceOnExit = endConferenceOnExit, WaitUrl = waitUrl, WaitMethod = waitMethod, EarlyMedia = earlyMedia, MaxParticipants = maxParticipants, ConferenceStatusCallback = conferenceStatusCallback, ConferenceStatusCallbackMethod = conferenceStatusCallbackMethod, ConferenceStatusCallbackEvent = conferenceStatusCallbackEvent, ConferenceRecord = conferenceRecord, ConferenceTrim = conferenceTrim, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, ConferenceRecordingStatusCallback = conferenceRecordingStatusCallback, ConferenceRecordingStatusCallbackMethod = conferenceRecordingStatusCallbackMethod, Region = region, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, DequeueStatusCallbackEvent = dequeueStatusCallbackEvent, PostWorkActivitySid = postWorkActivitySid, SupervisorMode = supervisorMode, Supervisor = supervisor, EndConferenceOnCustomerExit = endConferenceOnCustomerExit, BeepOnCustomerEntrance = beepOnCustomerEntrance, IfMatch = ifMatch};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ReservationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ReservationResource object represented by the provided JSON </returns>
-        public static ReservationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ReservationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The current status of the reservation
-        /// </summary>
-        [JsonProperty("reservation_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ReservationResource.StatusEnum ReservationStatus { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the reserved Task resource
-        /// </summary>
-        [JsonProperty("task_sid")]
-        public string TaskSid { get; private set; }
-        /// <summary>
-        /// The friendly_name of the Worker that is reserved
-        /// </summary>
-        [JsonProperty("worker_name")]
-        public string WorkerName { get; private set; }
-        /// <summary>
-        /// The SID of the reserved Worker resource
-        /// </summary>
-        [JsonProperty("worker_sid")]
-        public string WorkerSid { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that this task is contained within.
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the TaskReservation reservation
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ReservationResource()
-        {
-
-        }
-    }
+{
+
+  public class ReservationResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Pending = new StatusEnum("pending");
+      public static readonly StatusEnum Accepted = new StatusEnum("accepted");
+      public static readonly StatusEnum Rejected = new StatusEnum("rejected");
+      public static readonly StatusEnum Timeout = new StatusEnum("timeout");
+      public static readonly StatusEnum Canceled = new StatusEnum("canceled");
+      public static readonly StatusEnum Rescinded = new StatusEnum("rescinded");
+      public static readonly StatusEnum Wrapping = new StatusEnum("wrapping");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+    }
+
+    public sealed class CallStatusEnum : StringEnum
+    {
+      private CallStatusEnum(string value) : base(value) { }
+      public CallStatusEnum() { }
+      public static implicit operator CallStatusEnum(string value)
+      {
+        return new CallStatusEnum(value);
+      }
+
+      public static readonly CallStatusEnum Initiated = new CallStatusEnum("initiated");
+      public static readonly CallStatusEnum Ringing = new CallStatusEnum("ringing");
+      public static readonly CallStatusEnum Answered = new CallStatusEnum("answered");
+      public static readonly CallStatusEnum Completed = new CallStatusEnum("completed");
+    }
+
+    public sealed class ConferenceEventEnum : StringEnum
+    {
+      private ConferenceEventEnum(string value) : base(value) { }
+      public ConferenceEventEnum() { }
+      public static implicit operator ConferenceEventEnum(string value)
+      {
+        return new ConferenceEventEnum(value);
+      }
+
+      public static readonly ConferenceEventEnum Start = new ConferenceEventEnum("start");
+      public static readonly ConferenceEventEnum End = new ConferenceEventEnum("end");
+      public static readonly ConferenceEventEnum Join = new ConferenceEventEnum("join");
+      public static readonly ConferenceEventEnum Leave = new ConferenceEventEnum("leave");
+      public static readonly ConferenceEventEnum Mute = new ConferenceEventEnum("mute");
+      public static readonly ConferenceEventEnum Hold = new ConferenceEventEnum("hold");
+      public static readonly ConferenceEventEnum Speaker = new ConferenceEventEnum("speaker");
+    }
+
+    public sealed class SupervisorModeEnum : StringEnum
+    {
+      private SupervisorModeEnum(string value) : base(value) { }
+      public SupervisorModeEnum() { }
+      public static implicit operator SupervisorModeEnum(string value)
+      {
+        return new SupervisorModeEnum(value);
+      }
+
+      public static readonly SupervisorModeEnum Monitor = new SupervisorModeEnum("monitor");
+      public static readonly SupervisorModeEnum Whisper = new SupervisorModeEnum("whisper");
+      public static readonly SupervisorModeEnum Barge = new SupervisorModeEnum("barge");
+    }
+
+    private static Request BuildReadRequest(ReadReservationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks/" + options.PathTaskSid + "/Reservations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Reservation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Reservation </returns>
+    public static ResourceSet<ReservationResource> Read(ReadReservationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ReservationResource>.FromJson("reservations", response.Content);
+      return new ResourceSet<ReservationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Reservation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Reservation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ReservationResource>> ReadAsync(ReadReservationOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ReservationResource>.FromJson("reservations", response.Content);
+      return new ResourceSet<ReservationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resources to read </param>
+    /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resources to read </param>
+    /// <param name="reservationStatus"> Returns the list of reservations for a task with a specified ReservationStatus
+    ///                         </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Reservation </returns>
+    public static ResourceSet<ReservationResource> Read(string pathWorkspaceSid,
+                                                        string pathTaskSid,
+                                                        ReservationResource.StatusEnum reservationStatus = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadReservationOptions(pathWorkspaceSid, pathTaskSid) { ReservationStatus = reservationStatus, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resources to read </param>
+    /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resources to read </param>
+    /// <param name="reservationStatus"> Returns the list of reservations for a task with a specified ReservationStatus
+    ///                         </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Reservation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ReservationResource>> ReadAsync(string pathWorkspaceSid,
+                                                                                                string pathTaskSid,
+                                                                                                ReservationResource.StatusEnum reservationStatus = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadReservationOptions(pathWorkspaceSid, pathTaskSid) { ReservationStatus = reservationStatus, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ReservationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ReservationResource>.FromJson("reservations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ReservationResource> NextPage(Page<ReservationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<ReservationResource>.FromJson("reservations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ReservationResource> PreviousPage(Page<ReservationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<ReservationResource>.FromJson("reservations", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchReservationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks/" + options.PathTaskSid + "/Reservations/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Reservation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Reservation </returns>
+    public static ReservationResource Fetch(FetchReservationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Reservation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Reservation </returns>
+    public static async System.Threading.Tasks.Task<ReservationResource> FetchAsync(FetchReservationOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resource to fetch </param>
+    /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resource to fetch </param>
+    /// <param name="pathSid"> The SID of the TaskReservation resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Reservation </returns>
+    public static ReservationResource Fetch(string pathWorkspaceSid,
+                                            string pathTaskSid,
+                                            string pathSid,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchReservationOptions(pathWorkspaceSid, pathTaskSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resource to fetch </param>
+    /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resource to fetch </param>
+    /// <param name="pathSid"> The SID of the TaskReservation resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Reservation </returns>
+    public static async System.Threading.Tasks.Task<ReservationResource> FetchAsync(string pathWorkspaceSid,
+                                                                                    string pathTaskSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchReservationOptions(pathWorkspaceSid, pathTaskSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateReservationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks/" + options.PathTaskSid + "/Reservations/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Reservation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Reservation </returns>
+    public static ReservationResource Update(UpdateReservationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Reservation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Reservation </returns>
+    public static async System.Threading.Tasks.Task<ReservationResource> UpdateAsync(UpdateReservationOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resources to update </param>
+    /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resources to update
+    ///                   </param>
+    /// <param name="pathSid"> The SID of the TaskReservation resource to update </param>
+    /// <param name="reservationStatus"> The new status of the reservation </param>
+    /// <param name="workerActivitySid"> The new worker activity SID if rejecting a reservation </param>
+    /// <param name="instruction"> The assignment instruction for reservation </param>
+    /// <param name="dequeuePostWorkActivitySid"> The SID of the Activity resource to start after executing a Dequeue
+    ///                                  instruction </param>
+    /// <param name="dequeueFrom"> The Caller ID of the call to the worker when executing a Dequeue instruction </param>
+    /// <param name="dequeueRecord"> Whether to record both legs of a call when executing a Dequeue instruction </param>
+    /// <param name="dequeueTimeout"> Timeout for call when executing a Dequeue instruction </param>
+    /// <param name="dequeueTo"> The Contact URI of the worker when executing a Dequeue instruction </param>
+    /// <param name="dequeueStatusCallbackUrl"> The Callback URL for completed call event when executing a Dequeue
+    ///                                instruction </param>
+    /// <param name="callFrom"> The Caller ID of the outbound call when executing a Call instruction </param>
+    /// <param name="callRecord"> Whether to record both legs of a call when executing a Call instruction </param>
+    /// <param name="callTimeout"> Timeout for call when executing a Call instruction </param>
+    /// <param name="callTo"> The Contact URI of the worker when executing a Call instruction </param>
+    /// <param name="callUrl"> TwiML URI executed on answering the worker's leg as a result of the Call instruction </param>
+    /// <param name="callStatusCallbackUrl"> The URL to call  for the completed call event when executing a Call
+    ///                             instruction </param>
+    /// <param name="callAccept"> Whether to accept a reservation when executing a Call instruction </param>
+    /// <param name="redirectCallSid"> The Call SID of the call parked in the queue when executing a Redirect instruction
+    ///                       </param>
+    /// <param name="redirectAccept"> Whether the reservation should be accepted when executing a Redirect instruction
+    ///                      </param>
+    /// <param name="redirectUrl"> TwiML URI to redirect the call to when executing the Redirect instruction </param>
+    /// <param name="to"> The Contact URI of the worker when executing a Conference instruction </param>
+    /// <param name="from"> The Caller ID of the call to the worker when executing a Conference instruction </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="statusCallbackEvent"> The call progress events that we will send to status_callback </param>
+    /// <param name="timeout"> Timeout for call when executing a Conference instruction </param>
+    /// <param name="record"> Whether to record the participant and their conferences </param>
+    /// <param name="muted"> Whether to mute the agent </param>
+    /// <param name="beep"> Whether to play a notification beep when the participant joins </param>
+    /// <param name="startConferenceOnEnter"> Whether the conference starts when the participant joins the conference
+    ///                              </param>
+    /// <param name="endConferenceOnExit"> Whether to end the conference when the agent leaves </param>
+    /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
+    /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
+    /// <param name="earlyMedia"> Whether agents can hear the state of the outbound call </param>
+    /// <param name="maxParticipants"> The maximum number of agent conference participants </param>
+    /// <param name="conferenceStatusCallback"> The callback URL for conference events </param>
+    /// <param name="conferenceStatusCallbackMethod"> HTTP method for requesting `conference_status_callback` URL </param>
+    /// <param name="conferenceStatusCallbackEvent"> The conference status events that we will send to
+    ///                                     conference_status_callback </param>
+    /// <param name="conferenceRecord"> Whether to record the conference the participant is joining </param>
+    /// <param name="conferenceTrim"> How to trim leading and trailing silence from your recorded conference audio files
+    ///                      </param>
+    /// <param name="recordingChannels"> Specify `mono` or `dual` recording channels </param>
+    /// <param name="recordingStatusCallback"> The URL that we should call using the `recording_status_callback_method`
+    ///                               when the recording status changes </param>
+    /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when we call `recording_status_callback`
+    ///                                     </param>
+    /// <param name="conferenceRecordingStatusCallback"> The URL we should call using the
+    ///                                         `conference_recording_status_callback_method` when the conference recording
+    ///                                         is available </param>
+    /// <param name="conferenceRecordingStatusCallbackMethod"> The HTTP method we should use to call
+    ///                                               `conference_recording_status_callback` </param>
+    /// <param name="region"> The region where we should mix the conference audio </param>
+    /// <param name="sipAuthUsername"> The SIP username used for authentication </param>
+    /// <param name="sipAuthPassword"> The SIP password for authentication </param>
+    /// <param name="dequeueStatusCallbackEvent"> The Call progress events sent via webhooks as a result of a Dequeue
+    ///                                  instruction </param>
+    /// <param name="postWorkActivitySid"> The new worker activity SID after executing a Conference instruction </param>
+    /// <param name="supervisorMode"> The Supervisor mode when executing the Supervise instruction </param>
+    /// <param name="supervisor"> The Supervisor SID/URI when executing the Supervise instruction </param>
+    /// <param name="endConferenceOnCustomerExit"> Whether to end the conference when the customer leaves </param>
+    /// <param name="beepOnCustomerEntrance"> Whether to play a notification beep when the customer joins </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Reservation </returns>
+    public static ReservationResource Update(string pathWorkspaceSid,
+                                             string pathTaskSid,
+                                             string pathSid,
+                                             ReservationResource.StatusEnum reservationStatus = null,
+                                             string workerActivitySid = null,
+                                             string instruction = null,
+                                             string dequeuePostWorkActivitySid = null,
+                                             string dequeueFrom = null,
+                                             string dequeueRecord = null,
+                                             int? dequeueTimeout = null,
+                                             string dequeueTo = null,
+                                             Uri dequeueStatusCallbackUrl = null,
+                                             string callFrom = null,
+                                             string callRecord = null,
+                                             int? callTimeout = null,
+                                             string callTo = null,
+                                             Uri callUrl = null,
+                                             Uri callStatusCallbackUrl = null,
+                                             bool? callAccept = null,
+                                             string redirectCallSid = null,
+                                             bool? redirectAccept = null,
+                                             Uri redirectUrl = null,
+                                             string to = null,
+                                             string from = null,
+                                             Uri statusCallback = null,
+                                             Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                             List<ReservationResource.CallStatusEnum> statusCallbackEvent = null,
+                                             int? timeout = null,
+                                             bool? record = null,
+                                             bool? muted = null,
+                                             string beep = null,
+                                             bool? startConferenceOnEnter = null,
+                                             bool? endConferenceOnExit = null,
+                                             Uri waitUrl = null,
+                                             Twilio.Http.HttpMethod waitMethod = null,
+                                             bool? earlyMedia = null,
+                                             int? maxParticipants = null,
+                                             Uri conferenceStatusCallback = null,
+                                             Twilio.Http.HttpMethod conferenceStatusCallbackMethod = null,
+                                             List<ReservationResource.ConferenceEventEnum> conferenceStatusCallbackEvent = null,
+                                             string conferenceRecord = null,
+                                             string conferenceTrim = null,
+                                             string recordingChannels = null,
+                                             Uri recordingStatusCallback = null,
+                                             Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                                             Uri conferenceRecordingStatusCallback = null,
+                                             Twilio.Http.HttpMethod conferenceRecordingStatusCallbackMethod = null,
+                                             string region = null,
+                                             string sipAuthUsername = null,
+                                             string sipAuthPassword = null,
+                                             List<string> dequeueStatusCallbackEvent = null,
+                                             string postWorkActivitySid = null,
+                                             ReservationResource.SupervisorModeEnum supervisorMode = null,
+                                             string supervisor = null,
+                                             bool? endConferenceOnCustomerExit = null,
+                                             bool? beepOnCustomerEntrance = null,
+                                             string ifMatch = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateReservationOptions(pathWorkspaceSid, pathTaskSid, pathSid) { ReservationStatus = reservationStatus, WorkerActivitySid = workerActivitySid, Instruction = instruction, DequeuePostWorkActivitySid = dequeuePostWorkActivitySid, DequeueFrom = dequeueFrom, DequeueRecord = dequeueRecord, DequeueTimeout = dequeueTimeout, DequeueTo = dequeueTo, DequeueStatusCallbackUrl = dequeueStatusCallbackUrl, CallFrom = callFrom, CallRecord = callRecord, CallTimeout = callTimeout, CallTo = callTo, CallUrl = callUrl, CallStatusCallbackUrl = callStatusCallbackUrl, CallAccept = callAccept, RedirectCallSid = redirectCallSid, RedirectAccept = redirectAccept, RedirectUrl = redirectUrl, To = to, From = from, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, StatusCallbackEvent = statusCallbackEvent, Timeout = timeout, Record = record, Muted = muted, Beep = beep, StartConferenceOnEnter = startConferenceOnEnter, EndConferenceOnExit = endConferenceOnExit, WaitUrl = waitUrl, WaitMethod = waitMethod, EarlyMedia = earlyMedia, MaxParticipants = maxParticipants, ConferenceStatusCallback = conferenceStatusCallback, ConferenceStatusCallbackMethod = conferenceStatusCallbackMethod, ConferenceStatusCallbackEvent = conferenceStatusCallbackEvent, ConferenceRecord = conferenceRecord, ConferenceTrim = conferenceTrim, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, ConferenceRecordingStatusCallback = conferenceRecordingStatusCallback, ConferenceRecordingStatusCallbackMethod = conferenceRecordingStatusCallbackMethod, Region = region, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, DequeueStatusCallbackEvent = dequeueStatusCallbackEvent, PostWorkActivitySid = postWorkActivitySid, SupervisorMode = supervisorMode, Supervisor = supervisor, EndConferenceOnCustomerExit = endConferenceOnCustomerExit, BeepOnCustomerEntrance = beepOnCustomerEntrance, IfMatch = ifMatch };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskReservation resources to update </param>
+    /// <param name="pathTaskSid"> The SID of the reserved Task resource with the TaskReservation resources to update
+    ///                   </param>
+    /// <param name="pathSid"> The SID of the TaskReservation resource to update </param>
+    /// <param name="reservationStatus"> The new status of the reservation </param>
+    /// <param name="workerActivitySid"> The new worker activity SID if rejecting a reservation </param>
+    /// <param name="instruction"> The assignment instruction for reservation </param>
+    /// <param name="dequeuePostWorkActivitySid"> The SID of the Activity resource to start after executing a Dequeue
+    ///                                  instruction </param>
+    /// <param name="dequeueFrom"> The Caller ID of the call to the worker when executing a Dequeue instruction </param>
+    /// <param name="dequeueRecord"> Whether to record both legs of a call when executing a Dequeue instruction </param>
+    /// <param name="dequeueTimeout"> Timeout for call when executing a Dequeue instruction </param>
+    /// <param name="dequeueTo"> The Contact URI of the worker when executing a Dequeue instruction </param>
+    /// <param name="dequeueStatusCallbackUrl"> The Callback URL for completed call event when executing a Dequeue
+    ///                                instruction </param>
+    /// <param name="callFrom"> The Caller ID of the outbound call when executing a Call instruction </param>
+    /// <param name="callRecord"> Whether to record both legs of a call when executing a Call instruction </param>
+    /// <param name="callTimeout"> Timeout for call when executing a Call instruction </param>
+    /// <param name="callTo"> The Contact URI of the worker when executing a Call instruction </param>
+    /// <param name="callUrl"> TwiML URI executed on answering the worker's leg as a result of the Call instruction </param>
+    /// <param name="callStatusCallbackUrl"> The URL to call  for the completed call event when executing a Call
+    ///                             instruction </param>
+    /// <param name="callAccept"> Whether to accept a reservation when executing a Call instruction </param>
+    /// <param name="redirectCallSid"> The Call SID of the call parked in the queue when executing a Redirect instruction
+    ///                       </param>
+    /// <param name="redirectAccept"> Whether the reservation should be accepted when executing a Redirect instruction
+    ///                      </param>
+    /// <param name="redirectUrl"> TwiML URI to redirect the call to when executing the Redirect instruction </param>
+    /// <param name="to"> The Contact URI of the worker when executing a Conference instruction </param>
+    /// <param name="from"> The Caller ID of the call to the worker when executing a Conference instruction </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="statusCallbackEvent"> The call progress events that we will send to status_callback </param>
+    /// <param name="timeout"> Timeout for call when executing a Conference instruction </param>
+    /// <param name="record"> Whether to record the participant and their conferences </param>
+    /// <param name="muted"> Whether to mute the agent </param>
+    /// <param name="beep"> Whether to play a notification beep when the participant joins </param>
+    /// <param name="startConferenceOnEnter"> Whether the conference starts when the participant joins the conference
+    ///                              </param>
+    /// <param name="endConferenceOnExit"> Whether to end the conference when the agent leaves </param>
+    /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
+    /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
+    /// <param name="earlyMedia"> Whether agents can hear the state of the outbound call </param>
+    /// <param name="maxParticipants"> The maximum number of agent conference participants </param>
+    /// <param name="conferenceStatusCallback"> The callback URL for conference events </param>
+    /// <param name="conferenceStatusCallbackMethod"> HTTP method for requesting `conference_status_callback` URL </param>
+    /// <param name="conferenceStatusCallbackEvent"> The conference status events that we will send to
+    ///                                     conference_status_callback </param>
+    /// <param name="conferenceRecord"> Whether to record the conference the participant is joining </param>
+    /// <param name="conferenceTrim"> How to trim leading and trailing silence from your recorded conference audio files
+    ///                      </param>
+    /// <param name="recordingChannels"> Specify `mono` or `dual` recording channels </param>
+    /// <param name="recordingStatusCallback"> The URL that we should call using the `recording_status_callback_method`
+    ///                               when the recording status changes </param>
+    /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when we call `recording_status_callback`
+    ///                                     </param>
+    /// <param name="conferenceRecordingStatusCallback"> The URL we should call using the
+    ///                                         `conference_recording_status_callback_method` when the conference recording
+    ///                                         is available </param>
+    /// <param name="conferenceRecordingStatusCallbackMethod"> The HTTP method we should use to call
+    ///                                               `conference_recording_status_callback` </param>
+    /// <param name="region"> The region where we should mix the conference audio </param>
+    /// <param name="sipAuthUsername"> The SIP username used for authentication </param>
+    /// <param name="sipAuthPassword"> The SIP password for authentication </param>
+    /// <param name="dequeueStatusCallbackEvent"> The Call progress events sent via webhooks as a result of a Dequeue
+    ///                                  instruction </param>
+    /// <param name="postWorkActivitySid"> The new worker activity SID after executing a Conference instruction </param>
+    /// <param name="supervisorMode"> The Supervisor mode when executing the Supervise instruction </param>
+    /// <param name="supervisor"> The Supervisor SID/URI when executing the Supervise instruction </param>
+    /// <param name="endConferenceOnCustomerExit"> Whether to end the conference when the customer leaves </param>
+    /// <param name="beepOnCustomerEntrance"> Whether to play a notification beep when the customer joins </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Reservation </returns>
+    public static async System.Threading.Tasks.Task<ReservationResource> UpdateAsync(string pathWorkspaceSid,
+                                                                                     string pathTaskSid,
+                                                                                     string pathSid,
+                                                                                     ReservationResource.StatusEnum reservationStatus = null,
+                                                                                     string workerActivitySid = null,
+                                                                                     string instruction = null,
+                                                                                     string dequeuePostWorkActivitySid = null,
+                                                                                     string dequeueFrom = null,
+                                                                                     string dequeueRecord = null,
+                                                                                     int? dequeueTimeout = null,
+                                                                                     string dequeueTo = null,
+                                                                                     Uri dequeueStatusCallbackUrl = null,
+                                                                                     string callFrom = null,
+                                                                                     string callRecord = null,
+                                                                                     int? callTimeout = null,
+                                                                                     string callTo = null,
+                                                                                     Uri callUrl = null,
+                                                                                     Uri callStatusCallbackUrl = null,
+                                                                                     bool? callAccept = null,
+                                                                                     string redirectCallSid = null,
+                                                                                     bool? redirectAccept = null,
+                                                                                     Uri redirectUrl = null,
+                                                                                     string to = null,
+                                                                                     string from = null,
+                                                                                     Uri statusCallback = null,
+                                                                                     Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                     List<ReservationResource.CallStatusEnum> statusCallbackEvent = null,
+                                                                                     int? timeout = null,
+                                                                                     bool? record = null,
+                                                                                     bool? muted = null,
+                                                                                     string beep = null,
+                                                                                     bool? startConferenceOnEnter = null,
+                                                                                     bool? endConferenceOnExit = null,
+                                                                                     Uri waitUrl = null,
+                                                                                     Twilio.Http.HttpMethod waitMethod = null,
+                                                                                     bool? earlyMedia = null,
+                                                                                     int? maxParticipants = null,
+                                                                                     Uri conferenceStatusCallback = null,
+                                                                                     Twilio.Http.HttpMethod conferenceStatusCallbackMethod = null,
+                                                                                     List<ReservationResource.ConferenceEventEnum> conferenceStatusCallbackEvent = null,
+                                                                                     string conferenceRecord = null,
+                                                                                     string conferenceTrim = null,
+                                                                                     string recordingChannels = null,
+                                                                                     Uri recordingStatusCallback = null,
+                                                                                     Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                                                                                     Uri conferenceRecordingStatusCallback = null,
+                                                                                     Twilio.Http.HttpMethod conferenceRecordingStatusCallbackMethod = null,
+                                                                                     string region = null,
+                                                                                     string sipAuthUsername = null,
+                                                                                     string sipAuthPassword = null,
+                                                                                     List<string> dequeueStatusCallbackEvent = null,
+                                                                                     string postWorkActivitySid = null,
+                                                                                     ReservationResource.SupervisorModeEnum supervisorMode = null,
+                                                                                     string supervisor = null,
+                                                                                     bool? endConferenceOnCustomerExit = null,
+                                                                                     bool? beepOnCustomerEntrance = null,
+                                                                                     string ifMatch = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateReservationOptions(pathWorkspaceSid, pathTaskSid, pathSid) { ReservationStatus = reservationStatus, WorkerActivitySid = workerActivitySid, Instruction = instruction, DequeuePostWorkActivitySid = dequeuePostWorkActivitySid, DequeueFrom = dequeueFrom, DequeueRecord = dequeueRecord, DequeueTimeout = dequeueTimeout, DequeueTo = dequeueTo, DequeueStatusCallbackUrl = dequeueStatusCallbackUrl, CallFrom = callFrom, CallRecord = callRecord, CallTimeout = callTimeout, CallTo = callTo, CallUrl = callUrl, CallStatusCallbackUrl = callStatusCallbackUrl, CallAccept = callAccept, RedirectCallSid = redirectCallSid, RedirectAccept = redirectAccept, RedirectUrl = redirectUrl, To = to, From = from, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, StatusCallbackEvent = statusCallbackEvent, Timeout = timeout, Record = record, Muted = muted, Beep = beep, StartConferenceOnEnter = startConferenceOnEnter, EndConferenceOnExit = endConferenceOnExit, WaitUrl = waitUrl, WaitMethod = waitMethod, EarlyMedia = earlyMedia, MaxParticipants = maxParticipants, ConferenceStatusCallback = conferenceStatusCallback, ConferenceStatusCallbackMethod = conferenceStatusCallbackMethod, ConferenceStatusCallbackEvent = conferenceStatusCallbackEvent, ConferenceRecord = conferenceRecord, ConferenceTrim = conferenceTrim, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, ConferenceRecordingStatusCallback = conferenceRecordingStatusCallback, ConferenceRecordingStatusCallbackMethod = conferenceRecordingStatusCallbackMethod, Region = region, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, DequeueStatusCallbackEvent = dequeueStatusCallbackEvent, PostWorkActivitySid = postWorkActivitySid, SupervisorMode = supervisorMode, Supervisor = supervisor, EndConferenceOnCustomerExit = endConferenceOnCustomerExit, BeepOnCustomerEntrance = beepOnCustomerEntrance, IfMatch = ifMatch };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ReservationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ReservationResource object represented by the provided JSON </returns>
+    public static ReservationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ReservationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The current status of the reservation
+    /// </summary>
+    [JsonProperty("reservation_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ReservationResource.StatusEnum ReservationStatus { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the reserved Task resource
+    /// </summary>
+    [JsonProperty("task_sid")]
+    public string TaskSid { get; private set; }
+    /// <summary>
+    /// The friendly_name of the Worker that is reserved
+    /// </summary>
+    [JsonProperty("worker_name")]
+    public string WorkerName { get; private set; }
+    /// <summary>
+    /// The SID of the reserved Worker resource
+    /// </summary>
+    [JsonProperty("worker_sid")]
+    public string WorkerSid { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that this task is contained within.
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the TaskReservation reservation
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ReservationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskChannelOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskChannelOptions.cs
index bd4d00678..0981bce2c 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskChannelOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskChannelOptions.cs
@@ -9,223 +9,223 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
+{
+
+  /// <summary>
+  /// FetchTaskChannelOptions
+  /// </summary>
+  public class FetchTaskChannelOptions : IOptions<TaskChannelResource>
+  {
     /// <summary>
-    /// FetchTaskChannelOptions
-    /// </summary>
-    public class FetchTaskChannelOptions : IOptions<TaskChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Task Channel to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the Task Channel resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTaskChannelOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to fetch </param>
-        /// <param name="pathSid"> The SID of the Task Channel resource to fetch </param>
-        public FetchTaskChannelOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Workspace with the Task Channel to fetch
+    /// </summary>
+    public string PathWorkspaceSid { get; }
     /// <summary>
-    /// ReadTaskChannelOptions
+    /// The SID of the Task Channel resource to fetch
     /// </summary>
-    public class ReadTaskChannelOptions : ReadOptions<TaskChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Task Channel to read
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadTaskChannelOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to read </param>
-        public ReadTaskChannelOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// UpdateTaskChannelOptions
-    /// </summary>
-    public class UpdateTaskChannelOptions : IOptions<TaskChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Task Channel to update
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the Task Channel resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the Task Channel resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Whether the TaskChannel should prioritize Workers that have been idle
-        /// </summary>
-        public bool? ChannelOptimizedRouting { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateTaskChannelOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to update </param>
-        /// <param name="pathSid"> The SID of the Task Channel resource to update </param>
-        public UpdateTaskChannelOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (ChannelOptimizedRouting != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelOptimizedRouting", ChannelOptimizedRouting.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchTaskChannelOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to fetch </param>
+    /// <param name="pathSid"> The SID of the Task Channel resource to fetch </param>
+    public FetchTaskChannelOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// DeleteTaskChannelOptions
-    /// </summary>
-    public class DeleteTaskChannelOptions : IOptions<TaskChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Task Channel to delete
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the Task Channel resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteTaskChannelOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to delete </param>
-        /// <param name="pathSid"> The SID of the Task Channel resource to delete </param>
-        public DeleteTaskChannelOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadTaskChannelOptions
+  /// </summary>
+  public class ReadTaskChannelOptions : ReadOptions<TaskChannelResource>
+  {
     /// <summary>
-    /// CreateTaskChannelOptions
-    /// </summary>
-    public class CreateTaskChannelOptions : IOptions<TaskChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace that the new Task Channel belongs to
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// A string to describe the Task Channel resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the Task Channel
-        /// </summary>
-        public string UniqueName { get; }
-        /// <summary>
-        /// Whether the Task Channel should prioritize Workers that have been idle
-        /// </summary>
-        public bool? ChannelOptimizedRouting { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateTaskChannelOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Task Channel belongs to </param>
-        /// <param name="friendlyName"> A string to describe the Task Channel resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the Task Channel </param>
-        public CreateTaskChannelOptions(string pathWorkspaceSid, string friendlyName, string uniqueName)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            FriendlyName = friendlyName;
-            UniqueName = uniqueName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (ChannelOptimizedRouting != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelOptimizedRouting", ChannelOptimizedRouting.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Workspace with the Task Channel to read
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadTaskChannelOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to read </param>
+    public ReadTaskChannelOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateTaskChannelOptions
+  /// </summary>
+  public class UpdateTaskChannelOptions : IOptions<TaskChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the Task Channel to update
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the Task Channel resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the Task Channel resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Whether the TaskChannel should prioritize Workers that have been idle
+    /// </summary>
+    public bool? ChannelOptimizedRouting { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateTaskChannelOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to update </param>
+    /// <param name="pathSid"> The SID of the Task Channel resource to update </param>
+    public UpdateTaskChannelOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (ChannelOptimizedRouting != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelOptimizedRouting", ChannelOptimizedRouting.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteTaskChannelOptions
+  /// </summary>
+  public class DeleteTaskChannelOptions : IOptions<TaskChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the Task Channel to delete
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the Task Channel resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteTaskChannelOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to delete </param>
+    /// <param name="pathSid"> The SID of the Task Channel resource to delete </param>
+    public DeleteTaskChannelOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateTaskChannelOptions
+  /// </summary>
+  public class CreateTaskChannelOptions : IOptions<TaskChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace that the new Task Channel belongs to
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// A string to describe the Task Channel resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the Task Channel
+    /// </summary>
+    public string UniqueName { get; }
+    /// <summary>
+    /// Whether the Task Channel should prioritize Workers that have been idle
+    /// </summary>
+    public bool? ChannelOptimizedRouting { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateTaskChannelOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Task Channel belongs to </param>
+    /// <param name="friendlyName"> A string to describe the Task Channel resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the Task Channel </param>
+    public CreateTaskChannelOptions(string pathWorkspaceSid, string friendlyName, string uniqueName)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      FriendlyName = friendlyName;
+      UniqueName = uniqueName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (ChannelOptimizedRouting != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelOptimizedRouting", ChannelOptimizedRouting.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskChannelResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskChannelResource.cs
index 729aa0a92..65a6f432d 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskChannelResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskChannelResource.cs
@@ -16,520 +16,520 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
-    public class TaskChannelResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchTaskChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskChannels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskChannel </returns>
-        public static TaskChannelResource Fetch(FetchTaskChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskChannel </returns>
-        public static async System.Threading.Tasks.Task<TaskChannelResource> FetchAsync(FetchTaskChannelOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to fetch </param>
-        /// <param name="pathSid"> The SID of the Task Channel resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskChannel </returns>
-        public static TaskChannelResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskChannelOptions(pathWorkspaceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to fetch </param>
-        /// <param name="pathSid"> The SID of the Task Channel resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskChannel </returns>
-        public static async System.Threading.Tasks.Task<TaskChannelResource> FetchAsync(string pathWorkspaceSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskChannelOptions(pathWorkspaceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadTaskChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskChannels",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read TaskChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskChannel </returns>
-        public static ResourceSet<TaskChannelResource> Read(ReadTaskChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TaskChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<TaskChannelResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read TaskChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TaskChannelResource>> ReadAsync(ReadTaskChannelOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TaskChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<TaskChannelResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskChannel </returns>
-        public static ResourceSet<TaskChannelResource> Read(string pathWorkspaceSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadTaskChannelOptions(pathWorkspaceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TaskChannelResource>> ReadAsync(string pathWorkspaceSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadTaskChannelOptions(pathWorkspaceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TaskChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TaskChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TaskChannelResource> NextPage(Page<TaskChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<TaskChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TaskChannelResource> PreviousPage(Page<TaskChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<TaskChannelResource>.FromJson("channels", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateTaskChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskChannels/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update TaskChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskChannel </returns>
-        public static TaskChannelResource Update(UpdateTaskChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update TaskChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskChannel </returns>
-        public static async System.Threading.Tasks.Task<TaskChannelResource> UpdateAsync(UpdateTaskChannelOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to update </param>
-        /// <param name="pathSid"> The SID of the Task Channel resource to update </param>
-        /// <param name="friendlyName"> A string to describe the Task Channel resource </param>
-        /// <param name="channelOptimizedRouting"> Whether the TaskChannel should prioritize Workers that have been idle
-        ///                               </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskChannel </returns>
-        public static TaskChannelResource Update(string pathWorkspaceSid,
-                                                 string pathSid,
-                                                 string friendlyName = null,
-                                                 bool? channelOptimizedRouting = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskChannelOptions(pathWorkspaceSid, pathSid){FriendlyName = friendlyName, ChannelOptimizedRouting = channelOptimizedRouting};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to update </param>
-        /// <param name="pathSid"> The SID of the Task Channel resource to update </param>
-        /// <param name="friendlyName"> A string to describe the Task Channel resource </param>
-        /// <param name="channelOptimizedRouting"> Whether the TaskChannel should prioritize Workers that have been idle
-        ///                               </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskChannel </returns>
-        public static async System.Threading.Tasks.Task<TaskChannelResource> UpdateAsync(string pathWorkspaceSid,
-                                                                                         string pathSid,
-                                                                                         string friendlyName = null,
-                                                                                         bool? channelOptimizedRouting = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskChannelOptions(pathWorkspaceSid, pathSid){FriendlyName = friendlyName, ChannelOptimizedRouting = channelOptimizedRouting};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteTaskChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskChannels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete TaskChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskChannel </returns>
-        public static bool Delete(DeleteTaskChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete TaskChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskChannel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTaskChannelOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to delete </param>
-        /// <param name="pathSid"> The SID of the Task Channel resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskChannel </returns>
-        public static bool Delete(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteTaskChannelOptions(pathWorkspaceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to delete </param>
-        /// <param name="pathSid"> The SID of the Task Channel resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskChannel </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathWorkspaceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteTaskChannelOptions(pathWorkspaceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateTaskChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskChannels",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create TaskChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskChannel </returns>
-        public static TaskChannelResource Create(CreateTaskChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create TaskChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskChannel </returns>
-        public static async System.Threading.Tasks.Task<TaskChannelResource> CreateAsync(CreateTaskChannelOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Task Channel belongs to </param>
-        /// <param name="friendlyName"> A string to describe the Task Channel resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the Task Channel </param>
-        /// <param name="channelOptimizedRouting"> Whether the Task Channel should prioritize Workers that have been idle
-        ///                               </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskChannel </returns>
-        public static TaskChannelResource Create(string pathWorkspaceSid,
-                                                 string friendlyName,
-                                                 string uniqueName,
-                                                 bool? channelOptimizedRouting = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateTaskChannelOptions(pathWorkspaceSid, friendlyName, uniqueName){ChannelOptimizedRouting = channelOptimizedRouting};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Task Channel belongs to </param>
-        /// <param name="friendlyName"> A string to describe the Task Channel resource </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the Task Channel </param>
-        /// <param name="channelOptimizedRouting"> Whether the Task Channel should prioritize Workers that have been idle
-        ///                               </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskChannel </returns>
-        public static async System.Threading.Tasks.Task<TaskChannelResource> CreateAsync(string pathWorkspaceSid,
-                                                                                         string friendlyName,
-                                                                                         string uniqueName,
-                                                                                         bool? channelOptimizedRouting = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateTaskChannelOptions(pathWorkspaceSid, friendlyName, uniqueName){ChannelOptimizedRouting = channelOptimizedRouting};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TaskChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TaskChannelResource object represented by the provided JSON </returns>
-        public static TaskChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TaskChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the Task Channel
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the Task Channel
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// Whether the Task Channel will prioritize Workers that have been idle
-        /// </summary>
-        [JsonProperty("channel_optimized_routing")]
-        public bool? ChannelOptimizedRouting { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Task Channel resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private TaskChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class TaskChannelResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchTaskChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskChannels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskChannel </returns>
+    public static TaskChannelResource Fetch(FetchTaskChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskChannel </returns>
+    public static async System.Threading.Tasks.Task<TaskChannelResource> FetchAsync(FetchTaskChannelOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to fetch </param>
+    /// <param name="pathSid"> The SID of the Task Channel resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskChannel </returns>
+    public static TaskChannelResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskChannelOptions(pathWorkspaceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to fetch </param>
+    /// <param name="pathSid"> The SID of the Task Channel resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskChannel </returns>
+    public static async System.Threading.Tasks.Task<TaskChannelResource> FetchAsync(string pathWorkspaceSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskChannelOptions(pathWorkspaceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadTaskChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskChannels",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read TaskChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskChannel </returns>
+    public static ResourceSet<TaskChannelResource> Read(ReadTaskChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TaskChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<TaskChannelResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read TaskChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TaskChannelResource>> ReadAsync(ReadTaskChannelOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TaskChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<TaskChannelResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskChannel </returns>
+    public static ResourceSet<TaskChannelResource> Read(string pathWorkspaceSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadTaskChannelOptions(pathWorkspaceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TaskChannelResource>> ReadAsync(string pathWorkspaceSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadTaskChannelOptions(pathWorkspaceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TaskChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TaskChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TaskChannelResource> NextPage(Page<TaskChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<TaskChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TaskChannelResource> PreviousPage(Page<TaskChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<TaskChannelResource>.FromJson("channels", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateTaskChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskChannels/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update TaskChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskChannel </returns>
+    public static TaskChannelResource Update(UpdateTaskChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update TaskChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskChannel </returns>
+    public static async System.Threading.Tasks.Task<TaskChannelResource> UpdateAsync(UpdateTaskChannelOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to update </param>
+    /// <param name="pathSid"> The SID of the Task Channel resource to update </param>
+    /// <param name="friendlyName"> A string to describe the Task Channel resource </param>
+    /// <param name="channelOptimizedRouting"> Whether the TaskChannel should prioritize Workers that have been idle
+    ///                               </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskChannel </returns>
+    public static TaskChannelResource Update(string pathWorkspaceSid,
+                                             string pathSid,
+                                             string friendlyName = null,
+                                             bool? channelOptimizedRouting = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskChannelOptions(pathWorkspaceSid, pathSid) { FriendlyName = friendlyName, ChannelOptimizedRouting = channelOptimizedRouting };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to update </param>
+    /// <param name="pathSid"> The SID of the Task Channel resource to update </param>
+    /// <param name="friendlyName"> A string to describe the Task Channel resource </param>
+    /// <param name="channelOptimizedRouting"> Whether the TaskChannel should prioritize Workers that have been idle
+    ///                               </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskChannel </returns>
+    public static async System.Threading.Tasks.Task<TaskChannelResource> UpdateAsync(string pathWorkspaceSid,
+                                                                                     string pathSid,
+                                                                                     string friendlyName = null,
+                                                                                     bool? channelOptimizedRouting = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskChannelOptions(pathWorkspaceSid, pathSid) { FriendlyName = friendlyName, ChannelOptimizedRouting = channelOptimizedRouting };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteTaskChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskChannels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete TaskChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskChannel </returns>
+    public static bool Delete(DeleteTaskChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete TaskChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskChannel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTaskChannelOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to delete </param>
+    /// <param name="pathSid"> The SID of the Task Channel resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskChannel </returns>
+    public static bool Delete(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteTaskChannelOptions(pathWorkspaceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task Channel to delete </param>
+    /// <param name="pathSid"> The SID of the Task Channel resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskChannel </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathWorkspaceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteTaskChannelOptions(pathWorkspaceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateTaskChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskChannels",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create TaskChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskChannel </returns>
+    public static TaskChannelResource Create(CreateTaskChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create TaskChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskChannel </returns>
+    public static async System.Threading.Tasks.Task<TaskChannelResource> CreateAsync(CreateTaskChannelOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Task Channel belongs to </param>
+    /// <param name="friendlyName"> A string to describe the Task Channel resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the Task Channel </param>
+    /// <param name="channelOptimizedRouting"> Whether the Task Channel should prioritize Workers that have been idle
+    ///                               </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskChannel </returns>
+    public static TaskChannelResource Create(string pathWorkspaceSid,
+                                             string friendlyName,
+                                             string uniqueName,
+                                             bool? channelOptimizedRouting = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateTaskChannelOptions(pathWorkspaceSid, friendlyName, uniqueName) { ChannelOptimizedRouting = channelOptimizedRouting };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Task Channel belongs to </param>
+    /// <param name="friendlyName"> A string to describe the Task Channel resource </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the Task Channel </param>
+    /// <param name="channelOptimizedRouting"> Whether the Task Channel should prioritize Workers that have been idle
+    ///                               </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskChannel </returns>
+    public static async System.Threading.Tasks.Task<TaskChannelResource> CreateAsync(string pathWorkspaceSid,
+                                                                                     string friendlyName,
+                                                                                     string uniqueName,
+                                                                                     bool? channelOptimizedRouting = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateTaskChannelOptions(pathWorkspaceSid, friendlyName, uniqueName) { ChannelOptimizedRouting = channelOptimizedRouting };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TaskChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TaskChannelResource object represented by the provided JSON </returns>
+    public static TaskChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TaskChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the Task Channel
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the Task Channel
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// Whether the Task Channel will prioritize Workers that have been idle
+    /// </summary>
+    [JsonProperty("channel_optimized_routing")]
+    public bool? ChannelOptimizedRouting { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Task Channel resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private TaskChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskOptions.cs
index db8cbebe8..a8c561f64 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskOptions.cs
@@ -10,382 +10,382 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
+{
+
+  /// <summary>
+  /// FetchTaskOptions
+  /// </summary>
+  public class FetchTaskOptions : IOptions<TaskResource>
+  {
     /// <summary>
-    /// FetchTaskOptions
-    /// </summary>
-    public class FetchTaskOptions : IOptions<TaskResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Task to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTaskOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        public FetchTaskOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Workspace with the Task to fetch
+    /// </summary>
+    public string PathWorkspaceSid { get; }
     /// <summary>
-    /// UpdateTaskOptions
-    /// </summary>
-    public class UpdateTaskOptions : IOptions<TaskResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Task to update
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The JSON string that describes the custom attributes of the task
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// The new status of the task
-        /// </summary>
-        public TaskResource.StatusEnum AssignmentStatus { get; set; }
-        /// <summary>
-        /// The reason that the Task was canceled or complete
-        /// </summary>
-        public string Reason { get; set; }
-        /// <summary>
-        /// The Task's new priority value
-        /// </summary>
-        public int? Priority { get; set; }
-        /// <summary>
-        /// When MultiTasking is enabled, specify the TaskChannel with the task to update
-        /// </summary>
-        public string TaskChannel { get; set; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateTaskOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to update </param>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        public UpdateTaskOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (AssignmentStatus != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AssignmentStatus", AssignmentStatus.ToString()));
-            }
-
-            if (Reason != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Reason", Reason));
-            }
-
-            if (Priority != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
-            }
-
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteTaskOptions
-    /// </summary>
-    public class DeleteTaskOptions : IOptions<TaskResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Task to delete
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteTaskOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to delete </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        public DeleteTaskOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchTaskOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    public FetchTaskOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadTaskOptions
-    /// </summary>
-    public class ReadTaskOptions : ReadOptions<TaskResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Tasks to read
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The priority value of the Tasks to read
-        /// </summary>
-        public int? Priority { get; set; }
-        /// <summary>
-        /// Returns the list of all Tasks in the Workspace with the specified assignment_status
-        /// </summary>
-        public List<string> AssignmentStatus { get; set; }
-        /// <summary>
-        /// The SID of the Workflow with the Tasks to read
-        /// </summary>
-        public string WorkflowSid { get; set; }
-        /// <summary>
-        /// The friendly name of the Workflow with the Tasks to read
-        /// </summary>
-        public string WorkflowName { get; set; }
-        /// <summary>
-        /// The SID of the TaskQueue with the Tasks to read
-        /// </summary>
-        public string TaskQueueSid { get; set; }
-        /// <summary>
-        /// The friendly_name of the TaskQueue with the Tasks to read
-        /// </summary>
-        public string TaskQueueName { get; set; }
-        /// <summary>
-        /// The task attributes of the Tasks to read
-        /// </summary>
-        public string EvaluateTaskAttributes { get; set; }
-        /// <summary>
-        /// Controls the order of the Tasks returned
-        /// </summary>
-        public string Ordering { get; set; }
-        /// <summary>
-        /// Whether to read Tasks with addons
-        /// </summary>
-        public bool? HasAddons { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadTaskOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Tasks to read </param>
-        public ReadTaskOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            AssignmentStatus = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Priority != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
-            }
-
-            if (AssignmentStatus != null)
-            {
-                p.AddRange(AssignmentStatus.Select(prop => new KeyValuePair<string, string>("AssignmentStatus", prop)));
-            }
-
-            if (WorkflowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WorkflowSid", WorkflowSid.ToString()));
-            }
-
-            if (WorkflowName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WorkflowName", WorkflowName));
-            }
-
-            if (TaskQueueSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskQueueSid", TaskQueueSid.ToString()));
-            }
-
-            if (TaskQueueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskQueueName", TaskQueueName));
-            }
-
-            if (EvaluateTaskAttributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EvaluateTaskAttributes", EvaluateTaskAttributes));
-            }
-
-            if (Ordering != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ordering", Ordering));
-            }
-
-            if (HasAddons != null)
-            {
-                p.Add(new KeyValuePair<string, string>("HasAddons", HasAddons.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateTaskOptions
+  /// </summary>
+  public class UpdateTaskOptions : IOptions<TaskResource>
+  {
     /// <summary>
-    /// CreateTaskOptions
-    /// </summary>
-    public class CreateTaskOptions : IOptions<TaskResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace that the new Task belongs to
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The amount of time in seconds the task can live before being assigned
-        /// </summary>
-        public int? Timeout { get; set; }
-        /// <summary>
-        /// The priority to assign the new task and override the default
-        /// </summary>
-        public int? Priority { get; set; }
-        /// <summary>
-        /// When MultiTasking is enabled specify the TaskChannel by passing either its unique_name or SID
-        /// </summary>
-        public string TaskChannel { get; set; }
-        /// <summary>
-        /// The SID of the Workflow that you would like to handle routing for the new Task
-        /// </summary>
-        public string WorkflowSid { get; set; }
-        /// <summary>
-        /// A URL-encoded JSON string describing the attributes of the task
-        /// </summary>
-        public string Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateTaskOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Task belongs to </param>
-        public CreateTaskOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Timeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timeout", Timeout.ToString()));
-            }
-
-            if (Priority != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
-            }
-
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            if (WorkflowSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WorkflowSid", WorkflowSid.ToString()));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-    }
+    /// The SID of the Workspace with the Task to update
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The JSON string that describes the custom attributes of the task
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// The new status of the task
+    /// </summary>
+    public TaskResource.StatusEnum AssignmentStatus { get; set; }
+    /// <summary>
+    /// The reason that the Task was canceled or complete
+    /// </summary>
+    public string Reason { get; set; }
+    /// <summary>
+    /// The Task's new priority value
+    /// </summary>
+    public int? Priority { get; set; }
+    /// <summary>
+    /// When MultiTasking is enabled, specify the TaskChannel with the task to update
+    /// </summary>
+    public string TaskChannel { get; set; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateTaskOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to update </param>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    public UpdateTaskOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (AssignmentStatus != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AssignmentStatus", AssignmentStatus.ToString()));
+      }
+
+      if (Reason != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Reason", Reason));
+      }
+
+      if (Priority != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
+      }
+
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteTaskOptions
+  /// </summary>
+  public class DeleteTaskOptions : IOptions<TaskResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the Task to delete
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteTaskOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to delete </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    public DeleteTaskOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadTaskOptions
+  /// </summary>
+  public class ReadTaskOptions : ReadOptions<TaskResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the Tasks to read
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The priority value of the Tasks to read
+    /// </summary>
+    public int? Priority { get; set; }
+    /// <summary>
+    /// Returns the list of all Tasks in the Workspace with the specified assignment_status
+    /// </summary>
+    public List<string> AssignmentStatus { get; set; }
+    /// <summary>
+    /// The SID of the Workflow with the Tasks to read
+    /// </summary>
+    public string WorkflowSid { get; set; }
+    /// <summary>
+    /// The friendly name of the Workflow with the Tasks to read
+    /// </summary>
+    public string WorkflowName { get; set; }
+    /// <summary>
+    /// The SID of the TaskQueue with the Tasks to read
+    /// </summary>
+    public string TaskQueueSid { get; set; }
+    /// <summary>
+    /// The friendly_name of the TaskQueue with the Tasks to read
+    /// </summary>
+    public string TaskQueueName { get; set; }
+    /// <summary>
+    /// The task attributes of the Tasks to read
+    /// </summary>
+    public string EvaluateTaskAttributes { get; set; }
+    /// <summary>
+    /// Controls the order of the Tasks returned
+    /// </summary>
+    public string Ordering { get; set; }
+    /// <summary>
+    /// Whether to read Tasks with addons
+    /// </summary>
+    public bool? HasAddons { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadTaskOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Tasks to read </param>
+    public ReadTaskOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      AssignmentStatus = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Priority != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
+      }
+
+      if (AssignmentStatus != null)
+      {
+        p.AddRange(AssignmentStatus.Select(prop => new KeyValuePair<string, string>("AssignmentStatus", prop)));
+      }
+
+      if (WorkflowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WorkflowSid", WorkflowSid.ToString()));
+      }
+
+      if (WorkflowName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WorkflowName", WorkflowName));
+      }
+
+      if (TaskQueueSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskQueueSid", TaskQueueSid.ToString()));
+      }
+
+      if (TaskQueueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskQueueName", TaskQueueName));
+      }
+
+      if (EvaluateTaskAttributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EvaluateTaskAttributes", EvaluateTaskAttributes));
+      }
+
+      if (Ordering != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ordering", Ordering));
+      }
+
+      if (HasAddons != null)
+      {
+        p.Add(new KeyValuePair<string, string>("HasAddons", HasAddons.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateTaskOptions
+  /// </summary>
+  public class CreateTaskOptions : IOptions<TaskResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace that the new Task belongs to
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The amount of time in seconds the task can live before being assigned
+    /// </summary>
+    public int? Timeout { get; set; }
+    /// <summary>
+    /// The priority to assign the new task and override the default
+    /// </summary>
+    public int? Priority { get; set; }
+    /// <summary>
+    /// When MultiTasking is enabled specify the TaskChannel by passing either its unique_name or SID
+    /// </summary>
+    public string TaskChannel { get; set; }
+    /// <summary>
+    /// The SID of the Workflow that you would like to handle routing for the new Task
+    /// </summary>
+    public string WorkflowSid { get; set; }
+    /// <summary>
+    /// A URL-encoded JSON string describing the attributes of the task
+    /// </summary>
+    public string Attributes { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateTaskOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Task belongs to </param>
+    public CreateTaskOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Timeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timeout", Timeout.ToString()));
+      }
+
+      if (Priority != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
+      }
+
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      if (WorkflowSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WorkflowSid", WorkflowSid.ToString()));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueCumulativeStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueCumulativeStatisticsOptions.cs
index 928408a15..db359a4ac 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueCumulativeStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueCumulativeStatisticsOptions.cs
@@ -9,86 +9,86 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.TaskQueue
-{
-
+{
+
+  /// <summary>
+  /// FetchTaskQueueCumulativeStatisticsOptions
+  /// </summary>
+  public class FetchTaskQueueCumulativeStatisticsOptions : IOptions<TaskQueueCumulativeStatisticsResource>
+  {
     /// <summary>
-    /// FetchTaskQueueCumulativeStatisticsOptions
+    /// The SID of the Workspace with the TaskQueue to fetch
     /// </summary>
-    public class FetchTaskQueueCumulativeStatisticsOptions : IOptions<TaskQueueCumulativeStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the TaskQueue to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the TaskQueue for which to fetch statistics
-        /// </summary>
-        public string PathTaskQueueSid { get; }
-        /// <summary>
-        /// Only calculate statistics from on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Only calculate statistics since this many minutes in the past
-        /// </summary>
-        public int? Minutes { get; set; }
-        /// <summary>
-        /// Only calculate statistics from on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only calculate cumulative statistics on this TaskChannel
-        /// </summary>
-        public string TaskChannel { get; set; }
-        /// <summary>
-        /// A comma separated list of values that describes the thresholds to calculate statistics on
-        /// </summary>
-        public string SplitByWaitTime { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchTaskQueueCumulativeStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
-        /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
-        public FetchTaskQueueCumulativeStatisticsOptions(string pathWorkspaceSid, string pathTaskQueueSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathTaskQueueSid = pathTaskQueueSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (Minutes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            if (SplitByWaitTime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the TaskQueue for which to fetch statistics
+    /// </summary>
+    public string PathTaskQueueSid { get; }
+    /// <summary>
+    /// Only calculate statistics from on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Only calculate statistics since this many minutes in the past
+    /// </summary>
+    public int? Minutes { get; set; }
+    /// <summary>
+    /// Only calculate statistics from on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only calculate cumulative statistics on this TaskChannel
+    /// </summary>
+    public string TaskChannel { get; set; }
+    /// <summary>
+    /// A comma separated list of values that describes the thresholds to calculate statistics on
+    /// </summary>
+    public string SplitByWaitTime { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchTaskQueueCumulativeStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
+    /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
+    public FetchTaskQueueCumulativeStatisticsOptions(string pathWorkspaceSid, string pathTaskQueueSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathTaskQueueSid = pathTaskQueueSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (Minutes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      if (SplitByWaitTime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueCumulativeStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueCumulativeStatisticsResource.cs
index 0c1f671cb..69e6749b3 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueCumulativeStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueCumulativeStatisticsResource.cs
@@ -16,238 +16,238 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.TaskQueue
-{
-
-    public class TaskQueueCumulativeStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchTaskQueueCumulativeStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/" + options.PathTaskQueueSid + "/CumulativeStatistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskQueueCumulativeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueueCumulativeStatistics </returns>
-        public static TaskQueueCumulativeStatisticsResource Fetch(FetchTaskQueueCumulativeStatisticsOptions options,
-                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskQueueCumulativeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueueCumulativeStatistics </returns>
-        public static async System.Threading.Tasks.Task<TaskQueueCumulativeStatisticsResource> FetchAsync(FetchTaskQueueCumulativeStatisticsOptions options,
-                                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
-        /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
-        /// <param name="endDate"> Only calculate statistics from on or before this date </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueueCumulativeStatistics </returns>
-        public static TaskQueueCumulativeStatisticsResource Fetch(string pathWorkspaceSid,
-                                                                  string pathTaskQueueSid,
-                                                                  DateTime? endDate = null,
-                                                                  int? minutes = null,
-                                                                  DateTime? startDate = null,
-                                                                  string taskChannel = null,
-                                                                  string splitByWaitTime = null,
-                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskQueueCumulativeStatisticsOptions(pathWorkspaceSid, pathTaskQueueSid){EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
-        /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
-        /// <param name="endDate"> Only calculate statistics from on or before this date </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueueCumulativeStatistics </returns>
-        public static async System.Threading.Tasks.Task<TaskQueueCumulativeStatisticsResource> FetchAsync(string pathWorkspaceSid,
-                                                                                                          string pathTaskQueueSid,
-                                                                                                          DateTime? endDate = null,
-                                                                                                          int? minutes = null,
-                                                                                                          DateTime? startDate = null,
-                                                                                                          string taskChannel = null,
-                                                                                                          string splitByWaitTime = null,
-                                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskQueueCumulativeStatisticsOptions(pathWorkspaceSid, pathTaskQueueSid){EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TaskQueueCumulativeStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TaskQueueCumulativeStatisticsResource object represented by the provided JSON </returns>
-        public static TaskQueueCumulativeStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TaskQueueCumulativeStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The average time in seconds between Task creation and acceptance
-        /// </summary>
-        [JsonProperty("avg_task_acceptance_time")]
-        public int? AvgTaskAcceptanceTime { get; private set; }
-        /// <summary>
-        /// The beginning of the interval during which these statistics were calculated
-        /// </summary>
-        [JsonProperty("start_time")]
-        public DateTime? StartTime { get; private set; }
-        /// <summary>
-        /// The end of the interval during which these statistics were calculated
-        /// </summary>
-        [JsonProperty("end_time")]
-        public DateTime? EndTime { get; private set; }
-        /// <summary>
-        /// The total number of Reservations created for Tasks in the TaskQueue
-        /// </summary>
-        [JsonProperty("reservations_created")]
-        public int? ReservationsCreated { get; private set; }
-        /// <summary>
-        /// The total number of Reservations accepted for Tasks in the TaskQueue
-        /// </summary>
-        [JsonProperty("reservations_accepted")]
-        public int? ReservationsAccepted { get; private set; }
-        /// <summary>
-        /// The total number of Reservations rejected for Tasks in the TaskQueue
-        /// </summary>
-        [JsonProperty("reservations_rejected")]
-        public int? ReservationsRejected { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that timed out for Tasks in the TaskQueue
-        /// </summary>
-        [JsonProperty("reservations_timed_out")]
-        public int? ReservationsTimedOut { get; private set; }
-        /// <summary>
-        /// The total number of Reservations canceled for Tasks in the TaskQueue
-        /// </summary>
-        [JsonProperty("reservations_canceled")]
-        public int? ReservationsCanceled { get; private set; }
-        /// <summary>
-        /// The total number of Reservations rescinded
-        /// </summary>
-        [JsonProperty("reservations_rescinded")]
-        public int? ReservationsRescinded { get; private set; }
-        /// <summary>
-        /// A list of objects that describe the Tasks canceled and reservations accepted above and below the specified thresholds
-        /// </summary>
-        [JsonProperty("split_by_wait_time")]
-        public object SplitByWaitTime { get; private set; }
-        /// <summary>
-        /// The SID of the TaskQueue from which these statistics were calculated
-        /// </summary>
-        [JsonProperty("task_queue_sid")]
-        public string TaskQueueSid { get; private set; }
-        /// <summary>
-        /// The wait duration statistics for Tasks accepted while in the TaskQueue
-        /// </summary>
-        [JsonProperty("wait_duration_until_accepted")]
-        public object WaitDurationUntilAccepted { get; private set; }
-        /// <summary>
-        /// The wait duration statistics for Tasks canceled while in the TaskQueue
-        /// </summary>
-        [JsonProperty("wait_duration_until_canceled")]
-        public object WaitDurationUntilCanceled { get; private set; }
-        /// <summary>
-        /// The relative wait duration statistics for Tasks accepted while in the TaskQueue
-        /// </summary>
-        [JsonProperty("wait_duration_in_queue_until_accepted")]
-        public object WaitDurationInQueueUntilAccepted { get; private set; }
-        /// <summary>
-        /// The total number of Tasks canceled in the TaskQueue
-        /// </summary>
-        [JsonProperty("tasks_canceled")]
-        public int? TasksCanceled { get; private set; }
-        /// <summary>
-        /// The total number of Tasks completed in the TaskQueue
-        /// </summary>
-        [JsonProperty("tasks_completed")]
-        public int? TasksCompleted { get; private set; }
-        /// <summary>
-        /// The total number of Tasks deleted in the TaskQueue
-        /// </summary>
-        [JsonProperty("tasks_deleted")]
-        public int? TasksDeleted { get; private set; }
-        /// <summary>
-        /// The total number of Tasks entered into the TaskQueue
-        /// </summary>
-        [JsonProperty("tasks_entered")]
-        public int? TasksEntered { get; private set; }
-        /// <summary>
-        /// The total number of Tasks that were moved from one queue to another
-        /// </summary>
-        [JsonProperty("tasks_moved")]
-        public int? TasksMoved { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the TaskQueue
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the TaskQueue statistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private TaskQueueCumulativeStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class TaskQueueCumulativeStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchTaskQueueCumulativeStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/" + options.PathTaskQueueSid + "/CumulativeStatistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskQueueCumulativeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueueCumulativeStatistics </returns>
+    public static TaskQueueCumulativeStatisticsResource Fetch(FetchTaskQueueCumulativeStatisticsOptions options,
+                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskQueueCumulativeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueueCumulativeStatistics </returns>
+    public static async System.Threading.Tasks.Task<TaskQueueCumulativeStatisticsResource> FetchAsync(FetchTaskQueueCumulativeStatisticsOptions options,
+                                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
+    /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
+    /// <param name="endDate"> Only calculate statistics from on or before this date </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueueCumulativeStatistics </returns>
+    public static TaskQueueCumulativeStatisticsResource Fetch(string pathWorkspaceSid,
+                                                              string pathTaskQueueSid,
+                                                              DateTime? endDate = null,
+                                                              int? minutes = null,
+                                                              DateTime? startDate = null,
+                                                              string taskChannel = null,
+                                                              string splitByWaitTime = null,
+                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskQueueCumulativeStatisticsOptions(pathWorkspaceSid, pathTaskQueueSid) { EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
+    /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
+    /// <param name="endDate"> Only calculate statistics from on or before this date </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueueCumulativeStatistics </returns>
+    public static async System.Threading.Tasks.Task<TaskQueueCumulativeStatisticsResource> FetchAsync(string pathWorkspaceSid,
+                                                                                                      string pathTaskQueueSid,
+                                                                                                      DateTime? endDate = null,
+                                                                                                      int? minutes = null,
+                                                                                                      DateTime? startDate = null,
+                                                                                                      string taskChannel = null,
+                                                                                                      string splitByWaitTime = null,
+                                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskQueueCumulativeStatisticsOptions(pathWorkspaceSid, pathTaskQueueSid) { EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TaskQueueCumulativeStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TaskQueueCumulativeStatisticsResource object represented by the provided JSON </returns>
+    public static TaskQueueCumulativeStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TaskQueueCumulativeStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The average time in seconds between Task creation and acceptance
+    /// </summary>
+    [JsonProperty("avg_task_acceptance_time")]
+    public int? AvgTaskAcceptanceTime { get; private set; }
+    /// <summary>
+    /// The beginning of the interval during which these statistics were calculated
+    /// </summary>
+    [JsonProperty("start_time")]
+    public DateTime? StartTime { get; private set; }
+    /// <summary>
+    /// The end of the interval during which these statistics were calculated
+    /// </summary>
+    [JsonProperty("end_time")]
+    public DateTime? EndTime { get; private set; }
+    /// <summary>
+    /// The total number of Reservations created for Tasks in the TaskQueue
+    /// </summary>
+    [JsonProperty("reservations_created")]
+    public int? ReservationsCreated { get; private set; }
+    /// <summary>
+    /// The total number of Reservations accepted for Tasks in the TaskQueue
+    /// </summary>
+    [JsonProperty("reservations_accepted")]
+    public int? ReservationsAccepted { get; private set; }
+    /// <summary>
+    /// The total number of Reservations rejected for Tasks in the TaskQueue
+    /// </summary>
+    [JsonProperty("reservations_rejected")]
+    public int? ReservationsRejected { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that timed out for Tasks in the TaskQueue
+    /// </summary>
+    [JsonProperty("reservations_timed_out")]
+    public int? ReservationsTimedOut { get; private set; }
+    /// <summary>
+    /// The total number of Reservations canceled for Tasks in the TaskQueue
+    /// </summary>
+    [JsonProperty("reservations_canceled")]
+    public int? ReservationsCanceled { get; private set; }
+    /// <summary>
+    /// The total number of Reservations rescinded
+    /// </summary>
+    [JsonProperty("reservations_rescinded")]
+    public int? ReservationsRescinded { get; private set; }
+    /// <summary>
+    /// A list of objects that describe the Tasks canceled and reservations accepted above and below the specified thresholds
+    /// </summary>
+    [JsonProperty("split_by_wait_time")]
+    public object SplitByWaitTime { get; private set; }
+    /// <summary>
+    /// The SID of the TaskQueue from which these statistics were calculated
+    /// </summary>
+    [JsonProperty("task_queue_sid")]
+    public string TaskQueueSid { get; private set; }
+    /// <summary>
+    /// The wait duration statistics for Tasks accepted while in the TaskQueue
+    /// </summary>
+    [JsonProperty("wait_duration_until_accepted")]
+    public object WaitDurationUntilAccepted { get; private set; }
+    /// <summary>
+    /// The wait duration statistics for Tasks canceled while in the TaskQueue
+    /// </summary>
+    [JsonProperty("wait_duration_until_canceled")]
+    public object WaitDurationUntilCanceled { get; private set; }
+    /// <summary>
+    /// The relative wait duration statistics for Tasks accepted while in the TaskQueue
+    /// </summary>
+    [JsonProperty("wait_duration_in_queue_until_accepted")]
+    public object WaitDurationInQueueUntilAccepted { get; private set; }
+    /// <summary>
+    /// The total number of Tasks canceled in the TaskQueue
+    /// </summary>
+    [JsonProperty("tasks_canceled")]
+    public int? TasksCanceled { get; private set; }
+    /// <summary>
+    /// The total number of Tasks completed in the TaskQueue
+    /// </summary>
+    [JsonProperty("tasks_completed")]
+    public int? TasksCompleted { get; private set; }
+    /// <summary>
+    /// The total number of Tasks deleted in the TaskQueue
+    /// </summary>
+    [JsonProperty("tasks_deleted")]
+    public int? TasksDeleted { get; private set; }
+    /// <summary>
+    /// The total number of Tasks entered into the TaskQueue
+    /// </summary>
+    [JsonProperty("tasks_entered")]
+    public int? TasksEntered { get; private set; }
+    /// <summary>
+    /// The total number of Tasks that were moved from one queue to another
+    /// </summary>
+    [JsonProperty("tasks_moved")]
+    public int? TasksMoved { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the TaskQueue
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the TaskQueue statistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private TaskQueueCumulativeStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueRealTimeStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueRealTimeStatisticsOptions.cs
index 8f20462dd..e37bacc59 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueRealTimeStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueRealTimeStatisticsOptions.cs
@@ -9,50 +9,50 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.TaskQueue
-{
-
+{
+
+  /// <summary>
+  /// FetchTaskQueueRealTimeStatisticsOptions
+  /// </summary>
+  public class FetchTaskQueueRealTimeStatisticsOptions : IOptions<TaskQueueRealTimeStatisticsResource>
+  {
     /// <summary>
-    /// FetchTaskQueueRealTimeStatisticsOptions
+    /// The SID of the Workspace with the TaskQueue to fetch
     /// </summary>
-    public class FetchTaskQueueRealTimeStatisticsOptions : IOptions<TaskQueueRealTimeStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the TaskQueue to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the TaskQueue for which to fetch statistics
-        /// </summary>
-        public string PathTaskQueueSid { get; }
-        /// <summary>
-        /// The TaskChannel for which to fetch statistics
-        /// </summary>
-        public string TaskChannel { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchTaskQueueRealTimeStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
-        /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
-        public FetchTaskQueueRealTimeStatisticsOptions(string pathWorkspaceSid, string pathTaskQueueSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathTaskQueueSid = pathTaskQueueSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the TaskQueue for which to fetch statistics
+    /// </summary>
+    public string PathTaskQueueSid { get; }
+    /// <summary>
+    /// The TaskChannel for which to fetch statistics
+    /// </summary>
+    public string TaskChannel { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchTaskQueueRealTimeStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
+    /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
+    public FetchTaskQueueRealTimeStatisticsOptions(string pathWorkspaceSid, string pathTaskQueueSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathTaskQueueSid = pathTaskQueueSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueRealTimeStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueRealTimeStatisticsResource.cs
index 72a108f12..68b7088fe 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueRealTimeStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueRealTimeStatisticsResource.cs
@@ -16,180 +16,180 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.TaskQueue
-{
-
-    public class TaskQueueRealTimeStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchTaskQueueRealTimeStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/" + options.PathTaskQueueSid + "/RealTimeStatistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskQueueRealTimeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueueRealTimeStatistics </returns>
-        public static TaskQueueRealTimeStatisticsResource Fetch(FetchTaskQueueRealTimeStatisticsOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskQueueRealTimeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueueRealTimeStatistics </returns>
-        public static async System.Threading.Tasks.Task<TaskQueueRealTimeStatisticsResource> FetchAsync(FetchTaskQueueRealTimeStatisticsOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
-        /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
-        /// <param name="taskChannel"> The TaskChannel for which to fetch statistics </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueueRealTimeStatistics </returns>
-        public static TaskQueueRealTimeStatisticsResource Fetch(string pathWorkspaceSid,
-                                                                string pathTaskQueueSid,
-                                                                string taskChannel = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskQueueRealTimeStatisticsOptions(pathWorkspaceSid, pathTaskQueueSid){TaskChannel = taskChannel};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
-        /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
-        /// <param name="taskChannel"> The TaskChannel for which to fetch statistics </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueueRealTimeStatistics </returns>
-        public static async System.Threading.Tasks.Task<TaskQueueRealTimeStatisticsResource> FetchAsync(string pathWorkspaceSid,
-                                                                                                        string pathTaskQueueSid,
-                                                                                                        string taskChannel = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskQueueRealTimeStatisticsOptions(pathWorkspaceSid, pathTaskQueueSid){TaskChannel = taskChannel};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TaskQueueRealTimeStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TaskQueueRealTimeStatisticsResource object represented by the provided JSON </returns>
-        public static TaskQueueRealTimeStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TaskQueueRealTimeStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The number of current Workers by Activity
-        /// </summary>
-        [JsonProperty("activity_statistics")]
-        public List<object> ActivityStatistics { get; private set; }
-        /// <summary>
-        /// The age of the longest waiting Task
-        /// </summary>
-        [JsonProperty("longest_task_waiting_age")]
-        public int? LongestTaskWaitingAge { get; private set; }
-        /// <summary>
-        /// The SID of the longest waiting Task
-        /// </summary>
-        [JsonProperty("longest_task_waiting_sid")]
-        public string LongestTaskWaitingSid { get; private set; }
-        /// <summary>
-        /// The relative age in the TaskQueue for the longest waiting Task.
-        /// </summary>
-        [JsonProperty("longest_relative_task_age_in_queue")]
-        public int? LongestRelativeTaskAgeInQueue { get; private set; }
-        /// <summary>
-        /// The SID of the Task waiting in the TaskQueue the longest.
-        /// </summary>
-        [JsonProperty("longest_relative_task_sid_in_queue")]
-        public string LongestRelativeTaskSidInQueue { get; private set; }
-        /// <summary>
-        /// The SID of the TaskQueue from which these statistics were calculated
-        /// </summary>
-        [JsonProperty("task_queue_sid")]
-        public string TaskQueueSid { get; private set; }
-        /// <summary>
-        /// The number of Tasks by priority
-        /// </summary>
-        [JsonProperty("tasks_by_priority")]
-        public object TasksByPriority { get; private set; }
-        /// <summary>
-        /// The number of Tasks by their current status
-        /// </summary>
-        [JsonProperty("tasks_by_status")]
-        public object TasksByStatus { get; private set; }
-        /// <summary>
-        /// The total number of Workers available for Tasks in the TaskQueue
-        /// </summary>
-        [JsonProperty("total_available_workers")]
-        public int? TotalAvailableWorkers { get; private set; }
-        /// <summary>
-        /// The total number of Workers eligible for Tasks in the TaskQueue, independent of their Activity state
-        /// </summary>
-        [JsonProperty("total_eligible_workers")]
-        public int? TotalEligibleWorkers { get; private set; }
-        /// <summary>
-        /// The total number of Tasks
-        /// </summary>
-        [JsonProperty("total_tasks")]
-        public int? TotalTasks { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the TaskQueue
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the TaskQueue statistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private TaskQueueRealTimeStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class TaskQueueRealTimeStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchTaskQueueRealTimeStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/" + options.PathTaskQueueSid + "/RealTimeStatistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskQueueRealTimeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueueRealTimeStatistics </returns>
+    public static TaskQueueRealTimeStatisticsResource Fetch(FetchTaskQueueRealTimeStatisticsOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskQueueRealTimeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueueRealTimeStatistics </returns>
+    public static async System.Threading.Tasks.Task<TaskQueueRealTimeStatisticsResource> FetchAsync(FetchTaskQueueRealTimeStatisticsOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
+    /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
+    /// <param name="taskChannel"> The TaskChannel for which to fetch statistics </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueueRealTimeStatistics </returns>
+    public static TaskQueueRealTimeStatisticsResource Fetch(string pathWorkspaceSid,
+                                                            string pathTaskQueueSid,
+                                                            string taskChannel = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskQueueRealTimeStatisticsOptions(pathWorkspaceSid, pathTaskQueueSid) { TaskChannel = taskChannel };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
+    /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
+    /// <param name="taskChannel"> The TaskChannel for which to fetch statistics </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueueRealTimeStatistics </returns>
+    public static async System.Threading.Tasks.Task<TaskQueueRealTimeStatisticsResource> FetchAsync(string pathWorkspaceSid,
+                                                                                                    string pathTaskQueueSid,
+                                                                                                    string taskChannel = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskQueueRealTimeStatisticsOptions(pathWorkspaceSid, pathTaskQueueSid) { TaskChannel = taskChannel };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TaskQueueRealTimeStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TaskQueueRealTimeStatisticsResource object represented by the provided JSON </returns>
+    public static TaskQueueRealTimeStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TaskQueueRealTimeStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The number of current Workers by Activity
+    /// </summary>
+    [JsonProperty("activity_statistics")]
+    public List<object> ActivityStatistics { get; private set; }
+    /// <summary>
+    /// The age of the longest waiting Task
+    /// </summary>
+    [JsonProperty("longest_task_waiting_age")]
+    public int? LongestTaskWaitingAge { get; private set; }
+    /// <summary>
+    /// The SID of the longest waiting Task
+    /// </summary>
+    [JsonProperty("longest_task_waiting_sid")]
+    public string LongestTaskWaitingSid { get; private set; }
+    /// <summary>
+    /// The relative age in the TaskQueue for the longest waiting Task.
+    /// </summary>
+    [JsonProperty("longest_relative_task_age_in_queue")]
+    public int? LongestRelativeTaskAgeInQueue { get; private set; }
+    /// <summary>
+    /// The SID of the Task waiting in the TaskQueue the longest.
+    /// </summary>
+    [JsonProperty("longest_relative_task_sid_in_queue")]
+    public string LongestRelativeTaskSidInQueue { get; private set; }
+    /// <summary>
+    /// The SID of the TaskQueue from which these statistics were calculated
+    /// </summary>
+    [JsonProperty("task_queue_sid")]
+    public string TaskQueueSid { get; private set; }
+    /// <summary>
+    /// The number of Tasks by priority
+    /// </summary>
+    [JsonProperty("tasks_by_priority")]
+    public object TasksByPriority { get; private set; }
+    /// <summary>
+    /// The number of Tasks by their current status
+    /// </summary>
+    [JsonProperty("tasks_by_status")]
+    public object TasksByStatus { get; private set; }
+    /// <summary>
+    /// The total number of Workers available for Tasks in the TaskQueue
+    /// </summary>
+    [JsonProperty("total_available_workers")]
+    public int? TotalAvailableWorkers { get; private set; }
+    /// <summary>
+    /// The total number of Workers eligible for Tasks in the TaskQueue, independent of their Activity state
+    /// </summary>
+    [JsonProperty("total_eligible_workers")]
+    public int? TotalEligibleWorkers { get; private set; }
+    /// <summary>
+    /// The total number of Tasks
+    /// </summary>
+    [JsonProperty("total_tasks")]
+    public int? TotalTasks { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the TaskQueue
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the TaskQueue statistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private TaskQueueRealTimeStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueStatisticsOptions.cs
index aeb3222f6..c3b085cbd 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueStatisticsOptions.cs
@@ -9,86 +9,86 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.TaskQueue
-{
-
+{
+
+  /// <summary>
+  /// FetchTaskQueueStatisticsOptions
+  /// </summary>
+  public class FetchTaskQueueStatisticsOptions : IOptions<TaskQueueStatisticsResource>
+  {
     /// <summary>
-    /// FetchTaskQueueStatisticsOptions
+    /// The SID of the Workspace with the TaskQueue to fetch
     /// </summary>
-    public class FetchTaskQueueStatisticsOptions : IOptions<TaskQueueStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the TaskQueue to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the TaskQueue for which to fetch statistics
-        /// </summary>
-        public string PathTaskQueueSid { get; }
-        /// <summary>
-        /// Only calculate statistics from on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Only calculate statistics since this many minutes in the past
-        /// </summary>
-        public int? Minutes { get; set; }
-        /// <summary>
-        /// Only calculate statistics from on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only calculate real-time and cumulative statistics for the specified TaskChannel
-        /// </summary>
-        public string TaskChannel { get; set; }
-        /// <summary>
-        /// A comma separated list of values that describes the thresholds to calculate statistics on
-        /// </summary>
-        public string SplitByWaitTime { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchTaskQueueStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
-        /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
-        public FetchTaskQueueStatisticsOptions(string pathWorkspaceSid, string pathTaskQueueSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathTaskQueueSid = pathTaskQueueSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (Minutes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            if (SplitByWaitTime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the TaskQueue for which to fetch statistics
+    /// </summary>
+    public string PathTaskQueueSid { get; }
+    /// <summary>
+    /// Only calculate statistics from on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Only calculate statistics since this many minutes in the past
+    /// </summary>
+    public int? Minutes { get; set; }
+    /// <summary>
+    /// Only calculate statistics from on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only calculate real-time and cumulative statistics for the specified TaskChannel
+    /// </summary>
+    public string TaskChannel { get; set; }
+    /// <summary>
+    /// A comma separated list of values that describes the thresholds to calculate statistics on
+    /// </summary>
+    public string SplitByWaitTime { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchTaskQueueStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
+    /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
+    public FetchTaskQueueStatisticsOptions(string pathWorkspaceSid, string pathTaskQueueSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathTaskQueueSid = pathTaskQueueSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (Minutes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      if (SplitByWaitTime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueStatisticsResource.cs
index 0fd37978d..ddd034c2d 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueueStatisticsResource.cs
@@ -16,158 +16,158 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.TaskQueue
-{
-
-    public class TaskQueueStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchTaskQueueStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/" + options.PathTaskQueueSid + "/Statistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskQueueStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueueStatistics </returns>
-        public static TaskQueueStatisticsResource Fetch(FetchTaskQueueStatisticsOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskQueueStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueueStatistics </returns>
-        public static async System.Threading.Tasks.Task<TaskQueueStatisticsResource> FetchAsync(FetchTaskQueueStatisticsOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
-        /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
-        /// <param name="endDate"> Only calculate statistics from on or before this date </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="taskChannel"> Only calculate real-time and cumulative statistics for the specified TaskChannel </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueueStatistics </returns>
-        public static TaskQueueStatisticsResource Fetch(string pathWorkspaceSid,
-                                                        string pathTaskQueueSid,
-                                                        DateTime? endDate = null,
-                                                        int? minutes = null,
-                                                        DateTime? startDate = null,
-                                                        string taskChannel = null,
-                                                        string splitByWaitTime = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskQueueStatisticsOptions(pathWorkspaceSid, pathTaskQueueSid){EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
-        /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
-        /// <param name="endDate"> Only calculate statistics from on or before this date </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="taskChannel"> Only calculate real-time and cumulative statistics for the specified TaskChannel </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueueStatistics </returns>
-        public static async System.Threading.Tasks.Task<TaskQueueStatisticsResource> FetchAsync(string pathWorkspaceSid,
-                                                                                                string pathTaskQueueSid,
-                                                                                                DateTime? endDate = null,
-                                                                                                int? minutes = null,
-                                                                                                DateTime? startDate = null,
-                                                                                                string taskChannel = null,
-                                                                                                string splitByWaitTime = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskQueueStatisticsOptions(pathWorkspaceSid, pathTaskQueueSid){EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TaskQueueStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TaskQueueStatisticsResource object represented by the provided JSON </returns>
-        public static TaskQueueStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TaskQueueStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// An object that contains the cumulative statistics for the TaskQueue
-        /// </summary>
-        [JsonProperty("cumulative")]
-        public object Cumulative { get; private set; }
-        /// <summary>
-        /// An object that contains the real-time statistics for the TaskQueue
-        /// </summary>
-        [JsonProperty("realtime")]
-        public object Realtime { get; private set; }
-        /// <summary>
-        /// The SID of the TaskQueue from which these statistics were calculated
-        /// </summary>
-        [JsonProperty("task_queue_sid")]
-        public string TaskQueueSid { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the TaskQueue
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the TaskQueue statistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private TaskQueueStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class TaskQueueStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchTaskQueueStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/" + options.PathTaskQueueSid + "/Statistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskQueueStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueueStatistics </returns>
+    public static TaskQueueStatisticsResource Fetch(FetchTaskQueueStatisticsOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskQueueStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueueStatistics </returns>
+    public static async System.Threading.Tasks.Task<TaskQueueStatisticsResource> FetchAsync(FetchTaskQueueStatisticsOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
+    /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
+    /// <param name="endDate"> Only calculate statistics from on or before this date </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="taskChannel"> Only calculate real-time and cumulative statistics for the specified TaskChannel </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueueStatistics </returns>
+    public static TaskQueueStatisticsResource Fetch(string pathWorkspaceSid,
+                                                    string pathTaskQueueSid,
+                                                    DateTime? endDate = null,
+                                                    int? minutes = null,
+                                                    DateTime? startDate = null,
+                                                    string taskChannel = null,
+                                                    string splitByWaitTime = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskQueueStatisticsOptions(pathWorkspaceSid, pathTaskQueueSid) { EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
+    /// <param name="pathTaskQueueSid"> The SID of the TaskQueue for which to fetch statistics </param>
+    /// <param name="endDate"> Only calculate statistics from on or before this date </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="taskChannel"> Only calculate real-time and cumulative statistics for the specified TaskChannel </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueueStatistics </returns>
+    public static async System.Threading.Tasks.Task<TaskQueueStatisticsResource> FetchAsync(string pathWorkspaceSid,
+                                                                                            string pathTaskQueueSid,
+                                                                                            DateTime? endDate = null,
+                                                                                            int? minutes = null,
+                                                                                            DateTime? startDate = null,
+                                                                                            string taskChannel = null,
+                                                                                            string splitByWaitTime = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskQueueStatisticsOptions(pathWorkspaceSid, pathTaskQueueSid) { EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TaskQueueStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TaskQueueStatisticsResource object represented by the provided JSON </returns>
+    public static TaskQueueStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TaskQueueStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// An object that contains the cumulative statistics for the TaskQueue
+    /// </summary>
+    [JsonProperty("cumulative")]
+    public object Cumulative { get; private set; }
+    /// <summary>
+    /// An object that contains the real-time statistics for the TaskQueue
+    /// </summary>
+    [JsonProperty("realtime")]
+    public object Realtime { get; private set; }
+    /// <summary>
+    /// The SID of the TaskQueue from which these statistics were calculated
+    /// </summary>
+    [JsonProperty("task_queue_sid")]
+    public string TaskQueueSid { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the TaskQueue
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the TaskQueue statistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private TaskQueueStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueuesStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueuesStatisticsOptions.cs
index c2fbd0ac1..740bd4c28 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueuesStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueuesStatisticsOptions.cs
@@ -9,94 +9,94 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.TaskQueue
-{
-
+{
+
+  /// <summary>
+  /// ReadTaskQueuesStatisticsOptions
+  /// </summary>
+  public class ReadTaskQueuesStatisticsOptions : ReadOptions<TaskQueuesStatisticsResource>
+  {
     /// <summary>
-    /// ReadTaskQueuesStatisticsOptions
+    /// The SID of the Workspace with the TaskQueues to read
     /// </summary>
-    public class ReadTaskQueuesStatisticsOptions : ReadOptions<TaskQueuesStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the TaskQueues to read
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// Only calculate statistics from on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// The friendly_name of the TaskQueue statistics to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Only calculate statistics since this many minutes in the past
-        /// </summary>
-        public int? Minutes { get; set; }
-        /// <summary>
-        /// Only calculate statistics from on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only calculate statistics on this TaskChannel.
-        /// </summary>
-        public string TaskChannel { get; set; }
-        /// <summary>
-        /// A comma separated list of values that describes the thresholds to calculate statistics on
-        /// </summary>
-        public string SplitByWaitTime { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadTaskQueuesStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueues to read </param>
-        public ReadTaskQueuesStatisticsOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Minutes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            if (SplitByWaitTime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// Only calculate statistics from on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// The friendly_name of the TaskQueue statistics to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Only calculate statistics since this many minutes in the past
+    /// </summary>
+    public int? Minutes { get; set; }
+    /// <summary>
+    /// Only calculate statistics from on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only calculate statistics on this TaskChannel.
+    /// </summary>
+    public string TaskChannel { get; set; }
+    /// <summary>
+    /// A comma separated list of values that describes the thresholds to calculate statistics on
+    /// </summary>
+    public string SplitByWaitTime { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadTaskQueuesStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueues to read </param>
+    public ReadTaskQueuesStatisticsOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Minutes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      if (SplitByWaitTime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueuesStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueuesStatisticsResource.cs
index 2b03e1a13..f048649da 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueuesStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueue/TaskQueuesStatisticsResource.cs
@@ -16,220 +16,220 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.TaskQueue
-{
-
-    public class TaskQueuesStatisticsResource : Resource
-    {
-        private static Request BuildReadRequest(ReadTaskQueuesStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/Statistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read TaskQueuesStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueuesStatistics </returns>
-        public static ResourceSet<TaskQueuesStatisticsResource> Read(ReadTaskQueuesStatisticsOptions options,
-                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TaskQueuesStatisticsResource>.FromJson("task_queues_statistics", response.Content);
-            return new ResourceSet<TaskQueuesStatisticsResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read TaskQueuesStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueuesStatistics </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TaskQueuesStatisticsResource>> ReadAsync(ReadTaskQueuesStatisticsOptions options,
-                                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TaskQueuesStatisticsResource>.FromJson("task_queues_statistics", response.Content);
-            return new ResourceSet<TaskQueuesStatisticsResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueues to read </param>
-        /// <param name="endDate"> Only calculate statistics from on or before this date </param>
-        /// <param name="friendlyName"> The friendly_name of the TaskQueue statistics to read </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="taskChannel"> Only calculate statistics on this TaskChannel.  </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueuesStatistics </returns>
-        public static ResourceSet<TaskQueuesStatisticsResource> Read(string pathWorkspaceSid,
-                                                                     DateTime? endDate = null,
-                                                                     string friendlyName = null,
-                                                                     int? minutes = null,
-                                                                     DateTime? startDate = null,
-                                                                     string taskChannel = null,
-                                                                     string splitByWaitTime = null,
-                                                                     int? pageSize = null,
-                                                                     long? limit = null,
-                                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadTaskQueuesStatisticsOptions(pathWorkspaceSid){EndDate = endDate, FriendlyName = friendlyName, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueues to read </param>
-        /// <param name="endDate"> Only calculate statistics from on or before this date </param>
-        /// <param name="friendlyName"> The friendly_name of the TaskQueue statistics to read </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="taskChannel"> Only calculate statistics on this TaskChannel.  </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueuesStatistics </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TaskQueuesStatisticsResource>> ReadAsync(string pathWorkspaceSid,
-                                                                                                             DateTime? endDate = null,
-                                                                                                             string friendlyName = null,
-                                                                                                             int? minutes = null,
-                                                                                                             DateTime? startDate = null,
-                                                                                                             string taskChannel = null,
-                                                                                                             string splitByWaitTime = null,
-                                                                                                             int? pageSize = null,
-                                                                                                             long? limit = null,
-                                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadTaskQueuesStatisticsOptions(pathWorkspaceSid){EndDate = endDate, FriendlyName = friendlyName, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TaskQueuesStatisticsResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TaskQueuesStatisticsResource>.FromJson("task_queues_statistics", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TaskQueuesStatisticsResource> NextPage(Page<TaskQueuesStatisticsResource> page,
-                                                                  ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<TaskQueuesStatisticsResource>.FromJson("task_queues_statistics", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TaskQueuesStatisticsResource> PreviousPage(Page<TaskQueuesStatisticsResource> page,
-                                                                      ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<TaskQueuesStatisticsResource>.FromJson("task_queues_statistics", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a TaskQueuesStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TaskQueuesStatisticsResource object represented by the provided JSON </returns>
-        public static TaskQueuesStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TaskQueuesStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// An object that contains the cumulative statistics for the TaskQueues
-        /// </summary>
-        [JsonProperty("cumulative")]
-        public object Cumulative { get; private set; }
-        /// <summary>
-        /// An object that contains the real-time statistics for the TaskQueues
-        /// </summary>
-        [JsonProperty("realtime")]
-        public object Realtime { get; private set; }
-        /// <summary>
-        /// The SID of the TaskQueue from which these statistics were calculated
-        /// </summary>
-        [JsonProperty("task_queue_sid")]
-        public string TaskQueueSid { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the TaskQueues
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-
-        private TaskQueuesStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class TaskQueuesStatisticsResource : Resource
+  {
+    private static Request BuildReadRequest(ReadTaskQueuesStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/Statistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read TaskQueuesStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueuesStatistics </returns>
+    public static ResourceSet<TaskQueuesStatisticsResource> Read(ReadTaskQueuesStatisticsOptions options,
+                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TaskQueuesStatisticsResource>.FromJson("task_queues_statistics", response.Content);
+      return new ResourceSet<TaskQueuesStatisticsResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read TaskQueuesStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueuesStatistics </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TaskQueuesStatisticsResource>> ReadAsync(ReadTaskQueuesStatisticsOptions options,
+                                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TaskQueuesStatisticsResource>.FromJson("task_queues_statistics", response.Content);
+      return new ResourceSet<TaskQueuesStatisticsResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueues to read </param>
+    /// <param name="endDate"> Only calculate statistics from on or before this date </param>
+    /// <param name="friendlyName"> The friendly_name of the TaskQueue statistics to read </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="taskChannel"> Only calculate statistics on this TaskChannel.  </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueuesStatistics </returns>
+    public static ResourceSet<TaskQueuesStatisticsResource> Read(string pathWorkspaceSid,
+                                                                 DateTime? endDate = null,
+                                                                 string friendlyName = null,
+                                                                 int? minutes = null,
+                                                                 DateTime? startDate = null,
+                                                                 string taskChannel = null,
+                                                                 string splitByWaitTime = null,
+                                                                 int? pageSize = null,
+                                                                 long? limit = null,
+                                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadTaskQueuesStatisticsOptions(pathWorkspaceSid) { EndDate = endDate, FriendlyName = friendlyName, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueues to read </param>
+    /// <param name="endDate"> Only calculate statistics from on or before this date </param>
+    /// <param name="friendlyName"> The friendly_name of the TaskQueue statistics to read </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="taskChannel"> Only calculate statistics on this TaskChannel.  </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueuesStatistics </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TaskQueuesStatisticsResource>> ReadAsync(string pathWorkspaceSid,
+                                                                                                         DateTime? endDate = null,
+                                                                                                         string friendlyName = null,
+                                                                                                         int? minutes = null,
+                                                                                                         DateTime? startDate = null,
+                                                                                                         string taskChannel = null,
+                                                                                                         string splitByWaitTime = null,
+                                                                                                         int? pageSize = null,
+                                                                                                         long? limit = null,
+                                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadTaskQueuesStatisticsOptions(pathWorkspaceSid) { EndDate = endDate, FriendlyName = friendlyName, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TaskQueuesStatisticsResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TaskQueuesStatisticsResource>.FromJson("task_queues_statistics", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TaskQueuesStatisticsResource> NextPage(Page<TaskQueuesStatisticsResource> page,
+                                                              ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<TaskQueuesStatisticsResource>.FromJson("task_queues_statistics", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TaskQueuesStatisticsResource> PreviousPage(Page<TaskQueuesStatisticsResource> page,
+                                                                  ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<TaskQueuesStatisticsResource>.FromJson("task_queues_statistics", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a TaskQueuesStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TaskQueuesStatisticsResource object represented by the provided JSON </returns>
+    public static TaskQueuesStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TaskQueuesStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// An object that contains the cumulative statistics for the TaskQueues
+    /// </summary>
+    [JsonProperty("cumulative")]
+    public object Cumulative { get; private set; }
+    /// <summary>
+    /// An object that contains the real-time statistics for the TaskQueues
+    /// </summary>
+    [JsonProperty("realtime")]
+    public object Realtime { get; private set; }
+    /// <summary>
+    /// The SID of the TaskQueue from which these statistics were calculated
+    /// </summary>
+    [JsonProperty("task_queue_sid")]
+    public string TaskQueueSid { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the TaskQueues
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+
+    private TaskQueuesStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueueOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueueOptions.cs
index faab7c317..fc794244a 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueueOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueueOptions.cs
@@ -9,311 +9,311 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
+{
+
+  /// <summary>
+  /// FetchTaskQueueOptions
+  /// </summary>
+  public class FetchTaskQueueOptions : IOptions<TaskQueueResource>
+  {
     /// <summary>
-    /// FetchTaskQueueOptions
-    /// </summary>
-    public class FetchTaskQueueOptions : IOptions<TaskQueueResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the TaskQueue to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the resource to
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTaskQueueOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to  </param>
-        public FetchTaskQueueOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Workspace with the TaskQueue to fetch
+    /// </summary>
+    public string PathWorkspaceSid { get; }
     /// <summary>
-    /// UpdateTaskQueueOptions
-    /// </summary>
-    public class UpdateTaskQueueOptions : IOptions<TaskQueueResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the TaskQueue to update
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// A string describing the Worker selection criteria for any Tasks that enter the TaskQueue
-        /// </summary>
-        public string TargetWorkers { get; set; }
-        /// <summary>
-        /// The SID of the Activity to assign Workers when a task is reserved for them
-        /// </summary>
-        public string ReservationActivitySid { get; set; }
-        /// <summary>
-        /// The SID of the Activity to assign Workers when a task is assigned for them
-        /// </summary>
-        public string AssignmentActivitySid { get; set; }
-        /// <summary>
-        /// The maximum number of Workers to create reservations for the assignment of a task while in the queue
-        /// </summary>
-        public int? MaxReservedWorkers { get; set; }
-        /// <summary>
-        /// How Tasks will be assigned to Workers
-        /// </summary>
-        public TaskQueueResource.TaskOrderEnum TaskOrder { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateTaskQueueOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to update </param>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        public UpdateTaskQueueOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (TargetWorkers != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TargetWorkers", TargetWorkers));
-            }
-
-            if (ReservationActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReservationActivitySid", ReservationActivitySid.ToString()));
-            }
-
-            if (AssignmentActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AssignmentActivitySid", AssignmentActivitySid.ToString()));
-            }
-
-            if (MaxReservedWorkers != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MaxReservedWorkers", MaxReservedWorkers.ToString()));
-            }
-
-            if (TaskOrder != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskOrder", TaskOrder.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the resource to
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// ReadTaskQueueOptions
-    /// </summary>
-    public class ReadTaskQueueOptions : ReadOptions<TaskQueueResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the TaskQueue to read
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The friendly_name of the TaskQueue resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The attributes of the Workers to read
-        /// </summary>
-        public string EvaluateWorkerAttributes { get; set; }
-        /// <summary>
-        /// The SID of the Worker with the TaskQueue resources to read
-        /// </summary>
-        public string WorkerSid { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadTaskQueueOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to read </param>
-        public ReadTaskQueueOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (EvaluateWorkerAttributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EvaluateWorkerAttributes", EvaluateWorkerAttributes));
-            }
-
-            if (WorkerSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WorkerSid", WorkerSid.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchTaskQueueOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to  </param>
+    public FetchTaskQueueOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// CreateTaskQueueOptions
-    /// </summary>
-    public class CreateTaskQueueOptions : IOptions<TaskQueueResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace that the new TaskQueue belongs to
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// A string describing the Worker selection criteria for any Tasks that enter the TaskQueue
-        /// </summary>
-        public string TargetWorkers { get; set; }
-        /// <summary>
-        /// The maximum number of Workers to reserve
-        /// </summary>
-        public int? MaxReservedWorkers { get; set; }
-        /// <summary>
-        /// How Tasks will be assigned to Workers
-        /// </summary>
-        public TaskQueueResource.TaskOrderEnum TaskOrder { get; set; }
-        /// <summary>
-        /// The SID of the Activity to assign Workers when a task is reserved for them
-        /// </summary>
-        public string ReservationActivitySid { get; set; }
-        /// <summary>
-        /// The SID of the Activity to assign Workers once a task is assigned to them
-        /// </summary>
-        public string AssignmentActivitySid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateTaskQueueOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new TaskQueue belongs to </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        public CreateTaskQueueOptions(string pathWorkspaceSid, string friendlyName)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (TargetWorkers != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TargetWorkers", TargetWorkers));
-            }
-
-            if (MaxReservedWorkers != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MaxReservedWorkers", MaxReservedWorkers.ToString()));
-            }
-
-            if (TaskOrder != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskOrder", TaskOrder.ToString()));
-            }
-
-            if (ReservationActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReservationActivitySid", ReservationActivitySid.ToString()));
-            }
-
-            if (AssignmentActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AssignmentActivitySid", AssignmentActivitySid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateTaskQueueOptions
+  /// </summary>
+  public class UpdateTaskQueueOptions : IOptions<TaskQueueResource>
+  {
     /// <summary>
-    /// DeleteTaskQueueOptions
-    /// </summary>
-    public class DeleteTaskQueueOptions : IOptions<TaskQueueResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the TaskQueue to delete
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteTaskQueueOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to delete </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        public DeleteTaskQueueOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// The SID of the Workspace with the TaskQueue to update
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// A string describing the Worker selection criteria for any Tasks that enter the TaskQueue
+    /// </summary>
+    public string TargetWorkers { get; set; }
+    /// <summary>
+    /// The SID of the Activity to assign Workers when a task is reserved for them
+    /// </summary>
+    public string ReservationActivitySid { get; set; }
+    /// <summary>
+    /// The SID of the Activity to assign Workers when a task is assigned for them
+    /// </summary>
+    public string AssignmentActivitySid { get; set; }
+    /// <summary>
+    /// The maximum number of Workers to create reservations for the assignment of a task while in the queue
+    /// </summary>
+    public int? MaxReservedWorkers { get; set; }
+    /// <summary>
+    /// How Tasks will be assigned to Workers
+    /// </summary>
+    public TaskQueueResource.TaskOrderEnum TaskOrder { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateTaskQueueOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to update </param>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    public UpdateTaskQueueOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (TargetWorkers != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TargetWorkers", TargetWorkers));
+      }
+
+      if (ReservationActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReservationActivitySid", ReservationActivitySid.ToString()));
+      }
+
+      if (AssignmentActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AssignmentActivitySid", AssignmentActivitySid.ToString()));
+      }
+
+      if (MaxReservedWorkers != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MaxReservedWorkers", MaxReservedWorkers.ToString()));
+      }
+
+      if (TaskOrder != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskOrder", TaskOrder.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadTaskQueueOptions
+  /// </summary>
+  public class ReadTaskQueueOptions : ReadOptions<TaskQueueResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the TaskQueue to read
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The friendly_name of the TaskQueue resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The attributes of the Workers to read
+    /// </summary>
+    public string EvaluateWorkerAttributes { get; set; }
+    /// <summary>
+    /// The SID of the Worker with the TaskQueue resources to read
+    /// </summary>
+    public string WorkerSid { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadTaskQueueOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to read </param>
+    public ReadTaskQueueOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (EvaluateWorkerAttributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EvaluateWorkerAttributes", EvaluateWorkerAttributes));
+      }
+
+      if (WorkerSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WorkerSid", WorkerSid.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateTaskQueueOptions
+  /// </summary>
+  public class CreateTaskQueueOptions : IOptions<TaskQueueResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace that the new TaskQueue belongs to
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// A string describing the Worker selection criteria for any Tasks that enter the TaskQueue
+    /// </summary>
+    public string TargetWorkers { get; set; }
+    /// <summary>
+    /// The maximum number of Workers to reserve
+    /// </summary>
+    public int? MaxReservedWorkers { get; set; }
+    /// <summary>
+    /// How Tasks will be assigned to Workers
+    /// </summary>
+    public TaskQueueResource.TaskOrderEnum TaskOrder { get; set; }
+    /// <summary>
+    /// The SID of the Activity to assign Workers when a task is reserved for them
+    /// </summary>
+    public string ReservationActivitySid { get; set; }
+    /// <summary>
+    /// The SID of the Activity to assign Workers once a task is assigned to them
+    /// </summary>
+    public string AssignmentActivitySid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateTaskQueueOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new TaskQueue belongs to </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    public CreateTaskQueueOptions(string pathWorkspaceSid, string friendlyName)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (TargetWorkers != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TargetWorkers", TargetWorkers));
+      }
+
+      if (MaxReservedWorkers != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MaxReservedWorkers", MaxReservedWorkers.ToString()));
+      }
+
+      if (TaskOrder != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskOrder", TaskOrder.ToString()));
+      }
+
+      if (ReservationActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReservationActivitySid", ReservationActivitySid.ToString()));
+      }
+
+      if (AssignmentActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AssignmentActivitySid", AssignmentActivitySid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteTaskQueueOptions
+  /// </summary>
+  public class DeleteTaskQueueOptions : IOptions<TaskQueueResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the TaskQueue to delete
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteTaskQueueOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to delete </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    public DeleteTaskQueueOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueueResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueueResource.cs
index 68f7797ee..912caee40 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueueResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskQueueResource.cs
@@ -17,609 +17,609 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
-    public class TaskQueueResource : Resource
-    {
-        public sealed class TaskOrderEnum : StringEnum
-        {
-            private TaskOrderEnum(string value) : base(value) {}
-            public TaskOrderEnum() {}
-            public static implicit operator TaskOrderEnum(string value)
-            {
-                return new TaskOrderEnum(value);
-            }
-
-            public static readonly TaskOrderEnum Fifo = new TaskOrderEnum("FIFO");
-            public static readonly TaskOrderEnum Lifo = new TaskOrderEnum("LIFO");
-        }
-
-        private static Request BuildFetchRequest(FetchTaskQueueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskQueue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueue </returns>
-        public static TaskQueueResource Fetch(FetchTaskQueueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch TaskQueue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueue </returns>
-        public static async System.Threading.Tasks.Task<TaskQueueResource> FetchAsync(FetchTaskQueueOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to  </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueue </returns>
-        public static TaskQueueResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskQueueOptions(pathWorkspaceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to  </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueue </returns>
-        public static async System.Threading.Tasks.Task<TaskQueueResource> FetchAsync(string pathWorkspaceSid,
-                                                                                      string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskQueueOptions(pathWorkspaceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateTaskQueueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update TaskQueue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueue </returns>
-        public static TaskQueueResource Update(UpdateTaskQueueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update TaskQueue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueue </returns>
-        public static async System.Threading.Tasks.Task<TaskQueueResource> UpdateAsync(UpdateTaskQueueOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to update </param>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="targetWorkers"> A string describing the Worker selection criteria for any Tasks that enter the
-        ///                     TaskQueue </param>
-        /// <param name="reservationActivitySid"> The SID of the Activity to assign Workers when a task is reserved for them
-        ///                              </param>
-        /// <param name="assignmentActivitySid"> The SID of the Activity to assign Workers when a task is assigned for them
-        ///                             </param>
-        /// <param name="maxReservedWorkers"> The maximum number of Workers to create reservations for the assignment of a task
-        ///                          while in the queue </param>
-        /// <param name="taskOrder"> How Tasks will be assigned to Workers </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueue </returns>
-        public static TaskQueueResource Update(string pathWorkspaceSid,
-                                               string pathSid,
-                                               string friendlyName = null,
-                                               string targetWorkers = null,
-                                               string reservationActivitySid = null,
-                                               string assignmentActivitySid = null,
-                                               int? maxReservedWorkers = null,
-                                               TaskQueueResource.TaskOrderEnum taskOrder = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskQueueOptions(pathWorkspaceSid, pathSid){FriendlyName = friendlyName, TargetWorkers = targetWorkers, ReservationActivitySid = reservationActivitySid, AssignmentActivitySid = assignmentActivitySid, MaxReservedWorkers = maxReservedWorkers, TaskOrder = taskOrder};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to update </param>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="targetWorkers"> A string describing the Worker selection criteria for any Tasks that enter the
-        ///                     TaskQueue </param>
-        /// <param name="reservationActivitySid"> The SID of the Activity to assign Workers when a task is reserved for them
-        ///                              </param>
-        /// <param name="assignmentActivitySid"> The SID of the Activity to assign Workers when a task is assigned for them
-        ///                             </param>
-        /// <param name="maxReservedWorkers"> The maximum number of Workers to create reservations for the assignment of a task
-        ///                          while in the queue </param>
-        /// <param name="taskOrder"> How Tasks will be assigned to Workers </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueue </returns>
-        public static async System.Threading.Tasks.Task<TaskQueueResource> UpdateAsync(string pathWorkspaceSid,
-                                                                                       string pathSid,
-                                                                                       string friendlyName = null,
-                                                                                       string targetWorkers = null,
-                                                                                       string reservationActivitySid = null,
-                                                                                       string assignmentActivitySid = null,
-                                                                                       int? maxReservedWorkers = null,
-                                                                                       TaskQueueResource.TaskOrderEnum taskOrder = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskQueueOptions(pathWorkspaceSid, pathSid){FriendlyName = friendlyName, TargetWorkers = targetWorkers, ReservationActivitySid = reservationActivitySid, AssignmentActivitySid = assignmentActivitySid, MaxReservedWorkers = maxReservedWorkers, TaskOrder = taskOrder};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadTaskQueueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read TaskQueue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueue </returns>
-        public static ResourceSet<TaskQueueResource> Read(ReadTaskQueueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TaskQueueResource>.FromJson("task_queues", response.Content);
-            return new ResourceSet<TaskQueueResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read TaskQueue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueue </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TaskQueueResource>> ReadAsync(ReadTaskQueueOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TaskQueueResource>.FromJson("task_queues", response.Content);
-            return new ResourceSet<TaskQueueResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to read </param>
-        /// <param name="friendlyName"> The friendly_name of the TaskQueue resources to read </param>
-        /// <param name="evaluateWorkerAttributes"> The attributes of the Workers to read </param>
-        /// <param name="workerSid"> The SID of the Worker with the TaskQueue resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueue </returns>
-        public static ResourceSet<TaskQueueResource> Read(string pathWorkspaceSid,
-                                                          string friendlyName = null,
-                                                          string evaluateWorkerAttributes = null,
-                                                          string workerSid = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadTaskQueueOptions(pathWorkspaceSid){FriendlyName = friendlyName, EvaluateWorkerAttributes = evaluateWorkerAttributes, WorkerSid = workerSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to read </param>
-        /// <param name="friendlyName"> The friendly_name of the TaskQueue resources to read </param>
-        /// <param name="evaluateWorkerAttributes"> The attributes of the Workers to read </param>
-        /// <param name="workerSid"> The SID of the Worker with the TaskQueue resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueue </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TaskQueueResource>> ReadAsync(string pathWorkspaceSid,
-                                                                                                  string friendlyName = null,
-                                                                                                  string evaluateWorkerAttributes = null,
-                                                                                                  string workerSid = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadTaskQueueOptions(pathWorkspaceSid){FriendlyName = friendlyName, EvaluateWorkerAttributes = evaluateWorkerAttributes, WorkerSid = workerSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TaskQueueResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TaskQueueResource>.FromJson("task_queues", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TaskQueueResource> NextPage(Page<TaskQueueResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<TaskQueueResource>.FromJson("task_queues", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TaskQueueResource> PreviousPage(Page<TaskQueueResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<TaskQueueResource>.FromJson("task_queues", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateTaskQueueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create TaskQueue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueue </returns>
-        public static TaskQueueResource Create(CreateTaskQueueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create TaskQueue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueue </returns>
-        public static async System.Threading.Tasks.Task<TaskQueueResource> CreateAsync(CreateTaskQueueOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new TaskQueue belongs to </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="targetWorkers"> A string describing the Worker selection criteria for any Tasks that enter the
-        ///                     TaskQueue </param>
-        /// <param name="maxReservedWorkers"> The maximum number of Workers to reserve </param>
-        /// <param name="taskOrder"> How Tasks will be assigned to Workers </param>
-        /// <param name="reservationActivitySid"> The SID of the Activity to assign Workers when a task is reserved for them
-        ///                              </param>
-        /// <param name="assignmentActivitySid"> The SID of the Activity to assign Workers once a task is assigned to them
-        ///                             </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueue </returns>
-        public static TaskQueueResource Create(string pathWorkspaceSid,
-                                               string friendlyName,
-                                               string targetWorkers = null,
-                                               int? maxReservedWorkers = null,
-                                               TaskQueueResource.TaskOrderEnum taskOrder = null,
-                                               string reservationActivitySid = null,
-                                               string assignmentActivitySid = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateTaskQueueOptions(pathWorkspaceSid, friendlyName){TargetWorkers = targetWorkers, MaxReservedWorkers = maxReservedWorkers, TaskOrder = taskOrder, ReservationActivitySid = reservationActivitySid, AssignmentActivitySid = assignmentActivitySid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new TaskQueue belongs to </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="targetWorkers"> A string describing the Worker selection criteria for any Tasks that enter the
-        ///                     TaskQueue </param>
-        /// <param name="maxReservedWorkers"> The maximum number of Workers to reserve </param>
-        /// <param name="taskOrder"> How Tasks will be assigned to Workers </param>
-        /// <param name="reservationActivitySid"> The SID of the Activity to assign Workers when a task is reserved for them
-        ///                              </param>
-        /// <param name="assignmentActivitySid"> The SID of the Activity to assign Workers once a task is assigned to them
-        ///                             </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueue </returns>
-        public static async System.Threading.Tasks.Task<TaskQueueResource> CreateAsync(string pathWorkspaceSid,
-                                                                                       string friendlyName,
-                                                                                       string targetWorkers = null,
-                                                                                       int? maxReservedWorkers = null,
-                                                                                       TaskQueueResource.TaskOrderEnum taskOrder = null,
-                                                                                       string reservationActivitySid = null,
-                                                                                       string assignmentActivitySid = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateTaskQueueOptions(pathWorkspaceSid, friendlyName){TargetWorkers = targetWorkers, MaxReservedWorkers = maxReservedWorkers, TaskOrder = taskOrder, ReservationActivitySid = reservationActivitySid, AssignmentActivitySid = assignmentActivitySid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteTaskQueueOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete TaskQueue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueue </returns>
-        public static bool Delete(DeleteTaskQueueOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete TaskQueue parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueue </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTaskQueueOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to delete </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TaskQueue </returns>
-        public static bool Delete(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteTaskQueueOptions(pathWorkspaceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to delete </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TaskQueue </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathWorkspaceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteTaskQueueOptions(pathWorkspaceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TaskQueueResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TaskQueueResource object represented by the provided JSON </returns>
-        public static TaskQueueResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TaskQueueResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Activity to assign Workers when a task is assigned for them
-        /// </summary>
-        [JsonProperty("assignment_activity_sid")]
-        public string AssignmentActivitySid { get; private set; }
-        /// <summary>
-        /// The name of the Activity to assign Workers when a task is assigned for them
-        /// </summary>
-        [JsonProperty("assignment_activity_name")]
-        public string AssignmentActivityName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The maximum number of Workers to reserve
-        /// </summary>
-        [JsonProperty("max_reserved_workers")]
-        public int? MaxReservedWorkers { get; private set; }
-        /// <summary>
-        /// The SID of the Activity to assign Workers once a task is reserved for them
-        /// </summary>
-        [JsonProperty("reservation_activity_sid")]
-        public string ReservationActivitySid { get; private set; }
-        /// <summary>
-        /// The name of the Activity to assign Workers once a task is reserved for them
-        /// </summary>
-        [JsonProperty("reservation_activity_name")]
-        public string ReservationActivityName { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A string describing the Worker selection criteria for any Tasks that enter the TaskQueue
-        /// </summary>
-        [JsonProperty("target_workers")]
-        public string TargetWorkers { get; private set; }
-        /// <summary>
-        /// How Tasks will be assigned to Workers
-        /// </summary>
-        [JsonProperty("task_order")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TaskQueueResource.TaskOrderEnum TaskOrder { get; private set; }
-        /// <summary>
-        /// The absolute URL of the TaskQueue resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the TaskQueue
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private TaskQueueResource()
-        {
-
-        }
-    }
+{
+
+  public class TaskQueueResource : Resource
+  {
+    public sealed class TaskOrderEnum : StringEnum
+    {
+      private TaskOrderEnum(string value) : base(value) { }
+      public TaskOrderEnum() { }
+      public static implicit operator TaskOrderEnum(string value)
+      {
+        return new TaskOrderEnum(value);
+      }
+
+      public static readonly TaskOrderEnum Fifo = new TaskOrderEnum("FIFO");
+      public static readonly TaskOrderEnum Lifo = new TaskOrderEnum("LIFO");
+    }
+
+    private static Request BuildFetchRequest(FetchTaskQueueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskQueue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueue </returns>
+    public static TaskQueueResource Fetch(FetchTaskQueueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch TaskQueue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueue </returns>
+    public static async System.Threading.Tasks.Task<TaskQueueResource> FetchAsync(FetchTaskQueueOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to  </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueue </returns>
+    public static TaskQueueResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskQueueOptions(pathWorkspaceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to  </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueue </returns>
+    public static async System.Threading.Tasks.Task<TaskQueueResource> FetchAsync(string pathWorkspaceSid,
+                                                                                  string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskQueueOptions(pathWorkspaceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateTaskQueueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update TaskQueue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueue </returns>
+    public static TaskQueueResource Update(UpdateTaskQueueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update TaskQueue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueue </returns>
+    public static async System.Threading.Tasks.Task<TaskQueueResource> UpdateAsync(UpdateTaskQueueOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to update </param>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="targetWorkers"> A string describing the Worker selection criteria for any Tasks that enter the
+    ///                     TaskQueue </param>
+    /// <param name="reservationActivitySid"> The SID of the Activity to assign Workers when a task is reserved for them
+    ///                              </param>
+    /// <param name="assignmentActivitySid"> The SID of the Activity to assign Workers when a task is assigned for them
+    ///                             </param>
+    /// <param name="maxReservedWorkers"> The maximum number of Workers to create reservations for the assignment of a task
+    ///                          while in the queue </param>
+    /// <param name="taskOrder"> How Tasks will be assigned to Workers </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueue </returns>
+    public static TaskQueueResource Update(string pathWorkspaceSid,
+                                           string pathSid,
+                                           string friendlyName = null,
+                                           string targetWorkers = null,
+                                           string reservationActivitySid = null,
+                                           string assignmentActivitySid = null,
+                                           int? maxReservedWorkers = null,
+                                           TaskQueueResource.TaskOrderEnum taskOrder = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskQueueOptions(pathWorkspaceSid, pathSid) { FriendlyName = friendlyName, TargetWorkers = targetWorkers, ReservationActivitySid = reservationActivitySid, AssignmentActivitySid = assignmentActivitySid, MaxReservedWorkers = maxReservedWorkers, TaskOrder = taskOrder };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to update </param>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="targetWorkers"> A string describing the Worker selection criteria for any Tasks that enter the
+    ///                     TaskQueue </param>
+    /// <param name="reservationActivitySid"> The SID of the Activity to assign Workers when a task is reserved for them
+    ///                              </param>
+    /// <param name="assignmentActivitySid"> The SID of the Activity to assign Workers when a task is assigned for them
+    ///                             </param>
+    /// <param name="maxReservedWorkers"> The maximum number of Workers to create reservations for the assignment of a task
+    ///                          while in the queue </param>
+    /// <param name="taskOrder"> How Tasks will be assigned to Workers </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueue </returns>
+    public static async System.Threading.Tasks.Task<TaskQueueResource> UpdateAsync(string pathWorkspaceSid,
+                                                                                   string pathSid,
+                                                                                   string friendlyName = null,
+                                                                                   string targetWorkers = null,
+                                                                                   string reservationActivitySid = null,
+                                                                                   string assignmentActivitySid = null,
+                                                                                   int? maxReservedWorkers = null,
+                                                                                   TaskQueueResource.TaskOrderEnum taskOrder = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskQueueOptions(pathWorkspaceSid, pathSid) { FriendlyName = friendlyName, TargetWorkers = targetWorkers, ReservationActivitySid = reservationActivitySid, AssignmentActivitySid = assignmentActivitySid, MaxReservedWorkers = maxReservedWorkers, TaskOrder = taskOrder };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadTaskQueueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read TaskQueue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueue </returns>
+    public static ResourceSet<TaskQueueResource> Read(ReadTaskQueueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TaskQueueResource>.FromJson("task_queues", response.Content);
+      return new ResourceSet<TaskQueueResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read TaskQueue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueue </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TaskQueueResource>> ReadAsync(ReadTaskQueueOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TaskQueueResource>.FromJson("task_queues", response.Content);
+      return new ResourceSet<TaskQueueResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to read </param>
+    /// <param name="friendlyName"> The friendly_name of the TaskQueue resources to read </param>
+    /// <param name="evaluateWorkerAttributes"> The attributes of the Workers to read </param>
+    /// <param name="workerSid"> The SID of the Worker with the TaskQueue resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueue </returns>
+    public static ResourceSet<TaskQueueResource> Read(string pathWorkspaceSid,
+                                                      string friendlyName = null,
+                                                      string evaluateWorkerAttributes = null,
+                                                      string workerSid = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadTaskQueueOptions(pathWorkspaceSid) { FriendlyName = friendlyName, EvaluateWorkerAttributes = evaluateWorkerAttributes, WorkerSid = workerSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to read </param>
+    /// <param name="friendlyName"> The friendly_name of the TaskQueue resources to read </param>
+    /// <param name="evaluateWorkerAttributes"> The attributes of the Workers to read </param>
+    /// <param name="workerSid"> The SID of the Worker with the TaskQueue resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueue </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TaskQueueResource>> ReadAsync(string pathWorkspaceSid,
+                                                                                              string friendlyName = null,
+                                                                                              string evaluateWorkerAttributes = null,
+                                                                                              string workerSid = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadTaskQueueOptions(pathWorkspaceSid) { FriendlyName = friendlyName, EvaluateWorkerAttributes = evaluateWorkerAttributes, WorkerSid = workerSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TaskQueueResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TaskQueueResource>.FromJson("task_queues", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TaskQueueResource> NextPage(Page<TaskQueueResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<TaskQueueResource>.FromJson("task_queues", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TaskQueueResource> PreviousPage(Page<TaskQueueResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<TaskQueueResource>.FromJson("task_queues", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateTaskQueueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create TaskQueue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueue </returns>
+    public static TaskQueueResource Create(CreateTaskQueueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create TaskQueue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueue </returns>
+    public static async System.Threading.Tasks.Task<TaskQueueResource> CreateAsync(CreateTaskQueueOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new TaskQueue belongs to </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="targetWorkers"> A string describing the Worker selection criteria for any Tasks that enter the
+    ///                     TaskQueue </param>
+    /// <param name="maxReservedWorkers"> The maximum number of Workers to reserve </param>
+    /// <param name="taskOrder"> How Tasks will be assigned to Workers </param>
+    /// <param name="reservationActivitySid"> The SID of the Activity to assign Workers when a task is reserved for them
+    ///                              </param>
+    /// <param name="assignmentActivitySid"> The SID of the Activity to assign Workers once a task is assigned to them
+    ///                             </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueue </returns>
+    public static TaskQueueResource Create(string pathWorkspaceSid,
+                                           string friendlyName,
+                                           string targetWorkers = null,
+                                           int? maxReservedWorkers = null,
+                                           TaskQueueResource.TaskOrderEnum taskOrder = null,
+                                           string reservationActivitySid = null,
+                                           string assignmentActivitySid = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateTaskQueueOptions(pathWorkspaceSid, friendlyName) { TargetWorkers = targetWorkers, MaxReservedWorkers = maxReservedWorkers, TaskOrder = taskOrder, ReservationActivitySid = reservationActivitySid, AssignmentActivitySid = assignmentActivitySid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new TaskQueue belongs to </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="targetWorkers"> A string describing the Worker selection criteria for any Tasks that enter the
+    ///                     TaskQueue </param>
+    /// <param name="maxReservedWorkers"> The maximum number of Workers to reserve </param>
+    /// <param name="taskOrder"> How Tasks will be assigned to Workers </param>
+    /// <param name="reservationActivitySid"> The SID of the Activity to assign Workers when a task is reserved for them
+    ///                              </param>
+    /// <param name="assignmentActivitySid"> The SID of the Activity to assign Workers once a task is assigned to them
+    ///                             </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueue </returns>
+    public static async System.Threading.Tasks.Task<TaskQueueResource> CreateAsync(string pathWorkspaceSid,
+                                                                                   string friendlyName,
+                                                                                   string targetWorkers = null,
+                                                                                   int? maxReservedWorkers = null,
+                                                                                   TaskQueueResource.TaskOrderEnum taskOrder = null,
+                                                                                   string reservationActivitySid = null,
+                                                                                   string assignmentActivitySid = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateTaskQueueOptions(pathWorkspaceSid, friendlyName) { TargetWorkers = targetWorkers, MaxReservedWorkers = maxReservedWorkers, TaskOrder = taskOrder, ReservationActivitySid = reservationActivitySid, AssignmentActivitySid = assignmentActivitySid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteTaskQueueOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/TaskQueues/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete TaskQueue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueue </returns>
+    public static bool Delete(DeleteTaskQueueOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete TaskQueue parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueue </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTaskQueueOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to delete </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TaskQueue </returns>
+    public static bool Delete(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteTaskQueueOptions(pathWorkspaceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the TaskQueue to delete </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TaskQueue </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathWorkspaceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteTaskQueueOptions(pathWorkspaceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TaskQueueResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TaskQueueResource object represented by the provided JSON </returns>
+    public static TaskQueueResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TaskQueueResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Activity to assign Workers when a task is assigned for them
+    /// </summary>
+    [JsonProperty("assignment_activity_sid")]
+    public string AssignmentActivitySid { get; private set; }
+    /// <summary>
+    /// The name of the Activity to assign Workers when a task is assigned for them
+    /// </summary>
+    [JsonProperty("assignment_activity_name")]
+    public string AssignmentActivityName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The maximum number of Workers to reserve
+    /// </summary>
+    [JsonProperty("max_reserved_workers")]
+    public int? MaxReservedWorkers { get; private set; }
+    /// <summary>
+    /// The SID of the Activity to assign Workers once a task is reserved for them
+    /// </summary>
+    [JsonProperty("reservation_activity_sid")]
+    public string ReservationActivitySid { get; private set; }
+    /// <summary>
+    /// The name of the Activity to assign Workers once a task is reserved for them
+    /// </summary>
+    [JsonProperty("reservation_activity_name")]
+    public string ReservationActivityName { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A string describing the Worker selection criteria for any Tasks that enter the TaskQueue
+    /// </summary>
+    [JsonProperty("target_workers")]
+    public string TargetWorkers { get; private set; }
+    /// <summary>
+    /// How Tasks will be assigned to Workers
+    /// </summary>
+    [JsonProperty("task_order")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TaskQueueResource.TaskOrderEnum TaskOrder { get; private set; }
+    /// <summary>
+    /// The absolute URL of the TaskQueue resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the TaskQueue
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private TaskQueueResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskResource.cs
index dcdb2a514..5ee92c52b 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/TaskResource.cs
@@ -17,659 +17,659 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
-    public class TaskResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Pending = new StatusEnum("pending");
-            public static readonly StatusEnum Reserved = new StatusEnum("reserved");
-            public static readonly StatusEnum Assigned = new StatusEnum("assigned");
-            public static readonly StatusEnum Canceled = new StatusEnum("canceled");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Wrapping = new StatusEnum("wrapping");
-        }
-
-        private static Request BuildFetchRequest(FetchTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Fetch(FetchTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> FetchAsync(FetchTaskOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskOptions(pathWorkspaceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> FetchAsync(string pathWorkspaceSid,
-                                                                                 string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchTaskOptions(pathWorkspaceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Update(UpdateTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> UpdateAsync(UpdateTaskOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to update </param>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        /// <param name="attributes"> The JSON string that describes the custom attributes of the task </param>
-        /// <param name="assignmentStatus"> The new status of the task </param>
-        /// <param name="reason"> The reason that the Task was canceled or complete </param>
-        /// <param name="priority"> The Task's new priority value </param>
-        /// <param name="taskChannel"> When MultiTasking is enabled, specify the TaskChannel with the task to update </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Update(string pathWorkspaceSid,
-                                          string pathSid,
-                                          string attributes = null,
-                                          TaskResource.StatusEnum assignmentStatus = null,
-                                          string reason = null,
-                                          int? priority = null,
-                                          string taskChannel = null,
-                                          string ifMatch = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskOptions(pathWorkspaceSid, pathSid){Attributes = attributes, AssignmentStatus = assignmentStatus, Reason = reason, Priority = priority, TaskChannel = taskChannel, IfMatch = ifMatch};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to update </param>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        /// <param name="attributes"> The JSON string that describes the custom attributes of the task </param>
-        /// <param name="assignmentStatus"> The new status of the task </param>
-        /// <param name="reason"> The reason that the Task was canceled or complete </param>
-        /// <param name="priority"> The Task's new priority value </param>
-        /// <param name="taskChannel"> When MultiTasking is enabled, specify the TaskChannel with the task to update </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> UpdateAsync(string pathWorkspaceSid,
-                                                                                  string pathSid,
-                                                                                  string attributes = null,
-                                                                                  TaskResource.StatusEnum assignmentStatus = null,
-                                                                                  string reason = null,
-                                                                                  int? priority = null,
-                                                                                  string taskChannel = null,
-                                                                                  string ifMatch = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateTaskOptions(pathWorkspaceSid, pathSid){Attributes = attributes, AssignmentStatus = assignmentStatus, Reason = reason, Priority = priority, TaskChannel = taskChannel, IfMatch = ifMatch};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static bool Delete(DeleteTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTaskOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to delete </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static bool Delete(string pathWorkspaceSid,
-                                  string pathSid,
-                                  string ifMatch = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteTaskOptions(pathWorkspaceSid, pathSid){IfMatch = ifMatch};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to delete </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathWorkspaceSid,
-                                                                          string pathSid,
-                                                                          string ifMatch = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteTaskOptions(pathWorkspaceSid, pathSid){IfMatch = ifMatch};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static ResourceSet<TaskResource> Read(ReadTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TaskResource>.FromJson("tasks", response.Content);
-            return new ResourceSet<TaskResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TaskResource>> ReadAsync(ReadTaskOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TaskResource>.FromJson("tasks", response.Content);
-            return new ResourceSet<TaskResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Tasks to read </param>
-        /// <param name="priority"> The priority value of the Tasks to read </param>
-        /// <param name="assignmentStatus"> Returns the list of all Tasks in the Workspace with the specified assignment_status
-        ///                        </param>
-        /// <param name="workflowSid"> The SID of the Workflow with the Tasks to read </param>
-        /// <param name="workflowName"> The friendly name of the Workflow with the Tasks to read </param>
-        /// <param name="taskQueueSid"> The SID of the TaskQueue with the Tasks to read </param>
-        /// <param name="taskQueueName"> The friendly_name of the TaskQueue with the Tasks to read </param>
-        /// <param name="evaluateTaskAttributes"> The task attributes of the Tasks to read </param>
-        /// <param name="ordering"> Controls the order of the Tasks returned </param>
-        /// <param name="hasAddons"> Whether to read Tasks with addons </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static ResourceSet<TaskResource> Read(string pathWorkspaceSid,
-                                                     int? priority = null,
-                                                     List<string> assignmentStatus = null,
-                                                     string workflowSid = null,
-                                                     string workflowName = null,
-                                                     string taskQueueSid = null,
-                                                     string taskQueueName = null,
-                                                     string evaluateTaskAttributes = null,
-                                                     string ordering = null,
-                                                     bool? hasAddons = null,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadTaskOptions(pathWorkspaceSid){Priority = priority, AssignmentStatus = assignmentStatus, WorkflowSid = workflowSid, WorkflowName = workflowName, TaskQueueSid = taskQueueSid, TaskQueueName = taskQueueName, EvaluateTaskAttributes = evaluateTaskAttributes, Ordering = ordering, HasAddons = hasAddons, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Tasks to read </param>
-        /// <param name="priority"> The priority value of the Tasks to read </param>
-        /// <param name="assignmentStatus"> Returns the list of all Tasks in the Workspace with the specified assignment_status
-        ///                        </param>
-        /// <param name="workflowSid"> The SID of the Workflow with the Tasks to read </param>
-        /// <param name="workflowName"> The friendly name of the Workflow with the Tasks to read </param>
-        /// <param name="taskQueueSid"> The SID of the TaskQueue with the Tasks to read </param>
-        /// <param name="taskQueueName"> The friendly_name of the TaskQueue with the Tasks to read </param>
-        /// <param name="evaluateTaskAttributes"> The task attributes of the Tasks to read </param>
-        /// <param name="ordering"> Controls the order of the Tasks returned </param>
-        /// <param name="hasAddons"> Whether to read Tasks with addons </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TaskResource>> ReadAsync(string pathWorkspaceSid,
-                                                                                             int? priority = null,
-                                                                                             List<string> assignmentStatus = null,
-                                                                                             string workflowSid = null,
-                                                                                             string workflowName = null,
-                                                                                             string taskQueueSid = null,
-                                                                                             string taskQueueName = null,
-                                                                                             string evaluateTaskAttributes = null,
-                                                                                             string ordering = null,
-                                                                                             bool? hasAddons = null,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadTaskOptions(pathWorkspaceSid){Priority = priority, AssignmentStatus = assignmentStatus, WorkflowSid = workflowSid, WorkflowName = workflowName, TaskQueueSid = taskQueueSid, TaskQueueName = taskQueueName, EvaluateTaskAttributes = evaluateTaskAttributes, Ordering = ordering, HasAddons = hasAddons, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TaskResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TaskResource>.FromJson("tasks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TaskResource> NextPage(Page<TaskResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<TaskResource>.FromJson("tasks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TaskResource> PreviousPage(Page<TaskResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<TaskResource>.FromJson("tasks", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateTaskOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Create(CreateTaskOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Task parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> CreateAsync(CreateTaskOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Task belongs to </param>
-        /// <param name="timeout"> The amount of time in seconds the task can live before being assigned </param>
-        /// <param name="priority"> The priority to assign the new task and override the default </param>
-        /// <param name="taskChannel"> When MultiTasking is enabled specify the TaskChannel by passing either its unique_name
-        ///                   or SID </param>
-        /// <param name="workflowSid"> The SID of the Workflow that you would like to handle routing for the new Task </param>
-        /// <param name="attributes"> A URL-encoded JSON string describing the attributes of the task </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Task </returns>
-        public static TaskResource Create(string pathWorkspaceSid,
-                                          int? timeout = null,
-                                          int? priority = null,
-                                          string taskChannel = null,
-                                          string workflowSid = null,
-                                          string attributes = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateTaskOptions(pathWorkspaceSid){Timeout = timeout, Priority = priority, TaskChannel = taskChannel, WorkflowSid = workflowSid, Attributes = attributes};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Task belongs to </param>
-        /// <param name="timeout"> The amount of time in seconds the task can live before being assigned </param>
-        /// <param name="priority"> The priority to assign the new task and override the default </param>
-        /// <param name="taskChannel"> When MultiTasking is enabled specify the TaskChannel by passing either its unique_name
-        ///                   or SID </param>
-        /// <param name="workflowSid"> The SID of the Workflow that you would like to handle routing for the new Task </param>
-        /// <param name="attributes"> A URL-encoded JSON string describing the attributes of the task </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Task </returns>
-        public static async System.Threading.Tasks.Task<TaskResource> CreateAsync(string pathWorkspaceSid,
-                                                                                  int? timeout = null,
-                                                                                  int? priority = null,
-                                                                                  string taskChannel = null,
-                                                                                  string workflowSid = null,
-                                                                                  string attributes = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateTaskOptions(pathWorkspaceSid){Timeout = timeout, Priority = priority, TaskChannel = taskChannel, WorkflowSid = workflowSid, Attributes = attributes};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TaskResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TaskResource object represented by the provided JSON </returns>
-        public static TaskResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TaskResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The number of seconds since the Task was created
-        /// </summary>
-        [JsonProperty("age")]
-        public int? Age { get; private set; }
-        /// <summary>
-        /// The current status of the Task's assignment
-        /// </summary>
-        [JsonProperty("assignment_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TaskResource.StatusEnum AssignmentStatus { get; private set; }
-        /// <summary>
-        /// The JSON string with custom attributes of the work
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// An object that contains the addon data for all installed addons
-        /// </summary>
-        [JsonProperty("addons")]
-        public string Addons { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Task entered the TaskQueue.
-        /// </summary>
-        [JsonProperty("task_queue_entered_date")]
-        public DateTime? TaskQueueEnteredDate { get; private set; }
-        /// <summary>
-        /// Retrieve the list of all Tasks in the Workspace with the specified priority
-        /// </summary>
-        [JsonProperty("priority")]
-        public int? Priority { get; private set; }
-        /// <summary>
-        /// The reason the Task was canceled or completed
-        /// </summary>
-        [JsonProperty("reason")]
-        public string Reason { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the TaskQueue
-        /// </summary>
-        [JsonProperty("task_queue_sid")]
-        public string TaskQueueSid { get; private set; }
-        /// <summary>
-        /// The friendly name of the TaskQueue
-        /// </summary>
-        [JsonProperty("task_queue_friendly_name")]
-        public string TaskQueueFriendlyName { get; private set; }
-        /// <summary>
-        /// The SID of the TaskChannel
-        /// </summary>
-        [JsonProperty("task_channel_sid")]
-        public string TaskChannelSid { get; private set; }
-        /// <summary>
-        /// The unique name of the TaskChannel
-        /// </summary>
-        [JsonProperty("task_channel_unique_name")]
-        public string TaskChannelUniqueName { get; private set; }
-        /// <summary>
-        /// The amount of time in seconds that the Task can live before being assigned
-        /// </summary>
-        [JsonProperty("timeout")]
-        public int? Timeout { get; private set; }
-        /// <summary>
-        /// The SID of the Workflow that is controlling the Task
-        /// </summary>
-        [JsonProperty("workflow_sid")]
-        public string WorkflowSid { get; private set; }
-        /// <summary>
-        /// The friendly name of the Workflow that is controlling the Task
-        /// </summary>
-        [JsonProperty("workflow_friendly_name")]
-        public string WorkflowFriendlyName { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the Task
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Task resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private TaskResource()
-        {
-
-        }
-    }
+{
+
+  public class TaskResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Pending = new StatusEnum("pending");
+      public static readonly StatusEnum Reserved = new StatusEnum("reserved");
+      public static readonly StatusEnum Assigned = new StatusEnum("assigned");
+      public static readonly StatusEnum Canceled = new StatusEnum("canceled");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Wrapping = new StatusEnum("wrapping");
+    }
+
+    private static Request BuildFetchRequest(FetchTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Fetch(FetchTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> FetchAsync(FetchTaskOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskOptions(pathWorkspaceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> FetchAsync(string pathWorkspaceSid,
+                                                                             string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchTaskOptions(pathWorkspaceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Update(UpdateTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> UpdateAsync(UpdateTaskOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to update </param>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    /// <param name="attributes"> The JSON string that describes the custom attributes of the task </param>
+    /// <param name="assignmentStatus"> The new status of the task </param>
+    /// <param name="reason"> The reason that the Task was canceled or complete </param>
+    /// <param name="priority"> The Task's new priority value </param>
+    /// <param name="taskChannel"> When MultiTasking is enabled, specify the TaskChannel with the task to update </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Update(string pathWorkspaceSid,
+                                      string pathSid,
+                                      string attributes = null,
+                                      TaskResource.StatusEnum assignmentStatus = null,
+                                      string reason = null,
+                                      int? priority = null,
+                                      string taskChannel = null,
+                                      string ifMatch = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskOptions(pathWorkspaceSid, pathSid) { Attributes = attributes, AssignmentStatus = assignmentStatus, Reason = reason, Priority = priority, TaskChannel = taskChannel, IfMatch = ifMatch };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to update </param>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    /// <param name="attributes"> The JSON string that describes the custom attributes of the task </param>
+    /// <param name="assignmentStatus"> The new status of the task </param>
+    /// <param name="reason"> The reason that the Task was canceled or complete </param>
+    /// <param name="priority"> The Task's new priority value </param>
+    /// <param name="taskChannel"> When MultiTasking is enabled, specify the TaskChannel with the task to update </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> UpdateAsync(string pathWorkspaceSid,
+                                                                              string pathSid,
+                                                                              string attributes = null,
+                                                                              TaskResource.StatusEnum assignmentStatus = null,
+                                                                              string reason = null,
+                                                                              int? priority = null,
+                                                                              string taskChannel = null,
+                                                                              string ifMatch = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateTaskOptions(pathWorkspaceSid, pathSid) { Attributes = attributes, AssignmentStatus = assignmentStatus, Reason = reason, Priority = priority, TaskChannel = taskChannel, IfMatch = ifMatch };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static bool Delete(DeleteTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTaskOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to delete </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static bool Delete(string pathWorkspaceSid,
+                              string pathSid,
+                              string ifMatch = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteTaskOptions(pathWorkspaceSid, pathSid) { IfMatch = ifMatch };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Task to delete </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathWorkspaceSid,
+                                                                      string pathSid,
+                                                                      string ifMatch = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteTaskOptions(pathWorkspaceSid, pathSid) { IfMatch = ifMatch };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static ResourceSet<TaskResource> Read(ReadTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TaskResource>.FromJson("tasks", response.Content);
+      return new ResourceSet<TaskResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TaskResource>> ReadAsync(ReadTaskOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TaskResource>.FromJson("tasks", response.Content);
+      return new ResourceSet<TaskResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Tasks to read </param>
+    /// <param name="priority"> The priority value of the Tasks to read </param>
+    /// <param name="assignmentStatus"> Returns the list of all Tasks in the Workspace with the specified assignment_status
+    ///                        </param>
+    /// <param name="workflowSid"> The SID of the Workflow with the Tasks to read </param>
+    /// <param name="workflowName"> The friendly name of the Workflow with the Tasks to read </param>
+    /// <param name="taskQueueSid"> The SID of the TaskQueue with the Tasks to read </param>
+    /// <param name="taskQueueName"> The friendly_name of the TaskQueue with the Tasks to read </param>
+    /// <param name="evaluateTaskAttributes"> The task attributes of the Tasks to read </param>
+    /// <param name="ordering"> Controls the order of the Tasks returned </param>
+    /// <param name="hasAddons"> Whether to read Tasks with addons </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static ResourceSet<TaskResource> Read(string pathWorkspaceSid,
+                                                 int? priority = null,
+                                                 List<string> assignmentStatus = null,
+                                                 string workflowSid = null,
+                                                 string workflowName = null,
+                                                 string taskQueueSid = null,
+                                                 string taskQueueName = null,
+                                                 string evaluateTaskAttributes = null,
+                                                 string ordering = null,
+                                                 bool? hasAddons = null,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadTaskOptions(pathWorkspaceSid) { Priority = priority, AssignmentStatus = assignmentStatus, WorkflowSid = workflowSid, WorkflowName = workflowName, TaskQueueSid = taskQueueSid, TaskQueueName = taskQueueName, EvaluateTaskAttributes = evaluateTaskAttributes, Ordering = ordering, HasAddons = hasAddons, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Tasks to read </param>
+    /// <param name="priority"> The priority value of the Tasks to read </param>
+    /// <param name="assignmentStatus"> Returns the list of all Tasks in the Workspace with the specified assignment_status
+    ///                        </param>
+    /// <param name="workflowSid"> The SID of the Workflow with the Tasks to read </param>
+    /// <param name="workflowName"> The friendly name of the Workflow with the Tasks to read </param>
+    /// <param name="taskQueueSid"> The SID of the TaskQueue with the Tasks to read </param>
+    /// <param name="taskQueueName"> The friendly_name of the TaskQueue with the Tasks to read </param>
+    /// <param name="evaluateTaskAttributes"> The task attributes of the Tasks to read </param>
+    /// <param name="ordering"> Controls the order of the Tasks returned </param>
+    /// <param name="hasAddons"> Whether to read Tasks with addons </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TaskResource>> ReadAsync(string pathWorkspaceSid,
+                                                                                         int? priority = null,
+                                                                                         List<string> assignmentStatus = null,
+                                                                                         string workflowSid = null,
+                                                                                         string workflowName = null,
+                                                                                         string taskQueueSid = null,
+                                                                                         string taskQueueName = null,
+                                                                                         string evaluateTaskAttributes = null,
+                                                                                         string ordering = null,
+                                                                                         bool? hasAddons = null,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadTaskOptions(pathWorkspaceSid) { Priority = priority, AssignmentStatus = assignmentStatus, WorkflowSid = workflowSid, WorkflowName = workflowName, TaskQueueSid = taskQueueSid, TaskQueueName = taskQueueName, EvaluateTaskAttributes = evaluateTaskAttributes, Ordering = ordering, HasAddons = hasAddons, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TaskResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TaskResource>.FromJson("tasks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TaskResource> NextPage(Page<TaskResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<TaskResource>.FromJson("tasks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TaskResource> PreviousPage(Page<TaskResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<TaskResource>.FromJson("tasks", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateTaskOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Tasks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Create(CreateTaskOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Task parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> CreateAsync(CreateTaskOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Task belongs to </param>
+    /// <param name="timeout"> The amount of time in seconds the task can live before being assigned </param>
+    /// <param name="priority"> The priority to assign the new task and override the default </param>
+    /// <param name="taskChannel"> When MultiTasking is enabled specify the TaskChannel by passing either its unique_name
+    ///                   or SID </param>
+    /// <param name="workflowSid"> The SID of the Workflow that you would like to handle routing for the new Task </param>
+    /// <param name="attributes"> A URL-encoded JSON string describing the attributes of the task </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Task </returns>
+    public static TaskResource Create(string pathWorkspaceSid,
+                                      int? timeout = null,
+                                      int? priority = null,
+                                      string taskChannel = null,
+                                      string workflowSid = null,
+                                      string attributes = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateTaskOptions(pathWorkspaceSid) { Timeout = timeout, Priority = priority, TaskChannel = taskChannel, WorkflowSid = workflowSid, Attributes = attributes };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Task belongs to </param>
+    /// <param name="timeout"> The amount of time in seconds the task can live before being assigned </param>
+    /// <param name="priority"> The priority to assign the new task and override the default </param>
+    /// <param name="taskChannel"> When MultiTasking is enabled specify the TaskChannel by passing either its unique_name
+    ///                   or SID </param>
+    /// <param name="workflowSid"> The SID of the Workflow that you would like to handle routing for the new Task </param>
+    /// <param name="attributes"> A URL-encoded JSON string describing the attributes of the task </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Task </returns>
+    public static async System.Threading.Tasks.Task<TaskResource> CreateAsync(string pathWorkspaceSid,
+                                                                              int? timeout = null,
+                                                                              int? priority = null,
+                                                                              string taskChannel = null,
+                                                                              string workflowSid = null,
+                                                                              string attributes = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateTaskOptions(pathWorkspaceSid) { Timeout = timeout, Priority = priority, TaskChannel = taskChannel, WorkflowSid = workflowSid, Attributes = attributes };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TaskResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TaskResource object represented by the provided JSON </returns>
+    public static TaskResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TaskResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The number of seconds since the Task was created
+    /// </summary>
+    [JsonProperty("age")]
+    public int? Age { get; private set; }
+    /// <summary>
+    /// The current status of the Task's assignment
+    /// </summary>
+    [JsonProperty("assignment_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TaskResource.StatusEnum AssignmentStatus { get; private set; }
+    /// <summary>
+    /// The JSON string with custom attributes of the work
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// An object that contains the addon data for all installed addons
+    /// </summary>
+    [JsonProperty("addons")]
+    public string Addons { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Task entered the TaskQueue.
+    /// </summary>
+    [JsonProperty("task_queue_entered_date")]
+    public DateTime? TaskQueueEnteredDate { get; private set; }
+    /// <summary>
+    /// Retrieve the list of all Tasks in the Workspace with the specified priority
+    /// </summary>
+    [JsonProperty("priority")]
+    public int? Priority { get; private set; }
+    /// <summary>
+    /// The reason the Task was canceled or completed
+    /// </summary>
+    [JsonProperty("reason")]
+    public string Reason { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the TaskQueue
+    /// </summary>
+    [JsonProperty("task_queue_sid")]
+    public string TaskQueueSid { get; private set; }
+    /// <summary>
+    /// The friendly name of the TaskQueue
+    /// </summary>
+    [JsonProperty("task_queue_friendly_name")]
+    public string TaskQueueFriendlyName { get; private set; }
+    /// <summary>
+    /// The SID of the TaskChannel
+    /// </summary>
+    [JsonProperty("task_channel_sid")]
+    public string TaskChannelSid { get; private set; }
+    /// <summary>
+    /// The unique name of the TaskChannel
+    /// </summary>
+    [JsonProperty("task_channel_unique_name")]
+    public string TaskChannelUniqueName { get; private set; }
+    /// <summary>
+    /// The amount of time in seconds that the Task can live before being assigned
+    /// </summary>
+    [JsonProperty("timeout")]
+    public int? Timeout { get; private set; }
+    /// <summary>
+    /// The SID of the Workflow that is controlling the Task
+    /// </summary>
+    [JsonProperty("workflow_sid")]
+    public string WorkflowSid { get; private set; }
+    /// <summary>
+    /// The friendly name of the Workflow that is controlling the Task
+    /// </summary>
+    [JsonProperty("workflow_friendly_name")]
+    public string WorkflowFriendlyName { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the Task
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Task resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private TaskResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/ReservationOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/ReservationOptions.cs
index 727957683..24d8f598f 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/ReservationOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/ReservationOptions.cs
@@ -10,620 +10,620 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Worker
-{
-
+{
+
+  /// <summary>
+  /// ReadReservationOptions
+  /// </summary>
+  public class ReadReservationOptions : ReadOptions<ReservationResource>
+  {
     /// <summary>
-    /// ReadReservationOptions
-    /// </summary>
-    public class ReadReservationOptions : ReadOptions<ReservationResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the WorkerReservation resources to read
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the reserved Worker resource with the WorkerReservation resources to read
-        /// </summary>
-        public string PathWorkerSid { get; }
-        /// <summary>
-        /// Returns the list of reservations for a worker with a specified ReservationStatus
-        /// </summary>
-        public ReservationResource.StatusEnum ReservationStatus { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadReservationOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resources to read </param>
-        /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resources to read
-        ///                     </param>
-        public ReadReservationOptions(string pathWorkspaceSid, string pathWorkerSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathWorkerSid = pathWorkerSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ReservationStatus != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReservationStatus", ReservationStatus.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Workspace with the WorkerReservation resources to read
+    /// </summary>
+    public string PathWorkspaceSid { get; }
     /// <summary>
-    /// FetchReservationOptions
-    /// </summary>
-    public class FetchReservationOptions : IOptions<ReservationResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the WorkerReservation resource to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the reserved Worker resource with the WorkerReservation resource to fetch
-        /// </summary>
-        public string PathWorkerSid { get; }
-        /// <summary>
-        /// The SID of the WorkerReservation resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchReservationOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resource to fetch </param>
-        /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resource to fetch
-        ///                     </param>
-        /// <param name="pathSid"> The SID of the WorkerReservation resource to fetch </param>
-        public FetchReservationOptions(string pathWorkspaceSid, string pathWorkerSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathWorkerSid = pathWorkerSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the reserved Worker resource with the WorkerReservation resources to read
+    /// </summary>
+    public string PathWorkerSid { get; }
     /// <summary>
-    /// UpdateReservationOptions
-    /// </summary>
-    public class UpdateReservationOptions : IOptions<ReservationResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the WorkerReservation resources to update
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the reserved Worker resource with the WorkerReservation resources to update
-        /// </summary>
-        public string PathWorkerSid { get; }
-        /// <summary>
-        /// The SID of the WorkerReservation resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The new status of the reservation
-        /// </summary>
-        public ReservationResource.StatusEnum ReservationStatus { get; set; }
-        /// <summary>
-        /// The new worker activity SID if rejecting a reservation
-        /// </summary>
-        public string WorkerActivitySid { get; set; }
-        /// <summary>
-        /// The assignment instruction for the reservation
-        /// </summary>
-        public string Instruction { get; set; }
-        /// <summary>
-        /// The SID of the Activity resource to start after executing a Dequeue instruction
-        /// </summary>
-        public string DequeuePostWorkActivitySid { get; set; }
-        /// <summary>
-        /// The caller ID of the call to the worker when executing a Dequeue instruction
-        /// </summary>
-        public string DequeueFrom { get; set; }
-        /// <summary>
-        /// Whether to record both legs of a call when executing a Dequeue instruction
-        /// </summary>
-        public string DequeueRecord { get; set; }
-        /// <summary>
-        /// The timeout for call when executing a Dequeue instruction
-        /// </summary>
-        public int? DequeueTimeout { get; set; }
-        /// <summary>
-        /// The contact URI of the worker when executing a Dequeue instruction
-        /// </summary>
-        public string DequeueTo { get; set; }
-        /// <summary>
-        /// The callback URL for completed call event when executing a Dequeue instruction
-        /// </summary>
-        public Uri DequeueStatusCallbackUrl { get; set; }
-        /// <summary>
-        /// The Caller ID of the outbound call when executing a Call instruction
-        /// </summary>
-        public string CallFrom { get; set; }
-        /// <summary>
-        /// Whether to record both legs of a call when executing a Call instruction
-        /// </summary>
-        public string CallRecord { get; set; }
-        /// <summary>
-        /// The timeout for a call when executing a Call instruction
-        /// </summary>
-        public int? CallTimeout { get; set; }
-        /// <summary>
-        /// The contact URI of the worker when executing a Call instruction
-        /// </summary>
-        public string CallTo { get; set; }
-        /// <summary>
-        /// TwiML URI executed on answering the worker's leg as a result of the Call instruction
-        /// </summary>
-        public Uri CallUrl { get; set; }
-        /// <summary>
-        /// The URL to call for the completed call event when executing a Call instruction
-        /// </summary>
-        public Uri CallStatusCallbackUrl { get; set; }
-        /// <summary>
-        /// Whether to accept a reservation when executing a Call instruction
-        /// </summary>
-        public bool? CallAccept { get; set; }
-        /// <summary>
-        /// The Call SID of the call parked in the queue when executing a Redirect instruction
-        /// </summary>
-        public string RedirectCallSid { get; set; }
-        /// <summary>
-        /// Whether the reservation should be accepted when executing a Redirect instruction
-        /// </summary>
-        public bool? RedirectAccept { get; set; }
-        /// <summary>
-        /// TwiML URI to redirect the call to when executing the Redirect instruction
-        /// </summary>
-        public Uri RedirectUrl { get; set; }
-        /// <summary>
-        /// The Contact URI of the worker when executing a Conference instruction
-        /// </summary>
-        public string To { get; set; }
-        /// <summary>
-        /// The caller ID of the call to the worker when executing a Conference instruction
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The call progress events that we will send to status_callback
-        /// </summary>
-        public List<ReservationResource.CallStatusEnum> StatusCallbackEvent { get; set; }
-        /// <summary>
-        /// The timeout for a call when executing a Conference instruction
-        /// </summary>
-        public int? Timeout { get; set; }
-        /// <summary>
-        /// Whether to record the participant and their conferences
-        /// </summary>
-        public bool? Record { get; set; }
-        /// <summary>
-        /// Whether to mute the agent
-        /// </summary>
-        public bool? Muted { get; set; }
-        /// <summary>
-        /// Whether to play a notification beep when the participant joins
-        /// </summary>
-        public string Beep { get; set; }
-        /// <summary>
-        /// Whether the conference starts when the participant joins the conference
-        /// </summary>
-        public bool? StartConferenceOnEnter { get; set; }
-        /// <summary>
-        /// Whether to end the conference when the agent leaves
-        /// </summary>
-        public bool? EndConferenceOnExit { get; set; }
-        /// <summary>
-        /// URL that hosts pre-conference hold music
-        /// </summary>
-        public Uri WaitUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call `wait_url`
-        /// </summary>
-        public Twilio.Http.HttpMethod WaitMethod { get; set; }
-        /// <summary>
-        /// Whether agents can hear the state of the outbound call
-        /// </summary>
-        public bool? EarlyMedia { get; set; }
-        /// <summary>
-        /// The maximum number of agent conference participants
-        /// </summary>
-        public int? MaxParticipants { get; set; }
-        /// <summary>
-        /// The callback URL for conference events
-        /// </summary>
-        public Uri ConferenceStatusCallback { get; set; }
-        /// <summary>
-        /// HTTP method for requesting `conference_status_callback` URL
-        /// </summary>
-        public Twilio.Http.HttpMethod ConferenceStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The conference status events that we will send to conference_status_callback
-        /// </summary>
-        public List<ReservationResource.ConferenceEventEnum> ConferenceStatusCallbackEvent { get; set; }
-        /// <summary>
-        /// Whether to record the conference the participant is joining
-        /// </summary>
-        public string ConferenceRecord { get; set; }
-        /// <summary>
-        /// Whether to trim leading and trailing silence from your recorded conference audio files
-        /// </summary>
-        public string ConferenceTrim { get; set; }
-        /// <summary>
-        /// Specify `mono` or `dual` recording channels
-        /// </summary>
-        public string RecordingChannels { get; set; }
-        /// <summary>
-        /// The URL that we should call using the `recording_status_callback_method` when the recording status changes
-        /// </summary>
-        public Uri RecordingStatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use when we call `recording_status_callback`
-        /// </summary>
-        public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we should call using the `conference_recording_status_callback_method` when the conference recording is available
-        /// </summary>
-        public Uri ConferenceRecordingStatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call `conference_recording_status_callback`
-        /// </summary>
-        public Twilio.Http.HttpMethod ConferenceRecordingStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The region where we should mix the conference audio
-        /// </summary>
-        public string Region { get; set; }
-        /// <summary>
-        /// The SIP username used for authentication
-        /// </summary>
-        public string SipAuthUsername { get; set; }
-        /// <summary>
-        /// The SIP password for authentication
-        /// </summary>
-        public string SipAuthPassword { get; set; }
-        /// <summary>
-        /// The call progress events sent via webhooks as a result of a Dequeue instruction
-        /// </summary>
-        public List<string> DequeueStatusCallbackEvent { get; set; }
-        /// <summary>
-        /// The new worker activity SID after executing a Conference instruction
-        /// </summary>
-        public string PostWorkActivitySid { get; set; }
-        /// <summary>
-        /// Whether to end the conference when the customer leaves
-        /// </summary>
-        public bool? EndConferenceOnCustomerExit { get; set; }
-        /// <summary>
-        /// Whether to play a notification beep when the customer joins
-        /// </summary>
-        public bool? BeepOnCustomerEntrance { get; set; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateReservationOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resources to update </param>
-        /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resources to update
-        ///                     </param>
-        /// <param name="pathSid"> The SID of the WorkerReservation resource to update </param>
-        public UpdateReservationOptions(string pathWorkspaceSid, string pathWorkerSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathWorkerSid = pathWorkerSid;
-            PathSid = pathSid;
-            StatusCallbackEvent = new List<ReservationResource.CallStatusEnum>();
-            ConferenceStatusCallbackEvent = new List<ReservationResource.ConferenceEventEnum>();
-            DequeueStatusCallbackEvent = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ReservationStatus != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReservationStatus", ReservationStatus.ToString()));
-            }
-
-            if (WorkerActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WorkerActivitySid", WorkerActivitySid.ToString()));
-            }
-
-            if (Instruction != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Instruction", Instruction));
-            }
-
-            if (DequeuePostWorkActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DequeuePostWorkActivitySid", DequeuePostWorkActivitySid.ToString()));
-            }
-
-            if (DequeueFrom != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DequeueFrom", DequeueFrom));
-            }
-
-            if (DequeueRecord != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DequeueRecord", DequeueRecord));
-            }
-
-            if (DequeueTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DequeueTimeout", DequeueTimeout.ToString()));
-            }
-
-            if (DequeueTo != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DequeueTo", DequeueTo));
-            }
-
-            if (DequeueStatusCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DequeueStatusCallbackUrl", Serializers.Url(DequeueStatusCallbackUrl)));
-            }
-
-            if (CallFrom != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallFrom", CallFrom));
-            }
-
-            if (CallRecord != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallRecord", CallRecord));
-            }
-
-            if (CallTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallTimeout", CallTimeout.ToString()));
-            }
-
-            if (CallTo != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallTo", CallTo));
-            }
-
-            if (CallUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallUrl", Serializers.Url(CallUrl)));
-            }
-
-            if (CallStatusCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallStatusCallbackUrl", Serializers.Url(CallStatusCallbackUrl)));
-            }
-
-            if (CallAccept != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallAccept", CallAccept.Value.ToString().ToLower()));
-            }
-
-            if (RedirectCallSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RedirectCallSid", RedirectCallSid.ToString()));
-            }
-
-            if (RedirectAccept != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RedirectAccept", RedirectAccept.Value.ToString().ToLower()));
-            }
-
-            if (RedirectUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RedirectUrl", Serializers.Url(RedirectUrl)));
-            }
-
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To));
-            }
-
-            if (From != null)
-            {
-                p.Add(new KeyValuePair<string, string>("From", From));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (StatusCallbackEvent != null)
-            {
-                p.AddRange(StatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("StatusCallbackEvent", prop.ToString())));
-            }
-
-            if (Timeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Timeout", Timeout.ToString()));
-            }
-
-            if (Record != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Record", Record.Value.ToString().ToLower()));
-            }
-
-            if (Muted != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Muted", Muted.Value.ToString().ToLower()));
-            }
-
-            if (Beep != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Beep", Beep));
-            }
-
-            if (StartConferenceOnEnter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartConferenceOnEnter", StartConferenceOnEnter.Value.ToString().ToLower()));
-            }
-
-            if (EndConferenceOnExit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndConferenceOnExit", EndConferenceOnExit.Value.ToString().ToLower()));
-            }
-
-            if (WaitUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WaitUrl", Serializers.Url(WaitUrl)));
-            }
-
-            if (WaitMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WaitMethod", WaitMethod.ToString()));
-            }
-
-            if (EarlyMedia != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EarlyMedia", EarlyMedia.Value.ToString().ToLower()));
-            }
-
-            if (MaxParticipants != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MaxParticipants", MaxParticipants.ToString()));
-            }
-
-            if (ConferenceStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceStatusCallback", Serializers.Url(ConferenceStatusCallback)));
-            }
-
-            if (ConferenceStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceStatusCallbackMethod", ConferenceStatusCallbackMethod.ToString()));
-            }
-
-            if (ConferenceStatusCallbackEvent != null)
-            {
-                p.AddRange(ConferenceStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("ConferenceStatusCallbackEvent", prop.ToString())));
-            }
-
-            if (ConferenceRecord != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceRecord", ConferenceRecord));
-            }
-
-            if (ConferenceTrim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceTrim", ConferenceTrim));
-            }
-
-            if (RecordingChannels != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingChannels", RecordingChannels));
-            }
-
-            if (RecordingStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingStatusCallback", Serializers.Url(RecordingStatusCallback)));
-            }
-
-            if (RecordingStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingStatusCallbackMethod", RecordingStatusCallbackMethod.ToString()));
-            }
-
-            if (ConferenceRecordingStatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceRecordingStatusCallback", Serializers.Url(ConferenceRecordingStatusCallback)));
-            }
-
-            if (ConferenceRecordingStatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConferenceRecordingStatusCallbackMethod", ConferenceRecordingStatusCallbackMethod.ToString()));
-            }
-
-            if (Region != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Region", Region));
-            }
-
-            if (SipAuthUsername != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipAuthUsername", SipAuthUsername));
-            }
-
-            if (SipAuthPassword != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipAuthPassword", SipAuthPassword));
-            }
-
-            if (DequeueStatusCallbackEvent != null)
-            {
-                p.AddRange(DequeueStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("DequeueStatusCallbackEvent", prop)));
-            }
-
-            if (PostWorkActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PostWorkActivitySid", PostWorkActivitySid.ToString()));
-            }
-
-            if (EndConferenceOnCustomerExit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndConferenceOnCustomerExit", EndConferenceOnCustomerExit.Value.ToString().ToLower()));
-            }
-
-            if (BeepOnCustomerEntrance != null)
-            {
-                p.Add(new KeyValuePair<string, string>("BeepOnCustomerEntrance", BeepOnCustomerEntrance.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
+    /// Returns the list of reservations for a worker with a specified ReservationStatus
+    /// </summary>
+    public ReservationResource.StatusEnum ReservationStatus { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadReservationOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resources to read </param>
+    /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resources to read
+    ///                     </param>
+    public ReadReservationOptions(string pathWorkspaceSid, string pathWorkerSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathWorkerSid = pathWorkerSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ReservationStatus != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReservationStatus", ReservationStatus.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchReservationOptions
+  /// </summary>
+  public class FetchReservationOptions : IOptions<ReservationResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the WorkerReservation resource to fetch
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the reserved Worker resource with the WorkerReservation resource to fetch
+    /// </summary>
+    public string PathWorkerSid { get; }
+    /// <summary>
+    /// The SID of the WorkerReservation resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchReservationOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resource to fetch </param>
+    /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resource to fetch
+    ///                     </param>
+    /// <param name="pathSid"> The SID of the WorkerReservation resource to fetch </param>
+    public FetchReservationOptions(string pathWorkspaceSid, string pathWorkerSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathWorkerSid = pathWorkerSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateReservationOptions
+  /// </summary>
+  public class UpdateReservationOptions : IOptions<ReservationResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the WorkerReservation resources to update
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the reserved Worker resource with the WorkerReservation resources to update
+    /// </summary>
+    public string PathWorkerSid { get; }
+    /// <summary>
+    /// The SID of the WorkerReservation resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The new status of the reservation
+    /// </summary>
+    public ReservationResource.StatusEnum ReservationStatus { get; set; }
+    /// <summary>
+    /// The new worker activity SID if rejecting a reservation
+    /// </summary>
+    public string WorkerActivitySid { get; set; }
+    /// <summary>
+    /// The assignment instruction for the reservation
+    /// </summary>
+    public string Instruction { get; set; }
+    /// <summary>
+    /// The SID of the Activity resource to start after executing a Dequeue instruction
+    /// </summary>
+    public string DequeuePostWorkActivitySid { get; set; }
+    /// <summary>
+    /// The caller ID of the call to the worker when executing a Dequeue instruction
+    /// </summary>
+    public string DequeueFrom { get; set; }
+    /// <summary>
+    /// Whether to record both legs of a call when executing a Dequeue instruction
+    /// </summary>
+    public string DequeueRecord { get; set; }
+    /// <summary>
+    /// The timeout for call when executing a Dequeue instruction
+    /// </summary>
+    public int? DequeueTimeout { get; set; }
+    /// <summary>
+    /// The contact URI of the worker when executing a Dequeue instruction
+    /// </summary>
+    public string DequeueTo { get; set; }
+    /// <summary>
+    /// The callback URL for completed call event when executing a Dequeue instruction
+    /// </summary>
+    public Uri DequeueStatusCallbackUrl { get; set; }
+    /// <summary>
+    /// The Caller ID of the outbound call when executing a Call instruction
+    /// </summary>
+    public string CallFrom { get; set; }
+    /// <summary>
+    /// Whether to record both legs of a call when executing a Call instruction
+    /// </summary>
+    public string CallRecord { get; set; }
+    /// <summary>
+    /// The timeout for a call when executing a Call instruction
+    /// </summary>
+    public int? CallTimeout { get; set; }
+    /// <summary>
+    /// The contact URI of the worker when executing a Call instruction
+    /// </summary>
+    public string CallTo { get; set; }
+    /// <summary>
+    /// TwiML URI executed on answering the worker's leg as a result of the Call instruction
+    /// </summary>
+    public Uri CallUrl { get; set; }
+    /// <summary>
+    /// The URL to call for the completed call event when executing a Call instruction
+    /// </summary>
+    public Uri CallStatusCallbackUrl { get; set; }
+    /// <summary>
+    /// Whether to accept a reservation when executing a Call instruction
+    /// </summary>
+    public bool? CallAccept { get; set; }
+    /// <summary>
+    /// The Call SID of the call parked in the queue when executing a Redirect instruction
+    /// </summary>
+    public string RedirectCallSid { get; set; }
+    /// <summary>
+    /// Whether the reservation should be accepted when executing a Redirect instruction
+    /// </summary>
+    public bool? RedirectAccept { get; set; }
+    /// <summary>
+    /// TwiML URI to redirect the call to when executing the Redirect instruction
+    /// </summary>
+    public Uri RedirectUrl { get; set; }
+    /// <summary>
+    /// The Contact URI of the worker when executing a Conference instruction
+    /// </summary>
+    public string To { get; set; }
+    /// <summary>
+    /// The caller ID of the call to the worker when executing a Conference instruction
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The call progress events that we will send to status_callback
+    /// </summary>
+    public List<ReservationResource.CallStatusEnum> StatusCallbackEvent { get; set; }
+    /// <summary>
+    /// The timeout for a call when executing a Conference instruction
+    /// </summary>
+    public int? Timeout { get; set; }
+    /// <summary>
+    /// Whether to record the participant and their conferences
+    /// </summary>
+    public bool? Record { get; set; }
+    /// <summary>
+    /// Whether to mute the agent
+    /// </summary>
+    public bool? Muted { get; set; }
+    /// <summary>
+    /// Whether to play a notification beep when the participant joins
+    /// </summary>
+    public string Beep { get; set; }
+    /// <summary>
+    /// Whether the conference starts when the participant joins the conference
+    /// </summary>
+    public bool? StartConferenceOnEnter { get; set; }
+    /// <summary>
+    /// Whether to end the conference when the agent leaves
+    /// </summary>
+    public bool? EndConferenceOnExit { get; set; }
+    /// <summary>
+    /// URL that hosts pre-conference hold music
+    /// </summary>
+    public Uri WaitUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call `wait_url`
+    /// </summary>
+    public Twilio.Http.HttpMethod WaitMethod { get; set; }
+    /// <summary>
+    /// Whether agents can hear the state of the outbound call
+    /// </summary>
+    public bool? EarlyMedia { get; set; }
+    /// <summary>
+    /// The maximum number of agent conference participants
+    /// </summary>
+    public int? MaxParticipants { get; set; }
+    /// <summary>
+    /// The callback URL for conference events
+    /// </summary>
+    public Uri ConferenceStatusCallback { get; set; }
+    /// <summary>
+    /// HTTP method for requesting `conference_status_callback` URL
+    /// </summary>
+    public Twilio.Http.HttpMethod ConferenceStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The conference status events that we will send to conference_status_callback
+    /// </summary>
+    public List<ReservationResource.ConferenceEventEnum> ConferenceStatusCallbackEvent { get; set; }
+    /// <summary>
+    /// Whether to record the conference the participant is joining
+    /// </summary>
+    public string ConferenceRecord { get; set; }
+    /// <summary>
+    /// Whether to trim leading and trailing silence from your recorded conference audio files
+    /// </summary>
+    public string ConferenceTrim { get; set; }
+    /// <summary>
+    /// Specify `mono` or `dual` recording channels
+    /// </summary>
+    public string RecordingChannels { get; set; }
+    /// <summary>
+    /// The URL that we should call using the `recording_status_callback_method` when the recording status changes
+    /// </summary>
+    public Uri RecordingStatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use when we call `recording_status_callback`
+    /// </summary>
+    public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we should call using the `conference_recording_status_callback_method` when the conference recording is available
+    /// </summary>
+    public Uri ConferenceRecordingStatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call `conference_recording_status_callback`
+    /// </summary>
+    public Twilio.Http.HttpMethod ConferenceRecordingStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The region where we should mix the conference audio
+    /// </summary>
+    public string Region { get; set; }
+    /// <summary>
+    /// The SIP username used for authentication
+    /// </summary>
+    public string SipAuthUsername { get; set; }
+    /// <summary>
+    /// The SIP password for authentication
+    /// </summary>
+    public string SipAuthPassword { get; set; }
+    /// <summary>
+    /// The call progress events sent via webhooks as a result of a Dequeue instruction
+    /// </summary>
+    public List<string> DequeueStatusCallbackEvent { get; set; }
+    /// <summary>
+    /// The new worker activity SID after executing a Conference instruction
+    /// </summary>
+    public string PostWorkActivitySid { get; set; }
+    /// <summary>
+    /// Whether to end the conference when the customer leaves
+    /// </summary>
+    public bool? EndConferenceOnCustomerExit { get; set; }
+    /// <summary>
+    /// Whether to play a notification beep when the customer joins
+    /// </summary>
+    public bool? BeepOnCustomerEntrance { get; set; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateReservationOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resources to update </param>
+    /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resources to update
+    ///                     </param>
+    /// <param name="pathSid"> The SID of the WorkerReservation resource to update </param>
+    public UpdateReservationOptions(string pathWorkspaceSid, string pathWorkerSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathWorkerSid = pathWorkerSid;
+      PathSid = pathSid;
+      StatusCallbackEvent = new List<ReservationResource.CallStatusEnum>();
+      ConferenceStatusCallbackEvent = new List<ReservationResource.ConferenceEventEnum>();
+      DequeueStatusCallbackEvent = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ReservationStatus != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReservationStatus", ReservationStatus.ToString()));
+      }
+
+      if (WorkerActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WorkerActivitySid", WorkerActivitySid.ToString()));
+      }
+
+      if (Instruction != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Instruction", Instruction));
+      }
+
+      if (DequeuePostWorkActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DequeuePostWorkActivitySid", DequeuePostWorkActivitySid.ToString()));
+      }
+
+      if (DequeueFrom != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DequeueFrom", DequeueFrom));
+      }
+
+      if (DequeueRecord != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DequeueRecord", DequeueRecord));
+      }
+
+      if (DequeueTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DequeueTimeout", DequeueTimeout.ToString()));
+      }
+
+      if (DequeueTo != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DequeueTo", DequeueTo));
+      }
+
+      if (DequeueStatusCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DequeueStatusCallbackUrl", Serializers.Url(DequeueStatusCallbackUrl)));
+      }
+
+      if (CallFrom != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallFrom", CallFrom));
+      }
+
+      if (CallRecord != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallRecord", CallRecord));
+      }
+
+      if (CallTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallTimeout", CallTimeout.ToString()));
+      }
+
+      if (CallTo != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallTo", CallTo));
+      }
+
+      if (CallUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallUrl", Serializers.Url(CallUrl)));
+      }
+
+      if (CallStatusCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallStatusCallbackUrl", Serializers.Url(CallStatusCallbackUrl)));
+      }
+
+      if (CallAccept != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallAccept", CallAccept.Value.ToString().ToLower()));
+      }
+
+      if (RedirectCallSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RedirectCallSid", RedirectCallSid.ToString()));
+      }
+
+      if (RedirectAccept != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RedirectAccept", RedirectAccept.Value.ToString().ToLower()));
+      }
+
+      if (RedirectUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RedirectUrl", Serializers.Url(RedirectUrl)));
+      }
+
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To));
+      }
+
+      if (From != null)
+      {
+        p.Add(new KeyValuePair<string, string>("From", From));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (StatusCallbackEvent != null)
+      {
+        p.AddRange(StatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("StatusCallbackEvent", prop.ToString())));
+      }
+
+      if (Timeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Timeout", Timeout.ToString()));
+      }
+
+      if (Record != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Record", Record.Value.ToString().ToLower()));
+      }
+
+      if (Muted != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Muted", Muted.Value.ToString().ToLower()));
+      }
+
+      if (Beep != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Beep", Beep));
+      }
+
+      if (StartConferenceOnEnter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartConferenceOnEnter", StartConferenceOnEnter.Value.ToString().ToLower()));
+      }
+
+      if (EndConferenceOnExit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndConferenceOnExit", EndConferenceOnExit.Value.ToString().ToLower()));
+      }
+
+      if (WaitUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WaitUrl", Serializers.Url(WaitUrl)));
+      }
+
+      if (WaitMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WaitMethod", WaitMethod.ToString()));
+      }
+
+      if (EarlyMedia != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EarlyMedia", EarlyMedia.Value.ToString().ToLower()));
+      }
+
+      if (MaxParticipants != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MaxParticipants", MaxParticipants.ToString()));
+      }
+
+      if (ConferenceStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceStatusCallback", Serializers.Url(ConferenceStatusCallback)));
+      }
+
+      if (ConferenceStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceStatusCallbackMethod", ConferenceStatusCallbackMethod.ToString()));
+      }
+
+      if (ConferenceStatusCallbackEvent != null)
+      {
+        p.AddRange(ConferenceStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("ConferenceStatusCallbackEvent", prop.ToString())));
+      }
+
+      if (ConferenceRecord != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceRecord", ConferenceRecord));
+      }
+
+      if (ConferenceTrim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceTrim", ConferenceTrim));
+      }
+
+      if (RecordingChannels != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingChannels", RecordingChannels));
+      }
+
+      if (RecordingStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingStatusCallback", Serializers.Url(RecordingStatusCallback)));
+      }
+
+      if (RecordingStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingStatusCallbackMethod", RecordingStatusCallbackMethod.ToString()));
+      }
+
+      if (ConferenceRecordingStatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceRecordingStatusCallback", Serializers.Url(ConferenceRecordingStatusCallback)));
+      }
+
+      if (ConferenceRecordingStatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConferenceRecordingStatusCallbackMethod", ConferenceRecordingStatusCallbackMethod.ToString()));
+      }
+
+      if (Region != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Region", Region));
+      }
+
+      if (SipAuthUsername != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipAuthUsername", SipAuthUsername));
+      }
+
+      if (SipAuthPassword != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipAuthPassword", SipAuthPassword));
+      }
+
+      if (DequeueStatusCallbackEvent != null)
+      {
+        p.AddRange(DequeueStatusCallbackEvent.Select(prop => new KeyValuePair<string, string>("DequeueStatusCallbackEvent", prop)));
+      }
+
+      if (PostWorkActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PostWorkActivitySid", PostWorkActivitySid.ToString()));
+      }
+
+      if (EndConferenceOnCustomerExit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndConferenceOnCustomerExit", EndConferenceOnCustomerExit.Value.ToString().ToLower()));
+      }
+
+      if (BeepOnCustomerEntrance != null)
+      {
+        p.Add(new KeyValuePair<string, string>("BeepOnCustomerEntrance", BeepOnCustomerEntrance.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/ReservationResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/ReservationResource.cs
index f024b89a3..5541e8a93 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/ReservationResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/ReservationResource.cs
@@ -17,678 +17,678 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Worker
-{
-
-    public class ReservationResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Pending = new StatusEnum("pending");
-            public static readonly StatusEnum Accepted = new StatusEnum("accepted");
-            public static readonly StatusEnum Rejected = new StatusEnum("rejected");
-            public static readonly StatusEnum Timeout = new StatusEnum("timeout");
-            public static readonly StatusEnum Canceled = new StatusEnum("canceled");
-            public static readonly StatusEnum Rescinded = new StatusEnum("rescinded");
-            public static readonly StatusEnum Wrapping = new StatusEnum("wrapping");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-        }
-
-        public sealed class CallStatusEnum : StringEnum
-        {
-            private CallStatusEnum(string value) : base(value) {}
-            public CallStatusEnum() {}
-            public static implicit operator CallStatusEnum(string value)
-            {
-                return new CallStatusEnum(value);
-            }
-
-            public static readonly CallStatusEnum Initiated = new CallStatusEnum("initiated");
-            public static readonly CallStatusEnum Ringing = new CallStatusEnum("ringing");
-            public static readonly CallStatusEnum Answered = new CallStatusEnum("answered");
-            public static readonly CallStatusEnum Completed = new CallStatusEnum("completed");
-        }
-
-        public sealed class ConferenceEventEnum : StringEnum
-        {
-            private ConferenceEventEnum(string value) : base(value) {}
-            public ConferenceEventEnum() {}
-            public static implicit operator ConferenceEventEnum(string value)
-            {
-                return new ConferenceEventEnum(value);
-            }
-
-            public static readonly ConferenceEventEnum Start = new ConferenceEventEnum("start");
-            public static readonly ConferenceEventEnum End = new ConferenceEventEnum("end");
-            public static readonly ConferenceEventEnum Join = new ConferenceEventEnum("join");
-            public static readonly ConferenceEventEnum Leave = new ConferenceEventEnum("leave");
-            public static readonly ConferenceEventEnum Mute = new ConferenceEventEnum("mute");
-            public static readonly ConferenceEventEnum Hold = new ConferenceEventEnum("hold");
-            public static readonly ConferenceEventEnum Speaker = new ConferenceEventEnum("speaker");
-        }
-
-        private static Request BuildReadRequest(ReadReservationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Reservations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Reservation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Reservation </returns>
-        public static ResourceSet<ReservationResource> Read(ReadReservationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ReservationResource>.FromJson("reservations", response.Content);
-            return new ResourceSet<ReservationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Reservation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Reservation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ReservationResource>> ReadAsync(ReadReservationOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ReservationResource>.FromJson("reservations", response.Content);
-            return new ResourceSet<ReservationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resources to read </param>
-        /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resources to read
-        ///                     </param>
-        /// <param name="reservationStatus"> Returns the list of reservations for a worker with a specified ReservationStatus
-        ///                         </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Reservation </returns>
-        public static ResourceSet<ReservationResource> Read(string pathWorkspaceSid,
-                                                            string pathWorkerSid,
-                                                            ReservationResource.StatusEnum reservationStatus = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadReservationOptions(pathWorkspaceSid, pathWorkerSid){ReservationStatus = reservationStatus, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resources to read </param>
-        /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resources to read
-        ///                     </param>
-        /// <param name="reservationStatus"> Returns the list of reservations for a worker with a specified ReservationStatus
-        ///                         </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Reservation </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ReservationResource>> ReadAsync(string pathWorkspaceSid,
-                                                                                                    string pathWorkerSid,
-                                                                                                    ReservationResource.StatusEnum reservationStatus = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadReservationOptions(pathWorkspaceSid, pathWorkerSid){ReservationStatus = reservationStatus, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ReservationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ReservationResource>.FromJson("reservations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ReservationResource> NextPage(Page<ReservationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<ReservationResource>.FromJson("reservations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ReservationResource> PreviousPage(Page<ReservationResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<ReservationResource>.FromJson("reservations", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchReservationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Reservations/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Reservation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Reservation </returns>
-        public static ReservationResource Fetch(FetchReservationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Reservation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Reservation </returns>
-        public static async System.Threading.Tasks.Task<ReservationResource> FetchAsync(FetchReservationOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resource to fetch </param>
-        /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resource to fetch
-        ///                     </param>
-        /// <param name="pathSid"> The SID of the WorkerReservation resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Reservation </returns>
-        public static ReservationResource Fetch(string pathWorkspaceSid,
-                                                string pathWorkerSid,
-                                                string pathSid,
-                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchReservationOptions(pathWorkspaceSid, pathWorkerSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resource to fetch </param>
-        /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resource to fetch
-        ///                     </param>
-        /// <param name="pathSid"> The SID of the WorkerReservation resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Reservation </returns>
-        public static async System.Threading.Tasks.Task<ReservationResource> FetchAsync(string pathWorkspaceSid,
-                                                                                        string pathWorkerSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchReservationOptions(pathWorkspaceSid, pathWorkerSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateReservationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Reservations/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Reservation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Reservation </returns>
-        public static ReservationResource Update(UpdateReservationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Reservation parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Reservation </returns>
-        public static async System.Threading.Tasks.Task<ReservationResource> UpdateAsync(UpdateReservationOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resources to update </param>
-        /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resources to update
-        ///                     </param>
-        /// <param name="pathSid"> The SID of the WorkerReservation resource to update </param>
-        /// <param name="reservationStatus"> The new status of the reservation </param>
-        /// <param name="workerActivitySid"> The new worker activity SID if rejecting a reservation </param>
-        /// <param name="instruction"> The assignment instruction for the reservation </param>
-        /// <param name="dequeuePostWorkActivitySid"> The SID of the Activity resource to start after executing a Dequeue
-        ///                                  instruction </param>
-        /// <param name="dequeueFrom"> The caller ID of the call to the worker when executing a Dequeue instruction </param>
-        /// <param name="dequeueRecord"> Whether to record both legs of a call when executing a Dequeue instruction </param>
-        /// <param name="dequeueTimeout"> The timeout for call when executing a Dequeue instruction </param>
-        /// <param name="dequeueTo"> The contact URI of the worker when executing a Dequeue instruction </param>
-        /// <param name="dequeueStatusCallbackUrl"> The callback URL for completed call event when executing a Dequeue
-        ///                                instruction </param>
-        /// <param name="callFrom"> The Caller ID of the outbound call when executing a Call instruction </param>
-        /// <param name="callRecord"> Whether to record both legs of a call when executing a Call instruction </param>
-        /// <param name="callTimeout"> The timeout for a call when executing a Call instruction </param>
-        /// <param name="callTo"> The contact URI of the worker when executing a Call instruction </param>
-        /// <param name="callUrl"> TwiML URI executed on answering the worker's leg as a result of the Call instruction </param>
-        /// <param name="callStatusCallbackUrl"> The URL to call for the completed call event when executing a Call instruction
-        ///                             </param>
-        /// <param name="callAccept"> Whether to accept a reservation when executing a Call instruction </param>
-        /// <param name="redirectCallSid"> The Call SID of the call parked in the queue when executing a Redirect instruction
-        ///                       </param>
-        /// <param name="redirectAccept"> Whether the reservation should be accepted when executing a Redirect instruction
-        ///                      </param>
-        /// <param name="redirectUrl"> TwiML URI to redirect the call to when executing the Redirect instruction </param>
-        /// <param name="to"> The Contact URI of the worker when executing a Conference instruction </param>
-        /// <param name="from"> The caller ID of the call to the worker when executing a Conference instruction </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="statusCallbackEvent"> The call progress events that we will send to status_callback </param>
-        /// <param name="timeout"> The timeout for a call when executing a Conference instruction </param>
-        /// <param name="record"> Whether to record the participant and their conferences </param>
-        /// <param name="muted"> Whether to mute the agent </param>
-        /// <param name="beep"> Whether to play a notification beep when the participant joins </param>
-        /// <param name="startConferenceOnEnter"> Whether the conference starts when the participant joins the conference
-        ///                              </param>
-        /// <param name="endConferenceOnExit"> Whether to end the conference when the agent leaves </param>
-        /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
-        /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
-        /// <param name="earlyMedia"> Whether agents can hear the state of the outbound call </param>
-        /// <param name="maxParticipants"> The maximum number of agent conference participants </param>
-        /// <param name="conferenceStatusCallback"> The callback URL for conference events </param>
-        /// <param name="conferenceStatusCallbackMethod"> HTTP method for requesting `conference_status_callback` URL </param>
-        /// <param name="conferenceStatusCallbackEvent"> The conference status events that we will send to
-        ///                                     conference_status_callback </param>
-        /// <param name="conferenceRecord"> Whether to record the conference the participant is joining </param>
-        /// <param name="conferenceTrim"> Whether to trim leading and trailing silence from your recorded conference audio
-        ///                      files </param>
-        /// <param name="recordingChannels"> Specify `mono` or `dual` recording channels </param>
-        /// <param name="recordingStatusCallback"> The URL that we should call using the `recording_status_callback_method`
-        ///                               when the recording status changes </param>
-        /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when we call `recording_status_callback`
-        ///                                     </param>
-        /// <param name="conferenceRecordingStatusCallback"> The URL we should call using the
-        ///                                         `conference_recording_status_callback_method` when the conference recording
-        ///                                         is available </param>
-        /// <param name="conferenceRecordingStatusCallbackMethod"> The HTTP method we should use to call
-        ///                                               `conference_recording_status_callback` </param>
-        /// <param name="region"> The region where we should mix the conference audio </param>
-        /// <param name="sipAuthUsername"> The SIP username used for authentication </param>
-        /// <param name="sipAuthPassword"> The SIP password for authentication </param>
-        /// <param name="dequeueStatusCallbackEvent"> The call progress events sent via webhooks as a result of a Dequeue
-        ///                                  instruction </param>
-        /// <param name="postWorkActivitySid"> The new worker activity SID after executing a Conference instruction </param>
-        /// <param name="endConferenceOnCustomerExit"> Whether to end the conference when the customer leaves </param>
-        /// <param name="beepOnCustomerEntrance"> Whether to play a notification beep when the customer joins </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Reservation </returns>
-        public static ReservationResource Update(string pathWorkspaceSid,
-                                                 string pathWorkerSid,
-                                                 string pathSid,
-                                                 ReservationResource.StatusEnum reservationStatus = null,
-                                                 string workerActivitySid = null,
-                                                 string instruction = null,
-                                                 string dequeuePostWorkActivitySid = null,
-                                                 string dequeueFrom = null,
-                                                 string dequeueRecord = null,
-                                                 int? dequeueTimeout = null,
-                                                 string dequeueTo = null,
-                                                 Uri dequeueStatusCallbackUrl = null,
-                                                 string callFrom = null,
-                                                 string callRecord = null,
-                                                 int? callTimeout = null,
-                                                 string callTo = null,
-                                                 Uri callUrl = null,
-                                                 Uri callStatusCallbackUrl = null,
-                                                 bool? callAccept = null,
-                                                 string redirectCallSid = null,
-                                                 bool? redirectAccept = null,
-                                                 Uri redirectUrl = null,
-                                                 string to = null,
-                                                 string from = null,
-                                                 Uri statusCallback = null,
-                                                 Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                 List<ReservationResource.CallStatusEnum> statusCallbackEvent = null,
-                                                 int? timeout = null,
-                                                 bool? record = null,
-                                                 bool? muted = null,
-                                                 string beep = null,
-                                                 bool? startConferenceOnEnter = null,
-                                                 bool? endConferenceOnExit = null,
-                                                 Uri waitUrl = null,
-                                                 Twilio.Http.HttpMethod waitMethod = null,
-                                                 bool? earlyMedia = null,
-                                                 int? maxParticipants = null,
-                                                 Uri conferenceStatusCallback = null,
-                                                 Twilio.Http.HttpMethod conferenceStatusCallbackMethod = null,
-                                                 List<ReservationResource.ConferenceEventEnum> conferenceStatusCallbackEvent = null,
-                                                 string conferenceRecord = null,
-                                                 string conferenceTrim = null,
-                                                 string recordingChannels = null,
-                                                 Uri recordingStatusCallback = null,
-                                                 Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                                                 Uri conferenceRecordingStatusCallback = null,
-                                                 Twilio.Http.HttpMethod conferenceRecordingStatusCallbackMethod = null,
-                                                 string region = null,
-                                                 string sipAuthUsername = null,
-                                                 string sipAuthPassword = null,
-                                                 List<string> dequeueStatusCallbackEvent = null,
-                                                 string postWorkActivitySid = null,
-                                                 bool? endConferenceOnCustomerExit = null,
-                                                 bool? beepOnCustomerEntrance = null,
-                                                 string ifMatch = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateReservationOptions(pathWorkspaceSid, pathWorkerSid, pathSid){ReservationStatus = reservationStatus, WorkerActivitySid = workerActivitySid, Instruction = instruction, DequeuePostWorkActivitySid = dequeuePostWorkActivitySid, DequeueFrom = dequeueFrom, DequeueRecord = dequeueRecord, DequeueTimeout = dequeueTimeout, DequeueTo = dequeueTo, DequeueStatusCallbackUrl = dequeueStatusCallbackUrl, CallFrom = callFrom, CallRecord = callRecord, CallTimeout = callTimeout, CallTo = callTo, CallUrl = callUrl, CallStatusCallbackUrl = callStatusCallbackUrl, CallAccept = callAccept, RedirectCallSid = redirectCallSid, RedirectAccept = redirectAccept, RedirectUrl = redirectUrl, To = to, From = from, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, StatusCallbackEvent = statusCallbackEvent, Timeout = timeout, Record = record, Muted = muted, Beep = beep, StartConferenceOnEnter = startConferenceOnEnter, EndConferenceOnExit = endConferenceOnExit, WaitUrl = waitUrl, WaitMethod = waitMethod, EarlyMedia = earlyMedia, MaxParticipants = maxParticipants, ConferenceStatusCallback = conferenceStatusCallback, ConferenceStatusCallbackMethod = conferenceStatusCallbackMethod, ConferenceStatusCallbackEvent = conferenceStatusCallbackEvent, ConferenceRecord = conferenceRecord, ConferenceTrim = conferenceTrim, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, ConferenceRecordingStatusCallback = conferenceRecordingStatusCallback, ConferenceRecordingStatusCallbackMethod = conferenceRecordingStatusCallbackMethod, Region = region, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, DequeueStatusCallbackEvent = dequeueStatusCallbackEvent, PostWorkActivitySid = postWorkActivitySid, EndConferenceOnCustomerExit = endConferenceOnCustomerExit, BeepOnCustomerEntrance = beepOnCustomerEntrance, IfMatch = ifMatch};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resources to update </param>
-        /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resources to update
-        ///                     </param>
-        /// <param name="pathSid"> The SID of the WorkerReservation resource to update </param>
-        /// <param name="reservationStatus"> The new status of the reservation </param>
-        /// <param name="workerActivitySid"> The new worker activity SID if rejecting a reservation </param>
-        /// <param name="instruction"> The assignment instruction for the reservation </param>
-        /// <param name="dequeuePostWorkActivitySid"> The SID of the Activity resource to start after executing a Dequeue
-        ///                                  instruction </param>
-        /// <param name="dequeueFrom"> The caller ID of the call to the worker when executing a Dequeue instruction </param>
-        /// <param name="dequeueRecord"> Whether to record both legs of a call when executing a Dequeue instruction </param>
-        /// <param name="dequeueTimeout"> The timeout for call when executing a Dequeue instruction </param>
-        /// <param name="dequeueTo"> The contact URI of the worker when executing a Dequeue instruction </param>
-        /// <param name="dequeueStatusCallbackUrl"> The callback URL for completed call event when executing a Dequeue
-        ///                                instruction </param>
-        /// <param name="callFrom"> The Caller ID of the outbound call when executing a Call instruction </param>
-        /// <param name="callRecord"> Whether to record both legs of a call when executing a Call instruction </param>
-        /// <param name="callTimeout"> The timeout for a call when executing a Call instruction </param>
-        /// <param name="callTo"> The contact URI of the worker when executing a Call instruction </param>
-        /// <param name="callUrl"> TwiML URI executed on answering the worker's leg as a result of the Call instruction </param>
-        /// <param name="callStatusCallbackUrl"> The URL to call for the completed call event when executing a Call instruction
-        ///                             </param>
-        /// <param name="callAccept"> Whether to accept a reservation when executing a Call instruction </param>
-        /// <param name="redirectCallSid"> The Call SID of the call parked in the queue when executing a Redirect instruction
-        ///                       </param>
-        /// <param name="redirectAccept"> Whether the reservation should be accepted when executing a Redirect instruction
-        ///                      </param>
-        /// <param name="redirectUrl"> TwiML URI to redirect the call to when executing the Redirect instruction </param>
-        /// <param name="to"> The Contact URI of the worker when executing a Conference instruction </param>
-        /// <param name="from"> The caller ID of the call to the worker when executing a Conference instruction </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="statusCallbackEvent"> The call progress events that we will send to status_callback </param>
-        /// <param name="timeout"> The timeout for a call when executing a Conference instruction </param>
-        /// <param name="record"> Whether to record the participant and their conferences </param>
-        /// <param name="muted"> Whether to mute the agent </param>
-        /// <param name="beep"> Whether to play a notification beep when the participant joins </param>
-        /// <param name="startConferenceOnEnter"> Whether the conference starts when the participant joins the conference
-        ///                              </param>
-        /// <param name="endConferenceOnExit"> Whether to end the conference when the agent leaves </param>
-        /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
-        /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
-        /// <param name="earlyMedia"> Whether agents can hear the state of the outbound call </param>
-        /// <param name="maxParticipants"> The maximum number of agent conference participants </param>
-        /// <param name="conferenceStatusCallback"> The callback URL for conference events </param>
-        /// <param name="conferenceStatusCallbackMethod"> HTTP method for requesting `conference_status_callback` URL </param>
-        /// <param name="conferenceStatusCallbackEvent"> The conference status events that we will send to
-        ///                                     conference_status_callback </param>
-        /// <param name="conferenceRecord"> Whether to record the conference the participant is joining </param>
-        /// <param name="conferenceTrim"> Whether to trim leading and trailing silence from your recorded conference audio
-        ///                      files </param>
-        /// <param name="recordingChannels"> Specify `mono` or `dual` recording channels </param>
-        /// <param name="recordingStatusCallback"> The URL that we should call using the `recording_status_callback_method`
-        ///                               when the recording status changes </param>
-        /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when we call `recording_status_callback`
-        ///                                     </param>
-        /// <param name="conferenceRecordingStatusCallback"> The URL we should call using the
-        ///                                         `conference_recording_status_callback_method` when the conference recording
-        ///                                         is available </param>
-        /// <param name="conferenceRecordingStatusCallbackMethod"> The HTTP method we should use to call
-        ///                                               `conference_recording_status_callback` </param>
-        /// <param name="region"> The region where we should mix the conference audio </param>
-        /// <param name="sipAuthUsername"> The SIP username used for authentication </param>
-        /// <param name="sipAuthPassword"> The SIP password for authentication </param>
-        /// <param name="dequeueStatusCallbackEvent"> The call progress events sent via webhooks as a result of a Dequeue
-        ///                                  instruction </param>
-        /// <param name="postWorkActivitySid"> The new worker activity SID after executing a Conference instruction </param>
-        /// <param name="endConferenceOnCustomerExit"> Whether to end the conference when the customer leaves </param>
-        /// <param name="beepOnCustomerEntrance"> Whether to play a notification beep when the customer joins </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Reservation </returns>
-        public static async System.Threading.Tasks.Task<ReservationResource> UpdateAsync(string pathWorkspaceSid,
-                                                                                         string pathWorkerSid,
-                                                                                         string pathSid,
-                                                                                         ReservationResource.StatusEnum reservationStatus = null,
-                                                                                         string workerActivitySid = null,
-                                                                                         string instruction = null,
-                                                                                         string dequeuePostWorkActivitySid = null,
-                                                                                         string dequeueFrom = null,
-                                                                                         string dequeueRecord = null,
-                                                                                         int? dequeueTimeout = null,
-                                                                                         string dequeueTo = null,
-                                                                                         Uri dequeueStatusCallbackUrl = null,
-                                                                                         string callFrom = null,
-                                                                                         string callRecord = null,
-                                                                                         int? callTimeout = null,
-                                                                                         string callTo = null,
-                                                                                         Uri callUrl = null,
-                                                                                         Uri callStatusCallbackUrl = null,
-                                                                                         bool? callAccept = null,
-                                                                                         string redirectCallSid = null,
-                                                                                         bool? redirectAccept = null,
-                                                                                         Uri redirectUrl = null,
-                                                                                         string to = null,
-                                                                                         string from = null,
-                                                                                         Uri statusCallback = null,
-                                                                                         Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                         List<ReservationResource.CallStatusEnum> statusCallbackEvent = null,
-                                                                                         int? timeout = null,
-                                                                                         bool? record = null,
-                                                                                         bool? muted = null,
-                                                                                         string beep = null,
-                                                                                         bool? startConferenceOnEnter = null,
-                                                                                         bool? endConferenceOnExit = null,
-                                                                                         Uri waitUrl = null,
-                                                                                         Twilio.Http.HttpMethod waitMethod = null,
-                                                                                         bool? earlyMedia = null,
-                                                                                         int? maxParticipants = null,
-                                                                                         Uri conferenceStatusCallback = null,
-                                                                                         Twilio.Http.HttpMethod conferenceStatusCallbackMethod = null,
-                                                                                         List<ReservationResource.ConferenceEventEnum> conferenceStatusCallbackEvent = null,
-                                                                                         string conferenceRecord = null,
-                                                                                         string conferenceTrim = null,
-                                                                                         string recordingChannels = null,
-                                                                                         Uri recordingStatusCallback = null,
-                                                                                         Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                                                                                         Uri conferenceRecordingStatusCallback = null,
-                                                                                         Twilio.Http.HttpMethod conferenceRecordingStatusCallbackMethod = null,
-                                                                                         string region = null,
-                                                                                         string sipAuthUsername = null,
-                                                                                         string sipAuthPassword = null,
-                                                                                         List<string> dequeueStatusCallbackEvent = null,
-                                                                                         string postWorkActivitySid = null,
-                                                                                         bool? endConferenceOnCustomerExit = null,
-                                                                                         bool? beepOnCustomerEntrance = null,
-                                                                                         string ifMatch = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateReservationOptions(pathWorkspaceSid, pathWorkerSid, pathSid){ReservationStatus = reservationStatus, WorkerActivitySid = workerActivitySid, Instruction = instruction, DequeuePostWorkActivitySid = dequeuePostWorkActivitySid, DequeueFrom = dequeueFrom, DequeueRecord = dequeueRecord, DequeueTimeout = dequeueTimeout, DequeueTo = dequeueTo, DequeueStatusCallbackUrl = dequeueStatusCallbackUrl, CallFrom = callFrom, CallRecord = callRecord, CallTimeout = callTimeout, CallTo = callTo, CallUrl = callUrl, CallStatusCallbackUrl = callStatusCallbackUrl, CallAccept = callAccept, RedirectCallSid = redirectCallSid, RedirectAccept = redirectAccept, RedirectUrl = redirectUrl, To = to, From = from, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, StatusCallbackEvent = statusCallbackEvent, Timeout = timeout, Record = record, Muted = muted, Beep = beep, StartConferenceOnEnter = startConferenceOnEnter, EndConferenceOnExit = endConferenceOnExit, WaitUrl = waitUrl, WaitMethod = waitMethod, EarlyMedia = earlyMedia, MaxParticipants = maxParticipants, ConferenceStatusCallback = conferenceStatusCallback, ConferenceStatusCallbackMethod = conferenceStatusCallbackMethod, ConferenceStatusCallbackEvent = conferenceStatusCallbackEvent, ConferenceRecord = conferenceRecord, ConferenceTrim = conferenceTrim, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, ConferenceRecordingStatusCallback = conferenceRecordingStatusCallback, ConferenceRecordingStatusCallbackMethod = conferenceRecordingStatusCallbackMethod, Region = region, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, DequeueStatusCallbackEvent = dequeueStatusCallbackEvent, PostWorkActivitySid = postWorkActivitySid, EndConferenceOnCustomerExit = endConferenceOnCustomerExit, BeepOnCustomerEntrance = beepOnCustomerEntrance, IfMatch = ifMatch};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ReservationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ReservationResource object represented by the provided JSON </returns>
-        public static ReservationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ReservationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The current status of the reservation
-        /// </summary>
-        [JsonProperty("reservation_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ReservationResource.StatusEnum ReservationStatus { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the reserved Task resource
-        /// </summary>
-        [JsonProperty("task_sid")]
-        public string TaskSid { get; private set; }
-        /// <summary>
-        /// The friendly_name of the Worker that is reserved
-        /// </summary>
-        [JsonProperty("worker_name")]
-        public string WorkerName { get; private set; }
-        /// <summary>
-        /// The SID of the reserved Worker resource
-        /// </summary>
-        [JsonProperty("worker_sid")]
-        public string WorkerSid { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that this worker is contained within.
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the WorkerReservation resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ReservationResource()
-        {
-
-        }
-    }
+{
+
+  public class ReservationResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Pending = new StatusEnum("pending");
+      public static readonly StatusEnum Accepted = new StatusEnum("accepted");
+      public static readonly StatusEnum Rejected = new StatusEnum("rejected");
+      public static readonly StatusEnum Timeout = new StatusEnum("timeout");
+      public static readonly StatusEnum Canceled = new StatusEnum("canceled");
+      public static readonly StatusEnum Rescinded = new StatusEnum("rescinded");
+      public static readonly StatusEnum Wrapping = new StatusEnum("wrapping");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+    }
+
+    public sealed class CallStatusEnum : StringEnum
+    {
+      private CallStatusEnum(string value) : base(value) { }
+      public CallStatusEnum() { }
+      public static implicit operator CallStatusEnum(string value)
+      {
+        return new CallStatusEnum(value);
+      }
+
+      public static readonly CallStatusEnum Initiated = new CallStatusEnum("initiated");
+      public static readonly CallStatusEnum Ringing = new CallStatusEnum("ringing");
+      public static readonly CallStatusEnum Answered = new CallStatusEnum("answered");
+      public static readonly CallStatusEnum Completed = new CallStatusEnum("completed");
+    }
+
+    public sealed class ConferenceEventEnum : StringEnum
+    {
+      private ConferenceEventEnum(string value) : base(value) { }
+      public ConferenceEventEnum() { }
+      public static implicit operator ConferenceEventEnum(string value)
+      {
+        return new ConferenceEventEnum(value);
+      }
+
+      public static readonly ConferenceEventEnum Start = new ConferenceEventEnum("start");
+      public static readonly ConferenceEventEnum End = new ConferenceEventEnum("end");
+      public static readonly ConferenceEventEnum Join = new ConferenceEventEnum("join");
+      public static readonly ConferenceEventEnum Leave = new ConferenceEventEnum("leave");
+      public static readonly ConferenceEventEnum Mute = new ConferenceEventEnum("mute");
+      public static readonly ConferenceEventEnum Hold = new ConferenceEventEnum("hold");
+      public static readonly ConferenceEventEnum Speaker = new ConferenceEventEnum("speaker");
+    }
+
+    private static Request BuildReadRequest(ReadReservationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Reservations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Reservation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Reservation </returns>
+    public static ResourceSet<ReservationResource> Read(ReadReservationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ReservationResource>.FromJson("reservations", response.Content);
+      return new ResourceSet<ReservationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Reservation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Reservation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ReservationResource>> ReadAsync(ReadReservationOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ReservationResource>.FromJson("reservations", response.Content);
+      return new ResourceSet<ReservationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resources to read </param>
+    /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resources to read
+    ///                     </param>
+    /// <param name="reservationStatus"> Returns the list of reservations for a worker with a specified ReservationStatus
+    ///                         </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Reservation </returns>
+    public static ResourceSet<ReservationResource> Read(string pathWorkspaceSid,
+                                                        string pathWorkerSid,
+                                                        ReservationResource.StatusEnum reservationStatus = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadReservationOptions(pathWorkspaceSid, pathWorkerSid) { ReservationStatus = reservationStatus, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resources to read </param>
+    /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resources to read
+    ///                     </param>
+    /// <param name="reservationStatus"> Returns the list of reservations for a worker with a specified ReservationStatus
+    ///                         </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Reservation </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ReservationResource>> ReadAsync(string pathWorkspaceSid,
+                                                                                                string pathWorkerSid,
+                                                                                                ReservationResource.StatusEnum reservationStatus = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadReservationOptions(pathWorkspaceSid, pathWorkerSid) { ReservationStatus = reservationStatus, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ReservationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ReservationResource>.FromJson("reservations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ReservationResource> NextPage(Page<ReservationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<ReservationResource>.FromJson("reservations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ReservationResource> PreviousPage(Page<ReservationResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<ReservationResource>.FromJson("reservations", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchReservationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Reservations/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Reservation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Reservation </returns>
+    public static ReservationResource Fetch(FetchReservationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Reservation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Reservation </returns>
+    public static async System.Threading.Tasks.Task<ReservationResource> FetchAsync(FetchReservationOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resource to fetch </param>
+    /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resource to fetch
+    ///                     </param>
+    /// <param name="pathSid"> The SID of the WorkerReservation resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Reservation </returns>
+    public static ReservationResource Fetch(string pathWorkspaceSid,
+                                            string pathWorkerSid,
+                                            string pathSid,
+                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchReservationOptions(pathWorkspaceSid, pathWorkerSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resource to fetch </param>
+    /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resource to fetch
+    ///                     </param>
+    /// <param name="pathSid"> The SID of the WorkerReservation resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Reservation </returns>
+    public static async System.Threading.Tasks.Task<ReservationResource> FetchAsync(string pathWorkspaceSid,
+                                                                                    string pathWorkerSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchReservationOptions(pathWorkspaceSid, pathWorkerSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateReservationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Reservations/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Reservation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Reservation </returns>
+    public static ReservationResource Update(UpdateReservationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Reservation parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Reservation </returns>
+    public static async System.Threading.Tasks.Task<ReservationResource> UpdateAsync(UpdateReservationOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resources to update </param>
+    /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resources to update
+    ///                     </param>
+    /// <param name="pathSid"> The SID of the WorkerReservation resource to update </param>
+    /// <param name="reservationStatus"> The new status of the reservation </param>
+    /// <param name="workerActivitySid"> The new worker activity SID if rejecting a reservation </param>
+    /// <param name="instruction"> The assignment instruction for the reservation </param>
+    /// <param name="dequeuePostWorkActivitySid"> The SID of the Activity resource to start after executing a Dequeue
+    ///                                  instruction </param>
+    /// <param name="dequeueFrom"> The caller ID of the call to the worker when executing a Dequeue instruction </param>
+    /// <param name="dequeueRecord"> Whether to record both legs of a call when executing a Dequeue instruction </param>
+    /// <param name="dequeueTimeout"> The timeout for call when executing a Dequeue instruction </param>
+    /// <param name="dequeueTo"> The contact URI of the worker when executing a Dequeue instruction </param>
+    /// <param name="dequeueStatusCallbackUrl"> The callback URL for completed call event when executing a Dequeue
+    ///                                instruction </param>
+    /// <param name="callFrom"> The Caller ID of the outbound call when executing a Call instruction </param>
+    /// <param name="callRecord"> Whether to record both legs of a call when executing a Call instruction </param>
+    /// <param name="callTimeout"> The timeout for a call when executing a Call instruction </param>
+    /// <param name="callTo"> The contact URI of the worker when executing a Call instruction </param>
+    /// <param name="callUrl"> TwiML URI executed on answering the worker's leg as a result of the Call instruction </param>
+    /// <param name="callStatusCallbackUrl"> The URL to call for the completed call event when executing a Call instruction
+    ///                             </param>
+    /// <param name="callAccept"> Whether to accept a reservation when executing a Call instruction </param>
+    /// <param name="redirectCallSid"> The Call SID of the call parked in the queue when executing a Redirect instruction
+    ///                       </param>
+    /// <param name="redirectAccept"> Whether the reservation should be accepted when executing a Redirect instruction
+    ///                      </param>
+    /// <param name="redirectUrl"> TwiML URI to redirect the call to when executing the Redirect instruction </param>
+    /// <param name="to"> The Contact URI of the worker when executing a Conference instruction </param>
+    /// <param name="from"> The caller ID of the call to the worker when executing a Conference instruction </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="statusCallbackEvent"> The call progress events that we will send to status_callback </param>
+    /// <param name="timeout"> The timeout for a call when executing a Conference instruction </param>
+    /// <param name="record"> Whether to record the participant and their conferences </param>
+    /// <param name="muted"> Whether to mute the agent </param>
+    /// <param name="beep"> Whether to play a notification beep when the participant joins </param>
+    /// <param name="startConferenceOnEnter"> Whether the conference starts when the participant joins the conference
+    ///                              </param>
+    /// <param name="endConferenceOnExit"> Whether to end the conference when the agent leaves </param>
+    /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
+    /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
+    /// <param name="earlyMedia"> Whether agents can hear the state of the outbound call </param>
+    /// <param name="maxParticipants"> The maximum number of agent conference participants </param>
+    /// <param name="conferenceStatusCallback"> The callback URL for conference events </param>
+    /// <param name="conferenceStatusCallbackMethod"> HTTP method for requesting `conference_status_callback` URL </param>
+    /// <param name="conferenceStatusCallbackEvent"> The conference status events that we will send to
+    ///                                     conference_status_callback </param>
+    /// <param name="conferenceRecord"> Whether to record the conference the participant is joining </param>
+    /// <param name="conferenceTrim"> Whether to trim leading and trailing silence from your recorded conference audio
+    ///                      files </param>
+    /// <param name="recordingChannels"> Specify `mono` or `dual` recording channels </param>
+    /// <param name="recordingStatusCallback"> The URL that we should call using the `recording_status_callback_method`
+    ///                               when the recording status changes </param>
+    /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when we call `recording_status_callback`
+    ///                                     </param>
+    /// <param name="conferenceRecordingStatusCallback"> The URL we should call using the
+    ///                                         `conference_recording_status_callback_method` when the conference recording
+    ///                                         is available </param>
+    /// <param name="conferenceRecordingStatusCallbackMethod"> The HTTP method we should use to call
+    ///                                               `conference_recording_status_callback` </param>
+    /// <param name="region"> The region where we should mix the conference audio </param>
+    /// <param name="sipAuthUsername"> The SIP username used for authentication </param>
+    /// <param name="sipAuthPassword"> The SIP password for authentication </param>
+    /// <param name="dequeueStatusCallbackEvent"> The call progress events sent via webhooks as a result of a Dequeue
+    ///                                  instruction </param>
+    /// <param name="postWorkActivitySid"> The new worker activity SID after executing a Conference instruction </param>
+    /// <param name="endConferenceOnCustomerExit"> Whether to end the conference when the customer leaves </param>
+    /// <param name="beepOnCustomerEntrance"> Whether to play a notification beep when the customer joins </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Reservation </returns>
+    public static ReservationResource Update(string pathWorkspaceSid,
+                                             string pathWorkerSid,
+                                             string pathSid,
+                                             ReservationResource.StatusEnum reservationStatus = null,
+                                             string workerActivitySid = null,
+                                             string instruction = null,
+                                             string dequeuePostWorkActivitySid = null,
+                                             string dequeueFrom = null,
+                                             string dequeueRecord = null,
+                                             int? dequeueTimeout = null,
+                                             string dequeueTo = null,
+                                             Uri dequeueStatusCallbackUrl = null,
+                                             string callFrom = null,
+                                             string callRecord = null,
+                                             int? callTimeout = null,
+                                             string callTo = null,
+                                             Uri callUrl = null,
+                                             Uri callStatusCallbackUrl = null,
+                                             bool? callAccept = null,
+                                             string redirectCallSid = null,
+                                             bool? redirectAccept = null,
+                                             Uri redirectUrl = null,
+                                             string to = null,
+                                             string from = null,
+                                             Uri statusCallback = null,
+                                             Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                             List<ReservationResource.CallStatusEnum> statusCallbackEvent = null,
+                                             int? timeout = null,
+                                             bool? record = null,
+                                             bool? muted = null,
+                                             string beep = null,
+                                             bool? startConferenceOnEnter = null,
+                                             bool? endConferenceOnExit = null,
+                                             Uri waitUrl = null,
+                                             Twilio.Http.HttpMethod waitMethod = null,
+                                             bool? earlyMedia = null,
+                                             int? maxParticipants = null,
+                                             Uri conferenceStatusCallback = null,
+                                             Twilio.Http.HttpMethod conferenceStatusCallbackMethod = null,
+                                             List<ReservationResource.ConferenceEventEnum> conferenceStatusCallbackEvent = null,
+                                             string conferenceRecord = null,
+                                             string conferenceTrim = null,
+                                             string recordingChannels = null,
+                                             Uri recordingStatusCallback = null,
+                                             Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                                             Uri conferenceRecordingStatusCallback = null,
+                                             Twilio.Http.HttpMethod conferenceRecordingStatusCallbackMethod = null,
+                                             string region = null,
+                                             string sipAuthUsername = null,
+                                             string sipAuthPassword = null,
+                                             List<string> dequeueStatusCallbackEvent = null,
+                                             string postWorkActivitySid = null,
+                                             bool? endConferenceOnCustomerExit = null,
+                                             bool? beepOnCustomerEntrance = null,
+                                             string ifMatch = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateReservationOptions(pathWorkspaceSid, pathWorkerSid, pathSid) { ReservationStatus = reservationStatus, WorkerActivitySid = workerActivitySid, Instruction = instruction, DequeuePostWorkActivitySid = dequeuePostWorkActivitySid, DequeueFrom = dequeueFrom, DequeueRecord = dequeueRecord, DequeueTimeout = dequeueTimeout, DequeueTo = dequeueTo, DequeueStatusCallbackUrl = dequeueStatusCallbackUrl, CallFrom = callFrom, CallRecord = callRecord, CallTimeout = callTimeout, CallTo = callTo, CallUrl = callUrl, CallStatusCallbackUrl = callStatusCallbackUrl, CallAccept = callAccept, RedirectCallSid = redirectCallSid, RedirectAccept = redirectAccept, RedirectUrl = redirectUrl, To = to, From = from, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, StatusCallbackEvent = statusCallbackEvent, Timeout = timeout, Record = record, Muted = muted, Beep = beep, StartConferenceOnEnter = startConferenceOnEnter, EndConferenceOnExit = endConferenceOnExit, WaitUrl = waitUrl, WaitMethod = waitMethod, EarlyMedia = earlyMedia, MaxParticipants = maxParticipants, ConferenceStatusCallback = conferenceStatusCallback, ConferenceStatusCallbackMethod = conferenceStatusCallbackMethod, ConferenceStatusCallbackEvent = conferenceStatusCallbackEvent, ConferenceRecord = conferenceRecord, ConferenceTrim = conferenceTrim, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, ConferenceRecordingStatusCallback = conferenceRecordingStatusCallback, ConferenceRecordingStatusCallbackMethod = conferenceRecordingStatusCallbackMethod, Region = region, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, DequeueStatusCallbackEvent = dequeueStatusCallbackEvent, PostWorkActivitySid = postWorkActivitySid, EndConferenceOnCustomerExit = endConferenceOnCustomerExit, BeepOnCustomerEntrance = beepOnCustomerEntrance, IfMatch = ifMatch };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerReservation resources to update </param>
+    /// <param name="pathWorkerSid"> The SID of the reserved Worker resource with the WorkerReservation resources to update
+    ///                     </param>
+    /// <param name="pathSid"> The SID of the WorkerReservation resource to update </param>
+    /// <param name="reservationStatus"> The new status of the reservation </param>
+    /// <param name="workerActivitySid"> The new worker activity SID if rejecting a reservation </param>
+    /// <param name="instruction"> The assignment instruction for the reservation </param>
+    /// <param name="dequeuePostWorkActivitySid"> The SID of the Activity resource to start after executing a Dequeue
+    ///                                  instruction </param>
+    /// <param name="dequeueFrom"> The caller ID of the call to the worker when executing a Dequeue instruction </param>
+    /// <param name="dequeueRecord"> Whether to record both legs of a call when executing a Dequeue instruction </param>
+    /// <param name="dequeueTimeout"> The timeout for call when executing a Dequeue instruction </param>
+    /// <param name="dequeueTo"> The contact URI of the worker when executing a Dequeue instruction </param>
+    /// <param name="dequeueStatusCallbackUrl"> The callback URL for completed call event when executing a Dequeue
+    ///                                instruction </param>
+    /// <param name="callFrom"> The Caller ID of the outbound call when executing a Call instruction </param>
+    /// <param name="callRecord"> Whether to record both legs of a call when executing a Call instruction </param>
+    /// <param name="callTimeout"> The timeout for a call when executing a Call instruction </param>
+    /// <param name="callTo"> The contact URI of the worker when executing a Call instruction </param>
+    /// <param name="callUrl"> TwiML URI executed on answering the worker's leg as a result of the Call instruction </param>
+    /// <param name="callStatusCallbackUrl"> The URL to call for the completed call event when executing a Call instruction
+    ///                             </param>
+    /// <param name="callAccept"> Whether to accept a reservation when executing a Call instruction </param>
+    /// <param name="redirectCallSid"> The Call SID of the call parked in the queue when executing a Redirect instruction
+    ///                       </param>
+    /// <param name="redirectAccept"> Whether the reservation should be accepted when executing a Redirect instruction
+    ///                      </param>
+    /// <param name="redirectUrl"> TwiML URI to redirect the call to when executing the Redirect instruction </param>
+    /// <param name="to"> The Contact URI of the worker when executing a Conference instruction </param>
+    /// <param name="from"> The caller ID of the call to the worker when executing a Conference instruction </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="statusCallbackEvent"> The call progress events that we will send to status_callback </param>
+    /// <param name="timeout"> The timeout for a call when executing a Conference instruction </param>
+    /// <param name="record"> Whether to record the participant and their conferences </param>
+    /// <param name="muted"> Whether to mute the agent </param>
+    /// <param name="beep"> Whether to play a notification beep when the participant joins </param>
+    /// <param name="startConferenceOnEnter"> Whether the conference starts when the participant joins the conference
+    ///                              </param>
+    /// <param name="endConferenceOnExit"> Whether to end the conference when the agent leaves </param>
+    /// <param name="waitUrl"> URL that hosts pre-conference hold music </param>
+    /// <param name="waitMethod"> The HTTP method we should use to call `wait_url` </param>
+    /// <param name="earlyMedia"> Whether agents can hear the state of the outbound call </param>
+    /// <param name="maxParticipants"> The maximum number of agent conference participants </param>
+    /// <param name="conferenceStatusCallback"> The callback URL for conference events </param>
+    /// <param name="conferenceStatusCallbackMethod"> HTTP method for requesting `conference_status_callback` URL </param>
+    /// <param name="conferenceStatusCallbackEvent"> The conference status events that we will send to
+    ///                                     conference_status_callback </param>
+    /// <param name="conferenceRecord"> Whether to record the conference the participant is joining </param>
+    /// <param name="conferenceTrim"> Whether to trim leading and trailing silence from your recorded conference audio
+    ///                      files </param>
+    /// <param name="recordingChannels"> Specify `mono` or `dual` recording channels </param>
+    /// <param name="recordingStatusCallback"> The URL that we should call using the `recording_status_callback_method`
+    ///                               when the recording status changes </param>
+    /// <param name="recordingStatusCallbackMethod"> The HTTP method we should use when we call `recording_status_callback`
+    ///                                     </param>
+    /// <param name="conferenceRecordingStatusCallback"> The URL we should call using the
+    ///                                         `conference_recording_status_callback_method` when the conference recording
+    ///                                         is available </param>
+    /// <param name="conferenceRecordingStatusCallbackMethod"> The HTTP method we should use to call
+    ///                                               `conference_recording_status_callback` </param>
+    /// <param name="region"> The region where we should mix the conference audio </param>
+    /// <param name="sipAuthUsername"> The SIP username used for authentication </param>
+    /// <param name="sipAuthPassword"> The SIP password for authentication </param>
+    /// <param name="dequeueStatusCallbackEvent"> The call progress events sent via webhooks as a result of a Dequeue
+    ///                                  instruction </param>
+    /// <param name="postWorkActivitySid"> The new worker activity SID after executing a Conference instruction </param>
+    /// <param name="endConferenceOnCustomerExit"> Whether to end the conference when the customer leaves </param>
+    /// <param name="beepOnCustomerEntrance"> Whether to play a notification beep when the customer joins </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Reservation </returns>
+    public static async System.Threading.Tasks.Task<ReservationResource> UpdateAsync(string pathWorkspaceSid,
+                                                                                     string pathWorkerSid,
+                                                                                     string pathSid,
+                                                                                     ReservationResource.StatusEnum reservationStatus = null,
+                                                                                     string workerActivitySid = null,
+                                                                                     string instruction = null,
+                                                                                     string dequeuePostWorkActivitySid = null,
+                                                                                     string dequeueFrom = null,
+                                                                                     string dequeueRecord = null,
+                                                                                     int? dequeueTimeout = null,
+                                                                                     string dequeueTo = null,
+                                                                                     Uri dequeueStatusCallbackUrl = null,
+                                                                                     string callFrom = null,
+                                                                                     string callRecord = null,
+                                                                                     int? callTimeout = null,
+                                                                                     string callTo = null,
+                                                                                     Uri callUrl = null,
+                                                                                     Uri callStatusCallbackUrl = null,
+                                                                                     bool? callAccept = null,
+                                                                                     string redirectCallSid = null,
+                                                                                     bool? redirectAccept = null,
+                                                                                     Uri redirectUrl = null,
+                                                                                     string to = null,
+                                                                                     string from = null,
+                                                                                     Uri statusCallback = null,
+                                                                                     Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                     List<ReservationResource.CallStatusEnum> statusCallbackEvent = null,
+                                                                                     int? timeout = null,
+                                                                                     bool? record = null,
+                                                                                     bool? muted = null,
+                                                                                     string beep = null,
+                                                                                     bool? startConferenceOnEnter = null,
+                                                                                     bool? endConferenceOnExit = null,
+                                                                                     Uri waitUrl = null,
+                                                                                     Twilio.Http.HttpMethod waitMethod = null,
+                                                                                     bool? earlyMedia = null,
+                                                                                     int? maxParticipants = null,
+                                                                                     Uri conferenceStatusCallback = null,
+                                                                                     Twilio.Http.HttpMethod conferenceStatusCallbackMethod = null,
+                                                                                     List<ReservationResource.ConferenceEventEnum> conferenceStatusCallbackEvent = null,
+                                                                                     string conferenceRecord = null,
+                                                                                     string conferenceTrim = null,
+                                                                                     string recordingChannels = null,
+                                                                                     Uri recordingStatusCallback = null,
+                                                                                     Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                                                                                     Uri conferenceRecordingStatusCallback = null,
+                                                                                     Twilio.Http.HttpMethod conferenceRecordingStatusCallbackMethod = null,
+                                                                                     string region = null,
+                                                                                     string sipAuthUsername = null,
+                                                                                     string sipAuthPassword = null,
+                                                                                     List<string> dequeueStatusCallbackEvent = null,
+                                                                                     string postWorkActivitySid = null,
+                                                                                     bool? endConferenceOnCustomerExit = null,
+                                                                                     bool? beepOnCustomerEntrance = null,
+                                                                                     string ifMatch = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateReservationOptions(pathWorkspaceSid, pathWorkerSid, pathSid) { ReservationStatus = reservationStatus, WorkerActivitySid = workerActivitySid, Instruction = instruction, DequeuePostWorkActivitySid = dequeuePostWorkActivitySid, DequeueFrom = dequeueFrom, DequeueRecord = dequeueRecord, DequeueTimeout = dequeueTimeout, DequeueTo = dequeueTo, DequeueStatusCallbackUrl = dequeueStatusCallbackUrl, CallFrom = callFrom, CallRecord = callRecord, CallTimeout = callTimeout, CallTo = callTo, CallUrl = callUrl, CallStatusCallbackUrl = callStatusCallbackUrl, CallAccept = callAccept, RedirectCallSid = redirectCallSid, RedirectAccept = redirectAccept, RedirectUrl = redirectUrl, To = to, From = from, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, StatusCallbackEvent = statusCallbackEvent, Timeout = timeout, Record = record, Muted = muted, Beep = beep, StartConferenceOnEnter = startConferenceOnEnter, EndConferenceOnExit = endConferenceOnExit, WaitUrl = waitUrl, WaitMethod = waitMethod, EarlyMedia = earlyMedia, MaxParticipants = maxParticipants, ConferenceStatusCallback = conferenceStatusCallback, ConferenceStatusCallbackMethod = conferenceStatusCallbackMethod, ConferenceStatusCallbackEvent = conferenceStatusCallbackEvent, ConferenceRecord = conferenceRecord, ConferenceTrim = conferenceTrim, RecordingChannels = recordingChannels, RecordingStatusCallback = recordingStatusCallback, RecordingStatusCallbackMethod = recordingStatusCallbackMethod, ConferenceRecordingStatusCallback = conferenceRecordingStatusCallback, ConferenceRecordingStatusCallbackMethod = conferenceRecordingStatusCallbackMethod, Region = region, SipAuthUsername = sipAuthUsername, SipAuthPassword = sipAuthPassword, DequeueStatusCallbackEvent = dequeueStatusCallbackEvent, PostWorkActivitySid = postWorkActivitySid, EndConferenceOnCustomerExit = endConferenceOnCustomerExit, BeepOnCustomerEntrance = beepOnCustomerEntrance, IfMatch = ifMatch };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ReservationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ReservationResource object represented by the provided JSON </returns>
+    public static ReservationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ReservationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The current status of the reservation
+    /// </summary>
+    [JsonProperty("reservation_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ReservationResource.StatusEnum ReservationStatus { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the reserved Task resource
+    /// </summary>
+    [JsonProperty("task_sid")]
+    public string TaskSid { get; private set; }
+    /// <summary>
+    /// The friendly_name of the Worker that is reserved
+    /// </summary>
+    [JsonProperty("worker_name")]
+    public string WorkerName { get; private set; }
+    /// <summary>
+    /// The SID of the reserved Worker resource
+    /// </summary>
+    [JsonProperty("worker_sid")]
+    public string WorkerSid { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that this worker is contained within.
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the WorkerReservation resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ReservationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerChannelOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerChannelOptions.cs
index 306790325..26e4212c9 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerChannelOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerChannelOptions.cs
@@ -9,146 +9,146 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Worker
-{
-
+{
+
+  /// <summary>
+  /// ReadWorkerChannelOptions
+  /// </summary>
+  public class ReadWorkerChannelOptions : ReadOptions<WorkerChannelResource>
+  {
     /// <summary>
-    /// ReadWorkerChannelOptions
-    /// </summary>
-    public class ReadWorkerChannelOptions : ReadOptions<WorkerChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the WorkerChannels to read
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the Worker with the WorkerChannels to read
-        /// </summary>
-        public string PathWorkerSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadWorkerChannelOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannels to read </param>
-        /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannels to read </param>
-        public ReadWorkerChannelOptions(string pathWorkspaceSid, string pathWorkerSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathWorkerSid = pathWorkerSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Workspace with the WorkerChannels to read
+    /// </summary>
+    public string PathWorkspaceSid { get; }
     /// <summary>
-    /// FetchWorkerChannelOptions
-    /// </summary>
-    public class FetchWorkerChannelOptions : IOptions<WorkerChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the WorkerChannel to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the Worker with the WorkerChannel to fetch
-        /// </summary>
-        public string PathWorkerSid { get; }
-        /// <summary>
-        /// The SID of the to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchWorkerChannelOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to fetch </param>
-        /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to fetch </param>
-        /// <param name="pathSid"> The SID of the to fetch </param>
-        public FetchWorkerChannelOptions(string pathWorkspaceSid, string pathWorkerSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathWorkerSid = pathWorkerSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Worker with the WorkerChannels to read
+    /// </summary>
+    public string PathWorkerSid { get; }
+
     /// <summary>
-    /// UpdateWorkerChannelOptions
-    /// </summary>
-    public class UpdateWorkerChannelOptions : IOptions<WorkerChannelResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the WorkerChannel to update
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the Worker with the WorkerChannel to update
-        /// </summary>
-        public string PathWorkerSid { get; }
-        /// <summary>
-        /// The SID of the WorkerChannel to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The total number of Tasks that the Worker should handle for the TaskChannel type
-        /// </summary>
-        public int? Capacity { get; set; }
-        /// <summary>
-        /// Whether the WorkerChannel is available
-        /// </summary>
-        public bool? Available { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateWorkerChannelOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to update </param>
-        /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to update </param>
-        /// <param name="pathSid"> The SID of the WorkerChannel to update </param>
-        public UpdateWorkerChannelOptions(string pathWorkspaceSid, string pathWorkerSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathWorkerSid = pathWorkerSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Capacity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Capacity", Capacity.ToString()));
-            }
-
-            if (Available != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Available", Available.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new ReadWorkerChannelOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannels to read </param>
+    /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannels to read </param>
+    public ReadWorkerChannelOptions(string pathWorkspaceSid, string pathWorkerSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathWorkerSid = pathWorkerSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchWorkerChannelOptions
+  /// </summary>
+  public class FetchWorkerChannelOptions : IOptions<WorkerChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the WorkerChannel to fetch
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the Worker with the WorkerChannel to fetch
+    /// </summary>
+    public string PathWorkerSid { get; }
+    /// <summary>
+    /// The SID of the to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchWorkerChannelOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to fetch </param>
+    /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to fetch </param>
+    /// <param name="pathSid"> The SID of the to fetch </param>
+    public FetchWorkerChannelOptions(string pathWorkspaceSid, string pathWorkerSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathWorkerSid = pathWorkerSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateWorkerChannelOptions
+  /// </summary>
+  public class UpdateWorkerChannelOptions : IOptions<WorkerChannelResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the WorkerChannel to update
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the Worker with the WorkerChannel to update
+    /// </summary>
+    public string PathWorkerSid { get; }
+    /// <summary>
+    /// The SID of the WorkerChannel to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The total number of Tasks that the Worker should handle for the TaskChannel type
+    /// </summary>
+    public int? Capacity { get; set; }
+    /// <summary>
+    /// Whether the WorkerChannel is available
+    /// </summary>
+    public bool? Available { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateWorkerChannelOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to update </param>
+    /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to update </param>
+    /// <param name="pathSid"> The SID of the WorkerChannel to update </param>
+    public UpdateWorkerChannelOptions(string pathWorkspaceSid, string pathWorkerSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathWorkerSid = pathWorkerSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Capacity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Capacity", Capacity.ToString()));
+      }
+
+      if (Available != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Available", Available.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerChannelResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerChannelResource.cs
index f673d097b..089954498 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerChannelResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerChannelResource.cs
@@ -16,396 +16,396 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Worker
-{
-
-    public class WorkerChannelResource : Resource
-    {
-        private static Request BuildReadRequest(ReadWorkerChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Channels",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read WorkerChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkerChannel </returns>
-        public static ResourceSet<WorkerChannelResource> Read(ReadWorkerChannelOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<WorkerChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<WorkerChannelResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read WorkerChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkerChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WorkerChannelResource>> ReadAsync(ReadWorkerChannelOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<WorkerChannelResource>.FromJson("channels", response.Content);
-            return new ResourceSet<WorkerChannelResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannels to read </param>
-        /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannels to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkerChannel </returns>
-        public static ResourceSet<WorkerChannelResource> Read(string pathWorkspaceSid,
-                                                              string pathWorkerSid,
-                                                              int? pageSize = null,
-                                                              long? limit = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadWorkerChannelOptions(pathWorkspaceSid, pathWorkerSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannels to read </param>
-        /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannels to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkerChannel </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WorkerChannelResource>> ReadAsync(string pathWorkspaceSid,
-                                                                                                      string pathWorkerSid,
-                                                                                                      int? pageSize = null,
-                                                                                                      long? limit = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadWorkerChannelOptions(pathWorkspaceSid, pathWorkerSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<WorkerChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<WorkerChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<WorkerChannelResource> NextPage(Page<WorkerChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<WorkerChannelResource>.FromJson("channels", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<WorkerChannelResource> PreviousPage(Page<WorkerChannelResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<WorkerChannelResource>.FromJson("channels", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchWorkerChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Channels/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkerChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkerChannel </returns>
-        public static WorkerChannelResource Fetch(FetchWorkerChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkerChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkerChannel </returns>
-        public static async System.Threading.Tasks.Task<WorkerChannelResource> FetchAsync(FetchWorkerChannelOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to fetch </param>
-        /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to fetch </param>
-        /// <param name="pathSid"> The SID of the to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkerChannel </returns>
-        public static WorkerChannelResource Fetch(string pathWorkspaceSid,
-                                                  string pathWorkerSid,
-                                                  string pathSid,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkerChannelOptions(pathWorkspaceSid, pathWorkerSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to fetch </param>
-        /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to fetch </param>
-        /// <param name="pathSid"> The SID of the to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkerChannel </returns>
-        public static async System.Threading.Tasks.Task<WorkerChannelResource> FetchAsync(string pathWorkspaceSid,
-                                                                                          string pathWorkerSid,
-                                                                                          string pathSid,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkerChannelOptions(pathWorkspaceSid, pathWorkerSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateWorkerChannelOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Channels/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update WorkerChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkerChannel </returns>
-        public static WorkerChannelResource Update(UpdateWorkerChannelOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update WorkerChannel parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkerChannel </returns>
-        public static async System.Threading.Tasks.Task<WorkerChannelResource> UpdateAsync(UpdateWorkerChannelOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to update </param>
-        /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to update </param>
-        /// <param name="pathSid"> The SID of the WorkerChannel to update </param>
-        /// <param name="capacity"> The total number of Tasks that the Worker should handle for the TaskChannel type </param>
-        /// <param name="available"> Whether the WorkerChannel is available </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkerChannel </returns>
-        public static WorkerChannelResource Update(string pathWorkspaceSid,
-                                                   string pathWorkerSid,
-                                                   string pathSid,
-                                                   int? capacity = null,
-                                                   bool? available = null,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new UpdateWorkerChannelOptions(pathWorkspaceSid, pathWorkerSid, pathSid){Capacity = capacity, Available = available};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to update </param>
-        /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to update </param>
-        /// <param name="pathSid"> The SID of the WorkerChannel to update </param>
-        /// <param name="capacity"> The total number of Tasks that the Worker should handle for the TaskChannel type </param>
-        /// <param name="available"> Whether the WorkerChannel is available </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkerChannel </returns>
-        public static async System.Threading.Tasks.Task<WorkerChannelResource> UpdateAsync(string pathWorkspaceSid,
-                                                                                           string pathWorkerSid,
-                                                                                           string pathSid,
-                                                                                           int? capacity = null,
-                                                                                           bool? available = null,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new UpdateWorkerChannelOptions(pathWorkspaceSid, pathWorkerSid, pathSid){Capacity = capacity, Available = available};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkerChannelResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkerChannelResource object represented by the provided JSON </returns>
-        public static WorkerChannelResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkerChannelResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The total number of Tasks assigned to Worker for the TaskChannel type
-        /// </summary>
-        [JsonProperty("assigned_tasks")]
-        public int? AssignedTasks { get; private set; }
-        /// <summary>
-        /// Whether the Worker should receive Tasks of the TaskChannel type
-        /// </summary>
-        [JsonProperty("available")]
-        public bool? Available { get; private set; }
-        /// <summary>
-        /// The current available capacity between 0 to 100 for the TaskChannel
-        /// </summary>
-        [JsonProperty("available_capacity_percentage")]
-        public int? AvailableCapacityPercentage { get; private set; }
-        /// <summary>
-        /// The current configured capacity for the WorkerChannel
-        /// </summary>
-        [JsonProperty("configured_capacity")]
-        public int? ConfiguredCapacity { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the TaskChannel
-        /// </summary>
-        [JsonProperty("task_channel_sid")]
-        public string TaskChannelSid { get; private set; }
-        /// <summary>
-        /// The unique name of the TaskChannel, such as 'voice' or 'sms'
-        /// </summary>
-        [JsonProperty("task_channel_unique_name")]
-        public string TaskChannelUniqueName { get; private set; }
-        /// <summary>
-        /// The SID of the Worker that contains the WorkerChannel
-        /// </summary>
-        [JsonProperty("worker_sid")]
-        public string WorkerSid { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the WorkerChannel
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the WorkerChannel resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WorkerChannelResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkerChannelResource : Resource
+  {
+    private static Request BuildReadRequest(ReadWorkerChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Channels",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read WorkerChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkerChannel </returns>
+    public static ResourceSet<WorkerChannelResource> Read(ReadWorkerChannelOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<WorkerChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<WorkerChannelResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read WorkerChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkerChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WorkerChannelResource>> ReadAsync(ReadWorkerChannelOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<WorkerChannelResource>.FromJson("channels", response.Content);
+      return new ResourceSet<WorkerChannelResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannels to read </param>
+    /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannels to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkerChannel </returns>
+    public static ResourceSet<WorkerChannelResource> Read(string pathWorkspaceSid,
+                                                          string pathWorkerSid,
+                                                          int? pageSize = null,
+                                                          long? limit = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadWorkerChannelOptions(pathWorkspaceSid, pathWorkerSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannels to read </param>
+    /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannels to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkerChannel </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WorkerChannelResource>> ReadAsync(string pathWorkspaceSid,
+                                                                                                  string pathWorkerSid,
+                                                                                                  int? pageSize = null,
+                                                                                                  long? limit = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadWorkerChannelOptions(pathWorkspaceSid, pathWorkerSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<WorkerChannelResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<WorkerChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<WorkerChannelResource> NextPage(Page<WorkerChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<WorkerChannelResource>.FromJson("channels", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<WorkerChannelResource> PreviousPage(Page<WorkerChannelResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<WorkerChannelResource>.FromJson("channels", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchWorkerChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Channels/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkerChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkerChannel </returns>
+    public static WorkerChannelResource Fetch(FetchWorkerChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkerChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkerChannel </returns>
+    public static async System.Threading.Tasks.Task<WorkerChannelResource> FetchAsync(FetchWorkerChannelOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to fetch </param>
+    /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to fetch </param>
+    /// <param name="pathSid"> The SID of the to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkerChannel </returns>
+    public static WorkerChannelResource Fetch(string pathWorkspaceSid,
+                                              string pathWorkerSid,
+                                              string pathSid,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkerChannelOptions(pathWorkspaceSid, pathWorkerSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to fetch </param>
+    /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to fetch </param>
+    /// <param name="pathSid"> The SID of the to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkerChannel </returns>
+    public static async System.Threading.Tasks.Task<WorkerChannelResource> FetchAsync(string pathWorkspaceSid,
+                                                                                      string pathWorkerSid,
+                                                                                      string pathSid,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkerChannelOptions(pathWorkspaceSid, pathWorkerSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateWorkerChannelOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Channels/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update WorkerChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkerChannel </returns>
+    public static WorkerChannelResource Update(UpdateWorkerChannelOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update WorkerChannel parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkerChannel </returns>
+    public static async System.Threading.Tasks.Task<WorkerChannelResource> UpdateAsync(UpdateWorkerChannelOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to update </param>
+    /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to update </param>
+    /// <param name="pathSid"> The SID of the WorkerChannel to update </param>
+    /// <param name="capacity"> The total number of Tasks that the Worker should handle for the TaskChannel type </param>
+    /// <param name="available"> Whether the WorkerChannel is available </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkerChannel </returns>
+    public static WorkerChannelResource Update(string pathWorkspaceSid,
+                                               string pathWorkerSid,
+                                               string pathSid,
+                                               int? capacity = null,
+                                               bool? available = null,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new UpdateWorkerChannelOptions(pathWorkspaceSid, pathWorkerSid, pathSid) { Capacity = capacity, Available = available };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to update </param>
+    /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to update </param>
+    /// <param name="pathSid"> The SID of the WorkerChannel to update </param>
+    /// <param name="capacity"> The total number of Tasks that the Worker should handle for the TaskChannel type </param>
+    /// <param name="available"> Whether the WorkerChannel is available </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkerChannel </returns>
+    public static async System.Threading.Tasks.Task<WorkerChannelResource> UpdateAsync(string pathWorkspaceSid,
+                                                                                       string pathWorkerSid,
+                                                                                       string pathSid,
+                                                                                       int? capacity = null,
+                                                                                       bool? available = null,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new UpdateWorkerChannelOptions(pathWorkspaceSid, pathWorkerSid, pathSid) { Capacity = capacity, Available = available };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkerChannelResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkerChannelResource object represented by the provided JSON </returns>
+    public static WorkerChannelResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkerChannelResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The total number of Tasks assigned to Worker for the TaskChannel type
+    /// </summary>
+    [JsonProperty("assigned_tasks")]
+    public int? AssignedTasks { get; private set; }
+    /// <summary>
+    /// Whether the Worker should receive Tasks of the TaskChannel type
+    /// </summary>
+    [JsonProperty("available")]
+    public bool? Available { get; private set; }
+    /// <summary>
+    /// The current available capacity between 0 to 100 for the TaskChannel
+    /// </summary>
+    [JsonProperty("available_capacity_percentage")]
+    public int? AvailableCapacityPercentage { get; private set; }
+    /// <summary>
+    /// The current configured capacity for the WorkerChannel
+    /// </summary>
+    [JsonProperty("configured_capacity")]
+    public int? ConfiguredCapacity { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the TaskChannel
+    /// </summary>
+    [JsonProperty("task_channel_sid")]
+    public string TaskChannelSid { get; private set; }
+    /// <summary>
+    /// The unique name of the TaskChannel, such as 'voice' or 'sms'
+    /// </summary>
+    [JsonProperty("task_channel_unique_name")]
+    public string TaskChannelUniqueName { get; private set; }
+    /// <summary>
+    /// The SID of the Worker that contains the WorkerChannel
+    /// </summary>
+    [JsonProperty("worker_sid")]
+    public string WorkerSid { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the WorkerChannel
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the WorkerChannel resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WorkerChannelResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerStatisticsOptions.cs
index ab5f5c35d..ab8c3cb29 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerStatisticsOptions.cs
@@ -9,77 +9,77 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Worker
-{
-
+{
+
+  /// <summary>
+  /// FetchWorkerStatisticsOptions
+  /// </summary>
+  public class FetchWorkerStatisticsOptions : IOptions<WorkerStatisticsResource>
+  {
     /// <summary>
-    /// FetchWorkerStatisticsOptions
+    /// The SID of the Workspace with the WorkerChannel to fetch
     /// </summary>
-    public class FetchWorkerStatisticsOptions : IOptions<WorkerStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the WorkerChannel to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the Worker with the WorkerChannel to fetch
-        /// </summary>
-        public string PathWorkerSid { get; }
-        /// <summary>
-        /// Only calculate statistics since this many minutes in the past
-        /// </summary>
-        public int? Minutes { get; set; }
-        /// <summary>
-        /// Only calculate statistics from on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Only calculate statistics on this TaskChannel
-        /// </summary>
-        public string TaskChannel { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchWorkerStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to fetch </param>
-        /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to fetch </param>
-        public FetchWorkerStatisticsOptions(string pathWorkspaceSid, string pathWorkerSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathWorkerSid = pathWorkerSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Minutes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the Worker with the WorkerChannel to fetch
+    /// </summary>
+    public string PathWorkerSid { get; }
+    /// <summary>
+    /// Only calculate statistics since this many minutes in the past
+    /// </summary>
+    public int? Minutes { get; set; }
+    /// <summary>
+    /// Only calculate statistics from on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Only calculate statistics on this TaskChannel
+    /// </summary>
+    public string TaskChannel { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchWorkerStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to fetch </param>
+    /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to fetch </param>
+    public FetchWorkerStatisticsOptions(string pathWorkspaceSid, string pathWorkerSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathWorkerSid = pathWorkerSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Minutes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerStatisticsResource.cs
index f95d84c2b..444265ef5 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkerStatisticsResource.cs
@@ -16,146 +16,146 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Worker
-{
-
-    public class WorkerStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchWorkerStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Statistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkerStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkerStatistics </returns>
-        public static WorkerStatisticsResource Fetch(FetchWorkerStatisticsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkerStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkerStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkerStatisticsResource> FetchAsync(FetchWorkerStatisticsOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to fetch </param>
-        /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to fetch </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="taskChannel"> Only calculate statistics on this TaskChannel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkerStatistics </returns>
-        public static WorkerStatisticsResource Fetch(string pathWorkspaceSid,
-                                                     string pathWorkerSid,
-                                                     int? minutes = null,
-                                                     DateTime? startDate = null,
-                                                     DateTime? endDate = null,
-                                                     string taskChannel = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkerStatisticsOptions(pathWorkspaceSid, pathWorkerSid){Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskChannel = taskChannel};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to fetch </param>
-        /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to fetch </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="taskChannel"> Only calculate statistics on this TaskChannel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkerStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkerStatisticsResource> FetchAsync(string pathWorkspaceSid,
-                                                                                             string pathWorkerSid,
-                                                                                             int? minutes = null,
-                                                                                             DateTime? startDate = null,
-                                                                                             DateTime? endDate = null,
-                                                                                             string taskChannel = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkerStatisticsOptions(pathWorkspaceSid, pathWorkerSid){Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskChannel = taskChannel};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkerStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkerStatisticsResource object represented by the provided JSON </returns>
-        public static WorkerStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkerStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// An object that contains the cumulative statistics for the Worker
-        /// </summary>
-        [JsonProperty("cumulative")]
-        public object Cumulative { get; private set; }
-        /// <summary>
-        /// The SID of the Worker that contains the WorkerChannel
-        /// </summary>
-        [JsonProperty("worker_sid")]
-        public string WorkerSid { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the WorkerChannel
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the WorkerChannel statistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WorkerStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkerStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchWorkerStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathWorkerSid + "/Statistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkerStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkerStatistics </returns>
+    public static WorkerStatisticsResource Fetch(FetchWorkerStatisticsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkerStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkerStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkerStatisticsResource> FetchAsync(FetchWorkerStatisticsOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to fetch </param>
+    /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to fetch </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="taskChannel"> Only calculate statistics on this TaskChannel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkerStatistics </returns>
+    public static WorkerStatisticsResource Fetch(string pathWorkspaceSid,
+                                                 string pathWorkerSid,
+                                                 int? minutes = null,
+                                                 DateTime? startDate = null,
+                                                 DateTime? endDate = null,
+                                                 string taskChannel = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkerStatisticsOptions(pathWorkspaceSid, pathWorkerSid) { Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskChannel = taskChannel };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the WorkerChannel to fetch </param>
+    /// <param name="pathWorkerSid"> The SID of the Worker with the WorkerChannel to fetch </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="taskChannel"> Only calculate statistics on this TaskChannel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkerStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkerStatisticsResource> FetchAsync(string pathWorkspaceSid,
+                                                                                         string pathWorkerSid,
+                                                                                         int? minutes = null,
+                                                                                         DateTime? startDate = null,
+                                                                                         DateTime? endDate = null,
+                                                                                         string taskChannel = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkerStatisticsOptions(pathWorkspaceSid, pathWorkerSid) { Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskChannel = taskChannel };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkerStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkerStatisticsResource object represented by the provided JSON </returns>
+    public static WorkerStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkerStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// An object that contains the cumulative statistics for the Worker
+    /// </summary>
+    [JsonProperty("cumulative")]
+    public object Cumulative { get; private set; }
+    /// <summary>
+    /// The SID of the Worker that contains the WorkerChannel
+    /// </summary>
+    [JsonProperty("worker_sid")]
+    public string WorkerSid { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the WorkerChannel
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the WorkerChannel statistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WorkerStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersCumulativeStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersCumulativeStatisticsOptions.cs
index 393dbad2b..c977649ff 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersCumulativeStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersCumulativeStatisticsOptions.cs
@@ -9,71 +9,71 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Worker
-{
-
+{
+
+  /// <summary>
+  /// FetchWorkersCumulativeStatisticsOptions
+  /// </summary>
+  public class FetchWorkersCumulativeStatisticsOptions : IOptions<WorkersCumulativeStatisticsResource>
+  {
     /// <summary>
-    /// FetchWorkersCumulativeStatisticsOptions
+    /// The SID of the Workspace with the resource to fetch
     /// </summary>
-    public class FetchWorkersCumulativeStatisticsOptions : IOptions<WorkersCumulativeStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the resource to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// Only calculate statistics from on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Only calculate statistics since this many minutes in the past
-        /// </summary>
-        public int? Minutes { get; set; }
-        /// <summary>
-        /// Only calculate statistics from on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only calculate cumulative statistics on this TaskChannel
-        /// </summary>
-        public string TaskChannel { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchWorkersCumulativeStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
-        public FetchWorkersCumulativeStatisticsOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (Minutes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// Only calculate statistics from on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Only calculate statistics since this many minutes in the past
+    /// </summary>
+    public int? Minutes { get; set; }
+    /// <summary>
+    /// Only calculate statistics from on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only calculate cumulative statistics on this TaskChannel
+    /// </summary>
+    public string TaskChannel { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchWorkersCumulativeStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
+    public FetchWorkersCumulativeStatisticsOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (Minutes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersCumulativeStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersCumulativeStatisticsResource.cs
index ece29b00a..7106493aa 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersCumulativeStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersCumulativeStatisticsResource.cs
@@ -16,178 +16,178 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Worker
-{
-
-    public class WorkersCumulativeStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchWorkersCumulativeStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/CumulativeStatistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkersCumulativeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkersCumulativeStatistics </returns>
-        public static WorkersCumulativeStatisticsResource Fetch(FetchWorkersCumulativeStatisticsOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkersCumulativeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkersCumulativeStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkersCumulativeStatisticsResource> FetchAsync(FetchWorkersCumulativeStatisticsOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
-        /// <param name="endDate"> Only calculate statistics from on or before this date </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkersCumulativeStatistics </returns>
-        public static WorkersCumulativeStatisticsResource Fetch(string pathWorkspaceSid,
-                                                                DateTime? endDate = null,
-                                                                int? minutes = null,
-                                                                DateTime? startDate = null,
-                                                                string taskChannel = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkersCumulativeStatisticsOptions(pathWorkspaceSid){EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
-        /// <param name="endDate"> Only calculate statistics from on or before this date </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkersCumulativeStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkersCumulativeStatisticsResource> FetchAsync(string pathWorkspaceSid,
-                                                                                                        DateTime? endDate = null,
-                                                                                                        int? minutes = null,
-                                                                                                        DateTime? startDate = null,
-                                                                                                        string taskChannel = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkersCumulativeStatisticsOptions(pathWorkspaceSid){EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkersCumulativeStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkersCumulativeStatisticsResource object represented by the provided JSON </returns>
-        public static WorkersCumulativeStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkersCumulativeStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The beginning of the interval during which these statistics were calculated
-        /// </summary>
-        [JsonProperty("start_time")]
-        public DateTime? StartTime { get; private set; }
-        /// <summary>
-        /// The end of the interval during which these statistics were calculated
-        /// </summary>
-        [JsonProperty("end_time")]
-        public DateTime? EndTime { get; private set; }
-        /// <summary>
-        /// The minimum, average, maximum, and total time that Workers spent in each Activity
-        /// </summary>
-        [JsonProperty("activity_durations")]
-        public List<object> ActivityDurations { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were created
-        /// </summary>
-        [JsonProperty("reservations_created")]
-        public int? ReservationsCreated { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were accepted
-        /// </summary>
-        [JsonProperty("reservations_accepted")]
-        public int? ReservationsAccepted { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were rejected
-        /// </summary>
-        [JsonProperty("reservations_rejected")]
-        public int? ReservationsRejected { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were timed out
-        /// </summary>
-        [JsonProperty("reservations_timed_out")]
-        public int? ReservationsTimedOut { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were canceled
-        /// </summary>
-        [JsonProperty("reservations_canceled")]
-        public int? ReservationsCanceled { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were rescinded
-        /// </summary>
-        [JsonProperty("reservations_rescinded")]
-        public int? ReservationsRescinded { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the Workers
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Workers statistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WorkersCumulativeStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkersCumulativeStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchWorkersCumulativeStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/CumulativeStatistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkersCumulativeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkersCumulativeStatistics </returns>
+    public static WorkersCumulativeStatisticsResource Fetch(FetchWorkersCumulativeStatisticsOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkersCumulativeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkersCumulativeStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkersCumulativeStatisticsResource> FetchAsync(FetchWorkersCumulativeStatisticsOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
+    /// <param name="endDate"> Only calculate statistics from on or before this date </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkersCumulativeStatistics </returns>
+    public static WorkersCumulativeStatisticsResource Fetch(string pathWorkspaceSid,
+                                                            DateTime? endDate = null,
+                                                            int? minutes = null,
+                                                            DateTime? startDate = null,
+                                                            string taskChannel = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkersCumulativeStatisticsOptions(pathWorkspaceSid) { EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
+    /// <param name="endDate"> Only calculate statistics from on or before this date </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkersCumulativeStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkersCumulativeStatisticsResource> FetchAsync(string pathWorkspaceSid,
+                                                                                                    DateTime? endDate = null,
+                                                                                                    int? minutes = null,
+                                                                                                    DateTime? startDate = null,
+                                                                                                    string taskChannel = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkersCumulativeStatisticsOptions(pathWorkspaceSid) { EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkersCumulativeStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkersCumulativeStatisticsResource object represented by the provided JSON </returns>
+    public static WorkersCumulativeStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkersCumulativeStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The beginning of the interval during which these statistics were calculated
+    /// </summary>
+    [JsonProperty("start_time")]
+    public DateTime? StartTime { get; private set; }
+    /// <summary>
+    /// The end of the interval during which these statistics were calculated
+    /// </summary>
+    [JsonProperty("end_time")]
+    public DateTime? EndTime { get; private set; }
+    /// <summary>
+    /// The minimum, average, maximum, and total time that Workers spent in each Activity
+    /// </summary>
+    [JsonProperty("activity_durations")]
+    public List<object> ActivityDurations { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were created
+    /// </summary>
+    [JsonProperty("reservations_created")]
+    public int? ReservationsCreated { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were accepted
+    /// </summary>
+    [JsonProperty("reservations_accepted")]
+    public int? ReservationsAccepted { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were rejected
+    /// </summary>
+    [JsonProperty("reservations_rejected")]
+    public int? ReservationsRejected { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were timed out
+    /// </summary>
+    [JsonProperty("reservations_timed_out")]
+    public int? ReservationsTimedOut { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were canceled
+    /// </summary>
+    [JsonProperty("reservations_canceled")]
+    public int? ReservationsCanceled { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were rescinded
+    /// </summary>
+    [JsonProperty("reservations_rescinded")]
+    public int? ReservationsRescinded { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the Workers
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Workers statistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WorkersCumulativeStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersRealTimeStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersRealTimeStatisticsOptions.cs
index e57788860..45eea726f 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersRealTimeStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersRealTimeStatisticsOptions.cs
@@ -9,44 +9,44 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Worker
-{
-
+{
+
+  /// <summary>
+  /// FetchWorkersRealTimeStatisticsOptions
+  /// </summary>
+  public class FetchWorkersRealTimeStatisticsOptions : IOptions<WorkersRealTimeStatisticsResource>
+  {
     /// <summary>
-    /// FetchWorkersRealTimeStatisticsOptions
+    /// The SID of the Workspace with the resource to fetch
     /// </summary>
-    public class FetchWorkersRealTimeStatisticsOptions : IOptions<WorkersRealTimeStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the resource to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// Only calculate real-time statistics on this TaskChannel
-        /// </summary>
-        public string TaskChannel { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchWorkersRealTimeStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
-        public FetchWorkersRealTimeStatisticsOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// Only calculate real-time statistics on this TaskChannel
+    /// </summary>
+    public string TaskChannel { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchWorkersRealTimeStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
+    public FetchWorkersRealTimeStatisticsOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersRealTimeStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersRealTimeStatisticsResource.cs
index 860cd6bb9..898628253 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersRealTimeStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersRealTimeStatisticsResource.cs
@@ -16,131 +16,131 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Worker
-{
-
-    public class WorkersRealTimeStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchWorkersRealTimeStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/RealTimeStatistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkersRealTimeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkersRealTimeStatistics </returns>
-        public static WorkersRealTimeStatisticsResource Fetch(FetchWorkersRealTimeStatisticsOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkersRealTimeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkersRealTimeStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkersRealTimeStatisticsResource> FetchAsync(FetchWorkersRealTimeStatisticsOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
-        /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkersRealTimeStatistics </returns>
-        public static WorkersRealTimeStatisticsResource Fetch(string pathWorkspaceSid,
-                                                              string taskChannel = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkersRealTimeStatisticsOptions(pathWorkspaceSid){TaskChannel = taskChannel};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
-        /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkersRealTimeStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkersRealTimeStatisticsResource> FetchAsync(string pathWorkspaceSid,
-                                                                                                      string taskChannel = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkersRealTimeStatisticsOptions(pathWorkspaceSid){TaskChannel = taskChannel};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkersRealTimeStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkersRealTimeStatisticsResource object represented by the provided JSON </returns>
-        public static WorkersRealTimeStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkersRealTimeStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The number of current Workers by Activity
-        /// </summary>
-        [JsonProperty("activity_statistics")]
-        public List<object> ActivityStatistics { get; private set; }
-        /// <summary>
-        /// The total number of Workers
-        /// </summary>
-        [JsonProperty("total_workers")]
-        public int? TotalWorkers { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the Workers
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Workers statistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WorkersRealTimeStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkersRealTimeStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchWorkersRealTimeStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/RealTimeStatistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkersRealTimeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkersRealTimeStatistics </returns>
+    public static WorkersRealTimeStatisticsResource Fetch(FetchWorkersRealTimeStatisticsOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkersRealTimeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkersRealTimeStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkersRealTimeStatisticsResource> FetchAsync(FetchWorkersRealTimeStatisticsOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
+    /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkersRealTimeStatistics </returns>
+    public static WorkersRealTimeStatisticsResource Fetch(string pathWorkspaceSid,
+                                                          string taskChannel = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkersRealTimeStatisticsOptions(pathWorkspaceSid) { TaskChannel = taskChannel };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
+    /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkersRealTimeStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkersRealTimeStatisticsResource> FetchAsync(string pathWorkspaceSid,
+                                                                                                  string taskChannel = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkersRealTimeStatisticsOptions(pathWorkspaceSid) { TaskChannel = taskChannel };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkersRealTimeStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkersRealTimeStatisticsResource object represented by the provided JSON </returns>
+    public static WorkersRealTimeStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkersRealTimeStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The number of current Workers by Activity
+    /// </summary>
+    [JsonProperty("activity_statistics")]
+    public List<object> ActivityStatistics { get; private set; }
+    /// <summary>
+    /// The total number of Workers
+    /// </summary>
+    [JsonProperty("total_workers")]
+    public int? TotalWorkers { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the Workers
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Workers statistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WorkersRealTimeStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersStatisticsOptions.cs
index e899d3570..fc7739ad1 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersStatisticsOptions.cs
@@ -9,98 +9,98 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Worker
-{
-
+{
+
+  /// <summary>
+  /// FetchWorkersStatisticsOptions
+  /// </summary>
+  public class FetchWorkersStatisticsOptions : IOptions<WorkersStatisticsResource>
+  {
     /// <summary>
-    /// FetchWorkersStatisticsOptions
+    /// The SID of the Workspace with the Worker to fetch
     /// </summary>
-    public class FetchWorkersStatisticsOptions : IOptions<WorkersStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Worker to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// Only calculate statistics since this many minutes in the past
-        /// </summary>
-        public int? Minutes { get; set; }
-        /// <summary>
-        /// Only calculate statistics from on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only calculate statistics from this date and time and earlier
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// The SID of the TaskQueue for which to fetch Worker statistics
-        /// </summary>
-        public string TaskQueueSid { get; set; }
-        /// <summary>
-        /// The friendly_name of the TaskQueue for which to fetch Worker statistics
-        /// </summary>
-        public string TaskQueueName { get; set; }
-        /// <summary>
-        /// Only include Workers with `friendly_name` values that match this parameter
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Only calculate statistics on this TaskChannel
-        /// </summary>
-        public string TaskChannel { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchWorkersStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to fetch </param>
-        public FetchWorkersStatisticsOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Minutes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (TaskQueueSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskQueueSid", TaskQueueSid.ToString()));
-            }
-
-            if (TaskQueueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskQueueName", TaskQueueName));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// Only calculate statistics since this many minutes in the past
+    /// </summary>
+    public int? Minutes { get; set; }
+    /// <summary>
+    /// Only calculate statistics from on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only calculate statistics from this date and time and earlier
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// The SID of the TaskQueue for which to fetch Worker statistics
+    /// </summary>
+    public string TaskQueueSid { get; set; }
+    /// <summary>
+    /// The friendly_name of the TaskQueue for which to fetch Worker statistics
+    /// </summary>
+    public string TaskQueueName { get; set; }
+    /// <summary>
+    /// Only include Workers with `friendly_name` values that match this parameter
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Only calculate statistics on this TaskChannel
+    /// </summary>
+    public string TaskChannel { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchWorkersStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to fetch </param>
+    public FetchWorkersStatisticsOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Minutes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (TaskQueueSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskQueueSid", TaskQueueSid.ToString()));
+      }
+
+      if (TaskQueueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskQueueName", TaskQueueName));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersStatisticsResource.cs
index 1aab8fdb9..ccb67ea82 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Worker/WorkersStatisticsResource.cs
@@ -16,154 +16,154 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Worker
-{
-
-    public class WorkersStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchWorkersStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/Statistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkersStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkersStatistics </returns>
-        public static WorkersStatisticsResource Fetch(FetchWorkersStatisticsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkersStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkersStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkersStatisticsResource> FetchAsync(FetchWorkersStatisticsOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to fetch </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="endDate"> Only calculate statistics from this date and time and earlier </param>
-        /// <param name="taskQueueSid"> The SID of the TaskQueue for which to fetch Worker statistics </param>
-        /// <param name="taskQueueName"> The friendly_name of the TaskQueue for which to fetch Worker statistics </param>
-        /// <param name="friendlyName"> Only include Workers with `friendly_name` values that match this parameter </param>
-        /// <param name="taskChannel"> Only calculate statistics on this TaskChannel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkersStatistics </returns>
-        public static WorkersStatisticsResource Fetch(string pathWorkspaceSid,
-                                                      int? minutes = null,
-                                                      DateTime? startDate = null,
-                                                      DateTime? endDate = null,
-                                                      string taskQueueSid = null,
-                                                      string taskQueueName = null,
-                                                      string friendlyName = null,
-                                                      string taskChannel = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkersStatisticsOptions(pathWorkspaceSid){Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskQueueSid = taskQueueSid, TaskQueueName = taskQueueName, FriendlyName = friendlyName, TaskChannel = taskChannel};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to fetch </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="endDate"> Only calculate statistics from this date and time and earlier </param>
-        /// <param name="taskQueueSid"> The SID of the TaskQueue for which to fetch Worker statistics </param>
-        /// <param name="taskQueueName"> The friendly_name of the TaskQueue for which to fetch Worker statistics </param>
-        /// <param name="friendlyName"> Only include Workers with `friendly_name` values that match this parameter </param>
-        /// <param name="taskChannel"> Only calculate statistics on this TaskChannel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkersStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkersStatisticsResource> FetchAsync(string pathWorkspaceSid,
-                                                                                              int? minutes = null,
-                                                                                              DateTime? startDate = null,
-                                                                                              DateTime? endDate = null,
-                                                                                              string taskQueueSid = null,
-                                                                                              string taskQueueName = null,
-                                                                                              string friendlyName = null,
-                                                                                              string taskChannel = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkersStatisticsOptions(pathWorkspaceSid){Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskQueueSid = taskQueueSid, TaskQueueName = taskQueueName, FriendlyName = friendlyName, TaskChannel = taskChannel};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkersStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkersStatisticsResource object represented by the provided JSON </returns>
-        public static WorkersStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkersStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// An object that contains the real-time statistics for the Worker
-        /// </summary>
-        [JsonProperty("realtime")]
-        public object Realtime { get; private set; }
-        /// <summary>
-        /// An object that contains the cumulative statistics for the Worker
-        /// </summary>
-        [JsonProperty("cumulative")]
-        public object Cumulative { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the Worker
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Worker statistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WorkersStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkersStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchWorkersStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/Statistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkersStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkersStatistics </returns>
+    public static WorkersStatisticsResource Fetch(FetchWorkersStatisticsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkersStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkersStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkersStatisticsResource> FetchAsync(FetchWorkersStatisticsOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to fetch </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="endDate"> Only calculate statistics from this date and time and earlier </param>
+    /// <param name="taskQueueSid"> The SID of the TaskQueue for which to fetch Worker statistics </param>
+    /// <param name="taskQueueName"> The friendly_name of the TaskQueue for which to fetch Worker statistics </param>
+    /// <param name="friendlyName"> Only include Workers with `friendly_name` values that match this parameter </param>
+    /// <param name="taskChannel"> Only calculate statistics on this TaskChannel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkersStatistics </returns>
+    public static WorkersStatisticsResource Fetch(string pathWorkspaceSid,
+                                                  int? minutes = null,
+                                                  DateTime? startDate = null,
+                                                  DateTime? endDate = null,
+                                                  string taskQueueSid = null,
+                                                  string taskQueueName = null,
+                                                  string friendlyName = null,
+                                                  string taskChannel = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkersStatisticsOptions(pathWorkspaceSid) { Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskQueueSid = taskQueueSid, TaskQueueName = taskQueueName, FriendlyName = friendlyName, TaskChannel = taskChannel };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to fetch </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="endDate"> Only calculate statistics from this date and time and earlier </param>
+    /// <param name="taskQueueSid"> The SID of the TaskQueue for which to fetch Worker statistics </param>
+    /// <param name="taskQueueName"> The friendly_name of the TaskQueue for which to fetch Worker statistics </param>
+    /// <param name="friendlyName"> Only include Workers with `friendly_name` values that match this parameter </param>
+    /// <param name="taskChannel"> Only calculate statistics on this TaskChannel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkersStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkersStatisticsResource> FetchAsync(string pathWorkspaceSid,
+                                                                                          int? minutes = null,
+                                                                                          DateTime? startDate = null,
+                                                                                          DateTime? endDate = null,
+                                                                                          string taskQueueSid = null,
+                                                                                          string taskQueueName = null,
+                                                                                          string friendlyName = null,
+                                                                                          string taskChannel = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkersStatisticsOptions(pathWorkspaceSid) { Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskQueueSid = taskQueueSid, TaskQueueName = taskQueueName, FriendlyName = friendlyName, TaskChannel = taskChannel };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkersStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkersStatisticsResource object represented by the provided JSON </returns>
+    public static WorkersStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkersStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// An object that contains the real-time statistics for the Worker
+    /// </summary>
+    [JsonProperty("realtime")]
+    public object Realtime { get; private set; }
+    /// <summary>
+    /// An object that contains the cumulative statistics for the Worker
+    /// </summary>
+    [JsonProperty("cumulative")]
+    public object Cumulative { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the Worker
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Worker statistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WorkersStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkerOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkerOptions.cs
index dc61f1491..dfd111ee1 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkerOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkerOptions.cs
@@ -9,338 +9,338 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
+{
+
+  /// <summary>
+  /// ReadWorkerOptions
+  /// </summary>
+  public class ReadWorkerOptions : ReadOptions<WorkerResource>
+  {
     /// <summary>
-    /// ReadWorkerOptions
-    /// </summary>
-    public class ReadWorkerOptions : ReadOptions<WorkerResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Workers to read
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The activity_name of the Worker resources to read
-        /// </summary>
-        public string ActivityName { get; set; }
-        /// <summary>
-        /// The activity_sid of the Worker resources to read
-        /// </summary>
-        public string ActivitySid { get; set; }
-        /// <summary>
-        /// Whether to return Worker resources that are available or unavailable
-        /// </summary>
-        public string Available { get; set; }
-        /// <summary>
-        /// The friendly_name of the Worker resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Filter by Workers that would match an expression on a TaskQueue
-        /// </summary>
-        public string TargetWorkersExpression { get; set; }
-        /// <summary>
-        /// The friendly_name of the TaskQueue that the Workers to read are eligible for
-        /// </summary>
-        public string TaskQueueName { get; set; }
-        /// <summary>
-        /// The SID of the TaskQueue that the Workers to read are eligible for
-        /// </summary>
-        public string TaskQueueSid { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadWorkerOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workers to read </param>
-        public ReadWorkerOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ActivityName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ActivityName", ActivityName));
-            }
-
-            if (ActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ActivitySid", ActivitySid.ToString()));
-            }
-
-            if (Available != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Available", Available));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (TargetWorkersExpression != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TargetWorkersExpression", TargetWorkersExpression));
-            }
-
-            if (TaskQueueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskQueueName", TaskQueueName));
-            }
-
-            if (TaskQueueSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskQueueSid", TaskQueueSid.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Workspace with the Workers to read
+    /// </summary>
+    public string PathWorkspaceSid { get; }
     /// <summary>
-    /// CreateWorkerOptions
-    /// </summary>
-    public class CreateWorkerOptions : IOptions<WorkerResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace that the new Worker belongs to
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The SID of a valid Activity that describes the new Worker's initial state
-        /// </summary>
-        public string ActivitySid { get; set; }
-        /// <summary>
-        /// A valid JSON string that describes the new Worker
-        /// </summary>
-        public string Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateWorkerOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Worker belongs to </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        public CreateWorkerOptions(string pathWorkspaceSid, string friendlyName)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (ActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ActivitySid", ActivitySid.ToString()));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            return p;
-        }
-    }
-
+    /// The activity_name of the Worker resources to read
+    /// </summary>
+    public string ActivityName { get; set; }
     /// <summary>
-    /// FetchWorkerOptions
-    /// </summary>
-    public class FetchWorkerOptions : IOptions<WorkerResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Worker to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchWorkerOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        public FetchWorkerOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The activity_sid of the Worker resources to read
+    /// </summary>
+    public string ActivitySid { get; set; }
     /// <summary>
-    /// UpdateWorkerOptions
-    /// </summary>
-    public class UpdateWorkerOptions : IOptions<WorkerResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Worker to update
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The SID of the Activity that describes the Worker's initial state
-        /// </summary>
-        public string ActivitySid { get; set; }
-        /// <summary>
-        /// The JSON string that describes the Worker
-        /// </summary>
-        public string Attributes { get; set; }
-        /// <summary>
-        /// A string to describe the Worker
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Whether to reject the Worker's pending reservations
-        /// </summary>
-        public bool? RejectPendingReservations { get; set; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateWorkerOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to update </param>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        public UpdateWorkerOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ActivitySid", ActivitySid.ToString()));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (RejectPendingReservations != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RejectPendingReservations", RejectPendingReservations.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
-
+    /// Whether to return Worker resources that are available or unavailable
+    /// </summary>
+    public string Available { get; set; }
     /// <summary>
-    /// DeleteWorkerOptions
-    /// </summary>
-    public class DeleteWorkerOptions : IOptions<WorkerResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Worker to delete
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The If-Match HTTP request header
-        /// </summary>
-        public string IfMatch { get; set; }
-
-        /// <summary>
-        /// Construct a new DeleteWorkerOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to delete </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        public DeleteWorkerOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-
-        /// <summary>
-        /// Generate the necessary header parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetHeaderParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IfMatch != null)
-            {
-                p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
-            }
-
-            return p;
-        }
-    }
+    /// The friendly_name of the Worker resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Filter by Workers that would match an expression on a TaskQueue
+    /// </summary>
+    public string TargetWorkersExpression { get; set; }
+    /// <summary>
+    /// The friendly_name of the TaskQueue that the Workers to read are eligible for
+    /// </summary>
+    public string TaskQueueName { get; set; }
+    /// <summary>
+    /// The SID of the TaskQueue that the Workers to read are eligible for
+    /// </summary>
+    public string TaskQueueSid { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadWorkerOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workers to read </param>
+    public ReadWorkerOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ActivityName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ActivityName", ActivityName));
+      }
+
+      if (ActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ActivitySid", ActivitySid.ToString()));
+      }
+
+      if (Available != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Available", Available));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (TargetWorkersExpression != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TargetWorkersExpression", TargetWorkersExpression));
+      }
+
+      if (TaskQueueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskQueueName", TaskQueueName));
+      }
+
+      if (TaskQueueSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskQueueSid", TaskQueueSid.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateWorkerOptions
+  /// </summary>
+  public class CreateWorkerOptions : IOptions<WorkerResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace that the new Worker belongs to
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The SID of a valid Activity that describes the new Worker's initial state
+    /// </summary>
+    public string ActivitySid { get; set; }
+    /// <summary>
+    /// A valid JSON string that describes the new Worker
+    /// </summary>
+    public string Attributes { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateWorkerOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Worker belongs to </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    public CreateWorkerOptions(string pathWorkspaceSid, string friendlyName)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (ActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ActivitySid", ActivitySid.ToString()));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchWorkerOptions
+  /// </summary>
+  public class FetchWorkerOptions : IOptions<WorkerResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the Worker to fetch
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchWorkerOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    public FetchWorkerOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateWorkerOptions
+  /// </summary>
+  public class UpdateWorkerOptions : IOptions<WorkerResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the Worker to update
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The SID of the Activity that describes the Worker's initial state
+    /// </summary>
+    public string ActivitySid { get; set; }
+    /// <summary>
+    /// The JSON string that describes the Worker
+    /// </summary>
+    public string Attributes { get; set; }
+    /// <summary>
+    /// A string to describe the Worker
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Whether to reject the Worker's pending reservations
+    /// </summary>
+    public bool? RejectPendingReservations { get; set; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateWorkerOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to update </param>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    public UpdateWorkerOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ActivitySid", ActivitySid.ToString()));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Attributes));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (RejectPendingReservations != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RejectPendingReservations", RejectPendingReservations.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteWorkerOptions
+  /// </summary>
+  public class DeleteWorkerOptions : IOptions<WorkerResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the Worker to delete
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The If-Match HTTP request header
+    /// </summary>
+    public string IfMatch { get; set; }
+
+    /// <summary>
+    /// Construct a new DeleteWorkerOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to delete </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    public DeleteWorkerOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+
+    /// <summary>
+    /// Generate the necessary header parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetHeaderParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IfMatch != null)
+      {
+        p.Add(new KeyValuePair<string, string>("If-Match", IfMatch));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkerResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkerResource.cs
index f347b6a0c..852866acb 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkerResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkerResource.cs
@@ -16,577 +16,577 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
-    public class WorkerResource : Resource
-    {
-        private static Request BuildReadRequest(ReadWorkerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Worker parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Worker </returns>
-        public static ResourceSet<WorkerResource> Read(ReadWorkerOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<WorkerResource>.FromJson("workers", response.Content);
-            return new ResourceSet<WorkerResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Worker parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Worker </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WorkerResource>> ReadAsync(ReadWorkerOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<WorkerResource>.FromJson("workers", response.Content);
-            return new ResourceSet<WorkerResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workers to read </param>
-        /// <param name="activityName"> The activity_name of the Worker resources to read </param>
-        /// <param name="activitySid"> The activity_sid of the Worker resources to read </param>
-        /// <param name="available"> Whether to return Worker resources that are available or unavailable </param>
-        /// <param name="friendlyName"> The friendly_name of the Worker resources to read </param>
-        /// <param name="targetWorkersExpression"> Filter by Workers that would match an expression on a TaskQueue </param>
-        /// <param name="taskQueueName"> The friendly_name of the TaskQueue that the Workers to read are eligible for </param>
-        /// <param name="taskQueueSid"> The SID of the TaskQueue that the Workers to read are eligible for </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Worker </returns>
-        public static ResourceSet<WorkerResource> Read(string pathWorkspaceSid,
-                                                       string activityName = null,
-                                                       string activitySid = null,
-                                                       string available = null,
-                                                       string friendlyName = null,
-                                                       string targetWorkersExpression = null,
-                                                       string taskQueueName = null,
-                                                       string taskQueueSid = null,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadWorkerOptions(pathWorkspaceSid){ActivityName = activityName, ActivitySid = activitySid, Available = available, FriendlyName = friendlyName, TargetWorkersExpression = targetWorkersExpression, TaskQueueName = taskQueueName, TaskQueueSid = taskQueueSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workers to read </param>
-        /// <param name="activityName"> The activity_name of the Worker resources to read </param>
-        /// <param name="activitySid"> The activity_sid of the Worker resources to read </param>
-        /// <param name="available"> Whether to return Worker resources that are available or unavailable </param>
-        /// <param name="friendlyName"> The friendly_name of the Worker resources to read </param>
-        /// <param name="targetWorkersExpression"> Filter by Workers that would match an expression on a TaskQueue </param>
-        /// <param name="taskQueueName"> The friendly_name of the TaskQueue that the Workers to read are eligible for </param>
-        /// <param name="taskQueueSid"> The SID of the TaskQueue that the Workers to read are eligible for </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Worker </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WorkerResource>> ReadAsync(string pathWorkspaceSid,
-                                                                                               string activityName = null,
-                                                                                               string activitySid = null,
-                                                                                               string available = null,
-                                                                                               string friendlyName = null,
-                                                                                               string targetWorkersExpression = null,
-                                                                                               string taskQueueName = null,
-                                                                                               string taskQueueSid = null,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadWorkerOptions(pathWorkspaceSid){ActivityName = activityName, ActivitySid = activitySid, Available = available, FriendlyName = friendlyName, TargetWorkersExpression = targetWorkersExpression, TaskQueueName = taskQueueName, TaskQueueSid = taskQueueSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<WorkerResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<WorkerResource>.FromJson("workers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<WorkerResource> NextPage(Page<WorkerResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<WorkerResource>.FromJson("workers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<WorkerResource> PreviousPage(Page<WorkerResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<WorkerResource>.FromJson("workers", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateWorkerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Worker parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Worker </returns>
-        public static WorkerResource Create(CreateWorkerOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Worker parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Worker </returns>
-        public static async System.Threading.Tasks.Task<WorkerResource> CreateAsync(CreateWorkerOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Worker belongs to </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="activitySid"> The SID of a valid Activity that describes the new Worker's initial state </param>
-        /// <param name="attributes"> A valid JSON string that describes the new Worker </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Worker </returns>
-        public static WorkerResource Create(string pathWorkspaceSid,
-                                            string friendlyName,
-                                            string activitySid = null,
-                                            string attributes = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateWorkerOptions(pathWorkspaceSid, friendlyName){ActivitySid = activitySid, Attributes = attributes};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Worker belongs to </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="activitySid"> The SID of a valid Activity that describes the new Worker's initial state </param>
-        /// <param name="attributes"> A valid JSON string that describes the new Worker </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Worker </returns>
-        public static async System.Threading.Tasks.Task<WorkerResource> CreateAsync(string pathWorkspaceSid,
-                                                                                    string friendlyName,
-                                                                                    string activitySid = null,
-                                                                                    string attributes = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateWorkerOptions(pathWorkspaceSid, friendlyName){ActivitySid = activitySid, Attributes = attributes};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchWorkerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Worker parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Worker </returns>
-        public static WorkerResource Fetch(FetchWorkerOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Worker parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Worker </returns>
-        public static async System.Threading.Tasks.Task<WorkerResource> FetchAsync(FetchWorkerOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Worker </returns>
-        public static WorkerResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkerOptions(pathWorkspaceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to fetch </param>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Worker </returns>
-        public static async System.Threading.Tasks.Task<WorkerResource> FetchAsync(string pathWorkspaceSid,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkerOptions(pathWorkspaceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateWorkerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Worker parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Worker </returns>
-        public static WorkerResource Update(UpdateWorkerOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Worker parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Worker </returns>
-        public static async System.Threading.Tasks.Task<WorkerResource> UpdateAsync(UpdateWorkerOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to update </param>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        /// <param name="activitySid"> The SID of the Activity that describes the Worker's initial state </param>
-        /// <param name="attributes"> The JSON string that describes the Worker </param>
-        /// <param name="friendlyName"> A string to describe the Worker </param>
-        /// <param name="rejectPendingReservations"> Whether to reject the Worker's pending reservations </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Worker </returns>
-        public static WorkerResource Update(string pathWorkspaceSid,
-                                            string pathSid,
-                                            string activitySid = null,
-                                            string attributes = null,
-                                            string friendlyName = null,
-                                            bool? rejectPendingReservations = null,
-                                            string ifMatch = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateWorkerOptions(pathWorkspaceSid, pathSid){ActivitySid = activitySid, Attributes = attributes, FriendlyName = friendlyName, RejectPendingReservations = rejectPendingReservations, IfMatch = ifMatch};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to update </param>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        /// <param name="activitySid"> The SID of the Activity that describes the Worker's initial state </param>
-        /// <param name="attributes"> The JSON string that describes the Worker </param>
-        /// <param name="friendlyName"> A string to describe the Worker </param>
-        /// <param name="rejectPendingReservations"> Whether to reject the Worker's pending reservations </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Worker </returns>
-        public static async System.Threading.Tasks.Task<WorkerResource> UpdateAsync(string pathWorkspaceSid,
-                                                                                    string pathSid,
-                                                                                    string activitySid = null,
-                                                                                    string attributes = null,
-                                                                                    string friendlyName = null,
-                                                                                    bool? rejectPendingReservations = null,
-                                                                                    string ifMatch = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateWorkerOptions(pathWorkspaceSid, pathSid){ActivitySid = activitySid, Attributes = attributes, FriendlyName = friendlyName, RejectPendingReservations = rejectPendingReservations, IfMatch = ifMatch};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteWorkerOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: options.GetHeaderParams()
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Worker parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Worker </returns>
-        public static bool Delete(DeleteWorkerOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Worker parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Worker </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWorkerOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to delete </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Worker </returns>
-        public static bool Delete(string pathWorkspaceSid,
-                                  string pathSid,
-                                  string ifMatch = null,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteWorkerOptions(pathWorkspaceSid, pathSid){IfMatch = ifMatch};
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to delete </param>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        /// <param name="ifMatch"> The If-Match HTTP request header </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Worker </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathWorkspaceSid,
-                                                                          string pathSid,
-                                                                          string ifMatch = null,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteWorkerOptions(pathWorkspaceSid, pathSid){IfMatch = ifMatch};
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkerResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkerResource object represented by the provided JSON </returns>
-        public static WorkerResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkerResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The friendly_name of the Worker's current Activity
-        /// </summary>
-        [JsonProperty("activity_name")]
-        public string ActivityName { get; private set; }
-        /// <summary>
-        /// The SID of the Worker's current Activity
-        /// </summary>
-        [JsonProperty("activity_sid")]
-        public string ActivitySid { get; private set; }
-        /// <summary>
-        /// The JSON string that describes the Worker
-        /// </summary>
-        [JsonProperty("attributes")]
-        public string Attributes { get; private set; }
-        /// <summary>
-        /// Whether the Worker is available to perform tasks
-        /// </summary>
-        [JsonProperty("available")]
-        public bool? Available { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date and time in GMT of the last change to the Worker's activity
-        /// </summary>
-        [JsonProperty("date_status_changed")]
-        public DateTime? DateStatusChanged { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the Worker
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Worker resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private WorkerResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkerResource : Resource
+  {
+    private static Request BuildReadRequest(ReadWorkerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Worker parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Worker </returns>
+    public static ResourceSet<WorkerResource> Read(ReadWorkerOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<WorkerResource>.FromJson("workers", response.Content);
+      return new ResourceSet<WorkerResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Worker parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Worker </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WorkerResource>> ReadAsync(ReadWorkerOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<WorkerResource>.FromJson("workers", response.Content);
+      return new ResourceSet<WorkerResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workers to read </param>
+    /// <param name="activityName"> The activity_name of the Worker resources to read </param>
+    /// <param name="activitySid"> The activity_sid of the Worker resources to read </param>
+    /// <param name="available"> Whether to return Worker resources that are available or unavailable </param>
+    /// <param name="friendlyName"> The friendly_name of the Worker resources to read </param>
+    /// <param name="targetWorkersExpression"> Filter by Workers that would match an expression on a TaskQueue </param>
+    /// <param name="taskQueueName"> The friendly_name of the TaskQueue that the Workers to read are eligible for </param>
+    /// <param name="taskQueueSid"> The SID of the TaskQueue that the Workers to read are eligible for </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Worker </returns>
+    public static ResourceSet<WorkerResource> Read(string pathWorkspaceSid,
+                                                   string activityName = null,
+                                                   string activitySid = null,
+                                                   string available = null,
+                                                   string friendlyName = null,
+                                                   string targetWorkersExpression = null,
+                                                   string taskQueueName = null,
+                                                   string taskQueueSid = null,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadWorkerOptions(pathWorkspaceSid) { ActivityName = activityName, ActivitySid = activitySid, Available = available, FriendlyName = friendlyName, TargetWorkersExpression = targetWorkersExpression, TaskQueueName = taskQueueName, TaskQueueSid = taskQueueSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workers to read </param>
+    /// <param name="activityName"> The activity_name of the Worker resources to read </param>
+    /// <param name="activitySid"> The activity_sid of the Worker resources to read </param>
+    /// <param name="available"> Whether to return Worker resources that are available or unavailable </param>
+    /// <param name="friendlyName"> The friendly_name of the Worker resources to read </param>
+    /// <param name="targetWorkersExpression"> Filter by Workers that would match an expression on a TaskQueue </param>
+    /// <param name="taskQueueName"> The friendly_name of the TaskQueue that the Workers to read are eligible for </param>
+    /// <param name="taskQueueSid"> The SID of the TaskQueue that the Workers to read are eligible for </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Worker </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WorkerResource>> ReadAsync(string pathWorkspaceSid,
+                                                                                           string activityName = null,
+                                                                                           string activitySid = null,
+                                                                                           string available = null,
+                                                                                           string friendlyName = null,
+                                                                                           string targetWorkersExpression = null,
+                                                                                           string taskQueueName = null,
+                                                                                           string taskQueueSid = null,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadWorkerOptions(pathWorkspaceSid) { ActivityName = activityName, ActivitySid = activitySid, Available = available, FriendlyName = friendlyName, TargetWorkersExpression = targetWorkersExpression, TaskQueueName = taskQueueName, TaskQueueSid = taskQueueSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<WorkerResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<WorkerResource>.FromJson("workers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<WorkerResource> NextPage(Page<WorkerResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<WorkerResource>.FromJson("workers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<WorkerResource> PreviousPage(Page<WorkerResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<WorkerResource>.FromJson("workers", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateWorkerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Worker parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Worker </returns>
+    public static WorkerResource Create(CreateWorkerOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Worker parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Worker </returns>
+    public static async System.Threading.Tasks.Task<WorkerResource> CreateAsync(CreateWorkerOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Worker belongs to </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="activitySid"> The SID of a valid Activity that describes the new Worker's initial state </param>
+    /// <param name="attributes"> A valid JSON string that describes the new Worker </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Worker </returns>
+    public static WorkerResource Create(string pathWorkspaceSid,
+                                        string friendlyName,
+                                        string activitySid = null,
+                                        string attributes = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateWorkerOptions(pathWorkspaceSid, friendlyName) { ActivitySid = activitySid, Attributes = attributes };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Worker belongs to </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="activitySid"> The SID of a valid Activity that describes the new Worker's initial state </param>
+    /// <param name="attributes"> A valid JSON string that describes the new Worker </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Worker </returns>
+    public static async System.Threading.Tasks.Task<WorkerResource> CreateAsync(string pathWorkspaceSid,
+                                                                                string friendlyName,
+                                                                                string activitySid = null,
+                                                                                string attributes = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateWorkerOptions(pathWorkspaceSid, friendlyName) { ActivitySid = activitySid, Attributes = attributes };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchWorkerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Worker parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Worker </returns>
+    public static WorkerResource Fetch(FetchWorkerOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Worker parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Worker </returns>
+    public static async System.Threading.Tasks.Task<WorkerResource> FetchAsync(FetchWorkerOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Worker </returns>
+    public static WorkerResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkerOptions(pathWorkspaceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to fetch </param>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Worker </returns>
+    public static async System.Threading.Tasks.Task<WorkerResource> FetchAsync(string pathWorkspaceSid,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkerOptions(pathWorkspaceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateWorkerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Worker parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Worker </returns>
+    public static WorkerResource Update(UpdateWorkerOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Worker parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Worker </returns>
+    public static async System.Threading.Tasks.Task<WorkerResource> UpdateAsync(UpdateWorkerOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to update </param>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    /// <param name="activitySid"> The SID of the Activity that describes the Worker's initial state </param>
+    /// <param name="attributes"> The JSON string that describes the Worker </param>
+    /// <param name="friendlyName"> A string to describe the Worker </param>
+    /// <param name="rejectPendingReservations"> Whether to reject the Worker's pending reservations </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Worker </returns>
+    public static WorkerResource Update(string pathWorkspaceSid,
+                                        string pathSid,
+                                        string activitySid = null,
+                                        string attributes = null,
+                                        string friendlyName = null,
+                                        bool? rejectPendingReservations = null,
+                                        string ifMatch = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateWorkerOptions(pathWorkspaceSid, pathSid) { ActivitySid = activitySid, Attributes = attributes, FriendlyName = friendlyName, RejectPendingReservations = rejectPendingReservations, IfMatch = ifMatch };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to update </param>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    /// <param name="activitySid"> The SID of the Activity that describes the Worker's initial state </param>
+    /// <param name="attributes"> The JSON string that describes the Worker </param>
+    /// <param name="friendlyName"> A string to describe the Worker </param>
+    /// <param name="rejectPendingReservations"> Whether to reject the Worker's pending reservations </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Worker </returns>
+    public static async System.Threading.Tasks.Task<WorkerResource> UpdateAsync(string pathWorkspaceSid,
+                                                                                string pathSid,
+                                                                                string activitySid = null,
+                                                                                string attributes = null,
+                                                                                string friendlyName = null,
+                                                                                bool? rejectPendingReservations = null,
+                                                                                string ifMatch = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateWorkerOptions(pathWorkspaceSid, pathSid) { ActivitySid = activitySid, Attributes = attributes, FriendlyName = friendlyName, RejectPendingReservations = rejectPendingReservations, IfMatch = ifMatch };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteWorkerOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workers/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: options.GetHeaderParams()
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Worker parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Worker </returns>
+    public static bool Delete(DeleteWorkerOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Worker parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Worker </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWorkerOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to delete </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Worker </returns>
+    public static bool Delete(string pathWorkspaceSid,
+                              string pathSid,
+                              string ifMatch = null,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteWorkerOptions(pathWorkspaceSid, pathSid) { IfMatch = ifMatch };
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Worker to delete </param>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    /// <param name="ifMatch"> The If-Match HTTP request header </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Worker </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathWorkspaceSid,
+                                                                      string pathSid,
+                                                                      string ifMatch = null,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteWorkerOptions(pathWorkspaceSid, pathSid) { IfMatch = ifMatch };
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkerResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkerResource object represented by the provided JSON </returns>
+    public static WorkerResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkerResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The friendly_name of the Worker's current Activity
+    /// </summary>
+    [JsonProperty("activity_name")]
+    public string ActivityName { get; private set; }
+    /// <summary>
+    /// The SID of the Worker's current Activity
+    /// </summary>
+    [JsonProperty("activity_sid")]
+    public string ActivitySid { get; private set; }
+    /// <summary>
+    /// The JSON string that describes the Worker
+    /// </summary>
+    [JsonProperty("attributes")]
+    public string Attributes { get; private set; }
+    /// <summary>
+    /// Whether the Worker is available to perform tasks
+    /// </summary>
+    [JsonProperty("available")]
+    public bool? Available { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date and time in GMT of the last change to the Worker's activity
+    /// </summary>
+    [JsonProperty("date_status_changed")]
+    public DateTime? DateStatusChanged { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the Worker
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Worker resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private WorkerResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowCumulativeStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowCumulativeStatisticsOptions.cs
index e5025e649..77c50aa5b 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowCumulativeStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowCumulativeStatisticsOptions.cs
@@ -9,87 +9,87 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Workflow
-{
-
+{
+
+  /// <summary>
+  /// FetchWorkflowCumulativeStatisticsOptions
+  /// </summary>
+  public class FetchWorkflowCumulativeStatisticsOptions : IOptions<WorkflowCumulativeStatisticsResource>
+  {
     /// <summary>
-    /// FetchWorkflowCumulativeStatisticsOptions
+    /// The SID of the Workspace with the resource to fetch
     /// </summary>
-    public class FetchWorkflowCumulativeStatisticsOptions : IOptions<WorkflowCumulativeStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the resource to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// Returns the list of Tasks that are being controlled by the Workflow with the specified Sid value
-        /// </summary>
-        public string PathWorkflowSid { get; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Only calculate statistics since this many minutes in the past
-        /// </summary>
-        public int? Minutes { get; set; }
-        /// <summary>
-        /// Only calculate statistics from on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only calculate cumulative statistics on this TaskChannel
-        /// </summary>
-        public string TaskChannel { get; set; }
-        /// <summary>
-        /// A comma separated list of values that describes the thresholds to calculate statistics on
-        /// </summary>
-        public string SplitByWaitTime { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchWorkflowCumulativeStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
-        /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
-        ///                       specified Sid value </param>
-        public FetchWorkflowCumulativeStatisticsOptions(string pathWorkspaceSid, string pathWorkflowSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathWorkflowSid = pathWorkflowSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (Minutes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            if (SplitByWaitTime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// Returns the list of Tasks that are being controlled by the Workflow with the specified Sid value
+    /// </summary>
+    public string PathWorkflowSid { get; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Only calculate statistics since this many minutes in the past
+    /// </summary>
+    public int? Minutes { get; set; }
+    /// <summary>
+    /// Only calculate statistics from on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only calculate cumulative statistics on this TaskChannel
+    /// </summary>
+    public string TaskChannel { get; set; }
+    /// <summary>
+    /// A comma separated list of values that describes the thresholds to calculate statistics on
+    /// </summary>
+    public string SplitByWaitTime { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchWorkflowCumulativeStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
+    /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
+    ///                       specified Sid value </param>
+    public FetchWorkflowCumulativeStatisticsOptions(string pathWorkspaceSid, string pathWorkflowSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathWorkflowSid = pathWorkflowSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (Minutes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      if (SplitByWaitTime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowCumulativeStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowCumulativeStatisticsResource.cs
index d41454245..235ff3121 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowCumulativeStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowCumulativeStatisticsResource.cs
@@ -16,240 +16,240 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Workflow
-{
-
-    public class WorkflowCumulativeStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchWorkflowCumulativeStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows/" + options.PathWorkflowSid + "/CumulativeStatistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkflowCumulativeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkflowCumulativeStatistics </returns>
-        public static WorkflowCumulativeStatisticsResource Fetch(FetchWorkflowCumulativeStatisticsOptions options,
-                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkflowCumulativeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkflowCumulativeStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkflowCumulativeStatisticsResource> FetchAsync(FetchWorkflowCumulativeStatisticsOptions options,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
-        /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
-        ///                       specified Sid value </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkflowCumulativeStatistics </returns>
-        public static WorkflowCumulativeStatisticsResource Fetch(string pathWorkspaceSid,
-                                                                 string pathWorkflowSid,
-                                                                 DateTime? endDate = null,
-                                                                 int? minutes = null,
-                                                                 DateTime? startDate = null,
-                                                                 string taskChannel = null,
-                                                                 string splitByWaitTime = null,
-                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkflowCumulativeStatisticsOptions(pathWorkspaceSid, pathWorkflowSid){EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
-        /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
-        ///                       specified Sid value </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkflowCumulativeStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkflowCumulativeStatisticsResource> FetchAsync(string pathWorkspaceSid,
-                                                                                                         string pathWorkflowSid,
-                                                                                                         DateTime? endDate = null,
-                                                                                                         int? minutes = null,
-                                                                                                         DateTime? startDate = null,
-                                                                                                         string taskChannel = null,
-                                                                                                         string splitByWaitTime = null,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkflowCumulativeStatisticsOptions(pathWorkspaceSid, pathWorkflowSid){EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkflowCumulativeStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkflowCumulativeStatisticsResource object represented by the provided JSON </returns>
-        public static WorkflowCumulativeStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkflowCumulativeStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The average time in seconds between Task creation and acceptance
-        /// </summary>
-        [JsonProperty("avg_task_acceptance_time")]
-        public int? AvgTaskAcceptanceTime { get; private set; }
-        /// <summary>
-        /// The beginning of the interval during which these statistics were calculated
-        /// </summary>
-        [JsonProperty("start_time")]
-        public DateTime? StartTime { get; private set; }
-        /// <summary>
-        /// The end of the interval during which these statistics were calculated
-        /// </summary>
-        [JsonProperty("end_time")]
-        public DateTime? EndTime { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were created for Workers
-        /// </summary>
-        [JsonProperty("reservations_created")]
-        public int? ReservationsCreated { get; private set; }
-        /// <summary>
-        /// The total number of Reservations accepted by Workers
-        /// </summary>
-        [JsonProperty("reservations_accepted")]
-        public int? ReservationsAccepted { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were rejected
-        /// </summary>
-        [JsonProperty("reservations_rejected")]
-        public int? ReservationsRejected { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were timed out
-        /// </summary>
-        [JsonProperty("reservations_timed_out")]
-        public int? ReservationsTimedOut { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were canceled
-        /// </summary>
-        [JsonProperty("reservations_canceled")]
-        public int? ReservationsCanceled { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were rescinded
-        /// </summary>
-        [JsonProperty("reservations_rescinded")]
-        public int? ReservationsRescinded { get; private set; }
-        /// <summary>
-        /// A list of objects that describe the Tasks canceled and reservations accepted above and below the specified thresholds
-        /// </summary>
-        [JsonProperty("split_by_wait_time")]
-        public object SplitByWaitTime { get; private set; }
-        /// <summary>
-        /// The wait duration statistics for Tasks that were accepted
-        /// </summary>
-        [JsonProperty("wait_duration_until_accepted")]
-        public object WaitDurationUntilAccepted { get; private set; }
-        /// <summary>
-        /// The wait duration statistics for Tasks that were canceled
-        /// </summary>
-        [JsonProperty("wait_duration_until_canceled")]
-        public object WaitDurationUntilCanceled { get; private set; }
-        /// <summary>
-        /// The total number of Tasks that were canceled
-        /// </summary>
-        [JsonProperty("tasks_canceled")]
-        public int? TasksCanceled { get; private set; }
-        /// <summary>
-        /// The total number of Tasks that were completed
-        /// </summary>
-        [JsonProperty("tasks_completed")]
-        public int? TasksCompleted { get; private set; }
-        /// <summary>
-        /// The total number of Tasks that entered the Workflow
-        /// </summary>
-        [JsonProperty("tasks_entered")]
-        public int? TasksEntered { get; private set; }
-        /// <summary>
-        /// The total number of Tasks that were deleted
-        /// </summary>
-        [JsonProperty("tasks_deleted")]
-        public int? TasksDeleted { get; private set; }
-        /// <summary>
-        /// The total number of Tasks that were moved from one queue to another
-        /// </summary>
-        [JsonProperty("tasks_moved")]
-        public int? TasksMoved { get; private set; }
-        /// <summary>
-        /// The total number of Tasks that were timed out of their Workflows
-        /// </summary>
-        [JsonProperty("tasks_timed_out_in_workflow")]
-        public int? TasksTimedOutInWorkflow { get; private set; }
-        /// <summary>
-        /// Returns the list of Tasks that are being controlled by the Workflow with the specified Sid value
-        /// </summary>
-        [JsonProperty("workflow_sid")]
-        public string WorkflowSid { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the Workflow.
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Workflow statistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WorkflowCumulativeStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkflowCumulativeStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchWorkflowCumulativeStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows/" + options.PathWorkflowSid + "/CumulativeStatistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkflowCumulativeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkflowCumulativeStatistics </returns>
+    public static WorkflowCumulativeStatisticsResource Fetch(FetchWorkflowCumulativeStatisticsOptions options,
+                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkflowCumulativeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkflowCumulativeStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkflowCumulativeStatisticsResource> FetchAsync(FetchWorkflowCumulativeStatisticsOptions options,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
+    /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
+    ///                       specified Sid value </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkflowCumulativeStatistics </returns>
+    public static WorkflowCumulativeStatisticsResource Fetch(string pathWorkspaceSid,
+                                                             string pathWorkflowSid,
+                                                             DateTime? endDate = null,
+                                                             int? minutes = null,
+                                                             DateTime? startDate = null,
+                                                             string taskChannel = null,
+                                                             string splitByWaitTime = null,
+                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkflowCumulativeStatisticsOptions(pathWorkspaceSid, pathWorkflowSid) { EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the resource to fetch </param>
+    /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
+    ///                       specified Sid value </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkflowCumulativeStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkflowCumulativeStatisticsResource> FetchAsync(string pathWorkspaceSid,
+                                                                                                     string pathWorkflowSid,
+                                                                                                     DateTime? endDate = null,
+                                                                                                     int? minutes = null,
+                                                                                                     DateTime? startDate = null,
+                                                                                                     string taskChannel = null,
+                                                                                                     string splitByWaitTime = null,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkflowCumulativeStatisticsOptions(pathWorkspaceSid, pathWorkflowSid) { EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkflowCumulativeStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkflowCumulativeStatisticsResource object represented by the provided JSON </returns>
+    public static WorkflowCumulativeStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkflowCumulativeStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The average time in seconds between Task creation and acceptance
+    /// </summary>
+    [JsonProperty("avg_task_acceptance_time")]
+    public int? AvgTaskAcceptanceTime { get; private set; }
+    /// <summary>
+    /// The beginning of the interval during which these statistics were calculated
+    /// </summary>
+    [JsonProperty("start_time")]
+    public DateTime? StartTime { get; private set; }
+    /// <summary>
+    /// The end of the interval during which these statistics were calculated
+    /// </summary>
+    [JsonProperty("end_time")]
+    public DateTime? EndTime { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were created for Workers
+    /// </summary>
+    [JsonProperty("reservations_created")]
+    public int? ReservationsCreated { get; private set; }
+    /// <summary>
+    /// The total number of Reservations accepted by Workers
+    /// </summary>
+    [JsonProperty("reservations_accepted")]
+    public int? ReservationsAccepted { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were rejected
+    /// </summary>
+    [JsonProperty("reservations_rejected")]
+    public int? ReservationsRejected { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were timed out
+    /// </summary>
+    [JsonProperty("reservations_timed_out")]
+    public int? ReservationsTimedOut { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were canceled
+    /// </summary>
+    [JsonProperty("reservations_canceled")]
+    public int? ReservationsCanceled { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were rescinded
+    /// </summary>
+    [JsonProperty("reservations_rescinded")]
+    public int? ReservationsRescinded { get; private set; }
+    /// <summary>
+    /// A list of objects that describe the Tasks canceled and reservations accepted above and below the specified thresholds
+    /// </summary>
+    [JsonProperty("split_by_wait_time")]
+    public object SplitByWaitTime { get; private set; }
+    /// <summary>
+    /// The wait duration statistics for Tasks that were accepted
+    /// </summary>
+    [JsonProperty("wait_duration_until_accepted")]
+    public object WaitDurationUntilAccepted { get; private set; }
+    /// <summary>
+    /// The wait duration statistics for Tasks that were canceled
+    /// </summary>
+    [JsonProperty("wait_duration_until_canceled")]
+    public object WaitDurationUntilCanceled { get; private set; }
+    /// <summary>
+    /// The total number of Tasks that were canceled
+    /// </summary>
+    [JsonProperty("tasks_canceled")]
+    public int? TasksCanceled { get; private set; }
+    /// <summary>
+    /// The total number of Tasks that were completed
+    /// </summary>
+    [JsonProperty("tasks_completed")]
+    public int? TasksCompleted { get; private set; }
+    /// <summary>
+    /// The total number of Tasks that entered the Workflow
+    /// </summary>
+    [JsonProperty("tasks_entered")]
+    public int? TasksEntered { get; private set; }
+    /// <summary>
+    /// The total number of Tasks that were deleted
+    /// </summary>
+    [JsonProperty("tasks_deleted")]
+    public int? TasksDeleted { get; private set; }
+    /// <summary>
+    /// The total number of Tasks that were moved from one queue to another
+    /// </summary>
+    [JsonProperty("tasks_moved")]
+    public int? TasksMoved { get; private set; }
+    /// <summary>
+    /// The total number of Tasks that were timed out of their Workflows
+    /// </summary>
+    [JsonProperty("tasks_timed_out_in_workflow")]
+    public int? TasksTimedOutInWorkflow { get; private set; }
+    /// <summary>
+    /// Returns the list of Tasks that are being controlled by the Workflow with the specified Sid value
+    /// </summary>
+    [JsonProperty("workflow_sid")]
+    public string WorkflowSid { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the Workflow.
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Workflow statistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WorkflowCumulativeStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowRealTimeStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowRealTimeStatisticsOptions.cs
index 0667f2e91..c64a8a0ea 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowRealTimeStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowRealTimeStatisticsOptions.cs
@@ -9,51 +9,51 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Workflow
-{
-
+{
+
+  /// <summary>
+  /// FetchWorkflowRealTimeStatisticsOptions
+  /// </summary>
+  public class FetchWorkflowRealTimeStatisticsOptions : IOptions<WorkflowRealTimeStatisticsResource>
+  {
     /// <summary>
-    /// FetchWorkflowRealTimeStatisticsOptions
+    /// The SID of the Workspace with the Workflow to fetch
     /// </summary>
-    public class FetchWorkflowRealTimeStatisticsOptions : IOptions<WorkflowRealTimeStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Workflow to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// Returns the list of Tasks that are being controlled by the Workflow with the specified SID value
-        /// </summary>
-        public string PathWorkflowSid { get; }
-        /// <summary>
-        /// Only calculate real-time statistics on this TaskChannel
-        /// </summary>
-        public string TaskChannel { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchWorkflowRealTimeStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
-        /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
-        ///                       specified SID value </param>
-        public FetchWorkflowRealTimeStatisticsOptions(string pathWorkspaceSid, string pathWorkflowSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathWorkflowSid = pathWorkflowSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// Returns the list of Tasks that are being controlled by the Workflow with the specified SID value
+    /// </summary>
+    public string PathWorkflowSid { get; }
+    /// <summary>
+    /// Only calculate real-time statistics on this TaskChannel
+    /// </summary>
+    public string TaskChannel { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchWorkflowRealTimeStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
+    /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
+    ///                       specified SID value </param>
+    public FetchWorkflowRealTimeStatisticsOptions(string pathWorkspaceSid, string pathWorkflowSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathWorkflowSid = pathWorkflowSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowRealTimeStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowRealTimeStatisticsResource.cs
index 8e3075c7b..6cb973585 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowRealTimeStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowRealTimeStatisticsResource.cs
@@ -16,157 +16,157 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Workflow
-{
-
-    public class WorkflowRealTimeStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchWorkflowRealTimeStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows/" + options.PathWorkflowSid + "/RealTimeStatistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkflowRealTimeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkflowRealTimeStatistics </returns>
-        public static WorkflowRealTimeStatisticsResource Fetch(FetchWorkflowRealTimeStatisticsOptions options,
-                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkflowRealTimeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkflowRealTimeStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkflowRealTimeStatisticsResource> FetchAsync(FetchWorkflowRealTimeStatisticsOptions options,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
-        /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
-        ///                       specified SID value </param>
-        /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkflowRealTimeStatistics </returns>
-        public static WorkflowRealTimeStatisticsResource Fetch(string pathWorkspaceSid,
-                                                               string pathWorkflowSid,
-                                                               string taskChannel = null,
-                                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkflowRealTimeStatisticsOptions(pathWorkspaceSid, pathWorkflowSid){TaskChannel = taskChannel};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
-        /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
-        ///                       specified SID value </param>
-        /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkflowRealTimeStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkflowRealTimeStatisticsResource> FetchAsync(string pathWorkspaceSid,
-                                                                                                       string pathWorkflowSid,
-                                                                                                       string taskChannel = null,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkflowRealTimeStatisticsOptions(pathWorkspaceSid, pathWorkflowSid){TaskChannel = taskChannel};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkflowRealTimeStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkflowRealTimeStatisticsResource object represented by the provided JSON </returns>
-        public static WorkflowRealTimeStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkflowRealTimeStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The age of the longest waiting Task
-        /// </summary>
-        [JsonProperty("longest_task_waiting_age")]
-        public int? LongestTaskWaitingAge { get; private set; }
-        /// <summary>
-        /// The SID of the longest waiting Task
-        /// </summary>
-        [JsonProperty("longest_task_waiting_sid")]
-        public string LongestTaskWaitingSid { get; private set; }
-        /// <summary>
-        /// The number of Tasks by priority
-        /// </summary>
-        [JsonProperty("tasks_by_priority")]
-        public object TasksByPriority { get; private set; }
-        /// <summary>
-        /// The number of Tasks by their current status
-        /// </summary>
-        [JsonProperty("tasks_by_status")]
-        public object TasksByStatus { get; private set; }
-        /// <summary>
-        /// The total number of Tasks
-        /// </summary>
-        [JsonProperty("total_tasks")]
-        public int? TotalTasks { get; private set; }
-        /// <summary>
-        /// Returns the list of Tasks that are being controlled by the Workflow with the specified SID value
-        /// </summary>
-        [JsonProperty("workflow_sid")]
-        public string WorkflowSid { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the Workflow.
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Workflow statistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WorkflowRealTimeStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkflowRealTimeStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchWorkflowRealTimeStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows/" + options.PathWorkflowSid + "/RealTimeStatistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkflowRealTimeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkflowRealTimeStatistics </returns>
+    public static WorkflowRealTimeStatisticsResource Fetch(FetchWorkflowRealTimeStatisticsOptions options,
+                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkflowRealTimeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkflowRealTimeStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkflowRealTimeStatisticsResource> FetchAsync(FetchWorkflowRealTimeStatisticsOptions options,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
+    /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
+    ///                       specified SID value </param>
+    /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkflowRealTimeStatistics </returns>
+    public static WorkflowRealTimeStatisticsResource Fetch(string pathWorkspaceSid,
+                                                           string pathWorkflowSid,
+                                                           string taskChannel = null,
+                                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkflowRealTimeStatisticsOptions(pathWorkspaceSid, pathWorkflowSid) { TaskChannel = taskChannel };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
+    /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
+    ///                       specified SID value </param>
+    /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkflowRealTimeStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkflowRealTimeStatisticsResource> FetchAsync(string pathWorkspaceSid,
+                                                                                                   string pathWorkflowSid,
+                                                                                                   string taskChannel = null,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkflowRealTimeStatisticsOptions(pathWorkspaceSid, pathWorkflowSid) { TaskChannel = taskChannel };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkflowRealTimeStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkflowRealTimeStatisticsResource object represented by the provided JSON </returns>
+    public static WorkflowRealTimeStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkflowRealTimeStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The age of the longest waiting Task
+    /// </summary>
+    [JsonProperty("longest_task_waiting_age")]
+    public int? LongestTaskWaitingAge { get; private set; }
+    /// <summary>
+    /// The SID of the longest waiting Task
+    /// </summary>
+    [JsonProperty("longest_task_waiting_sid")]
+    public string LongestTaskWaitingSid { get; private set; }
+    /// <summary>
+    /// The number of Tasks by priority
+    /// </summary>
+    [JsonProperty("tasks_by_priority")]
+    public object TasksByPriority { get; private set; }
+    /// <summary>
+    /// The number of Tasks by their current status
+    /// </summary>
+    [JsonProperty("tasks_by_status")]
+    public object TasksByStatus { get; private set; }
+    /// <summary>
+    /// The total number of Tasks
+    /// </summary>
+    [JsonProperty("total_tasks")]
+    public int? TotalTasks { get; private set; }
+    /// <summary>
+    /// Returns the list of Tasks that are being controlled by the Workflow with the specified SID value
+    /// </summary>
+    [JsonProperty("workflow_sid")]
+    public string WorkflowSid { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the Workflow.
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Workflow statistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WorkflowRealTimeStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowStatisticsOptions.cs
index a96462281..170e09fdc 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowStatisticsOptions.cs
@@ -9,87 +9,87 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Workflow
-{
-
+{
+
+  /// <summary>
+  /// FetchWorkflowStatisticsOptions
+  /// </summary>
+  public class FetchWorkflowStatisticsOptions : IOptions<WorkflowStatisticsResource>
+  {
     /// <summary>
-    /// FetchWorkflowStatisticsOptions
+    /// The SID of the Workspace with the Workflow to fetch
     /// </summary>
-    public class FetchWorkflowStatisticsOptions : IOptions<WorkflowStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Workflow to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// Returns the list of Tasks that are being controlled by the Workflow with the specified SID value
-        /// </summary>
-        public string PathWorkflowSid { get; }
-        /// <summary>
-        /// Only calculate statistics since this many minutes in the past
-        /// </summary>
-        public int? Minutes { get; set; }
-        /// <summary>
-        /// Only calculate statistics from on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only calculate statistics from this date and time and earlier
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Only calculate real-time statistics on this TaskChannel.
-        /// </summary>
-        public string TaskChannel { get; set; }
-        /// <summary>
-        /// A comma separated list of values that describes the thresholds to calculate statistics on
-        /// </summary>
-        public string SplitByWaitTime { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchWorkflowStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
-        /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
-        ///                       specified SID value </param>
-        public FetchWorkflowStatisticsOptions(string pathWorkspaceSid, string pathWorkflowSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathWorkflowSid = pathWorkflowSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Minutes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            if (SplitByWaitTime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// Returns the list of Tasks that are being controlled by the Workflow with the specified SID value
+    /// </summary>
+    public string PathWorkflowSid { get; }
+    /// <summary>
+    /// Only calculate statistics since this many minutes in the past
+    /// </summary>
+    public int? Minutes { get; set; }
+    /// <summary>
+    /// Only calculate statistics from on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only calculate statistics from this date and time and earlier
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Only calculate real-time statistics on this TaskChannel.
+    /// </summary>
+    public string TaskChannel { get; set; }
+    /// <summary>
+    /// A comma separated list of values that describes the thresholds to calculate statistics on
+    /// </summary>
+    public string SplitByWaitTime { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchWorkflowStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
+    /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
+    ///                       specified SID value </param>
+    public FetchWorkflowStatisticsOptions(string pathWorkspaceSid, string pathWorkflowSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathWorkflowSid = pathWorkflowSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Minutes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      if (SplitByWaitTime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowStatisticsResource.cs
index 6e284f953..e7c1a365b 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/Workflow/WorkflowStatisticsResource.cs
@@ -16,160 +16,160 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace.Workflow
-{
-
-    public class WorkflowStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchWorkflowStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows/" + options.PathWorkflowSid + "/Statistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkflowStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkflowStatistics </returns>
-        public static WorkflowStatisticsResource Fetch(FetchWorkflowStatisticsOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkflowStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkflowStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkflowStatisticsResource> FetchAsync(FetchWorkflowStatisticsOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
-        /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
-        ///                       specified SID value </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="endDate"> Only calculate statistics from this date and time and earlier </param>
-        /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel.  </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkflowStatistics </returns>
-        public static WorkflowStatisticsResource Fetch(string pathWorkspaceSid,
-                                                       string pathWorkflowSid,
-                                                       int? minutes = null,
-                                                       DateTime? startDate = null,
-                                                       DateTime? endDate = null,
-                                                       string taskChannel = null,
-                                                       string splitByWaitTime = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkflowStatisticsOptions(pathWorkspaceSid, pathWorkflowSid){Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
-        /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
-        ///                       specified SID value </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="endDate"> Only calculate statistics from this date and time and earlier </param>
-        /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel.  </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkflowStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkflowStatisticsResource> FetchAsync(string pathWorkspaceSid,
-                                                                                               string pathWorkflowSid,
-                                                                                               int? minutes = null,
-                                                                                               DateTime? startDate = null,
-                                                                                               DateTime? endDate = null,
-                                                                                               string taskChannel = null,
-                                                                                               string splitByWaitTime = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkflowStatisticsOptions(pathWorkspaceSid, pathWorkflowSid){Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkflowStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkflowStatisticsResource object represented by the provided JSON </returns>
-        public static WorkflowStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkflowStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// An object that contains the cumulative statistics for the Workflow
-        /// </summary>
-        [JsonProperty("cumulative")]
-        public object Cumulative { get; private set; }
-        /// <summary>
-        /// An object that contains the real-time statistics for the Workflow
-        /// </summary>
-        [JsonProperty("realtime")]
-        public object Realtime { get; private set; }
-        /// <summary>
-        /// Returns the list of Tasks that are being controlled by the Workflow with the specified SID value
-        /// </summary>
-        [JsonProperty("workflow_sid")]
-        public string WorkflowSid { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the Workflow
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Workflow statistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WorkflowStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkflowStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchWorkflowStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows/" + options.PathWorkflowSid + "/Statistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkflowStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkflowStatistics </returns>
+    public static WorkflowStatisticsResource Fetch(FetchWorkflowStatisticsOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkflowStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkflowStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkflowStatisticsResource> FetchAsync(FetchWorkflowStatisticsOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
+    /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
+    ///                       specified SID value </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="endDate"> Only calculate statistics from this date and time and earlier </param>
+    /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel.  </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkflowStatistics </returns>
+    public static WorkflowStatisticsResource Fetch(string pathWorkspaceSid,
+                                                   string pathWorkflowSid,
+                                                   int? minutes = null,
+                                                   DateTime? startDate = null,
+                                                   DateTime? endDate = null,
+                                                   string taskChannel = null,
+                                                   string splitByWaitTime = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkflowStatisticsOptions(pathWorkspaceSid, pathWorkflowSid) { Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
+    /// <param name="pathWorkflowSid"> Returns the list of Tasks that are being controlled by the Workflow with the
+    ///                       specified SID value </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="endDate"> Only calculate statistics from this date and time and earlier </param>
+    /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel.  </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkflowStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkflowStatisticsResource> FetchAsync(string pathWorkspaceSid,
+                                                                                           string pathWorkflowSid,
+                                                                                           int? minutes = null,
+                                                                                           DateTime? startDate = null,
+                                                                                           DateTime? endDate = null,
+                                                                                           string taskChannel = null,
+                                                                                           string splitByWaitTime = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkflowStatisticsOptions(pathWorkspaceSid, pathWorkflowSid) { Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkflowStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkflowStatisticsResource object represented by the provided JSON </returns>
+    public static WorkflowStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkflowStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// An object that contains the cumulative statistics for the Workflow
+    /// </summary>
+    [JsonProperty("cumulative")]
+    public object Cumulative { get; private set; }
+    /// <summary>
+    /// An object that contains the real-time statistics for the Workflow
+    /// </summary>
+    [JsonProperty("realtime")]
+    public object Realtime { get; private set; }
+    /// <summary>
+    /// Returns the list of Tasks that are being controlled by the Workflow with the specified SID value
+    /// </summary>
+    [JsonProperty("workflow_sid")]
+    public string WorkflowSid { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the Workflow
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Workflow statistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WorkflowStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkflowOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkflowOptions.cs
index cd707181a..994bb16e2 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkflowOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkflowOptions.cs
@@ -9,286 +9,286 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
+{
+
+  /// <summary>
+  /// FetchWorkflowOptions
+  /// </summary>
+  public class FetchWorkflowOptions : IOptions<WorkflowResource>
+  {
     /// <summary>
-    /// FetchWorkflowOptions
+    /// The SID of the Workspace with the Workflow to fetch
     /// </summary>
-    public class FetchWorkflowOptions : IOptions<WorkflowResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Workflow to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchWorkflowOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
-        /// <param name="pathSid"> The SID of the resource </param>
-        public FetchWorkflowOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathWorkspaceSid { get; }
     /// <summary>
-    /// UpdateWorkflowOptions
+    /// The SID of the resource
     /// </summary>
-    public class UpdateWorkflowOptions : IOptions<WorkflowResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Workflow to update
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        ///  descriptive string that you create to describe the Workflow resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The URL from your application that will process task assignment events
-        /// </summary>
-        public Uri AssignmentCallbackUrl { get; set; }
-        /// <summary>
-        /// The URL that we should call when a call to the `assignment_callback_url` fails
-        /// </summary>
-        public Uri FallbackAssignmentCallbackUrl { get; set; }
-        /// <summary>
-        /// A JSON string that contains the rules to apply to the Workflow
-        /// </summary>
-        public string Configuration { get; set; }
-        /// <summary>
-        /// How long TaskRouter will wait for a confirmation response from your application after it assigns a Task to a Worker
-        /// </summary>
-        public int? TaskReservationTimeout { get; set; }
-        /// <summary>
-        /// Whether or not to re-evaluate Tasks
-        /// </summary>
-        public string ReEvaluateTasks { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateWorkflowOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to update </param>
-        /// <param name="pathSid"> The SID of the resource </param>
-        public UpdateWorkflowOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (AssignmentCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AssignmentCallbackUrl", Serializers.Url(AssignmentCallbackUrl)));
-            }
-
-            if (FallbackAssignmentCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackAssignmentCallbackUrl", Serializers.Url(FallbackAssignmentCallbackUrl)));
-            }
-
-            if (Configuration != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration", Configuration));
-            }
-
-            if (TaskReservationTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskReservationTimeout", TaskReservationTimeout.ToString()));
-            }
-
-            if (ReEvaluateTasks != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ReEvaluateTasks", ReEvaluateTasks));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteWorkflowOptions
+    /// Construct a new FetchWorkflowOptions
     /// </summary>
-    public class DeleteWorkflowOptions : IOptions<WorkflowResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Workflow to delete
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The SID of the Workflow resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteWorkflowOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to delete </param>
-        /// <param name="pathSid"> The SID of the Workflow resource to delete </param>
-        public DeleteWorkflowOptions(string pathWorkspaceSid, string pathSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
+    /// <param name="pathSid"> The SID of the resource </param>
+    public FetchWorkflowOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadWorkflowOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadWorkflowOptions : ReadOptions<WorkflowResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace with the Workflow to read
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// The friendly_name of the Workflow resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadWorkflowOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to read </param>
-        public ReadWorkflowOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateWorkflowOptions
+  /// </summary>
+  public class UpdateWorkflowOptions : IOptions<WorkflowResource>
+  {
     /// <summary>
-    /// CreateWorkflowOptions
+    /// The SID of the Workspace with the Workflow to update
     /// </summary>
-    public class CreateWorkflowOptions : IOptions<WorkflowResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace that the new Workflow to create belongs to
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        ///  descriptive string that you create to describe the Workflow resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// A JSON string that contains the rules to apply to the Workflow
-        /// </summary>
-        public string Configuration { get; }
-        /// <summary>
-        /// The URL from your application that will process task assignment events
-        /// </summary>
-        public Uri AssignmentCallbackUrl { get; set; }
-        /// <summary>
-        /// The URL that we should call when a call to the `assignment_callback_url` fails
-        /// </summary>
-        public Uri FallbackAssignmentCallbackUrl { get; set; }
-        /// <summary>
-        /// How long TaskRouter will wait for a confirmation response from your application after it assigns a Task to a Worker
-        /// </summary>
-        public int? TaskReservationTimeout { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateWorkflowOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Workflow to create belongs to </param>
-        /// <param name="friendlyName">  descriptive string that you create to describe the Workflow resource </param>
-        /// <param name="configuration"> A JSON string that contains the rules to apply to the Workflow </param>
-        public CreateWorkflowOptions(string pathWorkspaceSid, string friendlyName, string configuration)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-            FriendlyName = friendlyName;
-            Configuration = configuration;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Configuration != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Configuration", Configuration));
-            }
-
-            if (AssignmentCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AssignmentCallbackUrl", Serializers.Url(AssignmentCallbackUrl)));
-            }
-
-            if (FallbackAssignmentCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FallbackAssignmentCallbackUrl", Serializers.Url(FallbackAssignmentCallbackUrl)));
-            }
-
-            if (TaskReservationTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskReservationTimeout", TaskReservationTimeout.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    ///  descriptive string that you create to describe the Workflow resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The URL from your application that will process task assignment events
+    /// </summary>
+    public Uri AssignmentCallbackUrl { get; set; }
+    /// <summary>
+    /// The URL that we should call when a call to the `assignment_callback_url` fails
+    /// </summary>
+    public Uri FallbackAssignmentCallbackUrl { get; set; }
+    /// <summary>
+    /// A JSON string that contains the rules to apply to the Workflow
+    /// </summary>
+    public string Configuration { get; set; }
+    /// <summary>
+    /// How long TaskRouter will wait for a confirmation response from your application after it assigns a Task to a Worker
+    /// </summary>
+    public int? TaskReservationTimeout { get; set; }
+    /// <summary>
+    /// Whether or not to re-evaluate Tasks
+    /// </summary>
+    public string ReEvaluateTasks { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateWorkflowOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to update </param>
+    /// <param name="pathSid"> The SID of the resource </param>
+    public UpdateWorkflowOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (AssignmentCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AssignmentCallbackUrl", Serializers.Url(AssignmentCallbackUrl)));
+      }
+
+      if (FallbackAssignmentCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackAssignmentCallbackUrl", Serializers.Url(FallbackAssignmentCallbackUrl)));
+      }
+
+      if (Configuration != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration", Configuration));
+      }
+
+      if (TaskReservationTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskReservationTimeout", TaskReservationTimeout.ToString()));
+      }
+
+      if (ReEvaluateTasks != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ReEvaluateTasks", ReEvaluateTasks));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteWorkflowOptions
+  /// </summary>
+  public class DeleteWorkflowOptions : IOptions<WorkflowResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the Workflow to delete
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The SID of the Workflow resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteWorkflowOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to delete </param>
+    /// <param name="pathSid"> The SID of the Workflow resource to delete </param>
+    public DeleteWorkflowOptions(string pathWorkspaceSid, string pathSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadWorkflowOptions
+  /// </summary>
+  public class ReadWorkflowOptions : ReadOptions<WorkflowResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace with the Workflow to read
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// The friendly_name of the Workflow resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadWorkflowOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to read </param>
+    public ReadWorkflowOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateWorkflowOptions
+  /// </summary>
+  public class CreateWorkflowOptions : IOptions<WorkflowResource>
+  {
+    /// <summary>
+    /// The SID of the Workspace that the new Workflow to create belongs to
+    /// </summary>
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    ///  descriptive string that you create to describe the Workflow resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// A JSON string that contains the rules to apply to the Workflow
+    /// </summary>
+    public string Configuration { get; }
+    /// <summary>
+    /// The URL from your application that will process task assignment events
+    /// </summary>
+    public Uri AssignmentCallbackUrl { get; set; }
+    /// <summary>
+    /// The URL that we should call when a call to the `assignment_callback_url` fails
+    /// </summary>
+    public Uri FallbackAssignmentCallbackUrl { get; set; }
+    /// <summary>
+    /// How long TaskRouter will wait for a confirmation response from your application after it assigns a Task to a Worker
+    /// </summary>
+    public int? TaskReservationTimeout { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateWorkflowOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Workflow to create belongs to </param>
+    /// <param name="friendlyName">  descriptive string that you create to describe the Workflow resource </param>
+    /// <param name="configuration"> A JSON string that contains the rules to apply to the Workflow </param>
+    public CreateWorkflowOptions(string pathWorkspaceSid, string friendlyName, string configuration)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+      FriendlyName = friendlyName;
+      Configuration = configuration;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Configuration != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Configuration", Configuration));
+      }
+
+      if (AssignmentCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AssignmentCallbackUrl", Serializers.Url(AssignmentCallbackUrl)));
+      }
+
+      if (FallbackAssignmentCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FallbackAssignmentCallbackUrl", Serializers.Url(FallbackAssignmentCallbackUrl)));
+      }
+
+      if (TaskReservationTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskReservationTimeout", TaskReservationTimeout.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkflowResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkflowResource.cs
index 642c40dd0..8aef63098 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkflowResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkflowResource.cs
@@ -16,567 +16,567 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
-    public class WorkflowResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchWorkflowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Workflow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workflow </returns>
-        public static WorkflowResource Fetch(FetchWorkflowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Workflow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workflow </returns>
-        public static async System.Threading.Tasks.Task<WorkflowResource> FetchAsync(FetchWorkflowOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
-        /// <param name="pathSid"> The SID of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workflow </returns>
-        public static WorkflowResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkflowOptions(pathWorkspaceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
-        /// <param name="pathSid"> The SID of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workflow </returns>
-        public static async System.Threading.Tasks.Task<WorkflowResource> FetchAsync(string pathWorkspaceSid,
-                                                                                     string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkflowOptions(pathWorkspaceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateWorkflowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Workflow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workflow </returns>
-        public static WorkflowResource Update(UpdateWorkflowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Workflow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workflow </returns>
-        public static async System.Threading.Tasks.Task<WorkflowResource> UpdateAsync(UpdateWorkflowOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to update </param>
-        /// <param name="pathSid"> The SID of the resource </param>
-        /// <param name="friendlyName">  descriptive string that you create to describe the Workflow resource </param>
-        /// <param name="assignmentCallbackUrl"> The URL from your application that will process task assignment events </param>
-        /// <param name="fallbackAssignmentCallbackUrl"> The URL that we should call when a call to the
-        ///                                     `assignment_callback_url` fails </param>
-        /// <param name="configuration"> A JSON string that contains the rules to apply to the Workflow </param>
-        /// <param name="taskReservationTimeout"> How long TaskRouter will wait for a confirmation response from your
-        ///                              application after it assigns a Task to a Worker </param>
-        /// <param name="reEvaluateTasks"> Whether or not to re-evaluate Tasks </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workflow </returns>
-        public static WorkflowResource Update(string pathWorkspaceSid,
-                                              string pathSid,
-                                              string friendlyName = null,
-                                              Uri assignmentCallbackUrl = null,
-                                              Uri fallbackAssignmentCallbackUrl = null,
-                                              string configuration = null,
-                                              int? taskReservationTimeout = null,
-                                              string reEvaluateTasks = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateWorkflowOptions(pathWorkspaceSid, pathSid){FriendlyName = friendlyName, AssignmentCallbackUrl = assignmentCallbackUrl, FallbackAssignmentCallbackUrl = fallbackAssignmentCallbackUrl, Configuration = configuration, TaskReservationTimeout = taskReservationTimeout, ReEvaluateTasks = reEvaluateTasks};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to update </param>
-        /// <param name="pathSid"> The SID of the resource </param>
-        /// <param name="friendlyName">  descriptive string that you create to describe the Workflow resource </param>
-        /// <param name="assignmentCallbackUrl"> The URL from your application that will process task assignment events </param>
-        /// <param name="fallbackAssignmentCallbackUrl"> The URL that we should call when a call to the
-        ///                                     `assignment_callback_url` fails </param>
-        /// <param name="configuration"> A JSON string that contains the rules to apply to the Workflow </param>
-        /// <param name="taskReservationTimeout"> How long TaskRouter will wait for a confirmation response from your
-        ///                              application after it assigns a Task to a Worker </param>
-        /// <param name="reEvaluateTasks"> Whether or not to re-evaluate Tasks </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workflow </returns>
-        public static async System.Threading.Tasks.Task<WorkflowResource> UpdateAsync(string pathWorkspaceSid,
-                                                                                      string pathSid,
-                                                                                      string friendlyName = null,
-                                                                                      Uri assignmentCallbackUrl = null,
-                                                                                      Uri fallbackAssignmentCallbackUrl = null,
-                                                                                      string configuration = null,
-                                                                                      int? taskReservationTimeout = null,
-                                                                                      string reEvaluateTasks = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateWorkflowOptions(pathWorkspaceSid, pathSid){FriendlyName = friendlyName, AssignmentCallbackUrl = assignmentCallbackUrl, FallbackAssignmentCallbackUrl = fallbackAssignmentCallbackUrl, Configuration = configuration, TaskReservationTimeout = taskReservationTimeout, ReEvaluateTasks = reEvaluateTasks};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteWorkflowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Workflow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workflow </returns>
-        public static bool Delete(DeleteWorkflowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Workflow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workflow </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWorkflowOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to delete </param>
-        /// <param name="pathSid"> The SID of the Workflow resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workflow </returns>
-        public static bool Delete(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteWorkflowOptions(pathWorkspaceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to delete </param>
-        /// <param name="pathSid"> The SID of the Workflow resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workflow </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathWorkspaceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteWorkflowOptions(pathWorkspaceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadWorkflowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Workflow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workflow </returns>
-        public static ResourceSet<WorkflowResource> Read(ReadWorkflowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<WorkflowResource>.FromJson("workflows", response.Content);
-            return new ResourceSet<WorkflowResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Workflow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workflow </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WorkflowResource>> ReadAsync(ReadWorkflowOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<WorkflowResource>.FromJson("workflows", response.Content);
-            return new ResourceSet<WorkflowResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to read </param>
-        /// <param name="friendlyName"> The friendly_name of the Workflow resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workflow </returns>
-        public static ResourceSet<WorkflowResource> Read(string pathWorkspaceSid,
-                                                         string friendlyName = null,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadWorkflowOptions(pathWorkspaceSid){FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to read </param>
-        /// <param name="friendlyName"> The friendly_name of the Workflow resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workflow </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WorkflowResource>> ReadAsync(string pathWorkspaceSid,
-                                                                                                 string friendlyName = null,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadWorkflowOptions(pathWorkspaceSid){FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<WorkflowResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<WorkflowResource>.FromJson("workflows", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<WorkflowResource> NextPage(Page<WorkflowResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<WorkflowResource>.FromJson("workflows", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<WorkflowResource> PreviousPage(Page<WorkflowResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<WorkflowResource>.FromJson("workflows", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateWorkflowOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Workflow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workflow </returns>
-        public static WorkflowResource Create(CreateWorkflowOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Workflow parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workflow </returns>
-        public static async System.Threading.Tasks.Task<WorkflowResource> CreateAsync(CreateWorkflowOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Workflow to create belongs to </param>
-        /// <param name="friendlyName">  descriptive string that you create to describe the Workflow resource </param>
-        /// <param name="configuration"> A JSON string that contains the rules to apply to the Workflow </param>
-        /// <param name="assignmentCallbackUrl"> The URL from your application that will process task assignment events </param>
-        /// <param name="fallbackAssignmentCallbackUrl"> The URL that we should call when a call to the
-        ///                                     `assignment_callback_url` fails </param>
-        /// <param name="taskReservationTimeout"> How long TaskRouter will wait for a confirmation response from your
-        ///                              application after it assigns a Task to a Worker </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workflow </returns>
-        public static WorkflowResource Create(string pathWorkspaceSid,
-                                              string friendlyName,
-                                              string configuration,
-                                              Uri assignmentCallbackUrl = null,
-                                              Uri fallbackAssignmentCallbackUrl = null,
-                                              int? taskReservationTimeout = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateWorkflowOptions(pathWorkspaceSid, friendlyName, configuration){AssignmentCallbackUrl = assignmentCallbackUrl, FallbackAssignmentCallbackUrl = fallbackAssignmentCallbackUrl, TaskReservationTimeout = taskReservationTimeout};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Workflow to create belongs to </param>
-        /// <param name="friendlyName">  descriptive string that you create to describe the Workflow resource </param>
-        /// <param name="configuration"> A JSON string that contains the rules to apply to the Workflow </param>
-        /// <param name="assignmentCallbackUrl"> The URL from your application that will process task assignment events </param>
-        /// <param name="fallbackAssignmentCallbackUrl"> The URL that we should call when a call to the
-        ///                                     `assignment_callback_url` fails </param>
-        /// <param name="taskReservationTimeout"> How long TaskRouter will wait for a confirmation response from your
-        ///                              application after it assigns a Task to a Worker </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workflow </returns>
-        public static async System.Threading.Tasks.Task<WorkflowResource> CreateAsync(string pathWorkspaceSid,
-                                                                                      string friendlyName,
-                                                                                      string configuration,
-                                                                                      Uri assignmentCallbackUrl = null,
-                                                                                      Uri fallbackAssignmentCallbackUrl = null,
-                                                                                      int? taskReservationTimeout = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateWorkflowOptions(pathWorkspaceSid, friendlyName, configuration){AssignmentCallbackUrl = assignmentCallbackUrl, FallbackAssignmentCallbackUrl = fallbackAssignmentCallbackUrl, TaskReservationTimeout = taskReservationTimeout};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkflowResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkflowResource object represented by the provided JSON </returns>
-        public static WorkflowResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkflowResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The URL that we call when a task managed by the Workflow is assigned to a Worker
-        /// </summary>
-        [JsonProperty("assignment_callback_url")]
-        public Uri AssignmentCallbackUrl { get; private set; }
-        /// <summary>
-        /// A JSON string that contains the Workflow's configuration
-        /// </summary>
-        [JsonProperty("configuration")]
-        public string Configuration { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The MIME type of the document
-        /// </summary>
-        [JsonProperty("document_content_type")]
-        public string DocumentContentType { get; private set; }
-        /// <summary>
-        /// The URL that we call when a call to the `assignment_callback_url` fails
-        /// </summary>
-        [JsonProperty("fallback_assignment_callback_url")]
-        public Uri FallbackAssignmentCallbackUrl { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the Workflow resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// How long TaskRouter will wait for a confirmation response from your application after it assigns a Task to a Worker
-        /// </summary>
-        [JsonProperty("task_reservation_timeout")]
-        public int? TaskReservationTimeout { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace that contains the Workflow
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Workflow resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private WorkflowResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkflowResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchWorkflowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Workflow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workflow </returns>
+    public static WorkflowResource Fetch(FetchWorkflowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Workflow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workflow </returns>
+    public static async System.Threading.Tasks.Task<WorkflowResource> FetchAsync(FetchWorkflowOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
+    /// <param name="pathSid"> The SID of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workflow </returns>
+    public static WorkflowResource Fetch(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkflowOptions(pathWorkspaceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to fetch </param>
+    /// <param name="pathSid"> The SID of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workflow </returns>
+    public static async System.Threading.Tasks.Task<WorkflowResource> FetchAsync(string pathWorkspaceSid,
+                                                                                 string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkflowOptions(pathWorkspaceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateWorkflowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Workflow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workflow </returns>
+    public static WorkflowResource Update(UpdateWorkflowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Workflow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workflow </returns>
+    public static async System.Threading.Tasks.Task<WorkflowResource> UpdateAsync(UpdateWorkflowOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to update </param>
+    /// <param name="pathSid"> The SID of the resource </param>
+    /// <param name="friendlyName">  descriptive string that you create to describe the Workflow resource </param>
+    /// <param name="assignmentCallbackUrl"> The URL from your application that will process task assignment events </param>
+    /// <param name="fallbackAssignmentCallbackUrl"> The URL that we should call when a call to the
+    ///                                     `assignment_callback_url` fails </param>
+    /// <param name="configuration"> A JSON string that contains the rules to apply to the Workflow </param>
+    /// <param name="taskReservationTimeout"> How long TaskRouter will wait for a confirmation response from your
+    ///                              application after it assigns a Task to a Worker </param>
+    /// <param name="reEvaluateTasks"> Whether or not to re-evaluate Tasks </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workflow </returns>
+    public static WorkflowResource Update(string pathWorkspaceSid,
+                                          string pathSid,
+                                          string friendlyName = null,
+                                          Uri assignmentCallbackUrl = null,
+                                          Uri fallbackAssignmentCallbackUrl = null,
+                                          string configuration = null,
+                                          int? taskReservationTimeout = null,
+                                          string reEvaluateTasks = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateWorkflowOptions(pathWorkspaceSid, pathSid) { FriendlyName = friendlyName, AssignmentCallbackUrl = assignmentCallbackUrl, FallbackAssignmentCallbackUrl = fallbackAssignmentCallbackUrl, Configuration = configuration, TaskReservationTimeout = taskReservationTimeout, ReEvaluateTasks = reEvaluateTasks };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to update </param>
+    /// <param name="pathSid"> The SID of the resource </param>
+    /// <param name="friendlyName">  descriptive string that you create to describe the Workflow resource </param>
+    /// <param name="assignmentCallbackUrl"> The URL from your application that will process task assignment events </param>
+    /// <param name="fallbackAssignmentCallbackUrl"> The URL that we should call when a call to the
+    ///                                     `assignment_callback_url` fails </param>
+    /// <param name="configuration"> A JSON string that contains the rules to apply to the Workflow </param>
+    /// <param name="taskReservationTimeout"> How long TaskRouter will wait for a confirmation response from your
+    ///                              application after it assigns a Task to a Worker </param>
+    /// <param name="reEvaluateTasks"> Whether or not to re-evaluate Tasks </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workflow </returns>
+    public static async System.Threading.Tasks.Task<WorkflowResource> UpdateAsync(string pathWorkspaceSid,
+                                                                                  string pathSid,
+                                                                                  string friendlyName = null,
+                                                                                  Uri assignmentCallbackUrl = null,
+                                                                                  Uri fallbackAssignmentCallbackUrl = null,
+                                                                                  string configuration = null,
+                                                                                  int? taskReservationTimeout = null,
+                                                                                  string reEvaluateTasks = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateWorkflowOptions(pathWorkspaceSid, pathSid) { FriendlyName = friendlyName, AssignmentCallbackUrl = assignmentCallbackUrl, FallbackAssignmentCallbackUrl = fallbackAssignmentCallbackUrl, Configuration = configuration, TaskReservationTimeout = taskReservationTimeout, ReEvaluateTasks = reEvaluateTasks };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteWorkflowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Workflow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workflow </returns>
+    public static bool Delete(DeleteWorkflowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Workflow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workflow </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWorkflowOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to delete </param>
+    /// <param name="pathSid"> The SID of the Workflow resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workflow </returns>
+    public static bool Delete(string pathWorkspaceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteWorkflowOptions(pathWorkspaceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to delete </param>
+    /// <param name="pathSid"> The SID of the Workflow resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workflow </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathWorkspaceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteWorkflowOptions(pathWorkspaceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadWorkflowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Workflow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workflow </returns>
+    public static ResourceSet<WorkflowResource> Read(ReadWorkflowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<WorkflowResource>.FromJson("workflows", response.Content);
+      return new ResourceSet<WorkflowResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Workflow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workflow </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WorkflowResource>> ReadAsync(ReadWorkflowOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<WorkflowResource>.FromJson("workflows", response.Content);
+      return new ResourceSet<WorkflowResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to read </param>
+    /// <param name="friendlyName"> The friendly_name of the Workflow resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workflow </returns>
+    public static ResourceSet<WorkflowResource> Read(string pathWorkspaceSid,
+                                                     string friendlyName = null,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadWorkflowOptions(pathWorkspaceSid) { FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace with the Workflow to read </param>
+    /// <param name="friendlyName"> The friendly_name of the Workflow resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workflow </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WorkflowResource>> ReadAsync(string pathWorkspaceSid,
+                                                                                             string friendlyName = null,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadWorkflowOptions(pathWorkspaceSid) { FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<WorkflowResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<WorkflowResource>.FromJson("workflows", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<WorkflowResource> NextPage(Page<WorkflowResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<WorkflowResource>.FromJson("workflows", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<WorkflowResource> PreviousPage(Page<WorkflowResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<WorkflowResource>.FromJson("workflows", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateWorkflowOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Workflows",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Workflow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workflow </returns>
+    public static WorkflowResource Create(CreateWorkflowOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Workflow parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workflow </returns>
+    public static async System.Threading.Tasks.Task<WorkflowResource> CreateAsync(CreateWorkflowOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Workflow to create belongs to </param>
+    /// <param name="friendlyName">  descriptive string that you create to describe the Workflow resource </param>
+    /// <param name="configuration"> A JSON string that contains the rules to apply to the Workflow </param>
+    /// <param name="assignmentCallbackUrl"> The URL from your application that will process task assignment events </param>
+    /// <param name="fallbackAssignmentCallbackUrl"> The URL that we should call when a call to the
+    ///                                     `assignment_callback_url` fails </param>
+    /// <param name="taskReservationTimeout"> How long TaskRouter will wait for a confirmation response from your
+    ///                              application after it assigns a Task to a Worker </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workflow </returns>
+    public static WorkflowResource Create(string pathWorkspaceSid,
+                                          string friendlyName,
+                                          string configuration,
+                                          Uri assignmentCallbackUrl = null,
+                                          Uri fallbackAssignmentCallbackUrl = null,
+                                          int? taskReservationTimeout = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateWorkflowOptions(pathWorkspaceSid, friendlyName, configuration) { AssignmentCallbackUrl = assignmentCallbackUrl, FallbackAssignmentCallbackUrl = fallbackAssignmentCallbackUrl, TaskReservationTimeout = taskReservationTimeout };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace that the new Workflow to create belongs to </param>
+    /// <param name="friendlyName">  descriptive string that you create to describe the Workflow resource </param>
+    /// <param name="configuration"> A JSON string that contains the rules to apply to the Workflow </param>
+    /// <param name="assignmentCallbackUrl"> The URL from your application that will process task assignment events </param>
+    /// <param name="fallbackAssignmentCallbackUrl"> The URL that we should call when a call to the
+    ///                                     `assignment_callback_url` fails </param>
+    /// <param name="taskReservationTimeout"> How long TaskRouter will wait for a confirmation response from your
+    ///                              application after it assigns a Task to a Worker </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workflow </returns>
+    public static async System.Threading.Tasks.Task<WorkflowResource> CreateAsync(string pathWorkspaceSid,
+                                                                                  string friendlyName,
+                                                                                  string configuration,
+                                                                                  Uri assignmentCallbackUrl = null,
+                                                                                  Uri fallbackAssignmentCallbackUrl = null,
+                                                                                  int? taskReservationTimeout = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateWorkflowOptions(pathWorkspaceSid, friendlyName, configuration) { AssignmentCallbackUrl = assignmentCallbackUrl, FallbackAssignmentCallbackUrl = fallbackAssignmentCallbackUrl, TaskReservationTimeout = taskReservationTimeout };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkflowResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkflowResource object represented by the provided JSON </returns>
+    public static WorkflowResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkflowResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The URL that we call when a task managed by the Workflow is assigned to a Worker
+    /// </summary>
+    [JsonProperty("assignment_callback_url")]
+    public Uri AssignmentCallbackUrl { get; private set; }
+    /// <summary>
+    /// A JSON string that contains the Workflow's configuration
+    /// </summary>
+    [JsonProperty("configuration")]
+    public string Configuration { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The MIME type of the document
+    /// </summary>
+    [JsonProperty("document_content_type")]
+    public string DocumentContentType { get; private set; }
+    /// <summary>
+    /// The URL that we call when a call to the `assignment_callback_url` fails
+    /// </summary>
+    [JsonProperty("fallback_assignment_callback_url")]
+    public Uri FallbackAssignmentCallbackUrl { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the Workflow resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// How long TaskRouter will wait for a confirmation response from your application after it assigns a Task to a Worker
+    /// </summary>
+    [JsonProperty("task_reservation_timeout")]
+    public int? TaskReservationTimeout { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace that contains the Workflow
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Workflow resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private WorkflowResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceCumulativeStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceCumulativeStatisticsOptions.cs
index 3fc12c82d..9c7a103a9 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceCumulativeStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceCumulativeStatisticsOptions.cs
@@ -9,80 +9,80 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
+{
+
+  /// <summary>
+  /// FetchWorkspaceCumulativeStatisticsOptions
+  /// </summary>
+  public class FetchWorkspaceCumulativeStatisticsOptions : IOptions<WorkspaceCumulativeStatisticsResource>
+  {
     /// <summary>
-    /// FetchWorkspaceCumulativeStatisticsOptions
+    /// The SID of the Workspace to fetch
     /// </summary>
-    public class FetchWorkspaceCumulativeStatisticsOptions : IOptions<WorkspaceCumulativeStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Only calculate statistics since this many minutes in the past
-        /// </summary>
-        public int? Minutes { get; set; }
-        /// <summary>
-        /// Only calculate statistics from on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only calculate cumulative statistics on this TaskChannel
-        /// </summary>
-        public string TaskChannel { get; set; }
-        /// <summary>
-        /// A comma separated list of values that describes the thresholds to calculate statistics on
-        /// </summary>
-        public string SplitByWaitTime { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchWorkspaceCumulativeStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
-        public FetchWorkspaceCumulativeStatisticsOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (Minutes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            if (SplitByWaitTime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Only calculate statistics since this many minutes in the past
+    /// </summary>
+    public int? Minutes { get; set; }
+    /// <summary>
+    /// Only calculate statistics from on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only calculate cumulative statistics on this TaskChannel
+    /// </summary>
+    public string TaskChannel { get; set; }
+    /// <summary>
+    /// A comma separated list of values that describes the thresholds to calculate statistics on
+    /// </summary>
+    public string SplitByWaitTime { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchWorkspaceCumulativeStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
+    public FetchWorkspaceCumulativeStatisticsOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (Minutes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      if (SplitByWaitTime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceCumulativeStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceCumulativeStatisticsResource.cs
index 52c768baf..ff7937b9e 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceCumulativeStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceCumulativeStatisticsResource.cs
@@ -16,229 +16,229 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
-    public class WorkspaceCumulativeStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchWorkspaceCumulativeStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/CumulativeStatistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkspaceCumulativeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkspaceCumulativeStatistics </returns>
-        public static WorkspaceCumulativeStatisticsResource Fetch(FetchWorkspaceCumulativeStatisticsOptions options,
-                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkspaceCumulativeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkspaceCumulativeStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkspaceCumulativeStatisticsResource> FetchAsync(FetchWorkspaceCumulativeStatisticsOptions options,
-                                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkspaceCumulativeStatistics </returns>
-        public static WorkspaceCumulativeStatisticsResource Fetch(string pathWorkspaceSid,
-                                                                  DateTime? endDate = null,
-                                                                  int? minutes = null,
-                                                                  DateTime? startDate = null,
-                                                                  string taskChannel = null,
-                                                                  string splitByWaitTime = null,
-                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkspaceCumulativeStatisticsOptions(pathWorkspaceSid){EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
-        /// <param name="endDate"> Only include usage that occurred on or before this date </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkspaceCumulativeStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkspaceCumulativeStatisticsResource> FetchAsync(string pathWorkspaceSid,
-                                                                                                          DateTime? endDate = null,
-                                                                                                          int? minutes = null,
-                                                                                                          DateTime? startDate = null,
-                                                                                                          string taskChannel = null,
-                                                                                                          string splitByWaitTime = null,
-                                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkspaceCumulativeStatisticsOptions(pathWorkspaceSid){EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkspaceCumulativeStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkspaceCumulativeStatisticsResource object represented by the provided JSON </returns>
-        public static WorkspaceCumulativeStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkspaceCumulativeStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The average time in seconds between Task creation and acceptance
-        /// </summary>
-        [JsonProperty("avg_task_acceptance_time")]
-        public int? AvgTaskAcceptanceTime { get; private set; }
-        /// <summary>
-        /// The beginning of the interval during which these statistics were calculated
-        /// </summary>
-        [JsonProperty("start_time")]
-        public DateTime? StartTime { get; private set; }
-        /// <summary>
-        /// The end of the interval during which these statistics were calculated
-        /// </summary>
-        [JsonProperty("end_time")]
-        public DateTime? EndTime { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were created for Workers
-        /// </summary>
-        [JsonProperty("reservations_created")]
-        public int? ReservationsCreated { get; private set; }
-        /// <summary>
-        /// The total number of Reservations accepted by Workers
-        /// </summary>
-        [JsonProperty("reservations_accepted")]
-        public int? ReservationsAccepted { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were rejected
-        /// </summary>
-        [JsonProperty("reservations_rejected")]
-        public int? ReservationsRejected { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were timed out
-        /// </summary>
-        [JsonProperty("reservations_timed_out")]
-        public int? ReservationsTimedOut { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were canceled
-        /// </summary>
-        [JsonProperty("reservations_canceled")]
-        public int? ReservationsCanceled { get; private set; }
-        /// <summary>
-        /// The total number of Reservations that were rescinded
-        /// </summary>
-        [JsonProperty("reservations_rescinded")]
-        public int? ReservationsRescinded { get; private set; }
-        /// <summary>
-        /// A list of objects that describe the Tasks canceled and reservations accepted above and below the specified thresholds
-        /// </summary>
-        [JsonProperty("split_by_wait_time")]
-        public object SplitByWaitTime { get; private set; }
-        /// <summary>
-        /// The wait duration statistics for Tasks that were accepted
-        /// </summary>
-        [JsonProperty("wait_duration_until_accepted")]
-        public object WaitDurationUntilAccepted { get; private set; }
-        /// <summary>
-        /// The wait duration statistics for Tasks that were canceled
-        /// </summary>
-        [JsonProperty("wait_duration_until_canceled")]
-        public object WaitDurationUntilCanceled { get; private set; }
-        /// <summary>
-        /// The total number of Tasks that were canceled
-        /// </summary>
-        [JsonProperty("tasks_canceled")]
-        public int? TasksCanceled { get; private set; }
-        /// <summary>
-        /// The total number of Tasks that were completed
-        /// </summary>
-        [JsonProperty("tasks_completed")]
-        public int? TasksCompleted { get; private set; }
-        /// <summary>
-        /// The total number of Tasks created
-        /// </summary>
-        [JsonProperty("tasks_created")]
-        public int? TasksCreated { get; private set; }
-        /// <summary>
-        /// The total number of Tasks that were deleted
-        /// </summary>
-        [JsonProperty("tasks_deleted")]
-        public int? TasksDeleted { get; private set; }
-        /// <summary>
-        /// The total number of Tasks that were moved from one queue to another
-        /// </summary>
-        [JsonProperty("tasks_moved")]
-        public int? TasksMoved { get; private set; }
-        /// <summary>
-        /// The total number of Tasks that were timed out of their Workflows
-        /// </summary>
-        [JsonProperty("tasks_timed_out_in_workflow")]
-        public int? TasksTimedOutInWorkflow { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Workspace statistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WorkspaceCumulativeStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkspaceCumulativeStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchWorkspaceCumulativeStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/CumulativeStatistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkspaceCumulativeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkspaceCumulativeStatistics </returns>
+    public static WorkspaceCumulativeStatisticsResource Fetch(FetchWorkspaceCumulativeStatisticsOptions options,
+                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkspaceCumulativeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkspaceCumulativeStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkspaceCumulativeStatisticsResource> FetchAsync(FetchWorkspaceCumulativeStatisticsOptions options,
+                                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkspaceCumulativeStatistics </returns>
+    public static WorkspaceCumulativeStatisticsResource Fetch(string pathWorkspaceSid,
+                                                              DateTime? endDate = null,
+                                                              int? minutes = null,
+                                                              DateTime? startDate = null,
+                                                              string taskChannel = null,
+                                                              string splitByWaitTime = null,
+                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkspaceCumulativeStatisticsOptions(pathWorkspaceSid) { EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
+    /// <param name="endDate"> Only include usage that occurred on or before this date </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="taskChannel"> Only calculate cumulative statistics on this TaskChannel </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkspaceCumulativeStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkspaceCumulativeStatisticsResource> FetchAsync(string pathWorkspaceSid,
+                                                                                                      DateTime? endDate = null,
+                                                                                                      int? minutes = null,
+                                                                                                      DateTime? startDate = null,
+                                                                                                      string taskChannel = null,
+                                                                                                      string splitByWaitTime = null,
+                                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkspaceCumulativeStatisticsOptions(pathWorkspaceSid) { EndDate = endDate, Minutes = minutes, StartDate = startDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkspaceCumulativeStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkspaceCumulativeStatisticsResource object represented by the provided JSON </returns>
+    public static WorkspaceCumulativeStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkspaceCumulativeStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The average time in seconds between Task creation and acceptance
+    /// </summary>
+    [JsonProperty("avg_task_acceptance_time")]
+    public int? AvgTaskAcceptanceTime { get; private set; }
+    /// <summary>
+    /// The beginning of the interval during which these statistics were calculated
+    /// </summary>
+    [JsonProperty("start_time")]
+    public DateTime? StartTime { get; private set; }
+    /// <summary>
+    /// The end of the interval during which these statistics were calculated
+    /// </summary>
+    [JsonProperty("end_time")]
+    public DateTime? EndTime { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were created for Workers
+    /// </summary>
+    [JsonProperty("reservations_created")]
+    public int? ReservationsCreated { get; private set; }
+    /// <summary>
+    /// The total number of Reservations accepted by Workers
+    /// </summary>
+    [JsonProperty("reservations_accepted")]
+    public int? ReservationsAccepted { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were rejected
+    /// </summary>
+    [JsonProperty("reservations_rejected")]
+    public int? ReservationsRejected { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were timed out
+    /// </summary>
+    [JsonProperty("reservations_timed_out")]
+    public int? ReservationsTimedOut { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were canceled
+    /// </summary>
+    [JsonProperty("reservations_canceled")]
+    public int? ReservationsCanceled { get; private set; }
+    /// <summary>
+    /// The total number of Reservations that were rescinded
+    /// </summary>
+    [JsonProperty("reservations_rescinded")]
+    public int? ReservationsRescinded { get; private set; }
+    /// <summary>
+    /// A list of objects that describe the Tasks canceled and reservations accepted above and below the specified thresholds
+    /// </summary>
+    [JsonProperty("split_by_wait_time")]
+    public object SplitByWaitTime { get; private set; }
+    /// <summary>
+    /// The wait duration statistics for Tasks that were accepted
+    /// </summary>
+    [JsonProperty("wait_duration_until_accepted")]
+    public object WaitDurationUntilAccepted { get; private set; }
+    /// <summary>
+    /// The wait duration statistics for Tasks that were canceled
+    /// </summary>
+    [JsonProperty("wait_duration_until_canceled")]
+    public object WaitDurationUntilCanceled { get; private set; }
+    /// <summary>
+    /// The total number of Tasks that were canceled
+    /// </summary>
+    [JsonProperty("tasks_canceled")]
+    public int? TasksCanceled { get; private set; }
+    /// <summary>
+    /// The total number of Tasks that were completed
+    /// </summary>
+    [JsonProperty("tasks_completed")]
+    public int? TasksCompleted { get; private set; }
+    /// <summary>
+    /// The total number of Tasks created
+    /// </summary>
+    [JsonProperty("tasks_created")]
+    public int? TasksCreated { get; private set; }
+    /// <summary>
+    /// The total number of Tasks that were deleted
+    /// </summary>
+    [JsonProperty("tasks_deleted")]
+    public int? TasksDeleted { get; private set; }
+    /// <summary>
+    /// The total number of Tasks that were moved from one queue to another
+    /// </summary>
+    [JsonProperty("tasks_moved")]
+    public int? TasksMoved { get; private set; }
+    /// <summary>
+    /// The total number of Tasks that were timed out of their Workflows
+    /// </summary>
+    [JsonProperty("tasks_timed_out_in_workflow")]
+    public int? TasksTimedOutInWorkflow { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Workspace statistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WorkspaceCumulativeStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceRealTimeStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceRealTimeStatisticsOptions.cs
index 4cec41153..34bb39067 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceRealTimeStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceRealTimeStatisticsOptions.cs
@@ -9,44 +9,44 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
+{
+
+  /// <summary>
+  /// FetchWorkspaceRealTimeStatisticsOptions
+  /// </summary>
+  public class FetchWorkspaceRealTimeStatisticsOptions : IOptions<WorkspaceRealTimeStatisticsResource>
+  {
     /// <summary>
-    /// FetchWorkspaceRealTimeStatisticsOptions
+    /// The SID of the Workspace to fetch
     /// </summary>
-    public class FetchWorkspaceRealTimeStatisticsOptions : IOptions<WorkspaceRealTimeStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// Only calculate real-time statistics on this TaskChannel
-        /// </summary>
-        public string TaskChannel { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchWorkspaceRealTimeStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
-        public FetchWorkspaceRealTimeStatisticsOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// Only calculate real-time statistics on this TaskChannel
+    /// </summary>
+    public string TaskChannel { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchWorkspaceRealTimeStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
+    public FetchWorkspaceRealTimeStatisticsOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceRealTimeStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceRealTimeStatisticsResource.cs
index 7b8aabdee..4c6b7e39d 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceRealTimeStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceRealTimeStatisticsResource.cs
@@ -16,156 +16,156 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
-    public class WorkspaceRealTimeStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchWorkspaceRealTimeStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/RealTimeStatistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkspaceRealTimeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkspaceRealTimeStatistics </returns>
-        public static WorkspaceRealTimeStatisticsResource Fetch(FetchWorkspaceRealTimeStatisticsOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkspaceRealTimeStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkspaceRealTimeStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkspaceRealTimeStatisticsResource> FetchAsync(FetchWorkspaceRealTimeStatisticsOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
-        /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkspaceRealTimeStatistics </returns>
-        public static WorkspaceRealTimeStatisticsResource Fetch(string pathWorkspaceSid,
-                                                                string taskChannel = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkspaceRealTimeStatisticsOptions(pathWorkspaceSid){TaskChannel = taskChannel};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
-        /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkspaceRealTimeStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkspaceRealTimeStatisticsResource> FetchAsync(string pathWorkspaceSid,
-                                                                                                        string taskChannel = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkspaceRealTimeStatisticsOptions(pathWorkspaceSid){TaskChannel = taskChannel};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkspaceRealTimeStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkspaceRealTimeStatisticsResource object represented by the provided JSON </returns>
-        public static WorkspaceRealTimeStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkspaceRealTimeStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The number of current Workers by Activity
-        /// </summary>
-        [JsonProperty("activity_statistics")]
-        public List<object> ActivityStatistics { get; private set; }
-        /// <summary>
-        /// The age of the longest waiting Task
-        /// </summary>
-        [JsonProperty("longest_task_waiting_age")]
-        public int? LongestTaskWaitingAge { get; private set; }
-        /// <summary>
-        /// The SID of the longest waiting Task
-        /// </summary>
-        [JsonProperty("longest_task_waiting_sid")]
-        public string LongestTaskWaitingSid { get; private set; }
-        /// <summary>
-        /// The number of Tasks by priority
-        /// </summary>
-        [JsonProperty("tasks_by_priority")]
-        public object TasksByPriority { get; private set; }
-        /// <summary>
-        /// The number of Tasks by their current status
-        /// </summary>
-        [JsonProperty("tasks_by_status")]
-        public object TasksByStatus { get; private set; }
-        /// <summary>
-        /// The total number of Tasks
-        /// </summary>
-        [JsonProperty("total_tasks")]
-        public int? TotalTasks { get; private set; }
-        /// <summary>
-        /// The total number of Workers in the Workspace
-        /// </summary>
-        [JsonProperty("total_workers")]
-        public int? TotalWorkers { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Workspace statistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WorkspaceRealTimeStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkspaceRealTimeStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchWorkspaceRealTimeStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/RealTimeStatistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkspaceRealTimeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkspaceRealTimeStatistics </returns>
+    public static WorkspaceRealTimeStatisticsResource Fetch(FetchWorkspaceRealTimeStatisticsOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkspaceRealTimeStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkspaceRealTimeStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkspaceRealTimeStatisticsResource> FetchAsync(FetchWorkspaceRealTimeStatisticsOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
+    /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkspaceRealTimeStatistics </returns>
+    public static WorkspaceRealTimeStatisticsResource Fetch(string pathWorkspaceSid,
+                                                            string taskChannel = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkspaceRealTimeStatisticsOptions(pathWorkspaceSid) { TaskChannel = taskChannel };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
+    /// <param name="taskChannel"> Only calculate real-time statistics on this TaskChannel </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkspaceRealTimeStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkspaceRealTimeStatisticsResource> FetchAsync(string pathWorkspaceSid,
+                                                                                                    string taskChannel = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkspaceRealTimeStatisticsOptions(pathWorkspaceSid) { TaskChannel = taskChannel };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkspaceRealTimeStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkspaceRealTimeStatisticsResource object represented by the provided JSON </returns>
+    public static WorkspaceRealTimeStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkspaceRealTimeStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The number of current Workers by Activity
+    /// </summary>
+    [JsonProperty("activity_statistics")]
+    public List<object> ActivityStatistics { get; private set; }
+    /// <summary>
+    /// The age of the longest waiting Task
+    /// </summary>
+    [JsonProperty("longest_task_waiting_age")]
+    public int? LongestTaskWaitingAge { get; private set; }
+    /// <summary>
+    /// The SID of the longest waiting Task
+    /// </summary>
+    [JsonProperty("longest_task_waiting_sid")]
+    public string LongestTaskWaitingSid { get; private set; }
+    /// <summary>
+    /// The number of Tasks by priority
+    /// </summary>
+    [JsonProperty("tasks_by_priority")]
+    public object TasksByPriority { get; private set; }
+    /// <summary>
+    /// The number of Tasks by their current status
+    /// </summary>
+    [JsonProperty("tasks_by_status")]
+    public object TasksByStatus { get; private set; }
+    /// <summary>
+    /// The total number of Tasks
+    /// </summary>
+    [JsonProperty("total_tasks")]
+    public int? TotalTasks { get; private set; }
+    /// <summary>
+    /// The total number of Workers in the Workspace
+    /// </summary>
+    [JsonProperty("total_workers")]
+    public int? TotalWorkers { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Workspace statistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WorkspaceRealTimeStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceStatisticsOptions.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceStatisticsOptions.cs
index 8525700a4..94a0b7f7f 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceStatisticsOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceStatisticsOptions.cs
@@ -9,80 +9,80 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
+{
+
+  /// <summary>
+  /// FetchWorkspaceStatisticsOptions
+  /// </summary>
+  public class FetchWorkspaceStatisticsOptions : IOptions<WorkspaceStatisticsResource>
+  {
     /// <summary>
-    /// FetchWorkspaceStatisticsOptions
+    /// The SID of the Workspace to fetch
     /// </summary>
-    public class FetchWorkspaceStatisticsOptions : IOptions<WorkspaceStatisticsResource>
-    {
-        /// <summary>
-        /// The SID of the Workspace to fetch
-        /// </summary>
-        public string PathWorkspaceSid { get; }
-        /// <summary>
-        /// Only calculate statistics since this many minutes in the past
-        /// </summary>
-        public int? Minutes { get; set; }
-        /// <summary>
-        /// Only calculate statistics from on or after this date
-        /// </summary>
-        public DateTime? StartDate { get; set; }
-        /// <summary>
-        /// Only calculate statistics from this date and time and earlier
-        /// </summary>
-        public DateTime? EndDate { get; set; }
-        /// <summary>
-        /// Only calculate statistics on this TaskChannel.
-        /// </summary>
-        public string TaskChannel { get; set; }
-        /// <summary>
-        /// A comma separated list of values that describes the thresholds to calculate statistics on
-        /// </summary>
-        public string SplitByWaitTime { get; set; }
-
-        /// <summary>
-        /// Construct a new FetchWorkspaceStatisticsOptions
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
-        public FetchWorkspaceStatisticsOptions(string pathWorkspaceSid)
-        {
-            PathWorkspaceSid = pathWorkspaceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Minutes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
-            }
-
-            if (StartDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
-            }
-
-            if (EndDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
-            }
-
-            if (TaskChannel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
-            }
-
-            if (SplitByWaitTime != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
-            }
-
-            return p;
-        }
-    }
+    public string PathWorkspaceSid { get; }
+    /// <summary>
+    /// Only calculate statistics since this many minutes in the past
+    /// </summary>
+    public int? Minutes { get; set; }
+    /// <summary>
+    /// Only calculate statistics from on or after this date
+    /// </summary>
+    public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// Only calculate statistics from this date and time and earlier
+    /// </summary>
+    public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Only calculate statistics on this TaskChannel.
+    /// </summary>
+    public string TaskChannel { get; set; }
+    /// <summary>
+    /// A comma separated list of values that describes the thresholds to calculate statistics on
+    /// </summary>
+    public string SplitByWaitTime { get; set; }
+
+    /// <summary>
+    /// Construct a new FetchWorkspaceStatisticsOptions
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
+    public FetchWorkspaceStatisticsOptions(string pathWorkspaceSid)
+    {
+      PathWorkspaceSid = pathWorkspaceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Minutes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Minutes", Minutes.ToString()));
+      }
+
+      if (StartDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StartDate", Serializers.DateTimeIso8601(StartDate)));
+      }
+
+      if (EndDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EndDate", Serializers.DateTimeIso8601(EndDate)));
+      }
+
+      if (TaskChannel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TaskChannel", TaskChannel));
+      }
+
+      if (SplitByWaitTime != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SplitByWaitTime", SplitByWaitTime));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceStatisticsResource.cs b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceStatisticsResource.cs
index dbf43b77c..afbcdf6cf 100644
--- a/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceStatisticsResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/Workspace/WorkspaceStatisticsResource.cs
@@ -16,149 +16,149 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Taskrouter.V1.Workspace
-{
-
-    public class WorkspaceStatisticsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchWorkspaceStatisticsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathWorkspaceSid + "/Statistics",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkspaceStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkspaceStatistics </returns>
-        public static WorkspaceStatisticsResource Fetch(FetchWorkspaceStatisticsOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch WorkspaceStatistics parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkspaceStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkspaceStatisticsResource> FetchAsync(FetchWorkspaceStatisticsOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="endDate"> Only calculate statistics from this date and time and earlier </param>
-        /// <param name="taskChannel"> Only calculate statistics on this TaskChannel.  </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of WorkspaceStatistics </returns>
-        public static WorkspaceStatisticsResource Fetch(string pathWorkspaceSid,
-                                                        int? minutes = null,
-                                                        DateTime? startDate = null,
-                                                        DateTime? endDate = null,
-                                                        string taskChannel = null,
-                                                        string splitByWaitTime = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkspaceStatisticsOptions(pathWorkspaceSid){Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime};
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
-        /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
-        /// <param name="startDate"> Only calculate statistics from on or after this date </param>
-        /// <param name="endDate"> Only calculate statistics from this date and time and earlier </param>
-        /// <param name="taskChannel"> Only calculate statistics on this TaskChannel.  </param>
-        /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
-        ///                       statistics on </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of WorkspaceStatistics </returns>
-        public static async System.Threading.Tasks.Task<WorkspaceStatisticsResource> FetchAsync(string pathWorkspaceSid,
-                                                                                                int? minutes = null,
-                                                                                                DateTime? startDate = null,
-                                                                                                DateTime? endDate = null,
-                                                                                                string taskChannel = null,
-                                                                                                string splitByWaitTime = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkspaceStatisticsOptions(pathWorkspaceSid){Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime};
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkspaceStatisticsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkspaceStatisticsResource object represented by the provided JSON </returns>
-        public static WorkspaceStatisticsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkspaceStatisticsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// n object that contains the real-time statistics for the Workspace
-        /// </summary>
-        [JsonProperty("realtime")]
-        public object Realtime { get; private set; }
-        /// <summary>
-        /// An object that contains the cumulative statistics for the Workspace
-        /// </summary>
-        [JsonProperty("cumulative")]
-        public object Cumulative { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Workspace
-        /// </summary>
-        [JsonProperty("workspace_sid")]
-        public string WorkspaceSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Workspace statistics resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WorkspaceStatisticsResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkspaceStatisticsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchWorkspaceStatisticsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathWorkspaceSid + "/Statistics",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkspaceStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkspaceStatistics </returns>
+    public static WorkspaceStatisticsResource Fetch(FetchWorkspaceStatisticsOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch WorkspaceStatistics parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkspaceStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkspaceStatisticsResource> FetchAsync(FetchWorkspaceStatisticsOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="endDate"> Only calculate statistics from this date and time and earlier </param>
+    /// <param name="taskChannel"> Only calculate statistics on this TaskChannel.  </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of WorkspaceStatistics </returns>
+    public static WorkspaceStatisticsResource Fetch(string pathWorkspaceSid,
+                                                    int? minutes = null,
+                                                    DateTime? startDate = null,
+                                                    DateTime? endDate = null,
+                                                    string taskChannel = null,
+                                                    string splitByWaitTime = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkspaceStatisticsOptions(pathWorkspaceSid) { Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime };
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathWorkspaceSid"> The SID of the Workspace to fetch </param>
+    /// <param name="minutes"> Only calculate statistics since this many minutes in the past </param>
+    /// <param name="startDate"> Only calculate statistics from on or after this date </param>
+    /// <param name="endDate"> Only calculate statistics from this date and time and earlier </param>
+    /// <param name="taskChannel"> Only calculate statistics on this TaskChannel.  </param>
+    /// <param name="splitByWaitTime"> A comma separated list of values that describes the thresholds to calculate
+    ///                       statistics on </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of WorkspaceStatistics </returns>
+    public static async System.Threading.Tasks.Task<WorkspaceStatisticsResource> FetchAsync(string pathWorkspaceSid,
+                                                                                            int? minutes = null,
+                                                                                            DateTime? startDate = null,
+                                                                                            DateTime? endDate = null,
+                                                                                            string taskChannel = null,
+                                                                                            string splitByWaitTime = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkspaceStatisticsOptions(pathWorkspaceSid) { Minutes = minutes, StartDate = startDate, EndDate = endDate, TaskChannel = taskChannel, SplitByWaitTime = splitByWaitTime };
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkspaceStatisticsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkspaceStatisticsResource object represented by the provided JSON </returns>
+    public static WorkspaceStatisticsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkspaceStatisticsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// n object that contains the real-time statistics for the Workspace
+    /// </summary>
+    [JsonProperty("realtime")]
+    public object Realtime { get; private set; }
+    /// <summary>
+    /// An object that contains the cumulative statistics for the Workspace
+    /// </summary>
+    [JsonProperty("cumulative")]
+    public object Cumulative { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Workspace
+    /// </summary>
+    [JsonProperty("workspace_sid")]
+    public string WorkspaceSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Workspace statistics resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WorkspaceStatisticsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/WorkspaceOptions.cs b/src/Twilio/Rest/Taskrouter/V1/WorkspaceOptions.cs
index e8d1f71c0..528954d64 100644
--- a/src/Twilio/Rest/Taskrouter/V1/WorkspaceOptions.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/WorkspaceOptions.cs
@@ -9,265 +9,265 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Taskrouter.V1
-{
-
+{
+
+  /// <summary>
+  /// FetchWorkspaceOptions
+  /// </summary>
+  public class FetchWorkspaceOptions : IOptions<WorkspaceResource>
+  {
     /// <summary>
-    /// FetchWorkspaceOptions
+    /// The SID of the resource to fetch
     /// </summary>
-    public class FetchWorkspaceOptions : IOptions<WorkspaceResource>
-    {
-        /// <summary>
-        /// The SID of the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchWorkspaceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        public FetchWorkspaceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// UpdateWorkspaceOptions
+    /// Construct a new FetchWorkspaceOptions
     /// </summary>
-    public class UpdateWorkspaceOptions : IOptions<WorkspaceResource>
-    {
-        /// <summary>
-        /// The SID of the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The SID of the Activity that will be used when new Workers are created in the Workspace
-        /// </summary>
-        public string DefaultActivitySid { get; set; }
-        /// <summary>
-        /// The URL we should call when an event occurs
-        /// </summary>
-        public Uri EventCallbackUrl { get; set; }
-        /// <summary>
-        /// The list of Workspace events for which to call event_callback_url
-        /// </summary>
-        public string EventsFilter { get; set; }
-        /// <summary>
-        /// A string to describe the Workspace resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Whether multi-tasking is enabled
-        /// </summary>
-        public bool? MultiTaskEnabled { get; set; }
-        /// <summary>
-        /// The SID of the Activity that will be assigned to a Worker when a Task reservation times out without a response
-        /// </summary>
-        public string TimeoutActivitySid { get; set; }
-        /// <summary>
-        /// The type of TaskQueue to prioritize when Workers are receiving Tasks from both types of TaskQueues
-        /// </summary>
-        public WorkspaceResource.QueueOrderEnum PrioritizeQueueOrder { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateWorkspaceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        public UpdateWorkspaceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DefaultActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultActivitySid", DefaultActivitySid.ToString()));
-            }
-
-            if (EventCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EventCallbackUrl", Serializers.Url(EventCallbackUrl)));
-            }
-
-            if (EventsFilter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EventsFilter", EventsFilter));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (MultiTaskEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MultiTaskEnabled", MultiTaskEnabled.Value.ToString().ToLower()));
-            }
-
-            if (TimeoutActivitySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TimeoutActivitySid", TimeoutActivitySid.ToString()));
-            }
-
-            if (PrioritizeQueueOrder != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrioritizeQueueOrder", PrioritizeQueueOrder.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    public FetchWorkspaceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadWorkspaceOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadWorkspaceOptions : ReadOptions<WorkspaceResource>
-    {
-        /// <summary>
-        /// The friendly_name of the Workspace resources to read
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateWorkspaceOptions
+  /// </summary>
+  public class UpdateWorkspaceOptions : IOptions<WorkspaceResource>
+  {
     /// <summary>
-    /// CreateWorkspaceOptions
+    /// The SID of the resource to update
     /// </summary>
-    public class CreateWorkspaceOptions : IOptions<WorkspaceResource>
-    {
-        /// <summary>
-        /// A string to describe the Workspace resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The URL we should call when an event occurs
-        /// </summary>
-        public Uri EventCallbackUrl { get; set; }
-        /// <summary>
-        /// The list of Workspace events for which to call event_callback_url
-        /// </summary>
-        public string EventsFilter { get; set; }
-        /// <summary>
-        /// Whether multi-tasking is enabled
-        /// </summary>
-        public bool? MultiTaskEnabled { get; set; }
-        /// <summary>
-        /// An available template name
-        /// </summary>
-        public string Template { get; set; }
-        /// <summary>
-        /// The type of TaskQueue to prioritize when Workers are receiving Tasks from both types of TaskQueues
-        /// </summary>
-        public WorkspaceResource.QueueOrderEnum PrioritizeQueueOrder { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateWorkspaceOptions
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the Workspace resource </param>
-        public CreateWorkspaceOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (EventCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EventCallbackUrl", Serializers.Url(EventCallbackUrl)));
-            }
-
-            if (EventsFilter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EventsFilter", EventsFilter));
-            }
-
-            if (MultiTaskEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MultiTaskEnabled", MultiTaskEnabled.Value.ToString().ToLower()));
-            }
-
-            if (Template != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Template", Template));
-            }
-
-            if (PrioritizeQueueOrder != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PrioritizeQueueOrder", PrioritizeQueueOrder.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
     /// <summary>
-    /// DeleteWorkspaceOptions
+    /// The SID of the Activity that will be used when new Workers are created in the Workspace
     /// </summary>
-    public class DeleteWorkspaceOptions : IOptions<WorkspaceResource>
-    {
-        /// <summary>
-        /// The SID of the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteWorkspaceOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        public DeleteWorkspaceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string DefaultActivitySid { get; set; }
+    /// <summary>
+    /// The URL we should call when an event occurs
+    /// </summary>
+    public Uri EventCallbackUrl { get; set; }
+    /// <summary>
+    /// The list of Workspace events for which to call event_callback_url
+    /// </summary>
+    public string EventsFilter { get; set; }
+    /// <summary>
+    /// A string to describe the Workspace resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Whether multi-tasking is enabled
+    /// </summary>
+    public bool? MultiTaskEnabled { get; set; }
+    /// <summary>
+    /// The SID of the Activity that will be assigned to a Worker when a Task reservation times out without a response
+    /// </summary>
+    public string TimeoutActivitySid { get; set; }
+    /// <summary>
+    /// The type of TaskQueue to prioritize when Workers are receiving Tasks from both types of TaskQueues
+    /// </summary>
+    public WorkspaceResource.QueueOrderEnum PrioritizeQueueOrder { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateWorkspaceOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    public UpdateWorkspaceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DefaultActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultActivitySid", DefaultActivitySid.ToString()));
+      }
+
+      if (EventCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EventCallbackUrl", Serializers.Url(EventCallbackUrl)));
+      }
+
+      if (EventsFilter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EventsFilter", EventsFilter));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (MultiTaskEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MultiTaskEnabled", MultiTaskEnabled.Value.ToString().ToLower()));
+      }
+
+      if (TimeoutActivitySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TimeoutActivitySid", TimeoutActivitySid.ToString()));
+      }
+
+      if (PrioritizeQueueOrder != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrioritizeQueueOrder", PrioritizeQueueOrder.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadWorkspaceOptions
+  /// </summary>
+  public class ReadWorkspaceOptions : ReadOptions<WorkspaceResource>
+  {
+    /// <summary>
+    /// The friendly_name of the Workspace resources to read
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateWorkspaceOptions
+  /// </summary>
+  public class CreateWorkspaceOptions : IOptions<WorkspaceResource>
+  {
+    /// <summary>
+    /// A string to describe the Workspace resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The URL we should call when an event occurs
+    /// </summary>
+    public Uri EventCallbackUrl { get; set; }
+    /// <summary>
+    /// The list of Workspace events for which to call event_callback_url
+    /// </summary>
+    public string EventsFilter { get; set; }
+    /// <summary>
+    /// Whether multi-tasking is enabled
+    /// </summary>
+    public bool? MultiTaskEnabled { get; set; }
+    /// <summary>
+    /// An available template name
+    /// </summary>
+    public string Template { get; set; }
+    /// <summary>
+    /// The type of TaskQueue to prioritize when Workers are receiving Tasks from both types of TaskQueues
+    /// </summary>
+    public WorkspaceResource.QueueOrderEnum PrioritizeQueueOrder { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateWorkspaceOptions
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the Workspace resource </param>
+    public CreateWorkspaceOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (EventCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EventCallbackUrl", Serializers.Url(EventCallbackUrl)));
+      }
+
+      if (EventsFilter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EventsFilter", EventsFilter));
+      }
+
+      if (MultiTaskEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MultiTaskEnabled", MultiTaskEnabled.Value.ToString().ToLower()));
+      }
+
+      if (Template != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Template", Template));
+      }
+
+      if (PrioritizeQueueOrder != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PrioritizeQueueOrder", PrioritizeQueueOrder.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteWorkspaceOptions
+  /// </summary>
+  public class DeleteWorkspaceOptions : IOptions<WorkspaceResource>
+  {
+    /// <summary>
+    /// The SID of the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteWorkspaceOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    public DeleteWorkspaceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Taskrouter/V1/WorkspaceResource.cs b/src/Twilio/Rest/Taskrouter/V1/WorkspaceResource.cs
index d3a37fefb..15227b498 100644
--- a/src/Twilio/Rest/Taskrouter/V1/WorkspaceResource.cs
+++ b/src/Twilio/Rest/Taskrouter/V1/WorkspaceResource.cs
@@ -17,580 +17,580 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Taskrouter.V1
-{
-
-    public class WorkspaceResource : Resource
-    {
-        public sealed class QueueOrderEnum : StringEnum
-        {
-            private QueueOrderEnum(string value) : base(value) {}
-            public QueueOrderEnum() {}
-            public static implicit operator QueueOrderEnum(string value)
-            {
-                return new QueueOrderEnum(value);
-            }
-
-            public static readonly QueueOrderEnum Fifo = new QueueOrderEnum("FIFO");
-            public static readonly QueueOrderEnum Lifo = new QueueOrderEnum("LIFO");
-        }
-
-        private static Request BuildFetchRequest(FetchWorkspaceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Workspace parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workspace </returns>
-        public static WorkspaceResource Fetch(FetchWorkspaceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Workspace parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workspace </returns>
-        public static async System.Threading.Tasks.Task<WorkspaceResource> FetchAsync(FetchWorkspaceOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workspace </returns>
-        public static WorkspaceResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkspaceOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID of the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workspace </returns>
-        public static async System.Threading.Tasks.Task<WorkspaceResource> FetchAsync(string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchWorkspaceOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateWorkspaceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Workspace parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workspace </returns>
-        public static WorkspaceResource Update(UpdateWorkspaceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Workspace parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workspace </returns>
-        public static async System.Threading.Tasks.Task<WorkspaceResource> UpdateAsync(UpdateWorkspaceOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        /// <param name="defaultActivitySid"> The SID of the Activity that will be used when new Workers are created in the
-        ///                          Workspace </param>
-        /// <param name="eventCallbackUrl"> The URL we should call when an event occurs </param>
-        /// <param name="eventsFilter"> The list of Workspace events for which to call event_callback_url </param>
-        /// <param name="friendlyName"> A string to describe the Workspace resource </param>
-        /// <param name="multiTaskEnabled"> Whether multi-tasking is enabled </param>
-        /// <param name="timeoutActivitySid"> The SID of the Activity that will be assigned to a Worker when a Task reservation
-        ///                          times out without a response </param>
-        /// <param name="prioritizeQueueOrder"> The type of TaskQueue to prioritize when Workers are receiving Tasks from both
-        ///                            types of TaskQueues </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workspace </returns>
-        public static WorkspaceResource Update(string pathSid,
-                                               string defaultActivitySid = null,
-                                               Uri eventCallbackUrl = null,
-                                               string eventsFilter = null,
-                                               string friendlyName = null,
-                                               bool? multiTaskEnabled = null,
-                                               string timeoutActivitySid = null,
-                                               WorkspaceResource.QueueOrderEnum prioritizeQueueOrder = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateWorkspaceOptions(pathSid){DefaultActivitySid = defaultActivitySid, EventCallbackUrl = eventCallbackUrl, EventsFilter = eventsFilter, FriendlyName = friendlyName, MultiTaskEnabled = multiTaskEnabled, TimeoutActivitySid = timeoutActivitySid, PrioritizeQueueOrder = prioritizeQueueOrder};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID of the resource to update </param>
-        /// <param name="defaultActivitySid"> The SID of the Activity that will be used when new Workers are created in the
-        ///                          Workspace </param>
-        /// <param name="eventCallbackUrl"> The URL we should call when an event occurs </param>
-        /// <param name="eventsFilter"> The list of Workspace events for which to call event_callback_url </param>
-        /// <param name="friendlyName"> A string to describe the Workspace resource </param>
-        /// <param name="multiTaskEnabled"> Whether multi-tasking is enabled </param>
-        /// <param name="timeoutActivitySid"> The SID of the Activity that will be assigned to a Worker when a Task reservation
-        ///                          times out without a response </param>
-        /// <param name="prioritizeQueueOrder"> The type of TaskQueue to prioritize when Workers are receiving Tasks from both
-        ///                            types of TaskQueues </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workspace </returns>
-        public static async System.Threading.Tasks.Task<WorkspaceResource> UpdateAsync(string pathSid,
-                                                                                       string defaultActivitySid = null,
-                                                                                       Uri eventCallbackUrl = null,
-                                                                                       string eventsFilter = null,
-                                                                                       string friendlyName = null,
-                                                                                       bool? multiTaskEnabled = null,
-                                                                                       string timeoutActivitySid = null,
-                                                                                       WorkspaceResource.QueueOrderEnum prioritizeQueueOrder = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateWorkspaceOptions(pathSid){DefaultActivitySid = defaultActivitySid, EventCallbackUrl = eventCallbackUrl, EventsFilter = eventsFilter, FriendlyName = friendlyName, MultiTaskEnabled = multiTaskEnabled, TimeoutActivitySid = timeoutActivitySid, PrioritizeQueueOrder = prioritizeQueueOrder};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadWorkspaceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Workspace parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workspace </returns>
-        public static ResourceSet<WorkspaceResource> Read(ReadWorkspaceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<WorkspaceResource>.FromJson("workspaces", response.Content);
-            return new ResourceSet<WorkspaceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Workspace parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workspace </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WorkspaceResource>> ReadAsync(ReadWorkspaceOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<WorkspaceResource>.FromJson("workspaces", response.Content);
-            return new ResourceSet<WorkspaceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="friendlyName"> The friendly_name of the Workspace resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workspace </returns>
-        public static ResourceSet<WorkspaceResource> Read(string friendlyName = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadWorkspaceOptions(){FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="friendlyName"> The friendly_name of the Workspace resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workspace </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WorkspaceResource>> ReadAsync(string friendlyName = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadWorkspaceOptions(){FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<WorkspaceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<WorkspaceResource>.FromJson("workspaces", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<WorkspaceResource> NextPage(Page<WorkspaceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<WorkspaceResource>.FromJson("workspaces", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<WorkspaceResource> PreviousPage(Page<WorkspaceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
-            );
-
-            var response = client.Request(request);
-            return Page<WorkspaceResource>.FromJson("workspaces", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateWorkspaceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Workspace parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workspace </returns>
-        public static WorkspaceResource Create(CreateWorkspaceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Workspace parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workspace </returns>
-        public static async System.Threading.Tasks.Task<WorkspaceResource> CreateAsync(CreateWorkspaceOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the Workspace resource </param>
-        /// <param name="eventCallbackUrl"> The URL we should call when an event occurs </param>
-        /// <param name="eventsFilter"> The list of Workspace events for which to call event_callback_url </param>
-        /// <param name="multiTaskEnabled"> Whether multi-tasking is enabled </param>
-        /// <param name="template"> An available template name </param>
-        /// <param name="prioritizeQueueOrder"> The type of TaskQueue to prioritize when Workers are receiving Tasks from both
-        ///                            types of TaskQueues </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workspace </returns>
-        public static WorkspaceResource Create(string friendlyName,
-                                               Uri eventCallbackUrl = null,
-                                               string eventsFilter = null,
-                                               bool? multiTaskEnabled = null,
-                                               string template = null,
-                                               WorkspaceResource.QueueOrderEnum prioritizeQueueOrder = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateWorkspaceOptions(friendlyName){EventCallbackUrl = eventCallbackUrl, EventsFilter = eventsFilter, MultiTaskEnabled = multiTaskEnabled, Template = template, PrioritizeQueueOrder = prioritizeQueueOrder};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the Workspace resource </param>
-        /// <param name="eventCallbackUrl"> The URL we should call when an event occurs </param>
-        /// <param name="eventsFilter"> The list of Workspace events for which to call event_callback_url </param>
-        /// <param name="multiTaskEnabled"> Whether multi-tasking is enabled </param>
-        /// <param name="template"> An available template name </param>
-        /// <param name="prioritizeQueueOrder"> The type of TaskQueue to prioritize when Workers are receiving Tasks from both
-        ///                            types of TaskQueues </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workspace </returns>
-        public static async System.Threading.Tasks.Task<WorkspaceResource> CreateAsync(string friendlyName,
-                                                                                       Uri eventCallbackUrl = null,
-                                                                                       string eventsFilter = null,
-                                                                                       bool? multiTaskEnabled = null,
-                                                                                       string template = null,
-                                                                                       WorkspaceResource.QueueOrderEnum prioritizeQueueOrder = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateWorkspaceOptions(friendlyName){EventCallbackUrl = eventCallbackUrl, EventsFilter = eventsFilter, MultiTaskEnabled = multiTaskEnabled, Template = template, PrioritizeQueueOrder = prioritizeQueueOrder};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteWorkspaceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Taskrouter,
-                "/v1/Workspaces/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Workspace parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workspace </returns>
-        public static bool Delete(DeleteWorkspaceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Workspace parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workspace </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWorkspaceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Workspace </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteWorkspaceOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID of the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Workspace </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteWorkspaceOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a WorkspaceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WorkspaceResource object represented by the provided JSON </returns>
-        public static WorkspaceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WorkspaceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The name of the default activity
-        /// </summary>
-        [JsonProperty("default_activity_name")]
-        public string DefaultActivityName { get; private set; }
-        /// <summary>
-        /// The SID of the Activity that will be used when new Workers are created in the Workspace
-        /// </summary>
-        [JsonProperty("default_activity_sid")]
-        public string DefaultActivitySid { get; private set; }
-        /// <summary>
-        /// The URL we call when an event occurs
-        /// </summary>
-        [JsonProperty("event_callback_url")]
-        public Uri EventCallbackUrl { get; private set; }
-        /// <summary>
-        /// The list of Workspace events for which to call event_callback_url
-        /// </summary>
-        [JsonProperty("events_filter")]
-        public string EventsFilter { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the Workspace resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// Whether multi-tasking is enabled
-        /// </summary>
-        [JsonProperty("multi_task_enabled")]
-        public bool? MultiTaskEnabled { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The name of the timeout activity
-        /// </summary>
-        [JsonProperty("timeout_activity_name")]
-        public string TimeoutActivityName { get; private set; }
-        /// <summary>
-        /// The SID of the Activity that will be assigned to a Worker when a Task reservation times out without a response
-        /// </summary>
-        [JsonProperty("timeout_activity_sid")]
-        public string TimeoutActivitySid { get; private set; }
-        /// <summary>
-        /// The type of TaskQueue to prioritize when Workers are receiving Tasks from both types of TaskQueues
-        /// </summary>
-        [JsonProperty("prioritize_queue_order")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public WorkspaceResource.QueueOrderEnum PrioritizeQueueOrder { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Workspace resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private WorkspaceResource()
-        {
-
-        }
-    }
+{
+
+  public class WorkspaceResource : Resource
+  {
+    public sealed class QueueOrderEnum : StringEnum
+    {
+      private QueueOrderEnum(string value) : base(value) { }
+      public QueueOrderEnum() { }
+      public static implicit operator QueueOrderEnum(string value)
+      {
+        return new QueueOrderEnum(value);
+      }
+
+      public static readonly QueueOrderEnum Fifo = new QueueOrderEnum("FIFO");
+      public static readonly QueueOrderEnum Lifo = new QueueOrderEnum("LIFO");
+    }
+
+    private static Request BuildFetchRequest(FetchWorkspaceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Workspace parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workspace </returns>
+    public static WorkspaceResource Fetch(FetchWorkspaceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Workspace parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workspace </returns>
+    public static async System.Threading.Tasks.Task<WorkspaceResource> FetchAsync(FetchWorkspaceOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workspace </returns>
+    public static WorkspaceResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkspaceOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID of the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workspace </returns>
+    public static async System.Threading.Tasks.Task<WorkspaceResource> FetchAsync(string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchWorkspaceOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateWorkspaceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Workspace parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workspace </returns>
+    public static WorkspaceResource Update(UpdateWorkspaceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Workspace parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workspace </returns>
+    public static async System.Threading.Tasks.Task<WorkspaceResource> UpdateAsync(UpdateWorkspaceOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    /// <param name="defaultActivitySid"> The SID of the Activity that will be used when new Workers are created in the
+    ///                          Workspace </param>
+    /// <param name="eventCallbackUrl"> The URL we should call when an event occurs </param>
+    /// <param name="eventsFilter"> The list of Workspace events for which to call event_callback_url </param>
+    /// <param name="friendlyName"> A string to describe the Workspace resource </param>
+    /// <param name="multiTaskEnabled"> Whether multi-tasking is enabled </param>
+    /// <param name="timeoutActivitySid"> The SID of the Activity that will be assigned to a Worker when a Task reservation
+    ///                          times out without a response </param>
+    /// <param name="prioritizeQueueOrder"> The type of TaskQueue to prioritize when Workers are receiving Tasks from both
+    ///                            types of TaskQueues </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workspace </returns>
+    public static WorkspaceResource Update(string pathSid,
+                                           string defaultActivitySid = null,
+                                           Uri eventCallbackUrl = null,
+                                           string eventsFilter = null,
+                                           string friendlyName = null,
+                                           bool? multiTaskEnabled = null,
+                                           string timeoutActivitySid = null,
+                                           WorkspaceResource.QueueOrderEnum prioritizeQueueOrder = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateWorkspaceOptions(pathSid) { DefaultActivitySid = defaultActivitySid, EventCallbackUrl = eventCallbackUrl, EventsFilter = eventsFilter, FriendlyName = friendlyName, MultiTaskEnabled = multiTaskEnabled, TimeoutActivitySid = timeoutActivitySid, PrioritizeQueueOrder = prioritizeQueueOrder };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID of the resource to update </param>
+    /// <param name="defaultActivitySid"> The SID of the Activity that will be used when new Workers are created in the
+    ///                          Workspace </param>
+    /// <param name="eventCallbackUrl"> The URL we should call when an event occurs </param>
+    /// <param name="eventsFilter"> The list of Workspace events for which to call event_callback_url </param>
+    /// <param name="friendlyName"> A string to describe the Workspace resource </param>
+    /// <param name="multiTaskEnabled"> Whether multi-tasking is enabled </param>
+    /// <param name="timeoutActivitySid"> The SID of the Activity that will be assigned to a Worker when a Task reservation
+    ///                          times out without a response </param>
+    /// <param name="prioritizeQueueOrder"> The type of TaskQueue to prioritize when Workers are receiving Tasks from both
+    ///                            types of TaskQueues </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workspace </returns>
+    public static async System.Threading.Tasks.Task<WorkspaceResource> UpdateAsync(string pathSid,
+                                                                                   string defaultActivitySid = null,
+                                                                                   Uri eventCallbackUrl = null,
+                                                                                   string eventsFilter = null,
+                                                                                   string friendlyName = null,
+                                                                                   bool? multiTaskEnabled = null,
+                                                                                   string timeoutActivitySid = null,
+                                                                                   WorkspaceResource.QueueOrderEnum prioritizeQueueOrder = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateWorkspaceOptions(pathSid) { DefaultActivitySid = defaultActivitySid, EventCallbackUrl = eventCallbackUrl, EventsFilter = eventsFilter, FriendlyName = friendlyName, MultiTaskEnabled = multiTaskEnabled, TimeoutActivitySid = timeoutActivitySid, PrioritizeQueueOrder = prioritizeQueueOrder };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadWorkspaceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Workspace parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workspace </returns>
+    public static ResourceSet<WorkspaceResource> Read(ReadWorkspaceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<WorkspaceResource>.FromJson("workspaces", response.Content);
+      return new ResourceSet<WorkspaceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Workspace parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workspace </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WorkspaceResource>> ReadAsync(ReadWorkspaceOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<WorkspaceResource>.FromJson("workspaces", response.Content);
+      return new ResourceSet<WorkspaceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="friendlyName"> The friendly_name of the Workspace resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workspace </returns>
+    public static ResourceSet<WorkspaceResource> Read(string friendlyName = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadWorkspaceOptions() { FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="friendlyName"> The friendly_name of the Workspace resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workspace </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WorkspaceResource>> ReadAsync(string friendlyName = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadWorkspaceOptions() { FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<WorkspaceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<WorkspaceResource>.FromJson("workspaces", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<WorkspaceResource> NextPage(Page<WorkspaceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<WorkspaceResource>.FromJson("workspaces", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<WorkspaceResource> PreviousPage(Page<WorkspaceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Taskrouter)
+      );
+
+      var response = client.Request(request);
+      return Page<WorkspaceResource>.FromJson("workspaces", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateWorkspaceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Workspace parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workspace </returns>
+    public static WorkspaceResource Create(CreateWorkspaceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Workspace parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workspace </returns>
+    public static async System.Threading.Tasks.Task<WorkspaceResource> CreateAsync(CreateWorkspaceOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the Workspace resource </param>
+    /// <param name="eventCallbackUrl"> The URL we should call when an event occurs </param>
+    /// <param name="eventsFilter"> The list of Workspace events for which to call event_callback_url </param>
+    /// <param name="multiTaskEnabled"> Whether multi-tasking is enabled </param>
+    /// <param name="template"> An available template name </param>
+    /// <param name="prioritizeQueueOrder"> The type of TaskQueue to prioritize when Workers are receiving Tasks from both
+    ///                            types of TaskQueues </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workspace </returns>
+    public static WorkspaceResource Create(string friendlyName,
+                                           Uri eventCallbackUrl = null,
+                                           string eventsFilter = null,
+                                           bool? multiTaskEnabled = null,
+                                           string template = null,
+                                           WorkspaceResource.QueueOrderEnum prioritizeQueueOrder = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateWorkspaceOptions(friendlyName) { EventCallbackUrl = eventCallbackUrl, EventsFilter = eventsFilter, MultiTaskEnabled = multiTaskEnabled, Template = template, PrioritizeQueueOrder = prioritizeQueueOrder };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the Workspace resource </param>
+    /// <param name="eventCallbackUrl"> The URL we should call when an event occurs </param>
+    /// <param name="eventsFilter"> The list of Workspace events for which to call event_callback_url </param>
+    /// <param name="multiTaskEnabled"> Whether multi-tasking is enabled </param>
+    /// <param name="template"> An available template name </param>
+    /// <param name="prioritizeQueueOrder"> The type of TaskQueue to prioritize when Workers are receiving Tasks from both
+    ///                            types of TaskQueues </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workspace </returns>
+    public static async System.Threading.Tasks.Task<WorkspaceResource> CreateAsync(string friendlyName,
+                                                                                   Uri eventCallbackUrl = null,
+                                                                                   string eventsFilter = null,
+                                                                                   bool? multiTaskEnabled = null,
+                                                                                   string template = null,
+                                                                                   WorkspaceResource.QueueOrderEnum prioritizeQueueOrder = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateWorkspaceOptions(friendlyName) { EventCallbackUrl = eventCallbackUrl, EventsFilter = eventsFilter, MultiTaskEnabled = multiTaskEnabled, Template = template, PrioritizeQueueOrder = prioritizeQueueOrder };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteWorkspaceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Taskrouter,
+          "/v1/Workspaces/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Workspace parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workspace </returns>
+    public static bool Delete(DeleteWorkspaceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Workspace parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workspace </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWorkspaceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Workspace </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteWorkspaceOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID of the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Workspace </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteWorkspaceOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a WorkspaceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WorkspaceResource object represented by the provided JSON </returns>
+    public static WorkspaceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WorkspaceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The name of the default activity
+    /// </summary>
+    [JsonProperty("default_activity_name")]
+    public string DefaultActivityName { get; private set; }
+    /// <summary>
+    /// The SID of the Activity that will be used when new Workers are created in the Workspace
+    /// </summary>
+    [JsonProperty("default_activity_sid")]
+    public string DefaultActivitySid { get; private set; }
+    /// <summary>
+    /// The URL we call when an event occurs
+    /// </summary>
+    [JsonProperty("event_callback_url")]
+    public Uri EventCallbackUrl { get; private set; }
+    /// <summary>
+    /// The list of Workspace events for which to call event_callback_url
+    /// </summary>
+    [JsonProperty("events_filter")]
+    public string EventsFilter { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the Workspace resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// Whether multi-tasking is enabled
+    /// </summary>
+    [JsonProperty("multi_task_enabled")]
+    public bool? MultiTaskEnabled { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The name of the timeout activity
+    /// </summary>
+    [JsonProperty("timeout_activity_name")]
+    public string TimeoutActivityName { get; private set; }
+    /// <summary>
+    /// The SID of the Activity that will be assigned to a Worker when a Task reservation times out without a response
+    /// </summary>
+    [JsonProperty("timeout_activity_sid")]
+    public string TimeoutActivitySid { get; private set; }
+    /// <summary>
+    /// The type of TaskQueue to prioritize when Workers are receiving Tasks from both types of TaskQueues
+    /// </summary>
+    [JsonProperty("prioritize_queue_order")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public WorkspaceResource.QueueOrderEnum PrioritizeQueueOrder { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Workspace resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private WorkspaceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trunking/V1/Trunk/CredentialListOptions.cs b/src/Twilio/Rest/Trunking/V1/Trunk/CredentialListOptions.cs
index cf5a2aaf2..b98beecad 100644
--- a/src/Twilio/Rest/Trunking/V1/Trunk/CredentialListOptions.cs
+++ b/src/Twilio/Rest/Trunking/V1/Trunk/CredentialListOptions.cs
@@ -9,150 +9,150 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trunking.V1.Trunk
-{
-
+{
+
+  /// <summary>
+  /// FetchCredentialListOptions
+  /// </summary>
+  public class FetchCredentialListOptions : IOptions<CredentialListResource>
+  {
     /// <summary>
-    /// FetchCredentialListOptions
+    /// The SID of the Trunk from which to fetch the credential list
     /// </summary>
-    public class FetchCredentialListOptions : IOptions<CredentialListResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to fetch the credential list
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCredentialListOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the credential list </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchCredentialListOptions(string pathTrunkSid, string pathSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathTrunkSid { get; }
     /// <summary>
-    /// DeleteCredentialListOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class DeleteCredentialListOptions : IOptions<CredentialListResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to delete the credential list
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCredentialListOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the credential list </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteCredentialListOptions(string pathTrunkSid, string pathSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateCredentialListOptions
+    /// Construct a new FetchCredentialListOptions
     /// </summary>
-    public class CreateCredentialListOptions : IOptions<CredentialListResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk to associate the credential list with
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The SID of the Credential List that you want to associate with the trunk
-        /// </summary>
-        public string CredentialListSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateCredentialListOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk to associate the credential list with </param>
-        /// <param name="credentialListSid"> The SID of the Credential List that you want to associate with the trunk </param>
-        public CreateCredentialListOptions(string pathTrunkSid, string credentialListSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-            CredentialListSid = credentialListSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (CredentialListSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CredentialListSid", CredentialListSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the credential list </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchCredentialListOptions(string pathTrunkSid, string pathSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadCredentialListOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadCredentialListOptions : ReadOptions<CredentialListResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to read the credential lists
-        /// </summary>
-        public string PathTrunkSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadCredentialListOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the credential lists </param>
-        public ReadCredentialListOptions(string pathTrunkSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteCredentialListOptions
+  /// </summary>
+  public class DeleteCredentialListOptions : IOptions<CredentialListResource>
+  {
+    /// <summary>
+    /// The SID of the Trunk from which to delete the credential list
+    /// </summary>
+    public string PathTrunkSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCredentialListOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the credential list </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteCredentialListOptions(string pathTrunkSid, string pathSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateCredentialListOptions
+  /// </summary>
+  public class CreateCredentialListOptions : IOptions<CredentialListResource>
+  {
+    /// <summary>
+    /// The SID of the Trunk to associate the credential list with
+    /// </summary>
+    public string PathTrunkSid { get; }
+    /// <summary>
+    /// The SID of the Credential List that you want to associate with the trunk
+    /// </summary>
+    public string CredentialListSid { get; }
+
+    /// <summary>
+    /// Construct a new CreateCredentialListOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk to associate the credential list with </param>
+    /// <param name="credentialListSid"> The SID of the Credential List that you want to associate with the trunk </param>
+    public CreateCredentialListOptions(string pathTrunkSid, string credentialListSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+      CredentialListSid = credentialListSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (CredentialListSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CredentialListSid", CredentialListSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadCredentialListOptions
+  /// </summary>
+  public class ReadCredentialListOptions : ReadOptions<CredentialListResource>
+  {
+    /// <summary>
+    /// The SID of the Trunk from which to read the credential lists
+    /// </summary>
+    public string PathTrunkSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadCredentialListOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the credential lists </param>
+    public ReadCredentialListOptions(string pathTrunkSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trunking/V1/Trunk/CredentialListResource.cs b/src/Twilio/Rest/Trunking/V1/Trunk/CredentialListResource.cs
index 1d3cdefc1..017e36341 100644
--- a/src/Twilio/Rest/Trunking/V1/Trunk/CredentialListResource.cs
+++ b/src/Twilio/Rest/Trunking/V1/Trunk/CredentialListResource.cs
@@ -16,414 +16,414 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Trunking.V1.Trunk
-{
-
-    public class CredentialListResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchCredentialListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/CredentialLists/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static CredentialListResource Fetch(FetchCredentialListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<CredentialListResource> FetchAsync(FetchCredentialListOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the credential list </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static CredentialListResource Fetch(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialListOptions(pathTrunkSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the credential list </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<CredentialListResource> FetchAsync(string pathTrunkSid,
-                                                                                           string pathSid,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchCredentialListOptions(pathTrunkSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCredentialListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/CredentialLists/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static bool Delete(DeleteCredentialListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialListOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the credential list </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static bool Delete(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialListOptions(pathTrunkSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the credential list </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathTrunkSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteCredentialListOptions(pathTrunkSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateCredentialListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/CredentialLists",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static CredentialListResource Create(CreateCredentialListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<CredentialListResource> CreateAsync(CreateCredentialListOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk to associate the credential list with </param>
-        /// <param name="credentialListSid"> The SID of the Credential List that you want to associate with the trunk </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static CredentialListResource Create(string pathTrunkSid,
-                                                    string credentialListSid,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialListOptions(pathTrunkSid, credentialListSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk to associate the credential list with </param>
-        /// <param name="credentialListSid"> The SID of the Credential List that you want to associate with the trunk </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<CredentialListResource> CreateAsync(string pathTrunkSid,
-                                                                                            string credentialListSid,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateCredentialListOptions(pathTrunkSid, credentialListSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCredentialListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/CredentialLists",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static ResourceSet<CredentialListResource> Read(ReadCredentialListOptions options,
-                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CredentialListResource>.FromJson("credential_lists", response.Content);
-            return new ResourceSet<CredentialListResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read CredentialList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialListResource>> ReadAsync(ReadCredentialListOptions options,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CredentialListResource>.FromJson("credential_lists", response.Content);
-            return new ResourceSet<CredentialListResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the credential lists </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CredentialList </returns>
-        public static ResourceSet<CredentialListResource> Read(string pathTrunkSid,
-                                                               int? pageSize = null,
-                                                               long? limit = null,
-                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialListOptions(pathTrunkSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the credential lists </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CredentialList </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CredentialListResource>> ReadAsync(string pathTrunkSid,
-                                                                                                       int? pageSize = null,
-                                                                                                       long? limit = null,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadCredentialListOptions(pathTrunkSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CredentialListResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialListResource>.FromJson("credential_lists", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CredentialListResource> NextPage(Page<CredentialListResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trunking)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialListResource>.FromJson("credential_lists", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CredentialListResource> PreviousPage(Page<CredentialListResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trunking)
-            );
-
-            var response = client.Request(request);
-            return Page<CredentialListResource>.FromJson("credential_lists", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a CredentialListResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CredentialListResource object represented by the provided JSON </returns>
-        public static CredentialListResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CredentialListResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Trunk the credential list in associated with
-        /// </summary>
-        [JsonProperty("trunk_sid")]
-        public string TrunkSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CredentialListResource()
-        {
-
-        }
-    }
+{
+
+  public class CredentialListResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchCredentialListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/CredentialLists/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static CredentialListResource Fetch(FetchCredentialListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<CredentialListResource> FetchAsync(FetchCredentialListOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the credential list </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static CredentialListResource Fetch(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialListOptions(pathTrunkSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the credential list </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<CredentialListResource> FetchAsync(string pathTrunkSid,
+                                                                                       string pathSid,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchCredentialListOptions(pathTrunkSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCredentialListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/CredentialLists/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static bool Delete(DeleteCredentialListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCredentialListOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the credential list </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static bool Delete(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialListOptions(pathTrunkSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the credential list </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathTrunkSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteCredentialListOptions(pathTrunkSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateCredentialListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/CredentialLists",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static CredentialListResource Create(CreateCredentialListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<CredentialListResource> CreateAsync(CreateCredentialListOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk to associate the credential list with </param>
+    /// <param name="credentialListSid"> The SID of the Credential List that you want to associate with the trunk </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static CredentialListResource Create(string pathTrunkSid,
+                                                string credentialListSid,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialListOptions(pathTrunkSid, credentialListSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk to associate the credential list with </param>
+    /// <param name="credentialListSid"> The SID of the Credential List that you want to associate with the trunk </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<CredentialListResource> CreateAsync(string pathTrunkSid,
+                                                                                        string credentialListSid,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateCredentialListOptions(pathTrunkSid, credentialListSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCredentialListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/CredentialLists",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static ResourceSet<CredentialListResource> Read(ReadCredentialListOptions options,
+                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CredentialListResource>.FromJson("credential_lists", response.Content);
+      return new ResourceSet<CredentialListResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read CredentialList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialListResource>> ReadAsync(ReadCredentialListOptions options,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CredentialListResource>.FromJson("credential_lists", response.Content);
+      return new ResourceSet<CredentialListResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the credential lists </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CredentialList </returns>
+    public static ResourceSet<CredentialListResource> Read(string pathTrunkSid,
+                                                           int? pageSize = null,
+                                                           long? limit = null,
+                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialListOptions(pathTrunkSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the credential lists </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CredentialList </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CredentialListResource>> ReadAsync(string pathTrunkSid,
+                                                                                                   int? pageSize = null,
+                                                                                                   long? limit = null,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadCredentialListOptions(pathTrunkSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CredentialListResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialListResource>.FromJson("credential_lists", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CredentialListResource> NextPage(Page<CredentialListResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trunking)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialListResource>.FromJson("credential_lists", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CredentialListResource> PreviousPage(Page<CredentialListResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trunking)
+      );
+
+      var response = client.Request(request);
+      return Page<CredentialListResource>.FromJson("credential_lists", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a CredentialListResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CredentialListResource object represented by the provided JSON </returns>
+    public static CredentialListResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CredentialListResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Trunk the credential list in associated with
+    /// </summary>
+    [JsonProperty("trunk_sid")]
+    public string TrunkSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CredentialListResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trunking/V1/Trunk/IpAccessControlListOptions.cs b/src/Twilio/Rest/Trunking/V1/Trunk/IpAccessControlListOptions.cs
index ea61790fb..69266a3c4 100644
--- a/src/Twilio/Rest/Trunking/V1/Trunk/IpAccessControlListOptions.cs
+++ b/src/Twilio/Rest/Trunking/V1/Trunk/IpAccessControlListOptions.cs
@@ -9,151 +9,151 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trunking.V1.Trunk
-{
-
+{
+
+  /// <summary>
+  /// FetchIpAccessControlListOptions
+  /// </summary>
+  public class FetchIpAccessControlListOptions : IOptions<IpAccessControlListResource>
+  {
     /// <summary>
-    /// FetchIpAccessControlListOptions
+    /// The SID of the Trunk from which to fetch the IP Access Control List
     /// </summary>
-    public class FetchIpAccessControlListOptions : IOptions<IpAccessControlListResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to fetch the IP Access Control List
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchIpAccessControlListOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the IP Access Control List </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchIpAccessControlListOptions(string pathTrunkSid, string pathSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathTrunkSid { get; }
     /// <summary>
-    /// Remove an associated IP Access Control List from a Trunk
+    /// The unique string that identifies the resource
     /// </summary>
-    public class DeleteIpAccessControlListOptions : IOptions<IpAccessControlListResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to delete the IP Access Control List
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteIpAccessControlListOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the IP Access Control List </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteIpAccessControlListOptions(string pathTrunkSid, string pathSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// Associate an IP Access Control List with a Trunk
+    /// Construct a new FetchIpAccessControlListOptions
     /// </summary>
-    public class CreateIpAccessControlListOptions : IOptions<IpAccessControlListResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk to associate the IP Access Control List with
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The SID of the IP Access Control List that you want to associate with the trunk
-        /// </summary>
-        public string IpAccessControlListSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateIpAccessControlListOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk to associate the IP Access Control List with </param>
-        /// <param name="ipAccessControlListSid"> The SID of the IP Access Control List that you want to associate with the
-        ///                              trunk </param>
-        public CreateIpAccessControlListOptions(string pathTrunkSid, string ipAccessControlListSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-            IpAccessControlListSid = ipAccessControlListSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IpAccessControlListSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IpAccessControlListSid", IpAccessControlListSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the IP Access Control List </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchIpAccessControlListOptions(string pathTrunkSid, string pathSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// List all IP Access Control Lists for a Trunk
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadIpAccessControlListOptions : ReadOptions<IpAccessControlListResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to read the IP Access Control Lists
-        /// </summary>
-        public string PathTrunkSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadIpAccessControlListOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the IP Access Control Lists </param>
-        public ReadIpAccessControlListOptions(string pathTrunkSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove an associated IP Access Control List from a Trunk
+  /// </summary>
+  public class DeleteIpAccessControlListOptions : IOptions<IpAccessControlListResource>
+  {
+    /// <summary>
+    /// The SID of the Trunk from which to delete the IP Access Control List
+    /// </summary>
+    public string PathTrunkSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteIpAccessControlListOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the IP Access Control List </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteIpAccessControlListOptions(string pathTrunkSid, string pathSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Associate an IP Access Control List with a Trunk
+  /// </summary>
+  public class CreateIpAccessControlListOptions : IOptions<IpAccessControlListResource>
+  {
+    /// <summary>
+    /// The SID of the Trunk to associate the IP Access Control List with
+    /// </summary>
+    public string PathTrunkSid { get; }
+    /// <summary>
+    /// The SID of the IP Access Control List that you want to associate with the trunk
+    /// </summary>
+    public string IpAccessControlListSid { get; }
+
+    /// <summary>
+    /// Construct a new CreateIpAccessControlListOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk to associate the IP Access Control List with </param>
+    /// <param name="ipAccessControlListSid"> The SID of the IP Access Control List that you want to associate with the
+    ///                              trunk </param>
+    public CreateIpAccessControlListOptions(string pathTrunkSid, string ipAccessControlListSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+      IpAccessControlListSid = ipAccessControlListSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IpAccessControlListSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IpAccessControlListSid", IpAccessControlListSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// List all IP Access Control Lists for a Trunk
+  /// </summary>
+  public class ReadIpAccessControlListOptions : ReadOptions<IpAccessControlListResource>
+  {
+    /// <summary>
+    /// The SID of the Trunk from which to read the IP Access Control Lists
+    /// </summary>
+    public string PathTrunkSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadIpAccessControlListOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the IP Access Control Lists </param>
+    public ReadIpAccessControlListOptions(string pathTrunkSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trunking/V1/Trunk/IpAccessControlListResource.cs b/src/Twilio/Rest/Trunking/V1/Trunk/IpAccessControlListResource.cs
index f2bc0658c..cc3142af8 100644
--- a/src/Twilio/Rest/Trunking/V1/Trunk/IpAccessControlListResource.cs
+++ b/src/Twilio/Rest/Trunking/V1/Trunk/IpAccessControlListResource.cs
@@ -16,420 +16,420 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Trunking.V1.Trunk
-{
-
-    public class IpAccessControlListResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchIpAccessControlListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/IpAccessControlLists/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static IpAccessControlListResource Fetch(FetchIpAccessControlListOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListResource> FetchAsync(FetchIpAccessControlListOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the IP Access Control List </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static IpAccessControlListResource Fetch(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchIpAccessControlListOptions(pathTrunkSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the IP Access Control List </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListResource> FetchAsync(string pathTrunkSid,
-                                                                                                string pathSid,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchIpAccessControlListOptions(pathTrunkSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteIpAccessControlListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/IpAccessControlLists/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove an associated IP Access Control List from a Trunk
-        /// </summary>
-        /// <param name="options"> Delete IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static bool Delete(DeleteIpAccessControlListOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an associated IP Access Control List from a Trunk
-        /// </summary>
-        /// <param name="options"> Delete IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteIpAccessControlListOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove an associated IP Access Control List from a Trunk
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the IP Access Control List </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static bool Delete(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteIpAccessControlListOptions(pathTrunkSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an associated IP Access Control List from a Trunk
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the IP Access Control List </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathTrunkSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteIpAccessControlListOptions(pathTrunkSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateIpAccessControlListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/IpAccessControlLists",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Associate an IP Access Control List with a Trunk
-        /// </summary>
-        /// <param name="options"> Create IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static IpAccessControlListResource Create(CreateIpAccessControlListOptions options,
-                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Associate an IP Access Control List with a Trunk
-        /// </summary>
-        /// <param name="options"> Create IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListResource> CreateAsync(CreateIpAccessControlListOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Associate an IP Access Control List with a Trunk
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk to associate the IP Access Control List with </param>
-        /// <param name="ipAccessControlListSid"> The SID of the IP Access Control List that you want to associate with the
-        ///                              trunk </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static IpAccessControlListResource Create(string pathTrunkSid,
-                                                         string ipAccessControlListSid,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateIpAccessControlListOptions(pathTrunkSid, ipAccessControlListSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Associate an IP Access Control List with a Trunk
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk to associate the IP Access Control List with </param>
-        /// <param name="ipAccessControlListSid"> The SID of the IP Access Control List that you want to associate with the
-        ///                              trunk </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<IpAccessControlListResource> CreateAsync(string pathTrunkSid,
-                                                                                                 string ipAccessControlListSid,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateIpAccessControlListOptions(pathTrunkSid, ipAccessControlListSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadIpAccessControlListOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/IpAccessControlLists",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// List all IP Access Control Lists for a Trunk
-        /// </summary>
-        /// <param name="options"> Read IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static ResourceSet<IpAccessControlListResource> Read(ReadIpAccessControlListOptions options,
-                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
-            return new ResourceSet<IpAccessControlListResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List all IP Access Control Lists for a Trunk
-        /// </summary>
-        /// <param name="options"> Read IpAccessControlList parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IpAccessControlListResource>> ReadAsync(ReadIpAccessControlListOptions options,
-                                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
-            return new ResourceSet<IpAccessControlListResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// List all IP Access Control Lists for a Trunk
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the IP Access Control Lists </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpAccessControlList </returns>
-        public static ResourceSet<IpAccessControlListResource> Read(string pathTrunkSid,
-                                                                    int? pageSize = null,
-                                                                    long? limit = null,
-                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadIpAccessControlListOptions(pathTrunkSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List all IP Access Control Lists for a Trunk
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the IP Access Control Lists </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IpAccessControlListResource>> ReadAsync(string pathTrunkSid,
-                                                                                                            int? pageSize = null,
-                                                                                                            long? limit = null,
-                                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadIpAccessControlListOptions(pathTrunkSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<IpAccessControlListResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<IpAccessControlListResource> NextPage(Page<IpAccessControlListResource> page,
-                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trunking)
-            );
-
-            var response = client.Request(request);
-            return Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<IpAccessControlListResource> PreviousPage(Page<IpAccessControlListResource> page,
-                                                                     ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trunking)
-            );
-
-            var response = client.Request(request);
-            return Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a IpAccessControlListResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> IpAccessControlListResource object represented by the provided JSON </returns>
-        public static IpAccessControlListResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<IpAccessControlListResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Trunk the resource is associated with
-        /// </summary>
-        [JsonProperty("trunk_sid")]
-        public string TrunkSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private IpAccessControlListResource()
-        {
-
-        }
-    }
+{
+
+  public class IpAccessControlListResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchIpAccessControlListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/IpAccessControlLists/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static IpAccessControlListResource Fetch(FetchIpAccessControlListOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListResource> FetchAsync(FetchIpAccessControlListOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the IP Access Control List </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static IpAccessControlListResource Fetch(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchIpAccessControlListOptions(pathTrunkSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the IP Access Control List </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListResource> FetchAsync(string pathTrunkSid,
+                                                                                            string pathSid,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchIpAccessControlListOptions(pathTrunkSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteIpAccessControlListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/IpAccessControlLists/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove an associated IP Access Control List from a Trunk
+    /// </summary>
+    /// <param name="options"> Delete IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static bool Delete(DeleteIpAccessControlListOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an associated IP Access Control List from a Trunk
+    /// </summary>
+    /// <param name="options"> Delete IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteIpAccessControlListOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove an associated IP Access Control List from a Trunk
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the IP Access Control List </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static bool Delete(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteIpAccessControlListOptions(pathTrunkSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an associated IP Access Control List from a Trunk
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the IP Access Control List </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathTrunkSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteIpAccessControlListOptions(pathTrunkSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateIpAccessControlListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/IpAccessControlLists",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Associate an IP Access Control List with a Trunk
+    /// </summary>
+    /// <param name="options"> Create IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static IpAccessControlListResource Create(CreateIpAccessControlListOptions options,
+                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Associate an IP Access Control List with a Trunk
+    /// </summary>
+    /// <param name="options"> Create IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListResource> CreateAsync(CreateIpAccessControlListOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Associate an IP Access Control List with a Trunk
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk to associate the IP Access Control List with </param>
+    /// <param name="ipAccessControlListSid"> The SID of the IP Access Control List that you want to associate with the
+    ///                              trunk </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static IpAccessControlListResource Create(string pathTrunkSid,
+                                                     string ipAccessControlListSid,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateIpAccessControlListOptions(pathTrunkSid, ipAccessControlListSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Associate an IP Access Control List with a Trunk
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk to associate the IP Access Control List with </param>
+    /// <param name="ipAccessControlListSid"> The SID of the IP Access Control List that you want to associate with the
+    ///                              trunk </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<IpAccessControlListResource> CreateAsync(string pathTrunkSid,
+                                                                                             string ipAccessControlListSid,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateIpAccessControlListOptions(pathTrunkSid, ipAccessControlListSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadIpAccessControlListOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/IpAccessControlLists",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// List all IP Access Control Lists for a Trunk
+    /// </summary>
+    /// <param name="options"> Read IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static ResourceSet<IpAccessControlListResource> Read(ReadIpAccessControlListOptions options,
+                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
+      return new ResourceSet<IpAccessControlListResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List all IP Access Control Lists for a Trunk
+    /// </summary>
+    /// <param name="options"> Read IpAccessControlList parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IpAccessControlListResource>> ReadAsync(ReadIpAccessControlListOptions options,
+                                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
+      return new ResourceSet<IpAccessControlListResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// List all IP Access Control Lists for a Trunk
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the IP Access Control Lists </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpAccessControlList </returns>
+    public static ResourceSet<IpAccessControlListResource> Read(string pathTrunkSid,
+                                                                int? pageSize = null,
+                                                                long? limit = null,
+                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadIpAccessControlListOptions(pathTrunkSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List all IP Access Control Lists for a Trunk
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the IP Access Control Lists </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpAccessControlList </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IpAccessControlListResource>> ReadAsync(string pathTrunkSid,
+                                                                                                        int? pageSize = null,
+                                                                                                        long? limit = null,
+                                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadIpAccessControlListOptions(pathTrunkSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<IpAccessControlListResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<IpAccessControlListResource> NextPage(Page<IpAccessControlListResource> page,
+                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trunking)
+      );
+
+      var response = client.Request(request);
+      return Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<IpAccessControlListResource> PreviousPage(Page<IpAccessControlListResource> page,
+                                                                 ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trunking)
+      );
+
+      var response = client.Request(request);
+      return Page<IpAccessControlListResource>.FromJson("ip_access_control_lists", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a IpAccessControlListResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> IpAccessControlListResource object represented by the provided JSON </returns>
+    public static IpAccessControlListResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<IpAccessControlListResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Trunk the resource is associated with
+    /// </summary>
+    [JsonProperty("trunk_sid")]
+    public string TrunkSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private IpAccessControlListResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trunking/V1/Trunk/OriginationUrlOptions.cs b/src/Twilio/Rest/Trunking/V1/Trunk/OriginationUrlOptions.cs
index dfa3489ee..931427245 100644
--- a/src/Twilio/Rest/Trunking/V1/Trunk/OriginationUrlOptions.cs
+++ b/src/Twilio/Rest/Trunking/V1/Trunk/OriginationUrlOptions.cs
@@ -9,280 +9,280 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trunking.V1.Trunk
-{
-
+{
+
+  /// <summary>
+  /// FetchOriginationUrlOptions
+  /// </summary>
+  public class FetchOriginationUrlOptions : IOptions<OriginationUrlResource>
+  {
     /// <summary>
-    /// FetchOriginationUrlOptions
+    /// The SID of the Trunk from which to fetch the OriginationUrl
     /// </summary>
-    public class FetchOriginationUrlOptions : IOptions<OriginationUrlResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to fetch the OriginationUrl
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchOriginationUrlOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the OriginationUrl </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchOriginationUrlOptions(string pathTrunkSid, string pathSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathTrunkSid { get; }
     /// <summary>
-    /// DeleteOriginationUrlOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class DeleteOriginationUrlOptions : IOptions<OriginationUrlResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to delete the OriginationUrl
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteOriginationUrlOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the OriginationUrl </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteOriginationUrlOptions(string pathTrunkSid, string pathSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateOriginationUrlOptions
+    /// Construct a new FetchOriginationUrlOptions
     /// </summary>
-    public class CreateOriginationUrlOptions : IOptions<OriginationUrlResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk to associate the resource with
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The value that determines the relative load the URI should receive compared to others with the same priority
-        /// </summary>
-        public int? Weight { get; }
-        /// <summary>
-        /// The relative importance of the URI
-        /// </summary>
-        public int? Priority { get; }
-        /// <summary>
-        /// Whether the URL is enabled
-        /// </summary>
-        public bool? Enabled { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The SIP address you want Twilio to route your Origination calls to
-        /// </summary>
-        public Uri SipUrl { get; }
-
-        /// <summary>
-        /// Construct a new CreateOriginationUrlOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk to associate the resource with </param>
-        /// <param name="weight"> The value that determines the relative load the URI should receive compared to others with
-        ///              the same priority </param>
-        /// <param name="priority"> The relative importance of the URI </param>
-        /// <param name="enabled"> Whether the URL is enabled </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="sipUrl"> The SIP address you want Twilio to route your Origination calls to </param>
-        public CreateOriginationUrlOptions(string pathTrunkSid,
-                                           int? weight,
-                                           int? priority,
-                                           bool? enabled,
-                                           string friendlyName,
-                                           Uri sipUrl)
-        {
-            PathTrunkSid = pathTrunkSid;
-            Weight = weight;
-            Priority = priority;
-            Enabled = enabled;
-            FriendlyName = friendlyName;
-            SipUrl = sipUrl;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Weight != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Weight", Weight.ToString()));
-            }
-
-            if (Priority != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
-            }
-
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (SipUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipUrl", Serializers.Url(SipUrl)));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the OriginationUrl </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchOriginationUrlOptions(string pathTrunkSid, string pathSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadOriginationUrlOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadOriginationUrlOptions : ReadOptions<OriginationUrlResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to read the OriginationUrl
-        /// </summary>
-        public string PathTrunkSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadOriginationUrlOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the OriginationUrl </param>
-        public ReadOriginationUrlOptions(string pathTrunkSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteOriginationUrlOptions
+  /// </summary>
+  public class DeleteOriginationUrlOptions : IOptions<OriginationUrlResource>
+  {
     /// <summary>
-    /// UpdateOriginationUrlOptions
+    /// The SID of the Trunk from which to delete the OriginationUrl
     /// </summary>
-    public class UpdateOriginationUrlOptions : IOptions<OriginationUrlResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to update the OriginationUrl
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The value that determines the relative load the URI should receive compared to others with the same priority
-        /// </summary>
-        public int? Weight { get; set; }
-        /// <summary>
-        /// The relative importance of the URI
-        /// </summary>
-        public int? Priority { get; set; }
-        /// <summary>
-        /// Whether the URL is enabled
-        /// </summary>
-        public bool? Enabled { get; set; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The SIP address you want Twilio to route your Origination calls to
-        /// </summary>
-        public Uri SipUrl { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateOriginationUrlOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to update the OriginationUrl </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateOriginationUrlOptions(string pathTrunkSid, string pathSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Weight != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Weight", Weight.ToString()));
-            }
-
-            if (Priority != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
-            }
-
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (SipUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipUrl", Serializers.Url(SipUrl)));
-            }
-
-            return p;
-        }
-    }
+    public string PathTrunkSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteOriginationUrlOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the OriginationUrl </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteOriginationUrlOptions(string pathTrunkSid, string pathSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateOriginationUrlOptions
+  /// </summary>
+  public class CreateOriginationUrlOptions : IOptions<OriginationUrlResource>
+  {
+    /// <summary>
+    /// The SID of the Trunk to associate the resource with
+    /// </summary>
+    public string PathTrunkSid { get; }
+    /// <summary>
+    /// The value that determines the relative load the URI should receive compared to others with the same priority
+    /// </summary>
+    public int? Weight { get; }
+    /// <summary>
+    /// The relative importance of the URI
+    /// </summary>
+    public int? Priority { get; }
+    /// <summary>
+    /// Whether the URL is enabled
+    /// </summary>
+    public bool? Enabled { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The SIP address you want Twilio to route your Origination calls to
+    /// </summary>
+    public Uri SipUrl { get; }
+
+    /// <summary>
+    /// Construct a new CreateOriginationUrlOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk to associate the resource with </param>
+    /// <param name="weight"> The value that determines the relative load the URI should receive compared to others with
+    ///              the same priority </param>
+    /// <param name="priority"> The relative importance of the URI </param>
+    /// <param name="enabled"> Whether the URL is enabled </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="sipUrl"> The SIP address you want Twilio to route your Origination calls to </param>
+    public CreateOriginationUrlOptions(string pathTrunkSid,
+                                       int? weight,
+                                       int? priority,
+                                       bool? enabled,
+                                       string friendlyName,
+                                       Uri sipUrl)
+    {
+      PathTrunkSid = pathTrunkSid;
+      Weight = weight;
+      Priority = priority;
+      Enabled = enabled;
+      FriendlyName = friendlyName;
+      SipUrl = sipUrl;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Weight != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Weight", Weight.ToString()));
+      }
+
+      if (Priority != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
+      }
+
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (SipUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipUrl", Serializers.Url(SipUrl)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadOriginationUrlOptions
+  /// </summary>
+  public class ReadOriginationUrlOptions : ReadOptions<OriginationUrlResource>
+  {
+    /// <summary>
+    /// The SID of the Trunk from which to read the OriginationUrl
+    /// </summary>
+    public string PathTrunkSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadOriginationUrlOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the OriginationUrl </param>
+    public ReadOriginationUrlOptions(string pathTrunkSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateOriginationUrlOptions
+  /// </summary>
+  public class UpdateOriginationUrlOptions : IOptions<OriginationUrlResource>
+  {
+    /// <summary>
+    /// The SID of the Trunk from which to update the OriginationUrl
+    /// </summary>
+    public string PathTrunkSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The value that determines the relative load the URI should receive compared to others with the same priority
+    /// </summary>
+    public int? Weight { get; set; }
+    /// <summary>
+    /// The relative importance of the URI
+    /// </summary>
+    public int? Priority { get; set; }
+    /// <summary>
+    /// Whether the URL is enabled
+    /// </summary>
+    public bool? Enabled { get; set; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The SIP address you want Twilio to route your Origination calls to
+    /// </summary>
+    public Uri SipUrl { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateOriginationUrlOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to update the OriginationUrl </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateOriginationUrlOptions(string pathTrunkSid, string pathSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Weight != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Weight", Weight.ToString()));
+      }
+
+      if (Priority != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
+      }
+
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (SipUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipUrl", Serializers.Url(SipUrl)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trunking/V1/Trunk/OriginationUrlResource.cs b/src/Twilio/Rest/Trunking/V1/Trunk/OriginationUrlResource.cs
index e818d1250..97d5e2745 100644
--- a/src/Twilio/Rest/Trunking/V1/Trunk/OriginationUrlResource.cs
+++ b/src/Twilio/Rest/Trunking/V1/Trunk/OriginationUrlResource.cs
@@ -16,546 +16,546 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Trunking.V1.Trunk
-{
-
-    public class OriginationUrlResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchOriginationUrlOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/OriginationUrls/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch OriginationUrl parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OriginationUrl </returns>
-        public static OriginationUrlResource Fetch(FetchOriginationUrlOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch OriginationUrl parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
-        public static async System.Threading.Tasks.Task<OriginationUrlResource> FetchAsync(FetchOriginationUrlOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the OriginationUrl </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OriginationUrl </returns>
-        public static OriginationUrlResource Fetch(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchOriginationUrlOptions(pathTrunkSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the OriginationUrl </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
-        public static async System.Threading.Tasks.Task<OriginationUrlResource> FetchAsync(string pathTrunkSid,
-                                                                                           string pathSid,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchOriginationUrlOptions(pathTrunkSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteOriginationUrlOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/OriginationUrls/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete OriginationUrl parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OriginationUrl </returns>
-        public static bool Delete(DeleteOriginationUrlOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete OriginationUrl parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteOriginationUrlOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the OriginationUrl </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OriginationUrl </returns>
-        public static bool Delete(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteOriginationUrlOptions(pathTrunkSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the OriginationUrl </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathTrunkSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteOriginationUrlOptions(pathTrunkSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateOriginationUrlOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/OriginationUrls",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create OriginationUrl parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OriginationUrl </returns>
-        public static OriginationUrlResource Create(CreateOriginationUrlOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create OriginationUrl parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
-        public static async System.Threading.Tasks.Task<OriginationUrlResource> CreateAsync(CreateOriginationUrlOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk to associate the resource with </param>
-        /// <param name="weight"> The value that determines the relative load the URI should receive compared to others with
-        ///              the same priority </param>
-        /// <param name="priority"> The relative importance of the URI </param>
-        /// <param name="enabled"> Whether the URL is enabled </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="sipUrl"> The SIP address you want Twilio to route your Origination calls to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OriginationUrl </returns>
-        public static OriginationUrlResource Create(string pathTrunkSid,
-                                                    int? weight,
-                                                    int? priority,
-                                                    bool? enabled,
-                                                    string friendlyName,
-                                                    Uri sipUrl,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateOriginationUrlOptions(pathTrunkSid, weight, priority, enabled, friendlyName, sipUrl);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk to associate the resource with </param>
-        /// <param name="weight"> The value that determines the relative load the URI should receive compared to others with
-        ///              the same priority </param>
-        /// <param name="priority"> The relative importance of the URI </param>
-        /// <param name="enabled"> Whether the URL is enabled </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="sipUrl"> The SIP address you want Twilio to route your Origination calls to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
-        public static async System.Threading.Tasks.Task<OriginationUrlResource> CreateAsync(string pathTrunkSid,
-                                                                                            int? weight,
-                                                                                            int? priority,
-                                                                                            bool? enabled,
-                                                                                            string friendlyName,
-                                                                                            Uri sipUrl,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateOriginationUrlOptions(pathTrunkSid, weight, priority, enabled, friendlyName, sipUrl);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadOriginationUrlOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/OriginationUrls",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read OriginationUrl parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OriginationUrl </returns>
-        public static ResourceSet<OriginationUrlResource> Read(ReadOriginationUrlOptions options,
-                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<OriginationUrlResource>.FromJson("origination_urls", response.Content);
-            return new ResourceSet<OriginationUrlResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read OriginationUrl parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<OriginationUrlResource>> ReadAsync(ReadOriginationUrlOptions options,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<OriginationUrlResource>.FromJson("origination_urls", response.Content);
-            return new ResourceSet<OriginationUrlResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the OriginationUrl </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OriginationUrl </returns>
-        public static ResourceSet<OriginationUrlResource> Read(string pathTrunkSid,
-                                                               int? pageSize = null,
-                                                               long? limit = null,
-                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadOriginationUrlOptions(pathTrunkSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the OriginationUrl </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<OriginationUrlResource>> ReadAsync(string pathTrunkSid,
-                                                                                                       int? pageSize = null,
-                                                                                                       long? limit = null,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadOriginationUrlOptions(pathTrunkSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<OriginationUrlResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<OriginationUrlResource>.FromJson("origination_urls", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<OriginationUrlResource> NextPage(Page<OriginationUrlResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trunking)
-            );
-
-            var response = client.Request(request);
-            return Page<OriginationUrlResource>.FromJson("origination_urls", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<OriginationUrlResource> PreviousPage(Page<OriginationUrlResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trunking)
-            );
-
-            var response = client.Request(request);
-            return Page<OriginationUrlResource>.FromJson("origination_urls", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateOriginationUrlOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/OriginationUrls/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update OriginationUrl parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OriginationUrl </returns>
-        public static OriginationUrlResource Update(UpdateOriginationUrlOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update OriginationUrl parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
-        public static async System.Threading.Tasks.Task<OriginationUrlResource> UpdateAsync(UpdateOriginationUrlOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to update the OriginationUrl </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="weight"> The value that determines the relative load the URI should receive compared to others with
-        ///              the same priority </param>
-        /// <param name="priority"> The relative importance of the URI </param>
-        /// <param name="enabled"> Whether the URL is enabled </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="sipUrl"> The SIP address you want Twilio to route your Origination calls to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of OriginationUrl </returns>
-        public static OriginationUrlResource Update(string pathTrunkSid,
-                                                    string pathSid,
-                                                    int? weight = null,
-                                                    int? priority = null,
-                                                    bool? enabled = null,
-                                                    string friendlyName = null,
-                                                    Uri sipUrl = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateOriginationUrlOptions(pathTrunkSid, pathSid){Weight = weight, Priority = priority, Enabled = enabled, FriendlyName = friendlyName, SipUrl = sipUrl};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to update the OriginationUrl </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="weight"> The value that determines the relative load the URI should receive compared to others with
-        ///              the same priority </param>
-        /// <param name="priority"> The relative importance of the URI </param>
-        /// <param name="enabled"> Whether the URL is enabled </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="sipUrl"> The SIP address you want Twilio to route your Origination calls to </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
-        public static async System.Threading.Tasks.Task<OriginationUrlResource> UpdateAsync(string pathTrunkSid,
-                                                                                            string pathSid,
-                                                                                            int? weight = null,
-                                                                                            int? priority = null,
-                                                                                            bool? enabled = null,
-                                                                                            string friendlyName = null,
-                                                                                            Uri sipUrl = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateOriginationUrlOptions(pathTrunkSid, pathSid){Weight = weight, Priority = priority, Enabled = enabled, FriendlyName = friendlyName, SipUrl = sipUrl};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a OriginationUrlResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> OriginationUrlResource object represented by the provided JSON </returns>
-        public static OriginationUrlResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<OriginationUrlResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Trunk that owns the Origination URL
-        /// </summary>
-        [JsonProperty("trunk_sid")]
-        public string TrunkSid { get; private set; }
-        /// <summary>
-        /// The value that determines the relative load the URI should receive compared to others with the same priority
-        /// </summary>
-        [JsonProperty("weight")]
-        public int? Weight { get; private set; }
-        /// <summary>
-        /// Whether the URL is enabled
-        /// </summary>
-        [JsonProperty("enabled")]
-        public bool? Enabled { get; private set; }
-        /// <summary>
-        /// The SIP address you want Twilio to route your Origination calls to
-        /// </summary>
-        [JsonProperty("sip_url")]
-        public Uri SipUrl { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The relative importance of the URI
-        /// </summary>
-        [JsonProperty("priority")]
-        public int? Priority { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private OriginationUrlResource()
-        {
-
-        }
-    }
+{
+
+  public class OriginationUrlResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchOriginationUrlOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/OriginationUrls/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch OriginationUrl parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OriginationUrl </returns>
+    public static OriginationUrlResource Fetch(FetchOriginationUrlOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch OriginationUrl parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
+    public static async System.Threading.Tasks.Task<OriginationUrlResource> FetchAsync(FetchOriginationUrlOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the OriginationUrl </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OriginationUrl </returns>
+    public static OriginationUrlResource Fetch(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchOriginationUrlOptions(pathTrunkSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the OriginationUrl </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
+    public static async System.Threading.Tasks.Task<OriginationUrlResource> FetchAsync(string pathTrunkSid,
+                                                                                       string pathSid,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchOriginationUrlOptions(pathTrunkSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteOriginationUrlOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/OriginationUrls/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete OriginationUrl parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OriginationUrl </returns>
+    public static bool Delete(DeleteOriginationUrlOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete OriginationUrl parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteOriginationUrlOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the OriginationUrl </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OriginationUrl </returns>
+    public static bool Delete(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteOriginationUrlOptions(pathTrunkSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the OriginationUrl </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathTrunkSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteOriginationUrlOptions(pathTrunkSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateOriginationUrlOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/OriginationUrls",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create OriginationUrl parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OriginationUrl </returns>
+    public static OriginationUrlResource Create(CreateOriginationUrlOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create OriginationUrl parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
+    public static async System.Threading.Tasks.Task<OriginationUrlResource> CreateAsync(CreateOriginationUrlOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk to associate the resource with </param>
+    /// <param name="weight"> The value that determines the relative load the URI should receive compared to others with
+    ///              the same priority </param>
+    /// <param name="priority"> The relative importance of the URI </param>
+    /// <param name="enabled"> Whether the URL is enabled </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="sipUrl"> The SIP address you want Twilio to route your Origination calls to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OriginationUrl </returns>
+    public static OriginationUrlResource Create(string pathTrunkSid,
+                                                int? weight,
+                                                int? priority,
+                                                bool? enabled,
+                                                string friendlyName,
+                                                Uri sipUrl,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateOriginationUrlOptions(pathTrunkSid, weight, priority, enabled, friendlyName, sipUrl);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk to associate the resource with </param>
+    /// <param name="weight"> The value that determines the relative load the URI should receive compared to others with
+    ///              the same priority </param>
+    /// <param name="priority"> The relative importance of the URI </param>
+    /// <param name="enabled"> Whether the URL is enabled </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="sipUrl"> The SIP address you want Twilio to route your Origination calls to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
+    public static async System.Threading.Tasks.Task<OriginationUrlResource> CreateAsync(string pathTrunkSid,
+                                                                                        int? weight,
+                                                                                        int? priority,
+                                                                                        bool? enabled,
+                                                                                        string friendlyName,
+                                                                                        Uri sipUrl,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateOriginationUrlOptions(pathTrunkSid, weight, priority, enabled, friendlyName, sipUrl);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadOriginationUrlOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/OriginationUrls",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read OriginationUrl parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OriginationUrl </returns>
+    public static ResourceSet<OriginationUrlResource> Read(ReadOriginationUrlOptions options,
+                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<OriginationUrlResource>.FromJson("origination_urls", response.Content);
+      return new ResourceSet<OriginationUrlResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read OriginationUrl parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<OriginationUrlResource>> ReadAsync(ReadOriginationUrlOptions options,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<OriginationUrlResource>.FromJson("origination_urls", response.Content);
+      return new ResourceSet<OriginationUrlResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the OriginationUrl </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OriginationUrl </returns>
+    public static ResourceSet<OriginationUrlResource> Read(string pathTrunkSid,
+                                                           int? pageSize = null,
+                                                           long? limit = null,
+                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadOriginationUrlOptions(pathTrunkSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the OriginationUrl </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<OriginationUrlResource>> ReadAsync(string pathTrunkSid,
+                                                                                                   int? pageSize = null,
+                                                                                                   long? limit = null,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadOriginationUrlOptions(pathTrunkSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<OriginationUrlResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<OriginationUrlResource>.FromJson("origination_urls", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<OriginationUrlResource> NextPage(Page<OriginationUrlResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trunking)
+      );
+
+      var response = client.Request(request);
+      return Page<OriginationUrlResource>.FromJson("origination_urls", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<OriginationUrlResource> PreviousPage(Page<OriginationUrlResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trunking)
+      );
+
+      var response = client.Request(request);
+      return Page<OriginationUrlResource>.FromJson("origination_urls", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateOriginationUrlOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/OriginationUrls/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update OriginationUrl parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OriginationUrl </returns>
+    public static OriginationUrlResource Update(UpdateOriginationUrlOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update OriginationUrl parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
+    public static async System.Threading.Tasks.Task<OriginationUrlResource> UpdateAsync(UpdateOriginationUrlOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to update the OriginationUrl </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="weight"> The value that determines the relative load the URI should receive compared to others with
+    ///              the same priority </param>
+    /// <param name="priority"> The relative importance of the URI </param>
+    /// <param name="enabled"> Whether the URL is enabled </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="sipUrl"> The SIP address you want Twilio to route your Origination calls to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of OriginationUrl </returns>
+    public static OriginationUrlResource Update(string pathTrunkSid,
+                                                string pathSid,
+                                                int? weight = null,
+                                                int? priority = null,
+                                                bool? enabled = null,
+                                                string friendlyName = null,
+                                                Uri sipUrl = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateOriginationUrlOptions(pathTrunkSid, pathSid) { Weight = weight, Priority = priority, Enabled = enabled, FriendlyName = friendlyName, SipUrl = sipUrl };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to update the OriginationUrl </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="weight"> The value that determines the relative load the URI should receive compared to others with
+    ///              the same priority </param>
+    /// <param name="priority"> The relative importance of the URI </param>
+    /// <param name="enabled"> Whether the URL is enabled </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="sipUrl"> The SIP address you want Twilio to route your Origination calls to </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of OriginationUrl </returns>
+    public static async System.Threading.Tasks.Task<OriginationUrlResource> UpdateAsync(string pathTrunkSid,
+                                                                                        string pathSid,
+                                                                                        int? weight = null,
+                                                                                        int? priority = null,
+                                                                                        bool? enabled = null,
+                                                                                        string friendlyName = null,
+                                                                                        Uri sipUrl = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateOriginationUrlOptions(pathTrunkSid, pathSid) { Weight = weight, Priority = priority, Enabled = enabled, FriendlyName = friendlyName, SipUrl = sipUrl };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a OriginationUrlResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> OriginationUrlResource object represented by the provided JSON </returns>
+    public static OriginationUrlResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<OriginationUrlResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Trunk that owns the Origination URL
+    /// </summary>
+    [JsonProperty("trunk_sid")]
+    public string TrunkSid { get; private set; }
+    /// <summary>
+    /// The value that determines the relative load the URI should receive compared to others with the same priority
+    /// </summary>
+    [JsonProperty("weight")]
+    public int? Weight { get; private set; }
+    /// <summary>
+    /// Whether the URL is enabled
+    /// </summary>
+    [JsonProperty("enabled")]
+    public bool? Enabled { get; private set; }
+    /// <summary>
+    /// The SIP address you want Twilio to route your Origination calls to
+    /// </summary>
+    [JsonProperty("sip_url")]
+    public Uri SipUrl { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The relative importance of the URI
+    /// </summary>
+    [JsonProperty("priority")]
+    public int? Priority { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private OriginationUrlResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trunking/V1/Trunk/PhoneNumberOptions.cs b/src/Twilio/Rest/Trunking/V1/Trunk/PhoneNumberOptions.cs
index 77ef7d956..5aef5ab80 100644
--- a/src/Twilio/Rest/Trunking/V1/Trunk/PhoneNumberOptions.cs
+++ b/src/Twilio/Rest/Trunking/V1/Trunk/PhoneNumberOptions.cs
@@ -9,151 +9,151 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trunking.V1.Trunk
-{
-
+{
+
+  /// <summary>
+  /// FetchPhoneNumberOptions
+  /// </summary>
+  public class FetchPhoneNumberOptions : IOptions<PhoneNumberResource>
+  {
     /// <summary>
-    /// FetchPhoneNumberOptions
+    /// The SID of the Trunk from which to fetch the PhoneNumber resource
     /// </summary>
-    public class FetchPhoneNumberOptions : IOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to fetch the PhoneNumber resource
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchPhoneNumberOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the PhoneNumber resource </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchPhoneNumberOptions(string pathTrunkSid, string pathSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathTrunkSid { get; }
     /// <summary>
-    /// DeletePhoneNumberOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class DeletePhoneNumberOptions : IOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to delete the PhoneNumber resource
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeletePhoneNumberOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the PhoneNumber resource </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeletePhoneNumberOptions(string pathTrunkSid, string pathSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreatePhoneNumberOptions
+    /// Construct a new FetchPhoneNumberOptions
     /// </summary>
-    public class CreatePhoneNumberOptions : IOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk to associate the phone number with
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The SID of the Incoming Phone Number that you want to associate with the trunk
-        /// </summary>
-        public string PhoneNumberSid { get; }
-
-        /// <summary>
-        /// Construct a new CreatePhoneNumberOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk to associate the phone number with </param>
-        /// <param name="phoneNumberSid"> The SID of the Incoming Phone Number that you want to associate with the trunk
-        ///                      </param>
-        public CreatePhoneNumberOptions(string pathTrunkSid, string phoneNumberSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-            PhoneNumberSid = phoneNumberSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PhoneNumberSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PhoneNumberSid", PhoneNumberSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the PhoneNumber resource </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchPhoneNumberOptions(string pathTrunkSid, string pathSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadPhoneNumberOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadPhoneNumberOptions : ReadOptions<PhoneNumberResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to read the PhoneNumber resources
-        /// </summary>
-        public string PathTrunkSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadPhoneNumberOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the PhoneNumber resources </param>
-        public ReadPhoneNumberOptions(string pathTrunkSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeletePhoneNumberOptions
+  /// </summary>
+  public class DeletePhoneNumberOptions : IOptions<PhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the Trunk from which to delete the PhoneNumber resource
+    /// </summary>
+    public string PathTrunkSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeletePhoneNumberOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the PhoneNumber resource </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeletePhoneNumberOptions(string pathTrunkSid, string pathSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreatePhoneNumberOptions
+  /// </summary>
+  public class CreatePhoneNumberOptions : IOptions<PhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the Trunk to associate the phone number with
+    /// </summary>
+    public string PathTrunkSid { get; }
+    /// <summary>
+    /// The SID of the Incoming Phone Number that you want to associate with the trunk
+    /// </summary>
+    public string PhoneNumberSid { get; }
+
+    /// <summary>
+    /// Construct a new CreatePhoneNumberOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk to associate the phone number with </param>
+    /// <param name="phoneNumberSid"> The SID of the Incoming Phone Number that you want to associate with the trunk
+    ///                      </param>
+    public CreatePhoneNumberOptions(string pathTrunkSid, string phoneNumberSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+      PhoneNumberSid = phoneNumberSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PhoneNumberSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PhoneNumberSid", PhoneNumberSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadPhoneNumberOptions
+  /// </summary>
+  public class ReadPhoneNumberOptions : ReadOptions<PhoneNumberResource>
+  {
+    /// <summary>
+    /// The SID of the Trunk from which to read the PhoneNumber resources
+    /// </summary>
+    public string PathTrunkSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadPhoneNumberOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the PhoneNumber resources </param>
+    public ReadPhoneNumberOptions(string pathTrunkSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trunking/V1/Trunk/PhoneNumberResource.cs b/src/Twilio/Rest/Trunking/V1/Trunk/PhoneNumberResource.cs
index 4e61e05d8..456f9bf4a 100644
--- a/src/Twilio/Rest/Trunking/V1/Trunk/PhoneNumberResource.cs
+++ b/src/Twilio/Rest/Trunking/V1/Trunk/PhoneNumberResource.cs
@@ -17,530 +17,530 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Trunking.V1.Trunk
-{
-
-    public class PhoneNumberResource : Resource
-    {
-        public sealed class AddressRequirementEnum : StringEnum
-        {
-            private AddressRequirementEnum(string value) : base(value) {}
-            public AddressRequirementEnum() {}
-            public static implicit operator AddressRequirementEnum(string value)
-            {
-                return new AddressRequirementEnum(value);
-            }
-
-            public static readonly AddressRequirementEnum None = new AddressRequirementEnum("none");
-            public static readonly AddressRequirementEnum Any = new AddressRequirementEnum("any");
-            public static readonly AddressRequirementEnum Local = new AddressRequirementEnum("local");
-            public static readonly AddressRequirementEnum Foreign = new AddressRequirementEnum("foreign");
-        }
-
-        private static Request BuildFetchRequest(FetchPhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/PhoneNumbers/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Fetch(FetchPhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(FetchPhoneNumberOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the PhoneNumber resource </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Fetch(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchPhoneNumberOptions(pathTrunkSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the PhoneNumber resource </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(string pathTrunkSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchPhoneNumberOptions(pathTrunkSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeletePhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/PhoneNumbers/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static bool Delete(DeletePhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeletePhoneNumberOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the PhoneNumber resource </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static bool Delete(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeletePhoneNumberOptions(pathTrunkSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the PhoneNumber resource </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathTrunkSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeletePhoneNumberOptions(pathTrunkSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreatePhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/PhoneNumbers",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Create(CreatePhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> CreateAsync(CreatePhoneNumberOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk to associate the phone number with </param>
-        /// <param name="phoneNumberSid"> The SID of the Incoming Phone Number that you want to associate with the trunk
-        ///                      </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static PhoneNumberResource Create(string pathTrunkSid, string phoneNumberSid, ITwilioRestClient client = null)
-        {
-            var options = new CreatePhoneNumberOptions(pathTrunkSid, phoneNumberSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk to associate the phone number with </param>
-        /// <param name="phoneNumberSid"> The SID of the Incoming Phone Number that you want to associate with the trunk
-        ///                      </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<PhoneNumberResource> CreateAsync(string pathTrunkSid,
-                                                                                         string phoneNumberSid,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreatePhoneNumberOptions(pathTrunkSid, phoneNumberSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadPhoneNumberOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/PhoneNumbers",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static ResourceSet<PhoneNumberResource> Read(ReadPhoneNumberOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-            return new ResourceSet<PhoneNumberResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read PhoneNumber parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PhoneNumberResource>> ReadAsync(ReadPhoneNumberOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-            return new ResourceSet<PhoneNumberResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the PhoneNumber resources </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PhoneNumber </returns>
-        public static ResourceSet<PhoneNumberResource> Read(string pathTrunkSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadPhoneNumberOptions(pathTrunkSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the PhoneNumber resources </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PhoneNumberResource>> ReadAsync(string pathTrunkSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadPhoneNumberOptions(pathTrunkSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<PhoneNumberResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<PhoneNumberResource> NextPage(Page<PhoneNumberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trunking)
-            );
-
-            var response = client.Request(request);
-            return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<PhoneNumberResource> PreviousPage(Page<PhoneNumberResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trunking)
-            );
-
-            var response = client.Request(request);
-            return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a PhoneNumberResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> PhoneNumberResource object represented by the provided JSON </returns>
-        public static PhoneNumberResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<PhoneNumberResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Whether the phone number requires an Address registered with Twilio
-        /// </summary>
-        [JsonProperty("address_requirements")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public PhoneNumberResource.AddressRequirementEnum AddressRequirements { get; private set; }
-        /// <summary>
-        /// The API version used to start a new TwiML session
-        /// </summary>
-        [JsonProperty("api_version")]
-        public string ApiVersion { get; private set; }
-        /// <summary>
-        /// Whether the phone number is new to the Twilio platform
-        /// </summary>
-        [JsonProperty("beta")]
-        public bool? Beta { get; private set; }
-        /// <summary>
-        /// Indicate if a phone can receive calls or messages
-        /// </summary>
-        [JsonProperty("capabilities")]
-        public Dictionary<string, string> Capabilities { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// The phone number in E.164 format
-        /// </summary>
-        [JsonProperty("phone_number")]
-        [JsonConverter(typeof(PhoneNumberConverter))]
-        public Types.PhoneNumber PhoneNumber { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the application that handles SMS messages sent to the phone number
-        /// </summary>
-        [JsonProperty("sms_application_sid")]
-        public string SmsApplicationSid { get; private set; }
-        /// <summary>
-        /// The HTTP method used with sms_fallback_url
-        /// </summary>
-        [JsonProperty("sms_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL that we call when an error occurs while retrieving or executing the TwiML
-        /// </summary>
-        [JsonProperty("sms_fallback_url")]
-        public Uri SmsFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method to use with sms_url
-        /// </summary>
-        [JsonProperty("sms_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when the phone number receives an incoming SMS message
-        /// </summary>
-        [JsonProperty("sms_url")]
-        public Uri SmsUrl { get; private set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call status_callback
-        /// </summary>
-        [JsonProperty("status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// The SID of the Trunk that handles calls to the phone number
-        /// </summary>
-        [JsonProperty("trunk_sid")]
-        public string TrunkSid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The SID of the application that handles calls to the phone number
-        /// </summary>
-        [JsonProperty("voice_application_sid")]
-        public string VoiceApplicationSid { get; private set; }
-        /// <summary>
-        /// Whether to lookup the caller's name
-        /// </summary>
-        [JsonProperty("voice_caller_id_lookup")]
-        public bool? VoiceCallerIdLookup { get; private set; }
-        /// <summary>
-        /// The HTTP method that we use to call voice_fallback_url
-        /// </summary>
-        [JsonProperty("voice_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when an error occurs in TwiML
-        /// </summary>
-        [JsonProperty("voice_fallback_url")]
-        public Uri VoiceFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method used with the voice_url
-        /// </summary>
-        [JsonProperty("voice_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when the phone number receives a call
-        /// </summary>
-        [JsonProperty("voice_url")]
-        public Uri VoiceUrl { get; private set; }
-
-        private PhoneNumberResource()
-        {
-
-        }
-    }
+{
+
+  public class PhoneNumberResource : Resource
+  {
+    public sealed class AddressRequirementEnum : StringEnum
+    {
+      private AddressRequirementEnum(string value) : base(value) { }
+      public AddressRequirementEnum() { }
+      public static implicit operator AddressRequirementEnum(string value)
+      {
+        return new AddressRequirementEnum(value);
+      }
+
+      public static readonly AddressRequirementEnum None = new AddressRequirementEnum("none");
+      public static readonly AddressRequirementEnum Any = new AddressRequirementEnum("any");
+      public static readonly AddressRequirementEnum Local = new AddressRequirementEnum("local");
+      public static readonly AddressRequirementEnum Foreign = new AddressRequirementEnum("foreign");
+    }
+
+    private static Request BuildFetchRequest(FetchPhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/PhoneNumbers/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Fetch(FetchPhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(FetchPhoneNumberOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the PhoneNumber resource </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Fetch(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchPhoneNumberOptions(pathTrunkSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the PhoneNumber resource </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> FetchAsync(string pathTrunkSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchPhoneNumberOptions(pathTrunkSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeletePhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/PhoneNumbers/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static bool Delete(DeletePhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeletePhoneNumberOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the PhoneNumber resource </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static bool Delete(string pathTrunkSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeletePhoneNumberOptions(pathTrunkSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to delete the PhoneNumber resource </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathTrunkSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeletePhoneNumberOptions(pathTrunkSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreatePhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/PhoneNumbers",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Create(CreatePhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> CreateAsync(CreatePhoneNumberOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk to associate the phone number with </param>
+    /// <param name="phoneNumberSid"> The SID of the Incoming Phone Number that you want to associate with the trunk
+    ///                      </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static PhoneNumberResource Create(string pathTrunkSid, string phoneNumberSid, ITwilioRestClient client = null)
+    {
+      var options = new CreatePhoneNumberOptions(pathTrunkSid, phoneNumberSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk to associate the phone number with </param>
+    /// <param name="phoneNumberSid"> The SID of the Incoming Phone Number that you want to associate with the trunk
+    ///                      </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<PhoneNumberResource> CreateAsync(string pathTrunkSid,
+                                                                                     string phoneNumberSid,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreatePhoneNumberOptions(pathTrunkSid, phoneNumberSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadPhoneNumberOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/PhoneNumbers",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static ResourceSet<PhoneNumberResource> Read(ReadPhoneNumberOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+      return new ResourceSet<PhoneNumberResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read PhoneNumber parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PhoneNumberResource>> ReadAsync(ReadPhoneNumberOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+      return new ResourceSet<PhoneNumberResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the PhoneNumber resources </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PhoneNumber </returns>
+    public static ResourceSet<PhoneNumberResource> Read(string pathTrunkSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadPhoneNumberOptions(pathTrunkSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to read the PhoneNumber resources </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PhoneNumber </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PhoneNumberResource>> ReadAsync(string pathTrunkSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadPhoneNumberOptions(pathTrunkSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<PhoneNumberResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<PhoneNumberResource> NextPage(Page<PhoneNumberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trunking)
+      );
+
+      var response = client.Request(request);
+      return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<PhoneNumberResource> PreviousPage(Page<PhoneNumberResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trunking)
+      );
+
+      var response = client.Request(request);
+      return Page<PhoneNumberResource>.FromJson("phone_numbers", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a PhoneNumberResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> PhoneNumberResource object represented by the provided JSON </returns>
+    public static PhoneNumberResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<PhoneNumberResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Whether the phone number requires an Address registered with Twilio
+    /// </summary>
+    [JsonProperty("address_requirements")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public PhoneNumberResource.AddressRequirementEnum AddressRequirements { get; private set; }
+    /// <summary>
+    /// The API version used to start a new TwiML session
+    /// </summary>
+    [JsonProperty("api_version")]
+    public string ApiVersion { get; private set; }
+    /// <summary>
+    /// Whether the phone number is new to the Twilio platform
+    /// </summary>
+    [JsonProperty("beta")]
+    public bool? Beta { get; private set; }
+    /// <summary>
+    /// Indicate if a phone can receive calls or messages
+    /// </summary>
+    [JsonProperty("capabilities")]
+    public Dictionary<string, string> Capabilities { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// The phone number in E.164 format
+    /// </summary>
+    [JsonProperty("phone_number")]
+    [JsonConverter(typeof(PhoneNumberConverter))]
+    public Types.PhoneNumber PhoneNumber { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the application that handles SMS messages sent to the phone number
+    /// </summary>
+    [JsonProperty("sms_application_sid")]
+    public string SmsApplicationSid { get; private set; }
+    /// <summary>
+    /// The HTTP method used with sms_fallback_url
+    /// </summary>
+    [JsonProperty("sms_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL that we call when an error occurs while retrieving or executing the TwiML
+    /// </summary>
+    [JsonProperty("sms_fallback_url")]
+    public Uri SmsFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method to use with sms_url
+    /// </summary>
+    [JsonProperty("sms_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when the phone number receives an incoming SMS message
+    /// </summary>
+    [JsonProperty("sms_url")]
+    public Uri SmsUrl { get; private set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call status_callback
+    /// </summary>
+    [JsonProperty("status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// The SID of the Trunk that handles calls to the phone number
+    /// </summary>
+    [JsonProperty("trunk_sid")]
+    public string TrunkSid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The SID of the application that handles calls to the phone number
+    /// </summary>
+    [JsonProperty("voice_application_sid")]
+    public string VoiceApplicationSid { get; private set; }
+    /// <summary>
+    /// Whether to lookup the caller's name
+    /// </summary>
+    [JsonProperty("voice_caller_id_lookup")]
+    public bool? VoiceCallerIdLookup { get; private set; }
+    /// <summary>
+    /// The HTTP method that we use to call voice_fallback_url
+    /// </summary>
+    [JsonProperty("voice_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when an error occurs in TwiML
+    /// </summary>
+    [JsonProperty("voice_fallback_url")]
+    public Uri VoiceFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method used with the voice_url
+    /// </summary>
+    [JsonProperty("voice_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when the phone number receives a call
+    /// </summary>
+    [JsonProperty("voice_url")]
+    public Uri VoiceUrl { get; private set; }
+
+    private PhoneNumberResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trunking/V1/Trunk/RecordingOptions.cs b/src/Twilio/Rest/Trunking/V1/Trunk/RecordingOptions.cs
index 1b6933ad4..cd34f250f 100644
--- a/src/Twilio/Rest/Trunking/V1/Trunk/RecordingOptions.cs
+++ b/src/Twilio/Rest/Trunking/V1/Trunk/RecordingOptions.cs
@@ -9,82 +9,82 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trunking.V1.Trunk
-{
-
+{
+
+  /// <summary>
+  /// FetchRecordingOptions
+  /// </summary>
+  public class FetchRecordingOptions : IOptions<RecordingResource>
+  {
     /// <summary>
-    /// FetchRecordingOptions
+    /// The SID of the Trunk from which to fetch the recording settings.
     /// </summary>
-    public class FetchRecordingOptions : IOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk from which to fetch the recording settings.
-        /// </summary>
-        public string PathTrunkSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRecordingOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the recording settings. </param>
-        public FetchRecordingOptions(string pathTrunkSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathTrunkSid { get; }
+
     /// <summary>
-    /// UpdateRecordingOptions
+    /// Construct a new FetchRecordingOptions
     /// </summary>
-    public class UpdateRecordingOptions : IOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Trunk.
-        /// </summary>
-        public string PathTrunkSid { get; }
-        /// <summary>
-        /// The recording mode for the trunk.
-        /// </summary>
-        public RecordingResource.RecordingModeEnum Mode { get; set; }
-        /// <summary>
-        /// The recording trim setting for the trunk.
-        /// </summary>
-        public RecordingResource.RecordingTrimEnum Trim { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateRecordingOptions
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk. </param>
-        public UpdateRecordingOptions(string pathTrunkSid)
-        {
-            PathTrunkSid = pathTrunkSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Mode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Mode", Mode.ToString()));
-            }
-
-            if (Trim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Trim", Trim.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the recording settings. </param>
+    public FetchRecordingOptions(string pathTrunkSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateRecordingOptions
+  /// </summary>
+  public class UpdateRecordingOptions : IOptions<RecordingResource>
+  {
+    /// <summary>
+    /// The SID of the Trunk.
+    /// </summary>
+    public string PathTrunkSid { get; }
+    /// <summary>
+    /// The recording mode for the trunk.
+    /// </summary>
+    public RecordingResource.RecordingModeEnum Mode { get; set; }
+    /// <summary>
+    /// The recording trim setting for the trunk.
+    /// </summary>
+    public RecordingResource.RecordingTrimEnum Trim { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateRecordingOptions
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk. </param>
+    public UpdateRecordingOptions(string pathTrunkSid)
+    {
+      PathTrunkSid = pathTrunkSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Mode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Mode", Mode.ToString()));
+      }
+
+      if (Trim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Trim", Trim.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trunking/V1/Trunk/RecordingResource.cs b/src/Twilio/Rest/Trunking/V1/Trunk/RecordingResource.cs
index 477071245..33f45edf5 100644
--- a/src/Twilio/Rest/Trunking/V1/Trunk/RecordingResource.cs
+++ b/src/Twilio/Rest/Trunking/V1/Trunk/RecordingResource.cs
@@ -17,217 +17,217 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Trunking.V1.Trunk
-{
-
-    public class RecordingResource : Resource
-    {
-        public sealed class RecordingModeEnum : StringEnum
-        {
-            private RecordingModeEnum(string value) : base(value) {}
-            public RecordingModeEnum() {}
-            public static implicit operator RecordingModeEnum(string value)
-            {
-                return new RecordingModeEnum(value);
-            }
-
-            public static readonly RecordingModeEnum DoNotRecord = new RecordingModeEnum("do-not-record");
-            public static readonly RecordingModeEnum RecordFromRinging = new RecordingModeEnum("record-from-ringing");
-            public static readonly RecordingModeEnum RecordFromAnswer = new RecordingModeEnum("record-from-answer");
-            public static readonly RecordingModeEnum RecordFromRingingDual = new RecordingModeEnum("record-from-ringing-dual");
-            public static readonly RecordingModeEnum RecordFromAnswerDual = new RecordingModeEnum("record-from-answer-dual");
-        }
-
-        public sealed class RecordingTrimEnum : StringEnum
-        {
-            private RecordingTrimEnum(string value) : base(value) {}
-            public RecordingTrimEnum() {}
-            public static implicit operator RecordingTrimEnum(string value)
-            {
-                return new RecordingTrimEnum(value);
-            }
-
-            public static readonly RecordingTrimEnum TrimSilence = new RecordingTrimEnum("trim-silence");
-            public static readonly RecordingTrimEnum DoNotTrim = new RecordingTrimEnum("do-not-trim");
-        }
-
-        private static Request BuildFetchRequest(FetchRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/Recording",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Fetch(FetchRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(FetchRecordingOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the recording settings. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Fetch(string pathTrunkSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingOptions(pathTrunkSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the recording settings. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(string pathTrunkSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingOptions(pathTrunkSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathTrunkSid + "/Recording",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Update(UpdateRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> UpdateAsync(UpdateRecordingOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk. </param>
-        /// <param name="mode"> The recording mode for the trunk. </param>
-        /// <param name="trim"> The recording trim setting for the trunk. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Update(string pathTrunkSid,
-                                               RecordingResource.RecordingModeEnum mode = null,
-                                               RecordingResource.RecordingTrimEnum trim = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateRecordingOptions(pathTrunkSid){Mode = mode, Trim = trim};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathTrunkSid"> The SID of the Trunk. </param>
-        /// <param name="mode"> The recording mode for the trunk. </param>
-        /// <param name="trim"> The recording trim setting for the trunk. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> UpdateAsync(string pathTrunkSid,
-                                                                                       RecordingResource.RecordingModeEnum mode = null,
-                                                                                       RecordingResource.RecordingTrimEnum trim = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateRecordingOptions(pathTrunkSid){Mode = mode, Trim = trim};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RecordingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RecordingResource object represented by the provided JSON </returns>
-        public static RecordingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RecordingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The recording mode for the trunk.
-        /// </summary>
-        [JsonProperty("mode")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RecordingResource.RecordingModeEnum Mode { get; private set; }
-        /// <summary>
-        /// The recording trim setting for the trunk.
-        /// </summary>
-        [JsonProperty("trim")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RecordingResource.RecordingTrimEnum Trim { get; private set; }
-
-        private RecordingResource()
-        {
-
-        }
-    }
+{
+
+  public class RecordingResource : Resource
+  {
+    public sealed class RecordingModeEnum : StringEnum
+    {
+      private RecordingModeEnum(string value) : base(value) { }
+      public RecordingModeEnum() { }
+      public static implicit operator RecordingModeEnum(string value)
+      {
+        return new RecordingModeEnum(value);
+      }
+
+      public static readonly RecordingModeEnum DoNotRecord = new RecordingModeEnum("do-not-record");
+      public static readonly RecordingModeEnum RecordFromRinging = new RecordingModeEnum("record-from-ringing");
+      public static readonly RecordingModeEnum RecordFromAnswer = new RecordingModeEnum("record-from-answer");
+      public static readonly RecordingModeEnum RecordFromRingingDual = new RecordingModeEnum("record-from-ringing-dual");
+      public static readonly RecordingModeEnum RecordFromAnswerDual = new RecordingModeEnum("record-from-answer-dual");
+    }
+
+    public sealed class RecordingTrimEnum : StringEnum
+    {
+      private RecordingTrimEnum(string value) : base(value) { }
+      public RecordingTrimEnum() { }
+      public static implicit operator RecordingTrimEnum(string value)
+      {
+        return new RecordingTrimEnum(value);
+      }
+
+      public static readonly RecordingTrimEnum TrimSilence = new RecordingTrimEnum("trim-silence");
+      public static readonly RecordingTrimEnum DoNotTrim = new RecordingTrimEnum("do-not-trim");
+    }
+
+    private static Request BuildFetchRequest(FetchRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/Recording",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Fetch(FetchRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(FetchRecordingOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the recording settings. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Fetch(string pathTrunkSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingOptions(pathTrunkSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk from which to fetch the recording settings. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(string pathTrunkSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingOptions(pathTrunkSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathTrunkSid + "/Recording",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Update(UpdateRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> UpdateAsync(UpdateRecordingOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk. </param>
+    /// <param name="mode"> The recording mode for the trunk. </param>
+    /// <param name="trim"> The recording trim setting for the trunk. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Update(string pathTrunkSid,
+                                           RecordingResource.RecordingModeEnum mode = null,
+                                           RecordingResource.RecordingTrimEnum trim = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateRecordingOptions(pathTrunkSid) { Mode = mode, Trim = trim };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathTrunkSid"> The SID of the Trunk. </param>
+    /// <param name="mode"> The recording mode for the trunk. </param>
+    /// <param name="trim"> The recording trim setting for the trunk. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> UpdateAsync(string pathTrunkSid,
+                                                                                   RecordingResource.RecordingModeEnum mode = null,
+                                                                                   RecordingResource.RecordingTrimEnum trim = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateRecordingOptions(pathTrunkSid) { Mode = mode, Trim = trim };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RecordingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RecordingResource object represented by the provided JSON </returns>
+    public static RecordingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RecordingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The recording mode for the trunk.
+    /// </summary>
+    [JsonProperty("mode")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RecordingResource.RecordingModeEnum Mode { get; private set; }
+    /// <summary>
+    /// The recording trim setting for the trunk.
+    /// </summary>
+    [JsonProperty("trim")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RecordingResource.RecordingTrimEnum Trim { get; private set; }
+
+    private RecordingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trunking/V1/TrunkOptions.cs b/src/Twilio/Rest/Trunking/V1/TrunkOptions.cs
index 2a80ebdf5..bdfd11a90 100644
--- a/src/Twilio/Rest/Trunking/V1/TrunkOptions.cs
+++ b/src/Twilio/Rest/Trunking/V1/TrunkOptions.cs
@@ -9,273 +9,273 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trunking.V1
-{
-
+{
+
+  /// <summary>
+  /// FetchTrunkOptions
+  /// </summary>
+  public class FetchTrunkOptions : IOptions<TrunkResource>
+  {
     /// <summary>
-    /// FetchTrunkOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class FetchTrunkOptions : IOptions<TrunkResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTrunkOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchTrunkOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteTrunkOptions
+    /// Construct a new FetchTrunkOptions
     /// </summary>
-    public class DeleteTrunkOptions : IOptions<TrunkResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteTrunkOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteTrunkOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchTrunkOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// CreateTrunkOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class CreateTrunkOptions : IOptions<TrunkResource>
-    {
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique address you reserve on Twilio to which you route your SIP traffic
-        /// </summary>
-        public string DomainName { get; set; }
-        /// <summary>
-        /// The HTTP URL that we should call if an error occurs while sending SIP traffic towards your configured Origination URL
-        /// </summary>
-        public Uri DisasterRecoveryUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call the disaster_recovery_url
-        /// </summary>
-        public Twilio.Http.HttpMethod DisasterRecoveryMethod { get; set; }
-        /// <summary>
-        /// The call transfer settings for the trunk
-        /// </summary>
-        public TrunkResource.TransferSettingEnum TransferMode { get; set; }
-        /// <summary>
-        /// Whether Secure Trunking is enabled for the trunk
-        /// </summary>
-        public bool? Secure { get; set; }
-        /// <summary>
-        /// Whether Caller ID Name (CNAM) lookup should be enabled for the trunk
-        /// </summary>
-        public bool? CnamLookupEnabled { get; set; }
-        /// <summary>
-        /// Caller Id for transfer target
-        /// </summary>
-        public TrunkResource.TransferCallerIdEnum TransferCallerId { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DomainName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DomainName", DomainName));
-            }
-
-            if (DisasterRecoveryUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DisasterRecoveryUrl", Serializers.Url(DisasterRecoveryUrl)));
-            }
-
-            if (DisasterRecoveryMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DisasterRecoveryMethod", DisasterRecoveryMethod.ToString()));
-            }
-
-            if (TransferMode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TransferMode", TransferMode.ToString()));
-            }
-
-            if (Secure != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secure", Secure.Value.ToString().ToLower()));
-            }
-
-            if (CnamLookupEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CnamLookupEnabled", CnamLookupEnabled.Value.ToString().ToLower()));
-            }
-
-            if (TransferCallerId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TransferCallerId", TransferCallerId.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteTrunkOptions
+  /// </summary>
+  public class DeleteTrunkOptions : IOptions<TrunkResource>
+  {
     /// <summary>
-    /// ReadTrunkOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class ReadTrunkOptions : ReadOptions<TrunkResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// UpdateTrunkOptions
+    /// Construct a new DeleteTrunkOptions
     /// </summary>
-    public class UpdateTrunkOptions : IOptions<TrunkResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique address you reserve on Twilio to which you route your SIP traffic
-        /// </summary>
-        public string DomainName { get; set; }
-        /// <summary>
-        /// The HTTP URL that we should call if an error occurs while sending SIP traffic towards your configured Origination URL
-        /// </summary>
-        public Uri DisasterRecoveryUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call the disaster_recovery_url
-        /// </summary>
-        public Twilio.Http.HttpMethod DisasterRecoveryMethod { get; set; }
-        /// <summary>
-        /// The call transfer settings for the trunk
-        /// </summary>
-        public TrunkResource.TransferSettingEnum TransferMode { get; set; }
-        /// <summary>
-        /// Whether Secure Trunking is enabled for the trunk
-        /// </summary>
-        public bool? Secure { get; set; }
-        /// <summary>
-        /// Whether Caller ID Name (CNAM) lookup should be enabled for the trunk
-        /// </summary>
-        public bool? CnamLookupEnabled { get; set; }
-        /// <summary>
-        /// Caller Id for transfer target
-        /// </summary>
-        public TrunkResource.TransferCallerIdEnum TransferCallerId { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateTrunkOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateTrunkOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DomainName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DomainName", DomainName));
-            }
-
-            if (DisasterRecoveryUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DisasterRecoveryUrl", Serializers.Url(DisasterRecoveryUrl)));
-            }
-
-            if (DisasterRecoveryMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DisasterRecoveryMethod", DisasterRecoveryMethod.ToString()));
-            }
-
-            if (TransferMode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TransferMode", TransferMode.ToString()));
-            }
-
-            if (Secure != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Secure", Secure.Value.ToString().ToLower()));
-            }
-
-            if (CnamLookupEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CnamLookupEnabled", CnamLookupEnabled.Value.ToString().ToLower()));
-            }
-
-            if (TransferCallerId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TransferCallerId", TransferCallerId.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteTrunkOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateTrunkOptions
+  /// </summary>
+  public class CreateTrunkOptions : IOptions<TrunkResource>
+  {
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique address you reserve on Twilio to which you route your SIP traffic
+    /// </summary>
+    public string DomainName { get; set; }
+    /// <summary>
+    /// The HTTP URL that we should call if an error occurs while sending SIP traffic towards your configured Origination URL
+    /// </summary>
+    public Uri DisasterRecoveryUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call the disaster_recovery_url
+    /// </summary>
+    public Twilio.Http.HttpMethod DisasterRecoveryMethod { get; set; }
+    /// <summary>
+    /// The call transfer settings for the trunk
+    /// </summary>
+    public TrunkResource.TransferSettingEnum TransferMode { get; set; }
+    /// <summary>
+    /// Whether Secure Trunking is enabled for the trunk
+    /// </summary>
+    public bool? Secure { get; set; }
+    /// <summary>
+    /// Whether Caller ID Name (CNAM) lookup should be enabled for the trunk
+    /// </summary>
+    public bool? CnamLookupEnabled { get; set; }
+    /// <summary>
+    /// Caller Id for transfer target
+    /// </summary>
+    public TrunkResource.TransferCallerIdEnum TransferCallerId { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DomainName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DomainName", DomainName));
+      }
+
+      if (DisasterRecoveryUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DisasterRecoveryUrl", Serializers.Url(DisasterRecoveryUrl)));
+      }
+
+      if (DisasterRecoveryMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DisasterRecoveryMethod", DisasterRecoveryMethod.ToString()));
+      }
+
+      if (TransferMode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TransferMode", TransferMode.ToString()));
+      }
+
+      if (Secure != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secure", Secure.Value.ToString().ToLower()));
+      }
+
+      if (CnamLookupEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CnamLookupEnabled", CnamLookupEnabled.Value.ToString().ToLower()));
+      }
+
+      if (TransferCallerId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TransferCallerId", TransferCallerId.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadTrunkOptions
+  /// </summary>
+  public class ReadTrunkOptions : ReadOptions<TrunkResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateTrunkOptions
+  /// </summary>
+  public class UpdateTrunkOptions : IOptions<TrunkResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique address you reserve on Twilio to which you route your SIP traffic
+    /// </summary>
+    public string DomainName { get; set; }
+    /// <summary>
+    /// The HTTP URL that we should call if an error occurs while sending SIP traffic towards your configured Origination URL
+    /// </summary>
+    public Uri DisasterRecoveryUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call the disaster_recovery_url
+    /// </summary>
+    public Twilio.Http.HttpMethod DisasterRecoveryMethod { get; set; }
+    /// <summary>
+    /// The call transfer settings for the trunk
+    /// </summary>
+    public TrunkResource.TransferSettingEnum TransferMode { get; set; }
+    /// <summary>
+    /// Whether Secure Trunking is enabled for the trunk
+    /// </summary>
+    public bool? Secure { get; set; }
+    /// <summary>
+    /// Whether Caller ID Name (CNAM) lookup should be enabled for the trunk
+    /// </summary>
+    public bool? CnamLookupEnabled { get; set; }
+    /// <summary>
+    /// Caller Id for transfer target
+    /// </summary>
+    public TrunkResource.TransferCallerIdEnum TransferCallerId { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateTrunkOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateTrunkOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DomainName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DomainName", DomainName));
+      }
+
+      if (DisasterRecoveryUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DisasterRecoveryUrl", Serializers.Url(DisasterRecoveryUrl)));
+      }
+
+      if (DisasterRecoveryMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DisasterRecoveryMethod", DisasterRecoveryMethod.ToString()));
+      }
+
+      if (TransferMode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TransferMode", TransferMode.ToString()));
+      }
+
+      if (Secure != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Secure", Secure.Value.ToString().ToLower()));
+      }
+
+      if (CnamLookupEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CnamLookupEnabled", CnamLookupEnabled.Value.ToString().ToLower()));
+      }
+
+      if (TransferCallerId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TransferCallerId", TransferCallerId.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trunking/V1/TrunkResource.cs b/src/Twilio/Rest/Trunking/V1/TrunkResource.cs
index 39e074902..e66964032 100644
--- a/src/Twilio/Rest/Trunking/V1/TrunkResource.cs
+++ b/src/Twilio/Rest/Trunking/V1/TrunkResource.cs
@@ -17,610 +17,610 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Trunking.V1
-{
-
-    public class TrunkResource : Resource
-    {
-        public sealed class TransferSettingEnum : StringEnum
-        {
-            private TransferSettingEnum(string value) : base(value) {}
-            public TransferSettingEnum() {}
-            public static implicit operator TransferSettingEnum(string value)
-            {
-                return new TransferSettingEnum(value);
-            }
-
-            public static readonly TransferSettingEnum DisableAll = new TransferSettingEnum("disable-all");
-            public static readonly TransferSettingEnum EnableAll = new TransferSettingEnum("enable-all");
-            public static readonly TransferSettingEnum SipOnly = new TransferSettingEnum("sip-only");
-        }
-
-        public sealed class TransferCallerIdEnum : StringEnum
-        {
-            private TransferCallerIdEnum(string value) : base(value) {}
-            public TransferCallerIdEnum() {}
-            public static implicit operator TransferCallerIdEnum(string value)
-            {
-                return new TransferCallerIdEnum(value);
-            }
-
-            public static readonly TransferCallerIdEnum FromTransferee = new TransferCallerIdEnum("from-transferee");
-            public static readonly TransferCallerIdEnum FromTransferor = new TransferCallerIdEnum("from-transferor");
-        }
-
-        private static Request BuildFetchRequest(FetchTrunkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Trunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trunk </returns>
-        public static TrunkResource Fetch(FetchTrunkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Trunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trunk </returns>
-        public static async System.Threading.Tasks.Task<TrunkResource> FetchAsync(FetchTrunkOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trunk </returns>
-        public static TrunkResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchTrunkOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trunk </returns>
-        public static async System.Threading.Tasks.Task<TrunkResource> FetchAsync(string pathSid,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new FetchTrunkOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteTrunkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Trunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trunk </returns>
-        public static bool Delete(DeleteTrunkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete Trunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trunk </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTrunkOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trunk </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteTrunkOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trunk </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteTrunkOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateTrunkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trunking,
-                "/v1/Trunks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Trunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trunk </returns>
-        public static TrunkResource Create(CreateTrunkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Trunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trunk </returns>
-        public static async System.Threading.Tasks.Task<TrunkResource> CreateAsync(CreateTrunkOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="domainName"> The unique address you reserve on Twilio to which you route your SIP traffic </param>
-        /// <param name="disasterRecoveryUrl"> The HTTP URL that we should call if an error occurs while sending SIP traffic
-        ///                           towards your configured Origination URL </param>
-        /// <param name="disasterRecoveryMethod"> The HTTP method we should use to call the disaster_recovery_url </param>
-        /// <param name="transferMode"> The call transfer settings for the trunk </param>
-        /// <param name="secure"> Whether Secure Trunking is enabled for the trunk </param>
-        /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup should be enabled for the trunk </param>
-        /// <param name="transferCallerId"> Caller Id for transfer target </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trunk </returns>
-        public static TrunkResource Create(string friendlyName = null,
-                                           string domainName = null,
-                                           Uri disasterRecoveryUrl = null,
-                                           Twilio.Http.HttpMethod disasterRecoveryMethod = null,
-                                           TrunkResource.TransferSettingEnum transferMode = null,
-                                           bool? secure = null,
-                                           bool? cnamLookupEnabled = null,
-                                           TrunkResource.TransferCallerIdEnum transferCallerId = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateTrunkOptions(){FriendlyName = friendlyName, DomainName = domainName, DisasterRecoveryUrl = disasterRecoveryUrl, DisasterRecoveryMethod = disasterRecoveryMethod, TransferMode = transferMode, Secure = secure, CnamLookupEnabled = cnamLookupEnabled, TransferCallerId = transferCallerId};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="domainName"> The unique address you reserve on Twilio to which you route your SIP traffic </param>
-        /// <param name="disasterRecoveryUrl"> The HTTP URL that we should call if an error occurs while sending SIP traffic
-        ///                           towards your configured Origination URL </param>
-        /// <param name="disasterRecoveryMethod"> The HTTP method we should use to call the disaster_recovery_url </param>
-        /// <param name="transferMode"> The call transfer settings for the trunk </param>
-        /// <param name="secure"> Whether Secure Trunking is enabled for the trunk </param>
-        /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup should be enabled for the trunk </param>
-        /// <param name="transferCallerId"> Caller Id for transfer target </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trunk </returns>
-        public static async System.Threading.Tasks.Task<TrunkResource> CreateAsync(string friendlyName = null,
-                                                                                   string domainName = null,
-                                                                                   Uri disasterRecoveryUrl = null,
-                                                                                   Twilio.Http.HttpMethod disasterRecoveryMethod = null,
-                                                                                   TrunkResource.TransferSettingEnum transferMode = null,
-                                                                                   bool? secure = null,
-                                                                                   bool? cnamLookupEnabled = null,
-                                                                                   TrunkResource.TransferCallerIdEnum transferCallerId = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateTrunkOptions(){FriendlyName = friendlyName, DomainName = domainName, DisasterRecoveryUrl = disasterRecoveryUrl, DisasterRecoveryMethod = disasterRecoveryMethod, TransferMode = transferMode, Secure = secure, CnamLookupEnabled = cnamLookupEnabled, TransferCallerId = transferCallerId};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadTrunkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trunking,
-                "/v1/Trunks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Trunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trunk </returns>
-        public static ResourceSet<TrunkResource> Read(ReadTrunkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TrunkResource>.FromJson("trunks", response.Content);
-            return new ResourceSet<TrunkResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Trunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trunk </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TrunkResource>> ReadAsync(ReadTrunkOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TrunkResource>.FromJson("trunks", response.Content);
-            return new ResourceSet<TrunkResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trunk </returns>
-        public static ResourceSet<TrunkResource> Read(int? pageSize = null,
-                                                      long? limit = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadTrunkOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trunk </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TrunkResource>> ReadAsync(int? pageSize = null,
-                                                                                              long? limit = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadTrunkOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TrunkResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TrunkResource>.FromJson("trunks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TrunkResource> NextPage(Page<TrunkResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trunking)
-            );
-
-            var response = client.Request(request);
-            return Page<TrunkResource>.FromJson("trunks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TrunkResource> PreviousPage(Page<TrunkResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trunking)
-            );
-
-            var response = client.Request(request);
-            return Page<TrunkResource>.FromJson("trunks", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateTrunkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trunking,
-                "/v1/Trunks/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Trunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trunk </returns>
-        public static TrunkResource Update(UpdateTrunkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Trunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trunk </returns>
-        public static async System.Threading.Tasks.Task<TrunkResource> UpdateAsync(UpdateTrunkOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="domainName"> The unique address you reserve on Twilio to which you route your SIP traffic </param>
-        /// <param name="disasterRecoveryUrl"> The HTTP URL that we should call if an error occurs while sending SIP traffic
-        ///                           towards your configured Origination URL </param>
-        /// <param name="disasterRecoveryMethod"> The HTTP method we should use to call the disaster_recovery_url </param>
-        /// <param name="transferMode"> The call transfer settings for the trunk </param>
-        /// <param name="secure"> Whether Secure Trunking is enabled for the trunk </param>
-        /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup should be enabled for the trunk </param>
-        /// <param name="transferCallerId"> Caller Id for transfer target </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Trunk </returns>
-        public static TrunkResource Update(string pathSid,
-                                           string friendlyName = null,
-                                           string domainName = null,
-                                           Uri disasterRecoveryUrl = null,
-                                           Twilio.Http.HttpMethod disasterRecoveryMethod = null,
-                                           TrunkResource.TransferSettingEnum transferMode = null,
-                                           bool? secure = null,
-                                           bool? cnamLookupEnabled = null,
-                                           TrunkResource.TransferCallerIdEnum transferCallerId = null,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new UpdateTrunkOptions(pathSid){FriendlyName = friendlyName, DomainName = domainName, DisasterRecoveryUrl = disasterRecoveryUrl, DisasterRecoveryMethod = disasterRecoveryMethod, TransferMode = transferMode, Secure = secure, CnamLookupEnabled = cnamLookupEnabled, TransferCallerId = transferCallerId};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="domainName"> The unique address you reserve on Twilio to which you route your SIP traffic </param>
-        /// <param name="disasterRecoveryUrl"> The HTTP URL that we should call if an error occurs while sending SIP traffic
-        ///                           towards your configured Origination URL </param>
-        /// <param name="disasterRecoveryMethod"> The HTTP method we should use to call the disaster_recovery_url </param>
-        /// <param name="transferMode"> The call transfer settings for the trunk </param>
-        /// <param name="secure"> Whether Secure Trunking is enabled for the trunk </param>
-        /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup should be enabled for the trunk </param>
-        /// <param name="transferCallerId"> Caller Id for transfer target </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Trunk </returns>
-        public static async System.Threading.Tasks.Task<TrunkResource> UpdateAsync(string pathSid,
-                                                                                   string friendlyName = null,
-                                                                                   string domainName = null,
-                                                                                   Uri disasterRecoveryUrl = null,
-                                                                                   Twilio.Http.HttpMethod disasterRecoveryMethod = null,
-                                                                                   TrunkResource.TransferSettingEnum transferMode = null,
-                                                                                   bool? secure = null,
-                                                                                   bool? cnamLookupEnabled = null,
-                                                                                   TrunkResource.TransferCallerIdEnum transferCallerId = null,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new UpdateTrunkOptions(pathSid){FriendlyName = friendlyName, DomainName = domainName, DisasterRecoveryUrl = disasterRecoveryUrl, DisasterRecoveryMethod = disasterRecoveryMethod, TransferMode = transferMode, Secure = secure, CnamLookupEnabled = cnamLookupEnabled, TransferCallerId = transferCallerId};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TrunkResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TrunkResource object represented by the provided JSON </returns>
-        public static TrunkResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TrunkResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique address you reserve on Twilio to which you route your SIP traffic
-        /// </summary>
-        [JsonProperty("domain_name")]
-        public string DomainName { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call the disaster_recovery_url
-        /// </summary>
-        [JsonProperty("disaster_recovery_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod DisasterRecoveryMethod { get; private set; }
-        /// <summary>
-        /// The HTTP URL that we call if an error occurs while sending SIP traffic towards your configured Origination URL
-        /// </summary>
-        [JsonProperty("disaster_recovery_url")]
-        public Uri DisasterRecoveryUrl { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// Whether Secure Trunking is enabled for the trunk
-        /// </summary>
-        [JsonProperty("secure")]
-        public bool? Secure { get; private set; }
-        /// <summary>
-        /// The recording settings for the trunk
-        /// </summary>
-        [JsonProperty("recording")]
-        public object Recording { get; private set; }
-        /// <summary>
-        /// The call transfer settings for the trunk
-        /// </summary>
-        [JsonProperty("transfer_mode")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TrunkResource.TransferSettingEnum TransferMode { get; private set; }
-        /// <summary>
-        /// Caller Id for transfer target
-        /// </summary>
-        [JsonProperty("transfer_caller_id")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TrunkResource.TransferCallerIdEnum TransferCallerId { get; private set; }
-        /// <summary>
-        /// Whether Caller ID Name (CNAM) lookup is enabled for the trunk
-        /// </summary>
-        [JsonProperty("cnam_lookup_enabled")]
-        public bool? CnamLookupEnabled { get; private set; }
-        /// <summary>
-        /// The types of authentication mapped to the domain
-        /// </summary>
-        [JsonProperty("auth_type")]
-        public string AuthType { get; private set; }
-        /// <summary>
-        /// Reserved
-        /// </summary>
-        [JsonProperty("auth_type_set")]
-        public List<string> AuthTypeSet { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private TrunkResource()
-        {
-
-        }
-    }
+{
+
+  public class TrunkResource : Resource
+  {
+    public sealed class TransferSettingEnum : StringEnum
+    {
+      private TransferSettingEnum(string value) : base(value) { }
+      public TransferSettingEnum() { }
+      public static implicit operator TransferSettingEnum(string value)
+      {
+        return new TransferSettingEnum(value);
+      }
+
+      public static readonly TransferSettingEnum DisableAll = new TransferSettingEnum("disable-all");
+      public static readonly TransferSettingEnum EnableAll = new TransferSettingEnum("enable-all");
+      public static readonly TransferSettingEnum SipOnly = new TransferSettingEnum("sip-only");
+    }
+
+    public sealed class TransferCallerIdEnum : StringEnum
+    {
+      private TransferCallerIdEnum(string value) : base(value) { }
+      public TransferCallerIdEnum() { }
+      public static implicit operator TransferCallerIdEnum(string value)
+      {
+        return new TransferCallerIdEnum(value);
+      }
+
+      public static readonly TransferCallerIdEnum FromTransferee = new TransferCallerIdEnum("from-transferee");
+      public static readonly TransferCallerIdEnum FromTransferor = new TransferCallerIdEnum("from-transferor");
+    }
+
+    private static Request BuildFetchRequest(FetchTrunkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Trunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trunk </returns>
+    public static TrunkResource Fetch(FetchTrunkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Trunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trunk </returns>
+    public static async System.Threading.Tasks.Task<TrunkResource> FetchAsync(FetchTrunkOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trunk </returns>
+    public static TrunkResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchTrunkOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trunk </returns>
+    public static async System.Threading.Tasks.Task<TrunkResource> FetchAsync(string pathSid,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new FetchTrunkOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteTrunkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Trunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trunk </returns>
+    public static bool Delete(DeleteTrunkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete Trunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trunk </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTrunkOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trunk </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteTrunkOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trunk </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteTrunkOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateTrunkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trunking,
+          "/v1/Trunks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Trunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trunk </returns>
+    public static TrunkResource Create(CreateTrunkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Trunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trunk </returns>
+    public static async System.Threading.Tasks.Task<TrunkResource> CreateAsync(CreateTrunkOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="domainName"> The unique address you reserve on Twilio to which you route your SIP traffic </param>
+    /// <param name="disasterRecoveryUrl"> The HTTP URL that we should call if an error occurs while sending SIP traffic
+    ///                           towards your configured Origination URL </param>
+    /// <param name="disasterRecoveryMethod"> The HTTP method we should use to call the disaster_recovery_url </param>
+    /// <param name="transferMode"> The call transfer settings for the trunk </param>
+    /// <param name="secure"> Whether Secure Trunking is enabled for the trunk </param>
+    /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup should be enabled for the trunk </param>
+    /// <param name="transferCallerId"> Caller Id for transfer target </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trunk </returns>
+    public static TrunkResource Create(string friendlyName = null,
+                                       string domainName = null,
+                                       Uri disasterRecoveryUrl = null,
+                                       Twilio.Http.HttpMethod disasterRecoveryMethod = null,
+                                       TrunkResource.TransferSettingEnum transferMode = null,
+                                       bool? secure = null,
+                                       bool? cnamLookupEnabled = null,
+                                       TrunkResource.TransferCallerIdEnum transferCallerId = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateTrunkOptions() { FriendlyName = friendlyName, DomainName = domainName, DisasterRecoveryUrl = disasterRecoveryUrl, DisasterRecoveryMethod = disasterRecoveryMethod, TransferMode = transferMode, Secure = secure, CnamLookupEnabled = cnamLookupEnabled, TransferCallerId = transferCallerId };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="domainName"> The unique address you reserve on Twilio to which you route your SIP traffic </param>
+    /// <param name="disasterRecoveryUrl"> The HTTP URL that we should call if an error occurs while sending SIP traffic
+    ///                           towards your configured Origination URL </param>
+    /// <param name="disasterRecoveryMethod"> The HTTP method we should use to call the disaster_recovery_url </param>
+    /// <param name="transferMode"> The call transfer settings for the trunk </param>
+    /// <param name="secure"> Whether Secure Trunking is enabled for the trunk </param>
+    /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup should be enabled for the trunk </param>
+    /// <param name="transferCallerId"> Caller Id for transfer target </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trunk </returns>
+    public static async System.Threading.Tasks.Task<TrunkResource> CreateAsync(string friendlyName = null,
+                                                                               string domainName = null,
+                                                                               Uri disasterRecoveryUrl = null,
+                                                                               Twilio.Http.HttpMethod disasterRecoveryMethod = null,
+                                                                               TrunkResource.TransferSettingEnum transferMode = null,
+                                                                               bool? secure = null,
+                                                                               bool? cnamLookupEnabled = null,
+                                                                               TrunkResource.TransferCallerIdEnum transferCallerId = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateTrunkOptions() { FriendlyName = friendlyName, DomainName = domainName, DisasterRecoveryUrl = disasterRecoveryUrl, DisasterRecoveryMethod = disasterRecoveryMethod, TransferMode = transferMode, Secure = secure, CnamLookupEnabled = cnamLookupEnabled, TransferCallerId = transferCallerId };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadTrunkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trunking,
+          "/v1/Trunks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Trunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trunk </returns>
+    public static ResourceSet<TrunkResource> Read(ReadTrunkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TrunkResource>.FromJson("trunks", response.Content);
+      return new ResourceSet<TrunkResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Trunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trunk </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TrunkResource>> ReadAsync(ReadTrunkOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TrunkResource>.FromJson("trunks", response.Content);
+      return new ResourceSet<TrunkResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trunk </returns>
+    public static ResourceSet<TrunkResource> Read(int? pageSize = null,
+                                                  long? limit = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadTrunkOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trunk </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TrunkResource>> ReadAsync(int? pageSize = null,
+                                                                                          long? limit = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadTrunkOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TrunkResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TrunkResource>.FromJson("trunks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TrunkResource> NextPage(Page<TrunkResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trunking)
+      );
+
+      var response = client.Request(request);
+      return Page<TrunkResource>.FromJson("trunks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TrunkResource> PreviousPage(Page<TrunkResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trunking)
+      );
+
+      var response = client.Request(request);
+      return Page<TrunkResource>.FromJson("trunks", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateTrunkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trunking,
+          "/v1/Trunks/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Trunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trunk </returns>
+    public static TrunkResource Update(UpdateTrunkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Trunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trunk </returns>
+    public static async System.Threading.Tasks.Task<TrunkResource> UpdateAsync(UpdateTrunkOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="domainName"> The unique address you reserve on Twilio to which you route your SIP traffic </param>
+    /// <param name="disasterRecoveryUrl"> The HTTP URL that we should call if an error occurs while sending SIP traffic
+    ///                           towards your configured Origination URL </param>
+    /// <param name="disasterRecoveryMethod"> The HTTP method we should use to call the disaster_recovery_url </param>
+    /// <param name="transferMode"> The call transfer settings for the trunk </param>
+    /// <param name="secure"> Whether Secure Trunking is enabled for the trunk </param>
+    /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup should be enabled for the trunk </param>
+    /// <param name="transferCallerId"> Caller Id for transfer target </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Trunk </returns>
+    public static TrunkResource Update(string pathSid,
+                                       string friendlyName = null,
+                                       string domainName = null,
+                                       Uri disasterRecoveryUrl = null,
+                                       Twilio.Http.HttpMethod disasterRecoveryMethod = null,
+                                       TrunkResource.TransferSettingEnum transferMode = null,
+                                       bool? secure = null,
+                                       bool? cnamLookupEnabled = null,
+                                       TrunkResource.TransferCallerIdEnum transferCallerId = null,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new UpdateTrunkOptions(pathSid) { FriendlyName = friendlyName, DomainName = domainName, DisasterRecoveryUrl = disasterRecoveryUrl, DisasterRecoveryMethod = disasterRecoveryMethod, TransferMode = transferMode, Secure = secure, CnamLookupEnabled = cnamLookupEnabled, TransferCallerId = transferCallerId };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="domainName"> The unique address you reserve on Twilio to which you route your SIP traffic </param>
+    /// <param name="disasterRecoveryUrl"> The HTTP URL that we should call if an error occurs while sending SIP traffic
+    ///                           towards your configured Origination URL </param>
+    /// <param name="disasterRecoveryMethod"> The HTTP method we should use to call the disaster_recovery_url </param>
+    /// <param name="transferMode"> The call transfer settings for the trunk </param>
+    /// <param name="secure"> Whether Secure Trunking is enabled for the trunk </param>
+    /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup should be enabled for the trunk </param>
+    /// <param name="transferCallerId"> Caller Id for transfer target </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Trunk </returns>
+    public static async System.Threading.Tasks.Task<TrunkResource> UpdateAsync(string pathSid,
+                                                                               string friendlyName = null,
+                                                                               string domainName = null,
+                                                                               Uri disasterRecoveryUrl = null,
+                                                                               Twilio.Http.HttpMethod disasterRecoveryMethod = null,
+                                                                               TrunkResource.TransferSettingEnum transferMode = null,
+                                                                               bool? secure = null,
+                                                                               bool? cnamLookupEnabled = null,
+                                                                               TrunkResource.TransferCallerIdEnum transferCallerId = null,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new UpdateTrunkOptions(pathSid) { FriendlyName = friendlyName, DomainName = domainName, DisasterRecoveryUrl = disasterRecoveryUrl, DisasterRecoveryMethod = disasterRecoveryMethod, TransferMode = transferMode, Secure = secure, CnamLookupEnabled = cnamLookupEnabled, TransferCallerId = transferCallerId };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TrunkResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TrunkResource object represented by the provided JSON </returns>
+    public static TrunkResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TrunkResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique address you reserve on Twilio to which you route your SIP traffic
+    /// </summary>
+    [JsonProperty("domain_name")]
+    public string DomainName { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call the disaster_recovery_url
+    /// </summary>
+    [JsonProperty("disaster_recovery_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod DisasterRecoveryMethod { get; private set; }
+    /// <summary>
+    /// The HTTP URL that we call if an error occurs while sending SIP traffic towards your configured Origination URL
+    /// </summary>
+    [JsonProperty("disaster_recovery_url")]
+    public Uri DisasterRecoveryUrl { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// Whether Secure Trunking is enabled for the trunk
+    /// </summary>
+    [JsonProperty("secure")]
+    public bool? Secure { get; private set; }
+    /// <summary>
+    /// The recording settings for the trunk
+    /// </summary>
+    [JsonProperty("recording")]
+    public object Recording { get; private set; }
+    /// <summary>
+    /// The call transfer settings for the trunk
+    /// </summary>
+    [JsonProperty("transfer_mode")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TrunkResource.TransferSettingEnum TransferMode { get; private set; }
+    /// <summary>
+    /// Caller Id for transfer target
+    /// </summary>
+    [JsonProperty("transfer_caller_id")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TrunkResource.TransferCallerIdEnum TransferCallerId { get; private set; }
+    /// <summary>
+    /// Whether Caller ID Name (CNAM) lookup is enabled for the trunk
+    /// </summary>
+    [JsonProperty("cnam_lookup_enabled")]
+    public bool? CnamLookupEnabled { get; private set; }
+    /// <summary>
+    /// The types of authentication mapped to the domain
+    /// </summary>
+    [JsonProperty("auth_type")]
+    public string AuthType { get; private set; }
+    /// <summary>
+    /// Reserved
+    /// </summary>
+    [JsonProperty("auth_type_set")]
+    public List<string> AuthTypeSet { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private TrunkResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesChannelEndpointAssignmentOptions.cs b/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesChannelEndpointAssignmentOptions.cs
index ec63b1764..d3ccbcf03 100644
--- a/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesChannelEndpointAssignmentOptions.cs
+++ b/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesChannelEndpointAssignmentOptions.cs
@@ -9,181 +9,181 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trusthub.V1.CustomerProfiles
-{
-
+{
+
+  /// <summary>
+  /// Create a new Assigned Item.
+  /// </summary>
+  public class CreateCustomerProfilesChannelEndpointAssignmentOptions : IOptions<CustomerProfilesChannelEndpointAssignmentResource>
+  {
     /// <summary>
-    /// Create a new Assigned Item.
-    /// </summary>
-    public class CreateCustomerProfilesChannelEndpointAssignmentOptions : IOptions<CustomerProfilesChannelEndpointAssignmentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathCustomerProfileSid { get; }
-        /// <summary>
-        /// The type of channel endpoint
-        /// </summary>
-        public string ChannelEndpointType { get; }
-        /// <summary>
-        /// The sid of an channel endpoint
-        /// </summary>
-        public string ChannelEndpointSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateCustomerProfilesChannelEndpointAssignmentOptions
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="channelEndpointType"> The type of channel endpoint </param>
-        /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
-        public CreateCustomerProfilesChannelEndpointAssignmentOptions(string pathCustomerProfileSid,
-                                                                      string channelEndpointType,
-                                                                      string channelEndpointSid)
-        {
-            PathCustomerProfileSid = pathCustomerProfileSid;
-            ChannelEndpointType = channelEndpointType;
-            ChannelEndpointSid = channelEndpointSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ChannelEndpointType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelEndpointType", ChannelEndpointType));
-            }
-
-            if (ChannelEndpointSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelEndpointSid", ChannelEndpointSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathCustomerProfileSid { get; }
     /// <summary>
-    /// Retrieve a list of all Assigned Items for an account.
-    /// </summary>
-    public class ReadCustomerProfilesChannelEndpointAssignmentOptions : ReadOptions<CustomerProfilesChannelEndpointAssignmentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathCustomerProfileSid { get; }
-        /// <summary>
-        /// The sid of an channel endpoint
-        /// </summary>
-        public string ChannelEndpointSid { get; set; }
-        /// <summary>
-        /// comma separated list of channel endpoint sids
-        /// </summary>
-        public string ChannelEndpointSids { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadCustomerProfilesChannelEndpointAssignmentOptions
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        public ReadCustomerProfilesChannelEndpointAssignmentOptions(string pathCustomerProfileSid)
-        {
-            PathCustomerProfileSid = pathCustomerProfileSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ChannelEndpointSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelEndpointSid", ChannelEndpointSid.ToString()));
-            }
-
-            if (ChannelEndpointSids != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelEndpointSids", ChannelEndpointSids));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The type of channel endpoint
+    /// </summary>
+    public string ChannelEndpointType { get; }
     /// <summary>
-    /// Fetch specific Assigned Item Instance.
-    /// </summary>
-    public class FetchCustomerProfilesChannelEndpointAssignmentOptions : IOptions<CustomerProfilesChannelEndpointAssignmentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathCustomerProfileSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCustomerProfilesChannelEndpointAssignmentOptions
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchCustomerProfilesChannelEndpointAssignmentOptions(string pathCustomerProfileSid, string pathSid)
-        {
-            PathCustomerProfileSid = pathCustomerProfileSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The sid of an channel endpoint
+    /// </summary>
+    public string ChannelEndpointSid { get; }
+
     /// <summary>
-    /// Remove an Assignment Item Instance.
-    /// </summary>
-    public class DeleteCustomerProfilesChannelEndpointAssignmentOptions : IOptions<CustomerProfilesChannelEndpointAssignmentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathCustomerProfileSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCustomerProfilesChannelEndpointAssignmentOptions
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteCustomerProfilesChannelEndpointAssignmentOptions(string pathCustomerProfileSid, string pathSid)
-        {
-            PathCustomerProfileSid = pathCustomerProfileSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new CreateCustomerProfilesChannelEndpointAssignmentOptions
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="channelEndpointType"> The type of channel endpoint </param>
+    /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
+    public CreateCustomerProfilesChannelEndpointAssignmentOptions(string pathCustomerProfileSid,
+                                                                  string channelEndpointType,
+                                                                  string channelEndpointSid)
+    {
+      PathCustomerProfileSid = pathCustomerProfileSid;
+      ChannelEndpointType = channelEndpointType;
+      ChannelEndpointSid = channelEndpointSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ChannelEndpointType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelEndpointType", ChannelEndpointType));
+      }
+
+      if (ChannelEndpointSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelEndpointSid", ChannelEndpointSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Assigned Items for an account.
+  /// </summary>
+  public class ReadCustomerProfilesChannelEndpointAssignmentOptions : ReadOptions<CustomerProfilesChannelEndpointAssignmentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathCustomerProfileSid { get; }
+    /// <summary>
+    /// The sid of an channel endpoint
+    /// </summary>
+    public string ChannelEndpointSid { get; set; }
+    /// <summary>
+    /// comma separated list of channel endpoint sids
+    /// </summary>
+    public string ChannelEndpointSids { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadCustomerProfilesChannelEndpointAssignmentOptions
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    public ReadCustomerProfilesChannelEndpointAssignmentOptions(string pathCustomerProfileSid)
+    {
+      PathCustomerProfileSid = pathCustomerProfileSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ChannelEndpointSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelEndpointSid", ChannelEndpointSid.ToString()));
+      }
+
+      if (ChannelEndpointSids != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelEndpointSids", ChannelEndpointSids));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific Assigned Item Instance.
+  /// </summary>
+  public class FetchCustomerProfilesChannelEndpointAssignmentOptions : IOptions<CustomerProfilesChannelEndpointAssignmentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathCustomerProfileSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCustomerProfilesChannelEndpointAssignmentOptions
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchCustomerProfilesChannelEndpointAssignmentOptions(string pathCustomerProfileSid, string pathSid)
+    {
+      PathCustomerProfileSid = pathCustomerProfileSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove an Assignment Item Instance.
+  /// </summary>
+  public class DeleteCustomerProfilesChannelEndpointAssignmentOptions : IOptions<CustomerProfilesChannelEndpointAssignmentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathCustomerProfileSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCustomerProfilesChannelEndpointAssignmentOptions
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteCustomerProfilesChannelEndpointAssignmentOptions(string pathCustomerProfileSid, string pathSid)
+    {
+      PathCustomerProfileSid = pathCustomerProfileSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesChannelEndpointAssignmentResource.cs b/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesChannelEndpointAssignmentResource.cs
index d7c405c6c..f4f8ffcaf 100644
--- a/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesChannelEndpointAssignmentResource.cs
+++ b/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesChannelEndpointAssignmentResource.cs
@@ -16,438 +16,438 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Trusthub.V1.CustomerProfiles
-{
-
-    public class CustomerProfilesChannelEndpointAssignmentResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateCustomerProfilesChannelEndpointAssignmentOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/ChannelEndpointAssignments",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="options"> Create CustomerProfilesChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static CustomerProfilesChannelEndpointAssignmentResource Create(CreateCustomerProfilesChannelEndpointAssignmentOptions options,
-                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="options"> Create CustomerProfilesChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesChannelEndpointAssignmentResource> CreateAsync(CreateCustomerProfilesChannelEndpointAssignmentOptions options,
-                                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="channelEndpointType"> The type of channel endpoint </param>
-        /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static CustomerProfilesChannelEndpointAssignmentResource Create(string pathCustomerProfileSid,
-                                                                               string channelEndpointType,
-                                                                               string channelEndpointSid,
-                                                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid, channelEndpointType, channelEndpointSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="channelEndpointType"> The type of channel endpoint </param>
-        /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesChannelEndpointAssignmentResource> CreateAsync(string pathCustomerProfileSid,
-                                                                                                                       string channelEndpointType,
-                                                                                                                       string channelEndpointSid,
-                                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid, channelEndpointType, channelEndpointSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCustomerProfilesChannelEndpointAssignmentOptions options,
-                                                ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/ChannelEndpointAssignments",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="options"> Read CustomerProfilesChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static ResourceSet<CustomerProfilesChannelEndpointAssignmentResource> Read(ReadCustomerProfilesChannelEndpointAssignmentOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CustomerProfilesChannelEndpointAssignmentResource>.FromJson("results", response.Content);
-            return new ResourceSet<CustomerProfilesChannelEndpointAssignmentResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="options"> Read CustomerProfilesChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesChannelEndpointAssignmentResource>> ReadAsync(ReadCustomerProfilesChannelEndpointAssignmentOptions options,
-                                                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CustomerProfilesChannelEndpointAssignmentResource>.FromJson("results", response.Content);
-            return new ResourceSet<CustomerProfilesChannelEndpointAssignmentResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
-        /// <param name="channelEndpointSids"> comma separated list of channel endpoint sids </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static ResourceSet<CustomerProfilesChannelEndpointAssignmentResource> Read(string pathCustomerProfileSid,
-                                                                                          string channelEndpointSid = null,
-                                                                                          string channelEndpointSids = null,
-                                                                                          int? pageSize = null,
-                                                                                          long? limit = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid){ChannelEndpointSid = channelEndpointSid, ChannelEndpointSids = channelEndpointSids, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
-        /// <param name="channelEndpointSids"> comma separated list of channel endpoint sids </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesChannelEndpointAssignmentResource>> ReadAsync(string pathCustomerProfileSid,
-                                                                                                                                  string channelEndpointSid = null,
-                                                                                                                                  string channelEndpointSids = null,
-                                                                                                                                  int? pageSize = null,
-                                                                                                                                  long? limit = null,
-                                                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid){ChannelEndpointSid = channelEndpointSid, ChannelEndpointSids = channelEndpointSids, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CustomerProfilesChannelEndpointAssignmentResource> GetPage(string targetUrl,
-                                                                                      ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CustomerProfilesChannelEndpointAssignmentResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CustomerProfilesChannelEndpointAssignmentResource> NextPage(Page<CustomerProfilesChannelEndpointAssignmentResource> page,
-                                                                                       ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<CustomerProfilesChannelEndpointAssignmentResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CustomerProfilesChannelEndpointAssignmentResource> PreviousPage(Page<CustomerProfilesChannelEndpointAssignmentResource> page,
-                                                                                           ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<CustomerProfilesChannelEndpointAssignmentResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchCustomerProfilesChannelEndpointAssignmentOptions options,
-                                                 ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/ChannelEndpointAssignments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="options"> Fetch CustomerProfilesChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static CustomerProfilesChannelEndpointAssignmentResource Fetch(FetchCustomerProfilesChannelEndpointAssignmentOptions options,
-                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="options"> Fetch CustomerProfilesChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesChannelEndpointAssignmentResource> FetchAsync(FetchCustomerProfilesChannelEndpointAssignmentOptions options,
-                                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static CustomerProfilesChannelEndpointAssignmentResource Fetch(string pathCustomerProfileSid,
-                                                                              string pathSid,
-                                                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesChannelEndpointAssignmentResource> FetchAsync(string pathCustomerProfileSid,
-                                                                                                                      string pathSid,
-                                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCustomerProfilesChannelEndpointAssignmentOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/ChannelEndpointAssignments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="options"> Delete CustomerProfilesChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static bool Delete(DeleteCustomerProfilesChannelEndpointAssignmentOptions options,
-                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="options"> Delete CustomerProfilesChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCustomerProfilesChannelEndpointAssignmentOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static bool Delete(string pathCustomerProfileSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathCustomerProfileSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CustomerProfilesChannelEndpointAssignmentResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CustomerProfilesChannelEndpointAssignmentResource object represented by the provided JSON </returns>
-        public static CustomerProfilesChannelEndpointAssignmentResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CustomerProfilesChannelEndpointAssignmentResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the CustomerProfile resource.
-        /// </summary>
-        [JsonProperty("customer_profile_sid")]
-        public string CustomerProfileSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The type of channel endpoint
-        /// </summary>
-        [JsonProperty("channel_endpoint_type")]
-        public string ChannelEndpointType { get; private set; }
-        /// <summary>
-        /// The sid of an channel endpoint
-        /// </summary>
-        [JsonProperty("channel_endpoint_sid")]
-        public string ChannelEndpointSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Identity resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CustomerProfilesChannelEndpointAssignmentResource()
-        {
-
-        }
-    }
+{
+
+  public class CustomerProfilesChannelEndpointAssignmentResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateCustomerProfilesChannelEndpointAssignmentOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/ChannelEndpointAssignments",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="options"> Create CustomerProfilesChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static CustomerProfilesChannelEndpointAssignmentResource Create(CreateCustomerProfilesChannelEndpointAssignmentOptions options,
+                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="options"> Create CustomerProfilesChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesChannelEndpointAssignmentResource> CreateAsync(CreateCustomerProfilesChannelEndpointAssignmentOptions options,
+                                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="channelEndpointType"> The type of channel endpoint </param>
+    /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static CustomerProfilesChannelEndpointAssignmentResource Create(string pathCustomerProfileSid,
+                                                                           string channelEndpointType,
+                                                                           string channelEndpointSid,
+                                                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid, channelEndpointType, channelEndpointSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="channelEndpointType"> The type of channel endpoint </param>
+    /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesChannelEndpointAssignmentResource> CreateAsync(string pathCustomerProfileSid,
+                                                                                                                   string channelEndpointType,
+                                                                                                                   string channelEndpointSid,
+                                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid, channelEndpointType, channelEndpointSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCustomerProfilesChannelEndpointAssignmentOptions options,
+                                            ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/ChannelEndpointAssignments",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="options"> Read CustomerProfilesChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static ResourceSet<CustomerProfilesChannelEndpointAssignmentResource> Read(ReadCustomerProfilesChannelEndpointAssignmentOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CustomerProfilesChannelEndpointAssignmentResource>.FromJson("results", response.Content);
+      return new ResourceSet<CustomerProfilesChannelEndpointAssignmentResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="options"> Read CustomerProfilesChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesChannelEndpointAssignmentResource>> ReadAsync(ReadCustomerProfilesChannelEndpointAssignmentOptions options,
+                                                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CustomerProfilesChannelEndpointAssignmentResource>.FromJson("results", response.Content);
+      return new ResourceSet<CustomerProfilesChannelEndpointAssignmentResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
+    /// <param name="channelEndpointSids"> comma separated list of channel endpoint sids </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static ResourceSet<CustomerProfilesChannelEndpointAssignmentResource> Read(string pathCustomerProfileSid,
+                                                                                      string channelEndpointSid = null,
+                                                                                      string channelEndpointSids = null,
+                                                                                      int? pageSize = null,
+                                                                                      long? limit = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid) { ChannelEndpointSid = channelEndpointSid, ChannelEndpointSids = channelEndpointSids, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
+    /// <param name="channelEndpointSids"> comma separated list of channel endpoint sids </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesChannelEndpointAssignmentResource>> ReadAsync(string pathCustomerProfileSid,
+                                                                                                                              string channelEndpointSid = null,
+                                                                                                                              string channelEndpointSids = null,
+                                                                                                                              int? pageSize = null,
+                                                                                                                              long? limit = null,
+                                                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid) { ChannelEndpointSid = channelEndpointSid, ChannelEndpointSids = channelEndpointSids, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CustomerProfilesChannelEndpointAssignmentResource> GetPage(string targetUrl,
+                                                                                  ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CustomerProfilesChannelEndpointAssignmentResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CustomerProfilesChannelEndpointAssignmentResource> NextPage(Page<CustomerProfilesChannelEndpointAssignmentResource> page,
+                                                                                   ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<CustomerProfilesChannelEndpointAssignmentResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CustomerProfilesChannelEndpointAssignmentResource> PreviousPage(Page<CustomerProfilesChannelEndpointAssignmentResource> page,
+                                                                                       ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<CustomerProfilesChannelEndpointAssignmentResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchCustomerProfilesChannelEndpointAssignmentOptions options,
+                                             ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/ChannelEndpointAssignments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="options"> Fetch CustomerProfilesChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static CustomerProfilesChannelEndpointAssignmentResource Fetch(FetchCustomerProfilesChannelEndpointAssignmentOptions options,
+                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="options"> Fetch CustomerProfilesChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesChannelEndpointAssignmentResource> FetchAsync(FetchCustomerProfilesChannelEndpointAssignmentOptions options,
+                                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static CustomerProfilesChannelEndpointAssignmentResource Fetch(string pathCustomerProfileSid,
+                                                                          string pathSid,
+                                                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesChannelEndpointAssignmentResource> FetchAsync(string pathCustomerProfileSid,
+                                                                                                                  string pathSid,
+                                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCustomerProfilesChannelEndpointAssignmentOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/ChannelEndpointAssignments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="options"> Delete CustomerProfilesChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static bool Delete(DeleteCustomerProfilesChannelEndpointAssignmentOptions options,
+                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="options"> Delete CustomerProfilesChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCustomerProfilesChannelEndpointAssignmentOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static bool Delete(string pathCustomerProfileSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathCustomerProfileSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteCustomerProfilesChannelEndpointAssignmentOptions(pathCustomerProfileSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CustomerProfilesChannelEndpointAssignmentResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CustomerProfilesChannelEndpointAssignmentResource object represented by the provided JSON </returns>
+    public static CustomerProfilesChannelEndpointAssignmentResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CustomerProfilesChannelEndpointAssignmentResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the CustomerProfile resource.
+    /// </summary>
+    [JsonProperty("customer_profile_sid")]
+    public string CustomerProfileSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The type of channel endpoint
+    /// </summary>
+    [JsonProperty("channel_endpoint_type")]
+    public string ChannelEndpointType { get; private set; }
+    /// <summary>
+    /// The sid of an channel endpoint
+    /// </summary>
+    [JsonProperty("channel_endpoint_sid")]
+    public string ChannelEndpointSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Identity resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CustomerProfilesChannelEndpointAssignmentResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEntityAssignmentsOptions.cs b/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEntityAssignmentsOptions.cs
index 502ef7136..07527fc1c 100644
--- a/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEntityAssignmentsOptions.cs
+++ b/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEntityAssignmentsOptions.cs
@@ -9,150 +9,150 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trusthub.V1.CustomerProfiles
-{
-
+{
+
+  /// <summary>
+  /// Create a new Assigned Item.
+  /// </summary>
+  public class CreateCustomerProfilesEntityAssignmentsOptions : IOptions<CustomerProfilesEntityAssignmentsResource>
+  {
     /// <summary>
-    /// Create a new Assigned Item.
+    /// The unique string that identifies the resource.
     /// </summary>
-    public class CreateCustomerProfilesEntityAssignmentsOptions : IOptions<CustomerProfilesEntityAssignmentsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathCustomerProfileSid { get; }
-        /// <summary>
-        /// The sid of an object bag
-        /// </summary>
-        public string ObjectSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateCustomerProfilesEntityAssignmentsOptions
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="objectSid"> The sid of an object bag </param>
-        public CreateCustomerProfilesEntityAssignmentsOptions(string pathCustomerProfileSid, string objectSid)
-        {
-            PathCustomerProfileSid = pathCustomerProfileSid;
-            ObjectSid = objectSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ObjectSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ObjectSid", ObjectSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathCustomerProfileSid { get; }
     /// <summary>
-    /// Retrieve a list of all Assigned Items for an account.
+    /// The sid of an object bag
     /// </summary>
-    public class ReadCustomerProfilesEntityAssignmentsOptions : ReadOptions<CustomerProfilesEntityAssignmentsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathCustomerProfileSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadCustomerProfilesEntityAssignmentsOptions
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        public ReadCustomerProfilesEntityAssignmentsOptions(string pathCustomerProfileSid)
-        {
-            PathCustomerProfileSid = pathCustomerProfileSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string ObjectSid { get; }
+
     /// <summary>
-    /// Fetch specific Assigned Item Instance.
+    /// Construct a new CreateCustomerProfilesEntityAssignmentsOptions
     /// </summary>
-    public class FetchCustomerProfilesEntityAssignmentsOptions : IOptions<CustomerProfilesEntityAssignmentsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathCustomerProfileSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCustomerProfilesEntityAssignmentsOptions
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchCustomerProfilesEntityAssignmentsOptions(string pathCustomerProfileSid, string pathSid)
-        {
-            PathCustomerProfileSid = pathCustomerProfileSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="objectSid"> The sid of an object bag </param>
+    public CreateCustomerProfilesEntityAssignmentsOptions(string pathCustomerProfileSid, string objectSid)
+    {
+      PathCustomerProfileSid = pathCustomerProfileSid;
+      ObjectSid = objectSid;
+    }
+
     /// <summary>
-    /// Remove an Assignment Item Instance.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteCustomerProfilesEntityAssignmentsOptions : IOptions<CustomerProfilesEntityAssignmentsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathCustomerProfileSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCustomerProfilesEntityAssignmentsOptions
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteCustomerProfilesEntityAssignmentsOptions(string pathCustomerProfileSid, string pathSid)
-        {
-            PathCustomerProfileSid = pathCustomerProfileSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ObjectSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ObjectSid", ObjectSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Assigned Items for an account.
+  /// </summary>
+  public class ReadCustomerProfilesEntityAssignmentsOptions : ReadOptions<CustomerProfilesEntityAssignmentsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathCustomerProfileSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadCustomerProfilesEntityAssignmentsOptions
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    public ReadCustomerProfilesEntityAssignmentsOptions(string pathCustomerProfileSid)
+    {
+      PathCustomerProfileSid = pathCustomerProfileSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific Assigned Item Instance.
+  /// </summary>
+  public class FetchCustomerProfilesEntityAssignmentsOptions : IOptions<CustomerProfilesEntityAssignmentsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathCustomerProfileSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCustomerProfilesEntityAssignmentsOptions
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchCustomerProfilesEntityAssignmentsOptions(string pathCustomerProfileSid, string pathSid)
+    {
+      PathCustomerProfileSid = pathCustomerProfileSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove an Assignment Item Instance.
+  /// </summary>
+  public class DeleteCustomerProfilesEntityAssignmentsOptions : IOptions<CustomerProfilesEntityAssignmentsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathCustomerProfileSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCustomerProfilesEntityAssignmentsOptions
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteCustomerProfilesEntityAssignmentsOptions(string pathCustomerProfileSid, string pathSid)
+    {
+      PathCustomerProfileSid = pathCustomerProfileSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEntityAssignmentsResource.cs b/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEntityAssignmentsResource.cs
index a6e68fd5a..6de6d7e05 100644
--- a/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEntityAssignmentsResource.cs
+++ b/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEntityAssignmentsResource.cs
@@ -16,419 +16,419 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Trusthub.V1.CustomerProfiles
-{
-
-    public class CustomerProfilesEntityAssignmentsResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateCustomerProfilesEntityAssignmentsOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/EntityAssignments",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="options"> Create CustomerProfilesEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
-        public static CustomerProfilesEntityAssignmentsResource Create(CreateCustomerProfilesEntityAssignmentsOptions options,
-                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="options"> Create CustomerProfilesEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesEntityAssignmentsResource> CreateAsync(CreateCustomerProfilesEntityAssignmentsOptions options,
-                                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="objectSid"> The sid of an object bag </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
-        public static CustomerProfilesEntityAssignmentsResource Create(string pathCustomerProfileSid,
-                                                                       string objectSid,
-                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid, objectSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="objectSid"> The sid of an object bag </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesEntityAssignmentsResource> CreateAsync(string pathCustomerProfileSid,
-                                                                                                               string objectSid,
-                                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid, objectSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCustomerProfilesEntityAssignmentsOptions options,
-                                                ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/EntityAssignments",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="options"> Read CustomerProfilesEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
-        public static ResourceSet<CustomerProfilesEntityAssignmentsResource> Read(ReadCustomerProfilesEntityAssignmentsOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CustomerProfilesEntityAssignmentsResource>.FromJson("results", response.Content);
-            return new ResourceSet<CustomerProfilesEntityAssignmentsResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="options"> Read CustomerProfilesEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesEntityAssignmentsResource>> ReadAsync(ReadCustomerProfilesEntityAssignmentsOptions options,
-                                                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CustomerProfilesEntityAssignmentsResource>.FromJson("results", response.Content);
-            return new ResourceSet<CustomerProfilesEntityAssignmentsResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
-        public static ResourceSet<CustomerProfilesEntityAssignmentsResource> Read(string pathCustomerProfileSid,
-                                                                                  int? pageSize = null,
-                                                                                  long? limit = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesEntityAssignmentsResource>> ReadAsync(string pathCustomerProfileSid,
-                                                                                                                          int? pageSize = null,
-                                                                                                                          long? limit = null,
-                                                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CustomerProfilesEntityAssignmentsResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CustomerProfilesEntityAssignmentsResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CustomerProfilesEntityAssignmentsResource> NextPage(Page<CustomerProfilesEntityAssignmentsResource> page,
-                                                                               ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<CustomerProfilesEntityAssignmentsResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CustomerProfilesEntityAssignmentsResource> PreviousPage(Page<CustomerProfilesEntityAssignmentsResource> page,
-                                                                                   ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<CustomerProfilesEntityAssignmentsResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchCustomerProfilesEntityAssignmentsOptions options,
-                                                 ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/EntityAssignments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="options"> Fetch CustomerProfilesEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
-        public static CustomerProfilesEntityAssignmentsResource Fetch(FetchCustomerProfilesEntityAssignmentsOptions options,
-                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="options"> Fetch CustomerProfilesEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesEntityAssignmentsResource> FetchAsync(FetchCustomerProfilesEntityAssignmentsOptions options,
-                                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
-        public static CustomerProfilesEntityAssignmentsResource Fetch(string pathCustomerProfileSid,
-                                                                      string pathSid,
-                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesEntityAssignmentsResource> FetchAsync(string pathCustomerProfileSid,
-                                                                                                              string pathSid,
-                                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCustomerProfilesEntityAssignmentsOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/EntityAssignments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="options"> Delete CustomerProfilesEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
-        public static bool Delete(DeleteCustomerProfilesEntityAssignmentsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="options"> Delete CustomerProfilesEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCustomerProfilesEntityAssignmentsOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
-        public static bool Delete(string pathCustomerProfileSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathCustomerProfileSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CustomerProfilesEntityAssignmentsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CustomerProfilesEntityAssignmentsResource object represented by the provided JSON </returns>
-        public static CustomerProfilesEntityAssignmentsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CustomerProfilesEntityAssignmentsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the CustomerProfile resource.
-        /// </summary>
-        [JsonProperty("customer_profile_sid")]
-        public string CustomerProfileSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The sid of an object bag
-        /// </summary>
-        [JsonProperty("object_sid")]
-        public string ObjectSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Identity resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CustomerProfilesEntityAssignmentsResource()
-        {
-
-        }
-    }
+{
+
+  public class CustomerProfilesEntityAssignmentsResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateCustomerProfilesEntityAssignmentsOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/EntityAssignments",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="options"> Create CustomerProfilesEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
+    public static CustomerProfilesEntityAssignmentsResource Create(CreateCustomerProfilesEntityAssignmentsOptions options,
+                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="options"> Create CustomerProfilesEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesEntityAssignmentsResource> CreateAsync(CreateCustomerProfilesEntityAssignmentsOptions options,
+                                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="objectSid"> The sid of an object bag </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
+    public static CustomerProfilesEntityAssignmentsResource Create(string pathCustomerProfileSid,
+                                                                   string objectSid,
+                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid, objectSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="objectSid"> The sid of an object bag </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesEntityAssignmentsResource> CreateAsync(string pathCustomerProfileSid,
+                                                                                                           string objectSid,
+                                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid, objectSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCustomerProfilesEntityAssignmentsOptions options,
+                                            ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/EntityAssignments",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="options"> Read CustomerProfilesEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
+    public static ResourceSet<CustomerProfilesEntityAssignmentsResource> Read(ReadCustomerProfilesEntityAssignmentsOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CustomerProfilesEntityAssignmentsResource>.FromJson("results", response.Content);
+      return new ResourceSet<CustomerProfilesEntityAssignmentsResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="options"> Read CustomerProfilesEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesEntityAssignmentsResource>> ReadAsync(ReadCustomerProfilesEntityAssignmentsOptions options,
+                                                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CustomerProfilesEntityAssignmentsResource>.FromJson("results", response.Content);
+      return new ResourceSet<CustomerProfilesEntityAssignmentsResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
+    public static ResourceSet<CustomerProfilesEntityAssignmentsResource> Read(string pathCustomerProfileSid,
+                                                                              int? pageSize = null,
+                                                                              long? limit = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesEntityAssignmentsResource>> ReadAsync(string pathCustomerProfileSid,
+                                                                                                                      int? pageSize = null,
+                                                                                                                      long? limit = null,
+                                                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CustomerProfilesEntityAssignmentsResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CustomerProfilesEntityAssignmentsResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CustomerProfilesEntityAssignmentsResource> NextPage(Page<CustomerProfilesEntityAssignmentsResource> page,
+                                                                           ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<CustomerProfilesEntityAssignmentsResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CustomerProfilesEntityAssignmentsResource> PreviousPage(Page<CustomerProfilesEntityAssignmentsResource> page,
+                                                                               ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<CustomerProfilesEntityAssignmentsResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchCustomerProfilesEntityAssignmentsOptions options,
+                                             ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/EntityAssignments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="options"> Fetch CustomerProfilesEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
+    public static CustomerProfilesEntityAssignmentsResource Fetch(FetchCustomerProfilesEntityAssignmentsOptions options,
+                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="options"> Fetch CustomerProfilesEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesEntityAssignmentsResource> FetchAsync(FetchCustomerProfilesEntityAssignmentsOptions options,
+                                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
+    public static CustomerProfilesEntityAssignmentsResource Fetch(string pathCustomerProfileSid,
+                                                                  string pathSid,
+                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesEntityAssignmentsResource> FetchAsync(string pathCustomerProfileSid,
+                                                                                                          string pathSid,
+                                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCustomerProfilesEntityAssignmentsOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/EntityAssignments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="options"> Delete CustomerProfilesEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
+    public static bool Delete(DeleteCustomerProfilesEntityAssignmentsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="options"> Delete CustomerProfilesEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCustomerProfilesEntityAssignmentsOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEntityAssignments </returns>
+    public static bool Delete(string pathCustomerProfileSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathCustomerProfileSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteCustomerProfilesEntityAssignmentsOptions(pathCustomerProfileSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CustomerProfilesEntityAssignmentsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CustomerProfilesEntityAssignmentsResource object represented by the provided JSON </returns>
+    public static CustomerProfilesEntityAssignmentsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CustomerProfilesEntityAssignmentsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the CustomerProfile resource.
+    /// </summary>
+    [JsonProperty("customer_profile_sid")]
+    public string CustomerProfileSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The sid of an object bag
+    /// </summary>
+    [JsonProperty("object_sid")]
+    public string ObjectSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Identity resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CustomerProfilesEntityAssignmentsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEvaluationsOptions.cs b/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEvaluationsOptions.cs
index d1daa92ac..ed41c4e69 100644
--- a/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEvaluationsOptions.cs
+++ b/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEvaluationsOptions.cs
@@ -9,115 +9,115 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trusthub.V1.CustomerProfiles
-{
-
+{
+
+  /// <summary>
+  /// Create a new Evaluation
+  /// </summary>
+  public class CreateCustomerProfilesEvaluationsOptions : IOptions<CustomerProfilesEvaluationsResource>
+  {
     /// <summary>
-    /// Create a new Evaluation
+    /// The unique string that identifies the resource.
     /// </summary>
-    public class CreateCustomerProfilesEvaluationsOptions : IOptions<CustomerProfilesEvaluationsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathCustomerProfileSid { get; }
-        /// <summary>
-        /// The unique string of a policy
-        /// </summary>
-        public string PolicySid { get; }
-
-        /// <summary>
-        /// Construct a new CreateCustomerProfilesEvaluationsOptions
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="policySid"> The unique string of a policy </param>
-        public CreateCustomerProfilesEvaluationsOptions(string pathCustomerProfileSid, string policySid)
-        {
-            PathCustomerProfileSid = pathCustomerProfileSid;
-            PolicySid = policySid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PolicySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PolicySid", PolicySid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathCustomerProfileSid { get; }
     /// <summary>
-    /// Retrieve a list of Evaluations associated to the customer_profile resource.
+    /// The unique string of a policy
     /// </summary>
-    public class ReadCustomerProfilesEvaluationsOptions : ReadOptions<CustomerProfilesEvaluationsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathCustomerProfileSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadCustomerProfilesEvaluationsOptions
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        public ReadCustomerProfilesEvaluationsOptions(string pathCustomerProfileSid)
-        {
-            PathCustomerProfileSid = pathCustomerProfileSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PolicySid { get; }
+
     /// <summary>
-    /// Fetch specific Evaluation Instance.
+    /// Construct a new CreateCustomerProfilesEvaluationsOptions
     /// </summary>
-    public class FetchCustomerProfilesEvaluationsOptions : IOptions<CustomerProfilesEvaluationsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathCustomerProfileSid { get; }
-        /// <summary>
-        /// The unique string that identifies the Evaluation resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCustomerProfilesEvaluationsOptions
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource </param>
-        /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
-        public FetchCustomerProfilesEvaluationsOptions(string pathCustomerProfileSid, string pathSid)
-        {
-            PathCustomerProfileSid = pathCustomerProfileSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="policySid"> The unique string of a policy </param>
+    public CreateCustomerProfilesEvaluationsOptions(string pathCustomerProfileSid, string policySid)
+    {
+      PathCustomerProfileSid = pathCustomerProfileSid;
+      PolicySid = policySid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PolicySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PolicySid", PolicySid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of Evaluations associated to the customer_profile resource.
+  /// </summary>
+  public class ReadCustomerProfilesEvaluationsOptions : ReadOptions<CustomerProfilesEvaluationsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathCustomerProfileSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadCustomerProfilesEvaluationsOptions
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    public ReadCustomerProfilesEvaluationsOptions(string pathCustomerProfileSid)
+    {
+      PathCustomerProfileSid = pathCustomerProfileSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific Evaluation Instance.
+  /// </summary>
+  public class FetchCustomerProfilesEvaluationsOptions : IOptions<CustomerProfilesEvaluationsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathCustomerProfileSid { get; }
+    /// <summary>
+    /// The unique string that identifies the Evaluation resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCustomerProfilesEvaluationsOptions
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource </param>
+    /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
+    public FetchCustomerProfilesEvaluationsOptions(string pathCustomerProfileSid, string pathSid)
+    {
+      PathCustomerProfileSid = pathCustomerProfileSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEvaluationsResource.cs b/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEvaluationsResource.cs
index 3d0caf2d4..474fb0ceb 100644
--- a/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEvaluationsResource.cs
+++ b/src/Twilio/Rest/Trusthub/V1/CustomerProfiles/CustomerProfilesEvaluationsResource.cs
@@ -17,369 +17,369 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Trusthub.V1.CustomerProfiles
-{
-
-    public class CustomerProfilesEvaluationsResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Compliant = new StatusEnum("compliant");
-            public static readonly StatusEnum Noncompliant = new StatusEnum("noncompliant");
-        }
-
-        private static Request BuildCreateRequest(CreateCustomerProfilesEvaluationsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/Evaluations",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Evaluation
-        /// </summary>
-        /// <param name="options"> Create CustomerProfilesEvaluations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEvaluations </returns>
-        public static CustomerProfilesEvaluationsResource Create(CreateCustomerProfilesEvaluationsOptions options,
-                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Evaluation
-        /// </summary>
-        /// <param name="options"> Create CustomerProfilesEvaluations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEvaluations </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesEvaluationsResource> CreateAsync(CreateCustomerProfilesEvaluationsOptions options,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Evaluation
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="policySid"> The unique string of a policy </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEvaluations </returns>
-        public static CustomerProfilesEvaluationsResource Create(string pathCustomerProfileSid,
-                                                                 string policySid,
-                                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateCustomerProfilesEvaluationsOptions(pathCustomerProfileSid, policySid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Evaluation
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="policySid"> The unique string of a policy </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEvaluations </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesEvaluationsResource> CreateAsync(string pathCustomerProfileSid,
-                                                                                                         string policySid,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateCustomerProfilesEvaluationsOptions(pathCustomerProfileSid, policySid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCustomerProfilesEvaluationsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/Evaluations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Evaluations associated to the customer_profile resource.
-        /// </summary>
-        /// <param name="options"> Read CustomerProfilesEvaluations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEvaluations </returns>
-        public static ResourceSet<CustomerProfilesEvaluationsResource> Read(ReadCustomerProfilesEvaluationsOptions options,
-                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CustomerProfilesEvaluationsResource>.FromJson("results", response.Content);
-            return new ResourceSet<CustomerProfilesEvaluationsResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Evaluations associated to the customer_profile resource.
-        /// </summary>
-        /// <param name="options"> Read CustomerProfilesEvaluations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEvaluations </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesEvaluationsResource>> ReadAsync(ReadCustomerProfilesEvaluationsOptions options,
-                                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CustomerProfilesEvaluationsResource>.FromJson("results", response.Content);
-            return new ResourceSet<CustomerProfilesEvaluationsResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Evaluations associated to the customer_profile resource.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEvaluations </returns>
-        public static ResourceSet<CustomerProfilesEvaluationsResource> Read(string pathCustomerProfileSid,
-                                                                            int? pageSize = null,
-                                                                            long? limit = null,
-                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadCustomerProfilesEvaluationsOptions(pathCustomerProfileSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Evaluations associated to the customer_profile resource.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEvaluations </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesEvaluationsResource>> ReadAsync(string pathCustomerProfileSid,
-                                                                                                                    int? pageSize = null,
-                                                                                                                    long? limit = null,
-                                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadCustomerProfilesEvaluationsOptions(pathCustomerProfileSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CustomerProfilesEvaluationsResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CustomerProfilesEvaluationsResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CustomerProfilesEvaluationsResource> NextPage(Page<CustomerProfilesEvaluationsResource> page,
-                                                                         ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<CustomerProfilesEvaluationsResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CustomerProfilesEvaluationsResource> PreviousPage(Page<CustomerProfilesEvaluationsResource> page,
-                                                                             ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<CustomerProfilesEvaluationsResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchCustomerProfilesEvaluationsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/Evaluations/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific Evaluation Instance.
-        /// </summary>
-        /// <param name="options"> Fetch CustomerProfilesEvaluations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEvaluations </returns>
-        public static CustomerProfilesEvaluationsResource Fetch(FetchCustomerProfilesEvaluationsOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Evaluation Instance.
-        /// </summary>
-        /// <param name="options"> Fetch CustomerProfilesEvaluations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEvaluations </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesEvaluationsResource> FetchAsync(FetchCustomerProfilesEvaluationsOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific Evaluation Instance.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource </param>
-        /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfilesEvaluations </returns>
-        public static CustomerProfilesEvaluationsResource Fetch(string pathCustomerProfileSid,
-                                                                string pathSid,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchCustomerProfilesEvaluationsOptions(pathCustomerProfileSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Evaluation Instance.
-        /// </summary>
-        /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource </param>
-        /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfilesEvaluations </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesEvaluationsResource> FetchAsync(string pathCustomerProfileSid,
-                                                                                                        string pathSid,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchCustomerProfilesEvaluationsOptions(pathCustomerProfileSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CustomerProfilesEvaluationsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CustomerProfilesEvaluationsResource object represented by the provided JSON </returns>
-        public static CustomerProfilesEvaluationsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CustomerProfilesEvaluationsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Evaluation resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string of a policy
-        /// </summary>
-        [JsonProperty("policy_sid")]
-        public string PolicySid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("customer_profile_sid")]
-        public string CustomerProfileSid { get; private set; }
-        /// <summary>
-        /// The compliance status of the Evaluation resource
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CustomerProfilesEvaluationsResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The results of the Evaluation resource
-        /// </summary>
-        [JsonProperty("results")]
-        public List<object> Results { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CustomerProfilesEvaluationsResource()
-        {
-
-        }
-    }
+{
+
+  public class CustomerProfilesEvaluationsResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Compliant = new StatusEnum("compliant");
+      public static readonly StatusEnum Noncompliant = new StatusEnum("noncompliant");
+    }
+
+    private static Request BuildCreateRequest(CreateCustomerProfilesEvaluationsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/Evaluations",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Evaluation
+    /// </summary>
+    /// <param name="options"> Create CustomerProfilesEvaluations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEvaluations </returns>
+    public static CustomerProfilesEvaluationsResource Create(CreateCustomerProfilesEvaluationsOptions options,
+                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Evaluation
+    /// </summary>
+    /// <param name="options"> Create CustomerProfilesEvaluations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEvaluations </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesEvaluationsResource> CreateAsync(CreateCustomerProfilesEvaluationsOptions options,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Evaluation
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="policySid"> The unique string of a policy </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEvaluations </returns>
+    public static CustomerProfilesEvaluationsResource Create(string pathCustomerProfileSid,
+                                                             string policySid,
+                                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateCustomerProfilesEvaluationsOptions(pathCustomerProfileSid, policySid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Evaluation
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="policySid"> The unique string of a policy </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEvaluations </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesEvaluationsResource> CreateAsync(string pathCustomerProfileSid,
+                                                                                                     string policySid,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateCustomerProfilesEvaluationsOptions(pathCustomerProfileSid, policySid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCustomerProfilesEvaluationsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/Evaluations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Evaluations associated to the customer_profile resource.
+    /// </summary>
+    /// <param name="options"> Read CustomerProfilesEvaluations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEvaluations </returns>
+    public static ResourceSet<CustomerProfilesEvaluationsResource> Read(ReadCustomerProfilesEvaluationsOptions options,
+                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CustomerProfilesEvaluationsResource>.FromJson("results", response.Content);
+      return new ResourceSet<CustomerProfilesEvaluationsResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Evaluations associated to the customer_profile resource.
+    /// </summary>
+    /// <param name="options"> Read CustomerProfilesEvaluations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEvaluations </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesEvaluationsResource>> ReadAsync(ReadCustomerProfilesEvaluationsOptions options,
+                                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CustomerProfilesEvaluationsResource>.FromJson("results", response.Content);
+      return new ResourceSet<CustomerProfilesEvaluationsResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Evaluations associated to the customer_profile resource.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEvaluations </returns>
+    public static ResourceSet<CustomerProfilesEvaluationsResource> Read(string pathCustomerProfileSid,
+                                                                        int? pageSize = null,
+                                                                        long? limit = null,
+                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadCustomerProfilesEvaluationsOptions(pathCustomerProfileSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Evaluations associated to the customer_profile resource.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEvaluations </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesEvaluationsResource>> ReadAsync(string pathCustomerProfileSid,
+                                                                                                                int? pageSize = null,
+                                                                                                                long? limit = null,
+                                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadCustomerProfilesEvaluationsOptions(pathCustomerProfileSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CustomerProfilesEvaluationsResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CustomerProfilesEvaluationsResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CustomerProfilesEvaluationsResource> NextPage(Page<CustomerProfilesEvaluationsResource> page,
+                                                                     ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<CustomerProfilesEvaluationsResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CustomerProfilesEvaluationsResource> PreviousPage(Page<CustomerProfilesEvaluationsResource> page,
+                                                                         ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<CustomerProfilesEvaluationsResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchCustomerProfilesEvaluationsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathCustomerProfileSid + "/Evaluations/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific Evaluation Instance.
+    /// </summary>
+    /// <param name="options"> Fetch CustomerProfilesEvaluations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEvaluations </returns>
+    public static CustomerProfilesEvaluationsResource Fetch(FetchCustomerProfilesEvaluationsOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Evaluation Instance.
+    /// </summary>
+    /// <param name="options"> Fetch CustomerProfilesEvaluations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEvaluations </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesEvaluationsResource> FetchAsync(FetchCustomerProfilesEvaluationsOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific Evaluation Instance.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource </param>
+    /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfilesEvaluations </returns>
+    public static CustomerProfilesEvaluationsResource Fetch(string pathCustomerProfileSid,
+                                                            string pathSid,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchCustomerProfilesEvaluationsOptions(pathCustomerProfileSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Evaluation Instance.
+    /// </summary>
+    /// <param name="pathCustomerProfileSid"> The unique string that identifies the resource </param>
+    /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfilesEvaluations </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesEvaluationsResource> FetchAsync(string pathCustomerProfileSid,
+                                                                                                    string pathSid,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchCustomerProfilesEvaluationsOptions(pathCustomerProfileSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CustomerProfilesEvaluationsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CustomerProfilesEvaluationsResource object represented by the provided JSON </returns>
+    public static CustomerProfilesEvaluationsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CustomerProfilesEvaluationsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Evaluation resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string of a policy
+    /// </summary>
+    [JsonProperty("policy_sid")]
+    public string PolicySid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("customer_profile_sid")]
+    public string CustomerProfileSid { get; private set; }
+    /// <summary>
+    /// The compliance status of the Evaluation resource
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CustomerProfilesEvaluationsResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The results of the Evaluation resource
+    /// </summary>
+    [JsonProperty("results")]
+    public List<object> Results { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CustomerProfilesEvaluationsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/CustomerProfilesOptions.cs b/src/Twilio/Rest/Trusthub/V1/CustomerProfilesOptions.cs
index 73ea4ac3d..b636f3bc6 100644
--- a/src/Twilio/Rest/Trusthub/V1/CustomerProfilesOptions.cs
+++ b/src/Twilio/Rest/Trusthub/V1/CustomerProfilesOptions.cs
@@ -9,242 +9,242 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
+{
+
+  /// <summary>
+  /// Create a new Customer-Profile.
+  /// </summary>
+  public class CreateCustomerProfilesOptions : IOptions<CustomerProfilesResource>
+  {
     /// <summary>
-    /// Create a new Customer-Profile.
-    /// </summary>
-    public class CreateCustomerProfilesOptions : IOptions<CustomerProfilesResource>
-    {
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The email address
-        /// </summary>
-        public string Email { get; }
-        /// <summary>
-        /// The unique string of a policy.
-        /// </summary>
-        public string PolicySid { get; }
-        /// <summary>
-        /// The URL we call to inform your application of status changes.
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCustomerProfilesOptions
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="policySid"> The unique string of a policy. </param>
-        public CreateCustomerProfilesOptions(string friendlyName, string email, string policySid)
-        {
-            FriendlyName = friendlyName;
-            Email = email;
-            PolicySid = policySid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Email != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Email", Email));
-            }
-
-            if (PolicySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PolicySid", PolicySid.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            return p;
-        }
-    }
-
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
     /// <summary>
-    /// Retrieve a list of all Customer-Profiles for an account.
-    /// </summary>
-    public class ReadCustomerProfilesOptions : ReadOptions<CustomerProfilesResource>
-    {
-        /// <summary>
-        /// The verification status of the Customer-Profile resource
-        /// </summary>
-        public CustomerProfilesResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique string of a policy.
-        /// </summary>
-        public string PolicySid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PolicySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PolicySid", PolicySid.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The email address
+    /// </summary>
+    public string Email { get; }
     /// <summary>
-    /// Fetch a specific Customer-Profile instance.
+    /// The unique string of a policy.
     /// </summary>
-    public class FetchCustomerProfilesOptions : IOptions<CustomerProfilesResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCustomerProfilesOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        public FetchCustomerProfilesOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PolicySid { get; }
     /// <summary>
-    /// Updates a Customer-Profile in an account.
-    /// </summary>
-    public class UpdateCustomerProfilesOptions : IOptions<CustomerProfilesResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The verification status of the Customer-Profile resource
-        /// </summary>
-        public CustomerProfilesResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The URL we call to inform your application of status changes.
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The email address
-        /// </summary>
-        public string Email { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateCustomerProfilesOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        public UpdateCustomerProfilesOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Email != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Email", Email));
-            }
-
-            return p;
-        }
-    }
-
+    /// The URL we call to inform your application of status changes.
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+
     /// <summary>
-    /// Delete a specific Customer-Profile.
+    /// Construct a new CreateCustomerProfilesOptions
     /// </summary>
-    public class DeleteCustomerProfilesOptions : IOptions<CustomerProfilesResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCustomerProfilesOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        public DeleteCustomerProfilesOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="policySid"> The unique string of a policy. </param>
+    public CreateCustomerProfilesOptions(string friendlyName, string email, string policySid)
+    {
+      FriendlyName = friendlyName;
+      Email = email;
+      PolicySid = policySid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Email != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Email", Email));
+      }
+
+      if (PolicySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PolicySid", PolicySid.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Customer-Profiles for an account.
+  /// </summary>
+  public class ReadCustomerProfilesOptions : ReadOptions<CustomerProfilesResource>
+  {
+    /// <summary>
+    /// The verification status of the Customer-Profile resource
+    /// </summary>
+    public CustomerProfilesResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique string of a policy.
+    /// </summary>
+    public string PolicySid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PolicySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PolicySid", PolicySid.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific Customer-Profile instance.
+  /// </summary>
+  public class FetchCustomerProfilesOptions : IOptions<CustomerProfilesResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchCustomerProfilesOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    public FetchCustomerProfilesOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Updates a Customer-Profile in an account.
+  /// </summary>
+  public class UpdateCustomerProfilesOptions : IOptions<CustomerProfilesResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The verification status of the Customer-Profile resource
+    /// </summary>
+    public CustomerProfilesResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The URL we call to inform your application of status changes.
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The email address
+    /// </summary>
+    public string Email { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateCustomerProfilesOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    public UpdateCustomerProfilesOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Email != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Email", Email));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Customer-Profile.
+  /// </summary>
+  public class DeleteCustomerProfilesOptions : IOptions<CustomerProfilesResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCustomerProfilesOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    public DeleteCustomerProfilesOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/CustomerProfilesResource.cs b/src/Twilio/Rest/Trusthub/V1/CustomerProfilesResource.cs
index e3fd5c7a6..ad99c3c0c 100644
--- a/src/Twilio/Rest/Trusthub/V1/CustomerProfilesResource.cs
+++ b/src/Twilio/Rest/Trusthub/V1/CustomerProfilesResource.cs
@@ -17,563 +17,563 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
-    public class CustomerProfilesResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Draft = new StatusEnum("draft");
-            public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
-            public static readonly StatusEnum InReview = new StatusEnum("in-review");
-            public static readonly StatusEnum TwilioRejected = new StatusEnum("twilio-rejected");
-            public static readonly StatusEnum TwilioApproved = new StatusEnum("twilio-approved");
-        }
-
-        public sealed class EndUserTypeEnum : StringEnum
-        {
-            private EndUserTypeEnum(string value) : base(value) {}
-            public EndUserTypeEnum() {}
-            public static implicit operator EndUserTypeEnum(string value)
-            {
-                return new EndUserTypeEnum(value);
-            }
-
-            public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
-            public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
-        }
-
-        private static Request BuildCreateRequest(CreateCustomerProfilesOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Customer-Profile.
-        /// </summary>
-        /// <param name="options"> Create CustomerProfiles parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfiles </returns>
-        public static CustomerProfilesResource Create(CreateCustomerProfilesOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Customer-Profile.
-        /// </summary>
-        /// <param name="options"> Create CustomerProfiles parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesResource> CreateAsync(CreateCustomerProfilesOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Customer-Profile.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="policySid"> The unique string of a policy. </param>
-        /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfiles </returns>
-        public static CustomerProfilesResource Create(string friendlyName,
-                                                      string email,
-                                                      string policySid,
-                                                      Uri statusCallback = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateCustomerProfilesOptions(friendlyName, email, policySid){StatusCallback = statusCallback};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Customer-Profile.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="policySid"> The unique string of a policy. </param>
-        /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesResource> CreateAsync(string friendlyName,
-                                                                                              string email,
-                                                                                              string policySid,
-                                                                                              Uri statusCallback = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateCustomerProfilesOptions(friendlyName, email, policySid){StatusCallback = statusCallback};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCustomerProfilesOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Customer-Profiles for an account.
-        /// </summary>
-        /// <param name="options"> Read CustomerProfiles parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfiles </returns>
-        public static ResourceSet<CustomerProfilesResource> Read(ReadCustomerProfilesOptions options,
-                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CustomerProfilesResource>.FromJson("results", response.Content);
-            return new ResourceSet<CustomerProfilesResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Customer-Profiles for an account.
-        /// </summary>
-        /// <param name="options"> Read CustomerProfiles parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesResource>> ReadAsync(ReadCustomerProfilesOptions options,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CustomerProfilesResource>.FromJson("results", response.Content);
-            return new ResourceSet<CustomerProfilesResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Customer-Profiles for an account.
-        /// </summary>
-        /// <param name="status"> The verification status of the Customer-Profile resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="policySid"> The unique string of a policy. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfiles </returns>
-        public static ResourceSet<CustomerProfilesResource> Read(CustomerProfilesResource.StatusEnum status = null,
-                                                                 string friendlyName = null,
-                                                                 string policySid = null,
-                                                                 int? pageSize = null,
-                                                                 long? limit = null,
-                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadCustomerProfilesOptions(){Status = status, FriendlyName = friendlyName, PolicySid = policySid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Customer-Profiles for an account.
-        /// </summary>
-        /// <param name="status"> The verification status of the Customer-Profile resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="policySid"> The unique string of a policy. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesResource>> ReadAsync(CustomerProfilesResource.StatusEnum status = null,
-                                                                                                         string friendlyName = null,
-                                                                                                         string policySid = null,
-                                                                                                         int? pageSize = null,
-                                                                                                         long? limit = null,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadCustomerProfilesOptions(){Status = status, FriendlyName = friendlyName, PolicySid = policySid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CustomerProfilesResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CustomerProfilesResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CustomerProfilesResource> NextPage(Page<CustomerProfilesResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<CustomerProfilesResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CustomerProfilesResource> PreviousPage(Page<CustomerProfilesResource> page,
-                                                                  ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<CustomerProfilesResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchCustomerProfilesOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Customer-Profile instance.
-        /// </summary>
-        /// <param name="options"> Fetch CustomerProfiles parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfiles </returns>
-        public static CustomerProfilesResource Fetch(FetchCustomerProfilesOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Customer-Profile instance.
-        /// </summary>
-        /// <param name="options"> Fetch CustomerProfiles parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesResource> FetchAsync(FetchCustomerProfilesOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Customer-Profile instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfiles </returns>
-        public static CustomerProfilesResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCustomerProfilesOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Customer-Profile instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesResource> FetchAsync(string pathSid,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new FetchCustomerProfilesOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateCustomerProfilesOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates a Customer-Profile in an account.
-        /// </summary>
-        /// <param name="options"> Update CustomerProfiles parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfiles </returns>
-        public static CustomerProfilesResource Update(UpdateCustomerProfilesOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a Customer-Profile in an account.
-        /// </summary>
-        /// <param name="options"> Update CustomerProfiles parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesResource> UpdateAsync(UpdateCustomerProfilesOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates a Customer-Profile in an account.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="status"> The verification status of the Customer-Profile resource </param>
-        /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfiles </returns>
-        public static CustomerProfilesResource Update(string pathSid,
-                                                      CustomerProfilesResource.StatusEnum status = null,
-                                                      Uri statusCallback = null,
-                                                      string friendlyName = null,
-                                                      string email = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateCustomerProfilesOptions(pathSid){Status = status, StatusCallback = statusCallback, FriendlyName = friendlyName, Email = email};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a Customer-Profile in an account.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="status"> The verification status of the Customer-Profile resource </param>
-        /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
-        public static async System.Threading.Tasks.Task<CustomerProfilesResource> UpdateAsync(string pathSid,
-                                                                                              CustomerProfilesResource.StatusEnum status = null,
-                                                                                              Uri statusCallback = null,
-                                                                                              string friendlyName = null,
-                                                                                              string email = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateCustomerProfilesOptions(pathSid){Status = status, StatusCallback = statusCallback, FriendlyName = friendlyName, Email = email};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCustomerProfilesOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Trusthub,
-                "/v1/CustomerProfiles/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Customer-Profile.
-        /// </summary>
-        /// <param name="options"> Delete CustomerProfiles parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfiles </returns>
-        public static bool Delete(DeleteCustomerProfilesOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Customer-Profile.
-        /// </summary>
-        /// <param name="options"> Delete CustomerProfiles parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCustomerProfilesOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Customer-Profile.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CustomerProfiles </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCustomerProfilesOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Customer-Profile.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCustomerProfilesOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CustomerProfilesResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CustomerProfilesResource object represented by the provided JSON </returns>
-        public static CustomerProfilesResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CustomerProfilesResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string of a policy.
-        /// </summary>
-        [JsonProperty("policy_sid")]
-        public string PolicySid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The verification status of the Customer-Profile resource
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CustomerProfilesResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource will be valid until.
-        /// </summary>
-        [JsonProperty("valid_until")]
-        public DateTime? ValidUntil { get; private set; }
-        /// <summary>
-        /// The email address
-        /// </summary>
-        [JsonProperty("email")]
-        public string Email { get; private set; }
-        /// <summary>
-        /// The URL we call to inform your application of status changes.
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Customer-Profile resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of the Assigned Items of the Customer-Profile resource
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private CustomerProfilesResource()
-        {
-
-        }
-    }
+{
+
+  public class CustomerProfilesResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Draft = new StatusEnum("draft");
+      public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
+      public static readonly StatusEnum InReview = new StatusEnum("in-review");
+      public static readonly StatusEnum TwilioRejected = new StatusEnum("twilio-rejected");
+      public static readonly StatusEnum TwilioApproved = new StatusEnum("twilio-approved");
+    }
+
+    public sealed class EndUserTypeEnum : StringEnum
+    {
+      private EndUserTypeEnum(string value) : base(value) { }
+      public EndUserTypeEnum() { }
+      public static implicit operator EndUserTypeEnum(string value)
+      {
+        return new EndUserTypeEnum(value);
+      }
+
+      public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
+      public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
+    }
+
+    private static Request BuildCreateRequest(CreateCustomerProfilesOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Customer-Profile.
+    /// </summary>
+    /// <param name="options"> Create CustomerProfiles parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfiles </returns>
+    public static CustomerProfilesResource Create(CreateCustomerProfilesOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Customer-Profile.
+    /// </summary>
+    /// <param name="options"> Create CustomerProfiles parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesResource> CreateAsync(CreateCustomerProfilesOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Customer-Profile.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="policySid"> The unique string of a policy. </param>
+    /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfiles </returns>
+    public static CustomerProfilesResource Create(string friendlyName,
+                                                  string email,
+                                                  string policySid,
+                                                  Uri statusCallback = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateCustomerProfilesOptions(friendlyName, email, policySid) { StatusCallback = statusCallback };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Customer-Profile.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="policySid"> The unique string of a policy. </param>
+    /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesResource> CreateAsync(string friendlyName,
+                                                                                          string email,
+                                                                                          string policySid,
+                                                                                          Uri statusCallback = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateCustomerProfilesOptions(friendlyName, email, policySid) { StatusCallback = statusCallback };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCustomerProfilesOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Customer-Profiles for an account.
+    /// </summary>
+    /// <param name="options"> Read CustomerProfiles parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfiles </returns>
+    public static ResourceSet<CustomerProfilesResource> Read(ReadCustomerProfilesOptions options,
+                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CustomerProfilesResource>.FromJson("results", response.Content);
+      return new ResourceSet<CustomerProfilesResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Customer-Profiles for an account.
+    /// </summary>
+    /// <param name="options"> Read CustomerProfiles parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesResource>> ReadAsync(ReadCustomerProfilesOptions options,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CustomerProfilesResource>.FromJson("results", response.Content);
+      return new ResourceSet<CustomerProfilesResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Customer-Profiles for an account.
+    /// </summary>
+    /// <param name="status"> The verification status of the Customer-Profile resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="policySid"> The unique string of a policy. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfiles </returns>
+    public static ResourceSet<CustomerProfilesResource> Read(CustomerProfilesResource.StatusEnum status = null,
+                                                             string friendlyName = null,
+                                                             string policySid = null,
+                                                             int? pageSize = null,
+                                                             long? limit = null,
+                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadCustomerProfilesOptions() { Status = status, FriendlyName = friendlyName, PolicySid = policySid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Customer-Profiles for an account.
+    /// </summary>
+    /// <param name="status"> The verification status of the Customer-Profile resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="policySid"> The unique string of a policy. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CustomerProfilesResource>> ReadAsync(CustomerProfilesResource.StatusEnum status = null,
+                                                                                                     string friendlyName = null,
+                                                                                                     string policySid = null,
+                                                                                                     int? pageSize = null,
+                                                                                                     long? limit = null,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadCustomerProfilesOptions() { Status = status, FriendlyName = friendlyName, PolicySid = policySid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CustomerProfilesResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CustomerProfilesResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CustomerProfilesResource> NextPage(Page<CustomerProfilesResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<CustomerProfilesResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CustomerProfilesResource> PreviousPage(Page<CustomerProfilesResource> page,
+                                                              ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<CustomerProfilesResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchCustomerProfilesOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Customer-Profile instance.
+    /// </summary>
+    /// <param name="options"> Fetch CustomerProfiles parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfiles </returns>
+    public static CustomerProfilesResource Fetch(FetchCustomerProfilesOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Customer-Profile instance.
+    /// </summary>
+    /// <param name="options"> Fetch CustomerProfiles parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesResource> FetchAsync(FetchCustomerProfilesOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Customer-Profile instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfiles </returns>
+    public static CustomerProfilesResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCustomerProfilesOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Customer-Profile instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesResource> FetchAsync(string pathSid,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new FetchCustomerProfilesOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateCustomerProfilesOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates a Customer-Profile in an account.
+    /// </summary>
+    /// <param name="options"> Update CustomerProfiles parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfiles </returns>
+    public static CustomerProfilesResource Update(UpdateCustomerProfilesOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a Customer-Profile in an account.
+    /// </summary>
+    /// <param name="options"> Update CustomerProfiles parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesResource> UpdateAsync(UpdateCustomerProfilesOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates a Customer-Profile in an account.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="status"> The verification status of the Customer-Profile resource </param>
+    /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfiles </returns>
+    public static CustomerProfilesResource Update(string pathSid,
+                                                  CustomerProfilesResource.StatusEnum status = null,
+                                                  Uri statusCallback = null,
+                                                  string friendlyName = null,
+                                                  string email = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateCustomerProfilesOptions(pathSid) { Status = status, StatusCallback = statusCallback, FriendlyName = friendlyName, Email = email };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a Customer-Profile in an account.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="status"> The verification status of the Customer-Profile resource </param>
+    /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
+    public static async System.Threading.Tasks.Task<CustomerProfilesResource> UpdateAsync(string pathSid,
+                                                                                          CustomerProfilesResource.StatusEnum status = null,
+                                                                                          Uri statusCallback = null,
+                                                                                          string friendlyName = null,
+                                                                                          string email = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateCustomerProfilesOptions(pathSid) { Status = status, StatusCallback = statusCallback, FriendlyName = friendlyName, Email = email };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCustomerProfilesOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Trusthub,
+          "/v1/CustomerProfiles/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Customer-Profile.
+    /// </summary>
+    /// <param name="options"> Delete CustomerProfiles parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfiles </returns>
+    public static bool Delete(DeleteCustomerProfilesOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Customer-Profile.
+    /// </summary>
+    /// <param name="options"> Delete CustomerProfiles parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCustomerProfilesOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Customer-Profile.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CustomerProfiles </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCustomerProfilesOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Customer-Profile.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CustomerProfiles </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCustomerProfilesOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CustomerProfilesResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CustomerProfilesResource object represented by the provided JSON </returns>
+    public static CustomerProfilesResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CustomerProfilesResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string of a policy.
+    /// </summary>
+    [JsonProperty("policy_sid")]
+    public string PolicySid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The verification status of the Customer-Profile resource
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CustomerProfilesResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource will be valid until.
+    /// </summary>
+    [JsonProperty("valid_until")]
+    public DateTime? ValidUntil { get; private set; }
+    /// <summary>
+    /// The email address
+    /// </summary>
+    [JsonProperty("email")]
+    public string Email { get; private set; }
+    /// <summary>
+    /// The URL we call to inform your application of status changes.
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Customer-Profile resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of the Assigned Items of the Customer-Profile resource
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private CustomerProfilesResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/EndUserOptions.cs b/src/Twilio/Rest/Trusthub/V1/EndUserOptions.cs
index 7e163170b..452acb3c1 100644
--- a/src/Twilio/Rest/Trusthub/V1/EndUserOptions.cs
+++ b/src/Twilio/Rest/Trusthub/V1/EndUserOptions.cs
@@ -9,185 +9,185 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
+{
+
+  /// <summary>
+  /// Create a new End User.
+  /// </summary>
+  public class CreateEndUserOptions : IOptions<EndUserResource>
+  {
     /// <summary>
-    /// Create a new End User.
-    /// </summary>
-    public class CreateEndUserOptions : IOptions<EndUserResource>
-    {
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The type of end user of the Bundle resource
-        /// </summary>
-        public string Type { get; }
-        /// <summary>
-        /// The set of parameters that compose the End User resource
-        /// </summary>
-        public object Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateEndUserOptions
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="type"> The type of end user of the Bundle resource </param>
-        public CreateEndUserOptions(string friendlyName, string type)
-        {
-            FriendlyName = friendlyName;
-            Type = type;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
-            }
-
-            return p;
-        }
-    }
-
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
     /// <summary>
-    /// Retrieve a list of all End User for an account.
-    /// </summary>
-    public class ReadEndUserOptions : ReadOptions<EndUserResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The type of end user of the Bundle resource
+    /// </summary>
+    public string Type { get; }
     /// <summary>
-    /// Fetch specific End User Instance.
+    /// The set of parameters that compose the End User resource
     /// </summary>
-    public class FetchEndUserOptions : IOptions<EndUserResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchEndUserOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchEndUserOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public object Attributes { get; set; }
+
     /// <summary>
-    /// Update an existing End User.
-    /// </summary>
-    public class UpdateEndUserOptions : IOptions<EndUserResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The set of parameters that compose the End User resource
-        /// </summary>
-        public object Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateEndUserOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateEndUserOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new CreateEndUserOptions
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="type"> The type of end user of the Bundle resource </param>
+    public CreateEndUserOptions(string friendlyName, string type)
+    {
+      FriendlyName = friendlyName;
+      Type = type;
+    }
+
     /// <summary>
-    /// Delete a specific End User.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteEndUserOptions : IOptions<EndUserResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteEndUserOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteEndUserOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all End User for an account.
+  /// </summary>
+  public class ReadEndUserOptions : ReadOptions<EndUserResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific End User Instance.
+  /// </summary>
+  public class FetchEndUserOptions : IOptions<EndUserResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchEndUserOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchEndUserOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing End User.
+  /// </summary>
+  public class UpdateEndUserOptions : IOptions<EndUserResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The set of parameters that compose the End User resource
+    /// </summary>
+    public object Attributes { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateEndUserOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateEndUserOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific End User.
+  /// </summary>
+  public class DeleteEndUserOptions : IOptions<EndUserResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteEndUserOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteEndUserOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/EndUserResource.cs b/src/Twilio/Rest/Trusthub/V1/EndUserResource.cs
index df0280141..40a48101d 100644
--- a/src/Twilio/Rest/Trusthub/V1/EndUserResource.cs
+++ b/src/Twilio/Rest/Trusthub/V1/EndUserResource.cs
@@ -16,487 +16,487 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
-    public class EndUserResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateEndUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/EndUsers",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new End User.
-        /// </summary>
-        /// <param name="options"> Create EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static EndUserResource Create(CreateEndUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new End User.
-        /// </summary>
-        /// <param name="options"> Create EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<EndUserResource> CreateAsync(CreateEndUserOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new End User.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="type"> The type of end user of the Bundle resource </param>
-        /// <param name="attributes"> The set of parameters that compose the End User resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static EndUserResource Create(string friendlyName,
-                                             string type,
-                                             object attributes = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateEndUserOptions(friendlyName, type){Attributes = attributes};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new End User.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="type"> The type of end user of the Bundle resource </param>
-        /// <param name="attributes"> The set of parameters that compose the End User resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<EndUserResource> CreateAsync(string friendlyName,
-                                                                                     string type,
-                                                                                     object attributes = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateEndUserOptions(friendlyName, type){Attributes = attributes};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadEndUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/EndUsers",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all End User for an account.
-        /// </summary>
-        /// <param name="options"> Read EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static ResourceSet<EndUserResource> Read(ReadEndUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<EndUserResource>.FromJson("results", response.Content);
-            return new ResourceSet<EndUserResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all End User for an account.
-        /// </summary>
-        /// <param name="options"> Read EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EndUserResource>> ReadAsync(ReadEndUserOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<EndUserResource>.FromJson("results", response.Content);
-            return new ResourceSet<EndUserResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all End User for an account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static ResourceSet<EndUserResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadEndUserOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all End User for an account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EndUserResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadEndUserOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<EndUserResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<EndUserResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<EndUserResource> NextPage(Page<EndUserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<EndUserResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<EndUserResource> PreviousPage(Page<EndUserResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<EndUserResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchEndUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/EndUsers/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific End User Instance.
-        /// </summary>
-        /// <param name="options"> Fetch EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static EndUserResource Fetch(FetchEndUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific End User Instance.
-        /// </summary>
-        /// <param name="options"> Fetch EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<EndUserResource> FetchAsync(FetchEndUserOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific End User Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static EndUserResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchEndUserOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific End User Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<EndUserResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchEndUserOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateEndUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/EndUsers/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an existing End User.
-        /// </summary>
-        /// <param name="options"> Update EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static EndUserResource Update(UpdateEndUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing End User.
-        /// </summary>
-        /// <param name="options"> Update EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<EndUserResource> UpdateAsync(UpdateEndUserOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing End User.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The set of parameters that compose the End User resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static EndUserResource Update(string pathSid,
-                                             string friendlyName = null,
-                                             object attributes = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateEndUserOptions(pathSid){FriendlyName = friendlyName, Attributes = attributes};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing End User.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The set of parameters that compose the End User resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<EndUserResource> UpdateAsync(string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     object attributes = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateEndUserOptions(pathSid){FriendlyName = friendlyName, Attributes = attributes};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteEndUserOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Trusthub,
-                "/v1/EndUsers/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific End User.
-        /// </summary>
-        /// <param name="options"> Delete EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static bool Delete(DeleteEndUserOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific End User.
-        /// </summary>
-        /// <param name="options"> Delete EndUser parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteEndUserOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific End User.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUser </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteEndUserOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific End User.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUser </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteEndUserOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a EndUserResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EndUserResource object represented by the provided JSON </returns>
-        public static EndUserResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EndUserResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The type of end user of the Bundle resource
-        /// </summary>
-        [JsonProperty("type")]
-        public string Type { get; private set; }
-        /// <summary>
-        /// The set of parameters that compose the End Users resource
-        /// </summary>
-        [JsonProperty("attributes")]
-        public object Attributes { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the End User resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private EndUserResource()
-        {
-
-        }
-    }
+{
+
+  public class EndUserResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateEndUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/EndUsers",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new End User.
+    /// </summary>
+    /// <param name="options"> Create EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static EndUserResource Create(CreateEndUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new End User.
+    /// </summary>
+    /// <param name="options"> Create EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<EndUserResource> CreateAsync(CreateEndUserOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new End User.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="type"> The type of end user of the Bundle resource </param>
+    /// <param name="attributes"> The set of parameters that compose the End User resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static EndUserResource Create(string friendlyName,
+                                         string type,
+                                         object attributes = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateEndUserOptions(friendlyName, type) { Attributes = attributes };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new End User.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="type"> The type of end user of the Bundle resource </param>
+    /// <param name="attributes"> The set of parameters that compose the End User resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<EndUserResource> CreateAsync(string friendlyName,
+                                                                                 string type,
+                                                                                 object attributes = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateEndUserOptions(friendlyName, type) { Attributes = attributes };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadEndUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/EndUsers",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all End User for an account.
+    /// </summary>
+    /// <param name="options"> Read EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static ResourceSet<EndUserResource> Read(ReadEndUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<EndUserResource>.FromJson("results", response.Content);
+      return new ResourceSet<EndUserResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all End User for an account.
+    /// </summary>
+    /// <param name="options"> Read EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EndUserResource>> ReadAsync(ReadEndUserOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<EndUserResource>.FromJson("results", response.Content);
+      return new ResourceSet<EndUserResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all End User for an account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static ResourceSet<EndUserResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadEndUserOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all End User for an account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EndUserResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadEndUserOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<EndUserResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<EndUserResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<EndUserResource> NextPage(Page<EndUserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<EndUserResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<EndUserResource> PreviousPage(Page<EndUserResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<EndUserResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchEndUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/EndUsers/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific End User Instance.
+    /// </summary>
+    /// <param name="options"> Fetch EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static EndUserResource Fetch(FetchEndUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific End User Instance.
+    /// </summary>
+    /// <param name="options"> Fetch EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<EndUserResource> FetchAsync(FetchEndUserOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific End User Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static EndUserResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchEndUserOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific End User Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<EndUserResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchEndUserOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateEndUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/EndUsers/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an existing End User.
+    /// </summary>
+    /// <param name="options"> Update EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static EndUserResource Update(UpdateEndUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing End User.
+    /// </summary>
+    /// <param name="options"> Update EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<EndUserResource> UpdateAsync(UpdateEndUserOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing End User.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The set of parameters that compose the End User resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static EndUserResource Update(string pathSid,
+                                         string friendlyName = null,
+                                         object attributes = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateEndUserOptions(pathSid) { FriendlyName = friendlyName, Attributes = attributes };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing End User.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The set of parameters that compose the End User resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<EndUserResource> UpdateAsync(string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 object attributes = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateEndUserOptions(pathSid) { FriendlyName = friendlyName, Attributes = attributes };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteEndUserOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Trusthub,
+          "/v1/EndUsers/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific End User.
+    /// </summary>
+    /// <param name="options"> Delete EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static bool Delete(DeleteEndUserOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific End User.
+    /// </summary>
+    /// <param name="options"> Delete EndUser parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteEndUserOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific End User.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUser </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteEndUserOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific End User.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUser </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteEndUserOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a EndUserResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EndUserResource object represented by the provided JSON </returns>
+    public static EndUserResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EndUserResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The type of end user of the Bundle resource
+    /// </summary>
+    [JsonProperty("type")]
+    public string Type { get; private set; }
+    /// <summary>
+    /// The set of parameters that compose the End Users resource
+    /// </summary>
+    [JsonProperty("attributes")]
+    public object Attributes { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the End User resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private EndUserResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/EndUserTypeOptions.cs b/src/Twilio/Rest/Trusthub/V1/EndUserTypeOptions.cs
index 82619f561..b05a9cc6c 100644
--- a/src/Twilio/Rest/Trusthub/V1/EndUserTypeOptions.cs
+++ b/src/Twilio/Rest/Trusthub/V1/EndUserTypeOptions.cs
@@ -9,55 +9,55 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all End-User Types.
+  /// </summary>
+  public class ReadEndUserTypeOptions : ReadOptions<EndUserTypeResource>
+  {
     /// <summary>
-    /// Retrieve a list of all End-User Types.
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadEndUserTypeOptions : ReadOptions<EndUserTypeResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific End-User Type Instance.
+  /// </summary>
+  public class FetchEndUserTypeOptions : IOptions<EndUserTypeResource>
+  {
     /// <summary>
-    /// Fetch a specific End-User Type Instance.
+    /// The unique string that identifies the End-User Type resource
     /// </summary>
-    public class FetchEndUserTypeOptions : IOptions<EndUserTypeResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the End-User Type resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchEndUserTypeOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the End-User Type resource </param>
-        public FetchEndUserTypeOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchEndUserTypeOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the End-User Type resource </param>
+    public FetchEndUserTypeOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/EndUserTypeResource.cs b/src/Twilio/Rest/Trusthub/V1/EndUserTypeResource.cs
index 0167710a5..9c0e0d413 100644
--- a/src/Twilio/Rest/Trusthub/V1/EndUserTypeResource.cs
+++ b/src/Twilio/Rest/Trusthub/V1/EndUserTypeResource.cs
@@ -16,254 +16,254 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
-    public class EndUserTypeResource : Resource
-    {
-        private static Request BuildReadRequest(ReadEndUserTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/EndUserTypes",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all End-User Types.
-        /// </summary>
-        /// <param name="options"> Read EndUserType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUserType </returns>
-        public static ResourceSet<EndUserTypeResource> Read(ReadEndUserTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
-            return new ResourceSet<EndUserTypeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all End-User Types.
-        /// </summary>
-        /// <param name="options"> Read EndUserType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUserType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EndUserTypeResource>> ReadAsync(ReadEndUserTypeOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
-            return new ResourceSet<EndUserTypeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all End-User Types.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUserType </returns>
-        public static ResourceSet<EndUserTypeResource> Read(int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadEndUserTypeOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all End-User Types.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUserType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EndUserTypeResource>> ReadAsync(int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadEndUserTypeOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<EndUserTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<EndUserTypeResource> NextPage(Page<EndUserTypeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<EndUserTypeResource> PreviousPage(Page<EndUserTypeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchEndUserTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/EndUserTypes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific End-User Type Instance.
-        /// </summary>
-        /// <param name="options"> Fetch EndUserType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUserType </returns>
-        public static EndUserTypeResource Fetch(FetchEndUserTypeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific End-User Type Instance.
-        /// </summary>
-        /// <param name="options"> Fetch EndUserType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUserType </returns>
-        public static async System.Threading.Tasks.Task<EndUserTypeResource> FetchAsync(FetchEndUserTypeOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific End-User Type Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the End-User Type resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of EndUserType </returns>
-        public static EndUserTypeResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchEndUserTypeOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific End-User Type Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the End-User Type resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of EndUserType </returns>
-        public static async System.Threading.Tasks.Task<EndUserTypeResource> FetchAsync(string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchEndUserTypeOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a EndUserTypeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EndUserTypeResource object represented by the provided JSON </returns>
-        public static EndUserTypeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EndUserTypeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the End-User Type resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A human-readable description of the End-User Type resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// A machine-readable description of the End-User Type resource
-        /// </summary>
-        [JsonProperty("machine_name")]
-        public string MachineName { get; private set; }
-        /// <summary>
-        /// The required information for creating an End-User.
-        /// </summary>
-        [JsonProperty("fields")]
-        public List<object> Fields { get; private set; }
-        /// <summary>
-        /// The absolute URL of the End-User Type resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private EndUserTypeResource()
-        {
-
-        }
-    }
+{
+
+  public class EndUserTypeResource : Resource
+  {
+    private static Request BuildReadRequest(ReadEndUserTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/EndUserTypes",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all End-User Types.
+    /// </summary>
+    /// <param name="options"> Read EndUserType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUserType </returns>
+    public static ResourceSet<EndUserTypeResource> Read(ReadEndUserTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
+      return new ResourceSet<EndUserTypeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all End-User Types.
+    /// </summary>
+    /// <param name="options"> Read EndUserType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUserType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EndUserTypeResource>> ReadAsync(ReadEndUserTypeOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
+      return new ResourceSet<EndUserTypeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all End-User Types.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUserType </returns>
+    public static ResourceSet<EndUserTypeResource> Read(int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadEndUserTypeOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all End-User Types.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUserType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EndUserTypeResource>> ReadAsync(int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadEndUserTypeOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<EndUserTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<EndUserTypeResource> NextPage(Page<EndUserTypeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<EndUserTypeResource> PreviousPage(Page<EndUserTypeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<EndUserTypeResource>.FromJson("end_user_types", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchEndUserTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/EndUserTypes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific End-User Type Instance.
+    /// </summary>
+    /// <param name="options"> Fetch EndUserType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUserType </returns>
+    public static EndUserTypeResource Fetch(FetchEndUserTypeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific End-User Type Instance.
+    /// </summary>
+    /// <param name="options"> Fetch EndUserType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUserType </returns>
+    public static async System.Threading.Tasks.Task<EndUserTypeResource> FetchAsync(FetchEndUserTypeOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific End-User Type Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the End-User Type resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of EndUserType </returns>
+    public static EndUserTypeResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchEndUserTypeOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific End-User Type Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the End-User Type resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of EndUserType </returns>
+    public static async System.Threading.Tasks.Task<EndUserTypeResource> FetchAsync(string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchEndUserTypeOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a EndUserTypeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EndUserTypeResource object represented by the provided JSON </returns>
+    public static EndUserTypeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EndUserTypeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the End-User Type resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A human-readable description of the End-User Type resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// A machine-readable description of the End-User Type resource
+    /// </summary>
+    [JsonProperty("machine_name")]
+    public string MachineName { get; private set; }
+    /// <summary>
+    /// The required information for creating an End-User.
+    /// </summary>
+    [JsonProperty("fields")]
+    public List<object> Fields { get; private set; }
+    /// <summary>
+    /// The absolute URL of the End-User Type resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private EndUserTypeResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/PoliciesOptions.cs b/src/Twilio/Rest/Trusthub/V1/PoliciesOptions.cs
index b60c74537..0088f3d94 100644
--- a/src/Twilio/Rest/Trusthub/V1/PoliciesOptions.cs
+++ b/src/Twilio/Rest/Trusthub/V1/PoliciesOptions.cs
@@ -9,55 +9,55 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Policys.
+  /// </summary>
+  public class ReadPoliciesOptions : ReadOptions<PoliciesResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Policys.
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadPoliciesOptions : ReadOptions<PoliciesResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific Policy Instance.
+  /// </summary>
+  public class FetchPoliciesOptions : IOptions<PoliciesResource>
+  {
     /// <summary>
-    /// Fetch specific Policy Instance.
+    /// The unique string that identifies the Policy resource
     /// </summary>
-    public class FetchPoliciesOptions : IOptions<PoliciesResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the Policy resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchPoliciesOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the Policy resource </param>
-        public FetchPoliciesOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchPoliciesOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the Policy resource </param>
+    public FetchPoliciesOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/PoliciesResource.cs b/src/Twilio/Rest/Trusthub/V1/PoliciesResource.cs
index 3a8e05849..972d8d75b 100644
--- a/src/Twilio/Rest/Trusthub/V1/PoliciesResource.cs
+++ b/src/Twilio/Rest/Trusthub/V1/PoliciesResource.cs
@@ -17,262 +17,262 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
-    public class PoliciesResource : Resource
-    {
-        public sealed class EndUserTypeEnum : StringEnum
-        {
-            private EndUserTypeEnum(string value) : base(value) {}
-            public EndUserTypeEnum() {}
-            public static implicit operator EndUserTypeEnum(string value)
-            {
-                return new EndUserTypeEnum(value);
-            }
-
-            public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
-            public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
-        }
-
-        private static Request BuildReadRequest(ReadPoliciesOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/Policies",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Policys.
-        /// </summary>
-        /// <param name="options"> Read Policies parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Policies </returns>
-        public static ResourceSet<PoliciesResource> Read(ReadPoliciesOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<PoliciesResource>.FromJson("results", response.Content);
-            return new ResourceSet<PoliciesResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Policys.
-        /// </summary>
-        /// <param name="options"> Read Policies parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Policies </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PoliciesResource>> ReadAsync(ReadPoliciesOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<PoliciesResource>.FromJson("results", response.Content);
-            return new ResourceSet<PoliciesResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Policys.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Policies </returns>
-        public static ResourceSet<PoliciesResource> Read(int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadPoliciesOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Policys.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Policies </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PoliciesResource>> ReadAsync(int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadPoliciesOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<PoliciesResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<PoliciesResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<PoliciesResource> NextPage(Page<PoliciesResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<PoliciesResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<PoliciesResource> PreviousPage(Page<PoliciesResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<PoliciesResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchPoliciesOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/Policies/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific Policy Instance.
-        /// </summary>
-        /// <param name="options"> Fetch Policies parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Policies </returns>
-        public static PoliciesResource Fetch(FetchPoliciesOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Policy Instance.
-        /// </summary>
-        /// <param name="options"> Fetch Policies parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Policies </returns>
-        public static async System.Threading.Tasks.Task<PoliciesResource> FetchAsync(FetchPoliciesOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific Policy Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the Policy resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Policies </returns>
-        public static PoliciesResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchPoliciesOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Policy Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the Policy resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Policies </returns>
-        public static async System.Threading.Tasks.Task<PoliciesResource> FetchAsync(string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchPoliciesOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a PoliciesResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> PoliciesResource object represented by the provided JSON </returns>
-        public static PoliciesResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<PoliciesResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Policy resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A human-readable description of the Policy resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The sid of a Policy object that dictates requirements
-        /// </summary>
-        [JsonProperty("requirements")]
-        public object Requirements { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Policy resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private PoliciesResource()
-        {
-
-        }
-    }
+{
+
+  public class PoliciesResource : Resource
+  {
+    public sealed class EndUserTypeEnum : StringEnum
+    {
+      private EndUserTypeEnum(string value) : base(value) { }
+      public EndUserTypeEnum() { }
+      public static implicit operator EndUserTypeEnum(string value)
+      {
+        return new EndUserTypeEnum(value);
+      }
+
+      public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
+      public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
+    }
+
+    private static Request BuildReadRequest(ReadPoliciesOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/Policies",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Policys.
+    /// </summary>
+    /// <param name="options"> Read Policies parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Policies </returns>
+    public static ResourceSet<PoliciesResource> Read(ReadPoliciesOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<PoliciesResource>.FromJson("results", response.Content);
+      return new ResourceSet<PoliciesResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Policys.
+    /// </summary>
+    /// <param name="options"> Read Policies parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Policies </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PoliciesResource>> ReadAsync(ReadPoliciesOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<PoliciesResource>.FromJson("results", response.Content);
+      return new ResourceSet<PoliciesResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Policys.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Policies </returns>
+    public static ResourceSet<PoliciesResource> Read(int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadPoliciesOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Policys.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Policies </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PoliciesResource>> ReadAsync(int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadPoliciesOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<PoliciesResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<PoliciesResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<PoliciesResource> NextPage(Page<PoliciesResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<PoliciesResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<PoliciesResource> PreviousPage(Page<PoliciesResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<PoliciesResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchPoliciesOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/Policies/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific Policy Instance.
+    /// </summary>
+    /// <param name="options"> Fetch Policies parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Policies </returns>
+    public static PoliciesResource Fetch(FetchPoliciesOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Policy Instance.
+    /// </summary>
+    /// <param name="options"> Fetch Policies parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Policies </returns>
+    public static async System.Threading.Tasks.Task<PoliciesResource> FetchAsync(FetchPoliciesOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific Policy Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the Policy resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Policies </returns>
+    public static PoliciesResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchPoliciesOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Policy Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the Policy resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Policies </returns>
+    public static async System.Threading.Tasks.Task<PoliciesResource> FetchAsync(string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchPoliciesOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a PoliciesResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> PoliciesResource object represented by the provided JSON </returns>
+    public static PoliciesResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<PoliciesResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Policy resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A human-readable description of the Policy resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The sid of a Policy object that dictates requirements
+    /// </summary>
+    [JsonProperty("requirements")]
+    public object Requirements { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Policy resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private PoliciesResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/SupportingDocumentOptions.cs b/src/Twilio/Rest/Trusthub/V1/SupportingDocumentOptions.cs
index 8f059b9ef..fd158dcff 100644
--- a/src/Twilio/Rest/Trusthub/V1/SupportingDocumentOptions.cs
+++ b/src/Twilio/Rest/Trusthub/V1/SupportingDocumentOptions.cs
@@ -9,185 +9,185 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
+{
+
+  /// <summary>
+  /// Create a new Supporting Document.
+  /// </summary>
+  public class CreateSupportingDocumentOptions : IOptions<SupportingDocumentResource>
+  {
     /// <summary>
-    /// Create a new Supporting Document.
-    /// </summary>
-    public class CreateSupportingDocumentOptions : IOptions<SupportingDocumentResource>
-    {
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The type of the Supporting Document
-        /// </summary>
-        public string Type { get; }
-        /// <summary>
-        /// The set of parameters that compose the Supporting Documents resource
-        /// </summary>
-        public object Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateSupportingDocumentOptions
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="type"> The type of the Supporting Document </param>
-        public CreateSupportingDocumentOptions(string friendlyName, string type)
-        {
-            FriendlyName = friendlyName;
-            Type = type;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
-            }
-
-            return p;
-        }
-    }
-
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
     /// <summary>
-    /// Retrieve a list of all Supporting Document for an account.
-    /// </summary>
-    public class ReadSupportingDocumentOptions : ReadOptions<SupportingDocumentResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The type of the Supporting Document
+    /// </summary>
+    public string Type { get; }
     /// <summary>
-    /// Fetch specific Supporting Document Instance.
+    /// The set of parameters that compose the Supporting Documents resource
     /// </summary>
-    public class FetchSupportingDocumentOptions : IOptions<SupportingDocumentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSupportingDocumentOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchSupportingDocumentOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public object Attributes { get; set; }
+
     /// <summary>
-    /// Update an existing Supporting Document.
-    /// </summary>
-    public class UpdateSupportingDocumentOptions : IOptions<SupportingDocumentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The set of parameters that compose the Supporting Document resource
-        /// </summary>
-        public object Attributes { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSupportingDocumentOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateSupportingDocumentOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Attributes != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new CreateSupportingDocumentOptions
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="type"> The type of the Supporting Document </param>
+    public CreateSupportingDocumentOptions(string friendlyName, string type)
+    {
+      FriendlyName = friendlyName;
+      Type = type;
+    }
+
     /// <summary>
-    /// Delete a specific Supporting Document.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteSupportingDocumentOptions : IOptions<SupportingDocumentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSupportingDocumentOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteSupportingDocumentOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Supporting Document for an account.
+  /// </summary>
+  public class ReadSupportingDocumentOptions : ReadOptions<SupportingDocumentResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific Supporting Document Instance.
+  /// </summary>
+  public class FetchSupportingDocumentOptions : IOptions<SupportingDocumentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchSupportingDocumentOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchSupportingDocumentOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update an existing Supporting Document.
+  /// </summary>
+  public class UpdateSupportingDocumentOptions : IOptions<SupportingDocumentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The set of parameters that compose the Supporting Document resource
+    /// </summary>
+    public object Attributes { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSupportingDocumentOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateSupportingDocumentOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Attributes != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Attributes", Serializers.JsonObject(Attributes)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Supporting Document.
+  /// </summary>
+  public class DeleteSupportingDocumentOptions : IOptions<SupportingDocumentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSupportingDocumentOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteSupportingDocumentOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/SupportingDocumentResource.cs b/src/Twilio/Rest/Trusthub/V1/SupportingDocumentResource.cs
index e4138ab6a..92f6f487d 100644
--- a/src/Twilio/Rest/Trusthub/V1/SupportingDocumentResource.cs
+++ b/src/Twilio/Rest/Trusthub/V1/SupportingDocumentResource.cs
@@ -17,521 +17,521 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
-    public class SupportingDocumentResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Draft = new StatusEnum("draft");
-            public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
-            public static readonly StatusEnum Rejected = new StatusEnum("rejected");
-            public static readonly StatusEnum Approved = new StatusEnum("approved");
-            public static readonly StatusEnum Expired = new StatusEnum("expired");
-            public static readonly StatusEnum ProvisionallyApproved = new StatusEnum("provisionally-approved");
-        }
-
-        private static Request BuildCreateRequest(CreateSupportingDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/SupportingDocuments",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Supporting Document.
-        /// </summary>
-        /// <param name="options"> Create SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static SupportingDocumentResource Create(CreateSupportingDocumentOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Supporting Document.
-        /// </summary>
-        /// <param name="options"> Create SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentResource> CreateAsync(CreateSupportingDocumentOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Supporting Document.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="type"> The type of the Supporting Document </param>
-        /// <param name="attributes"> The set of parameters that compose the Supporting Documents resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static SupportingDocumentResource Create(string friendlyName,
-                                                        string type,
-                                                        object attributes = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new CreateSupportingDocumentOptions(friendlyName, type){Attributes = attributes};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Supporting Document.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="type"> The type of the Supporting Document </param>
-        /// <param name="attributes"> The set of parameters that compose the Supporting Documents resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentResource> CreateAsync(string friendlyName,
-                                                                                                string type,
-                                                                                                object attributes = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new CreateSupportingDocumentOptions(friendlyName, type){Attributes = attributes};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSupportingDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/SupportingDocuments",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Supporting Document for an account.
-        /// </summary>
-        /// <param name="options"> Read SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static ResourceSet<SupportingDocumentResource> Read(ReadSupportingDocumentOptions options,
-                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SupportingDocumentResource>.FromJson("results", response.Content);
-            return new ResourceSet<SupportingDocumentResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Supporting Document for an account.
-        /// </summary>
-        /// <param name="options"> Read SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentResource>> ReadAsync(ReadSupportingDocumentOptions options,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SupportingDocumentResource>.FromJson("results", response.Content);
-            return new ResourceSet<SupportingDocumentResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Supporting Document for an account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static ResourceSet<SupportingDocumentResource> Read(int? pageSize = null,
-                                                                   long? limit = null,
-                                                                   ITwilioRestClient client = null)
-        {
-            var options = new ReadSupportingDocumentOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Supporting Document for an account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentResource>> ReadAsync(int? pageSize = null,
-                                                                                                           long? limit = null,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new ReadSupportingDocumentOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SupportingDocumentResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SupportingDocumentResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SupportingDocumentResource> NextPage(Page<SupportingDocumentResource> page,
-                                                                ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<SupportingDocumentResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SupportingDocumentResource> PreviousPage(Page<SupportingDocumentResource> page,
-                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<SupportingDocumentResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchSupportingDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/SupportingDocuments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific Supporting Document Instance.
-        /// </summary>
-        /// <param name="options"> Fetch SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static SupportingDocumentResource Fetch(FetchSupportingDocumentOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Supporting Document Instance.
-        /// </summary>
-        /// <param name="options"> Fetch SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentResource> FetchAsync(FetchSupportingDocumentOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific Supporting Document Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static SupportingDocumentResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSupportingDocumentOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Supporting Document Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentResource> FetchAsync(string pathSid,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new FetchSupportingDocumentOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSupportingDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/SupportingDocuments/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update an existing Supporting Document.
-        /// </summary>
-        /// <param name="options"> Update SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static SupportingDocumentResource Update(UpdateSupportingDocumentOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing Supporting Document.
-        /// </summary>
-        /// <param name="options"> Update SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentResource> UpdateAsync(UpdateSupportingDocumentOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update an existing Supporting Document.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The set of parameters that compose the Supporting Document resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static SupportingDocumentResource Update(string pathSid,
-                                                        string friendlyName = null,
-                                                        object attributes = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new UpdateSupportingDocumentOptions(pathSid){FriendlyName = friendlyName, Attributes = attributes};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update an existing Supporting Document.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="attributes"> The set of parameters that compose the Supporting Document resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentResource> UpdateAsync(string pathSid,
-                                                                                                string friendlyName = null,
-                                                                                                object attributes = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new UpdateSupportingDocumentOptions(pathSid){FriendlyName = friendlyName, Attributes = attributes};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSupportingDocumentOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Trusthub,
-                "/v1/SupportingDocuments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Supporting Document.
-        /// </summary>
-        /// <param name="options"> Delete SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static bool Delete(DeleteSupportingDocumentOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Supporting Document.
-        /// </summary>
-        /// <param name="options"> Delete SupportingDocument parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSupportingDocumentOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Supporting Document.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocument </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSupportingDocumentOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Supporting Document.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSupportingDocumentOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SupportingDocumentResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SupportingDocumentResource object represented by the provided JSON </returns>
-        public static SupportingDocumentResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SupportingDocumentResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The image type of the file
-        /// </summary>
-        [JsonProperty("mime_type")]
-        public string MimeType { get; private set; }
-        /// <summary>
-        /// The verification status of the Supporting Document resource
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SupportingDocumentResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The type of the Supporting Document
-        /// </summary>
-        [JsonProperty("type")]
-        public string Type { get; private set; }
-        /// <summary>
-        /// The set of parameters that compose the Supporting Documents resource
-        /// </summary>
-        [JsonProperty("attributes")]
-        public object Attributes { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Supporting Document resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SupportingDocumentResource()
-        {
-
-        }
-    }
+{
+
+  public class SupportingDocumentResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Draft = new StatusEnum("draft");
+      public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
+      public static readonly StatusEnum Rejected = new StatusEnum("rejected");
+      public static readonly StatusEnum Approved = new StatusEnum("approved");
+      public static readonly StatusEnum Expired = new StatusEnum("expired");
+      public static readonly StatusEnum ProvisionallyApproved = new StatusEnum("provisionally-approved");
+    }
+
+    private static Request BuildCreateRequest(CreateSupportingDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/SupportingDocuments",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Supporting Document.
+    /// </summary>
+    /// <param name="options"> Create SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static SupportingDocumentResource Create(CreateSupportingDocumentOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Supporting Document.
+    /// </summary>
+    /// <param name="options"> Create SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentResource> CreateAsync(CreateSupportingDocumentOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Supporting Document.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="type"> The type of the Supporting Document </param>
+    /// <param name="attributes"> The set of parameters that compose the Supporting Documents resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static SupportingDocumentResource Create(string friendlyName,
+                                                    string type,
+                                                    object attributes = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new CreateSupportingDocumentOptions(friendlyName, type) { Attributes = attributes };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Supporting Document.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="type"> The type of the Supporting Document </param>
+    /// <param name="attributes"> The set of parameters that compose the Supporting Documents resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentResource> CreateAsync(string friendlyName,
+                                                                                            string type,
+                                                                                            object attributes = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new CreateSupportingDocumentOptions(friendlyName, type) { Attributes = attributes };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSupportingDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/SupportingDocuments",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Supporting Document for an account.
+    /// </summary>
+    /// <param name="options"> Read SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static ResourceSet<SupportingDocumentResource> Read(ReadSupportingDocumentOptions options,
+                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SupportingDocumentResource>.FromJson("results", response.Content);
+      return new ResourceSet<SupportingDocumentResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Supporting Document for an account.
+    /// </summary>
+    /// <param name="options"> Read SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentResource>> ReadAsync(ReadSupportingDocumentOptions options,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SupportingDocumentResource>.FromJson("results", response.Content);
+      return new ResourceSet<SupportingDocumentResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Supporting Document for an account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static ResourceSet<SupportingDocumentResource> Read(int? pageSize = null,
+                                                               long? limit = null,
+                                                               ITwilioRestClient client = null)
+    {
+      var options = new ReadSupportingDocumentOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Supporting Document for an account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentResource>> ReadAsync(int? pageSize = null,
+                                                                                                       long? limit = null,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new ReadSupportingDocumentOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SupportingDocumentResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SupportingDocumentResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SupportingDocumentResource> NextPage(Page<SupportingDocumentResource> page,
+                                                            ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<SupportingDocumentResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SupportingDocumentResource> PreviousPage(Page<SupportingDocumentResource> page,
+                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<SupportingDocumentResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchSupportingDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/SupportingDocuments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific Supporting Document Instance.
+    /// </summary>
+    /// <param name="options"> Fetch SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static SupportingDocumentResource Fetch(FetchSupportingDocumentOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Supporting Document Instance.
+    /// </summary>
+    /// <param name="options"> Fetch SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentResource> FetchAsync(FetchSupportingDocumentOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific Supporting Document Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static SupportingDocumentResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSupportingDocumentOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Supporting Document Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentResource> FetchAsync(string pathSid,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new FetchSupportingDocumentOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSupportingDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/SupportingDocuments/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update an existing Supporting Document.
+    /// </summary>
+    /// <param name="options"> Update SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static SupportingDocumentResource Update(UpdateSupportingDocumentOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing Supporting Document.
+    /// </summary>
+    /// <param name="options"> Update SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentResource> UpdateAsync(UpdateSupportingDocumentOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update an existing Supporting Document.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The set of parameters that compose the Supporting Document resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static SupportingDocumentResource Update(string pathSid,
+                                                    string friendlyName = null,
+                                                    object attributes = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new UpdateSupportingDocumentOptions(pathSid) { FriendlyName = friendlyName, Attributes = attributes };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update an existing Supporting Document.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="attributes"> The set of parameters that compose the Supporting Document resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentResource> UpdateAsync(string pathSid,
+                                                                                            string friendlyName = null,
+                                                                                            object attributes = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new UpdateSupportingDocumentOptions(pathSid) { FriendlyName = friendlyName, Attributes = attributes };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSupportingDocumentOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Trusthub,
+          "/v1/SupportingDocuments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Supporting Document.
+    /// </summary>
+    /// <param name="options"> Delete SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static bool Delete(DeleteSupportingDocumentOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Supporting Document.
+    /// </summary>
+    /// <param name="options"> Delete SupportingDocument parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSupportingDocumentOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Supporting Document.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocument </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSupportingDocumentOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Supporting Document.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocument </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSupportingDocumentOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SupportingDocumentResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SupportingDocumentResource object represented by the provided JSON </returns>
+    public static SupportingDocumentResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SupportingDocumentResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The image type of the file
+    /// </summary>
+    [JsonProperty("mime_type")]
+    public string MimeType { get; private set; }
+    /// <summary>
+    /// The verification status of the Supporting Document resource
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public SupportingDocumentResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The type of the Supporting Document
+    /// </summary>
+    [JsonProperty("type")]
+    public string Type { get; private set; }
+    /// <summary>
+    /// The set of parameters that compose the Supporting Documents resource
+    /// </summary>
+    [JsonProperty("attributes")]
+    public object Attributes { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Supporting Document resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SupportingDocumentResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/SupportingDocumentTypeOptions.cs b/src/Twilio/Rest/Trusthub/V1/SupportingDocumentTypeOptions.cs
index 32ac06975..8ee5d73b6 100644
--- a/src/Twilio/Rest/Trusthub/V1/SupportingDocumentTypeOptions.cs
+++ b/src/Twilio/Rest/Trusthub/V1/SupportingDocumentTypeOptions.cs
@@ -9,55 +9,55 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
+{
+
+  /// <summary>
+  /// Retrieve a list of all Supporting Document Types.
+  /// </summary>
+  public class ReadSupportingDocumentTypeOptions : ReadOptions<SupportingDocumentTypeResource>
+  {
     /// <summary>
-    /// Retrieve a list of all Supporting Document Types.
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadSupportingDocumentTypeOptions : ReadOptions<SupportingDocumentTypeResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific Supporting Document Type Instance.
+  /// </summary>
+  public class FetchSupportingDocumentTypeOptions : IOptions<SupportingDocumentTypeResource>
+  {
     /// <summary>
-    /// Fetch a specific Supporting Document Type Instance.
+    /// The unique string that identifies the Supporting Document Type resource
     /// </summary>
-    public class FetchSupportingDocumentTypeOptions : IOptions<SupportingDocumentTypeResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the Supporting Document Type resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSupportingDocumentTypeOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the Supporting Document Type resource </param>
-        public FetchSupportingDocumentTypeOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchSupportingDocumentTypeOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the Supporting Document Type resource </param>
+    public FetchSupportingDocumentTypeOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/SupportingDocumentTypeResource.cs b/src/Twilio/Rest/Trusthub/V1/SupportingDocumentTypeResource.cs
index ee8488f05..781a5b254 100644
--- a/src/Twilio/Rest/Trusthub/V1/SupportingDocumentTypeResource.cs
+++ b/src/Twilio/Rest/Trusthub/V1/SupportingDocumentTypeResource.cs
@@ -16,258 +16,258 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
-    public class SupportingDocumentTypeResource : Resource
-    {
-        private static Request BuildReadRequest(ReadSupportingDocumentTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/SupportingDocumentTypes",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Supporting Document Types.
-        /// </summary>
-        /// <param name="options"> Read SupportingDocumentType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocumentType </returns>
-        public static ResourceSet<SupportingDocumentTypeResource> Read(ReadSupportingDocumentTypeOptions options,
-                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
-            return new ResourceSet<SupportingDocumentTypeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Supporting Document Types.
-        /// </summary>
-        /// <param name="options"> Read SupportingDocumentType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentTypeResource>> ReadAsync(ReadSupportingDocumentTypeOptions options,
-                                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
-            return new ResourceSet<SupportingDocumentTypeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Supporting Document Types.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocumentType </returns>
-        public static ResourceSet<SupportingDocumentTypeResource> Read(int? pageSize = null,
-                                                                       long? limit = null,
-                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadSupportingDocumentTypeOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Supporting Document Types.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentTypeResource>> ReadAsync(int? pageSize = null,
-                                                                                                               long? limit = null,
-                                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadSupportingDocumentTypeOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SupportingDocumentTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SupportingDocumentTypeResource> NextPage(Page<SupportingDocumentTypeResource> page,
-                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SupportingDocumentTypeResource> PreviousPage(Page<SupportingDocumentTypeResource> page,
-                                                                        ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchSupportingDocumentTypeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/SupportingDocumentTypes/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Supporting Document Type Instance.
-        /// </summary>
-        /// <param name="options"> Fetch SupportingDocumentType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocumentType </returns>
-        public static SupportingDocumentTypeResource Fetch(FetchSupportingDocumentTypeOptions options,
-                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Supporting Document Type Instance.
-        /// </summary>
-        /// <param name="options"> Fetch SupportingDocumentType parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentTypeResource> FetchAsync(FetchSupportingDocumentTypeOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Supporting Document Type Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the Supporting Document Type resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SupportingDocumentType </returns>
-        public static SupportingDocumentTypeResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSupportingDocumentTypeOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Supporting Document Type Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the Supporting Document Type resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
-        public static async System.Threading.Tasks.Task<SupportingDocumentTypeResource> FetchAsync(string pathSid,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchSupportingDocumentTypeOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SupportingDocumentTypeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SupportingDocumentTypeResource object represented by the provided JSON </returns>
-        public static SupportingDocumentTypeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SupportingDocumentTypeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Supporting Document Type resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// A human-readable description of the Supporting Document Type resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The machine-readable description of the Supporting Document Type resource
-        /// </summary>
-        [JsonProperty("machine_name")]
-        public string MachineName { get; private set; }
-        /// <summary>
-        /// The required information for creating a Supporting Document
-        /// </summary>
-        [JsonProperty("fields")]
-        public List<object> Fields { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Supporting Document Type resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SupportingDocumentTypeResource()
-        {
-
-        }
-    }
+{
+
+  public class SupportingDocumentTypeResource : Resource
+  {
+    private static Request BuildReadRequest(ReadSupportingDocumentTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/SupportingDocumentTypes",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Supporting Document Types.
+    /// </summary>
+    /// <param name="options"> Read SupportingDocumentType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocumentType </returns>
+    public static ResourceSet<SupportingDocumentTypeResource> Read(ReadSupportingDocumentTypeOptions options,
+                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
+      return new ResourceSet<SupportingDocumentTypeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Supporting Document Types.
+    /// </summary>
+    /// <param name="options"> Read SupportingDocumentType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentTypeResource>> ReadAsync(ReadSupportingDocumentTypeOptions options,
+                                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
+      return new ResourceSet<SupportingDocumentTypeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Supporting Document Types.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocumentType </returns>
+    public static ResourceSet<SupportingDocumentTypeResource> Read(int? pageSize = null,
+                                                                   long? limit = null,
+                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadSupportingDocumentTypeOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Supporting Document Types.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SupportingDocumentTypeResource>> ReadAsync(int? pageSize = null,
+                                                                                                           long? limit = null,
+                                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadSupportingDocumentTypeOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SupportingDocumentTypeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SupportingDocumentTypeResource> NextPage(Page<SupportingDocumentTypeResource> page,
+                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SupportingDocumentTypeResource> PreviousPage(Page<SupportingDocumentTypeResource> page,
+                                                                    ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<SupportingDocumentTypeResource>.FromJson("supporting_document_types", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchSupportingDocumentTypeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/SupportingDocumentTypes/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Supporting Document Type Instance.
+    /// </summary>
+    /// <param name="options"> Fetch SupportingDocumentType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocumentType </returns>
+    public static SupportingDocumentTypeResource Fetch(FetchSupportingDocumentTypeOptions options,
+                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Supporting Document Type Instance.
+    /// </summary>
+    /// <param name="options"> Fetch SupportingDocumentType parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentTypeResource> FetchAsync(FetchSupportingDocumentTypeOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Supporting Document Type Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the Supporting Document Type resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SupportingDocumentType </returns>
+    public static SupportingDocumentTypeResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSupportingDocumentTypeOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Supporting Document Type Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the Supporting Document Type resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SupportingDocumentType </returns>
+    public static async System.Threading.Tasks.Task<SupportingDocumentTypeResource> FetchAsync(string pathSid,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchSupportingDocumentTypeOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SupportingDocumentTypeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SupportingDocumentTypeResource object represented by the provided JSON </returns>
+    public static SupportingDocumentTypeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SupportingDocumentTypeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Supporting Document Type resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// A human-readable description of the Supporting Document Type resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The machine-readable description of the Supporting Document Type resource
+    /// </summary>
+    [JsonProperty("machine_name")]
+    public string MachineName { get; private set; }
+    /// <summary>
+    /// The required information for creating a Supporting Document
+    /// </summary>
+    [JsonProperty("fields")]
+    public List<object> Fields { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Supporting Document Type resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SupportingDocumentTypeResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsChannelEndpointAssignmentOptions.cs b/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsChannelEndpointAssignmentOptions.cs
index f72b835cc..9c6e008ca 100644
--- a/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsChannelEndpointAssignmentOptions.cs
+++ b/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsChannelEndpointAssignmentOptions.cs
@@ -9,181 +9,181 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trusthub.V1.TrustProducts
-{
-
+{
+
+  /// <summary>
+  /// Create a new Assigned Item.
+  /// </summary>
+  public class CreateTrustProductsChannelEndpointAssignmentOptions : IOptions<TrustProductsChannelEndpointAssignmentResource>
+  {
     /// <summary>
-    /// Create a new Assigned Item.
-    /// </summary>
-    public class CreateTrustProductsChannelEndpointAssignmentOptions : IOptions<TrustProductsChannelEndpointAssignmentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathTrustProductSid { get; }
-        /// <summary>
-        /// The type of channel endpoint
-        /// </summary>
-        public string ChannelEndpointType { get; }
-        /// <summary>
-        /// The sid of an channel endpoint
-        /// </summary>
-        public string ChannelEndpointSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateTrustProductsChannelEndpointAssignmentOptions
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="channelEndpointType"> The type of channel endpoint </param>
-        /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
-        public CreateTrustProductsChannelEndpointAssignmentOptions(string pathTrustProductSid,
-                                                                   string channelEndpointType,
-                                                                   string channelEndpointSid)
-        {
-            PathTrustProductSid = pathTrustProductSid;
-            ChannelEndpointType = channelEndpointType;
-            ChannelEndpointSid = channelEndpointSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ChannelEndpointType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelEndpointType", ChannelEndpointType));
-            }
-
-            if (ChannelEndpointSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelEndpointSid", ChannelEndpointSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathTrustProductSid { get; }
     /// <summary>
-    /// Retrieve a list of all Assigned Items for an account.
-    /// </summary>
-    public class ReadTrustProductsChannelEndpointAssignmentOptions : ReadOptions<TrustProductsChannelEndpointAssignmentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathTrustProductSid { get; }
-        /// <summary>
-        /// The sid of an channel endpoint
-        /// </summary>
-        public string ChannelEndpointSid { get; set; }
-        /// <summary>
-        /// comma separated list of channel endpoint sids
-        /// </summary>
-        public string ChannelEndpointSids { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadTrustProductsChannelEndpointAssignmentOptions
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        public ReadTrustProductsChannelEndpointAssignmentOptions(string pathTrustProductSid)
-        {
-            PathTrustProductSid = pathTrustProductSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ChannelEndpointSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelEndpointSid", ChannelEndpointSid.ToString()));
-            }
-
-            if (ChannelEndpointSids != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelEndpointSids", ChannelEndpointSids));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The type of channel endpoint
+    /// </summary>
+    public string ChannelEndpointType { get; }
     /// <summary>
-    /// Fetch specific Assigned Item Instance.
-    /// </summary>
-    public class FetchTrustProductsChannelEndpointAssignmentOptions : IOptions<TrustProductsChannelEndpointAssignmentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathTrustProductSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTrustProductsChannelEndpointAssignmentOptions
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchTrustProductsChannelEndpointAssignmentOptions(string pathTrustProductSid, string pathSid)
-        {
-            PathTrustProductSid = pathTrustProductSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The sid of an channel endpoint
+    /// </summary>
+    public string ChannelEndpointSid { get; }
+
     /// <summary>
-    /// Remove an Assignment Item Instance.
-    /// </summary>
-    public class DeleteTrustProductsChannelEndpointAssignmentOptions : IOptions<TrustProductsChannelEndpointAssignmentResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathTrustProductSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteTrustProductsChannelEndpointAssignmentOptions
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteTrustProductsChannelEndpointAssignmentOptions(string pathTrustProductSid, string pathSid)
-        {
-            PathTrustProductSid = pathTrustProductSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new CreateTrustProductsChannelEndpointAssignmentOptions
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="channelEndpointType"> The type of channel endpoint </param>
+    /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
+    public CreateTrustProductsChannelEndpointAssignmentOptions(string pathTrustProductSid,
+                                                               string channelEndpointType,
+                                                               string channelEndpointSid)
+    {
+      PathTrustProductSid = pathTrustProductSid;
+      ChannelEndpointType = channelEndpointType;
+      ChannelEndpointSid = channelEndpointSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ChannelEndpointType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelEndpointType", ChannelEndpointType));
+      }
+
+      if (ChannelEndpointSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelEndpointSid", ChannelEndpointSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Assigned Items for an account.
+  /// </summary>
+  public class ReadTrustProductsChannelEndpointAssignmentOptions : ReadOptions<TrustProductsChannelEndpointAssignmentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathTrustProductSid { get; }
+    /// <summary>
+    /// The sid of an channel endpoint
+    /// </summary>
+    public string ChannelEndpointSid { get; set; }
+    /// <summary>
+    /// comma separated list of channel endpoint sids
+    /// </summary>
+    public string ChannelEndpointSids { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadTrustProductsChannelEndpointAssignmentOptions
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    public ReadTrustProductsChannelEndpointAssignmentOptions(string pathTrustProductSid)
+    {
+      PathTrustProductSid = pathTrustProductSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ChannelEndpointSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelEndpointSid", ChannelEndpointSid.ToString()));
+      }
+
+      if (ChannelEndpointSids != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelEndpointSids", ChannelEndpointSids));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific Assigned Item Instance.
+  /// </summary>
+  public class FetchTrustProductsChannelEndpointAssignmentOptions : IOptions<TrustProductsChannelEndpointAssignmentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathTrustProductSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchTrustProductsChannelEndpointAssignmentOptions
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchTrustProductsChannelEndpointAssignmentOptions(string pathTrustProductSid, string pathSid)
+    {
+      PathTrustProductSid = pathTrustProductSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove an Assignment Item Instance.
+  /// </summary>
+  public class DeleteTrustProductsChannelEndpointAssignmentOptions : IOptions<TrustProductsChannelEndpointAssignmentResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathTrustProductSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteTrustProductsChannelEndpointAssignmentOptions
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteTrustProductsChannelEndpointAssignmentOptions(string pathTrustProductSid, string pathSid)
+    {
+      PathTrustProductSid = pathTrustProductSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsChannelEndpointAssignmentResource.cs b/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsChannelEndpointAssignmentResource.cs
index 24e5293a8..8ea9f4dd8 100644
--- a/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsChannelEndpointAssignmentResource.cs
+++ b/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsChannelEndpointAssignmentResource.cs
@@ -16,438 +16,438 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Trusthub.V1.TrustProducts
-{
-
-    public class TrustProductsChannelEndpointAssignmentResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateTrustProductsChannelEndpointAssignmentOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathTrustProductSid + "/ChannelEndpointAssignments",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="options"> Create TrustProductsChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static TrustProductsChannelEndpointAssignmentResource Create(CreateTrustProductsChannelEndpointAssignmentOptions options,
-                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="options"> Create TrustProductsChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsChannelEndpointAssignmentResource> CreateAsync(CreateTrustProductsChannelEndpointAssignmentOptions options,
-                                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="channelEndpointType"> The type of channel endpoint </param>
-        /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static TrustProductsChannelEndpointAssignmentResource Create(string pathTrustProductSid,
-                                                                            string channelEndpointType,
-                                                                            string channelEndpointSid,
-                                                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid, channelEndpointType, channelEndpointSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="channelEndpointType"> The type of channel endpoint </param>
-        /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsChannelEndpointAssignmentResource> CreateAsync(string pathTrustProductSid,
-                                                                                                                    string channelEndpointType,
-                                                                                                                    string channelEndpointSid,
-                                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid, channelEndpointType, channelEndpointSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadTrustProductsChannelEndpointAssignmentOptions options,
-                                                ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathTrustProductSid + "/ChannelEndpointAssignments",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="options"> Read TrustProductsChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static ResourceSet<TrustProductsChannelEndpointAssignmentResource> Read(ReadTrustProductsChannelEndpointAssignmentOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TrustProductsChannelEndpointAssignmentResource>.FromJson("results", response.Content);
-            return new ResourceSet<TrustProductsChannelEndpointAssignmentResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="options"> Read TrustProductsChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsChannelEndpointAssignmentResource>> ReadAsync(ReadTrustProductsChannelEndpointAssignmentOptions options,
-                                                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TrustProductsChannelEndpointAssignmentResource>.FromJson("results", response.Content);
-            return new ResourceSet<TrustProductsChannelEndpointAssignmentResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
-        /// <param name="channelEndpointSids"> comma separated list of channel endpoint sids </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static ResourceSet<TrustProductsChannelEndpointAssignmentResource> Read(string pathTrustProductSid,
-                                                                                       string channelEndpointSid = null,
-                                                                                       string channelEndpointSids = null,
-                                                                                       int? pageSize = null,
-                                                                                       long? limit = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid){ChannelEndpointSid = channelEndpointSid, ChannelEndpointSids = channelEndpointSids, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
-        /// <param name="channelEndpointSids"> comma separated list of channel endpoint sids </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsChannelEndpointAssignmentResource>> ReadAsync(string pathTrustProductSid,
-                                                                                                                               string channelEndpointSid = null,
-                                                                                                                               string channelEndpointSids = null,
-                                                                                                                               int? pageSize = null,
-                                                                                                                               long? limit = null,
-                                                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid){ChannelEndpointSid = channelEndpointSid, ChannelEndpointSids = channelEndpointSids, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TrustProductsChannelEndpointAssignmentResource> GetPage(string targetUrl,
-                                                                                   ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TrustProductsChannelEndpointAssignmentResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TrustProductsChannelEndpointAssignmentResource> NextPage(Page<TrustProductsChannelEndpointAssignmentResource> page,
-                                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<TrustProductsChannelEndpointAssignmentResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TrustProductsChannelEndpointAssignmentResource> PreviousPage(Page<TrustProductsChannelEndpointAssignmentResource> page,
-                                                                                        ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<TrustProductsChannelEndpointAssignmentResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchTrustProductsChannelEndpointAssignmentOptions options,
-                                                 ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathTrustProductSid + "/ChannelEndpointAssignments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="options"> Fetch TrustProductsChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static TrustProductsChannelEndpointAssignmentResource Fetch(FetchTrustProductsChannelEndpointAssignmentOptions options,
-                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="options"> Fetch TrustProductsChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsChannelEndpointAssignmentResource> FetchAsync(FetchTrustProductsChannelEndpointAssignmentOptions options,
-                                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static TrustProductsChannelEndpointAssignmentResource Fetch(string pathTrustProductSid,
-                                                                           string pathSid,
-                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsChannelEndpointAssignmentResource> FetchAsync(string pathTrustProductSid,
-                                                                                                                   string pathSid,
-                                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteTrustProductsChannelEndpointAssignmentOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathTrustProductSid + "/ChannelEndpointAssignments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="options"> Delete TrustProductsChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static bool Delete(DeleteTrustProductsChannelEndpointAssignmentOptions options,
-                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="options"> Delete TrustProductsChannelEndpointAssignment parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTrustProductsChannelEndpointAssignmentOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static bool Delete(string pathTrustProductSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathTrustProductSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TrustProductsChannelEndpointAssignmentResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TrustProductsChannelEndpointAssignmentResource object represented by the provided JSON </returns>
-        public static TrustProductsChannelEndpointAssignmentResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TrustProductsChannelEndpointAssignmentResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the CustomerProfile resource.
-        /// </summary>
-        [JsonProperty("trust_product_sid")]
-        public string TrustProductSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The type of channel endpoint
-        /// </summary>
-        [JsonProperty("channel_endpoint_type")]
-        public string ChannelEndpointType { get; private set; }
-        /// <summary>
-        /// The sid of an channel endpoint
-        /// </summary>
-        [JsonProperty("channel_endpoint_sid")]
-        public string ChannelEndpointSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Identity resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private TrustProductsChannelEndpointAssignmentResource()
-        {
-
-        }
-    }
+{
+
+  public class TrustProductsChannelEndpointAssignmentResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateTrustProductsChannelEndpointAssignmentOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathTrustProductSid + "/ChannelEndpointAssignments",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="options"> Create TrustProductsChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static TrustProductsChannelEndpointAssignmentResource Create(CreateTrustProductsChannelEndpointAssignmentOptions options,
+                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="options"> Create TrustProductsChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsChannelEndpointAssignmentResource> CreateAsync(CreateTrustProductsChannelEndpointAssignmentOptions options,
+                                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="channelEndpointType"> The type of channel endpoint </param>
+    /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static TrustProductsChannelEndpointAssignmentResource Create(string pathTrustProductSid,
+                                                                        string channelEndpointType,
+                                                                        string channelEndpointSid,
+                                                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid, channelEndpointType, channelEndpointSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="channelEndpointType"> The type of channel endpoint </param>
+    /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsChannelEndpointAssignmentResource> CreateAsync(string pathTrustProductSid,
+                                                                                                                string channelEndpointType,
+                                                                                                                string channelEndpointSid,
+                                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid, channelEndpointType, channelEndpointSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadTrustProductsChannelEndpointAssignmentOptions options,
+                                            ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathTrustProductSid + "/ChannelEndpointAssignments",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="options"> Read TrustProductsChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static ResourceSet<TrustProductsChannelEndpointAssignmentResource> Read(ReadTrustProductsChannelEndpointAssignmentOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TrustProductsChannelEndpointAssignmentResource>.FromJson("results", response.Content);
+      return new ResourceSet<TrustProductsChannelEndpointAssignmentResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="options"> Read TrustProductsChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsChannelEndpointAssignmentResource>> ReadAsync(ReadTrustProductsChannelEndpointAssignmentOptions options,
+                                                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TrustProductsChannelEndpointAssignmentResource>.FromJson("results", response.Content);
+      return new ResourceSet<TrustProductsChannelEndpointAssignmentResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
+    /// <param name="channelEndpointSids"> comma separated list of channel endpoint sids </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static ResourceSet<TrustProductsChannelEndpointAssignmentResource> Read(string pathTrustProductSid,
+                                                                                   string channelEndpointSid = null,
+                                                                                   string channelEndpointSids = null,
+                                                                                   int? pageSize = null,
+                                                                                   long? limit = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid) { ChannelEndpointSid = channelEndpointSid, ChannelEndpointSids = channelEndpointSids, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="channelEndpointSid"> The sid of an channel endpoint </param>
+    /// <param name="channelEndpointSids"> comma separated list of channel endpoint sids </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsChannelEndpointAssignmentResource>> ReadAsync(string pathTrustProductSid,
+                                                                                                                           string channelEndpointSid = null,
+                                                                                                                           string channelEndpointSids = null,
+                                                                                                                           int? pageSize = null,
+                                                                                                                           long? limit = null,
+                                                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid) { ChannelEndpointSid = channelEndpointSid, ChannelEndpointSids = channelEndpointSids, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TrustProductsChannelEndpointAssignmentResource> GetPage(string targetUrl,
+                                                                               ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TrustProductsChannelEndpointAssignmentResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TrustProductsChannelEndpointAssignmentResource> NextPage(Page<TrustProductsChannelEndpointAssignmentResource> page,
+                                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<TrustProductsChannelEndpointAssignmentResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TrustProductsChannelEndpointAssignmentResource> PreviousPage(Page<TrustProductsChannelEndpointAssignmentResource> page,
+                                                                                    ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<TrustProductsChannelEndpointAssignmentResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchTrustProductsChannelEndpointAssignmentOptions options,
+                                             ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathTrustProductSid + "/ChannelEndpointAssignments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="options"> Fetch TrustProductsChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static TrustProductsChannelEndpointAssignmentResource Fetch(FetchTrustProductsChannelEndpointAssignmentOptions options,
+                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="options"> Fetch TrustProductsChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsChannelEndpointAssignmentResource> FetchAsync(FetchTrustProductsChannelEndpointAssignmentOptions options,
+                                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static TrustProductsChannelEndpointAssignmentResource Fetch(string pathTrustProductSid,
+                                                                       string pathSid,
+                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsChannelEndpointAssignmentResource> FetchAsync(string pathTrustProductSid,
+                                                                                                               string pathSid,
+                                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteTrustProductsChannelEndpointAssignmentOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathTrustProductSid + "/ChannelEndpointAssignments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="options"> Delete TrustProductsChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static bool Delete(DeleteTrustProductsChannelEndpointAssignmentOptions options,
+                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="options"> Delete TrustProductsChannelEndpointAssignment parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTrustProductsChannelEndpointAssignmentOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static bool Delete(string pathTrustProductSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsChannelEndpointAssignment </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathTrustProductSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteTrustProductsChannelEndpointAssignmentOptions(pathTrustProductSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TrustProductsChannelEndpointAssignmentResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TrustProductsChannelEndpointAssignmentResource object represented by the provided JSON </returns>
+    public static TrustProductsChannelEndpointAssignmentResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TrustProductsChannelEndpointAssignmentResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the CustomerProfile resource.
+    /// </summary>
+    [JsonProperty("trust_product_sid")]
+    public string TrustProductSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The type of channel endpoint
+    /// </summary>
+    [JsonProperty("channel_endpoint_type")]
+    public string ChannelEndpointType { get; private set; }
+    /// <summary>
+    /// The sid of an channel endpoint
+    /// </summary>
+    [JsonProperty("channel_endpoint_sid")]
+    public string ChannelEndpointSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Identity resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private TrustProductsChannelEndpointAssignmentResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEntityAssignmentsOptions.cs b/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEntityAssignmentsOptions.cs
index 26467ff03..09c921f68 100644
--- a/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEntityAssignmentsOptions.cs
+++ b/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEntityAssignmentsOptions.cs
@@ -9,150 +9,150 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trusthub.V1.TrustProducts
-{
-
+{
+
+  /// <summary>
+  /// Create a new Assigned Item.
+  /// </summary>
+  public class CreateTrustProductsEntityAssignmentsOptions : IOptions<TrustProductsEntityAssignmentsResource>
+  {
     /// <summary>
-    /// Create a new Assigned Item.
+    /// The unique string that identifies the resource.
     /// </summary>
-    public class CreateTrustProductsEntityAssignmentsOptions : IOptions<TrustProductsEntityAssignmentsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathTrustProductSid { get; }
-        /// <summary>
-        /// The sid of an object bag
-        /// </summary>
-        public string ObjectSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateTrustProductsEntityAssignmentsOptions
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="objectSid"> The sid of an object bag </param>
-        public CreateTrustProductsEntityAssignmentsOptions(string pathTrustProductSid, string objectSid)
-        {
-            PathTrustProductSid = pathTrustProductSid;
-            ObjectSid = objectSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (ObjectSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ObjectSid", ObjectSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathTrustProductSid { get; }
     /// <summary>
-    /// Retrieve a list of all Assigned Items for an account.
+    /// The sid of an object bag
     /// </summary>
-    public class ReadTrustProductsEntityAssignmentsOptions : ReadOptions<TrustProductsEntityAssignmentsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathTrustProductSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadTrustProductsEntityAssignmentsOptions
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        public ReadTrustProductsEntityAssignmentsOptions(string pathTrustProductSid)
-        {
-            PathTrustProductSid = pathTrustProductSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string ObjectSid { get; }
+
     /// <summary>
-    /// Fetch specific Assigned Item Instance.
+    /// Construct a new CreateTrustProductsEntityAssignmentsOptions
     /// </summary>
-    public class FetchTrustProductsEntityAssignmentsOptions : IOptions<TrustProductsEntityAssignmentsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathTrustProductSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTrustProductsEntityAssignmentsOptions
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchTrustProductsEntityAssignmentsOptions(string pathTrustProductSid, string pathSid)
-        {
-            PathTrustProductSid = pathTrustProductSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="objectSid"> The sid of an object bag </param>
+    public CreateTrustProductsEntityAssignmentsOptions(string pathTrustProductSid, string objectSid)
+    {
+      PathTrustProductSid = pathTrustProductSid;
+      ObjectSid = objectSid;
+    }
+
     /// <summary>
-    /// Remove an Assignment Item Instance.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteTrustProductsEntityAssignmentsOptions : IOptions<TrustProductsEntityAssignmentsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathTrustProductSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteTrustProductsEntityAssignmentsOptions
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteTrustProductsEntityAssignmentsOptions(string pathTrustProductSid, string pathSid)
-        {
-            PathTrustProductSid = pathTrustProductSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (ObjectSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ObjectSid", ObjectSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Assigned Items for an account.
+  /// </summary>
+  public class ReadTrustProductsEntityAssignmentsOptions : ReadOptions<TrustProductsEntityAssignmentsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathTrustProductSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadTrustProductsEntityAssignmentsOptions
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    public ReadTrustProductsEntityAssignmentsOptions(string pathTrustProductSid)
+    {
+      PathTrustProductSid = pathTrustProductSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific Assigned Item Instance.
+  /// </summary>
+  public class FetchTrustProductsEntityAssignmentsOptions : IOptions<TrustProductsEntityAssignmentsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathTrustProductSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchTrustProductsEntityAssignmentsOptions
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchTrustProductsEntityAssignmentsOptions(string pathTrustProductSid, string pathSid)
+    {
+      PathTrustProductSid = pathTrustProductSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Remove an Assignment Item Instance.
+  /// </summary>
+  public class DeleteTrustProductsEntityAssignmentsOptions : IOptions<TrustProductsEntityAssignmentsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathTrustProductSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteTrustProductsEntityAssignmentsOptions
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteTrustProductsEntityAssignmentsOptions(string pathTrustProductSid, string pathSid)
+    {
+      PathTrustProductSid = pathTrustProductSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEntityAssignmentsResource.cs b/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEntityAssignmentsResource.cs
index 48682bfeb..4c8c5a5db 100644
--- a/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEntityAssignmentsResource.cs
+++ b/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEntityAssignmentsResource.cs
@@ -16,418 +16,418 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Trusthub.V1.TrustProducts
-{
-
-    public class TrustProductsEntityAssignmentsResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateTrustProductsEntityAssignmentsOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathTrustProductSid + "/EntityAssignments",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="options"> Create TrustProductsEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEntityAssignments </returns>
-        public static TrustProductsEntityAssignmentsResource Create(CreateTrustProductsEntityAssignmentsOptions options,
-                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="options"> Create TrustProductsEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsEntityAssignmentsResource> CreateAsync(CreateTrustProductsEntityAssignmentsOptions options,
-                                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="objectSid"> The sid of an object bag </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEntityAssignments </returns>
-        public static TrustProductsEntityAssignmentsResource Create(string pathTrustProductSid,
-                                                                    string objectSid,
-                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateTrustProductsEntityAssignmentsOptions(pathTrustProductSid, objectSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Assigned Item.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="objectSid"> The sid of an object bag </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsEntityAssignmentsResource> CreateAsync(string pathTrustProductSid,
-                                                                                                            string objectSid,
-                                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateTrustProductsEntityAssignmentsOptions(pathTrustProductSid, objectSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadTrustProductsEntityAssignmentsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathTrustProductSid + "/EntityAssignments",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="options"> Read TrustProductsEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEntityAssignments </returns>
-        public static ResourceSet<TrustProductsEntityAssignmentsResource> Read(ReadTrustProductsEntityAssignmentsOptions options,
-                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TrustProductsEntityAssignmentsResource>.FromJson("results", response.Content);
-            return new ResourceSet<TrustProductsEntityAssignmentsResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="options"> Read TrustProductsEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsEntityAssignmentsResource>> ReadAsync(ReadTrustProductsEntityAssignmentsOptions options,
-                                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TrustProductsEntityAssignmentsResource>.FromJson("results", response.Content);
-            return new ResourceSet<TrustProductsEntityAssignmentsResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEntityAssignments </returns>
-        public static ResourceSet<TrustProductsEntityAssignmentsResource> Read(string pathTrustProductSid,
-                                                                               int? pageSize = null,
-                                                                               long? limit = null,
-                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadTrustProductsEntityAssignmentsOptions(pathTrustProductSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Assigned Items for an account.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsEntityAssignmentsResource>> ReadAsync(string pathTrustProductSid,
-                                                                                                                       int? pageSize = null,
-                                                                                                                       long? limit = null,
-                                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadTrustProductsEntityAssignmentsOptions(pathTrustProductSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TrustProductsEntityAssignmentsResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TrustProductsEntityAssignmentsResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TrustProductsEntityAssignmentsResource> NextPage(Page<TrustProductsEntityAssignmentsResource> page,
-                                                                            ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<TrustProductsEntityAssignmentsResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TrustProductsEntityAssignmentsResource> PreviousPage(Page<TrustProductsEntityAssignmentsResource> page,
-                                                                                ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<TrustProductsEntityAssignmentsResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchTrustProductsEntityAssignmentsOptions options,
-                                                 ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathTrustProductSid + "/EntityAssignments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="options"> Fetch TrustProductsEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEntityAssignments </returns>
-        public static TrustProductsEntityAssignmentsResource Fetch(FetchTrustProductsEntityAssignmentsOptions options,
-                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="options"> Fetch TrustProductsEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsEntityAssignmentsResource> FetchAsync(FetchTrustProductsEntityAssignmentsOptions options,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEntityAssignments </returns>
-        public static TrustProductsEntityAssignmentsResource Fetch(string pathTrustProductSid,
-                                                                   string pathSid,
-                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchTrustProductsEntityAssignmentsOptions(pathTrustProductSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Assigned Item Instance.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsEntityAssignmentsResource> FetchAsync(string pathTrustProductSid,
-                                                                                                           string pathSid,
-                                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchTrustProductsEntityAssignmentsOptions(pathTrustProductSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteTrustProductsEntityAssignmentsOptions options,
-                                                  ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathTrustProductSid + "/EntityAssignments/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="options"> Delete TrustProductsEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEntityAssignments </returns>
-        public static bool Delete(DeleteTrustProductsEntityAssignmentsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="options"> Delete TrustProductsEntityAssignments parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTrustProductsEntityAssignmentsOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEntityAssignments </returns>
-        public static bool Delete(string pathTrustProductSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteTrustProductsEntityAssignmentsOptions(pathTrustProductSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Remove an Assignment Item Instance.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathTrustProductSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteTrustProductsEntityAssignmentsOptions(pathTrustProductSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TrustProductsEntityAssignmentsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TrustProductsEntityAssignmentsResource object represented by the provided JSON </returns>
-        public static TrustProductsEntityAssignmentsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TrustProductsEntityAssignmentsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the TrustProduct resource.
-        /// </summary>
-        [JsonProperty("trust_product_sid")]
-        public string TrustProductSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The sid of an object bag
-        /// </summary>
-        [JsonProperty("object_sid")]
-        public string ObjectSid { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Identity resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private TrustProductsEntityAssignmentsResource()
-        {
-
-        }
-    }
+{
+
+  public class TrustProductsEntityAssignmentsResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateTrustProductsEntityAssignmentsOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathTrustProductSid + "/EntityAssignments",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="options"> Create TrustProductsEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEntityAssignments </returns>
+    public static TrustProductsEntityAssignmentsResource Create(CreateTrustProductsEntityAssignmentsOptions options,
+                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="options"> Create TrustProductsEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsEntityAssignmentsResource> CreateAsync(CreateTrustProductsEntityAssignmentsOptions options,
+                                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="objectSid"> The sid of an object bag </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEntityAssignments </returns>
+    public static TrustProductsEntityAssignmentsResource Create(string pathTrustProductSid,
+                                                                string objectSid,
+                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateTrustProductsEntityAssignmentsOptions(pathTrustProductSid, objectSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Assigned Item.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="objectSid"> The sid of an object bag </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsEntityAssignmentsResource> CreateAsync(string pathTrustProductSid,
+                                                                                                        string objectSid,
+                                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateTrustProductsEntityAssignmentsOptions(pathTrustProductSid, objectSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadTrustProductsEntityAssignmentsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathTrustProductSid + "/EntityAssignments",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="options"> Read TrustProductsEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEntityAssignments </returns>
+    public static ResourceSet<TrustProductsEntityAssignmentsResource> Read(ReadTrustProductsEntityAssignmentsOptions options,
+                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TrustProductsEntityAssignmentsResource>.FromJson("results", response.Content);
+      return new ResourceSet<TrustProductsEntityAssignmentsResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="options"> Read TrustProductsEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsEntityAssignmentsResource>> ReadAsync(ReadTrustProductsEntityAssignmentsOptions options,
+                                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TrustProductsEntityAssignmentsResource>.FromJson("results", response.Content);
+      return new ResourceSet<TrustProductsEntityAssignmentsResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEntityAssignments </returns>
+    public static ResourceSet<TrustProductsEntityAssignmentsResource> Read(string pathTrustProductSid,
+                                                                           int? pageSize = null,
+                                                                           long? limit = null,
+                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadTrustProductsEntityAssignmentsOptions(pathTrustProductSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Assigned Items for an account.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsEntityAssignmentsResource>> ReadAsync(string pathTrustProductSid,
+                                                                                                                   int? pageSize = null,
+                                                                                                                   long? limit = null,
+                                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadTrustProductsEntityAssignmentsOptions(pathTrustProductSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TrustProductsEntityAssignmentsResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TrustProductsEntityAssignmentsResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TrustProductsEntityAssignmentsResource> NextPage(Page<TrustProductsEntityAssignmentsResource> page,
+                                                                        ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<TrustProductsEntityAssignmentsResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TrustProductsEntityAssignmentsResource> PreviousPage(Page<TrustProductsEntityAssignmentsResource> page,
+                                                                            ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<TrustProductsEntityAssignmentsResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchTrustProductsEntityAssignmentsOptions options,
+                                             ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathTrustProductSid + "/EntityAssignments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="options"> Fetch TrustProductsEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEntityAssignments </returns>
+    public static TrustProductsEntityAssignmentsResource Fetch(FetchTrustProductsEntityAssignmentsOptions options,
+                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="options"> Fetch TrustProductsEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsEntityAssignmentsResource> FetchAsync(FetchTrustProductsEntityAssignmentsOptions options,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEntityAssignments </returns>
+    public static TrustProductsEntityAssignmentsResource Fetch(string pathTrustProductSid,
+                                                               string pathSid,
+                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchTrustProductsEntityAssignmentsOptions(pathTrustProductSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Assigned Item Instance.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsEntityAssignmentsResource> FetchAsync(string pathTrustProductSid,
+                                                                                                       string pathSid,
+                                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchTrustProductsEntityAssignmentsOptions(pathTrustProductSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteTrustProductsEntityAssignmentsOptions options,
+                                              ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathTrustProductSid + "/EntityAssignments/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="options"> Delete TrustProductsEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEntityAssignments </returns>
+    public static bool Delete(DeleteTrustProductsEntityAssignmentsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="options"> Delete TrustProductsEntityAssignments parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTrustProductsEntityAssignmentsOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEntityAssignments </returns>
+    public static bool Delete(string pathTrustProductSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteTrustProductsEntityAssignmentsOptions(pathTrustProductSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Remove an Assignment Item Instance.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEntityAssignments </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathTrustProductSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteTrustProductsEntityAssignmentsOptions(pathTrustProductSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TrustProductsEntityAssignmentsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TrustProductsEntityAssignmentsResource object represented by the provided JSON </returns>
+    public static TrustProductsEntityAssignmentsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TrustProductsEntityAssignmentsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the TrustProduct resource.
+    /// </summary>
+    [JsonProperty("trust_product_sid")]
+    public string TrustProductSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The sid of an object bag
+    /// </summary>
+    [JsonProperty("object_sid")]
+    public string ObjectSid { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Identity resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private TrustProductsEntityAssignmentsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEvaluationsOptions.cs b/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEvaluationsOptions.cs
index 5eebccebe..aa042ca61 100644
--- a/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEvaluationsOptions.cs
+++ b/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEvaluationsOptions.cs
@@ -9,115 +9,115 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trusthub.V1.TrustProducts
-{
-
+{
+
+  /// <summary>
+  /// Create a new Evaluation
+  /// </summary>
+  public class CreateTrustProductsEvaluationsOptions : IOptions<TrustProductsEvaluationsResource>
+  {
     /// <summary>
-    /// Create a new Evaluation
+    /// The unique string that identifies the resource
     /// </summary>
-    public class CreateTrustProductsEvaluationsOptions : IOptions<TrustProductsEvaluationsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathTrustProductSid { get; }
-        /// <summary>
-        /// The unique string of a policy
-        /// </summary>
-        public string PolicySid { get; }
-
-        /// <summary>
-        /// Construct a new CreateTrustProductsEvaluationsOptions
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
-        /// <param name="policySid"> The unique string of a policy </param>
-        public CreateTrustProductsEvaluationsOptions(string pathTrustProductSid, string policySid)
-        {
-            PathTrustProductSid = pathTrustProductSid;
-            PolicySid = policySid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PolicySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PolicySid", PolicySid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathTrustProductSid { get; }
     /// <summary>
-    /// Retrieve a list of Evaluations associated to the trust_product resource.
+    /// The unique string of a policy
     /// </summary>
-    public class ReadTrustProductsEvaluationsOptions : ReadOptions<TrustProductsEvaluationsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathTrustProductSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadTrustProductsEvaluationsOptions
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
-        public ReadTrustProductsEvaluationsOptions(string pathTrustProductSid)
-        {
-            PathTrustProductSid = pathTrustProductSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PolicySid { get; }
+
     /// <summary>
-    /// Fetch specific Evaluation Instance.
+    /// Construct a new CreateTrustProductsEvaluationsOptions
     /// </summary>
-    public class FetchTrustProductsEvaluationsOptions : IOptions<TrustProductsEvaluationsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathTrustProductSid { get; }
-        /// <summary>
-        /// The unique string that identifies the Evaluation resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTrustProductsEvaluationsOptions
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
-        /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
-        public FetchTrustProductsEvaluationsOptions(string pathTrustProductSid, string pathSid)
-        {
-            PathTrustProductSid = pathTrustProductSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
+    /// <param name="policySid"> The unique string of a policy </param>
+    public CreateTrustProductsEvaluationsOptions(string pathTrustProductSid, string policySid)
+    {
+      PathTrustProductSid = pathTrustProductSid;
+      PolicySid = policySid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PolicySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PolicySid", PolicySid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of Evaluations associated to the trust_product resource.
+  /// </summary>
+  public class ReadTrustProductsEvaluationsOptions : ReadOptions<TrustProductsEvaluationsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathTrustProductSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadTrustProductsEvaluationsOptions
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
+    public ReadTrustProductsEvaluationsOptions(string pathTrustProductSid)
+    {
+      PathTrustProductSid = pathTrustProductSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific Evaluation Instance.
+  /// </summary>
+  public class FetchTrustProductsEvaluationsOptions : IOptions<TrustProductsEvaluationsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathTrustProductSid { get; }
+    /// <summary>
+    /// The unique string that identifies the Evaluation resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchTrustProductsEvaluationsOptions
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
+    /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
+    public FetchTrustProductsEvaluationsOptions(string pathTrustProductSid, string pathSid)
+    {
+      PathTrustProductSid = pathTrustProductSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEvaluationsResource.cs b/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEvaluationsResource.cs
index 0660cdbc6..9d470396f 100644
--- a/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEvaluationsResource.cs
+++ b/src/Twilio/Rest/Trusthub/V1/TrustProducts/TrustProductsEvaluationsResource.cs
@@ -17,369 +17,369 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Trusthub.V1.TrustProducts
-{
-
-    public class TrustProductsEvaluationsResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Compliant = new StatusEnum("compliant");
-            public static readonly StatusEnum Noncompliant = new StatusEnum("noncompliant");
-        }
-
-        private static Request BuildCreateRequest(CreateTrustProductsEvaluationsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathTrustProductSid + "/Evaluations",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Evaluation
-        /// </summary>
-        /// <param name="options"> Create TrustProductsEvaluations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEvaluations </returns>
-        public static TrustProductsEvaluationsResource Create(CreateTrustProductsEvaluationsOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Evaluation
-        /// </summary>
-        /// <param name="options"> Create TrustProductsEvaluations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEvaluations </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsEvaluationsResource> CreateAsync(CreateTrustProductsEvaluationsOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Evaluation
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
-        /// <param name="policySid"> The unique string of a policy </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEvaluations </returns>
-        public static TrustProductsEvaluationsResource Create(string pathTrustProductSid,
-                                                              string policySid,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateTrustProductsEvaluationsOptions(pathTrustProductSid, policySid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Evaluation
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
-        /// <param name="policySid"> The unique string of a policy </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEvaluations </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsEvaluationsResource> CreateAsync(string pathTrustProductSid,
-                                                                                                      string policySid,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateTrustProductsEvaluationsOptions(pathTrustProductSid, policySid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadTrustProductsEvaluationsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathTrustProductSid + "/Evaluations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Evaluations associated to the trust_product resource.
-        /// </summary>
-        /// <param name="options"> Read TrustProductsEvaluations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEvaluations </returns>
-        public static ResourceSet<TrustProductsEvaluationsResource> Read(ReadTrustProductsEvaluationsOptions options,
-                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TrustProductsEvaluationsResource>.FromJson("results", response.Content);
-            return new ResourceSet<TrustProductsEvaluationsResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Evaluations associated to the trust_product resource.
-        /// </summary>
-        /// <param name="options"> Read TrustProductsEvaluations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEvaluations </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsEvaluationsResource>> ReadAsync(ReadTrustProductsEvaluationsOptions options,
-                                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TrustProductsEvaluationsResource>.FromJson("results", response.Content);
-            return new ResourceSet<TrustProductsEvaluationsResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Evaluations associated to the trust_product resource.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEvaluations </returns>
-        public static ResourceSet<TrustProductsEvaluationsResource> Read(string pathTrustProductSid,
-                                                                         int? pageSize = null,
-                                                                         long? limit = null,
-                                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadTrustProductsEvaluationsOptions(pathTrustProductSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Evaluations associated to the trust_product resource.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEvaluations </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsEvaluationsResource>> ReadAsync(string pathTrustProductSid,
-                                                                                                                 int? pageSize = null,
-                                                                                                                 long? limit = null,
-                                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadTrustProductsEvaluationsOptions(pathTrustProductSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TrustProductsEvaluationsResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TrustProductsEvaluationsResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TrustProductsEvaluationsResource> NextPage(Page<TrustProductsEvaluationsResource> page,
-                                                                      ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<TrustProductsEvaluationsResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TrustProductsEvaluationsResource> PreviousPage(Page<TrustProductsEvaluationsResource> page,
-                                                                          ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<TrustProductsEvaluationsResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchTrustProductsEvaluationsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathTrustProductSid + "/Evaluations/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific Evaluation Instance.
-        /// </summary>
-        /// <param name="options"> Fetch TrustProductsEvaluations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEvaluations </returns>
-        public static TrustProductsEvaluationsResource Fetch(FetchTrustProductsEvaluationsOptions options,
-                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Evaluation Instance.
-        /// </summary>
-        /// <param name="options"> Fetch TrustProductsEvaluations parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEvaluations </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsEvaluationsResource> FetchAsync(FetchTrustProductsEvaluationsOptions options,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific Evaluation Instance.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
-        /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProductsEvaluations </returns>
-        public static TrustProductsEvaluationsResource Fetch(string pathTrustProductSid,
-                                                             string pathSid,
-                                                             ITwilioRestClient client = null)
-        {
-            var options = new FetchTrustProductsEvaluationsOptions(pathTrustProductSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Evaluation Instance.
-        /// </summary>
-        /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
-        /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProductsEvaluations </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsEvaluationsResource> FetchAsync(string pathTrustProductSid,
-                                                                                                     string pathSid,
-                                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchTrustProductsEvaluationsOptions(pathTrustProductSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TrustProductsEvaluationsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TrustProductsEvaluationsResource object represented by the provided JSON </returns>
-        public static TrustProductsEvaluationsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TrustProductsEvaluationsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Evaluation resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string of a policy
-        /// </summary>
-        [JsonProperty("policy_sid")]
-        public string PolicySid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("trust_product_sid")]
-        public string TrustProductSid { get; private set; }
-        /// <summary>
-        /// The compliance status of the Evaluation resource
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TrustProductsEvaluationsResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The results of the Evaluation resource
-        /// </summary>
-        [JsonProperty("results")]
-        public List<object> Results { get; private set; }
-        /// <summary>
-        /// The date_created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private TrustProductsEvaluationsResource()
-        {
-
-        }
-    }
+{
+
+  public class TrustProductsEvaluationsResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Compliant = new StatusEnum("compliant");
+      public static readonly StatusEnum Noncompliant = new StatusEnum("noncompliant");
+    }
+
+    private static Request BuildCreateRequest(CreateTrustProductsEvaluationsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathTrustProductSid + "/Evaluations",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Evaluation
+    /// </summary>
+    /// <param name="options"> Create TrustProductsEvaluations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEvaluations </returns>
+    public static TrustProductsEvaluationsResource Create(CreateTrustProductsEvaluationsOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Evaluation
+    /// </summary>
+    /// <param name="options"> Create TrustProductsEvaluations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEvaluations </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsEvaluationsResource> CreateAsync(CreateTrustProductsEvaluationsOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Evaluation
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
+    /// <param name="policySid"> The unique string of a policy </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEvaluations </returns>
+    public static TrustProductsEvaluationsResource Create(string pathTrustProductSid,
+                                                          string policySid,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateTrustProductsEvaluationsOptions(pathTrustProductSid, policySid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Evaluation
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
+    /// <param name="policySid"> The unique string of a policy </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEvaluations </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsEvaluationsResource> CreateAsync(string pathTrustProductSid,
+                                                                                                  string policySid,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateTrustProductsEvaluationsOptions(pathTrustProductSid, policySid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadTrustProductsEvaluationsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathTrustProductSid + "/Evaluations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Evaluations associated to the trust_product resource.
+    /// </summary>
+    /// <param name="options"> Read TrustProductsEvaluations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEvaluations </returns>
+    public static ResourceSet<TrustProductsEvaluationsResource> Read(ReadTrustProductsEvaluationsOptions options,
+                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TrustProductsEvaluationsResource>.FromJson("results", response.Content);
+      return new ResourceSet<TrustProductsEvaluationsResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Evaluations associated to the trust_product resource.
+    /// </summary>
+    /// <param name="options"> Read TrustProductsEvaluations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEvaluations </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsEvaluationsResource>> ReadAsync(ReadTrustProductsEvaluationsOptions options,
+                                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TrustProductsEvaluationsResource>.FromJson("results", response.Content);
+      return new ResourceSet<TrustProductsEvaluationsResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Evaluations associated to the trust_product resource.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEvaluations </returns>
+    public static ResourceSet<TrustProductsEvaluationsResource> Read(string pathTrustProductSid,
+                                                                     int? pageSize = null,
+                                                                     long? limit = null,
+                                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadTrustProductsEvaluationsOptions(pathTrustProductSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Evaluations associated to the trust_product resource.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEvaluations </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsEvaluationsResource>> ReadAsync(string pathTrustProductSid,
+                                                                                                             int? pageSize = null,
+                                                                                                             long? limit = null,
+                                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadTrustProductsEvaluationsOptions(pathTrustProductSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TrustProductsEvaluationsResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TrustProductsEvaluationsResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TrustProductsEvaluationsResource> NextPage(Page<TrustProductsEvaluationsResource> page,
+                                                                  ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<TrustProductsEvaluationsResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TrustProductsEvaluationsResource> PreviousPage(Page<TrustProductsEvaluationsResource> page,
+                                                                      ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<TrustProductsEvaluationsResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchTrustProductsEvaluationsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathTrustProductSid + "/Evaluations/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific Evaluation Instance.
+    /// </summary>
+    /// <param name="options"> Fetch TrustProductsEvaluations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEvaluations </returns>
+    public static TrustProductsEvaluationsResource Fetch(FetchTrustProductsEvaluationsOptions options,
+                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Evaluation Instance.
+    /// </summary>
+    /// <param name="options"> Fetch TrustProductsEvaluations parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEvaluations </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsEvaluationsResource> FetchAsync(FetchTrustProductsEvaluationsOptions options,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific Evaluation Instance.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
+    /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProductsEvaluations </returns>
+    public static TrustProductsEvaluationsResource Fetch(string pathTrustProductSid,
+                                                         string pathSid,
+                                                         ITwilioRestClient client = null)
+    {
+      var options = new FetchTrustProductsEvaluationsOptions(pathTrustProductSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Evaluation Instance.
+    /// </summary>
+    /// <param name="pathTrustProductSid"> The unique string that identifies the resource </param>
+    /// <param name="pathSid"> The unique string that identifies the Evaluation resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProductsEvaluations </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsEvaluationsResource> FetchAsync(string pathTrustProductSid,
+                                                                                                 string pathSid,
+                                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchTrustProductsEvaluationsOptions(pathTrustProductSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TrustProductsEvaluationsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TrustProductsEvaluationsResource object represented by the provided JSON </returns>
+    public static TrustProductsEvaluationsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TrustProductsEvaluationsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Evaluation resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string of a policy
+    /// </summary>
+    [JsonProperty("policy_sid")]
+    public string PolicySid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("trust_product_sid")]
+    public string TrustProductSid { get; private set; }
+    /// <summary>
+    /// The compliance status of the Evaluation resource
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TrustProductsEvaluationsResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The results of the Evaluation resource
+    /// </summary>
+    [JsonProperty("results")]
+    public List<object> Results { get; private set; }
+    /// <summary>
+    /// The date_created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private TrustProductsEvaluationsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/TrustProductsOptions.cs b/src/Twilio/Rest/Trusthub/V1/TrustProductsOptions.cs
index caaa9c72b..c50390ffd 100644
--- a/src/Twilio/Rest/Trusthub/V1/TrustProductsOptions.cs
+++ b/src/Twilio/Rest/Trusthub/V1/TrustProductsOptions.cs
@@ -9,242 +9,242 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
+{
+
+  /// <summary>
+  /// Create a new Customer-Profile.
+  /// </summary>
+  public class CreateTrustProductsOptions : IOptions<TrustProductsResource>
+  {
     /// <summary>
-    /// Create a new Customer-Profile.
-    /// </summary>
-    public class CreateTrustProductsOptions : IOptions<TrustProductsResource>
-    {
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The email address
-        /// </summary>
-        public string Email { get; }
-        /// <summary>
-        /// The unique string of a policy.
-        /// </summary>
-        public string PolicySid { get; }
-        /// <summary>
-        /// The URL we call to inform your application of status changes.
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateTrustProductsOptions
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="policySid"> The unique string of a policy. </param>
-        public CreateTrustProductsOptions(string friendlyName, string email, string policySid)
-        {
-            FriendlyName = friendlyName;
-            Email = email;
-            PolicySid = policySid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Email != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Email", Email));
-            }
-
-            if (PolicySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PolicySid", PolicySid.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            return p;
-        }
-    }
-
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
     /// <summary>
-    /// Retrieve a list of all Customer-Profiles for an account.
-    /// </summary>
-    public class ReadTrustProductsOptions : ReadOptions<TrustProductsResource>
-    {
-        /// <summary>
-        /// The verification status of the Customer-Profile resource
-        /// </summary>
-        public TrustProductsResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The unique string of a policy.
-        /// </summary>
-        public string PolicySid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PolicySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PolicySid", PolicySid.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The email address
+    /// </summary>
+    public string Email { get; }
     /// <summary>
-    /// Fetch a specific Customer-Profile instance.
+    /// The unique string of a policy.
     /// </summary>
-    public class FetchTrustProductsOptions : IOptions<TrustProductsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchTrustProductsOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        public FetchTrustProductsOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PolicySid { get; }
     /// <summary>
-    /// Updates a Customer-Profile in an account.
-    /// </summary>
-    public class UpdateTrustProductsOptions : IOptions<TrustProductsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The verification status of the Customer-Profile resource
-        /// </summary>
-        public TrustProductsResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The URL we call to inform your application of status changes.
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The email address
-        /// </summary>
-        public string Email { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateTrustProductsOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        public UpdateTrustProductsOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Email != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Email", Email));
-            }
-
-            return p;
-        }
-    }
-
+    /// The URL we call to inform your application of status changes.
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+
     /// <summary>
-    /// Delete a specific Customer-Profile.
+    /// Construct a new CreateTrustProductsOptions
     /// </summary>
-    public class DeleteTrustProductsOptions : IOptions<TrustProductsResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteTrustProductsOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        public DeleteTrustProductsOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="policySid"> The unique string of a policy. </param>
+    public CreateTrustProductsOptions(string friendlyName, string email, string policySid)
+    {
+      FriendlyName = friendlyName;
+      Email = email;
+      PolicySid = policySid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Email != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Email", Email));
+      }
+
+      if (PolicySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PolicySid", PolicySid.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Customer-Profiles for an account.
+  /// </summary>
+  public class ReadTrustProductsOptions : ReadOptions<TrustProductsResource>
+  {
+    /// <summary>
+    /// The verification status of the Customer-Profile resource
+    /// </summary>
+    public TrustProductsResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The unique string of a policy.
+    /// </summary>
+    public string PolicySid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PolicySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PolicySid", PolicySid.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific Customer-Profile instance.
+  /// </summary>
+  public class FetchTrustProductsOptions : IOptions<TrustProductsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchTrustProductsOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    public FetchTrustProductsOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Updates a Customer-Profile in an account.
+  /// </summary>
+  public class UpdateTrustProductsOptions : IOptions<TrustProductsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The verification status of the Customer-Profile resource
+    /// </summary>
+    public TrustProductsResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The URL we call to inform your application of status changes.
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The email address
+    /// </summary>
+    public string Email { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateTrustProductsOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    public UpdateTrustProductsOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Email != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Email", Email));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Customer-Profile.
+  /// </summary>
+  public class DeleteTrustProductsOptions : IOptions<TrustProductsResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteTrustProductsOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    public DeleteTrustProductsOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Trusthub/V1/TrustProductsResource.cs b/src/Twilio/Rest/Trusthub/V1/TrustProductsResource.cs
index 227b8879a..903845914 100644
--- a/src/Twilio/Rest/Trusthub/V1/TrustProductsResource.cs
+++ b/src/Twilio/Rest/Trusthub/V1/TrustProductsResource.cs
@@ -17,562 +17,562 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Trusthub.V1
-{
-
-    public class TrustProductsResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Draft = new StatusEnum("draft");
-            public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
-            public static readonly StatusEnum InReview = new StatusEnum("in-review");
-            public static readonly StatusEnum TwilioRejected = new StatusEnum("twilio-rejected");
-            public static readonly StatusEnum TwilioApproved = new StatusEnum("twilio-approved");
-        }
-
-        public sealed class EndUserTypeEnum : StringEnum
-        {
-            private EndUserTypeEnum(string value) : base(value) {}
-            public EndUserTypeEnum() {}
-            public static implicit operator EndUserTypeEnum(string value)
-            {
-                return new EndUserTypeEnum(value);
-            }
-
-            public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
-            public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
-        }
-
-        private static Request BuildCreateRequest(CreateTrustProductsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Customer-Profile.
-        /// </summary>
-        /// <param name="options"> Create TrustProducts parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProducts </returns>
-        public static TrustProductsResource Create(CreateTrustProductsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Customer-Profile.
-        /// </summary>
-        /// <param name="options"> Create TrustProducts parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProducts </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsResource> CreateAsync(CreateTrustProductsOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Customer-Profile.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="policySid"> The unique string of a policy. </param>
-        /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProducts </returns>
-        public static TrustProductsResource Create(string friendlyName,
-                                                   string email,
-                                                   string policySid,
-                                                   Uri statusCallback = null,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new CreateTrustProductsOptions(friendlyName, email, policySid){StatusCallback = statusCallback};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Customer-Profile.
-        /// </summary>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="policySid"> The unique string of a policy. </param>
-        /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProducts </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsResource> CreateAsync(string friendlyName,
-                                                                                           string email,
-                                                                                           string policySid,
-                                                                                           Uri statusCallback = null,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new CreateTrustProductsOptions(friendlyName, email, policySid){StatusCallback = statusCallback};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadTrustProductsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Customer-Profiles for an account.
-        /// </summary>
-        /// <param name="options"> Read TrustProducts parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProducts </returns>
-        public static ResourceSet<TrustProductsResource> Read(ReadTrustProductsOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TrustProductsResource>.FromJson("results", response.Content);
-            return new ResourceSet<TrustProductsResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Customer-Profiles for an account.
-        /// </summary>
-        /// <param name="options"> Read TrustProducts parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProducts </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsResource>> ReadAsync(ReadTrustProductsOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TrustProductsResource>.FromJson("results", response.Content);
-            return new ResourceSet<TrustProductsResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Customer-Profiles for an account.
-        /// </summary>
-        /// <param name="status"> The verification status of the Customer-Profile resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="policySid"> The unique string of a policy. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProducts </returns>
-        public static ResourceSet<TrustProductsResource> Read(TrustProductsResource.StatusEnum status = null,
-                                                              string friendlyName = null,
-                                                              string policySid = null,
-                                                              int? pageSize = null,
-                                                              long? limit = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadTrustProductsOptions(){Status = status, FriendlyName = friendlyName, PolicySid = policySid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Customer-Profiles for an account.
-        /// </summary>
-        /// <param name="status"> The verification status of the Customer-Profile resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="policySid"> The unique string of a policy. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProducts </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsResource>> ReadAsync(TrustProductsResource.StatusEnum status = null,
-                                                                                                      string friendlyName = null,
-                                                                                                      string policySid = null,
-                                                                                                      int? pageSize = null,
-                                                                                                      long? limit = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadTrustProductsOptions(){Status = status, FriendlyName = friendlyName, PolicySid = policySid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TrustProductsResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TrustProductsResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TrustProductsResource> NextPage(Page<TrustProductsResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<TrustProductsResource>.FromJson("results", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TrustProductsResource> PreviousPage(Page<TrustProductsResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Trusthub)
-            );
-
-            var response = client.Request(request);
-            return Page<TrustProductsResource>.FromJson("results", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchTrustProductsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Customer-Profile instance.
-        /// </summary>
-        /// <param name="options"> Fetch TrustProducts parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProducts </returns>
-        public static TrustProductsResource Fetch(FetchTrustProductsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Customer-Profile instance.
-        /// </summary>
-        /// <param name="options"> Fetch TrustProducts parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProducts </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsResource> FetchAsync(FetchTrustProductsOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Customer-Profile instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProducts </returns>
-        public static TrustProductsResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchTrustProductsOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Customer-Profile instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProducts </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsResource> FetchAsync(string pathSid,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchTrustProductsOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateTrustProductsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates a Customer-Profile in an account.
-        /// </summary>
-        /// <param name="options"> Update TrustProducts parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProducts </returns>
-        public static TrustProductsResource Update(UpdateTrustProductsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a Customer-Profile in an account.
-        /// </summary>
-        /// <param name="options"> Update TrustProducts parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProducts </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsResource> UpdateAsync(UpdateTrustProductsOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates a Customer-Profile in an account.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="status"> The verification status of the Customer-Profile resource </param>
-        /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProducts </returns>
-        public static TrustProductsResource Update(string pathSid,
-                                                   TrustProductsResource.StatusEnum status = null,
-                                                   Uri statusCallback = null,
-                                                   string friendlyName = null,
-                                                   string email = null,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new UpdateTrustProductsOptions(pathSid){Status = status, StatusCallback = statusCallback, FriendlyName = friendlyName, Email = email};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates a Customer-Profile in an account.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="status"> The verification status of the Customer-Profile resource </param>
-        /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
-        /// <param name="email"> The email address </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProducts </returns>
-        public static async System.Threading.Tasks.Task<TrustProductsResource> UpdateAsync(string pathSid,
-                                                                                           TrustProductsResource.StatusEnum status = null,
-                                                                                           Uri statusCallback = null,
-                                                                                           string friendlyName = null,
-                                                                                           string email = null,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new UpdateTrustProductsOptions(pathSid){Status = status, StatusCallback = statusCallback, FriendlyName = friendlyName, Email = email};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteTrustProductsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Trusthub,
-                "/v1/TrustProducts/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Customer-Profile.
-        /// </summary>
-        /// <param name="options"> Delete TrustProducts parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProducts </returns>
-        public static bool Delete(DeleteTrustProductsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Customer-Profile.
-        /// </summary>
-        /// <param name="options"> Delete TrustProducts parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProducts </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTrustProductsOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Customer-Profile.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of TrustProducts </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteTrustProductsOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Customer-Profile.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of TrustProducts </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteTrustProductsOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a TrustProductsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TrustProductsResource object represented by the provided JSON </returns>
-        public static TrustProductsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TrustProductsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string of a policy.
-        /// </summary>
-        [JsonProperty("policy_sid")]
-        public string PolicySid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The verification status of the Customer-Profile resource
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TrustProductsResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource will be valid until.
-        /// </summary>
-        [JsonProperty("valid_until")]
-        public DateTime? ValidUntil { get; private set; }
-        /// <summary>
-        /// The email address
-        /// </summary>
-        [JsonProperty("email")]
-        public string Email { get; private set; }
-        /// <summary>
-        /// The URL we call to inform your application of status changes.
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Customer-Profile resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of the Assigned Items of the Customer-Profile resource
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private TrustProductsResource()
-        {
-
-        }
-    }
+{
+
+  public class TrustProductsResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Draft = new StatusEnum("draft");
+      public static readonly StatusEnum PendingReview = new StatusEnum("pending-review");
+      public static readonly StatusEnum InReview = new StatusEnum("in-review");
+      public static readonly StatusEnum TwilioRejected = new StatusEnum("twilio-rejected");
+      public static readonly StatusEnum TwilioApproved = new StatusEnum("twilio-approved");
+    }
+
+    public sealed class EndUserTypeEnum : StringEnum
+    {
+      private EndUserTypeEnum(string value) : base(value) { }
+      public EndUserTypeEnum() { }
+      public static implicit operator EndUserTypeEnum(string value)
+      {
+        return new EndUserTypeEnum(value);
+      }
+
+      public static readonly EndUserTypeEnum Individual = new EndUserTypeEnum("individual");
+      public static readonly EndUserTypeEnum Business = new EndUserTypeEnum("business");
+    }
+
+    private static Request BuildCreateRequest(CreateTrustProductsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Customer-Profile.
+    /// </summary>
+    /// <param name="options"> Create TrustProducts parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProducts </returns>
+    public static TrustProductsResource Create(CreateTrustProductsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Customer-Profile.
+    /// </summary>
+    /// <param name="options"> Create TrustProducts parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProducts </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsResource> CreateAsync(CreateTrustProductsOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Customer-Profile.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="policySid"> The unique string of a policy. </param>
+    /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProducts </returns>
+    public static TrustProductsResource Create(string friendlyName,
+                                               string email,
+                                               string policySid,
+                                               Uri statusCallback = null,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new CreateTrustProductsOptions(friendlyName, email, policySid) { StatusCallback = statusCallback };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Customer-Profile.
+    /// </summary>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="policySid"> The unique string of a policy. </param>
+    /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProducts </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsResource> CreateAsync(string friendlyName,
+                                                                                       string email,
+                                                                                       string policySid,
+                                                                                       Uri statusCallback = null,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new CreateTrustProductsOptions(friendlyName, email, policySid) { StatusCallback = statusCallback };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadTrustProductsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Customer-Profiles for an account.
+    /// </summary>
+    /// <param name="options"> Read TrustProducts parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProducts </returns>
+    public static ResourceSet<TrustProductsResource> Read(ReadTrustProductsOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TrustProductsResource>.FromJson("results", response.Content);
+      return new ResourceSet<TrustProductsResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Customer-Profiles for an account.
+    /// </summary>
+    /// <param name="options"> Read TrustProducts parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProducts </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsResource>> ReadAsync(ReadTrustProductsOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TrustProductsResource>.FromJson("results", response.Content);
+      return new ResourceSet<TrustProductsResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Customer-Profiles for an account.
+    /// </summary>
+    /// <param name="status"> The verification status of the Customer-Profile resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="policySid"> The unique string of a policy. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProducts </returns>
+    public static ResourceSet<TrustProductsResource> Read(TrustProductsResource.StatusEnum status = null,
+                                                          string friendlyName = null,
+                                                          string policySid = null,
+                                                          int? pageSize = null,
+                                                          long? limit = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadTrustProductsOptions() { Status = status, FriendlyName = friendlyName, PolicySid = policySid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Customer-Profiles for an account.
+    /// </summary>
+    /// <param name="status"> The verification status of the Customer-Profile resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="policySid"> The unique string of a policy. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProducts </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TrustProductsResource>> ReadAsync(TrustProductsResource.StatusEnum status = null,
+                                                                                                  string friendlyName = null,
+                                                                                                  string policySid = null,
+                                                                                                  int? pageSize = null,
+                                                                                                  long? limit = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadTrustProductsOptions() { Status = status, FriendlyName = friendlyName, PolicySid = policySid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TrustProductsResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TrustProductsResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TrustProductsResource> NextPage(Page<TrustProductsResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<TrustProductsResource>.FromJson("results", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TrustProductsResource> PreviousPage(Page<TrustProductsResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Trusthub)
+      );
+
+      var response = client.Request(request);
+      return Page<TrustProductsResource>.FromJson("results", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchTrustProductsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Customer-Profile instance.
+    /// </summary>
+    /// <param name="options"> Fetch TrustProducts parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProducts </returns>
+    public static TrustProductsResource Fetch(FetchTrustProductsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Customer-Profile instance.
+    /// </summary>
+    /// <param name="options"> Fetch TrustProducts parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProducts </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsResource> FetchAsync(FetchTrustProductsOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Customer-Profile instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProducts </returns>
+    public static TrustProductsResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchTrustProductsOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Customer-Profile instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProducts </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsResource> FetchAsync(string pathSid,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchTrustProductsOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateTrustProductsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates a Customer-Profile in an account.
+    /// </summary>
+    /// <param name="options"> Update TrustProducts parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProducts </returns>
+    public static TrustProductsResource Update(UpdateTrustProductsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a Customer-Profile in an account.
+    /// </summary>
+    /// <param name="options"> Update TrustProducts parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProducts </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsResource> UpdateAsync(UpdateTrustProductsOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates a Customer-Profile in an account.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="status"> The verification status of the Customer-Profile resource </param>
+    /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProducts </returns>
+    public static TrustProductsResource Update(string pathSid,
+                                               TrustProductsResource.StatusEnum status = null,
+                                               Uri statusCallback = null,
+                                               string friendlyName = null,
+                                               string email = null,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new UpdateTrustProductsOptions(pathSid) { Status = status, StatusCallback = statusCallback, FriendlyName = friendlyName, Email = email };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates a Customer-Profile in an account.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="status"> The verification status of the Customer-Profile resource </param>
+    /// <param name="statusCallback"> The URL we call to inform your application of status changes. </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the resource </param>
+    /// <param name="email"> The email address </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProducts </returns>
+    public static async System.Threading.Tasks.Task<TrustProductsResource> UpdateAsync(string pathSid,
+                                                                                       TrustProductsResource.StatusEnum status = null,
+                                                                                       Uri statusCallback = null,
+                                                                                       string friendlyName = null,
+                                                                                       string email = null,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new UpdateTrustProductsOptions(pathSid) { Status = status, StatusCallback = statusCallback, FriendlyName = friendlyName, Email = email };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteTrustProductsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Trusthub,
+          "/v1/TrustProducts/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Customer-Profile.
+    /// </summary>
+    /// <param name="options"> Delete TrustProducts parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProducts </returns>
+    public static bool Delete(DeleteTrustProductsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Customer-Profile.
+    /// </summary>
+    /// <param name="options"> Delete TrustProducts parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProducts </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteTrustProductsOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Customer-Profile.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of TrustProducts </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteTrustProductsOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Customer-Profile.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of TrustProducts </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteTrustProductsOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a TrustProductsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TrustProductsResource object represented by the provided JSON </returns>
+    public static TrustProductsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TrustProductsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string of a policy.
+    /// </summary>
+    [JsonProperty("policy_sid")]
+    public string PolicySid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The verification status of the Customer-Profile resource
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TrustProductsResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource will be valid until.
+    /// </summary>
+    [JsonProperty("valid_until")]
+    public DateTime? ValidUntil { get; private set; }
+    /// <summary>
+    /// The email address
+    /// </summary>
+    [JsonProperty("email")]
+    public string Email { get; private set; }
+    /// <summary>
+    /// The URL we call to inform your application of status changes.
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Customer-Profile resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of the Assigned Items of the Customer-Profile resource
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private TrustProductsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/FormOptions.cs b/src/Twilio/Rest/Verify/V2/FormOptions.cs
index b264e45a8..3c4263a01 100644
--- a/src/Twilio/Rest/Verify/V2/FormOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/FormOptions.cs
@@ -9,37 +9,37 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch the forms for a specific Form Type.
+  /// </summary>
+  public class FetchFormOptions : IOptions<FormResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch the forms for a specific Form Type.
+    /// The Type of this Form
     /// </summary>
-    public class FetchFormOptions : IOptions<FormResource>
-    {
-        /// <summary>
-        /// The Type of this Form
-        /// </summary>
-        public FormResource.FormTypesEnum PathFormType { get; }
-
-        /// <summary>
-        /// Construct a new FetchFormOptions
-        /// </summary>
-        /// <param name="pathFormType"> The Type of this Form </param>
-        public FetchFormOptions(FormResource.FormTypesEnum pathFormType)
-        {
-            PathFormType = pathFormType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public FormResource.FormTypesEnum PathFormType { get; }
+
+    /// <summary>
+    /// Construct a new FetchFormOptions
+    /// </summary>
+    /// <param name="pathFormType"> The Type of this Form </param>
+    public FetchFormOptions(FormResource.FormTypesEnum pathFormType)
+    {
+      PathFormType = pathFormType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/FormResource.cs b/src/Twilio/Rest/Verify/V2/FormResource.cs
index 30ff97dc7..d6656cd80 100644
--- a/src/Twilio/Rest/Verify/V2/FormResource.cs
+++ b/src/Twilio/Rest/Verify/V2/FormResource.cs
@@ -19,133 +19,133 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Verify.V2
-{
-
-    public class FormResource : Resource
-    {
-        public sealed class FormTypesEnum : StringEnum
-        {
-            private FormTypesEnum(string value) : base(value) {}
-            public FormTypesEnum() {}
-            public static implicit operator FormTypesEnum(string value)
-            {
-                return new FormTypesEnum(value);
-            }
-
-            public static readonly FormTypesEnum FormPush = new FormTypesEnum("form-push");
-        }
-
-        private static Request BuildFetchRequest(FetchFormOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Forms/" + options.PathFormType + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the forms for a specific Form Type.
-        /// </summary>
-        /// <param name="options"> Fetch Form parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Form </returns>
-        public static FormResource Fetch(FetchFormOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the forms for a specific Form Type.
-        /// </summary>
-        /// <param name="options"> Fetch Form parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Form </returns>
-        public static async System.Threading.Tasks.Task<FormResource> FetchAsync(FetchFormOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the forms for a specific Form Type.
-        /// </summary>
-        /// <param name="pathFormType"> The Type of this Form </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Form </returns>
-        public static FormResource Fetch(FormResource.FormTypesEnum pathFormType, ITwilioRestClient client = null)
-        {
-            var options = new FetchFormOptions(pathFormType);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the forms for a specific Form Type.
-        /// </summary>
-        /// <param name="pathFormType"> The Type of this Form </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Form </returns>
-        public static async System.Threading.Tasks.Task<FormResource> FetchAsync(FormResource.FormTypesEnum pathFormType,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchFormOptions(pathFormType);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FormResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FormResource object represented by the provided JSON </returns>
-        public static FormResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FormResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The Type of this Form
-        /// </summary>
-        [JsonProperty("form_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FormResource.FormTypesEnum FormType { get; private set; }
-        /// <summary>
-        /// Object that contains the available forms for this type.
-        /// </summary>
-        [JsonProperty("forms")]
-        public object Forms { get; private set; }
-        /// <summary>
-        /// Additional information for the available forms for this type.
-        /// </summary>
-        [JsonProperty("form_meta")]
-        public object FormMeta { get; private set; }
-        /// <summary>
-        /// The URL to access the forms for this type.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private FormResource()
-        {
-
-        }
-    }
+{
+
+  public class FormResource : Resource
+  {
+    public sealed class FormTypesEnum : StringEnum
+    {
+      private FormTypesEnum(string value) : base(value) { }
+      public FormTypesEnum() { }
+      public static implicit operator FormTypesEnum(string value)
+      {
+        return new FormTypesEnum(value);
+      }
+
+      public static readonly FormTypesEnum FormPush = new FormTypesEnum("form-push");
+    }
+
+    private static Request BuildFetchRequest(FetchFormOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Forms/" + options.PathFormType + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the forms for a specific Form Type.
+    /// </summary>
+    /// <param name="options"> Fetch Form parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Form </returns>
+    public static FormResource Fetch(FetchFormOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the forms for a specific Form Type.
+    /// </summary>
+    /// <param name="options"> Fetch Form parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Form </returns>
+    public static async System.Threading.Tasks.Task<FormResource> FetchAsync(FetchFormOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the forms for a specific Form Type.
+    /// </summary>
+    /// <param name="pathFormType"> The Type of this Form </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Form </returns>
+    public static FormResource Fetch(FormResource.FormTypesEnum pathFormType, ITwilioRestClient client = null)
+    {
+      var options = new FetchFormOptions(pathFormType);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the forms for a specific Form Type.
+    /// </summary>
+    /// <param name="pathFormType"> The Type of this Form </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Form </returns>
+    public static async System.Threading.Tasks.Task<FormResource> FetchAsync(FormResource.FormTypesEnum pathFormType,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchFormOptions(pathFormType);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FormResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FormResource object represented by the provided JSON </returns>
+    public static FormResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FormResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The Type of this Form
+    /// </summary>
+    [JsonProperty("form_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FormResource.FormTypesEnum FormType { get; private set; }
+    /// <summary>
+    /// Object that contains the available forms for this type.
+    /// </summary>
+    [JsonProperty("forms")]
+    public object Forms { get; private set; }
+    /// <summary>
+    /// Additional information for the available forms for this type.
+    /// </summary>
+    [JsonProperty("form_meta")]
+    public object FormMeta { get; private set; }
+    /// <summary>
+    /// The URL to access the forms for this type.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private FormResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/AccessTokenOptions.cs b/src/Twilio/Rest/Verify/V2/Service/AccessTokenOptions.cs
index 84605022f..72af690d3 100644
--- a/src/Twilio/Rest/Verify/V2/Service/AccessTokenOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/AccessTokenOptions.cs
@@ -9,70 +9,70 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new enrollment Access Token for the Entity
+  /// </summary>
+  public class CreateAccessTokenOptions : IOptions<AccessTokenResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new enrollment Access Token for the Entity
+    /// Service Sid.
     /// </summary>
-    public class CreateAccessTokenOptions : IOptions<AccessTokenResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string Identity { get; }
-        /// <summary>
-        /// The Type of this Factor
-        /// </summary>
-        public AccessTokenResource.FactorTypesEnum FactorType { get; }
-        /// <summary>
-        /// The factor friendly name
-        /// </summary>
-        public string FactorFriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateAccessTokenOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="identity"> Unique external identifier of the Entity </param>
-        /// <param name="factorType"> The Type of this Factor </param>
-        public CreateAccessTokenOptions(string pathServiceSid,
-                                        string identity,
-                                        AccessTokenResource.FactorTypesEnum factorType)
-        {
-            PathServiceSid = pathServiceSid;
-            Identity = identity;
-            FactorType = factorType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (FactorType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FactorType", FactorType.ToString()));
-            }
-
-            if (FactorFriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FactorFriendlyName", FactorFriendlyName));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    public string Identity { get; }
+    /// <summary>
+    /// The Type of this Factor
+    /// </summary>
+    public AccessTokenResource.FactorTypesEnum FactorType { get; }
+    /// <summary>
+    /// The factor friendly name
+    /// </summary>
+    public string FactorFriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateAccessTokenOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="identity"> Unique external identifier of the Entity </param>
+    /// <param name="factorType"> The Type of this Factor </param>
+    public CreateAccessTokenOptions(string pathServiceSid,
+                                    string identity,
+                                    AccessTokenResource.FactorTypesEnum factorType)
+    {
+      PathServiceSid = pathServiceSid;
+      Identity = identity;
+      FactorType = factorType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (FactorType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FactorType", FactorType.ToString()));
+      }
+
+      if (FactorFriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FactorFriendlyName", FactorFriendlyName));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/AccessTokenResource.cs b/src/Twilio/Rest/Verify/V2/Service/AccessTokenResource.cs
index 22543f666..8408c21d9 100644
--- a/src/Twilio/Rest/Verify/V2/Service/AccessTokenResource.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/AccessTokenResource.cs
@@ -19,130 +19,130 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
-    public class AccessTokenResource : Resource
-    {
-        public sealed class FactorTypesEnum : StringEnum
-        {
-            private FactorTypesEnum(string value) : base(value) {}
-            public FactorTypesEnum() {}
-            public static implicit operator FactorTypesEnum(string value)
-            {
-                return new FactorTypesEnum(value);
-            }
-
-            public static readonly FactorTypesEnum Push = new FactorTypesEnum("push");
-        }
-
-        private static Request BuildCreateRequest(CreateAccessTokenOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/AccessTokens",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new enrollment Access Token for the Entity
-        /// </summary>
-        /// <param name="options"> Create AccessToken parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AccessToken </returns>
-        public static AccessTokenResource Create(CreateAccessTokenOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new enrollment Access Token for the Entity
-        /// </summary>
-        /// <param name="options"> Create AccessToken parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AccessToken </returns>
-        public static async System.Threading.Tasks.Task<AccessTokenResource> CreateAsync(CreateAccessTokenOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new enrollment Access Token for the Entity
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="identity"> Unique external identifier of the Entity </param>
-        /// <param name="factorType"> The Type of this Factor </param>
-        /// <param name="factorFriendlyName"> The factor friendly name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of AccessToken </returns>
-        public static AccessTokenResource Create(string pathServiceSid,
-                                                 string identity,
-                                                 AccessTokenResource.FactorTypesEnum factorType,
-                                                 string factorFriendlyName = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateAccessTokenOptions(pathServiceSid, identity, factorType){FactorFriendlyName = factorFriendlyName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new enrollment Access Token for the Entity
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="identity"> Unique external identifier of the Entity </param>
-        /// <param name="factorType"> The Type of this Factor </param>
-        /// <param name="factorFriendlyName"> The factor friendly name </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of AccessToken </returns>
-        public static async System.Threading.Tasks.Task<AccessTokenResource> CreateAsync(string pathServiceSid,
-                                                                                         string identity,
-                                                                                         AccessTokenResource.FactorTypesEnum factorType,
-                                                                                         string factorFriendlyName = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateAccessTokenOptions(pathServiceSid, identity, factorType){FactorFriendlyName = factorFriendlyName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a AccessTokenResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> AccessTokenResource object represented by the provided JSON </returns>
-        public static AccessTokenResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<AccessTokenResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// Generated access token.
-        /// </summary>
-        [JsonProperty("token")]
-        public string Token { get; private set; }
-
-        private AccessTokenResource()
-        {
-
-        }
-    }
+{
+
+  public class AccessTokenResource : Resource
+  {
+    public sealed class FactorTypesEnum : StringEnum
+    {
+      private FactorTypesEnum(string value) : base(value) { }
+      public FactorTypesEnum() { }
+      public static implicit operator FactorTypesEnum(string value)
+      {
+        return new FactorTypesEnum(value);
+      }
+
+      public static readonly FactorTypesEnum Push = new FactorTypesEnum("push");
+    }
+
+    private static Request BuildCreateRequest(CreateAccessTokenOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/AccessTokens",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new enrollment Access Token for the Entity
+    /// </summary>
+    /// <param name="options"> Create AccessToken parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AccessToken </returns>
+    public static AccessTokenResource Create(CreateAccessTokenOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new enrollment Access Token for the Entity
+    /// </summary>
+    /// <param name="options"> Create AccessToken parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AccessToken </returns>
+    public static async System.Threading.Tasks.Task<AccessTokenResource> CreateAsync(CreateAccessTokenOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new enrollment Access Token for the Entity
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="identity"> Unique external identifier of the Entity </param>
+    /// <param name="factorType"> The Type of this Factor </param>
+    /// <param name="factorFriendlyName"> The factor friendly name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of AccessToken </returns>
+    public static AccessTokenResource Create(string pathServiceSid,
+                                             string identity,
+                                             AccessTokenResource.FactorTypesEnum factorType,
+                                             string factorFriendlyName = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateAccessTokenOptions(pathServiceSid, identity, factorType) { FactorFriendlyName = factorFriendlyName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new enrollment Access Token for the Entity
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="identity"> Unique external identifier of the Entity </param>
+    /// <param name="factorType"> The Type of this Factor </param>
+    /// <param name="factorFriendlyName"> The factor friendly name </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of AccessToken </returns>
+    public static async System.Threading.Tasks.Task<AccessTokenResource> CreateAsync(string pathServiceSid,
+                                                                                     string identity,
+                                                                                     AccessTokenResource.FactorTypesEnum factorType,
+                                                                                     string factorFriendlyName = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateAccessTokenOptions(pathServiceSid, identity, factorType) { FactorFriendlyName = factorFriendlyName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a AccessTokenResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> AccessTokenResource object represented by the provided JSON </returns>
+    public static AccessTokenResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<AccessTokenResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// Generated access token.
+    /// </summary>
+    [JsonProperty("token")]
+    public string Token { get; private set; }
+
+    private AccessTokenResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/Entity/Challenge/NotificationOptions.cs b/src/Twilio/Rest/Verify/V2/Service/Entity/Challenge/NotificationOptions.cs
index cc0ada55e..9e3912704 100644
--- a/src/Twilio/Rest/Verify/V2/Service/Entity/Challenge/NotificationOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/Entity/Challenge/NotificationOptions.cs
@@ -9,58 +9,58 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2.Service.Entity.Challenge
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Notification for the corresponding Challenge
+  /// </summary>
+  public class CreateNotificationOptions : IOptions<NotificationResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Notification for the corresponding Challenge
+    /// Service Sid.
     /// </summary>
-    public class CreateNotificationOptions : IOptions<NotificationResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// Challenge Sid.
-        /// </summary>
-        public string PathChallengeSid { get; }
-        /// <summary>
-        /// How long, in seconds, the notification is valid.
-        /// </summary>
-        public int? Ttl { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateNotificationOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathChallengeSid"> Challenge Sid. </param>
-        public CreateNotificationOptions(string pathServiceSid, string pathIdentity, string pathChallengeSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathIdentity = pathIdentity;
-            PathChallengeSid = pathChallengeSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Ttl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    public string PathIdentity { get; }
+    /// <summary>
+    /// Challenge Sid.
+    /// </summary>
+    public string PathChallengeSid { get; }
+    /// <summary>
+    /// How long, in seconds, the notification is valid.
+    /// </summary>
+    public int? Ttl { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateNotificationOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathChallengeSid"> Challenge Sid. </param>
+    public CreateNotificationOptions(string pathServiceSid, string pathIdentity, string pathChallengeSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathIdentity = pathIdentity;
+      PathChallengeSid = pathChallengeSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Ttl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Ttl", Ttl.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/Entity/Challenge/NotificationResource.cs b/src/Twilio/Rest/Verify/V2/Service/Entity/Challenge/NotificationResource.cs
index c13488ec0..4062f2a64 100644
--- a/src/Twilio/Rest/Verify/V2/Service/Entity/Challenge/NotificationResource.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/Entity/Challenge/NotificationResource.cs
@@ -18,158 +18,158 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Verify.V2.Service.Entity.Challenge
-{
-
-    public class NotificationResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateNotificationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Challenges/" + options.PathChallengeSid + "/Notifications",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Notification for the corresponding Challenge
-        /// </summary>
-        /// <param name="options"> Create Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static NotificationResource Create(CreateNotificationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Notification for the corresponding Challenge
-        /// </summary>
-        /// <param name="options"> Create Notification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<NotificationResource> CreateAsync(CreateNotificationOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Notification for the corresponding Challenge
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathChallengeSid"> Challenge Sid. </param>
-        /// <param name="ttl"> How long, in seconds, the notification is valid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Notification </returns>
-        public static NotificationResource Create(string pathServiceSid,
-                                                  string pathIdentity,
-                                                  string pathChallengeSid,
-                                                  int? ttl = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateNotificationOptions(pathServiceSid, pathIdentity, pathChallengeSid){Ttl = ttl};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Notification for the corresponding Challenge
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathChallengeSid"> Challenge Sid. </param>
-        /// <param name="ttl"> How long, in seconds, the notification is valid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Notification </returns>
-        public static async System.Threading.Tasks.Task<NotificationResource> CreateAsync(string pathServiceSid,
-                                                                                          string pathIdentity,
-                                                                                          string pathChallengeSid,
-                                                                                          int? ttl = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateNotificationOptions(pathServiceSid, pathIdentity, pathChallengeSid){Ttl = ttl};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a NotificationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NotificationResource object represented by the provided JSON </returns>
-        public static NotificationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NotificationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Notification.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Account Sid.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// Entity Sid.
-        /// </summary>
-        [JsonProperty("entity_sid")]
-        public string EntitySid { get; private set; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// Challenge Sid.
-        /// </summary>
-        [JsonProperty("challenge_sid")]
-        public string ChallengeSid { get; private set; }
-        /// <summary>
-        /// The priority of the notification.
-        /// </summary>
-        [JsonProperty("priority")]
-        public string Priority { get; private set; }
-        /// <summary>
-        /// How long, in seconds, the notification is valid.
-        /// </summary>
-        [JsonProperty("ttl")]
-        public int? Ttl { get; private set; }
-        /// <summary>
-        /// The date this Notification was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-
-        private NotificationResource()
-        {
-
-        }
-    }
+{
+
+  public class NotificationResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateNotificationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Challenges/" + options.PathChallengeSid + "/Notifications",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Notification for the corresponding Challenge
+    /// </summary>
+    /// <param name="options"> Create Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static NotificationResource Create(CreateNotificationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Notification for the corresponding Challenge
+    /// </summary>
+    /// <param name="options"> Create Notification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<NotificationResource> CreateAsync(CreateNotificationOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Notification for the corresponding Challenge
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathChallengeSid"> Challenge Sid. </param>
+    /// <param name="ttl"> How long, in seconds, the notification is valid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Notification </returns>
+    public static NotificationResource Create(string pathServiceSid,
+                                              string pathIdentity,
+                                              string pathChallengeSid,
+                                              int? ttl = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateNotificationOptions(pathServiceSid, pathIdentity, pathChallengeSid) { Ttl = ttl };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Notification for the corresponding Challenge
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathChallengeSid"> Challenge Sid. </param>
+    /// <param name="ttl"> How long, in seconds, the notification is valid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Notification </returns>
+    public static async System.Threading.Tasks.Task<NotificationResource> CreateAsync(string pathServiceSid,
+                                                                                      string pathIdentity,
+                                                                                      string pathChallengeSid,
+                                                                                      int? ttl = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateNotificationOptions(pathServiceSid, pathIdentity, pathChallengeSid) { Ttl = ttl };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a NotificationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NotificationResource object represented by the provided JSON </returns>
+    public static NotificationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NotificationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Notification.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Account Sid.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// Entity Sid.
+    /// </summary>
+    [JsonProperty("entity_sid")]
+    public string EntitySid { get; private set; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// Challenge Sid.
+    /// </summary>
+    [JsonProperty("challenge_sid")]
+    public string ChallengeSid { get; private set; }
+    /// <summary>
+    /// The priority of the notification.
+    /// </summary>
+    [JsonProperty("priority")]
+    public string Priority { get; private set; }
+    /// <summary>
+    /// How long, in seconds, the notification is valid.
+    /// </summary>
+    [JsonProperty("ttl")]
+    public int? Ttl { get; private set; }
+    /// <summary>
+    /// The date this Notification was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+
+    private NotificationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/Entity/ChallengeOptions.cs b/src/Twilio/Rest/Verify/V2/Service/Entity/ChallengeOptions.cs
index ae0982531..376aa37ff 100644
--- a/src/Twilio/Rest/Verify/V2/Service/Entity/ChallengeOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/Entity/ChallengeOptions.cs
@@ -10,264 +10,264 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2.Service.Entity
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Challenge for the Factor
+  /// </summary>
+  public class CreateChallengeOptions : IOptions<ChallengeResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Challenge for the Factor
+    /// Service Sid.
     /// </summary>
-    public class CreateChallengeOptions : IOptions<ChallengeResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// Factor Sid.
-        /// </summary>
-        public string FactorSid { get; }
-        /// <summary>
-        /// The date-time when this Challenge expires
-        /// </summary>
-        public DateTime? ExpirationDate { get; set; }
-        /// <summary>
-        /// Shown to the user when the push notification arrives
-        /// </summary>
-        public string DetailsMessage { get; set; }
-        /// <summary>
-        /// A list of objects that describe the Fields included in the Challenge
-        /// </summary>
-        public List<object> DetailsFields { get; set; }
-        /// <summary>
-        /// Hidden details provided to contextualize the Challenge
-        /// </summary>
-        public object HiddenDetails { get; set; }
-        /// <summary>
-        /// Optional payload to verify the Challenge
-        /// </summary>
-        public string AuthPayload { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateChallengeOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="factorSid"> Factor Sid. </param>
-        public CreateChallengeOptions(string pathServiceSid, string pathIdentity, string factorSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathIdentity = pathIdentity;
-            FactorSid = factorSid;
-            DetailsFields = new List<object>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FactorSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FactorSid", FactorSid.ToString()));
-            }
-
-            if (ExpirationDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ExpirationDate", Serializers.DateTimeIso8601(ExpirationDate)));
-            }
-
-            if (DetailsMessage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Details.Message", DetailsMessage));
-            }
-
-            if (DetailsFields != null)
-            {
-                p.AddRange(DetailsFields.Select(prop => new KeyValuePair<string, string>("Details.Fields", Serializers.JsonObject(prop))));
-            }
-
-            if (HiddenDetails != null)
-            {
-                p.Add(new KeyValuePair<string, string>("HiddenDetails", Serializers.JsonObject(HiddenDetails)));
-            }
-
-            if (AuthPayload != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AuthPayload", AuthPayload));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific Challenge.
+    /// Unique external identifier of the Entity
     /// </summary>
-    public class FetchChallengeOptions : IOptions<ChallengeResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// A string that uniquely identifies this Challenge.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchChallengeOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Challenge. </param>
-        public FetchChallengeOptions(string pathServiceSid, string pathIdentity, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathIdentity = pathIdentity;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathIdentity { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Challenges for a Factor.
+    /// Factor Sid.
     /// </summary>
-    public class ReadChallengeOptions : ReadOptions<ChallengeResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// Factor Sid.
-        /// </summary>
-        public string FactorSid { get; set; }
-        /// <summary>
-        /// The Status of theChallenges to fetch
-        /// </summary>
-        public ChallengeResource.ChallengeStatusesEnum Status { get; set; }
-        /// <summary>
-        /// The sort order of the Challenges list
-        /// </summary>
-        public ChallengeResource.ListOrdersEnum Order { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadChallengeOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        public ReadChallengeOptions(string pathServiceSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FactorSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FactorSid", FactorSid.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Order != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string FactorSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Verify a specific Challenge.
+    /// The date-time when this Challenge expires
     /// </summary>
-    public class UpdateChallengeOptions : IOptions<ChallengeResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// A string that uniquely identifies this Challenge.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// Optional payload to verify the Challenge
-        /// </summary>
-        public string AuthPayload { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateChallengeOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Challenge. </param>
-        public UpdateChallengeOptions(string pathServiceSid, string pathIdentity, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathIdentity = pathIdentity;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AuthPayload != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AuthPayload", AuthPayload));
-            }
-
-            return p;
-        }
-    }
+    public DateTime? ExpirationDate { get; set; }
+    /// <summary>
+    /// Shown to the user when the push notification arrives
+    /// </summary>
+    public string DetailsMessage { get; set; }
+    /// <summary>
+    /// A list of objects that describe the Fields included in the Challenge
+    /// </summary>
+    public List<object> DetailsFields { get; set; }
+    /// <summary>
+    /// Hidden details provided to contextualize the Challenge
+    /// </summary>
+    public object HiddenDetails { get; set; }
+    /// <summary>
+    /// Optional payload to verify the Challenge
+    /// </summary>
+    public string AuthPayload { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateChallengeOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="factorSid"> Factor Sid. </param>
+    public CreateChallengeOptions(string pathServiceSid, string pathIdentity, string factorSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathIdentity = pathIdentity;
+      FactorSid = factorSid;
+      DetailsFields = new List<object>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FactorSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FactorSid", FactorSid.ToString()));
+      }
+
+      if (ExpirationDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ExpirationDate", Serializers.DateTimeIso8601(ExpirationDate)));
+      }
+
+      if (DetailsMessage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Details.Message", DetailsMessage));
+      }
+
+      if (DetailsFields != null)
+      {
+        p.AddRange(DetailsFields.Select(prop => new KeyValuePair<string, string>("Details.Fields", Serializers.JsonObject(prop))));
+      }
+
+      if (HiddenDetails != null)
+      {
+        p.Add(new KeyValuePair<string, string>("HiddenDetails", Serializers.JsonObject(HiddenDetails)));
+      }
+
+      if (AuthPayload != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AuthPayload", AuthPayload));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific Challenge.
+  /// </summary>
+  public class FetchChallengeOptions : IOptions<ChallengeResource>
+  {
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    public string PathIdentity { get; }
+    /// <summary>
+    /// A string that uniquely identifies this Challenge.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchChallengeOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Challenge. </param>
+    public FetchChallengeOptions(string pathServiceSid, string pathIdentity, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathIdentity = pathIdentity;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Challenges for a Factor.
+  /// </summary>
+  public class ReadChallengeOptions : ReadOptions<ChallengeResource>
+  {
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    public string PathIdentity { get; }
+    /// <summary>
+    /// Factor Sid.
+    /// </summary>
+    public string FactorSid { get; set; }
+    /// <summary>
+    /// The Status of theChallenges to fetch
+    /// </summary>
+    public ChallengeResource.ChallengeStatusesEnum Status { get; set; }
+    /// <summary>
+    /// The sort order of the Challenges list
+    /// </summary>
+    public ChallengeResource.ListOrdersEnum Order { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadChallengeOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    public ReadChallengeOptions(string pathServiceSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FactorSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FactorSid", FactorSid.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Order != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Order", Order.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Verify a specific Challenge.
+  /// </summary>
+  public class UpdateChallengeOptions : IOptions<ChallengeResource>
+  {
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    public string PathIdentity { get; }
+    /// <summary>
+    /// A string that uniquely identifies this Challenge.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// Optional payload to verify the Challenge
+    /// </summary>
+    public string AuthPayload { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateChallengeOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Challenge. </param>
+    public UpdateChallengeOptions(string pathServiceSid, string pathIdentity, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathIdentity = pathIdentity;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AuthPayload != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AuthPayload", AuthPayload));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/Entity/ChallengeResource.cs b/src/Twilio/Rest/Verify/V2/Service/Entity/ChallengeResource.cs
index 564b8daf4..df9671e37 100644
--- a/src/Twilio/Rest/Verify/V2/Service/Entity/ChallengeResource.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/Entity/ChallengeResource.cs
@@ -19,577 +19,577 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Verify.V2.Service.Entity
-{
-
-    public class ChallengeResource : Resource
-    {
-        public sealed class ChallengeStatusesEnum : StringEnum
-        {
-            private ChallengeStatusesEnum(string value) : base(value) {}
-            public ChallengeStatusesEnum() {}
-            public static implicit operator ChallengeStatusesEnum(string value)
-            {
-                return new ChallengeStatusesEnum(value);
-            }
-
-            public static readonly ChallengeStatusesEnum Pending = new ChallengeStatusesEnum("pending");
-            public static readonly ChallengeStatusesEnum Expired = new ChallengeStatusesEnum("expired");
-            public static readonly ChallengeStatusesEnum Approved = new ChallengeStatusesEnum("approved");
-            public static readonly ChallengeStatusesEnum Denied = new ChallengeStatusesEnum("denied");
-        }
-
-        public sealed class ChallengeReasonsEnum : StringEnum
-        {
-            private ChallengeReasonsEnum(string value) : base(value) {}
-            public ChallengeReasonsEnum() {}
-            public static implicit operator ChallengeReasonsEnum(string value)
-            {
-                return new ChallengeReasonsEnum(value);
-            }
-
-            public static readonly ChallengeReasonsEnum None = new ChallengeReasonsEnum("none");
-            public static readonly ChallengeReasonsEnum NotNeeded = new ChallengeReasonsEnum("not_needed");
-            public static readonly ChallengeReasonsEnum NotRequested = new ChallengeReasonsEnum("not_requested");
-        }
-
-        public sealed class FactorTypesEnum : StringEnum
-        {
-            private FactorTypesEnum(string value) : base(value) {}
-            public FactorTypesEnum() {}
-            public static implicit operator FactorTypesEnum(string value)
-            {
-                return new FactorTypesEnum(value);
-            }
-
-            public static readonly FactorTypesEnum Push = new FactorTypesEnum("push");
-            public static readonly FactorTypesEnum Totp = new FactorTypesEnum("totp");
-        }
-
-        public sealed class ListOrdersEnum : StringEnum
-        {
-            private ListOrdersEnum(string value) : base(value) {}
-            public ListOrdersEnum() {}
-            public static implicit operator ListOrdersEnum(string value)
-            {
-                return new ListOrdersEnum(value);
-            }
-
-            public static readonly ListOrdersEnum Asc = new ListOrdersEnum("asc");
-            public static readonly ListOrdersEnum Desc = new ListOrdersEnum("desc");
-        }
-
-        private static Request BuildCreateRequest(CreateChallengeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Challenges",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Challenge for the Factor
-        /// </summary>
-        /// <param name="options"> Create Challenge parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Challenge </returns>
-        public static ChallengeResource Create(CreateChallengeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Challenge for the Factor
-        /// </summary>
-        /// <param name="options"> Create Challenge parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Challenge </returns>
-        public static async System.Threading.Tasks.Task<ChallengeResource> CreateAsync(CreateChallengeOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Challenge for the Factor
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="factorSid"> Factor Sid. </param>
-        /// <param name="expirationDate"> The date-time when this Challenge expires </param>
-        /// <param name="detailsMessage"> Shown to the user when the push notification arrives </param>
-        /// <param name="detailsFields"> A list of objects that describe the Fields included in the Challenge </param>
-        /// <param name="hiddenDetails"> Hidden details provided to contextualize the Challenge </param>
-        /// <param name="authPayload"> Optional payload to verify the Challenge </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Challenge </returns>
-        public static ChallengeResource Create(string pathServiceSid,
-                                               string pathIdentity,
-                                               string factorSid,
-                                               DateTime? expirationDate = null,
-                                               string detailsMessage = null,
-                                               List<object> detailsFields = null,
-                                               object hiddenDetails = null,
-                                               string authPayload = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateChallengeOptions(pathServiceSid, pathIdentity, factorSid){ExpirationDate = expirationDate, DetailsMessage = detailsMessage, DetailsFields = detailsFields, HiddenDetails = hiddenDetails, AuthPayload = authPayload};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Challenge for the Factor
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="factorSid"> Factor Sid. </param>
-        /// <param name="expirationDate"> The date-time when this Challenge expires </param>
-        /// <param name="detailsMessage"> Shown to the user when the push notification arrives </param>
-        /// <param name="detailsFields"> A list of objects that describe the Fields included in the Challenge </param>
-        /// <param name="hiddenDetails"> Hidden details provided to contextualize the Challenge </param>
-        /// <param name="authPayload"> Optional payload to verify the Challenge </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Challenge </returns>
-        public static async System.Threading.Tasks.Task<ChallengeResource> CreateAsync(string pathServiceSid,
-                                                                                       string pathIdentity,
-                                                                                       string factorSid,
-                                                                                       DateTime? expirationDate = null,
-                                                                                       string detailsMessage = null,
-                                                                                       List<object> detailsFields = null,
-                                                                                       object hiddenDetails = null,
-                                                                                       string authPayload = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateChallengeOptions(pathServiceSid, pathIdentity, factorSid){ExpirationDate = expirationDate, DetailsMessage = detailsMessage, DetailsFields = detailsFields, HiddenDetails = hiddenDetails, AuthPayload = authPayload};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchChallengeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Challenges/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Challenge.
-        /// </summary>
-        /// <param name="options"> Fetch Challenge parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Challenge </returns>
-        public static ChallengeResource Fetch(FetchChallengeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Challenge.
-        /// </summary>
-        /// <param name="options"> Fetch Challenge parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Challenge </returns>
-        public static async System.Threading.Tasks.Task<ChallengeResource> FetchAsync(FetchChallengeOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Challenge.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Challenge. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Challenge </returns>
-        public static ChallengeResource Fetch(string pathServiceSid,
-                                              string pathIdentity,
-                                              string pathSid,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new FetchChallengeOptions(pathServiceSid, pathIdentity, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Challenge.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Challenge. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Challenge </returns>
-        public static async System.Threading.Tasks.Task<ChallengeResource> FetchAsync(string pathServiceSid,
-                                                                                      string pathIdentity,
-                                                                                      string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchChallengeOptions(pathServiceSid, pathIdentity, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadChallengeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Challenges",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Challenges for a Factor.
-        /// </summary>
-        /// <param name="options"> Read Challenge parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Challenge </returns>
-        public static ResourceSet<ChallengeResource> Read(ReadChallengeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ChallengeResource>.FromJson("challenges", response.Content);
-            return new ResourceSet<ChallengeResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Challenges for a Factor.
-        /// </summary>
-        /// <param name="options"> Read Challenge parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Challenge </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ChallengeResource>> ReadAsync(ReadChallengeOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ChallengeResource>.FromJson("challenges", response.Content);
-            return new ResourceSet<ChallengeResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Challenges for a Factor.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="factorSid"> Factor Sid. </param>
-        /// <param name="status"> The Status of theChallenges to fetch </param>
-        /// <param name="order"> The sort order of the Challenges list </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Challenge </returns>
-        public static ResourceSet<ChallengeResource> Read(string pathServiceSid,
-                                                          string pathIdentity,
-                                                          string factorSid = null,
-                                                          ChallengeResource.ChallengeStatusesEnum status = null,
-                                                          ChallengeResource.ListOrdersEnum order = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadChallengeOptions(pathServiceSid, pathIdentity){FactorSid = factorSid, Status = status, Order = order, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Challenges for a Factor.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="factorSid"> Factor Sid. </param>
-        /// <param name="status"> The Status of theChallenges to fetch </param>
-        /// <param name="order"> The sort order of the Challenges list </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Challenge </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ChallengeResource>> ReadAsync(string pathServiceSid,
-                                                                                                  string pathIdentity,
-                                                                                                  string factorSid = null,
-                                                                                                  ChallengeResource.ChallengeStatusesEnum status = null,
-                                                                                                  ChallengeResource.ListOrdersEnum order = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadChallengeOptions(pathServiceSid, pathIdentity){FactorSid = factorSid, Status = status, Order = order, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ChallengeResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ChallengeResource>.FromJson("challenges", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ChallengeResource> NextPage(Page<ChallengeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<ChallengeResource>.FromJson("challenges", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ChallengeResource> PreviousPage(Page<ChallengeResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<ChallengeResource>.FromJson("challenges", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateChallengeOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Challenges/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Verify a specific Challenge.
-        /// </summary>
-        /// <param name="options"> Update Challenge parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Challenge </returns>
-        public static ChallengeResource Update(UpdateChallengeOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Verify a specific Challenge.
-        /// </summary>
-        /// <param name="options"> Update Challenge parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Challenge </returns>
-        public static async System.Threading.Tasks.Task<ChallengeResource> UpdateAsync(UpdateChallengeOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Verify a specific Challenge.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Challenge. </param>
-        /// <param name="authPayload"> Optional payload to verify the Challenge </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Challenge </returns>
-        public static ChallengeResource Update(string pathServiceSid,
-                                               string pathIdentity,
-                                               string pathSid,
-                                               string authPayload = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateChallengeOptions(pathServiceSid, pathIdentity, pathSid){AuthPayload = authPayload};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Verify a specific Challenge.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Challenge. </param>
-        /// <param name="authPayload"> Optional payload to verify the Challenge </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Challenge </returns>
-        public static async System.Threading.Tasks.Task<ChallengeResource> UpdateAsync(string pathServiceSid,
-                                                                                       string pathIdentity,
-                                                                                       string pathSid,
-                                                                                       string authPayload = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateChallengeOptions(pathServiceSid, pathIdentity, pathSid){AuthPayload = authPayload};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ChallengeResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ChallengeResource object represented by the provided JSON </returns>
-        public static ChallengeResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ChallengeResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Challenge.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Account Sid.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// Entity Sid.
-        /// </summary>
-        [JsonProperty("entity_sid")]
-        public string EntitySid { get; private set; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// Factor Sid.
-        /// </summary>
-        [JsonProperty("factor_sid")]
-        public string FactorSid { get; private set; }
-        /// <summary>
-        /// The date this Challenge was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this Challenge was updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The date this Challenge was responded
-        /// </summary>
-        [JsonProperty("date_responded")]
-        public DateTime? DateResponded { get; private set; }
-        /// <summary>
-        /// The date-time when this Challenge expires
-        /// </summary>
-        [JsonProperty("expiration_date")]
-        public DateTime? ExpirationDate { get; private set; }
-        /// <summary>
-        /// The Status of this Challenge
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ChallengeResource.ChallengeStatusesEnum Status { get; private set; }
-        /// <summary>
-        /// The Reason of this Challenge `status`
-        /// </summary>
-        [JsonProperty("responded_reason")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ChallengeResource.ChallengeReasonsEnum RespondedReason { get; private set; }
-        /// <summary>
-        /// Details about the Challenge.
-        /// </summary>
-        [JsonProperty("details")]
-        public object Details { get; private set; }
-        /// <summary>
-        /// Hidden details about the Challenge
-        /// </summary>
-        [JsonProperty("hidden_details")]
-        public object HiddenDetails { get; private set; }
-        /// <summary>
-        /// The Factor Type of this Challenge
-        /// </summary>
-        [JsonProperty("factor_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ChallengeResource.FactorTypesEnum FactorType { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Nested resource URLs.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ChallengeResource()
-        {
-
-        }
-    }
+{
+
+  public class ChallengeResource : Resource
+  {
+    public sealed class ChallengeStatusesEnum : StringEnum
+    {
+      private ChallengeStatusesEnum(string value) : base(value) { }
+      public ChallengeStatusesEnum() { }
+      public static implicit operator ChallengeStatusesEnum(string value)
+      {
+        return new ChallengeStatusesEnum(value);
+      }
+
+      public static readonly ChallengeStatusesEnum Pending = new ChallengeStatusesEnum("pending");
+      public static readonly ChallengeStatusesEnum Expired = new ChallengeStatusesEnum("expired");
+      public static readonly ChallengeStatusesEnum Approved = new ChallengeStatusesEnum("approved");
+      public static readonly ChallengeStatusesEnum Denied = new ChallengeStatusesEnum("denied");
+    }
+
+    public sealed class ChallengeReasonsEnum : StringEnum
+    {
+      private ChallengeReasonsEnum(string value) : base(value) { }
+      public ChallengeReasonsEnum() { }
+      public static implicit operator ChallengeReasonsEnum(string value)
+      {
+        return new ChallengeReasonsEnum(value);
+      }
+
+      public static readonly ChallengeReasonsEnum None = new ChallengeReasonsEnum("none");
+      public static readonly ChallengeReasonsEnum NotNeeded = new ChallengeReasonsEnum("not_needed");
+      public static readonly ChallengeReasonsEnum NotRequested = new ChallengeReasonsEnum("not_requested");
+    }
+
+    public sealed class FactorTypesEnum : StringEnum
+    {
+      private FactorTypesEnum(string value) : base(value) { }
+      public FactorTypesEnum() { }
+      public static implicit operator FactorTypesEnum(string value)
+      {
+        return new FactorTypesEnum(value);
+      }
+
+      public static readonly FactorTypesEnum Push = new FactorTypesEnum("push");
+      public static readonly FactorTypesEnum Totp = new FactorTypesEnum("totp");
+    }
+
+    public sealed class ListOrdersEnum : StringEnum
+    {
+      private ListOrdersEnum(string value) : base(value) { }
+      public ListOrdersEnum() { }
+      public static implicit operator ListOrdersEnum(string value)
+      {
+        return new ListOrdersEnum(value);
+      }
+
+      public static readonly ListOrdersEnum Asc = new ListOrdersEnum("asc");
+      public static readonly ListOrdersEnum Desc = new ListOrdersEnum("desc");
+    }
+
+    private static Request BuildCreateRequest(CreateChallengeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Challenges",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Challenge for the Factor
+    /// </summary>
+    /// <param name="options"> Create Challenge parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Challenge </returns>
+    public static ChallengeResource Create(CreateChallengeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Challenge for the Factor
+    /// </summary>
+    /// <param name="options"> Create Challenge parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Challenge </returns>
+    public static async System.Threading.Tasks.Task<ChallengeResource> CreateAsync(CreateChallengeOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Challenge for the Factor
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="factorSid"> Factor Sid. </param>
+    /// <param name="expirationDate"> The date-time when this Challenge expires </param>
+    /// <param name="detailsMessage"> Shown to the user when the push notification arrives </param>
+    /// <param name="detailsFields"> A list of objects that describe the Fields included in the Challenge </param>
+    /// <param name="hiddenDetails"> Hidden details provided to contextualize the Challenge </param>
+    /// <param name="authPayload"> Optional payload to verify the Challenge </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Challenge </returns>
+    public static ChallengeResource Create(string pathServiceSid,
+                                           string pathIdentity,
+                                           string factorSid,
+                                           DateTime? expirationDate = null,
+                                           string detailsMessage = null,
+                                           List<object> detailsFields = null,
+                                           object hiddenDetails = null,
+                                           string authPayload = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateChallengeOptions(pathServiceSid, pathIdentity, factorSid) { ExpirationDate = expirationDate, DetailsMessage = detailsMessage, DetailsFields = detailsFields, HiddenDetails = hiddenDetails, AuthPayload = authPayload };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Challenge for the Factor
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="factorSid"> Factor Sid. </param>
+    /// <param name="expirationDate"> The date-time when this Challenge expires </param>
+    /// <param name="detailsMessage"> Shown to the user when the push notification arrives </param>
+    /// <param name="detailsFields"> A list of objects that describe the Fields included in the Challenge </param>
+    /// <param name="hiddenDetails"> Hidden details provided to contextualize the Challenge </param>
+    /// <param name="authPayload"> Optional payload to verify the Challenge </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Challenge </returns>
+    public static async System.Threading.Tasks.Task<ChallengeResource> CreateAsync(string pathServiceSid,
+                                                                                   string pathIdentity,
+                                                                                   string factorSid,
+                                                                                   DateTime? expirationDate = null,
+                                                                                   string detailsMessage = null,
+                                                                                   List<object> detailsFields = null,
+                                                                                   object hiddenDetails = null,
+                                                                                   string authPayload = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateChallengeOptions(pathServiceSid, pathIdentity, factorSid) { ExpirationDate = expirationDate, DetailsMessage = detailsMessage, DetailsFields = detailsFields, HiddenDetails = hiddenDetails, AuthPayload = authPayload };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchChallengeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Challenges/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Challenge.
+    /// </summary>
+    /// <param name="options"> Fetch Challenge parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Challenge </returns>
+    public static ChallengeResource Fetch(FetchChallengeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Challenge.
+    /// </summary>
+    /// <param name="options"> Fetch Challenge parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Challenge </returns>
+    public static async System.Threading.Tasks.Task<ChallengeResource> FetchAsync(FetchChallengeOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Challenge.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Challenge. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Challenge </returns>
+    public static ChallengeResource Fetch(string pathServiceSid,
+                                          string pathIdentity,
+                                          string pathSid,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new FetchChallengeOptions(pathServiceSid, pathIdentity, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Challenge.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Challenge. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Challenge </returns>
+    public static async System.Threading.Tasks.Task<ChallengeResource> FetchAsync(string pathServiceSid,
+                                                                                  string pathIdentity,
+                                                                                  string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchChallengeOptions(pathServiceSid, pathIdentity, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadChallengeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Challenges",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Challenges for a Factor.
+    /// </summary>
+    /// <param name="options"> Read Challenge parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Challenge </returns>
+    public static ResourceSet<ChallengeResource> Read(ReadChallengeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ChallengeResource>.FromJson("challenges", response.Content);
+      return new ResourceSet<ChallengeResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Challenges for a Factor.
+    /// </summary>
+    /// <param name="options"> Read Challenge parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Challenge </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ChallengeResource>> ReadAsync(ReadChallengeOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ChallengeResource>.FromJson("challenges", response.Content);
+      return new ResourceSet<ChallengeResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Challenges for a Factor.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="factorSid"> Factor Sid. </param>
+    /// <param name="status"> The Status of theChallenges to fetch </param>
+    /// <param name="order"> The sort order of the Challenges list </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Challenge </returns>
+    public static ResourceSet<ChallengeResource> Read(string pathServiceSid,
+                                                      string pathIdentity,
+                                                      string factorSid = null,
+                                                      ChallengeResource.ChallengeStatusesEnum status = null,
+                                                      ChallengeResource.ListOrdersEnum order = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadChallengeOptions(pathServiceSid, pathIdentity) { FactorSid = factorSid, Status = status, Order = order, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Challenges for a Factor.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="factorSid"> Factor Sid. </param>
+    /// <param name="status"> The Status of theChallenges to fetch </param>
+    /// <param name="order"> The sort order of the Challenges list </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Challenge </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ChallengeResource>> ReadAsync(string pathServiceSid,
+                                                                                              string pathIdentity,
+                                                                                              string factorSid = null,
+                                                                                              ChallengeResource.ChallengeStatusesEnum status = null,
+                                                                                              ChallengeResource.ListOrdersEnum order = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadChallengeOptions(pathServiceSid, pathIdentity) { FactorSid = factorSid, Status = status, Order = order, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ChallengeResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ChallengeResource>.FromJson("challenges", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ChallengeResource> NextPage(Page<ChallengeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<ChallengeResource>.FromJson("challenges", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ChallengeResource> PreviousPage(Page<ChallengeResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<ChallengeResource>.FromJson("challenges", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateChallengeOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Challenges/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Verify a specific Challenge.
+    /// </summary>
+    /// <param name="options"> Update Challenge parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Challenge </returns>
+    public static ChallengeResource Update(UpdateChallengeOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Verify a specific Challenge.
+    /// </summary>
+    /// <param name="options"> Update Challenge parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Challenge </returns>
+    public static async System.Threading.Tasks.Task<ChallengeResource> UpdateAsync(UpdateChallengeOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Verify a specific Challenge.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Challenge. </param>
+    /// <param name="authPayload"> Optional payload to verify the Challenge </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Challenge </returns>
+    public static ChallengeResource Update(string pathServiceSid,
+                                           string pathIdentity,
+                                           string pathSid,
+                                           string authPayload = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateChallengeOptions(pathServiceSid, pathIdentity, pathSid) { AuthPayload = authPayload };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Verify a specific Challenge.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Challenge. </param>
+    /// <param name="authPayload"> Optional payload to verify the Challenge </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Challenge </returns>
+    public static async System.Threading.Tasks.Task<ChallengeResource> UpdateAsync(string pathServiceSid,
+                                                                                   string pathIdentity,
+                                                                                   string pathSid,
+                                                                                   string authPayload = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateChallengeOptions(pathServiceSid, pathIdentity, pathSid) { AuthPayload = authPayload };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ChallengeResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ChallengeResource object represented by the provided JSON </returns>
+    public static ChallengeResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ChallengeResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Challenge.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Account Sid.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// Entity Sid.
+    /// </summary>
+    [JsonProperty("entity_sid")]
+    public string EntitySid { get; private set; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// Factor Sid.
+    /// </summary>
+    [JsonProperty("factor_sid")]
+    public string FactorSid { get; private set; }
+    /// <summary>
+    /// The date this Challenge was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this Challenge was updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The date this Challenge was responded
+    /// </summary>
+    [JsonProperty("date_responded")]
+    public DateTime? DateResponded { get; private set; }
+    /// <summary>
+    /// The date-time when this Challenge expires
+    /// </summary>
+    [JsonProperty("expiration_date")]
+    public DateTime? ExpirationDate { get; private set; }
+    /// <summary>
+    /// The Status of this Challenge
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ChallengeResource.ChallengeStatusesEnum Status { get; private set; }
+    /// <summary>
+    /// The Reason of this Challenge `status`
+    /// </summary>
+    [JsonProperty("responded_reason")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ChallengeResource.ChallengeReasonsEnum RespondedReason { get; private set; }
+    /// <summary>
+    /// Details about the Challenge.
+    /// </summary>
+    [JsonProperty("details")]
+    public object Details { get; private set; }
+    /// <summary>
+    /// Hidden details about the Challenge
+    /// </summary>
+    [JsonProperty("hidden_details")]
+    public object HiddenDetails { get; private set; }
+    /// <summary>
+    /// The Factor Type of this Challenge
+    /// </summary>
+    [JsonProperty("factor_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ChallengeResource.FactorTypesEnum FactorType { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Nested resource URLs.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ChallengeResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/Entity/FactorOptions.cs b/src/Twilio/Rest/Verify/V2/Service/Entity/FactorOptions.cs
index 26cddf213..94339a420 100644
--- a/src/Twilio/Rest/Verify/V2/Service/Entity/FactorOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/Entity/FactorOptions.cs
@@ -9,258 +9,258 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2.Service.Entity
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific Factor.
+  /// </summary>
+  public class DeleteFactorOptions : IOptions<FactorResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific Factor.
+    /// Service Sid.
     /// </summary>
-    public class DeleteFactorOptions : IOptions<FactorResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// A string that uniquely identifies this Factor.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteFactorOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
-        public DeleteFactorOptions(string pathServiceSid, string pathIdentity, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathIdentity = pathIdentity;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific Factor.
+    /// Unique external identifier of the Entity
     /// </summary>
-    public class FetchFactorOptions : IOptions<FactorResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// A string that uniquely identifies this Factor.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchFactorOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
-        public FetchFactorOptions(string pathServiceSid, string pathIdentity, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathIdentity = pathIdentity;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathIdentity { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Factors for an Entity.
+    /// A string that uniquely identifies this Factor.
     /// </summary>
-    public class ReadFactorOptions : ReadOptions<FactorResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new ReadFactorOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        public ReadFactorOptions(string pathServiceSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Update a specific Factor. This endpoint can be used to Verify a Factor if passed an `AuthPayload` param.
+    /// Construct a new DeleteFactorOptions
     /// </summary>
-    public class UpdateFactorOptions : IOptions<FactorResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// A string that uniquely identifies this Factor.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// Optional payload to verify the Factor for the first time
-        /// </summary>
-        public string AuthPayload { get; set; }
-        /// <summary>
-        /// The friendly name of this Factor
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// For APN, the device token. For FCM, the registration token
-        /// </summary>
-        public string ConfigNotificationToken { get; set; }
-        /// <summary>
-        /// The Verify Push SDK version used to configure the factor
-        /// </summary>
-        public string ConfigSdkVersion { get; set; }
-        /// <summary>
-        /// How often, in seconds, are TOTP codes generated
-        /// </summary>
-        public int? ConfigTimeStep { get; set; }
-        /// <summary>
-        /// The number of past and future time-steps valid at a given time
-        /// </summary>
-        public int? ConfigSkew { get; set; }
-        /// <summary>
-        /// Number of digits for generated TOTP codes
-        /// </summary>
-        public int? ConfigCodeLength { get; set; }
-        /// <summary>
-        /// The algorithm used to derive the TOTP codes
-        /// </summary>
-        public FactorResource.TotpAlgorithmsEnum ConfigAlg { get; set; }
-        /// <summary>
-        /// The transport technology used to generate the Notification Token
-        /// </summary>
-        public string ConfigNotificationPlatform { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateFactorOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
-        public UpdateFactorOptions(string pathServiceSid, string pathIdentity, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathIdentity = pathIdentity;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (AuthPayload != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AuthPayload", AuthPayload));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (ConfigNotificationToken != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.NotificationToken", ConfigNotificationToken));
-            }
-
-            if (ConfigSdkVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.SdkVersion", ConfigSdkVersion));
-            }
-
-            if (ConfigTimeStep != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.TimeStep", ConfigTimeStep.ToString()));
-            }
-
-            if (ConfigSkew != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.Skew", ConfigSkew.ToString()));
-            }
-
-            if (ConfigCodeLength != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.CodeLength", ConfigCodeLength.ToString()));
-            }
-
-            if (ConfigAlg != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.Alg", ConfigAlg.ToString()));
-            }
-
-            if (ConfigNotificationPlatform != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.NotificationPlatform", ConfigNotificationPlatform));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
+    public DeleteFactorOptions(string pathServiceSid, string pathIdentity, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathIdentity = pathIdentity;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific Factor.
+  /// </summary>
+  public class FetchFactorOptions : IOptions<FactorResource>
+  {
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    public string PathIdentity { get; }
+    /// <summary>
+    /// A string that uniquely identifies this Factor.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchFactorOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
+    public FetchFactorOptions(string pathServiceSid, string pathIdentity, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathIdentity = pathIdentity;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Factors for an Entity.
+  /// </summary>
+  public class ReadFactorOptions : ReadOptions<FactorResource>
+  {
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    public string PathIdentity { get; }
+
+    /// <summary>
+    /// Construct a new ReadFactorOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    public ReadFactorOptions(string pathServiceSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Update a specific Factor. This endpoint can be used to Verify a Factor if passed an `AuthPayload` param.
+  /// </summary>
+  public class UpdateFactorOptions : IOptions<FactorResource>
+  {
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    public string PathIdentity { get; }
+    /// <summary>
+    /// A string that uniquely identifies this Factor.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// Optional payload to verify the Factor for the first time
+    /// </summary>
+    public string AuthPayload { get; set; }
+    /// <summary>
+    /// The friendly name of this Factor
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// For APN, the device token. For FCM, the registration token
+    /// </summary>
+    public string ConfigNotificationToken { get; set; }
+    /// <summary>
+    /// The Verify Push SDK version used to configure the factor
+    /// </summary>
+    public string ConfigSdkVersion { get; set; }
+    /// <summary>
+    /// How often, in seconds, are TOTP codes generated
+    /// </summary>
+    public int? ConfigTimeStep { get; set; }
+    /// <summary>
+    /// The number of past and future time-steps valid at a given time
+    /// </summary>
+    public int? ConfigSkew { get; set; }
+    /// <summary>
+    /// Number of digits for generated TOTP codes
+    /// </summary>
+    public int? ConfigCodeLength { get; set; }
+    /// <summary>
+    /// The algorithm used to derive the TOTP codes
+    /// </summary>
+    public FactorResource.TotpAlgorithmsEnum ConfigAlg { get; set; }
+    /// <summary>
+    /// The transport technology used to generate the Notification Token
+    /// </summary>
+    public string ConfigNotificationPlatform { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateFactorOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
+    public UpdateFactorOptions(string pathServiceSid, string pathIdentity, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathIdentity = pathIdentity;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (AuthPayload != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AuthPayload", AuthPayload));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (ConfigNotificationToken != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.NotificationToken", ConfigNotificationToken));
+      }
+
+      if (ConfigSdkVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.SdkVersion", ConfigSdkVersion));
+      }
+
+      if (ConfigTimeStep != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.TimeStep", ConfigTimeStep.ToString()));
+      }
+
+      if (ConfigSkew != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.Skew", ConfigSkew.ToString()));
+      }
+
+      if (ConfigCodeLength != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.CodeLength", ConfigCodeLength.ToString()));
+      }
+
+      if (ConfigAlg != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.Alg", ConfigAlg.ToString()));
+      }
+
+      if (ConfigNotificationPlatform != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.NotificationPlatform", ConfigNotificationPlatform));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/Entity/FactorResource.cs b/src/Twilio/Rest/Verify/V2/Service/Entity/FactorResource.cs
index 038dd6e45..096b992c2 100644
--- a/src/Twilio/Rest/Verify/V2/Service/Entity/FactorResource.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/Entity/FactorResource.cs
@@ -19,550 +19,550 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Verify.V2.Service.Entity
-{
-
-    public class FactorResource : Resource
-    {
-        public sealed class FactorStatusesEnum : StringEnum
-        {
-            private FactorStatusesEnum(string value) : base(value) {}
-            public FactorStatusesEnum() {}
-            public static implicit operator FactorStatusesEnum(string value)
-            {
-                return new FactorStatusesEnum(value);
-            }
-
-            public static readonly FactorStatusesEnum Unverified = new FactorStatusesEnum("unverified");
-            public static readonly FactorStatusesEnum Verified = new FactorStatusesEnum("verified");
-        }
-
-        public sealed class FactorTypesEnum : StringEnum
-        {
-            private FactorTypesEnum(string value) : base(value) {}
-            public FactorTypesEnum() {}
-            public static implicit operator FactorTypesEnum(string value)
-            {
-                return new FactorTypesEnum(value);
-            }
-
-            public static readonly FactorTypesEnum Push = new FactorTypesEnum("push");
-            public static readonly FactorTypesEnum Totp = new FactorTypesEnum("totp");
-        }
-
-        public sealed class NotificationPlatformsEnum : StringEnum
-        {
-            private NotificationPlatformsEnum(string value) : base(value) {}
-            public NotificationPlatformsEnum() {}
-            public static implicit operator NotificationPlatformsEnum(string value)
-            {
-                return new NotificationPlatformsEnum(value);
-            }
-
-            public static readonly NotificationPlatformsEnum Apn = new NotificationPlatformsEnum("apn");
-            public static readonly NotificationPlatformsEnum Fcm = new NotificationPlatformsEnum("fcm");
-            public static readonly NotificationPlatformsEnum None = new NotificationPlatformsEnum("none");
-        }
-
-        public sealed class TotpAlgorithmsEnum : StringEnum
-        {
-            private TotpAlgorithmsEnum(string value) : base(value) {}
-            public TotpAlgorithmsEnum() {}
-            public static implicit operator TotpAlgorithmsEnum(string value)
-            {
-                return new TotpAlgorithmsEnum(value);
-            }
-
-            public static readonly TotpAlgorithmsEnum Sha1 = new TotpAlgorithmsEnum("sha1");
-            public static readonly TotpAlgorithmsEnum Sha256 = new TotpAlgorithmsEnum("sha256");
-            public static readonly TotpAlgorithmsEnum Sha512 = new TotpAlgorithmsEnum("sha512");
-        }
-
-        private static Request BuildDeleteRequest(DeleteFactorOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Factors/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Factor.
-        /// </summary>
-        /// <param name="options"> Delete Factor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Factor </returns>
-        public static bool Delete(DeleteFactorOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Factor.
-        /// </summary>
-        /// <param name="options"> Delete Factor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Factor </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFactorOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Factor.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Factor </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathIdentity,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteFactorOptions(pathServiceSid, pathIdentity, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Factor.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Factor </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathIdentity,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteFactorOptions(pathServiceSid, pathIdentity, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchFactorOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Factors/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Factor.
-        /// </summary>
-        /// <param name="options"> Fetch Factor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Factor </returns>
-        public static FactorResource Fetch(FetchFactorOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Factor.
-        /// </summary>
-        /// <param name="options"> Fetch Factor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Factor </returns>
-        public static async System.Threading.Tasks.Task<FactorResource> FetchAsync(FetchFactorOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Factor.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Factor </returns>
-        public static FactorResource Fetch(string pathServiceSid,
-                                           string pathIdentity,
-                                           string pathSid,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchFactorOptions(pathServiceSid, pathIdentity, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Factor.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Factor </returns>
-        public static async System.Threading.Tasks.Task<FactorResource> FetchAsync(string pathServiceSid,
-                                                                                   string pathIdentity,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchFactorOptions(pathServiceSid, pathIdentity, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadFactorOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Factors",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Factors for an Entity.
-        /// </summary>
-        /// <param name="options"> Read Factor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Factor </returns>
-        public static ResourceSet<FactorResource> Read(ReadFactorOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<FactorResource>.FromJson("factors", response.Content);
-            return new ResourceSet<FactorResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Factors for an Entity.
-        /// </summary>
-        /// <param name="options"> Read Factor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Factor </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FactorResource>> ReadAsync(ReadFactorOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<FactorResource>.FromJson("factors", response.Content);
-            return new ResourceSet<FactorResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Factors for an Entity.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Factor </returns>
-        public static ResourceSet<FactorResource> Read(string pathServiceSid,
-                                                       string pathIdentity,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadFactorOptions(pathServiceSid, pathIdentity){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Factors for an Entity.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Factor </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<FactorResource>> ReadAsync(string pathServiceSid,
-                                                                                               string pathIdentity,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadFactorOptions(pathServiceSid, pathIdentity){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<FactorResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<FactorResource>.FromJson("factors", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<FactorResource> NextPage(Page<FactorResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<FactorResource>.FromJson("factors", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<FactorResource> PreviousPage(Page<FactorResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<FactorResource>.FromJson("factors", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateFactorOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Factors/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Factor. This endpoint can be used to Verify a Factor if passed an `AuthPayload` param.
-        /// </summary>
-        /// <param name="options"> Update Factor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Factor </returns>
-        public static FactorResource Update(UpdateFactorOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Factor. This endpoint can be used to Verify a Factor if passed an `AuthPayload` param.
-        /// </summary>
-        /// <param name="options"> Update Factor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Factor </returns>
-        public static async System.Threading.Tasks.Task<FactorResource> UpdateAsync(UpdateFactorOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Factor. This endpoint can be used to Verify a Factor if passed an `AuthPayload` param.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
-        /// <param name="authPayload"> Optional payload to verify the Factor for the first time </param>
-        /// <param name="friendlyName"> The friendly name of this Factor </param>
-        /// <param name="configNotificationToken"> For APN, the device token. For FCM, the registration token </param>
-        /// <param name="configSdkVersion"> The Verify Push SDK version used to configure the factor </param>
-        /// <param name="configTimeStep"> How often, in seconds, are TOTP codes generated </param>
-        /// <param name="configSkew"> The number of past and future time-steps valid at a given time </param>
-        /// <param name="configCodeLength"> Number of digits for generated TOTP codes </param>
-        /// <param name="configAlg"> The algorithm used to derive the TOTP codes </param>
-        /// <param name="configNotificationPlatform"> The transport technology used to generate the Notification Token </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Factor </returns>
-        public static FactorResource Update(string pathServiceSid,
-                                            string pathIdentity,
-                                            string pathSid,
-                                            string authPayload = null,
-                                            string friendlyName = null,
-                                            string configNotificationToken = null,
-                                            string configSdkVersion = null,
-                                            int? configTimeStep = null,
-                                            int? configSkew = null,
-                                            int? configCodeLength = null,
-                                            FactorResource.TotpAlgorithmsEnum configAlg = null,
-                                            string configNotificationPlatform = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateFactorOptions(pathServiceSid, pathIdentity, pathSid){AuthPayload = authPayload, FriendlyName = friendlyName, ConfigNotificationToken = configNotificationToken, ConfigSdkVersion = configSdkVersion, ConfigTimeStep = configTimeStep, ConfigSkew = configSkew, ConfigCodeLength = configCodeLength, ConfigAlg = configAlg, ConfigNotificationPlatform = configNotificationPlatform};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Factor. This endpoint can be used to Verify a Factor if passed an `AuthPayload` param.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
-        /// <param name="authPayload"> Optional payload to verify the Factor for the first time </param>
-        /// <param name="friendlyName"> The friendly name of this Factor </param>
-        /// <param name="configNotificationToken"> For APN, the device token. For FCM, the registration token </param>
-        /// <param name="configSdkVersion"> The Verify Push SDK version used to configure the factor </param>
-        /// <param name="configTimeStep"> How often, in seconds, are TOTP codes generated </param>
-        /// <param name="configSkew"> The number of past and future time-steps valid at a given time </param>
-        /// <param name="configCodeLength"> Number of digits for generated TOTP codes </param>
-        /// <param name="configAlg"> The algorithm used to derive the TOTP codes </param>
-        /// <param name="configNotificationPlatform"> The transport technology used to generate the Notification Token </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Factor </returns>
-        public static async System.Threading.Tasks.Task<FactorResource> UpdateAsync(string pathServiceSid,
-                                                                                    string pathIdentity,
-                                                                                    string pathSid,
-                                                                                    string authPayload = null,
-                                                                                    string friendlyName = null,
-                                                                                    string configNotificationToken = null,
-                                                                                    string configSdkVersion = null,
-                                                                                    int? configTimeStep = null,
-                                                                                    int? configSkew = null,
-                                                                                    int? configCodeLength = null,
-                                                                                    FactorResource.TotpAlgorithmsEnum configAlg = null,
-                                                                                    string configNotificationPlatform = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateFactorOptions(pathServiceSid, pathIdentity, pathSid){AuthPayload = authPayload, FriendlyName = friendlyName, ConfigNotificationToken = configNotificationToken, ConfigSdkVersion = configSdkVersion, ConfigTimeStep = configTimeStep, ConfigSkew = configSkew, ConfigCodeLength = configCodeLength, ConfigAlg = configAlg, ConfigNotificationPlatform = configNotificationPlatform};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a FactorResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> FactorResource object represented by the provided JSON </returns>
-        public static FactorResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<FactorResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Factor.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Account Sid.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// Entity Sid.
-        /// </summary>
-        [JsonProperty("entity_sid")]
-        public string EntitySid { get; private set; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The date this Factor was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this Factor was updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// A human readable description of this resource.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The Status of this Factor
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FactorResource.FactorStatusesEnum Status { get; private set; }
-        /// <summary>
-        /// The Type of this Factor
-        /// </summary>
-        [JsonProperty("factor_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public FactorResource.FactorTypesEnum FactorType { get; private set; }
-        /// <summary>
-        /// Configurations for a `factor_type`.
-        /// </summary>
-        [JsonProperty("config")]
-        public object Config { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private FactorResource()
-        {
-
-        }
-    }
+{
+
+  public class FactorResource : Resource
+  {
+    public sealed class FactorStatusesEnum : StringEnum
+    {
+      private FactorStatusesEnum(string value) : base(value) { }
+      public FactorStatusesEnum() { }
+      public static implicit operator FactorStatusesEnum(string value)
+      {
+        return new FactorStatusesEnum(value);
+      }
+
+      public static readonly FactorStatusesEnum Unverified = new FactorStatusesEnum("unverified");
+      public static readonly FactorStatusesEnum Verified = new FactorStatusesEnum("verified");
+    }
+
+    public sealed class FactorTypesEnum : StringEnum
+    {
+      private FactorTypesEnum(string value) : base(value) { }
+      public FactorTypesEnum() { }
+      public static implicit operator FactorTypesEnum(string value)
+      {
+        return new FactorTypesEnum(value);
+      }
+
+      public static readonly FactorTypesEnum Push = new FactorTypesEnum("push");
+      public static readonly FactorTypesEnum Totp = new FactorTypesEnum("totp");
+    }
+
+    public sealed class NotificationPlatformsEnum : StringEnum
+    {
+      private NotificationPlatformsEnum(string value) : base(value) { }
+      public NotificationPlatformsEnum() { }
+      public static implicit operator NotificationPlatformsEnum(string value)
+      {
+        return new NotificationPlatformsEnum(value);
+      }
+
+      public static readonly NotificationPlatformsEnum Apn = new NotificationPlatformsEnum("apn");
+      public static readonly NotificationPlatformsEnum Fcm = new NotificationPlatformsEnum("fcm");
+      public static readonly NotificationPlatformsEnum None = new NotificationPlatformsEnum("none");
+    }
+
+    public sealed class TotpAlgorithmsEnum : StringEnum
+    {
+      private TotpAlgorithmsEnum(string value) : base(value) { }
+      public TotpAlgorithmsEnum() { }
+      public static implicit operator TotpAlgorithmsEnum(string value)
+      {
+        return new TotpAlgorithmsEnum(value);
+      }
+
+      public static readonly TotpAlgorithmsEnum Sha1 = new TotpAlgorithmsEnum("sha1");
+      public static readonly TotpAlgorithmsEnum Sha256 = new TotpAlgorithmsEnum("sha256");
+      public static readonly TotpAlgorithmsEnum Sha512 = new TotpAlgorithmsEnum("sha512");
+    }
+
+    private static Request BuildDeleteRequest(DeleteFactorOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Factors/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Factor.
+    /// </summary>
+    /// <param name="options"> Delete Factor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Factor </returns>
+    public static bool Delete(DeleteFactorOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Factor.
+    /// </summary>
+    /// <param name="options"> Delete Factor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Factor </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteFactorOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Factor.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Factor </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathIdentity,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteFactorOptions(pathServiceSid, pathIdentity, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Factor.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Factor </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathIdentity,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteFactorOptions(pathServiceSid, pathIdentity, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchFactorOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Factors/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Factor.
+    /// </summary>
+    /// <param name="options"> Fetch Factor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Factor </returns>
+    public static FactorResource Fetch(FetchFactorOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Factor.
+    /// </summary>
+    /// <param name="options"> Fetch Factor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Factor </returns>
+    public static async System.Threading.Tasks.Task<FactorResource> FetchAsync(FetchFactorOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Factor.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Factor </returns>
+    public static FactorResource Fetch(string pathServiceSid,
+                                       string pathIdentity,
+                                       string pathSid,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchFactorOptions(pathServiceSid, pathIdentity, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Factor.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Factor </returns>
+    public static async System.Threading.Tasks.Task<FactorResource> FetchAsync(string pathServiceSid,
+                                                                               string pathIdentity,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchFactorOptions(pathServiceSid, pathIdentity, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadFactorOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Factors",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Factors for an Entity.
+    /// </summary>
+    /// <param name="options"> Read Factor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Factor </returns>
+    public static ResourceSet<FactorResource> Read(ReadFactorOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<FactorResource>.FromJson("factors", response.Content);
+      return new ResourceSet<FactorResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Factors for an Entity.
+    /// </summary>
+    /// <param name="options"> Read Factor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Factor </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FactorResource>> ReadAsync(ReadFactorOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<FactorResource>.FromJson("factors", response.Content);
+      return new ResourceSet<FactorResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Factors for an Entity.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Factor </returns>
+    public static ResourceSet<FactorResource> Read(string pathServiceSid,
+                                                   string pathIdentity,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadFactorOptions(pathServiceSid, pathIdentity) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Factors for an Entity.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Factor </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<FactorResource>> ReadAsync(string pathServiceSid,
+                                                                                           string pathIdentity,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadFactorOptions(pathServiceSid, pathIdentity) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<FactorResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<FactorResource>.FromJson("factors", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<FactorResource> NextPage(Page<FactorResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<FactorResource>.FromJson("factors", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<FactorResource> PreviousPage(Page<FactorResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<FactorResource>.FromJson("factors", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateFactorOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Factors/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Factor. This endpoint can be used to Verify a Factor if passed an `AuthPayload` param.
+    /// </summary>
+    /// <param name="options"> Update Factor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Factor </returns>
+    public static FactorResource Update(UpdateFactorOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Factor. This endpoint can be used to Verify a Factor if passed an `AuthPayload` param.
+    /// </summary>
+    /// <param name="options"> Update Factor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Factor </returns>
+    public static async System.Threading.Tasks.Task<FactorResource> UpdateAsync(UpdateFactorOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Factor. This endpoint can be used to Verify a Factor if passed an `AuthPayload` param.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
+    /// <param name="authPayload"> Optional payload to verify the Factor for the first time </param>
+    /// <param name="friendlyName"> The friendly name of this Factor </param>
+    /// <param name="configNotificationToken"> For APN, the device token. For FCM, the registration token </param>
+    /// <param name="configSdkVersion"> The Verify Push SDK version used to configure the factor </param>
+    /// <param name="configTimeStep"> How often, in seconds, are TOTP codes generated </param>
+    /// <param name="configSkew"> The number of past and future time-steps valid at a given time </param>
+    /// <param name="configCodeLength"> Number of digits for generated TOTP codes </param>
+    /// <param name="configAlg"> The algorithm used to derive the TOTP codes </param>
+    /// <param name="configNotificationPlatform"> The transport technology used to generate the Notification Token </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Factor </returns>
+    public static FactorResource Update(string pathServiceSid,
+                                        string pathIdentity,
+                                        string pathSid,
+                                        string authPayload = null,
+                                        string friendlyName = null,
+                                        string configNotificationToken = null,
+                                        string configSdkVersion = null,
+                                        int? configTimeStep = null,
+                                        int? configSkew = null,
+                                        int? configCodeLength = null,
+                                        FactorResource.TotpAlgorithmsEnum configAlg = null,
+                                        string configNotificationPlatform = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateFactorOptions(pathServiceSid, pathIdentity, pathSid) { AuthPayload = authPayload, FriendlyName = friendlyName, ConfigNotificationToken = configNotificationToken, ConfigSdkVersion = configSdkVersion, ConfigTimeStep = configTimeStep, ConfigSkew = configSkew, ConfigCodeLength = configCodeLength, ConfigAlg = configAlg, ConfigNotificationPlatform = configNotificationPlatform };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Factor. This endpoint can be used to Verify a Factor if passed an `AuthPayload` param.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Factor. </param>
+    /// <param name="authPayload"> Optional payload to verify the Factor for the first time </param>
+    /// <param name="friendlyName"> The friendly name of this Factor </param>
+    /// <param name="configNotificationToken"> For APN, the device token. For FCM, the registration token </param>
+    /// <param name="configSdkVersion"> The Verify Push SDK version used to configure the factor </param>
+    /// <param name="configTimeStep"> How often, in seconds, are TOTP codes generated </param>
+    /// <param name="configSkew"> The number of past and future time-steps valid at a given time </param>
+    /// <param name="configCodeLength"> Number of digits for generated TOTP codes </param>
+    /// <param name="configAlg"> The algorithm used to derive the TOTP codes </param>
+    /// <param name="configNotificationPlatform"> The transport technology used to generate the Notification Token </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Factor </returns>
+    public static async System.Threading.Tasks.Task<FactorResource> UpdateAsync(string pathServiceSid,
+                                                                                string pathIdentity,
+                                                                                string pathSid,
+                                                                                string authPayload = null,
+                                                                                string friendlyName = null,
+                                                                                string configNotificationToken = null,
+                                                                                string configSdkVersion = null,
+                                                                                int? configTimeStep = null,
+                                                                                int? configSkew = null,
+                                                                                int? configCodeLength = null,
+                                                                                FactorResource.TotpAlgorithmsEnum configAlg = null,
+                                                                                string configNotificationPlatform = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateFactorOptions(pathServiceSid, pathIdentity, pathSid) { AuthPayload = authPayload, FriendlyName = friendlyName, ConfigNotificationToken = configNotificationToken, ConfigSdkVersion = configSdkVersion, ConfigTimeStep = configTimeStep, ConfigSkew = configSkew, ConfigCodeLength = configCodeLength, ConfigAlg = configAlg, ConfigNotificationPlatform = configNotificationPlatform };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a FactorResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> FactorResource object represented by the provided JSON </returns>
+    public static FactorResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<FactorResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Factor.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Account Sid.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// Entity Sid.
+    /// </summary>
+    [JsonProperty("entity_sid")]
+    public string EntitySid { get; private set; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The date this Factor was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this Factor was updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// A human readable description of this resource.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The Status of this Factor
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FactorResource.FactorStatusesEnum Status { get; private set; }
+    /// <summary>
+    /// The Type of this Factor
+    /// </summary>
+    [JsonProperty("factor_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public FactorResource.FactorTypesEnum FactorType { get; private set; }
+    /// <summary>
+    /// Configurations for a `factor_type`.
+    /// </summary>
+    [JsonProperty("config")]
+    public object Config { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private FactorResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/Entity/NewFactorOptions.cs b/src/Twilio/Rest/Verify/V2/Service/Entity/NewFactorOptions.cs
index 66e046f87..5c6f6026e 100644
--- a/src/Twilio/Rest/Verify/V2/Service/Entity/NewFactorOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/Entity/NewFactorOptions.cs
@@ -9,167 +9,167 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2.Service.Entity
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Factor for the Entity
+  /// </summary>
+  public class CreateNewFactorOptions : IOptions<NewFactorResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Factor for the Entity
-    /// </summary>
-    public class CreateNewFactorOptions : IOptions<NewFactorResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string PathIdentity { get; }
-        /// <summary>
-        /// The friendly name of this Factor
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The Type of this Factor
-        /// </summary>
-        public NewFactorResource.FactorTypesEnum FactorType { get; }
-        /// <summary>
-        /// The algorithm used when `factor_type` is `push`
-        /// </summary>
-        public string BindingAlg { get; set; }
-        /// <summary>
-        /// The public key encoded in Base64
-        /// </summary>
-        public string BindingPublicKey { get; set; }
-        /// <summary>
-        /// The ID that uniquely identifies your app in the Google or Apple store
-        /// </summary>
-        public string ConfigAppId { get; set; }
-        /// <summary>
-        /// The transport technology used to generate the Notification Token
-        /// </summary>
-        public NewFactorResource.NotificationPlatformsEnum ConfigNotificationPlatform { get; set; }
-        /// <summary>
-        /// For APN, the device token. For FCM, the registration token
-        /// </summary>
-        public string ConfigNotificationToken { get; set; }
-        /// <summary>
-        /// The Verify Push SDK version used to configure the factor
-        /// </summary>
-        public string ConfigSdkVersion { get; set; }
-        /// <summary>
-        /// The shared secret in Base32
-        /// </summary>
-        public string BindingSecret { get; set; }
-        /// <summary>
-        /// How often, in seconds, are TOTP codes generated
-        /// </summary>
-        public int? ConfigTimeStep { get; set; }
-        /// <summary>
-        /// The number of past and future time-steps valid at a given time
-        /// </summary>
-        public int? ConfigSkew { get; set; }
-        /// <summary>
-        /// Number of digits for generated TOTP codes
-        /// </summary>
-        public int? ConfigCodeLength { get; set; }
-        /// <summary>
-        /// The algorithm used to derive the TOTP codes
-        /// </summary>
-        public NewFactorResource.TotpAlgorithmsEnum ConfigAlg { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateNewFactorOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="friendlyName"> The friendly name of this Factor </param>
-        /// <param name="factorType"> The Type of this Factor </param>
-        public CreateNewFactorOptions(string pathServiceSid,
-                                      string pathIdentity,
-                                      string friendlyName,
-                                      NewFactorResource.FactorTypesEnum factorType)
-        {
-            PathServiceSid = pathServiceSid;
-            PathIdentity = pathIdentity;
-            FriendlyName = friendlyName;
-            FactorType = factorType;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (FactorType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FactorType", FactorType.ToString()));
-            }
-
-            if (BindingAlg != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Binding.Alg", BindingAlg));
-            }
-
-            if (BindingPublicKey != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Binding.PublicKey", BindingPublicKey.ToString()));
-            }
-
-            if (ConfigAppId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.AppId", ConfigAppId));
-            }
-
-            if (ConfigNotificationPlatform != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.NotificationPlatform", ConfigNotificationPlatform.ToString()));
-            }
-
-            if (ConfigNotificationToken != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.NotificationToken", ConfigNotificationToken));
-            }
-
-            if (ConfigSdkVersion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.SdkVersion", ConfigSdkVersion));
-            }
-
-            if (BindingSecret != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Binding.Secret", BindingSecret));
-            }
-
-            if (ConfigTimeStep != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.TimeStep", ConfigTimeStep.ToString()));
-            }
-
-            if (ConfigSkew != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.Skew", ConfigSkew.ToString()));
-            }
-
-            if (ConfigCodeLength != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.CodeLength", ConfigCodeLength.ToString()));
-            }
-
-            if (ConfigAlg != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Config.Alg", ConfigAlg.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    public string PathIdentity { get; }
+    /// <summary>
+    /// The friendly name of this Factor
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The Type of this Factor
+    /// </summary>
+    public NewFactorResource.FactorTypesEnum FactorType { get; }
+    /// <summary>
+    /// The algorithm used when `factor_type` is `push`
+    /// </summary>
+    public string BindingAlg { get; set; }
+    /// <summary>
+    /// The public key encoded in Base64
+    /// </summary>
+    public string BindingPublicKey { get; set; }
+    /// <summary>
+    /// The ID that uniquely identifies your app in the Google or Apple store
+    /// </summary>
+    public string ConfigAppId { get; set; }
+    /// <summary>
+    /// The transport technology used to generate the Notification Token
+    /// </summary>
+    public NewFactorResource.NotificationPlatformsEnum ConfigNotificationPlatform { get; set; }
+    /// <summary>
+    /// For APN, the device token. For FCM, the registration token
+    /// </summary>
+    public string ConfigNotificationToken { get; set; }
+    /// <summary>
+    /// The Verify Push SDK version used to configure the factor
+    /// </summary>
+    public string ConfigSdkVersion { get; set; }
+    /// <summary>
+    /// The shared secret in Base32
+    /// </summary>
+    public string BindingSecret { get; set; }
+    /// <summary>
+    /// How often, in seconds, are TOTP codes generated
+    /// </summary>
+    public int? ConfigTimeStep { get; set; }
+    /// <summary>
+    /// The number of past and future time-steps valid at a given time
+    /// </summary>
+    public int? ConfigSkew { get; set; }
+    /// <summary>
+    /// Number of digits for generated TOTP codes
+    /// </summary>
+    public int? ConfigCodeLength { get; set; }
+    /// <summary>
+    /// The algorithm used to derive the TOTP codes
+    /// </summary>
+    public NewFactorResource.TotpAlgorithmsEnum ConfigAlg { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateNewFactorOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="friendlyName"> The friendly name of this Factor </param>
+    /// <param name="factorType"> The Type of this Factor </param>
+    public CreateNewFactorOptions(string pathServiceSid,
+                                  string pathIdentity,
+                                  string friendlyName,
+                                  NewFactorResource.FactorTypesEnum factorType)
+    {
+      PathServiceSid = pathServiceSid;
+      PathIdentity = pathIdentity;
+      FriendlyName = friendlyName;
+      FactorType = factorType;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (FactorType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FactorType", FactorType.ToString()));
+      }
+
+      if (BindingAlg != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Binding.Alg", BindingAlg));
+      }
+
+      if (BindingPublicKey != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Binding.PublicKey", BindingPublicKey.ToString()));
+      }
+
+      if (ConfigAppId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.AppId", ConfigAppId));
+      }
+
+      if (ConfigNotificationPlatform != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.NotificationPlatform", ConfigNotificationPlatform.ToString()));
+      }
+
+      if (ConfigNotificationToken != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.NotificationToken", ConfigNotificationToken));
+      }
+
+      if (ConfigSdkVersion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.SdkVersion", ConfigSdkVersion));
+      }
+
+      if (BindingSecret != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Binding.Secret", BindingSecret));
+      }
+
+      if (ConfigTimeStep != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.TimeStep", ConfigTimeStep.ToString()));
+      }
+
+      if (ConfigSkew != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.Skew", ConfigSkew.ToString()));
+      }
+
+      if (ConfigCodeLength != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.CodeLength", ConfigCodeLength.ToString()));
+      }
+
+      if (ConfigAlg != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Config.Alg", ConfigAlg.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/Entity/NewFactorResource.cs b/src/Twilio/Rest/Verify/V2/Service/Entity/NewFactorResource.cs
index a71833403..61b1312e7 100644
--- a/src/Twilio/Rest/Verify/V2/Service/Entity/NewFactorResource.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/Entity/NewFactorResource.cs
@@ -19,278 +19,278 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Verify.V2.Service.Entity
-{
-
-    public class NewFactorResource : Resource
-    {
-        public sealed class FactorStatusesEnum : StringEnum
-        {
-            private FactorStatusesEnum(string value) : base(value) {}
-            public FactorStatusesEnum() {}
-            public static implicit operator FactorStatusesEnum(string value)
-            {
-                return new FactorStatusesEnum(value);
-            }
-
-            public static readonly FactorStatusesEnum Unverified = new FactorStatusesEnum("unverified");
-            public static readonly FactorStatusesEnum Verified = new FactorStatusesEnum("verified");
-        }
-
-        public sealed class FactorTypesEnum : StringEnum
-        {
-            private FactorTypesEnum(string value) : base(value) {}
-            public FactorTypesEnum() {}
-            public static implicit operator FactorTypesEnum(string value)
-            {
-                return new FactorTypesEnum(value);
-            }
-
-            public static readonly FactorTypesEnum Push = new FactorTypesEnum("push");
-            public static readonly FactorTypesEnum Totp = new FactorTypesEnum("totp");
-        }
-
-        public sealed class NotificationPlatformsEnum : StringEnum
-        {
-            private NotificationPlatformsEnum(string value) : base(value) {}
-            public NotificationPlatformsEnum() {}
-            public static implicit operator NotificationPlatformsEnum(string value)
-            {
-                return new NotificationPlatformsEnum(value);
-            }
-
-            public static readonly NotificationPlatformsEnum Apn = new NotificationPlatformsEnum("apn");
-            public static readonly NotificationPlatformsEnum Fcm = new NotificationPlatformsEnum("fcm");
-            public static readonly NotificationPlatformsEnum None = new NotificationPlatformsEnum("none");
-        }
-
-        public sealed class TotpAlgorithmsEnum : StringEnum
-        {
-            private TotpAlgorithmsEnum(string value) : base(value) {}
-            public TotpAlgorithmsEnum() {}
-            public static implicit operator TotpAlgorithmsEnum(string value)
-            {
-                return new TotpAlgorithmsEnum(value);
-            }
-
-            public static readonly TotpAlgorithmsEnum Sha1 = new TotpAlgorithmsEnum("sha1");
-            public static readonly TotpAlgorithmsEnum Sha256 = new TotpAlgorithmsEnum("sha256");
-            public static readonly TotpAlgorithmsEnum Sha512 = new TotpAlgorithmsEnum("sha512");
-        }
-
-        private static Request BuildCreateRequest(CreateNewFactorOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Factors",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Factor for the Entity
-        /// </summary>
-        /// <param name="options"> Create NewFactor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NewFactor </returns>
-        public static NewFactorResource Create(CreateNewFactorOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Factor for the Entity
-        /// </summary>
-        /// <param name="options"> Create NewFactor parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NewFactor </returns>
-        public static async System.Threading.Tasks.Task<NewFactorResource> CreateAsync(CreateNewFactorOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Factor for the Entity
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="friendlyName"> The friendly name of this Factor </param>
-        /// <param name="factorType"> The Type of this Factor </param>
-        /// <param name="bindingAlg"> The algorithm used when `factor_type` is `push` </param>
-        /// <param name="bindingPublicKey"> The public key encoded in Base64 </param>
-        /// <param name="configAppId"> The ID that uniquely identifies your app in the Google or Apple store </param>
-        /// <param name="configNotificationPlatform"> The transport technology used to generate the Notification Token </param>
-        /// <param name="configNotificationToken"> For APN, the device token. For FCM, the registration token </param>
-        /// <param name="configSdkVersion"> The Verify Push SDK version used to configure the factor </param>
-        /// <param name="bindingSecret"> The shared secret in Base32 </param>
-        /// <param name="configTimeStep"> How often, in seconds, are TOTP codes generated </param>
-        /// <param name="configSkew"> The number of past and future time-steps valid at a given time </param>
-        /// <param name="configCodeLength"> Number of digits for generated TOTP codes </param>
-        /// <param name="configAlg"> The algorithm used to derive the TOTP codes </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of NewFactor </returns>
-        public static NewFactorResource Create(string pathServiceSid,
-                                               string pathIdentity,
-                                               string friendlyName,
-                                               NewFactorResource.FactorTypesEnum factorType,
-                                               string bindingAlg = null,
-                                               string bindingPublicKey = null,
-                                               string configAppId = null,
-                                               NewFactorResource.NotificationPlatformsEnum configNotificationPlatform = null,
-                                               string configNotificationToken = null,
-                                               string configSdkVersion = null,
-                                               string bindingSecret = null,
-                                               int? configTimeStep = null,
-                                               int? configSkew = null,
-                                               int? configCodeLength = null,
-                                               NewFactorResource.TotpAlgorithmsEnum configAlg = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateNewFactorOptions(pathServiceSid, pathIdentity, friendlyName, factorType){BindingAlg = bindingAlg, BindingPublicKey = bindingPublicKey, ConfigAppId = configAppId, ConfigNotificationPlatform = configNotificationPlatform, ConfigNotificationToken = configNotificationToken, ConfigSdkVersion = configSdkVersion, BindingSecret = bindingSecret, ConfigTimeStep = configTimeStep, ConfigSkew = configSkew, ConfigCodeLength = configCodeLength, ConfigAlg = configAlg};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Factor for the Entity
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="friendlyName"> The friendly name of this Factor </param>
-        /// <param name="factorType"> The Type of this Factor </param>
-        /// <param name="bindingAlg"> The algorithm used when `factor_type` is `push` </param>
-        /// <param name="bindingPublicKey"> The public key encoded in Base64 </param>
-        /// <param name="configAppId"> The ID that uniquely identifies your app in the Google or Apple store </param>
-        /// <param name="configNotificationPlatform"> The transport technology used to generate the Notification Token </param>
-        /// <param name="configNotificationToken"> For APN, the device token. For FCM, the registration token </param>
-        /// <param name="configSdkVersion"> The Verify Push SDK version used to configure the factor </param>
-        /// <param name="bindingSecret"> The shared secret in Base32 </param>
-        /// <param name="configTimeStep"> How often, in seconds, are TOTP codes generated </param>
-        /// <param name="configSkew"> The number of past and future time-steps valid at a given time </param>
-        /// <param name="configCodeLength"> Number of digits for generated TOTP codes </param>
-        /// <param name="configAlg"> The algorithm used to derive the TOTP codes </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of NewFactor </returns>
-        public static async System.Threading.Tasks.Task<NewFactorResource> CreateAsync(string pathServiceSid,
-                                                                                       string pathIdentity,
-                                                                                       string friendlyName,
-                                                                                       NewFactorResource.FactorTypesEnum factorType,
-                                                                                       string bindingAlg = null,
-                                                                                       string bindingPublicKey = null,
-                                                                                       string configAppId = null,
-                                                                                       NewFactorResource.NotificationPlatformsEnum configNotificationPlatform = null,
-                                                                                       string configNotificationToken = null,
-                                                                                       string configSdkVersion = null,
-                                                                                       string bindingSecret = null,
-                                                                                       int? configTimeStep = null,
-                                                                                       int? configSkew = null,
-                                                                                       int? configCodeLength = null,
-                                                                                       NewFactorResource.TotpAlgorithmsEnum configAlg = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateNewFactorOptions(pathServiceSid, pathIdentity, friendlyName, factorType){BindingAlg = bindingAlg, BindingPublicKey = bindingPublicKey, ConfigAppId = configAppId, ConfigNotificationPlatform = configNotificationPlatform, ConfigNotificationToken = configNotificationToken, ConfigSdkVersion = configSdkVersion, BindingSecret = bindingSecret, ConfigTimeStep = configTimeStep, ConfigSkew = configSkew, ConfigCodeLength = configCodeLength, ConfigAlg = configAlg};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a NewFactorResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> NewFactorResource object represented by the provided JSON </returns>
-        public static NewFactorResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<NewFactorResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Factor.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Account Sid.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// Entity Sid.
-        /// </summary>
-        [JsonProperty("entity_sid")]
-        public string EntitySid { get; private set; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        [JsonProperty("binding")]
-        public object Binding { get; private set; }
-        /// <summary>
-        /// The date this Factor was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this Factor was updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// A human readable description of this resource.
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The Status of this Factor
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public NewFactorResource.FactorStatusesEnum Status { get; private set; }
-        /// <summary>
-        /// The Type of this Factor
-        /// </summary>
-        [JsonProperty("factor_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public NewFactorResource.FactorTypesEnum FactorType { get; private set; }
-        /// <summary>
-        /// Binding for a `factor_type`.
-        /// </summary>
-        [JsonProperty("config")]
-        public object Config { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private NewFactorResource()
-        {
-
-        }
-    }
+{
+
+  public class NewFactorResource : Resource
+  {
+    public sealed class FactorStatusesEnum : StringEnum
+    {
+      private FactorStatusesEnum(string value) : base(value) { }
+      public FactorStatusesEnum() { }
+      public static implicit operator FactorStatusesEnum(string value)
+      {
+        return new FactorStatusesEnum(value);
+      }
+
+      public static readonly FactorStatusesEnum Unverified = new FactorStatusesEnum("unverified");
+      public static readonly FactorStatusesEnum Verified = new FactorStatusesEnum("verified");
+    }
+
+    public sealed class FactorTypesEnum : StringEnum
+    {
+      private FactorTypesEnum(string value) : base(value) { }
+      public FactorTypesEnum() { }
+      public static implicit operator FactorTypesEnum(string value)
+      {
+        return new FactorTypesEnum(value);
+      }
+
+      public static readonly FactorTypesEnum Push = new FactorTypesEnum("push");
+      public static readonly FactorTypesEnum Totp = new FactorTypesEnum("totp");
+    }
+
+    public sealed class NotificationPlatformsEnum : StringEnum
+    {
+      private NotificationPlatformsEnum(string value) : base(value) { }
+      public NotificationPlatformsEnum() { }
+      public static implicit operator NotificationPlatformsEnum(string value)
+      {
+        return new NotificationPlatformsEnum(value);
+      }
+
+      public static readonly NotificationPlatformsEnum Apn = new NotificationPlatformsEnum("apn");
+      public static readonly NotificationPlatformsEnum Fcm = new NotificationPlatformsEnum("fcm");
+      public static readonly NotificationPlatformsEnum None = new NotificationPlatformsEnum("none");
+    }
+
+    public sealed class TotpAlgorithmsEnum : StringEnum
+    {
+      private TotpAlgorithmsEnum(string value) : base(value) { }
+      public TotpAlgorithmsEnum() { }
+      public static implicit operator TotpAlgorithmsEnum(string value)
+      {
+        return new TotpAlgorithmsEnum(value);
+      }
+
+      public static readonly TotpAlgorithmsEnum Sha1 = new TotpAlgorithmsEnum("sha1");
+      public static readonly TotpAlgorithmsEnum Sha256 = new TotpAlgorithmsEnum("sha256");
+      public static readonly TotpAlgorithmsEnum Sha512 = new TotpAlgorithmsEnum("sha512");
+    }
+
+    private static Request BuildCreateRequest(CreateNewFactorOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "/Factors",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Factor for the Entity
+    /// </summary>
+    /// <param name="options"> Create NewFactor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NewFactor </returns>
+    public static NewFactorResource Create(CreateNewFactorOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Factor for the Entity
+    /// </summary>
+    /// <param name="options"> Create NewFactor parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NewFactor </returns>
+    public static async System.Threading.Tasks.Task<NewFactorResource> CreateAsync(CreateNewFactorOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Factor for the Entity
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="friendlyName"> The friendly name of this Factor </param>
+    /// <param name="factorType"> The Type of this Factor </param>
+    /// <param name="bindingAlg"> The algorithm used when `factor_type` is `push` </param>
+    /// <param name="bindingPublicKey"> The public key encoded in Base64 </param>
+    /// <param name="configAppId"> The ID that uniquely identifies your app in the Google or Apple store </param>
+    /// <param name="configNotificationPlatform"> The transport technology used to generate the Notification Token </param>
+    /// <param name="configNotificationToken"> For APN, the device token. For FCM, the registration token </param>
+    /// <param name="configSdkVersion"> The Verify Push SDK version used to configure the factor </param>
+    /// <param name="bindingSecret"> The shared secret in Base32 </param>
+    /// <param name="configTimeStep"> How often, in seconds, are TOTP codes generated </param>
+    /// <param name="configSkew"> The number of past and future time-steps valid at a given time </param>
+    /// <param name="configCodeLength"> Number of digits for generated TOTP codes </param>
+    /// <param name="configAlg"> The algorithm used to derive the TOTP codes </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of NewFactor </returns>
+    public static NewFactorResource Create(string pathServiceSid,
+                                           string pathIdentity,
+                                           string friendlyName,
+                                           NewFactorResource.FactorTypesEnum factorType,
+                                           string bindingAlg = null,
+                                           string bindingPublicKey = null,
+                                           string configAppId = null,
+                                           NewFactorResource.NotificationPlatformsEnum configNotificationPlatform = null,
+                                           string configNotificationToken = null,
+                                           string configSdkVersion = null,
+                                           string bindingSecret = null,
+                                           int? configTimeStep = null,
+                                           int? configSkew = null,
+                                           int? configCodeLength = null,
+                                           NewFactorResource.TotpAlgorithmsEnum configAlg = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateNewFactorOptions(pathServiceSid, pathIdentity, friendlyName, factorType) { BindingAlg = bindingAlg, BindingPublicKey = bindingPublicKey, ConfigAppId = configAppId, ConfigNotificationPlatform = configNotificationPlatform, ConfigNotificationToken = configNotificationToken, ConfigSdkVersion = configSdkVersion, BindingSecret = bindingSecret, ConfigTimeStep = configTimeStep, ConfigSkew = configSkew, ConfigCodeLength = configCodeLength, ConfigAlg = configAlg };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Factor for the Entity
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="friendlyName"> The friendly name of this Factor </param>
+    /// <param name="factorType"> The Type of this Factor </param>
+    /// <param name="bindingAlg"> The algorithm used when `factor_type` is `push` </param>
+    /// <param name="bindingPublicKey"> The public key encoded in Base64 </param>
+    /// <param name="configAppId"> The ID that uniquely identifies your app in the Google or Apple store </param>
+    /// <param name="configNotificationPlatform"> The transport technology used to generate the Notification Token </param>
+    /// <param name="configNotificationToken"> For APN, the device token. For FCM, the registration token </param>
+    /// <param name="configSdkVersion"> The Verify Push SDK version used to configure the factor </param>
+    /// <param name="bindingSecret"> The shared secret in Base32 </param>
+    /// <param name="configTimeStep"> How often, in seconds, are TOTP codes generated </param>
+    /// <param name="configSkew"> The number of past and future time-steps valid at a given time </param>
+    /// <param name="configCodeLength"> Number of digits for generated TOTP codes </param>
+    /// <param name="configAlg"> The algorithm used to derive the TOTP codes </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of NewFactor </returns>
+    public static async System.Threading.Tasks.Task<NewFactorResource> CreateAsync(string pathServiceSid,
+                                                                                   string pathIdentity,
+                                                                                   string friendlyName,
+                                                                                   NewFactorResource.FactorTypesEnum factorType,
+                                                                                   string bindingAlg = null,
+                                                                                   string bindingPublicKey = null,
+                                                                                   string configAppId = null,
+                                                                                   NewFactorResource.NotificationPlatformsEnum configNotificationPlatform = null,
+                                                                                   string configNotificationToken = null,
+                                                                                   string configSdkVersion = null,
+                                                                                   string bindingSecret = null,
+                                                                                   int? configTimeStep = null,
+                                                                                   int? configSkew = null,
+                                                                                   int? configCodeLength = null,
+                                                                                   NewFactorResource.TotpAlgorithmsEnum configAlg = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateNewFactorOptions(pathServiceSid, pathIdentity, friendlyName, factorType) { BindingAlg = bindingAlg, BindingPublicKey = bindingPublicKey, ConfigAppId = configAppId, ConfigNotificationPlatform = configNotificationPlatform, ConfigNotificationToken = configNotificationToken, ConfigSdkVersion = configSdkVersion, BindingSecret = bindingSecret, ConfigTimeStep = configTimeStep, ConfigSkew = configSkew, ConfigCodeLength = configCodeLength, ConfigAlg = configAlg };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a NewFactorResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> NewFactorResource object represented by the provided JSON </returns>
+    public static NewFactorResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<NewFactorResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Factor.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Account Sid.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// Entity Sid.
+    /// </summary>
+    [JsonProperty("entity_sid")]
+    public string EntitySid { get; private set; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    [JsonProperty("binding")]
+    public object Binding { get; private set; }
+    /// <summary>
+    /// The date this Factor was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this Factor was updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// A human readable description of this resource.
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The Status of this Factor
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public NewFactorResource.FactorStatusesEnum Status { get; private set; }
+    /// <summary>
+    /// The Type of this Factor
+    /// </summary>
+    [JsonProperty("factor_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public NewFactorResource.FactorTypesEnum FactorType { get; private set; }
+    /// <summary>
+    /// Binding for a `factor_type`.
+    /// </summary>
+    [JsonProperty("config")]
+    public object Config { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private NewFactorResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/EntityOptions.cs b/src/Twilio/Rest/Verify/V2/Service/EntityOptions.cs
index dfbe35bab..764ed4e7c 100644
--- a/src/Twilio/Rest/Verify/V2/Service/EntityOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/EntityOptions.cs
@@ -9,158 +9,158 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Entity for the Service
+  /// </summary>
+  public class CreateEntityOptions : IOptions<EntityResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Entity for the Service
+    /// Service Sid.
     /// </summary>
-    public class CreateEntityOptions : IOptions<EntityResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string Identity { get; }
-
-        /// <summary>
-        /// Construct a new CreateEntityOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="identity"> Unique external identifier of the Entity </param>
-        public CreateEntityOptions(string pathServiceSid, string identity)
-        {
-            PathServiceSid = pathServiceSid;
-            Identity = identity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific Entity.
+    /// Unique external identifier of the Entity
     /// </summary>
-    public class DeleteEntityOptions : IOptions<EntityResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new DeleteEntityOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        public DeleteEntityOptions(string pathServiceSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string Identity { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific Entity.
+    /// Construct a new CreateEntityOptions
     /// </summary>
-    public class FetchEntityOptions : IOptions<EntityResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        public string PathIdentity { get; }
-
-        /// <summary>
-        /// Construct a new FetchEntityOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        public FetchEntityOptions(string pathServiceSid, string pathIdentity)
-        {
-            PathServiceSid = pathServiceSid;
-            PathIdentity = pathIdentity;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="identity"> Unique external identifier of the Entity </param>
+    public CreateEntityOptions(string pathServiceSid, string identity)
+    {
+      PathServiceSid = pathServiceSid;
+      Identity = identity;
+    }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Entities for a Service.
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadEntityOptions : ReadOptions<EntityResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadEntityOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        public ReadEntityOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific Entity.
+  /// </summary>
+  public class DeleteEntityOptions : IOptions<EntityResource>
+  {
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    public string PathIdentity { get; }
+
+    /// <summary>
+    /// Construct a new DeleteEntityOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    public DeleteEntityOptions(string pathServiceSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific Entity.
+  /// </summary>
+  public class FetchEntityOptions : IOptions<EntityResource>
+  {
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    public string PathIdentity { get; }
+
+    /// <summary>
+    /// Construct a new FetchEntityOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    public FetchEntityOptions(string pathServiceSid, string pathIdentity)
+    {
+      PathServiceSid = pathServiceSid;
+      PathIdentity = pathIdentity;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Entities for a Service.
+  /// </summary>
+  public class ReadEntityOptions : ReadOptions<EntityResource>
+  {
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadEntityOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    public ReadEntityOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/EntityResource.cs b/src/Twilio/Rest/Verify/V2/Service/EntityResource.cs
index 6d031f449..cfbc41655 100644
--- a/src/Twilio/Rest/Verify/V2/Service/EntityResource.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/EntityResource.cs
@@ -18,416 +18,416 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
-    public class EntityResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateEntityOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Entity for the Service
-        /// </summary>
-        /// <param name="options"> Create Entity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Entity </returns>
-        public static EntityResource Create(CreateEntityOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Entity for the Service
-        /// </summary>
-        /// <param name="options"> Create Entity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Entity </returns>
-        public static async System.Threading.Tasks.Task<EntityResource> CreateAsync(CreateEntityOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Entity for the Service
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="identity"> Unique external identifier of the Entity </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Entity </returns>
-        public static EntityResource Create(string pathServiceSid, string identity, ITwilioRestClient client = null)
-        {
-            var options = new CreateEntityOptions(pathServiceSid, identity);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Entity for the Service
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="identity"> Unique external identifier of the Entity </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Entity </returns>
-        public static async System.Threading.Tasks.Task<EntityResource> CreateAsync(string pathServiceSid,
-                                                                                    string identity,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateEntityOptions(pathServiceSid, identity);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteEntityOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Entity.
-        /// </summary>
-        /// <param name="options"> Delete Entity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Entity </returns>
-        public static bool Delete(DeleteEntityOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Entity.
-        /// </summary>
-        /// <param name="options"> Delete Entity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Entity </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteEntityOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Entity.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Entity </returns>
-        public static bool Delete(string pathServiceSid, string pathIdentity, ITwilioRestClient client = null)
-        {
-            var options = new DeleteEntityOptions(pathServiceSid, pathIdentity);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Entity.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Entity </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathIdentity,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteEntityOptions(pathServiceSid, pathIdentity);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchEntityOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Entity.
-        /// </summary>
-        /// <param name="options"> Fetch Entity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Entity </returns>
-        public static EntityResource Fetch(FetchEntityOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Entity.
-        /// </summary>
-        /// <param name="options"> Fetch Entity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Entity </returns>
-        public static async System.Threading.Tasks.Task<EntityResource> FetchAsync(FetchEntityOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Entity.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Entity </returns>
-        public static EntityResource Fetch(string pathServiceSid, string pathIdentity, ITwilioRestClient client = null)
-        {
-            var options = new FetchEntityOptions(pathServiceSid, pathIdentity);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Entity.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Entity </returns>
-        public static async System.Threading.Tasks.Task<EntityResource> FetchAsync(string pathServiceSid,
-                                                                                   string pathIdentity,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchEntityOptions(pathServiceSid, pathIdentity);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadEntityOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Entities",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Entities for a Service.
-        /// </summary>
-        /// <param name="options"> Read Entity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Entity </returns>
-        public static ResourceSet<EntityResource> Read(ReadEntityOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<EntityResource>.FromJson("entities", response.Content);
-            return new ResourceSet<EntityResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Entities for a Service.
-        /// </summary>
-        /// <param name="options"> Read Entity parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Entity </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EntityResource>> ReadAsync(ReadEntityOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<EntityResource>.FromJson("entities", response.Content);
-            return new ResourceSet<EntityResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Entities for a Service.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Entity </returns>
-        public static ResourceSet<EntityResource> Read(string pathServiceSid,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadEntityOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Entities for a Service.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Entity </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<EntityResource>> ReadAsync(string pathServiceSid,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadEntityOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<EntityResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<EntityResource>.FromJson("entities", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<EntityResource> NextPage(Page<EntityResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<EntityResource>.FromJson("entities", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<EntityResource> PreviousPage(Page<EntityResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<EntityResource>.FromJson("entities", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a EntityResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> EntityResource object represented by the provided JSON </returns>
-        public static EntityResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<EntityResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Entity.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Unique external identifier of the Entity
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// Account Sid.
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The date this Entity was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this Entity was updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// Nested resource URLs.
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private EntityResource()
-        {
-
-        }
-    }
+{
+
+  public class EntityResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateEntityOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Entity for the Service
+    /// </summary>
+    /// <param name="options"> Create Entity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Entity </returns>
+    public static EntityResource Create(CreateEntityOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Entity for the Service
+    /// </summary>
+    /// <param name="options"> Create Entity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Entity </returns>
+    public static async System.Threading.Tasks.Task<EntityResource> CreateAsync(CreateEntityOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Entity for the Service
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="identity"> Unique external identifier of the Entity </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Entity </returns>
+    public static EntityResource Create(string pathServiceSid, string identity, ITwilioRestClient client = null)
+    {
+      var options = new CreateEntityOptions(pathServiceSid, identity);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Entity for the Service
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="identity"> Unique external identifier of the Entity </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Entity </returns>
+    public static async System.Threading.Tasks.Task<EntityResource> CreateAsync(string pathServiceSid,
+                                                                                string identity,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateEntityOptions(pathServiceSid, identity);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteEntityOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Entity.
+    /// </summary>
+    /// <param name="options"> Delete Entity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Entity </returns>
+    public static bool Delete(DeleteEntityOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Entity.
+    /// </summary>
+    /// <param name="options"> Delete Entity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Entity </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteEntityOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Entity.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Entity </returns>
+    public static bool Delete(string pathServiceSid, string pathIdentity, ITwilioRestClient client = null)
+    {
+      var options = new DeleteEntityOptions(pathServiceSid, pathIdentity);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Entity.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Entity </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathIdentity,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteEntityOptions(pathServiceSid, pathIdentity);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchEntityOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities/" + options.PathIdentity + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Entity.
+    /// </summary>
+    /// <param name="options"> Fetch Entity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Entity </returns>
+    public static EntityResource Fetch(FetchEntityOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Entity.
+    /// </summary>
+    /// <param name="options"> Fetch Entity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Entity </returns>
+    public static async System.Threading.Tasks.Task<EntityResource> FetchAsync(FetchEntityOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Entity.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Entity </returns>
+    public static EntityResource Fetch(string pathServiceSid, string pathIdentity, ITwilioRestClient client = null)
+    {
+      var options = new FetchEntityOptions(pathServiceSid, pathIdentity);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Entity.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathIdentity"> Unique external identifier of the Entity </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Entity </returns>
+    public static async System.Threading.Tasks.Task<EntityResource> FetchAsync(string pathServiceSid,
+                                                                               string pathIdentity,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchEntityOptions(pathServiceSid, pathIdentity);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadEntityOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Entities",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Entities for a Service.
+    /// </summary>
+    /// <param name="options"> Read Entity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Entity </returns>
+    public static ResourceSet<EntityResource> Read(ReadEntityOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<EntityResource>.FromJson("entities", response.Content);
+      return new ResourceSet<EntityResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Entities for a Service.
+    /// </summary>
+    /// <param name="options"> Read Entity parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Entity </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EntityResource>> ReadAsync(ReadEntityOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<EntityResource>.FromJson("entities", response.Content);
+      return new ResourceSet<EntityResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Entities for a Service.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Entity </returns>
+    public static ResourceSet<EntityResource> Read(string pathServiceSid,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadEntityOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Entities for a Service.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Entity </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<EntityResource>> ReadAsync(string pathServiceSid,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadEntityOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<EntityResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<EntityResource>.FromJson("entities", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<EntityResource> NextPage(Page<EntityResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<EntityResource>.FromJson("entities", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<EntityResource> PreviousPage(Page<EntityResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<EntityResource>.FromJson("entities", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a EntityResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> EntityResource object represented by the provided JSON </returns>
+    public static EntityResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<EntityResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Entity.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Unique external identifier of the Entity
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// Account Sid.
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The date this Entity was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this Entity was updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// Nested resource URLs.
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private EntityResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/MessagingConfigurationOptions.cs b/src/Twilio/Rest/Verify/V2/Service/MessagingConfigurationOptions.cs
index d2ae2a070..39fcbfdf3 100644
--- a/src/Twilio/Rest/Verify/V2/Service/MessagingConfigurationOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/MessagingConfigurationOptions.cs
@@ -9,207 +9,207 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// Create a new MessagingConfiguration for a service.
+  /// </summary>
+  public class CreateMessagingConfigurationOptions : IOptions<MessagingConfigurationResource>
+  {
     /// <summary>
-    /// Create a new MessagingConfiguration for a service.
-    /// </summary>
-    public class CreateMessagingConfigurationOptions : IOptions<MessagingConfigurationResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The ISO-3166-1 country code of the country or `all`.
-        /// </summary>
-        public string Country { get; }
-        /// <summary>
-        /// The SID of the Messaging Service used for this configuration.
-        /// </summary>
-        public string MessagingServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateMessagingConfigurationOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="country"> The ISO-3166-1 country code of the country or `all`. </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service used for this configuration. </param>
-        public CreateMessagingConfigurationOptions(string pathServiceSid, string country, string messagingServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-            Country = country;
-            MessagingServiceSid = messagingServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Country != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Country", Country));
-            }
-
-            if (MessagingServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// Update a specific MessagingConfiguration
-    /// </summary>
-    public class UpdateMessagingConfigurationOptions : IOptions<MessagingConfigurationResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The ISO-3166-1 country code of the country or `all`.
-        /// </summary>
-        public string PathCountry { get; }
-        /// <summary>
-        /// The SID of the Messaging Service used for this configuration.
-        /// </summary>
-        public string MessagingServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new UpdateMessagingConfigurationOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service used for this configuration. </param>
-        public UpdateMessagingConfigurationOptions(string pathServiceSid, string pathCountry, string messagingServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathCountry = pathCountry;
-            MessagingServiceSid = messagingServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (MessagingServiceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The ISO-3166-1 country code of the country or `all`.
+    /// </summary>
+    public string Country { get; }
     /// <summary>
-    /// Fetch a specific MessagingConfiguration.
-    /// </summary>
-    public class FetchMessagingConfigurationOptions : IOptions<MessagingConfigurationResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The ISO-3166-1 country code of the country or `all`.
-        /// </summary>
-        public string PathCountry { get; }
-
-        /// <summary>
-        /// Construct a new FetchMessagingConfigurationOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
-        public FetchMessagingConfigurationOptions(string pathServiceSid, string pathCountry)
-        {
-            PathServiceSid = pathServiceSid;
-            PathCountry = pathCountry;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the Messaging Service used for this configuration.
+    /// </summary>
+    public string MessagingServiceSid { get; }
+
     /// <summary>
-    /// Retrieve a list of all Messaging Configurations for a Service.
+    /// Construct a new CreateMessagingConfigurationOptions
     /// </summary>
-    public class ReadMessagingConfigurationOptions : ReadOptions<MessagingConfigurationResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadMessagingConfigurationOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        public ReadMessagingConfigurationOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="country"> The ISO-3166-1 country code of the country or `all`. </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service used for this configuration. </param>
+    public CreateMessagingConfigurationOptions(string pathServiceSid, string country, string messagingServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+      Country = country;
+      MessagingServiceSid = messagingServiceSid;
+    }
+
     /// <summary>
-    /// Delete a specific MessagingConfiguration.
-    /// </summary>
-    public class DeleteMessagingConfigurationOptions : IOptions<MessagingConfigurationResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The ISO-3166-1 country code of the country or `all`.
-        /// </summary>
-        public string PathCountry { get; }
-
-        /// <summary>
-        /// Construct a new DeleteMessagingConfigurationOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
-        public DeleteMessagingConfigurationOptions(string pathServiceSid, string pathCountry)
-        {
-            PathServiceSid = pathServiceSid;
-            PathCountry = pathCountry;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Country != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Country", Country));
+      }
+
+      if (MessagingServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update a specific MessagingConfiguration
+  /// </summary>
+  public class UpdateMessagingConfigurationOptions : IOptions<MessagingConfigurationResource>
+  {
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The ISO-3166-1 country code of the country or `all`.
+    /// </summary>
+    public string PathCountry { get; }
+    /// <summary>
+    /// The SID of the Messaging Service used for this configuration.
+    /// </summary>
+    public string MessagingServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new UpdateMessagingConfigurationOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service used for this configuration. </param>
+    public UpdateMessagingConfigurationOptions(string pathServiceSid, string pathCountry, string messagingServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathCountry = pathCountry;
+      MessagingServiceSid = messagingServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (MessagingServiceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingServiceSid", MessagingServiceSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific MessagingConfiguration.
+  /// </summary>
+  public class FetchMessagingConfigurationOptions : IOptions<MessagingConfigurationResource>
+  {
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The ISO-3166-1 country code of the country or `all`.
+    /// </summary>
+    public string PathCountry { get; }
+
+    /// <summary>
+    /// Construct a new FetchMessagingConfigurationOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
+    public FetchMessagingConfigurationOptions(string pathServiceSid, string pathCountry)
+    {
+      PathServiceSid = pathServiceSid;
+      PathCountry = pathCountry;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Messaging Configurations for a Service.
+  /// </summary>
+  public class ReadMessagingConfigurationOptions : ReadOptions<MessagingConfigurationResource>
+  {
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadMessagingConfigurationOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    public ReadMessagingConfigurationOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific MessagingConfiguration.
+  /// </summary>
+  public class DeleteMessagingConfigurationOptions : IOptions<MessagingConfigurationResource>
+  {
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The ISO-3166-1 country code of the country or `all`.
+    /// </summary>
+    public string PathCountry { get; }
+
+    /// <summary>
+    /// Construct a new DeleteMessagingConfigurationOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
+    public DeleteMessagingConfigurationOptions(string pathServiceSid, string pathCountry)
+    {
+      PathServiceSid = pathServiceSid;
+      PathCountry = pathCountry;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/MessagingConfigurationResource.cs b/src/Twilio/Rest/Verify/V2/Service/MessagingConfigurationResource.cs
index e3ef9e2ad..0f024fc25 100644
--- a/src/Twilio/Rest/Verify/V2/Service/MessagingConfigurationResource.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/MessagingConfigurationResource.cs
@@ -16,501 +16,501 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
-    public class MessagingConfigurationResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateMessagingConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/MessagingConfigurations",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new MessagingConfiguration for a service.
-        /// </summary>
-        /// <param name="options"> Create MessagingConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessagingConfiguration </returns>
-        public static MessagingConfigurationResource Create(CreateMessagingConfigurationOptions options,
-                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new MessagingConfiguration for a service.
-        /// </summary>
-        /// <param name="options"> Create MessagingConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
-        public static async System.Threading.Tasks.Task<MessagingConfigurationResource> CreateAsync(CreateMessagingConfigurationOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new MessagingConfiguration for a service.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="country"> The ISO-3166-1 country code of the country or `all`. </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service used for this configuration. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessagingConfiguration </returns>
-        public static MessagingConfigurationResource Create(string pathServiceSid,
-                                                            string country,
-                                                            string messagingServiceSid,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateMessagingConfigurationOptions(pathServiceSid, country, messagingServiceSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new MessagingConfiguration for a service.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="country"> The ISO-3166-1 country code of the country or `all`. </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service used for this configuration. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
-        public static async System.Threading.Tasks.Task<MessagingConfigurationResource> CreateAsync(string pathServiceSid,
-                                                                                                    string country,
-                                                                                                    string messagingServiceSid,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateMessagingConfigurationOptions(pathServiceSid, country, messagingServiceSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateMessagingConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/MessagingConfigurations/" + options.PathCountry + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific MessagingConfiguration
-        /// </summary>
-        /// <param name="options"> Update MessagingConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessagingConfiguration </returns>
-        public static MessagingConfigurationResource Update(UpdateMessagingConfigurationOptions options,
-                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific MessagingConfiguration
-        /// </summary>
-        /// <param name="options"> Update MessagingConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
-        public static async System.Threading.Tasks.Task<MessagingConfigurationResource> UpdateAsync(UpdateMessagingConfigurationOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific MessagingConfiguration
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service used for this configuration. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessagingConfiguration </returns>
-        public static MessagingConfigurationResource Update(string pathServiceSid,
-                                                            string pathCountry,
-                                                            string messagingServiceSid,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessagingConfigurationOptions(pathServiceSid, pathCountry, messagingServiceSid);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific MessagingConfiguration
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
-        /// <param name="messagingServiceSid"> The SID of the Messaging Service used for this configuration. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
-        public static async System.Threading.Tasks.Task<MessagingConfigurationResource> UpdateAsync(string pathServiceSid,
-                                                                                                    string pathCountry,
-                                                                                                    string messagingServiceSid,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateMessagingConfigurationOptions(pathServiceSid, pathCountry, messagingServiceSid);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchMessagingConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/MessagingConfigurations/" + options.PathCountry + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific MessagingConfiguration.
-        /// </summary>
-        /// <param name="options"> Fetch MessagingConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessagingConfiguration </returns>
-        public static MessagingConfigurationResource Fetch(FetchMessagingConfigurationOptions options,
-                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific MessagingConfiguration.
-        /// </summary>
-        /// <param name="options"> Fetch MessagingConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
-        public static async System.Threading.Tasks.Task<MessagingConfigurationResource> FetchAsync(FetchMessagingConfigurationOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific MessagingConfiguration.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessagingConfiguration </returns>
-        public static MessagingConfigurationResource Fetch(string pathServiceSid,
-                                                           string pathCountry,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchMessagingConfigurationOptions(pathServiceSid, pathCountry);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific MessagingConfiguration.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
-        public static async System.Threading.Tasks.Task<MessagingConfigurationResource> FetchAsync(string pathServiceSid,
-                                                                                                   string pathCountry,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchMessagingConfigurationOptions(pathServiceSid, pathCountry);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadMessagingConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/MessagingConfigurations",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Messaging Configurations for a Service.
-        /// </summary>
-        /// <param name="options"> Read MessagingConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessagingConfiguration </returns>
-        public static ResourceSet<MessagingConfigurationResource> Read(ReadMessagingConfigurationOptions options,
-                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<MessagingConfigurationResource>.FromJson("messaging_configurations", response.Content);
-            return new ResourceSet<MessagingConfigurationResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Messaging Configurations for a Service.
-        /// </summary>
-        /// <param name="options"> Read MessagingConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessagingConfigurationResource>> ReadAsync(ReadMessagingConfigurationOptions options,
-                                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<MessagingConfigurationResource>.FromJson("messaging_configurations", response.Content);
-            return new ResourceSet<MessagingConfigurationResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Messaging Configurations for a Service.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessagingConfiguration </returns>
-        public static ResourceSet<MessagingConfigurationResource> Read(string pathServiceSid,
-                                                                       int? pageSize = null,
-                                                                       long? limit = null,
-                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadMessagingConfigurationOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Messaging Configurations for a Service.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<MessagingConfigurationResource>> ReadAsync(string pathServiceSid,
-                                                                                                               int? pageSize = null,
-                                                                                                               long? limit = null,
-                                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadMessagingConfigurationOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<MessagingConfigurationResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<MessagingConfigurationResource>.FromJson("messaging_configurations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<MessagingConfigurationResource> NextPage(Page<MessagingConfigurationResource> page,
-                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<MessagingConfigurationResource>.FromJson("messaging_configurations", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<MessagingConfigurationResource> PreviousPage(Page<MessagingConfigurationResource> page,
-                                                                        ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<MessagingConfigurationResource>.FromJson("messaging_configurations", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteMessagingConfigurationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/MessagingConfigurations/" + options.PathCountry + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific MessagingConfiguration.
-        /// </summary>
-        /// <param name="options"> Delete MessagingConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessagingConfiguration </returns>
-        public static bool Delete(DeleteMessagingConfigurationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific MessagingConfiguration.
-        /// </summary>
-        /// <param name="options"> Delete MessagingConfiguration parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessagingConfigurationOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific MessagingConfiguration.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of MessagingConfiguration </returns>
-        public static bool Delete(string pathServiceSid, string pathCountry, ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessagingConfigurationOptions(pathServiceSid, pathCountry);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific MessagingConfiguration.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathCountry,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteMessagingConfigurationOptions(pathServiceSid, pathCountry);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a MessagingConfigurationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> MessagingConfigurationResource object represented by the provided JSON </returns>
-        public static MessagingConfigurationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<MessagingConfigurationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The ISO-3166-1 country code of the country or `all`.
-        /// </summary>
-        [JsonProperty("country")]
-        public string Country { get; private set; }
-        /// <summary>
-        /// The SID of the Messaging Service used for this configuration.
-        /// </summary>
-        [JsonProperty("messaging_service_sid")]
-        public string MessagingServiceSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private MessagingConfigurationResource()
-        {
-
-        }
-    }
+{
+
+  public class MessagingConfigurationResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateMessagingConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/MessagingConfigurations",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new MessagingConfiguration for a service.
+    /// </summary>
+    /// <param name="options"> Create MessagingConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessagingConfiguration </returns>
+    public static MessagingConfigurationResource Create(CreateMessagingConfigurationOptions options,
+                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new MessagingConfiguration for a service.
+    /// </summary>
+    /// <param name="options"> Create MessagingConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
+    public static async System.Threading.Tasks.Task<MessagingConfigurationResource> CreateAsync(CreateMessagingConfigurationOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new MessagingConfiguration for a service.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="country"> The ISO-3166-1 country code of the country or `all`. </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service used for this configuration. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessagingConfiguration </returns>
+    public static MessagingConfigurationResource Create(string pathServiceSid,
+                                                        string country,
+                                                        string messagingServiceSid,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateMessagingConfigurationOptions(pathServiceSid, country, messagingServiceSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new MessagingConfiguration for a service.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="country"> The ISO-3166-1 country code of the country or `all`. </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service used for this configuration. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
+    public static async System.Threading.Tasks.Task<MessagingConfigurationResource> CreateAsync(string pathServiceSid,
+                                                                                                string country,
+                                                                                                string messagingServiceSid,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateMessagingConfigurationOptions(pathServiceSid, country, messagingServiceSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateMessagingConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/MessagingConfigurations/" + options.PathCountry + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific MessagingConfiguration
+    /// </summary>
+    /// <param name="options"> Update MessagingConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessagingConfiguration </returns>
+    public static MessagingConfigurationResource Update(UpdateMessagingConfigurationOptions options,
+                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific MessagingConfiguration
+    /// </summary>
+    /// <param name="options"> Update MessagingConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
+    public static async System.Threading.Tasks.Task<MessagingConfigurationResource> UpdateAsync(UpdateMessagingConfigurationOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific MessagingConfiguration
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service used for this configuration. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessagingConfiguration </returns>
+    public static MessagingConfigurationResource Update(string pathServiceSid,
+                                                        string pathCountry,
+                                                        string messagingServiceSid,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessagingConfigurationOptions(pathServiceSid, pathCountry, messagingServiceSid);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific MessagingConfiguration
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
+    /// <param name="messagingServiceSid"> The SID of the Messaging Service used for this configuration. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
+    public static async System.Threading.Tasks.Task<MessagingConfigurationResource> UpdateAsync(string pathServiceSid,
+                                                                                                string pathCountry,
+                                                                                                string messagingServiceSid,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateMessagingConfigurationOptions(pathServiceSid, pathCountry, messagingServiceSid);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchMessagingConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/MessagingConfigurations/" + options.PathCountry + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific MessagingConfiguration.
+    /// </summary>
+    /// <param name="options"> Fetch MessagingConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessagingConfiguration </returns>
+    public static MessagingConfigurationResource Fetch(FetchMessagingConfigurationOptions options,
+                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific MessagingConfiguration.
+    /// </summary>
+    /// <param name="options"> Fetch MessagingConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
+    public static async System.Threading.Tasks.Task<MessagingConfigurationResource> FetchAsync(FetchMessagingConfigurationOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific MessagingConfiguration.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessagingConfiguration </returns>
+    public static MessagingConfigurationResource Fetch(string pathServiceSid,
+                                                       string pathCountry,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchMessagingConfigurationOptions(pathServiceSid, pathCountry);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific MessagingConfiguration.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
+    public static async System.Threading.Tasks.Task<MessagingConfigurationResource> FetchAsync(string pathServiceSid,
+                                                                                               string pathCountry,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchMessagingConfigurationOptions(pathServiceSid, pathCountry);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadMessagingConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/MessagingConfigurations",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Messaging Configurations for a Service.
+    /// </summary>
+    /// <param name="options"> Read MessagingConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessagingConfiguration </returns>
+    public static ResourceSet<MessagingConfigurationResource> Read(ReadMessagingConfigurationOptions options,
+                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<MessagingConfigurationResource>.FromJson("messaging_configurations", response.Content);
+      return new ResourceSet<MessagingConfigurationResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Messaging Configurations for a Service.
+    /// </summary>
+    /// <param name="options"> Read MessagingConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessagingConfigurationResource>> ReadAsync(ReadMessagingConfigurationOptions options,
+                                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<MessagingConfigurationResource>.FromJson("messaging_configurations", response.Content);
+      return new ResourceSet<MessagingConfigurationResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Messaging Configurations for a Service.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessagingConfiguration </returns>
+    public static ResourceSet<MessagingConfigurationResource> Read(string pathServiceSid,
+                                                                   int? pageSize = null,
+                                                                   long? limit = null,
+                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadMessagingConfigurationOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Messaging Configurations for a Service.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<MessagingConfigurationResource>> ReadAsync(string pathServiceSid,
+                                                                                                           int? pageSize = null,
+                                                                                                           long? limit = null,
+                                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadMessagingConfigurationOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<MessagingConfigurationResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<MessagingConfigurationResource>.FromJson("messaging_configurations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<MessagingConfigurationResource> NextPage(Page<MessagingConfigurationResource> page,
+                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<MessagingConfigurationResource>.FromJson("messaging_configurations", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<MessagingConfigurationResource> PreviousPage(Page<MessagingConfigurationResource> page,
+                                                                    ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<MessagingConfigurationResource>.FromJson("messaging_configurations", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteMessagingConfigurationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/MessagingConfigurations/" + options.PathCountry + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific MessagingConfiguration.
+    /// </summary>
+    /// <param name="options"> Delete MessagingConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessagingConfiguration </returns>
+    public static bool Delete(DeleteMessagingConfigurationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific MessagingConfiguration.
+    /// </summary>
+    /// <param name="options"> Delete MessagingConfiguration parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteMessagingConfigurationOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific MessagingConfiguration.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of MessagingConfiguration </returns>
+    public static bool Delete(string pathServiceSid, string pathCountry, ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessagingConfigurationOptions(pathServiceSid, pathCountry);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific MessagingConfiguration.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathCountry"> The ISO-3166-1 country code of the country or `all`. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of MessagingConfiguration </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathCountry,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteMessagingConfigurationOptions(pathServiceSid, pathCountry);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a MessagingConfigurationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> MessagingConfigurationResource object represented by the provided JSON </returns>
+    public static MessagingConfigurationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<MessagingConfigurationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The ISO-3166-1 country code of the country or `all`.
+    /// </summary>
+    [JsonProperty("country")]
+    public string Country { get; private set; }
+    /// <summary>
+    /// The SID of the Messaging Service used for this configuration.
+    /// </summary>
+    [JsonProperty("messaging_service_sid")]
+    public string MessagingServiceSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private MessagingConfigurationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/RateLimit/BucketOptions.cs b/src/Twilio/Rest/Verify/V2/Service/RateLimit/BucketOptions.cs
index c04633610..09ccc843d 100644
--- a/src/Twilio/Rest/Verify/V2/Service/RateLimit/BucketOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/RateLimit/BucketOptions.cs
@@ -9,244 +9,244 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2.Service.RateLimit
-{
-
+{
+
+  /// <summary>
+  /// Create a new Bucket for a Rate Limit
+  /// </summary>
+  public class CreateBucketOptions : IOptions<BucketResource>
+  {
     /// <summary>
-    /// Create a new Bucket for a Rate Limit
-    /// </summary>
-    public class CreateBucketOptions : IOptions<BucketResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Rate Limit Sid.
-        /// </summary>
-        public string PathRateLimitSid { get; }
-        /// <summary>
-        /// Max number of requests.
-        /// </summary>
-        public int? Max { get; }
-        /// <summary>
-        /// Number of seconds that the rate limit will be enforced over.
-        /// </summary>
-        public int? Interval { get; }
-
-        /// <summary>
-        /// Construct a new CreateBucketOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="max"> Max number of requests. </param>
-        /// <param name="interval"> Number of seconds that the rate limit will be enforced over. </param>
-        public CreateBucketOptions(string pathServiceSid, string pathRateLimitSid, int? max, int? interval)
-        {
-            PathServiceSid = pathServiceSid;
-            PathRateLimitSid = pathRateLimitSid;
-            Max = max;
-            Interval = interval;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Max != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Max", Max.ToString()));
-            }
-
-            if (Interval != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Interval", Interval.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// Update a specific Bucket.
-    /// </summary>
-    public class UpdateBucketOptions : IOptions<BucketResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Rate Limit Sid.
-        /// </summary>
-        public string PathRateLimitSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies this Bucket.
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// Max number of requests.
-        /// </summary>
-        public int? Max { get; set; }
-        /// <summary>
-        /// Number of seconds that the rate limit will be enforced over.
-        /// </summary>
-        public int? Interval { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateBucketOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
-        public UpdateBucketOptions(string pathServiceSid, string pathRateLimitSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathRateLimitSid = pathRateLimitSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Max != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Max", Max.ToString()));
-            }
-
-            if (Interval != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Interval", Interval.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Rate Limit Sid.
+    /// </summary>
+    public string PathRateLimitSid { get; }
     /// <summary>
-    /// Fetch a specific Bucket.
-    /// </summary>
-    public class FetchBucketOptions : IOptions<BucketResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Rate Limit Sid.
-        /// </summary>
-        public string PathRateLimitSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies this Bucket.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchBucketOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
-        public FetchBucketOptions(string pathServiceSid, string pathRateLimitSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathRateLimitSid = pathRateLimitSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Max number of requests.
+    /// </summary>
+    public int? Max { get; }
     /// <summary>
-    /// Retrieve a list of all Buckets for a Rate Limit.
-    /// </summary>
-    public class ReadBucketOptions : ReadOptions<BucketResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Rate Limit Sid.
-        /// </summary>
-        public string PathRateLimitSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadBucketOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        public ReadBucketOptions(string pathServiceSid, string pathRateLimitSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathRateLimitSid = pathRateLimitSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Number of seconds that the rate limit will be enforced over.
+    /// </summary>
+    public int? Interval { get; }
+
     /// <summary>
-    /// Delete a specific Bucket.
-    /// </summary>
-    public class DeleteBucketOptions : IOptions<BucketResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// Rate Limit Sid.
-        /// </summary>
-        public string PathRateLimitSid { get; }
-        /// <summary>
-        /// A string that uniquely identifies this Bucket.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteBucketOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
-        public DeleteBucketOptions(string pathServiceSid, string pathRateLimitSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathRateLimitSid = pathRateLimitSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Construct a new CreateBucketOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="max"> Max number of requests. </param>
+    /// <param name="interval"> Number of seconds that the rate limit will be enforced over. </param>
+    public CreateBucketOptions(string pathServiceSid, string pathRateLimitSid, int? max, int? interval)
+    {
+      PathServiceSid = pathServiceSid;
+      PathRateLimitSid = pathRateLimitSid;
+      Max = max;
+      Interval = interval;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Max != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Max", Max.ToString()));
+      }
+
+      if (Interval != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Interval", Interval.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update a specific Bucket.
+  /// </summary>
+  public class UpdateBucketOptions : IOptions<BucketResource>
+  {
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Rate Limit Sid.
+    /// </summary>
+    public string PathRateLimitSid { get; }
+    /// <summary>
+    /// A string that uniquely identifies this Bucket.
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// Max number of requests.
+    /// </summary>
+    public int? Max { get; set; }
+    /// <summary>
+    /// Number of seconds that the rate limit will be enforced over.
+    /// </summary>
+    public int? Interval { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateBucketOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
+    public UpdateBucketOptions(string pathServiceSid, string pathRateLimitSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathRateLimitSid = pathRateLimitSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Max != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Max", Max.ToString()));
+      }
+
+      if (Interval != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Interval", Interval.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific Bucket.
+  /// </summary>
+  public class FetchBucketOptions : IOptions<BucketResource>
+  {
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Rate Limit Sid.
+    /// </summary>
+    public string PathRateLimitSid { get; }
+    /// <summary>
+    /// A string that uniquely identifies this Bucket.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchBucketOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
+    public FetchBucketOptions(string pathServiceSid, string pathRateLimitSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathRateLimitSid = pathRateLimitSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Buckets for a Rate Limit.
+  /// </summary>
+  public class ReadBucketOptions : ReadOptions<BucketResource>
+  {
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Rate Limit Sid.
+    /// </summary>
+    public string PathRateLimitSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadBucketOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    public ReadBucketOptions(string pathServiceSid, string pathRateLimitSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathRateLimitSid = pathRateLimitSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Bucket.
+  /// </summary>
+  public class DeleteBucketOptions : IOptions<BucketResource>
+  {
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// Rate Limit Sid.
+    /// </summary>
+    public string PathRateLimitSid { get; }
+    /// <summary>
+    /// A string that uniquely identifies this Bucket.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteBucketOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
+    public DeleteBucketOptions(string pathServiceSid, string pathRateLimitSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathRateLimitSid = pathRateLimitSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/RateLimit/BucketResource.cs b/src/Twilio/Rest/Verify/V2/Service/RateLimit/BucketResource.cs
index 8889305f4..397c83d9b 100644
--- a/src/Twilio/Rest/Verify/V2/Service/RateLimit/BucketResource.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/RateLimit/BucketResource.cs
@@ -16,531 +16,531 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Verify.V2.Service.RateLimit
-{
-
-    public class BucketResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateBucketOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathRateLimitSid + "/Buckets",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Bucket for a Rate Limit
-        /// </summary>
-        /// <param name="options"> Create Bucket parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bucket </returns>
-        public static BucketResource Create(CreateBucketOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Bucket for a Rate Limit
-        /// </summary>
-        /// <param name="options"> Create Bucket parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bucket </returns>
-        public static async System.Threading.Tasks.Task<BucketResource> CreateAsync(CreateBucketOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Bucket for a Rate Limit
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="max"> Max number of requests. </param>
-        /// <param name="interval"> Number of seconds that the rate limit will be enforced over. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bucket </returns>
-        public static BucketResource Create(string pathServiceSid,
-                                            string pathRateLimitSid,
-                                            int? max,
-                                            int? interval,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateBucketOptions(pathServiceSid, pathRateLimitSid, max, interval);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Bucket for a Rate Limit
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="max"> Max number of requests. </param>
-        /// <param name="interval"> Number of seconds that the rate limit will be enforced over. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bucket </returns>
-        public static async System.Threading.Tasks.Task<BucketResource> CreateAsync(string pathServiceSid,
-                                                                                    string pathRateLimitSid,
-                                                                                    int? max,
-                                                                                    int? interval,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateBucketOptions(pathServiceSid, pathRateLimitSid, max, interval);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateBucketOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathRateLimitSid + "/Buckets/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Bucket.
-        /// </summary>
-        /// <param name="options"> Update Bucket parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bucket </returns>
-        public static BucketResource Update(UpdateBucketOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Bucket.
-        /// </summary>
-        /// <param name="options"> Update Bucket parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bucket </returns>
-        public static async System.Threading.Tasks.Task<BucketResource> UpdateAsync(UpdateBucketOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Bucket.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
-        /// <param name="max"> Max number of requests. </param>
-        /// <param name="interval"> Number of seconds that the rate limit will be enforced over. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bucket </returns>
-        public static BucketResource Update(string pathServiceSid,
-                                            string pathRateLimitSid,
-                                            string pathSid,
-                                            int? max = null,
-                                            int? interval = null,
-                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateBucketOptions(pathServiceSid, pathRateLimitSid, pathSid){Max = max, Interval = interval};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Bucket.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
-        /// <param name="max"> Max number of requests. </param>
-        /// <param name="interval"> Number of seconds that the rate limit will be enforced over. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bucket </returns>
-        public static async System.Threading.Tasks.Task<BucketResource> UpdateAsync(string pathServiceSid,
-                                                                                    string pathRateLimitSid,
-                                                                                    string pathSid,
-                                                                                    int? max = null,
-                                                                                    int? interval = null,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateBucketOptions(pathServiceSid, pathRateLimitSid, pathSid){Max = max, Interval = interval};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchBucketOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathRateLimitSid + "/Buckets/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Bucket.
-        /// </summary>
-        /// <param name="options"> Fetch Bucket parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bucket </returns>
-        public static BucketResource Fetch(FetchBucketOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Bucket.
-        /// </summary>
-        /// <param name="options"> Fetch Bucket parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bucket </returns>
-        public static async System.Threading.Tasks.Task<BucketResource> FetchAsync(FetchBucketOptions options,
-                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Bucket.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bucket </returns>
-        public static BucketResource Fetch(string pathServiceSid,
-                                           string pathRateLimitSid,
-                                           string pathSid,
-                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchBucketOptions(pathServiceSid, pathRateLimitSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Bucket.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bucket </returns>
-        public static async System.Threading.Tasks.Task<BucketResource> FetchAsync(string pathServiceSid,
-                                                                                   string pathRateLimitSid,
-                                                                                   string pathSid,
-                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchBucketOptions(pathServiceSid, pathRateLimitSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadBucketOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathRateLimitSid + "/Buckets",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Buckets for a Rate Limit.
-        /// </summary>
-        /// <param name="options"> Read Bucket parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bucket </returns>
-        public static ResourceSet<BucketResource> Read(ReadBucketOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<BucketResource>.FromJson("buckets", response.Content);
-            return new ResourceSet<BucketResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Buckets for a Rate Limit.
-        /// </summary>
-        /// <param name="options"> Read Bucket parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bucket </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BucketResource>> ReadAsync(ReadBucketOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<BucketResource>.FromJson("buckets", response.Content);
-            return new ResourceSet<BucketResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Buckets for a Rate Limit.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bucket </returns>
-        public static ResourceSet<BucketResource> Read(string pathServiceSid,
-                                                       string pathRateLimitSid,
-                                                       int? pageSize = null,
-                                                       long? limit = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadBucketOptions(pathServiceSid, pathRateLimitSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Buckets for a Rate Limit.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bucket </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<BucketResource>> ReadAsync(string pathServiceSid,
-                                                                                               string pathRateLimitSid,
-                                                                                               int? pageSize = null,
-                                                                                               long? limit = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadBucketOptions(pathServiceSid, pathRateLimitSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<BucketResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<BucketResource>.FromJson("buckets", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<BucketResource> NextPage(Page<BucketResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<BucketResource>.FromJson("buckets", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<BucketResource> PreviousPage(Page<BucketResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<BucketResource>.FromJson("buckets", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteBucketOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathRateLimitSid + "/Buckets/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Bucket.
-        /// </summary>
-        /// <param name="options"> Delete Bucket parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bucket </returns>
-        public static bool Delete(DeleteBucketOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Bucket.
-        /// </summary>
-        /// <param name="options"> Delete Bucket parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bucket </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBucketOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Bucket.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Bucket </returns>
-        public static bool Delete(string pathServiceSid,
-                                  string pathRateLimitSid,
-                                  string pathSid,
-                                  ITwilioRestClient client = null)
-        {
-            var options = new DeleteBucketOptions(pathServiceSid, pathRateLimitSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Bucket.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
-        /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Bucket </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathRateLimitSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteBucketOptions(pathServiceSid, pathRateLimitSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a BucketResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BucketResource object represented by the provided JSON </returns>
-        public static BucketResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BucketResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Bucket.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Rate Limit Sid.
-        /// </summary>
-        [JsonProperty("rate_limit_sid")]
-        public string RateLimitSid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Max number of requests.
-        /// </summary>
-        [JsonProperty("max")]
-        public int? Max { get; private set; }
-        /// <summary>
-        /// Number of seconds that the rate limit will be enforced over.
-        /// </summary>
-        [JsonProperty("interval")]
-        public int? Interval { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private BucketResource()
-        {
-
-        }
-    }
+{
+
+  public class BucketResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateBucketOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathRateLimitSid + "/Buckets",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Bucket for a Rate Limit
+    /// </summary>
+    /// <param name="options"> Create Bucket parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bucket </returns>
+    public static BucketResource Create(CreateBucketOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Bucket for a Rate Limit
+    /// </summary>
+    /// <param name="options"> Create Bucket parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bucket </returns>
+    public static async System.Threading.Tasks.Task<BucketResource> CreateAsync(CreateBucketOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Bucket for a Rate Limit
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="max"> Max number of requests. </param>
+    /// <param name="interval"> Number of seconds that the rate limit will be enforced over. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bucket </returns>
+    public static BucketResource Create(string pathServiceSid,
+                                        string pathRateLimitSid,
+                                        int? max,
+                                        int? interval,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateBucketOptions(pathServiceSid, pathRateLimitSid, max, interval);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Bucket for a Rate Limit
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="max"> Max number of requests. </param>
+    /// <param name="interval"> Number of seconds that the rate limit will be enforced over. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bucket </returns>
+    public static async System.Threading.Tasks.Task<BucketResource> CreateAsync(string pathServiceSid,
+                                                                                string pathRateLimitSid,
+                                                                                int? max,
+                                                                                int? interval,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateBucketOptions(pathServiceSid, pathRateLimitSid, max, interval);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateBucketOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathRateLimitSid + "/Buckets/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Bucket.
+    /// </summary>
+    /// <param name="options"> Update Bucket parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bucket </returns>
+    public static BucketResource Update(UpdateBucketOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Bucket.
+    /// </summary>
+    /// <param name="options"> Update Bucket parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bucket </returns>
+    public static async System.Threading.Tasks.Task<BucketResource> UpdateAsync(UpdateBucketOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Bucket.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
+    /// <param name="max"> Max number of requests. </param>
+    /// <param name="interval"> Number of seconds that the rate limit will be enforced over. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bucket </returns>
+    public static BucketResource Update(string pathServiceSid,
+                                        string pathRateLimitSid,
+                                        string pathSid,
+                                        int? max = null,
+                                        int? interval = null,
+                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateBucketOptions(pathServiceSid, pathRateLimitSid, pathSid) { Max = max, Interval = interval };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Bucket.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
+    /// <param name="max"> Max number of requests. </param>
+    /// <param name="interval"> Number of seconds that the rate limit will be enforced over. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bucket </returns>
+    public static async System.Threading.Tasks.Task<BucketResource> UpdateAsync(string pathServiceSid,
+                                                                                string pathRateLimitSid,
+                                                                                string pathSid,
+                                                                                int? max = null,
+                                                                                int? interval = null,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateBucketOptions(pathServiceSid, pathRateLimitSid, pathSid) { Max = max, Interval = interval };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchBucketOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathRateLimitSid + "/Buckets/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Bucket.
+    /// </summary>
+    /// <param name="options"> Fetch Bucket parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bucket </returns>
+    public static BucketResource Fetch(FetchBucketOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Bucket.
+    /// </summary>
+    /// <param name="options"> Fetch Bucket parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bucket </returns>
+    public static async System.Threading.Tasks.Task<BucketResource> FetchAsync(FetchBucketOptions options,
+                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Bucket.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bucket </returns>
+    public static BucketResource Fetch(string pathServiceSid,
+                                       string pathRateLimitSid,
+                                       string pathSid,
+                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchBucketOptions(pathServiceSid, pathRateLimitSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Bucket.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bucket </returns>
+    public static async System.Threading.Tasks.Task<BucketResource> FetchAsync(string pathServiceSid,
+                                                                               string pathRateLimitSid,
+                                                                               string pathSid,
+                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchBucketOptions(pathServiceSid, pathRateLimitSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadBucketOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathRateLimitSid + "/Buckets",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Buckets for a Rate Limit.
+    /// </summary>
+    /// <param name="options"> Read Bucket parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bucket </returns>
+    public static ResourceSet<BucketResource> Read(ReadBucketOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<BucketResource>.FromJson("buckets", response.Content);
+      return new ResourceSet<BucketResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Buckets for a Rate Limit.
+    /// </summary>
+    /// <param name="options"> Read Bucket parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bucket </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BucketResource>> ReadAsync(ReadBucketOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<BucketResource>.FromJson("buckets", response.Content);
+      return new ResourceSet<BucketResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Buckets for a Rate Limit.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bucket </returns>
+    public static ResourceSet<BucketResource> Read(string pathServiceSid,
+                                                   string pathRateLimitSid,
+                                                   int? pageSize = null,
+                                                   long? limit = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadBucketOptions(pathServiceSid, pathRateLimitSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Buckets for a Rate Limit.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bucket </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<BucketResource>> ReadAsync(string pathServiceSid,
+                                                                                           string pathRateLimitSid,
+                                                                                           int? pageSize = null,
+                                                                                           long? limit = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadBucketOptions(pathServiceSid, pathRateLimitSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<BucketResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<BucketResource>.FromJson("buckets", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<BucketResource> NextPage(Page<BucketResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<BucketResource>.FromJson("buckets", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<BucketResource> PreviousPage(Page<BucketResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<BucketResource>.FromJson("buckets", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteBucketOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathRateLimitSid + "/Buckets/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Bucket.
+    /// </summary>
+    /// <param name="options"> Delete Bucket parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bucket </returns>
+    public static bool Delete(DeleteBucketOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Bucket.
+    /// </summary>
+    /// <param name="options"> Delete Bucket parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bucket </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteBucketOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Bucket.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Bucket </returns>
+    public static bool Delete(string pathServiceSid,
+                              string pathRateLimitSid,
+                              string pathSid,
+                              ITwilioRestClient client = null)
+    {
+      var options = new DeleteBucketOptions(pathServiceSid, pathRateLimitSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Bucket.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathRateLimitSid"> Rate Limit Sid. </param>
+    /// <param name="pathSid"> A string that uniquely identifies this Bucket. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Bucket </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathRateLimitSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteBucketOptions(pathServiceSid, pathRateLimitSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a BucketResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BucketResource object represented by the provided JSON </returns>
+    public static BucketResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BucketResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Bucket.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Rate Limit Sid.
+    /// </summary>
+    [JsonProperty("rate_limit_sid")]
+    public string RateLimitSid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Max number of requests.
+    /// </summary>
+    [JsonProperty("max")]
+    public int? Max { get; private set; }
+    /// <summary>
+    /// Number of seconds that the rate limit will be enforced over.
+    /// </summary>
+    [JsonProperty("interval")]
+    public int? Interval { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private BucketResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/RateLimitOptions.cs b/src/Twilio/Rest/Verify/V2/Service/RateLimitOptions.cs
index d1c841849..7ffb59513 100644
--- a/src/Twilio/Rest/Verify/V2/Service/RateLimitOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/RateLimitOptions.cs
@@ -9,203 +9,203 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// Create a new Rate Limit for a Service
+  /// </summary>
+  public class CreateRateLimitOptions : IOptions<RateLimitResource>
+  {
     /// <summary>
-    /// Create a new Rate Limit for a Service
-    /// </summary>
-    public class CreateRateLimitOptions : IOptions<RateLimitResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// A unique, developer assigned name of this Rate Limit.
-        /// </summary>
-        public string UniqueName { get; }
-        /// <summary>
-        /// Description of this Rate Limit
-        /// </summary>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateRateLimitOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="uniqueName"> A unique, developer assigned name of this Rate Limit. </param>
-        public CreateRateLimitOptions(string pathServiceSid, string uniqueName)
-        {
-            PathServiceSid = pathServiceSid;
-            UniqueName = uniqueName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (Description != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Description", Description));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// Update a specific Rate Limit.
-    /// </summary>
-    public class UpdateRateLimitOptions : IOptions<RateLimitResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// Description of this Rate Limit
-        /// </summary>
-        public string Description { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateRateLimitOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateRateLimitOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Description != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Description", Description));
-            }
-
-            return p;
-        }
-    }
-
+    /// A unique, developer assigned name of this Rate Limit.
+    /// </summary>
+    public string UniqueName { get; }
     /// <summary>
-    /// Fetch a specific Rate Limit.
-    /// </summary>
-    public class FetchRateLimitOptions : IOptions<RateLimitResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRateLimitOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchRateLimitOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// Description of this Rate Limit
+    /// </summary>
+    public string Description { get; set; }
+
     /// <summary>
-    /// Retrieve a list of all Rate Limits for a service.
+    /// Construct a new CreateRateLimitOptions
     /// </summary>
-    public class ReadRateLimitOptions : ReadOptions<RateLimitResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadRateLimitOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        public ReadRateLimitOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="uniqueName"> A unique, developer assigned name of this Rate Limit. </param>
+    public CreateRateLimitOptions(string pathServiceSid, string uniqueName)
+    {
+      PathServiceSid = pathServiceSid;
+      UniqueName = uniqueName;
+    }
+
     /// <summary>
-    /// Delete a specific Rate Limit.
-    /// </summary>
-    public class DeleteRateLimitOptions : IOptions<RateLimitResource>
-    {
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRateLimitOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteRateLimitOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (Description != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Description", Description));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update a specific Rate Limit.
+  /// </summary>
+  public class UpdateRateLimitOptions : IOptions<RateLimitResource>
+  {
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// Description of this Rate Limit
+    /// </summary>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateRateLimitOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateRateLimitOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Description != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Description", Description));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific Rate Limit.
+  /// </summary>
+  public class FetchRateLimitOptions : IOptions<RateLimitResource>
+  {
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchRateLimitOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchRateLimitOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Rate Limits for a service.
+  /// </summary>
+  public class ReadRateLimitOptions : ReadOptions<RateLimitResource>
+  {
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadRateLimitOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    public ReadRateLimitOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Rate Limit.
+  /// </summary>
+  public class DeleteRateLimitOptions : IOptions<RateLimitResource>
+  {
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRateLimitOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteRateLimitOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/RateLimitResource.cs b/src/Twilio/Rest/Verify/V2/Service/RateLimitResource.cs
index 127090682..d896e8872 100644
--- a/src/Twilio/Rest/Verify/V2/Service/RateLimitResource.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/RateLimitResource.cs
@@ -16,503 +16,503 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
-    public class RateLimitResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateRateLimitOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/RateLimits",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Rate Limit for a Service
-        /// </summary>
-        /// <param name="options"> Create RateLimit parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RateLimit </returns>
-        public static RateLimitResource Create(CreateRateLimitOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Rate Limit for a Service
-        /// </summary>
-        /// <param name="options"> Create RateLimit parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RateLimit </returns>
-        public static async System.Threading.Tasks.Task<RateLimitResource> CreateAsync(CreateRateLimitOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Rate Limit for a Service
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="uniqueName"> A unique, developer assigned name of this Rate Limit. </param>
-        /// <param name="description"> Description of this Rate Limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RateLimit </returns>
-        public static RateLimitResource Create(string pathServiceSid,
-                                               string uniqueName,
-                                               string description = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateRateLimitOptions(pathServiceSid, uniqueName){Description = description};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Rate Limit for a Service
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="uniqueName"> A unique, developer assigned name of this Rate Limit. </param>
-        /// <param name="description"> Description of this Rate Limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RateLimit </returns>
-        public static async System.Threading.Tasks.Task<RateLimitResource> CreateAsync(string pathServiceSid,
-                                                                                       string uniqueName,
-                                                                                       string description = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateRateLimitOptions(pathServiceSid, uniqueName){Description = description};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateRateLimitOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Rate Limit.
-        /// </summary>
-        /// <param name="options"> Update RateLimit parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RateLimit </returns>
-        public static RateLimitResource Update(UpdateRateLimitOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Rate Limit.
-        /// </summary>
-        /// <param name="options"> Update RateLimit parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RateLimit </returns>
-        public static async System.Threading.Tasks.Task<RateLimitResource> UpdateAsync(UpdateRateLimitOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Rate Limit.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="description"> Description of this Rate Limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RateLimit </returns>
-        public static RateLimitResource Update(string pathServiceSid,
-                                               string pathSid,
-                                               string description = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateRateLimitOptions(pathServiceSid, pathSid){Description = description};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Rate Limit.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="description"> Description of this Rate Limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RateLimit </returns>
-        public static async System.Threading.Tasks.Task<RateLimitResource> UpdateAsync(string pathServiceSid,
-                                                                                       string pathSid,
-                                                                                       string description = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateRateLimitOptions(pathServiceSid, pathSid){Description = description};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchRateLimitOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Rate Limit.
-        /// </summary>
-        /// <param name="options"> Fetch RateLimit parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RateLimit </returns>
-        public static RateLimitResource Fetch(FetchRateLimitOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Rate Limit.
-        /// </summary>
-        /// <param name="options"> Fetch RateLimit parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RateLimit </returns>
-        public static async System.Threading.Tasks.Task<RateLimitResource> FetchAsync(FetchRateLimitOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Rate Limit.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RateLimit </returns>
-        public static RateLimitResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRateLimitOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Rate Limit.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RateLimit </returns>
-        public static async System.Threading.Tasks.Task<RateLimitResource> FetchAsync(string pathServiceSid,
-                                                                                      string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchRateLimitOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRateLimitOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/RateLimits",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Rate Limits for a service.
-        /// </summary>
-        /// <param name="options"> Read RateLimit parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RateLimit </returns>
-        public static ResourceSet<RateLimitResource> Read(ReadRateLimitOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RateLimitResource>.FromJson("rate_limits", response.Content);
-            return new ResourceSet<RateLimitResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Rate Limits for a service.
-        /// </summary>
-        /// <param name="options"> Read RateLimit parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RateLimit </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RateLimitResource>> ReadAsync(ReadRateLimitOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RateLimitResource>.FromJson("rate_limits", response.Content);
-            return new ResourceSet<RateLimitResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Rate Limits for a service.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RateLimit </returns>
-        public static ResourceSet<RateLimitResource> Read(string pathServiceSid,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadRateLimitOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Rate Limits for a service.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RateLimit </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RateLimitResource>> ReadAsync(string pathServiceSid,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadRateLimitOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RateLimitResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RateLimitResource>.FromJson("rate_limits", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RateLimitResource> NextPage(Page<RateLimitResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<RateLimitResource>.FromJson("rate_limits", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RateLimitResource> PreviousPage(Page<RateLimitResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<RateLimitResource>.FromJson("rate_limits", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteRateLimitOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Rate Limit.
-        /// </summary>
-        /// <param name="options"> Delete RateLimit parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RateLimit </returns>
-        public static bool Delete(DeleteRateLimitOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Rate Limit.
-        /// </summary>
-        /// <param name="options"> Delete RateLimit parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RateLimit </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRateLimitOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Rate Limit.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RateLimit </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRateLimitOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Rate Limit.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RateLimit </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteRateLimitOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RateLimitResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RateLimitResource object represented by the provided JSON </returns>
-        public static RateLimitResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RateLimitResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Rate Limit.
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// A unique, developer assigned name of this Rate Limit.
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// Description of this Rate Limit
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The URL of this resource.
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private RateLimitResource()
-        {
-
-        }
-    }
+{
+
+  public class RateLimitResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateRateLimitOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/RateLimits",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Rate Limit for a Service
+    /// </summary>
+    /// <param name="options"> Create RateLimit parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RateLimit </returns>
+    public static RateLimitResource Create(CreateRateLimitOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Rate Limit for a Service
+    /// </summary>
+    /// <param name="options"> Create RateLimit parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RateLimit </returns>
+    public static async System.Threading.Tasks.Task<RateLimitResource> CreateAsync(CreateRateLimitOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Rate Limit for a Service
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="uniqueName"> A unique, developer assigned name of this Rate Limit. </param>
+    /// <param name="description"> Description of this Rate Limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RateLimit </returns>
+    public static RateLimitResource Create(string pathServiceSid,
+                                           string uniqueName,
+                                           string description = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateRateLimitOptions(pathServiceSid, uniqueName) { Description = description };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Rate Limit for a Service
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="uniqueName"> A unique, developer assigned name of this Rate Limit. </param>
+    /// <param name="description"> Description of this Rate Limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RateLimit </returns>
+    public static async System.Threading.Tasks.Task<RateLimitResource> CreateAsync(string pathServiceSid,
+                                                                                   string uniqueName,
+                                                                                   string description = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateRateLimitOptions(pathServiceSid, uniqueName) { Description = description };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateRateLimitOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Rate Limit.
+    /// </summary>
+    /// <param name="options"> Update RateLimit parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RateLimit </returns>
+    public static RateLimitResource Update(UpdateRateLimitOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Rate Limit.
+    /// </summary>
+    /// <param name="options"> Update RateLimit parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RateLimit </returns>
+    public static async System.Threading.Tasks.Task<RateLimitResource> UpdateAsync(UpdateRateLimitOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Rate Limit.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="description"> Description of this Rate Limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RateLimit </returns>
+    public static RateLimitResource Update(string pathServiceSid,
+                                           string pathSid,
+                                           string description = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateRateLimitOptions(pathServiceSid, pathSid) { Description = description };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Rate Limit.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="description"> Description of this Rate Limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RateLimit </returns>
+    public static async System.Threading.Tasks.Task<RateLimitResource> UpdateAsync(string pathServiceSid,
+                                                                                   string pathSid,
+                                                                                   string description = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateRateLimitOptions(pathServiceSid, pathSid) { Description = description };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchRateLimitOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Rate Limit.
+    /// </summary>
+    /// <param name="options"> Fetch RateLimit parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RateLimit </returns>
+    public static RateLimitResource Fetch(FetchRateLimitOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Rate Limit.
+    /// </summary>
+    /// <param name="options"> Fetch RateLimit parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RateLimit </returns>
+    public static async System.Threading.Tasks.Task<RateLimitResource> FetchAsync(FetchRateLimitOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Rate Limit.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RateLimit </returns>
+    public static RateLimitResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRateLimitOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Rate Limit.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RateLimit </returns>
+    public static async System.Threading.Tasks.Task<RateLimitResource> FetchAsync(string pathServiceSid,
+                                                                                  string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchRateLimitOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRateLimitOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/RateLimits",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Rate Limits for a service.
+    /// </summary>
+    /// <param name="options"> Read RateLimit parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RateLimit </returns>
+    public static ResourceSet<RateLimitResource> Read(ReadRateLimitOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RateLimitResource>.FromJson("rate_limits", response.Content);
+      return new ResourceSet<RateLimitResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Rate Limits for a service.
+    /// </summary>
+    /// <param name="options"> Read RateLimit parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RateLimit </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RateLimitResource>> ReadAsync(ReadRateLimitOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RateLimitResource>.FromJson("rate_limits", response.Content);
+      return new ResourceSet<RateLimitResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Rate Limits for a service.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RateLimit </returns>
+    public static ResourceSet<RateLimitResource> Read(string pathServiceSid,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadRateLimitOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Rate Limits for a service.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RateLimit </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RateLimitResource>> ReadAsync(string pathServiceSid,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadRateLimitOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RateLimitResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RateLimitResource>.FromJson("rate_limits", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RateLimitResource> NextPage(Page<RateLimitResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<RateLimitResource>.FromJson("rate_limits", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RateLimitResource> PreviousPage(Page<RateLimitResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<RateLimitResource>.FromJson("rate_limits", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteRateLimitOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/RateLimits/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Rate Limit.
+    /// </summary>
+    /// <param name="options"> Delete RateLimit parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RateLimit </returns>
+    public static bool Delete(DeleteRateLimitOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Rate Limit.
+    /// </summary>
+    /// <param name="options"> Delete RateLimit parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RateLimit </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRateLimitOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Rate Limit.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RateLimit </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRateLimitOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Rate Limit.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the Service that the resource is associated with </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RateLimit </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteRateLimitOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RateLimitResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RateLimitResource object represented by the provided JSON </returns>
+    public static RateLimitResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RateLimitResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Rate Limit.
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// A unique, developer assigned name of this Rate Limit.
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// Description of this Rate Limit
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The URL of this resource.
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private RateLimitResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/VerificationCheckOptions.cs b/src/Twilio/Rest/Verify/V2/Service/VerificationCheckOptions.cs
index 638736b0b..b108fbc6e 100644
--- a/src/Twilio/Rest/Verify/V2/Service/VerificationCheckOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/VerificationCheckOptions.cs
@@ -9,82 +9,82 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// challenge a specific Verification Check.
+  /// </summary>
+  public class CreateVerificationCheckOptions : IOptions<VerificationCheckResource>
+  {
     /// <summary>
-    /// challenge a specific Verification Check.
+    /// The SID of the verification Service to create the resource under
     /// </summary>
-    public class CreateVerificationCheckOptions : IOptions<VerificationCheckResource>
-    {
-        /// <summary>
-        /// The SID of the verification Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The verification string
-        /// </summary>
-        public string Code { get; }
-        /// <summary>
-        /// The phone number or email to verify
-        /// </summary>
-        public string To { get; set; }
-        /// <summary>
-        /// A SID that uniquely identifies the Verification Check
-        /// </summary>
-        public string VerificationSid { get; set; }
-        /// <summary>
-        /// The amount of the associated PSD2 compliant transaction.
-        /// </summary>
-        public string Amount { get; set; }
-        /// <summary>
-        /// The payee of the associated PSD2 compliant transaction
-        /// </summary>
-        public string Payee { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateVerificationCheckOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the verification Service to create the resource under </param>
-        /// <param name="code"> The verification string </param>
-        public CreateVerificationCheckOptions(string pathServiceSid, string code)
-        {
-            PathServiceSid = pathServiceSid;
-            Code = code;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Code != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Code", Code));
-            }
-
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To));
-            }
-
-            if (VerificationSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VerificationSid", VerificationSid.ToString()));
-            }
-
-            if (Amount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Amount", Amount));
-            }
-
-            if (Payee != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Payee", Payee));
-            }
-
-            return p;
-        }
-    }
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The verification string
+    /// </summary>
+    public string Code { get; }
+    /// <summary>
+    /// The phone number or email to verify
+    /// </summary>
+    public string To { get; set; }
+    /// <summary>
+    /// A SID that uniquely identifies the Verification Check
+    /// </summary>
+    public string VerificationSid { get; set; }
+    /// <summary>
+    /// The amount of the associated PSD2 compliant transaction.
+    /// </summary>
+    public string Amount { get; set; }
+    /// <summary>
+    /// The payee of the associated PSD2 compliant transaction
+    /// </summary>
+    public string Payee { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateVerificationCheckOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the verification Service to create the resource under </param>
+    /// <param name="code"> The verification string </param>
+    public CreateVerificationCheckOptions(string pathServiceSid, string code)
+    {
+      PathServiceSid = pathServiceSid;
+      Code = code;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Code != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Code", Code));
+      }
+
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To));
+      }
+
+      if (VerificationSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VerificationSid", VerificationSid.ToString()));
+      }
+
+      if (Amount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Amount", Amount));
+      }
+
+      if (Payee != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Payee", Payee));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/VerificationCheckResource.cs b/src/Twilio/Rest/Verify/V2/Service/VerificationCheckResource.cs
index f50418612..273bea4af 100644
--- a/src/Twilio/Rest/Verify/V2/Service/VerificationCheckResource.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/VerificationCheckResource.cs
@@ -17,193 +17,193 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
-    public class VerificationCheckResource : Resource
-    {
-        public sealed class ChannelEnum : StringEnum
-        {
-            private ChannelEnum(string value) : base(value) {}
-            public ChannelEnum() {}
-            public static implicit operator ChannelEnum(string value)
-            {
-                return new ChannelEnum(value);
-            }
-
-            public static readonly ChannelEnum Sms = new ChannelEnum("sms");
-            public static readonly ChannelEnum Call = new ChannelEnum("call");
-            public static readonly ChannelEnum Email = new ChannelEnum("email");
-            public static readonly ChannelEnum Whatsapp = new ChannelEnum("whatsapp");
-        }
-
-        private static Request BuildCreateRequest(CreateVerificationCheckOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/VerificationCheck",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// challenge a specific Verification Check.
-        /// </summary>
-        /// <param name="options"> Create VerificationCheck parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of VerificationCheck </returns>
-        public static VerificationCheckResource Create(CreateVerificationCheckOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// challenge a specific Verification Check.
-        /// </summary>
-        /// <param name="options"> Create VerificationCheck parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of VerificationCheck </returns>
-        public static async System.Threading.Tasks.Task<VerificationCheckResource> CreateAsync(CreateVerificationCheckOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// challenge a specific Verification Check.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the verification Service to create the resource under </param>
-        /// <param name="code"> The verification string </param>
-        /// <param name="to"> The phone number or email to verify </param>
-        /// <param name="verificationSid"> A SID that uniquely identifies the Verification Check </param>
-        /// <param name="amount"> The amount of the associated PSD2 compliant transaction. </param>
-        /// <param name="payee"> The payee of the associated PSD2 compliant transaction </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of VerificationCheck </returns>
-        public static VerificationCheckResource Create(string pathServiceSid,
-                                                       string code,
-                                                       string to = null,
-                                                       string verificationSid = null,
-                                                       string amount = null,
-                                                       string payee = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateVerificationCheckOptions(pathServiceSid, code){To = to, VerificationSid = verificationSid, Amount = amount, Payee = payee};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// challenge a specific Verification Check.
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the verification Service to create the resource under </param>
-        /// <param name="code"> The verification string </param>
-        /// <param name="to"> The phone number or email to verify </param>
-        /// <param name="verificationSid"> A SID that uniquely identifies the Verification Check </param>
-        /// <param name="amount"> The amount of the associated PSD2 compliant transaction. </param>
-        /// <param name="payee"> The payee of the associated PSD2 compliant transaction </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of VerificationCheck </returns>
-        public static async System.Threading.Tasks.Task<VerificationCheckResource> CreateAsync(string pathServiceSid,
-                                                                                               string code,
-                                                                                               string to = null,
-                                                                                               string verificationSid = null,
-                                                                                               string amount = null,
-                                                                                               string payee = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateVerificationCheckOptions(pathServiceSid, code){To = to, VerificationSid = verificationSid, Amount = amount, Payee = payee};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a VerificationCheckResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> VerificationCheckResource object represented by the provided JSON </returns>
-        public static VerificationCheckResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<VerificationCheckResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The phone number or email being verified
-        /// </summary>
-        [JsonProperty("to")]
-        public string To { get; private set; }
-        /// <summary>
-        /// The verification method to use
-        /// </summary>
-        [JsonProperty("channel")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public VerificationCheckResource.ChannelEnum Channel { get; private set; }
-        /// <summary>
-        /// The status of the verification resource
-        /// </summary>
-        [JsonProperty("status")]
-        public string Status { get; private set; }
-        /// <summary>
-        /// Whether the verification was successful
-        /// </summary>
-        [JsonProperty("valid")]
-        public bool? Valid { get; private set; }
-        /// <summary>
-        /// The amount of the associated PSD2 compliant transaction.
-        /// </summary>
-        [JsonProperty("amount")]
-        public string Amount { get; private set; }
-        /// <summary>
-        /// The payee of the associated PSD2 compliant transaction
-        /// </summary>
-        [JsonProperty("payee")]
-        public string Payee { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Verification Check resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Verification Check resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private VerificationCheckResource()
-        {
-
-        }
-    }
+{
+
+  public class VerificationCheckResource : Resource
+  {
+    public sealed class ChannelEnum : StringEnum
+    {
+      private ChannelEnum(string value) : base(value) { }
+      public ChannelEnum() { }
+      public static implicit operator ChannelEnum(string value)
+      {
+        return new ChannelEnum(value);
+      }
+
+      public static readonly ChannelEnum Sms = new ChannelEnum("sms");
+      public static readonly ChannelEnum Call = new ChannelEnum("call");
+      public static readonly ChannelEnum Email = new ChannelEnum("email");
+      public static readonly ChannelEnum Whatsapp = new ChannelEnum("whatsapp");
+    }
+
+    private static Request BuildCreateRequest(CreateVerificationCheckOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/VerificationCheck",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// challenge a specific Verification Check.
+    /// </summary>
+    /// <param name="options"> Create VerificationCheck parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of VerificationCheck </returns>
+    public static VerificationCheckResource Create(CreateVerificationCheckOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// challenge a specific Verification Check.
+    /// </summary>
+    /// <param name="options"> Create VerificationCheck parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of VerificationCheck </returns>
+    public static async System.Threading.Tasks.Task<VerificationCheckResource> CreateAsync(CreateVerificationCheckOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// challenge a specific Verification Check.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the verification Service to create the resource under </param>
+    /// <param name="code"> The verification string </param>
+    /// <param name="to"> The phone number or email to verify </param>
+    /// <param name="verificationSid"> A SID that uniquely identifies the Verification Check </param>
+    /// <param name="amount"> The amount of the associated PSD2 compliant transaction. </param>
+    /// <param name="payee"> The payee of the associated PSD2 compliant transaction </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of VerificationCheck </returns>
+    public static VerificationCheckResource Create(string pathServiceSid,
+                                                   string code,
+                                                   string to = null,
+                                                   string verificationSid = null,
+                                                   string amount = null,
+                                                   string payee = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateVerificationCheckOptions(pathServiceSid, code) { To = to, VerificationSid = verificationSid, Amount = amount, Payee = payee };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// challenge a specific Verification Check.
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the verification Service to create the resource under </param>
+    /// <param name="code"> The verification string </param>
+    /// <param name="to"> The phone number or email to verify </param>
+    /// <param name="verificationSid"> A SID that uniquely identifies the Verification Check </param>
+    /// <param name="amount"> The amount of the associated PSD2 compliant transaction. </param>
+    /// <param name="payee"> The payee of the associated PSD2 compliant transaction </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of VerificationCheck </returns>
+    public static async System.Threading.Tasks.Task<VerificationCheckResource> CreateAsync(string pathServiceSid,
+                                                                                           string code,
+                                                                                           string to = null,
+                                                                                           string verificationSid = null,
+                                                                                           string amount = null,
+                                                                                           string payee = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateVerificationCheckOptions(pathServiceSid, code) { To = to, VerificationSid = verificationSid, Amount = amount, Payee = payee };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a VerificationCheckResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> VerificationCheckResource object represented by the provided JSON </returns>
+    public static VerificationCheckResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<VerificationCheckResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The phone number or email being verified
+    /// </summary>
+    [JsonProperty("to")]
+    public string To { get; private set; }
+    /// <summary>
+    /// The verification method to use
+    /// </summary>
+    [JsonProperty("channel")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public VerificationCheckResource.ChannelEnum Channel { get; private set; }
+    /// <summary>
+    /// The status of the verification resource
+    /// </summary>
+    [JsonProperty("status")]
+    public string Status { get; private set; }
+    /// <summary>
+    /// Whether the verification was successful
+    /// </summary>
+    [JsonProperty("valid")]
+    public bool? Valid { get; private set; }
+    /// <summary>
+    /// The amount of the associated PSD2 compliant transaction.
+    /// </summary>
+    [JsonProperty("amount")]
+    public string Amount { get; private set; }
+    /// <summary>
+    /// The payee of the associated PSD2 compliant transaction
+    /// </summary>
+    [JsonProperty("payee")]
+    public string Payee { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Verification Check resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Verification Check resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private VerificationCheckResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/VerificationOptions.cs b/src/Twilio/Rest/Verify/V2/Service/VerificationOptions.cs
index 1c01b10e7..b316a2137 100644
--- a/src/Twilio/Rest/Verify/V2/Service/VerificationOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/VerificationOptions.cs
@@ -9,246 +9,246 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// Create a new Verification using a Service
+  /// </summary>
+  public class CreateVerificationOptions : IOptions<VerificationResource>
+  {
     /// <summary>
-    /// Create a new Verification using a Service
-    /// </summary>
-    public class CreateVerificationOptions : IOptions<VerificationResource>
-    {
-        /// <summary>
-        /// The SID of the verification Service to create the resource under
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The phone number or email to verify
-        /// </summary>
-        public string To { get; }
-        /// <summary>
-        /// The verification method to use
-        /// </summary>
-        public string Channel { get; }
-        /// <summary>
-        /// A custom user defined friendly name
-        /// </summary>
-        public string CustomFriendlyName { get; set; }
-        /// <summary>
-        /// The text of a custom message to use for the verification
-        /// </summary>
-        public string CustomMessage { get; set; }
-        /// <summary>
-        /// The digits to send after a phone call is answered
-        /// </summary>
-        public string SendDigits { get; set; }
-        /// <summary>
-        /// The locale to use for the verification SMS, WhatsApp or call
-        /// </summary>
-        public string Locale { get; set; }
-        /// <summary>
-        /// A pre-generated code
-        /// </summary>
-        public string CustomCode { get; set; }
-        /// <summary>
-        /// The amount of the associated PSD2 compliant transaction.
-        /// </summary>
-        public string Amount { get; set; }
-        /// <summary>
-        /// The payee of the associated PSD2 compliant transaction
-        /// </summary>
-        public string Payee { get; set; }
-        /// <summary>
-        /// The custom key-value pairs of Programmable Rate Limits.
-        /// </summary>
-        public object RateLimits { get; set; }
-        /// <summary>
-        /// Channel specific configuration in json format.
-        /// </summary>
-        public object ChannelConfiguration { get; set; }
-        /// <summary>
-        /// Your App Hash to be appended at the end of an SMS.
-        /// </summary>
-        public string AppHash { get; set; }
-        /// <summary>
-        /// The verification template SMS messages.
-        /// </summary>
-        public string TemplateSid { get; set; }
-        /// <summary>
-        /// The values of the special variables declared on the message template.
-        /// </summary>
-        public string TemplateCustomSubstitutions { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateVerificationOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the verification Service to create the resource under </param>
-        /// <param name="to"> The phone number or email to verify </param>
-        /// <param name="channel"> The verification method to use </param>
-        public CreateVerificationOptions(string pathServiceSid, string to, string channel)
-        {
-            PathServiceSid = pathServiceSid;
-            To = to;
-            Channel = channel;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (To != null)
-            {
-                p.Add(new KeyValuePair<string, string>("To", To));
-            }
-
-            if (Channel != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Channel", Channel));
-            }
-
-            if (CustomFriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CustomFriendlyName", CustomFriendlyName));
-            }
-
-            if (CustomMessage != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CustomMessage", CustomMessage));
-            }
-
-            if (SendDigits != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SendDigits", SendDigits));
-            }
-
-            if (Locale != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Locale", Locale));
-            }
-
-            if (CustomCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CustomCode", CustomCode));
-            }
-
-            if (Amount != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Amount", Amount));
-            }
-
-            if (Payee != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Payee", Payee));
-            }
-
-            if (RateLimits != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RateLimits", Serializers.JsonObject(RateLimits)));
-            }
-
-            if (ChannelConfiguration != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelConfiguration", Serializers.JsonObject(ChannelConfiguration)));
-            }
-
-            if (AppHash != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AppHash", AppHash));
-            }
-
-            if (TemplateSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TemplateSid", TemplateSid.ToString()));
-            }
-
-            if (TemplateCustomSubstitutions != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TemplateCustomSubstitutions", TemplateCustomSubstitutions));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID of the verification Service to create the resource under
+    /// </summary>
+    public string PathServiceSid { get; }
     /// <summary>
-    /// Update a Verification status
-    /// </summary>
-    public class UpdateVerificationOptions : IOptions<VerificationResource>
-    {
-        /// <summary>
-        /// The SID of the verification Service to update the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The new status of the resource
-        /// </summary>
-        public VerificationResource.StatusEnum Status { get; }
-
-        /// <summary>
-        /// Construct a new UpdateVerificationOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the verification Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="status"> The new status of the resource </param>
-        public UpdateVerificationOptions(string pathServiceSid, string pathSid, VerificationResource.StatusEnum status)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-            Status = status;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The phone number or email to verify
+    /// </summary>
+    public string To { get; }
     /// <summary>
-    /// Fetch a specific Verification
-    /// </summary>
-    public class FetchVerificationOptions : IOptions<VerificationResource>
-    {
-        /// <summary>
-        /// The SID of the verification Service to fetch the resource from
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchVerificationOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the verification Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchVerificationOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// The verification method to use
+    /// </summary>
+    public string Channel { get; }
+    /// <summary>
+    /// A custom user defined friendly name
+    /// </summary>
+    public string CustomFriendlyName { get; set; }
+    /// <summary>
+    /// The text of a custom message to use for the verification
+    /// </summary>
+    public string CustomMessage { get; set; }
+    /// <summary>
+    /// The digits to send after a phone call is answered
+    /// </summary>
+    public string SendDigits { get; set; }
+    /// <summary>
+    /// The locale to use for the verification SMS, WhatsApp or call
+    /// </summary>
+    public string Locale { get; set; }
+    /// <summary>
+    /// A pre-generated code
+    /// </summary>
+    public string CustomCode { get; set; }
+    /// <summary>
+    /// The amount of the associated PSD2 compliant transaction.
+    /// </summary>
+    public string Amount { get; set; }
+    /// <summary>
+    /// The payee of the associated PSD2 compliant transaction
+    /// </summary>
+    public string Payee { get; set; }
+    /// <summary>
+    /// The custom key-value pairs of Programmable Rate Limits.
+    /// </summary>
+    public object RateLimits { get; set; }
+    /// <summary>
+    /// Channel specific configuration in json format.
+    /// </summary>
+    public object ChannelConfiguration { get; set; }
+    /// <summary>
+    /// Your App Hash to be appended at the end of an SMS.
+    /// </summary>
+    public string AppHash { get; set; }
+    /// <summary>
+    /// The verification template SMS messages.
+    /// </summary>
+    public string TemplateSid { get; set; }
+    /// <summary>
+    /// The values of the special variables declared on the message template.
+    /// </summary>
+    public string TemplateCustomSubstitutions { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateVerificationOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the verification Service to create the resource under </param>
+    /// <param name="to"> The phone number or email to verify </param>
+    /// <param name="channel"> The verification method to use </param>
+    public CreateVerificationOptions(string pathServiceSid, string to, string channel)
+    {
+      PathServiceSid = pathServiceSid;
+      To = to;
+      Channel = channel;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (To != null)
+      {
+        p.Add(new KeyValuePair<string, string>("To", To));
+      }
+
+      if (Channel != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Channel", Channel));
+      }
+
+      if (CustomFriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CustomFriendlyName", CustomFriendlyName));
+      }
+
+      if (CustomMessage != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CustomMessage", CustomMessage));
+      }
+
+      if (SendDigits != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SendDigits", SendDigits));
+      }
+
+      if (Locale != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Locale", Locale));
+      }
+
+      if (CustomCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CustomCode", CustomCode));
+      }
+
+      if (Amount != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Amount", Amount));
+      }
+
+      if (Payee != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Payee", Payee));
+      }
+
+      if (RateLimits != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RateLimits", Serializers.JsonObject(RateLimits)));
+      }
+
+      if (ChannelConfiguration != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelConfiguration", Serializers.JsonObject(ChannelConfiguration)));
+      }
+
+      if (AppHash != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AppHash", AppHash));
+      }
+
+      if (TemplateSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TemplateSid", TemplateSid.ToString()));
+      }
+
+      if (TemplateCustomSubstitutions != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TemplateCustomSubstitutions", TemplateCustomSubstitutions));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update a Verification status
+  /// </summary>
+  public class UpdateVerificationOptions : IOptions<VerificationResource>
+  {
+    /// <summary>
+    /// The SID of the verification Service to update the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The new status of the resource
+    /// </summary>
+    public VerificationResource.StatusEnum Status { get; }
+
+    /// <summary>
+    /// Construct a new UpdateVerificationOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the verification Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="status"> The new status of the resource </param>
+    public UpdateVerificationOptions(string pathServiceSid, string pathSid, VerificationResource.StatusEnum status)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+      Status = status;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific Verification
+  /// </summary>
+  public class FetchVerificationOptions : IOptions<VerificationResource>
+  {
+    /// <summary>
+    /// The SID of the verification Service to fetch the resource from
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchVerificationOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the verification Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchVerificationOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/VerificationResource.cs b/src/Twilio/Rest/Verify/V2/Service/VerificationResource.cs
index 8df563861..ea1d4e4d7 100644
--- a/src/Twilio/Rest/Verify/V2/Service/VerificationResource.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/VerificationResource.cs
@@ -17,404 +17,404 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
-    public class VerificationResource : Resource
-    {
-        public sealed class ChannelEnum : StringEnum
-        {
-            private ChannelEnum(string value) : base(value) {}
-            public ChannelEnum() {}
-            public static implicit operator ChannelEnum(string value)
-            {
-                return new ChannelEnum(value);
-            }
-
-            public static readonly ChannelEnum Sms = new ChannelEnum("sms");
-            public static readonly ChannelEnum Call = new ChannelEnum("call");
-            public static readonly ChannelEnum Email = new ChannelEnum("email");
-            public static readonly ChannelEnum Whatsapp = new ChannelEnum("whatsapp");
-        }
-
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Canceled = new StatusEnum("canceled");
-            public static readonly StatusEnum Approved = new StatusEnum("approved");
-        }
-
-        private static Request BuildCreateRequest(CreateVerificationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Verifications",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Verification using a Service
-        /// </summary>
-        /// <param name="options"> Create Verification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Verification </returns>
-        public static VerificationResource Create(CreateVerificationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Verification using a Service
-        /// </summary>
-        /// <param name="options"> Create Verification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Verification </returns>
-        public static async System.Threading.Tasks.Task<VerificationResource> CreateAsync(CreateVerificationOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Verification using a Service
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the verification Service to create the resource under </param>
-        /// <param name="to"> The phone number or email to verify </param>
-        /// <param name="channel"> The verification method to use </param>
-        /// <param name="customFriendlyName"> A custom user defined friendly name </param>
-        /// <param name="customMessage"> The text of a custom message to use for the verification </param>
-        /// <param name="sendDigits"> The digits to send after a phone call is answered </param>
-        /// <param name="locale"> The locale to use for the verification SMS, WhatsApp or call </param>
-        /// <param name="customCode"> A pre-generated code </param>
-        /// <param name="amount"> The amount of the associated PSD2 compliant transaction. </param>
-        /// <param name="payee"> The payee of the associated PSD2 compliant transaction </param>
-        /// <param name="rateLimits"> The custom key-value pairs of Programmable Rate Limits. </param>
-        /// <param name="channelConfiguration"> Channel specific configuration in json format. </param>
-        /// <param name="appHash"> Your App Hash to be appended at the end of an SMS. </param>
-        /// <param name="templateSid"> The verification template SMS messages. </param>
-        /// <param name="templateCustomSubstitutions"> The values of the special variables declared on the message template.
-        ///                                   </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Verification </returns>
-        public static VerificationResource Create(string pathServiceSid,
-                                                  string to,
-                                                  string channel,
-                                                  string customFriendlyName = null,
-                                                  string customMessage = null,
-                                                  string sendDigits = null,
-                                                  string locale = null,
-                                                  string customCode = null,
-                                                  string amount = null,
-                                                  string payee = null,
-                                                  object rateLimits = null,
-                                                  object channelConfiguration = null,
-                                                  string appHash = null,
-                                                  string templateSid = null,
-                                                  string templateCustomSubstitutions = null,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateVerificationOptions(pathServiceSid, to, channel){CustomFriendlyName = customFriendlyName, CustomMessage = customMessage, SendDigits = sendDigits, Locale = locale, CustomCode = customCode, Amount = amount, Payee = payee, RateLimits = rateLimits, ChannelConfiguration = channelConfiguration, AppHash = appHash, TemplateSid = templateSid, TemplateCustomSubstitutions = templateCustomSubstitutions};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Verification using a Service
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the verification Service to create the resource under </param>
-        /// <param name="to"> The phone number or email to verify </param>
-        /// <param name="channel"> The verification method to use </param>
-        /// <param name="customFriendlyName"> A custom user defined friendly name </param>
-        /// <param name="customMessage"> The text of a custom message to use for the verification </param>
-        /// <param name="sendDigits"> The digits to send after a phone call is answered </param>
-        /// <param name="locale"> The locale to use for the verification SMS, WhatsApp or call </param>
-        /// <param name="customCode"> A pre-generated code </param>
-        /// <param name="amount"> The amount of the associated PSD2 compliant transaction. </param>
-        /// <param name="payee"> The payee of the associated PSD2 compliant transaction </param>
-        /// <param name="rateLimits"> The custom key-value pairs of Programmable Rate Limits. </param>
-        /// <param name="channelConfiguration"> Channel specific configuration in json format. </param>
-        /// <param name="appHash"> Your App Hash to be appended at the end of an SMS. </param>
-        /// <param name="templateSid"> The verification template SMS messages. </param>
-        /// <param name="templateCustomSubstitutions"> The values of the special variables declared on the message template.
-        ///                                   </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Verification </returns>
-        public static async System.Threading.Tasks.Task<VerificationResource> CreateAsync(string pathServiceSid,
-                                                                                          string to,
-                                                                                          string channel,
-                                                                                          string customFriendlyName = null,
-                                                                                          string customMessage = null,
-                                                                                          string sendDigits = null,
-                                                                                          string locale = null,
-                                                                                          string customCode = null,
-                                                                                          string amount = null,
-                                                                                          string payee = null,
-                                                                                          object rateLimits = null,
-                                                                                          object channelConfiguration = null,
-                                                                                          string appHash = null,
-                                                                                          string templateSid = null,
-                                                                                          string templateCustomSubstitutions = null,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateVerificationOptions(pathServiceSid, to, channel){CustomFriendlyName = customFriendlyName, CustomMessage = customMessage, SendDigits = sendDigits, Locale = locale, CustomCode = customCode, Amount = amount, Payee = payee, RateLimits = rateLimits, ChannelConfiguration = channelConfiguration, AppHash = appHash, TemplateSid = templateSid, TemplateCustomSubstitutions = templateCustomSubstitutions};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateVerificationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Verifications/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a Verification status
-        /// </summary>
-        /// <param name="options"> Update Verification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Verification </returns>
-        public static VerificationResource Update(UpdateVerificationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a Verification status
-        /// </summary>
-        /// <param name="options"> Update Verification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Verification </returns>
-        public static async System.Threading.Tasks.Task<VerificationResource> UpdateAsync(UpdateVerificationOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a Verification status
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the verification Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Verification </returns>
-        public static VerificationResource Update(string pathServiceSid,
-                                                  string pathSid,
-                                                  VerificationResource.StatusEnum status,
-                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateVerificationOptions(pathServiceSid, pathSid, status);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a Verification status
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the verification Service to update the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Verification </returns>
-        public static async System.Threading.Tasks.Task<VerificationResource> UpdateAsync(string pathServiceSid,
-                                                                                          string pathSid,
-                                                                                          VerificationResource.StatusEnum status,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateVerificationOptions(pathServiceSid, pathSid, status);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchVerificationOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Verifications/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Verification
-        /// </summary>
-        /// <param name="options"> Fetch Verification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Verification </returns>
-        public static VerificationResource Fetch(FetchVerificationOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Verification
-        /// </summary>
-        /// <param name="options"> Fetch Verification parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Verification </returns>
-        public static async System.Threading.Tasks.Task<VerificationResource> FetchAsync(FetchVerificationOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Verification
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the verification Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Verification </returns>
-        public static VerificationResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchVerificationOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Verification
-        /// </summary>
-        /// <param name="pathServiceSid"> The SID of the verification Service to fetch the resource from </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Verification </returns>
-        public static async System.Threading.Tasks.Task<VerificationResource> FetchAsync(string pathServiceSid,
-                                                                                         string pathSid,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new FetchVerificationOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a VerificationResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> VerificationResource object represented by the provided JSON </returns>
-        public static VerificationResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<VerificationResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Service that the resource is associated with
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The phone number or email being verified
-        /// </summary>
-        [JsonProperty("to")]
-        public string To { get; private set; }
-        /// <summary>
-        /// The verification method used.
-        /// </summary>
-        [JsonProperty("channel")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public VerificationResource.ChannelEnum Channel { get; private set; }
-        /// <summary>
-        /// The status of the verification resource
-        /// </summary>
-        [JsonProperty("status")]
-        public string Status { get; private set; }
-        /// <summary>
-        /// Whether the verification was successful
-        /// </summary>
-        [JsonProperty("valid")]
-        public bool? Valid { get; private set; }
-        /// <summary>
-        /// Information about the phone number being verified
-        /// </summary>
-        [JsonProperty("lookup")]
-        public object Lookup { get; private set; }
-        /// <summary>
-        /// The amount of the associated PSD2 compliant transaction.
-        /// </summary>
-        [JsonProperty("amount")]
-        public string Amount { get; private set; }
-        /// <summary>
-        /// The payee of the associated PSD2 compliant transaction
-        /// </summary>
-        [JsonProperty("payee")]
-        public string Payee { get; private set; }
-        /// <summary>
-        /// An array of verification attempt objects.
-        /// </summary>
-        [JsonProperty("send_code_attempts")]
-        public List<object> SendCodeAttempts { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Verification resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private VerificationResource()
-        {
-
-        }
-    }
+{
+
+  public class VerificationResource : Resource
+  {
+    public sealed class ChannelEnum : StringEnum
+    {
+      private ChannelEnum(string value) : base(value) { }
+      public ChannelEnum() { }
+      public static implicit operator ChannelEnum(string value)
+      {
+        return new ChannelEnum(value);
+      }
+
+      public static readonly ChannelEnum Sms = new ChannelEnum("sms");
+      public static readonly ChannelEnum Call = new ChannelEnum("call");
+      public static readonly ChannelEnum Email = new ChannelEnum("email");
+      public static readonly ChannelEnum Whatsapp = new ChannelEnum("whatsapp");
+    }
+
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Canceled = new StatusEnum("canceled");
+      public static readonly StatusEnum Approved = new StatusEnum("approved");
+    }
+
+    private static Request BuildCreateRequest(CreateVerificationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Verifications",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Verification using a Service
+    /// </summary>
+    /// <param name="options"> Create Verification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Verification </returns>
+    public static VerificationResource Create(CreateVerificationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Verification using a Service
+    /// </summary>
+    /// <param name="options"> Create Verification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Verification </returns>
+    public static async System.Threading.Tasks.Task<VerificationResource> CreateAsync(CreateVerificationOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Verification using a Service
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the verification Service to create the resource under </param>
+    /// <param name="to"> The phone number or email to verify </param>
+    /// <param name="channel"> The verification method to use </param>
+    /// <param name="customFriendlyName"> A custom user defined friendly name </param>
+    /// <param name="customMessage"> The text of a custom message to use for the verification </param>
+    /// <param name="sendDigits"> The digits to send after a phone call is answered </param>
+    /// <param name="locale"> The locale to use for the verification SMS, WhatsApp or call </param>
+    /// <param name="customCode"> A pre-generated code </param>
+    /// <param name="amount"> The amount of the associated PSD2 compliant transaction. </param>
+    /// <param name="payee"> The payee of the associated PSD2 compliant transaction </param>
+    /// <param name="rateLimits"> The custom key-value pairs of Programmable Rate Limits. </param>
+    /// <param name="channelConfiguration"> Channel specific configuration in json format. </param>
+    /// <param name="appHash"> Your App Hash to be appended at the end of an SMS. </param>
+    /// <param name="templateSid"> The verification template SMS messages. </param>
+    /// <param name="templateCustomSubstitutions"> The values of the special variables declared on the message template.
+    ///                                   </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Verification </returns>
+    public static VerificationResource Create(string pathServiceSid,
+                                              string to,
+                                              string channel,
+                                              string customFriendlyName = null,
+                                              string customMessage = null,
+                                              string sendDigits = null,
+                                              string locale = null,
+                                              string customCode = null,
+                                              string amount = null,
+                                              string payee = null,
+                                              object rateLimits = null,
+                                              object channelConfiguration = null,
+                                              string appHash = null,
+                                              string templateSid = null,
+                                              string templateCustomSubstitutions = null,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateVerificationOptions(pathServiceSid, to, channel) { CustomFriendlyName = customFriendlyName, CustomMessage = customMessage, SendDigits = sendDigits, Locale = locale, CustomCode = customCode, Amount = amount, Payee = payee, RateLimits = rateLimits, ChannelConfiguration = channelConfiguration, AppHash = appHash, TemplateSid = templateSid, TemplateCustomSubstitutions = templateCustomSubstitutions };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Verification using a Service
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the verification Service to create the resource under </param>
+    /// <param name="to"> The phone number or email to verify </param>
+    /// <param name="channel"> The verification method to use </param>
+    /// <param name="customFriendlyName"> A custom user defined friendly name </param>
+    /// <param name="customMessage"> The text of a custom message to use for the verification </param>
+    /// <param name="sendDigits"> The digits to send after a phone call is answered </param>
+    /// <param name="locale"> The locale to use for the verification SMS, WhatsApp or call </param>
+    /// <param name="customCode"> A pre-generated code </param>
+    /// <param name="amount"> The amount of the associated PSD2 compliant transaction. </param>
+    /// <param name="payee"> The payee of the associated PSD2 compliant transaction </param>
+    /// <param name="rateLimits"> The custom key-value pairs of Programmable Rate Limits. </param>
+    /// <param name="channelConfiguration"> Channel specific configuration in json format. </param>
+    /// <param name="appHash"> Your App Hash to be appended at the end of an SMS. </param>
+    /// <param name="templateSid"> The verification template SMS messages. </param>
+    /// <param name="templateCustomSubstitutions"> The values of the special variables declared on the message template.
+    ///                                   </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Verification </returns>
+    public static async System.Threading.Tasks.Task<VerificationResource> CreateAsync(string pathServiceSid,
+                                                                                      string to,
+                                                                                      string channel,
+                                                                                      string customFriendlyName = null,
+                                                                                      string customMessage = null,
+                                                                                      string sendDigits = null,
+                                                                                      string locale = null,
+                                                                                      string customCode = null,
+                                                                                      string amount = null,
+                                                                                      string payee = null,
+                                                                                      object rateLimits = null,
+                                                                                      object channelConfiguration = null,
+                                                                                      string appHash = null,
+                                                                                      string templateSid = null,
+                                                                                      string templateCustomSubstitutions = null,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateVerificationOptions(pathServiceSid, to, channel) { CustomFriendlyName = customFriendlyName, CustomMessage = customMessage, SendDigits = sendDigits, Locale = locale, CustomCode = customCode, Amount = amount, Payee = payee, RateLimits = rateLimits, ChannelConfiguration = channelConfiguration, AppHash = appHash, TemplateSid = templateSid, TemplateCustomSubstitutions = templateCustomSubstitutions };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateVerificationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Verifications/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a Verification status
+    /// </summary>
+    /// <param name="options"> Update Verification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Verification </returns>
+    public static VerificationResource Update(UpdateVerificationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a Verification status
+    /// </summary>
+    /// <param name="options"> Update Verification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Verification </returns>
+    public static async System.Threading.Tasks.Task<VerificationResource> UpdateAsync(UpdateVerificationOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a Verification status
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the verification Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Verification </returns>
+    public static VerificationResource Update(string pathServiceSid,
+                                              string pathSid,
+                                              VerificationResource.StatusEnum status,
+                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateVerificationOptions(pathServiceSid, pathSid, status);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a Verification status
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the verification Service to update the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Verification </returns>
+    public static async System.Threading.Tasks.Task<VerificationResource> UpdateAsync(string pathServiceSid,
+                                                                                      string pathSid,
+                                                                                      VerificationResource.StatusEnum status,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateVerificationOptions(pathServiceSid, pathSid, status);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchVerificationOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Verifications/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Verification
+    /// </summary>
+    /// <param name="options"> Fetch Verification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Verification </returns>
+    public static VerificationResource Fetch(FetchVerificationOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Verification
+    /// </summary>
+    /// <param name="options"> Fetch Verification parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Verification </returns>
+    public static async System.Threading.Tasks.Task<VerificationResource> FetchAsync(FetchVerificationOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Verification
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the verification Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Verification </returns>
+    public static VerificationResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchVerificationOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Verification
+    /// </summary>
+    /// <param name="pathServiceSid"> The SID of the verification Service to fetch the resource from </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Verification </returns>
+    public static async System.Threading.Tasks.Task<VerificationResource> FetchAsync(string pathServiceSid,
+                                                                                     string pathSid,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new FetchVerificationOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a VerificationResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> VerificationResource object represented by the provided JSON </returns>
+    public static VerificationResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<VerificationResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Service that the resource is associated with
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The phone number or email being verified
+    /// </summary>
+    [JsonProperty("to")]
+    public string To { get; private set; }
+    /// <summary>
+    /// The verification method used.
+    /// </summary>
+    [JsonProperty("channel")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public VerificationResource.ChannelEnum Channel { get; private set; }
+    /// <summary>
+    /// The status of the verification resource
+    /// </summary>
+    [JsonProperty("status")]
+    public string Status { get; private set; }
+    /// <summary>
+    /// Whether the verification was successful
+    /// </summary>
+    [JsonProperty("valid")]
+    public bool? Valid { get; private set; }
+    /// <summary>
+    /// Information about the phone number being verified
+    /// </summary>
+    [JsonProperty("lookup")]
+    public object Lookup { get; private set; }
+    /// <summary>
+    /// The amount of the associated PSD2 compliant transaction.
+    /// </summary>
+    [JsonProperty("amount")]
+    public string Amount { get; private set; }
+    /// <summary>
+    /// The payee of the associated PSD2 compliant transaction
+    /// </summary>
+    [JsonProperty("payee")]
+    public string Payee { get; private set; }
+    /// <summary>
+    /// An array of verification attempt objects.
+    /// </summary>
+    [JsonProperty("send_code_attempts")]
+    public List<object> SendCodeAttempts { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Verification resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private VerificationResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/WebhookOptions.cs b/src/Twilio/Rest/Verify/V2/Service/WebhookOptions.cs
index d351b5381..6d6d09ac6 100644
--- a/src/Twilio/Rest/Verify/V2/Service/WebhookOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/WebhookOptions.cs
@@ -10,281 +10,281 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Create a new Webhook for the Service
+  /// </summary>
+  public class CreateWebhookOptions : IOptions<WebhookResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Create a new Webhook for the Service
+    /// Service Sid.
     /// </summary>
-    public class CreateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The string that you assigned to describe the webhook
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The array of events that this Webhook is subscribed to.
-        /// </summary>
-        public List<string> EventTypes { get; }
-        /// <summary>
-        /// The URL associated with this Webhook.
-        /// </summary>
-        public string WebhookUrl { get; }
-        /// <summary>
-        /// The webhook status
-        /// </summary>
-        public WebhookResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The webhook version
-        /// </summary>
-        public WebhookResource.VersionEnum Version { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the webhook </param>
-        /// <param name="eventTypes"> The array of events that this Webhook is subscribed to. </param>
-        /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
-        public CreateWebhookOptions(string pathServiceSid, string friendlyName, List<string> eventTypes, string webhookUrl)
-        {
-            PathServiceSid = pathServiceSid;
-            FriendlyName = friendlyName;
-            EventTypes = eventTypes;
-            WebhookUrl = webhookUrl;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (EventTypes != null)
-            {
-                p.AddRange(EventTypes.Select(prop => new KeyValuePair<string, string>("EventTypes", prop)));
-            }
-
-            if (WebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookUrl", WebhookUrl));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Version != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Version", Version.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathServiceSid { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// UpdateWebhookOptions
+    /// The string that you assigned to describe the webhook
     /// </summary>
-    public class UpdateWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The string that you assigned to describe the webhook
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The array of events that this Webhook is subscribed to.
-        /// </summary>
-        public List<string> EventTypes { get; set; }
-        /// <summary>
-        /// The URL associated with this Webhook.
-        /// </summary>
-        public string WebhookUrl { get; set; }
-        /// <summary>
-        /// The webhook status
-        /// </summary>
-        public WebhookResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The webhook version
-        /// </summary>
-        public WebhookResource.VersionEnum Version { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateWebhookOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-            EventTypes = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (EventTypes != null)
-            {
-                p.AddRange(EventTypes.Select(prop => new KeyValuePair<string, string>("EventTypes", prop)));
-            }
-
-            if (WebhookUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("WebhookUrl", WebhookUrl));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Version != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Version", Version.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete a specific Webhook.
+    /// The array of events that this Webhook is subscribed to.
     /// </summary>
-    public class DeleteWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
-        public DeleteWebhookOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<string> EventTypes { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Fetch a specific Webhook.
+    /// The URL associated with this Webhook.
     /// </summary>
-    public class FetchWebhookOptions : IOptions<WebhookResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        public FetchWebhookOptions(string pathServiceSid, string pathSid)
-        {
-            PathServiceSid = pathServiceSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string WebhookUrl { get; }
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Retrieve a list of all Webhooks for a Service.
+    /// The webhook status
     /// </summary>
-    public class ReadWebhookOptions : ReadOptions<WebhookResource>
-    {
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        public string PathServiceSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadWebhookOptions
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        public ReadWebhookOptions(string pathServiceSid)
-        {
-            PathServiceSid = pathServiceSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public WebhookResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The webhook version
+    /// </summary>
+    public WebhookResource.VersionEnum Version { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the webhook </param>
+    /// <param name="eventTypes"> The array of events that this Webhook is subscribed to. </param>
+    /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
+    public CreateWebhookOptions(string pathServiceSid, string friendlyName, List<string> eventTypes, string webhookUrl)
+    {
+      PathServiceSid = pathServiceSid;
+      FriendlyName = friendlyName;
+      EventTypes = eventTypes;
+      WebhookUrl = webhookUrl;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (EventTypes != null)
+      {
+        p.AddRange(EventTypes.Select(prop => new KeyValuePair<string, string>("EventTypes", prop)));
+      }
+
+      if (WebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookUrl", WebhookUrl));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Version != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Version", Version.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// UpdateWebhookOptions
+  /// </summary>
+  public class UpdateWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The string that you assigned to describe the webhook
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The array of events that this Webhook is subscribed to.
+    /// </summary>
+    public List<string> EventTypes { get; set; }
+    /// <summary>
+    /// The URL associated with this Webhook.
+    /// </summary>
+    public string WebhookUrl { get; set; }
+    /// <summary>
+    /// The webhook status
+    /// </summary>
+    public WebhookResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The webhook version
+    /// </summary>
+    public WebhookResource.VersionEnum Version { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateWebhookOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+      EventTypes = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (EventTypes != null)
+      {
+        p.AddRange(EventTypes.Select(prop => new KeyValuePair<string, string>("EventTypes", prop)));
+      }
+
+      if (WebhookUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("WebhookUrl", WebhookUrl));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Version != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Version", Version.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete a specific Webhook.
+  /// </summary>
+  public class DeleteWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
+    public DeleteWebhookOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Fetch a specific Webhook.
+  /// </summary>
+  public class FetchWebhookOptions : IOptions<WebhookResource>
+  {
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    public FetchWebhookOptions(string pathServiceSid, string pathSid)
+    {
+      PathServiceSid = pathServiceSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Retrieve a list of all Webhooks for a Service.
+  /// </summary>
+  public class ReadWebhookOptions : ReadOptions<WebhookResource>
+  {
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    public string PathServiceSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadWebhookOptions
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    public ReadWebhookOptions(string pathServiceSid)
+    {
+      PathServiceSid = pathServiceSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/Service/WebhookResource.cs b/src/Twilio/Rest/Verify/V2/Service/WebhookResource.cs
index 5ace87ab8..d10ea90db 100644
--- a/src/Twilio/Rest/Verify/V2/Service/WebhookResource.cs
+++ b/src/Twilio/Rest/Verify/V2/Service/WebhookResource.cs
@@ -19,588 +19,588 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Verify.V2.Service
-{
-
-    public class WebhookResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Enabled = new StatusEnum("enabled");
-            public static readonly StatusEnum Disabled = new StatusEnum("disabled");
-        }
-
-        public sealed class VersionEnum : StringEnum
-        {
-            private VersionEnum(string value) : base(value) {}
-            public VersionEnum() {}
-            public static implicit operator VersionEnum(string value)
-            {
-                return new VersionEnum(value);
-            }
-
-            public static readonly VersionEnum V1 = new VersionEnum("v1");
-            public static readonly VersionEnum V2 = new VersionEnum("v2");
-        }
-
-        public sealed class MethodsEnum : StringEnum
-        {
-            private MethodsEnum(string value) : base(value) {}
-            public MethodsEnum() {}
-            public static implicit operator MethodsEnum(string value)
-            {
-                return new MethodsEnum(value);
-            }
-
-            public static readonly MethodsEnum Get = new MethodsEnum("GET");
-            public static readonly MethodsEnum Post = new MethodsEnum("POST");
-        }
-
-        private static Request BuildCreateRequest(CreateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Webhooks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Webhook for the Service
-        /// </summary>
-        /// <param name="options"> Create Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Create(CreateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Webhook for the Service
-        /// </summary>
-        /// <param name="options"> Create Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(CreateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Webhook for the Service
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the webhook </param>
-        /// <param name="eventTypes"> The array of events that this Webhook is subscribed to. </param>
-        /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
-        /// <param name="status"> The webhook status </param>
-        /// <param name="version"> The webhook version </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Create(string pathServiceSid,
-                                             string friendlyName,
-                                             List<string> eventTypes,
-                                             string webhookUrl,
-                                             WebhookResource.StatusEnum status = null,
-                                             WebhookResource.VersionEnum version = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateWebhookOptions(pathServiceSid, friendlyName, eventTypes, webhookUrl){Status = status, Version = version};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Webhook for the Service
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the webhook </param>
-        /// <param name="eventTypes"> The array of events that this Webhook is subscribed to. </param>
-        /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
-        /// <param name="status"> The webhook status </param>
-        /// <param name="version"> The webhook version </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(string pathServiceSid,
-                                                                                     string friendlyName,
-                                                                                     List<string> eventTypes,
-                                                                                     string webhookUrl,
-                                                                                     WebhookResource.StatusEnum status = null,
-                                                                                     WebhookResource.VersionEnum version = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateWebhookOptions(pathServiceSid, friendlyName, eventTypes, webhookUrl){Status = status, Version = version};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Webhooks/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the webhook </param>
-        /// <param name="eventTypes"> The array of events that this Webhook is subscribed to. </param>
-        /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
-        /// <param name="status"> The webhook status </param>
-        /// <param name="version"> The webhook version </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Update(string pathServiceSid,
-                                             string pathSid,
-                                             string friendlyName = null,
-                                             List<string> eventTypes = null,
-                                             string webhookUrl = null,
-                                             WebhookResource.StatusEnum status = null,
-                                             WebhookResource.VersionEnum version = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathServiceSid, pathSid){FriendlyName = friendlyName, EventTypes = eventTypes, WebhookUrl = webhookUrl, Status = status, Version = version};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> The string that you assigned to describe the webhook </param>
-        /// <param name="eventTypes"> The array of events that this Webhook is subscribed to. </param>
-        /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
-        /// <param name="status"> The webhook status </param>
-        /// <param name="version"> The webhook version </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathServiceSid,
-                                                                                     string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     List<string> eventTypes = null,
-                                                                                     string webhookUrl = null,
-                                                                                     WebhookResource.StatusEnum status = null,
-                                                                                     WebhookResource.VersionEnum version = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateWebhookOptions(pathServiceSid, pathSid){FriendlyName = friendlyName, EventTypes = eventTypes, WebhookUrl = webhookUrl, Status = status, Version = version};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Webhooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Webhook.
-        /// </summary>
-        /// <param name="options"> Delete Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static bool Delete(DeleteWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Webhook.
-        /// </summary>
-        /// <param name="options"> Delete Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebhookOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Webhook.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebhookOptions(pathServiceSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Webhook.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteWebhookOptions(pathServiceSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Webhooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific Webhook.
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Webhook.
-        /// </summary>
-        /// <param name="options"> Fetch Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific Webhook.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static WebhookResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathServiceSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific Webhook.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathServiceSid,
-                                                                                    string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchWebhookOptions(pathServiceSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadWebhookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathServiceSid + "/Webhooks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Webhooks for a Service.
-        /// </summary>
-        /// <param name="options"> Read Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static ResourceSet<WebhookResource> Read(ReadWebhookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
-            return new ResourceSet<WebhookResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Webhooks for a Service.
-        /// </summary>
-        /// <param name="options"> Read Webhook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(ReadWebhookOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
-            return new ResourceSet<WebhookResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Webhooks for a Service.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Webhook </returns>
-        public static ResourceSet<WebhookResource> Read(string pathServiceSid,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadWebhookOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Webhooks for a Service.
-        /// </summary>
-        /// <param name="pathServiceSid"> Service Sid. </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Webhook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(string pathServiceSid,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadWebhookOptions(pathServiceSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<WebhookResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<WebhookResource> NextPage(Page<WebhookResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<WebhookResource> PreviousPage(Page<WebhookResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<WebhookResource>.FromJson("webhooks", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a WebhookResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> WebhookResource object represented by the provided JSON </returns>
-        public static WebhookResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<WebhookResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Service Sid.
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the webhook
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The array of events that this Webhook is subscribed to.
-        /// </summary>
-        [JsonProperty("event_types")]
-        public List<string> EventTypes { get; private set; }
-        /// <summary>
-        /// The webhook status
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public WebhookResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The webhook version
-        /// </summary>
-        [JsonProperty("version")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public WebhookResource.VersionEnum Version { get; private set; }
-        /// <summary>
-        /// The URL associated with this Webhook.
-        /// </summary>
-        [JsonProperty("webhook_url")]
-        public Uri WebhookUrl { get; private set; }
-        /// <summary>
-        /// The method used when calling the webhook's URL.
-        /// </summary>
-        [JsonProperty("webhook_method")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public WebhookResource.MethodsEnum WebhookMethod { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the Webhook resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private WebhookResource()
-        {
-
-        }
-    }
+{
+
+  public class WebhookResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Enabled = new StatusEnum("enabled");
+      public static readonly StatusEnum Disabled = new StatusEnum("disabled");
+    }
+
+    public sealed class VersionEnum : StringEnum
+    {
+      private VersionEnum(string value) : base(value) { }
+      public VersionEnum() { }
+      public static implicit operator VersionEnum(string value)
+      {
+        return new VersionEnum(value);
+      }
+
+      public static readonly VersionEnum V1 = new VersionEnum("v1");
+      public static readonly VersionEnum V2 = new VersionEnum("v2");
+    }
+
+    public sealed class MethodsEnum : StringEnum
+    {
+      private MethodsEnum(string value) : base(value) { }
+      public MethodsEnum() { }
+      public static implicit operator MethodsEnum(string value)
+      {
+        return new MethodsEnum(value);
+      }
+
+      public static readonly MethodsEnum Get = new MethodsEnum("GET");
+      public static readonly MethodsEnum Post = new MethodsEnum("POST");
+    }
+
+    private static Request BuildCreateRequest(CreateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Webhooks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Webhook for the Service
+    /// </summary>
+    /// <param name="options"> Create Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Create(CreateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Webhook for the Service
+    /// </summary>
+    /// <param name="options"> Create Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(CreateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Webhook for the Service
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the webhook </param>
+    /// <param name="eventTypes"> The array of events that this Webhook is subscribed to. </param>
+    /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
+    /// <param name="status"> The webhook status </param>
+    /// <param name="version"> The webhook version </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Create(string pathServiceSid,
+                                         string friendlyName,
+                                         List<string> eventTypes,
+                                         string webhookUrl,
+                                         WebhookResource.StatusEnum status = null,
+                                         WebhookResource.VersionEnum version = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateWebhookOptions(pathServiceSid, friendlyName, eventTypes, webhookUrl) { Status = status, Version = version };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Webhook for the Service
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the webhook </param>
+    /// <param name="eventTypes"> The array of events that this Webhook is subscribed to. </param>
+    /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
+    /// <param name="status"> The webhook status </param>
+    /// <param name="version"> The webhook version </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> CreateAsync(string pathServiceSid,
+                                                                                 string friendlyName,
+                                                                                 List<string> eventTypes,
+                                                                                 string webhookUrl,
+                                                                                 WebhookResource.StatusEnum status = null,
+                                                                                 WebhookResource.VersionEnum version = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateWebhookOptions(pathServiceSid, friendlyName, eventTypes, webhookUrl) { Status = status, Version = version };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Webhooks/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(UpdateWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(UpdateWebhookOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the webhook </param>
+    /// <param name="eventTypes"> The array of events that this Webhook is subscribed to. </param>
+    /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
+    /// <param name="status"> The webhook status </param>
+    /// <param name="version"> The webhook version </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Update(string pathServiceSid,
+                                         string pathSid,
+                                         string friendlyName = null,
+                                         List<string> eventTypes = null,
+                                         string webhookUrl = null,
+                                         WebhookResource.StatusEnum status = null,
+                                         WebhookResource.VersionEnum version = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathServiceSid, pathSid) { FriendlyName = friendlyName, EventTypes = eventTypes, WebhookUrl = webhookUrl, Status = status, Version = version };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> The string that you assigned to describe the webhook </param>
+    /// <param name="eventTypes"> The array of events that this Webhook is subscribed to. </param>
+    /// <param name="webhookUrl"> The URL associated with this Webhook. </param>
+    /// <param name="status"> The webhook status </param>
+    /// <param name="version"> The webhook version </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> UpdateAsync(string pathServiceSid,
+                                                                                 string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 List<string> eventTypes = null,
+                                                                                 string webhookUrl = null,
+                                                                                 WebhookResource.StatusEnum status = null,
+                                                                                 WebhookResource.VersionEnum version = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateWebhookOptions(pathServiceSid, pathSid) { FriendlyName = friendlyName, EventTypes = eventTypes, WebhookUrl = webhookUrl, Status = status, Version = version };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Webhooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Webhook.
+    /// </summary>
+    /// <param name="options"> Delete Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static bool Delete(DeleteWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Webhook.
+    /// </summary>
+    /// <param name="options"> Delete Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteWebhookOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Webhook.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static bool Delete(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebhookOptions(pathServiceSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Webhook.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathServiceSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteWebhookOptions(pathServiceSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Webhooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific Webhook.
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(FetchWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Webhook.
+    /// </summary>
+    /// <param name="options"> Fetch Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(FetchWebhookOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific Webhook.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static WebhookResource Fetch(string pathServiceSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathServiceSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific Webhook.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pathSid"> The unique string that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<WebhookResource> FetchAsync(string pathServiceSid,
+                                                                                string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchWebhookOptions(pathServiceSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadWebhookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathServiceSid + "/Webhooks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Webhooks for a Service.
+    /// </summary>
+    /// <param name="options"> Read Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static ResourceSet<WebhookResource> Read(ReadWebhookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
+      return new ResourceSet<WebhookResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Webhooks for a Service.
+    /// </summary>
+    /// <param name="options"> Read Webhook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(ReadWebhookOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<WebhookResource>.FromJson("webhooks", response.Content);
+      return new ResourceSet<WebhookResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Webhooks for a Service.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Webhook </returns>
+    public static ResourceSet<WebhookResource> Read(string pathServiceSid,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadWebhookOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Webhooks for a Service.
+    /// </summary>
+    /// <param name="pathServiceSid"> Service Sid. </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Webhook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<WebhookResource>> ReadAsync(string pathServiceSid,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadWebhookOptions(pathServiceSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<WebhookResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<WebhookResource> NextPage(Page<WebhookResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<WebhookResource> PreviousPage(Page<WebhookResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<WebhookResource>.FromJson("webhooks", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a WebhookResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> WebhookResource object represented by the provided JSON </returns>
+    public static WebhookResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<WebhookResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Service Sid.
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the webhook
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The array of events that this Webhook is subscribed to.
+    /// </summary>
+    [JsonProperty("event_types")]
+    public List<string> EventTypes { get; private set; }
+    /// <summary>
+    /// The webhook status
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public WebhookResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The webhook version
+    /// </summary>
+    [JsonProperty("version")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public WebhookResource.VersionEnum Version { get; private set; }
+    /// <summary>
+    /// The URL associated with this Webhook.
+    /// </summary>
+    [JsonProperty("webhook_url")]
+    public Uri WebhookUrl { get; private set; }
+    /// <summary>
+    /// The method used when calling the webhook's URL.
+    /// </summary>
+    [JsonProperty("webhook_method")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public WebhookResource.MethodsEnum WebhookMethod { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the Webhook resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private WebhookResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/ServiceOptions.cs b/src/Twilio/Rest/Verify/V2/ServiceOptions.cs
index e39fe1dd0..e8b82f515 100644
--- a/src/Twilio/Rest/Verify/V2/ServiceOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/ServiceOptions.cs
@@ -9,444 +9,444 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2
-{
-
+{
+
+  /// <summary>
+  /// Create a new Verification Service.
+  /// </summary>
+  public class CreateServiceOptions : IOptions<ServiceResource>
+  {
     /// <summary>
-    /// Create a new Verification Service.
-    /// </summary>
-    public class CreateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// A string to describe the verification service
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The length of the verification code to generate
-        /// </summary>
-        public int? CodeLength { get; set; }
-        /// <summary>
-        /// Whether to perform a lookup with each verification
-        /// </summary>
-        public bool? LookupEnabled { get; set; }
-        /// <summary>
-        /// Whether to skip sending SMS verifications to landlines
-        /// </summary>
-        public bool? SkipSmsToLandlines { get; set; }
-        /// <summary>
-        /// Whether to ask the user to press a number before delivering the verify code in a phone call
-        /// </summary>
-        public bool? DtmfInputRequired { get; set; }
-        /// <summary>
-        /// The name of an alternative text-to-speech service to use in phone calls
-        /// </summary>
-        public string TtsName { get; set; }
-        /// <summary>
-        /// Whether to pass PSD2 transaction parameters when starting a verification
-        /// </summary>
-        public bool? Psd2Enabled { get; set; }
-        /// <summary>
-        /// Whether to add a security warning at the end of an SMS.
-        /// </summary>
-        public bool? DoNotShareWarningEnabled { get; set; }
-        /// <summary>
-        /// Whether to allow sending verifications with a custom code.
-        /// </summary>
-        public bool? CustomCodeEnabled { get; set; }
-        /// <summary>
-        /// Optional. Include the date in the Challenge's reponse. Default: true
-        /// </summary>
-        public bool? PushIncludeDate { get; set; }
-        /// <summary>
-        /// Optional. Set APN Credential for this service.
-        /// </summary>
-        public string PushApnCredentialSid { get; set; }
-        /// <summary>
-        /// Optional. Set FCM Credential for this service.
-        /// </summary>
-        public string PushFcmCredentialSid { get; set; }
-        /// <summary>
-        /// Optional. Set TOTP Issuer for this service.
-        /// </summary>
-        public string TotpIssuer { get; set; }
-        /// <summary>
-        /// Optional. How often, in seconds, are TOTP codes generated
-        /// </summary>
-        public int? TotpTimeStep { get; set; }
-        /// <summary>
-        /// Optional. Number of digits for generated TOTP codes
-        /// </summary>
-        public int? TotpCodeLength { get; set; }
-        /// <summary>
-        /// Optional. The number of past and future time-steps valid at a given time
-        /// </summary>
-        public int? TotpSkew { get; set; }
-        /// <summary>
-        /// The verification template SMS messages.
-        /// </summary>
-        public string DefaultTemplateSid { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateServiceOptions
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the verification service </param>
-        public CreateServiceOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (CodeLength != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CodeLength", CodeLength.ToString()));
-            }
-
-            if (LookupEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LookupEnabled", LookupEnabled.Value.ToString().ToLower()));
-            }
-
-            if (SkipSmsToLandlines != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SkipSmsToLandlines", SkipSmsToLandlines.Value.ToString().ToLower()));
-            }
-
-            if (DtmfInputRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DtmfInputRequired", DtmfInputRequired.Value.ToString().ToLower()));
-            }
-
-            if (TtsName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TtsName", TtsName));
-            }
-
-            if (Psd2Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Psd2Enabled", Psd2Enabled.Value.ToString().ToLower()));
-            }
-
-            if (DoNotShareWarningEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DoNotShareWarningEnabled", DoNotShareWarningEnabled.Value.ToString().ToLower()));
-            }
-
-            if (CustomCodeEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CustomCodeEnabled", CustomCodeEnabled.Value.ToString().ToLower()));
-            }
-
-            if (PushIncludeDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Push.IncludeDate", PushIncludeDate.Value.ToString().ToLower()));
-            }
-
-            if (PushApnCredentialSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Push.ApnCredentialSid", PushApnCredentialSid.ToString()));
-            }
-
-            if (PushFcmCredentialSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Push.FcmCredentialSid", PushFcmCredentialSid.ToString()));
-            }
-
-            if (TotpIssuer != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Totp.Issuer", TotpIssuer));
-            }
-
-            if (TotpTimeStep != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Totp.TimeStep", TotpTimeStep.ToString()));
-            }
-
-            if (TotpCodeLength != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Totp.CodeLength", TotpCodeLength.ToString()));
-            }
-
-            if (TotpSkew != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Totp.Skew", TotpSkew.ToString()));
-            }
-
-            if (DefaultTemplateSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultTemplateSid", DefaultTemplateSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// A string to describe the verification service
+    /// </summary>
+    public string FriendlyName { get; }
     /// <summary>
-    /// Fetch specific Verification Service Instance.
+    /// The length of the verification code to generate
     /// </summary>
-    public class FetchServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public int? CodeLength { get; set; }
     /// <summary>
-    /// Delete a specific Verification Service Instance.
+    /// Whether to perform a lookup with each verification
     /// </summary>
-    public class DeleteServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public bool? LookupEnabled { get; set; }
     /// <summary>
-    /// Retrieve a list of all Verification Services for an account.
-    /// </summary>
-    public class ReadServiceOptions : ReadOptions<ServiceResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Whether to skip sending SMS verifications to landlines
+    /// </summary>
+    public bool? SkipSmsToLandlines { get; set; }
     /// <summary>
-    /// Update a specific Verification Service.
-    /// </summary>
-    public class UpdateServiceOptions : IOptions<ServiceResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the verification service
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The length of the verification code to generate
-        /// </summary>
-        public int? CodeLength { get; set; }
-        /// <summary>
-        /// Whether to perform a lookup with each verification
-        /// </summary>
-        public bool? LookupEnabled { get; set; }
-        /// <summary>
-        /// Whether to skip sending SMS verifications to landlines
-        /// </summary>
-        public bool? SkipSmsToLandlines { get; set; }
-        /// <summary>
-        /// Whether to ask the user to press a number before delivering the verify code in a phone call
-        /// </summary>
-        public bool? DtmfInputRequired { get; set; }
-        /// <summary>
-        /// The name of an alternative text-to-speech service to use in phone calls
-        /// </summary>
-        public string TtsName { get; set; }
-        /// <summary>
-        /// Whether to pass PSD2 transaction parameters when starting a verification
-        /// </summary>
-        public bool? Psd2Enabled { get; set; }
-        /// <summary>
-        /// Whether to add a privacy warning at the end of an SMS.
-        /// </summary>
-        public bool? DoNotShareWarningEnabled { get; set; }
-        /// <summary>
-        /// Whether to allow sending verifications with a custom code.
-        /// </summary>
-        public bool? CustomCodeEnabled { get; set; }
-        /// <summary>
-        /// Optional. Include the date in the Challenge's reponse. Default: true
-        /// </summary>
-        public bool? PushIncludeDate { get; set; }
-        /// <summary>
-        /// Optional. Set APN Credential for this service.
-        /// </summary>
-        public string PushApnCredentialSid { get; set; }
-        /// <summary>
-        /// Optional. Set FCM Credential for this service.
-        /// </summary>
-        public string PushFcmCredentialSid { get; set; }
-        /// <summary>
-        /// Optional. Set TOTP Issuer for this service.
-        /// </summary>
-        public string TotpIssuer { get; set; }
-        /// <summary>
-        /// Optional. How often, in seconds, are TOTP codes generated
-        /// </summary>
-        public int? TotpTimeStep { get; set; }
-        /// <summary>
-        /// Optional. Number of digits for generated TOTP codes
-        /// </summary>
-        public int? TotpCodeLength { get; set; }
-        /// <summary>
-        /// Optional. The number of past and future time-steps valid at a given time
-        /// </summary>
-        public int? TotpSkew { get; set; }
-        /// <summary>
-        /// The verification template SMS messages.
-        /// </summary>
-        public string DefaultTemplateSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateServiceOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateServiceOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (CodeLength != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CodeLength", CodeLength.ToString()));
-            }
-
-            if (LookupEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LookupEnabled", LookupEnabled.Value.ToString().ToLower()));
-            }
-
-            if (SkipSmsToLandlines != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SkipSmsToLandlines", SkipSmsToLandlines.Value.ToString().ToLower()));
-            }
-
-            if (DtmfInputRequired != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DtmfInputRequired", DtmfInputRequired.Value.ToString().ToLower()));
-            }
-
-            if (TtsName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("TtsName", TtsName));
-            }
-
-            if (Psd2Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Psd2Enabled", Psd2Enabled.Value.ToString().ToLower()));
-            }
-
-            if (DoNotShareWarningEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DoNotShareWarningEnabled", DoNotShareWarningEnabled.Value.ToString().ToLower()));
-            }
-
-            if (CustomCodeEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CustomCodeEnabled", CustomCodeEnabled.Value.ToString().ToLower()));
-            }
-
-            if (PushIncludeDate != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Push.IncludeDate", PushIncludeDate.Value.ToString().ToLower()));
-            }
-
-            if (PushApnCredentialSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Push.ApnCredentialSid", PushApnCredentialSid.ToString()));
-            }
-
-            if (PushFcmCredentialSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Push.FcmCredentialSid", PushFcmCredentialSid.ToString()));
-            }
-
-            if (TotpIssuer != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Totp.Issuer", TotpIssuer));
-            }
-
-            if (TotpTimeStep != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Totp.TimeStep", TotpTimeStep.ToString()));
-            }
-
-            if (TotpCodeLength != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Totp.CodeLength", TotpCodeLength.ToString()));
-            }
-
-            if (TotpSkew != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Totp.Skew", TotpSkew.ToString()));
-            }
-
-            if (DefaultTemplateSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DefaultTemplateSid", DefaultTemplateSid.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Whether to ask the user to press a number before delivering the verify code in a phone call
+    /// </summary>
+    public bool? DtmfInputRequired { get; set; }
+    /// <summary>
+    /// The name of an alternative text-to-speech service to use in phone calls
+    /// </summary>
+    public string TtsName { get; set; }
+    /// <summary>
+    /// Whether to pass PSD2 transaction parameters when starting a verification
+    /// </summary>
+    public bool? Psd2Enabled { get; set; }
+    /// <summary>
+    /// Whether to add a security warning at the end of an SMS.
+    /// </summary>
+    public bool? DoNotShareWarningEnabled { get; set; }
+    /// <summary>
+    /// Whether to allow sending verifications with a custom code.
+    /// </summary>
+    public bool? CustomCodeEnabled { get; set; }
+    /// <summary>
+    /// Optional. Include the date in the Challenge's reponse. Default: true
+    /// </summary>
+    public bool? PushIncludeDate { get; set; }
+    /// <summary>
+    /// Optional. Set APN Credential for this service.
+    /// </summary>
+    public string PushApnCredentialSid { get; set; }
+    /// <summary>
+    /// Optional. Set FCM Credential for this service.
+    /// </summary>
+    public string PushFcmCredentialSid { get; set; }
+    /// <summary>
+    /// Optional. Set TOTP Issuer for this service.
+    /// </summary>
+    public string TotpIssuer { get; set; }
+    /// <summary>
+    /// Optional. How often, in seconds, are TOTP codes generated
+    /// </summary>
+    public int? TotpTimeStep { get; set; }
+    /// <summary>
+    /// Optional. Number of digits for generated TOTP codes
+    /// </summary>
+    public int? TotpCodeLength { get; set; }
+    /// <summary>
+    /// Optional. The number of past and future time-steps valid at a given time
+    /// </summary>
+    public int? TotpSkew { get; set; }
+    /// <summary>
+    /// The verification template SMS messages.
+    /// </summary>
+    public string DefaultTemplateSid { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateServiceOptions
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the verification service </param>
+    public CreateServiceOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (CodeLength != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CodeLength", CodeLength.ToString()));
+      }
+
+      if (LookupEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LookupEnabled", LookupEnabled.Value.ToString().ToLower()));
+      }
+
+      if (SkipSmsToLandlines != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SkipSmsToLandlines", SkipSmsToLandlines.Value.ToString().ToLower()));
+      }
+
+      if (DtmfInputRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DtmfInputRequired", DtmfInputRequired.Value.ToString().ToLower()));
+      }
+
+      if (TtsName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TtsName", TtsName));
+      }
+
+      if (Psd2Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Psd2Enabled", Psd2Enabled.Value.ToString().ToLower()));
+      }
+
+      if (DoNotShareWarningEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DoNotShareWarningEnabled", DoNotShareWarningEnabled.Value.ToString().ToLower()));
+      }
+
+      if (CustomCodeEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CustomCodeEnabled", CustomCodeEnabled.Value.ToString().ToLower()));
+      }
+
+      if (PushIncludeDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Push.IncludeDate", PushIncludeDate.Value.ToString().ToLower()));
+      }
+
+      if (PushApnCredentialSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Push.ApnCredentialSid", PushApnCredentialSid.ToString()));
+      }
+
+      if (PushFcmCredentialSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Push.FcmCredentialSid", PushFcmCredentialSid.ToString()));
+      }
+
+      if (TotpIssuer != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Totp.Issuer", TotpIssuer));
+      }
+
+      if (TotpTimeStep != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Totp.TimeStep", TotpTimeStep.ToString()));
+      }
+
+      if (TotpCodeLength != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Totp.CodeLength", TotpCodeLength.ToString()));
+      }
+
+      if (TotpSkew != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Totp.Skew", TotpSkew.ToString()));
+      }
+
+      if (DefaultTemplateSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultTemplateSid", DefaultTemplateSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch specific Verification Service Instance.
+  /// </summary>
+  public class FetchServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a specific Verification Service Instance.
+  /// </summary>
+  public class DeleteServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of all Verification Services for an account.
+  /// </summary>
+  public class ReadServiceOptions : ReadOptions<ServiceResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update a specific Verification Service.
+  /// </summary>
+  public class UpdateServiceOptions : IOptions<ServiceResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the verification service
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The length of the verification code to generate
+    /// </summary>
+    public int? CodeLength { get; set; }
+    /// <summary>
+    /// Whether to perform a lookup with each verification
+    /// </summary>
+    public bool? LookupEnabled { get; set; }
+    /// <summary>
+    /// Whether to skip sending SMS verifications to landlines
+    /// </summary>
+    public bool? SkipSmsToLandlines { get; set; }
+    /// <summary>
+    /// Whether to ask the user to press a number before delivering the verify code in a phone call
+    /// </summary>
+    public bool? DtmfInputRequired { get; set; }
+    /// <summary>
+    /// The name of an alternative text-to-speech service to use in phone calls
+    /// </summary>
+    public string TtsName { get; set; }
+    /// <summary>
+    /// Whether to pass PSD2 transaction parameters when starting a verification
+    /// </summary>
+    public bool? Psd2Enabled { get; set; }
+    /// <summary>
+    /// Whether to add a privacy warning at the end of an SMS.
+    /// </summary>
+    public bool? DoNotShareWarningEnabled { get; set; }
+    /// <summary>
+    /// Whether to allow sending verifications with a custom code.
+    /// </summary>
+    public bool? CustomCodeEnabled { get; set; }
+    /// <summary>
+    /// Optional. Include the date in the Challenge's reponse. Default: true
+    /// </summary>
+    public bool? PushIncludeDate { get; set; }
+    /// <summary>
+    /// Optional. Set APN Credential for this service.
+    /// </summary>
+    public string PushApnCredentialSid { get; set; }
+    /// <summary>
+    /// Optional. Set FCM Credential for this service.
+    /// </summary>
+    public string PushFcmCredentialSid { get; set; }
+    /// <summary>
+    /// Optional. Set TOTP Issuer for this service.
+    /// </summary>
+    public string TotpIssuer { get; set; }
+    /// <summary>
+    /// Optional. How often, in seconds, are TOTP codes generated
+    /// </summary>
+    public int? TotpTimeStep { get; set; }
+    /// <summary>
+    /// Optional. Number of digits for generated TOTP codes
+    /// </summary>
+    public int? TotpCodeLength { get; set; }
+    /// <summary>
+    /// Optional. The number of past and future time-steps valid at a given time
+    /// </summary>
+    public int? TotpSkew { get; set; }
+    /// <summary>
+    /// The verification template SMS messages.
+    /// </summary>
+    public string DefaultTemplateSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateServiceOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateServiceOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (CodeLength != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CodeLength", CodeLength.ToString()));
+      }
+
+      if (LookupEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LookupEnabled", LookupEnabled.Value.ToString().ToLower()));
+      }
+
+      if (SkipSmsToLandlines != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SkipSmsToLandlines", SkipSmsToLandlines.Value.ToString().ToLower()));
+      }
+
+      if (DtmfInputRequired != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DtmfInputRequired", DtmfInputRequired.Value.ToString().ToLower()));
+      }
+
+      if (TtsName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("TtsName", TtsName));
+      }
+
+      if (Psd2Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Psd2Enabled", Psd2Enabled.Value.ToString().ToLower()));
+      }
+
+      if (DoNotShareWarningEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DoNotShareWarningEnabled", DoNotShareWarningEnabled.Value.ToString().ToLower()));
+      }
+
+      if (CustomCodeEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CustomCodeEnabled", CustomCodeEnabled.Value.ToString().ToLower()));
+      }
+
+      if (PushIncludeDate != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Push.IncludeDate", PushIncludeDate.Value.ToString().ToLower()));
+      }
+
+      if (PushApnCredentialSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Push.ApnCredentialSid", PushApnCredentialSid.ToString()));
+      }
+
+      if (PushFcmCredentialSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Push.FcmCredentialSid", PushFcmCredentialSid.ToString()));
+      }
+
+      if (TotpIssuer != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Totp.Issuer", TotpIssuer));
+      }
+
+      if (TotpTimeStep != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Totp.TimeStep", TotpTimeStep.ToString()));
+      }
+
+      if (TotpCodeLength != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Totp.CodeLength", TotpCodeLength.ToString()));
+      }
+
+      if (TotpSkew != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Totp.Skew", TotpSkew.ToString()));
+      }
+
+      if (DefaultTemplateSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DefaultTemplateSid", DefaultTemplateSid.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/ServiceResource.cs b/src/Twilio/Rest/Verify/V2/ServiceResource.cs
index 299e46777..839d7c8c9 100644
--- a/src/Twilio/Rest/Verify/V2/ServiceResource.cs
+++ b/src/Twilio/Rest/Verify/V2/ServiceResource.cs
@@ -16,657 +16,657 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Verify.V2
-{
-
-    public class ServiceResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a new Verification Service.
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Verification Service.
-        /// </summary>
-        /// <param name="options"> Create Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a new Verification Service.
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the verification service </param>
-        /// <param name="codeLength"> The length of the verification code to generate </param>
-        /// <param name="lookupEnabled"> Whether to perform a lookup with each verification </param>
-        /// <param name="skipSmsToLandlines"> Whether to skip sending SMS verifications to landlines </param>
-        /// <param name="dtmfInputRequired"> Whether to ask the user to press a number before delivering the verify code in a
-        ///                         phone call </param>
-        /// <param name="ttsName"> The name of an alternative text-to-speech service to use in phone calls </param>
-        /// <param name="psd2Enabled"> Whether to pass PSD2 transaction parameters when starting a verification </param>
-        /// <param name="doNotShareWarningEnabled"> Whether to add a security warning at the end of an SMS. </param>
-        /// <param name="customCodeEnabled"> Whether to allow sending verifications with a custom code. </param>
-        /// <param name="pushIncludeDate"> Optional. Include the date in the Challenge's reponse. Default: true </param>
-        /// <param name="pushApnCredentialSid"> Optional. Set APN Credential for this service. </param>
-        /// <param name="pushFcmCredentialSid"> Optional. Set FCM Credential for this service. </param>
-        /// <param name="totpIssuer"> Optional. Set TOTP Issuer for this service. </param>
-        /// <param name="totpTimeStep"> Optional. How often, in seconds, are TOTP codes generated </param>
-        /// <param name="totpCodeLength"> Optional. Number of digits for generated TOTP codes </param>
-        /// <param name="totpSkew"> Optional. The number of past and future time-steps valid at a given time </param>
-        /// <param name="defaultTemplateSid"> The verification template SMS messages. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Create(string friendlyName,
-                                             int? codeLength = null,
-                                             bool? lookupEnabled = null,
-                                             bool? skipSmsToLandlines = null,
-                                             bool? dtmfInputRequired = null,
-                                             string ttsName = null,
-                                             bool? psd2Enabled = null,
-                                             bool? doNotShareWarningEnabled = null,
-                                             bool? customCodeEnabled = null,
-                                             bool? pushIncludeDate = null,
-                                             string pushApnCredentialSid = null,
-                                             string pushFcmCredentialSid = null,
-                                             string totpIssuer = null,
-                                             int? totpTimeStep = null,
-                                             int? totpCodeLength = null,
-                                             int? totpSkew = null,
-                                             string defaultTemplateSid = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName){CodeLength = codeLength, LookupEnabled = lookupEnabled, SkipSmsToLandlines = skipSmsToLandlines, DtmfInputRequired = dtmfInputRequired, TtsName = ttsName, Psd2Enabled = psd2Enabled, DoNotShareWarningEnabled = doNotShareWarningEnabled, CustomCodeEnabled = customCodeEnabled, PushIncludeDate = pushIncludeDate, PushApnCredentialSid = pushApnCredentialSid, PushFcmCredentialSid = pushFcmCredentialSid, TotpIssuer = totpIssuer, TotpTimeStep = totpTimeStep, TotpCodeLength = totpCodeLength, TotpSkew = totpSkew, DefaultTemplateSid = defaultTemplateSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a new Verification Service.
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the verification service </param>
-        /// <param name="codeLength"> The length of the verification code to generate </param>
-        /// <param name="lookupEnabled"> Whether to perform a lookup with each verification </param>
-        /// <param name="skipSmsToLandlines"> Whether to skip sending SMS verifications to landlines </param>
-        /// <param name="dtmfInputRequired"> Whether to ask the user to press a number before delivering the verify code in a
-        ///                         phone call </param>
-        /// <param name="ttsName"> The name of an alternative text-to-speech service to use in phone calls </param>
-        /// <param name="psd2Enabled"> Whether to pass PSD2 transaction parameters when starting a verification </param>
-        /// <param name="doNotShareWarningEnabled"> Whether to add a security warning at the end of an SMS. </param>
-        /// <param name="customCodeEnabled"> Whether to allow sending verifications with a custom code. </param>
-        /// <param name="pushIncludeDate"> Optional. Include the date in the Challenge's reponse. Default: true </param>
-        /// <param name="pushApnCredentialSid"> Optional. Set APN Credential for this service. </param>
-        /// <param name="pushFcmCredentialSid"> Optional. Set FCM Credential for this service. </param>
-        /// <param name="totpIssuer"> Optional. Set TOTP Issuer for this service. </param>
-        /// <param name="totpTimeStep"> Optional. How often, in seconds, are TOTP codes generated </param>
-        /// <param name="totpCodeLength"> Optional. Number of digits for generated TOTP codes </param>
-        /// <param name="totpSkew"> Optional. The number of past and future time-steps valid at a given time </param>
-        /// <param name="defaultTemplateSid"> The verification template SMS messages. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
-                                                                                     int? codeLength = null,
-                                                                                     bool? lookupEnabled = null,
-                                                                                     bool? skipSmsToLandlines = null,
-                                                                                     bool? dtmfInputRequired = null,
-                                                                                     string ttsName = null,
-                                                                                     bool? psd2Enabled = null,
-                                                                                     bool? doNotShareWarningEnabled = null,
-                                                                                     bool? customCodeEnabled = null,
-                                                                                     bool? pushIncludeDate = null,
-                                                                                     string pushApnCredentialSid = null,
-                                                                                     string pushFcmCredentialSid = null,
-                                                                                     string totpIssuer = null,
-                                                                                     int? totpTimeStep = null,
-                                                                                     int? totpCodeLength = null,
-                                                                                     int? totpSkew = null,
-                                                                                     string defaultTemplateSid = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateServiceOptions(friendlyName){CodeLength = codeLength, LookupEnabled = lookupEnabled, SkipSmsToLandlines = skipSmsToLandlines, DtmfInputRequired = dtmfInputRequired, TtsName = ttsName, Psd2Enabled = psd2Enabled, DoNotShareWarningEnabled = doNotShareWarningEnabled, CustomCodeEnabled = customCodeEnabled, PushIncludeDate = pushIncludeDate, PushApnCredentialSid = pushApnCredentialSid, PushFcmCredentialSid = pushFcmCredentialSid, TotpIssuer = totpIssuer, TotpTimeStep = totpTimeStep, TotpCodeLength = totpCodeLength, TotpSkew = totpSkew, DefaultTemplateSid = defaultTemplateSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch specific Verification Service Instance.
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Verification Service Instance.
-        /// </summary>
-        /// <param name="options"> Fetch Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch specific Verification Service Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch specific Verification Service Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchServiceOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a specific Verification Service Instance.
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Verification Service Instance.
-        /// </summary>
-        /// <param name="options"> Delete Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a specific Verification Service Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a specific Verification Service Instance.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteServiceOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Services",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of all Verification Services for an account.
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Verification Services for an account.
-        /// </summary>
-        /// <param name="options"> Read Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ServiceResource>.FromJson("services", response.Content);
-            return new ResourceSet<ServiceResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of all Verification Services for an account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ResourceSet<ServiceResource> Read(int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of all Verification Services for an account.
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadServiceOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<ServiceResource>.FromJson("services", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Verify,
-                "/v2/Services/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update a specific Verification Service.
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Verification Service.
-        /// </summary>
-        /// <param name="options"> Update Service parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update a specific Verification Service.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the verification service </param>
-        /// <param name="codeLength"> The length of the verification code to generate </param>
-        /// <param name="lookupEnabled"> Whether to perform a lookup with each verification </param>
-        /// <param name="skipSmsToLandlines"> Whether to skip sending SMS verifications to landlines </param>
-        /// <param name="dtmfInputRequired"> Whether to ask the user to press a number before delivering the verify code in a
-        ///                         phone call </param>
-        /// <param name="ttsName"> The name of an alternative text-to-speech service to use in phone calls </param>
-        /// <param name="psd2Enabled"> Whether to pass PSD2 transaction parameters when starting a verification </param>
-        /// <param name="doNotShareWarningEnabled"> Whether to add a privacy warning at the end of an SMS. </param>
-        /// <param name="customCodeEnabled"> Whether to allow sending verifications with a custom code. </param>
-        /// <param name="pushIncludeDate"> Optional. Include the date in the Challenge's reponse. Default: true </param>
-        /// <param name="pushApnCredentialSid"> Optional. Set APN Credential for this service. </param>
-        /// <param name="pushFcmCredentialSid"> Optional. Set FCM Credential for this service. </param>
-        /// <param name="totpIssuer"> Optional. Set TOTP Issuer for this service. </param>
-        /// <param name="totpTimeStep"> Optional. How often, in seconds, are TOTP codes generated </param>
-        /// <param name="totpCodeLength"> Optional. Number of digits for generated TOTP codes </param>
-        /// <param name="totpSkew"> Optional. The number of past and future time-steps valid at a given time </param>
-        /// <param name="defaultTemplateSid"> The verification template SMS messages. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Service </returns>
-        public static ServiceResource Update(string pathSid,
-                                             string friendlyName = null,
-                                             int? codeLength = null,
-                                             bool? lookupEnabled = null,
-                                             bool? skipSmsToLandlines = null,
-                                             bool? dtmfInputRequired = null,
-                                             string ttsName = null,
-                                             bool? psd2Enabled = null,
-                                             bool? doNotShareWarningEnabled = null,
-                                             bool? customCodeEnabled = null,
-                                             bool? pushIncludeDate = null,
-                                             string pushApnCredentialSid = null,
-                                             string pushFcmCredentialSid = null,
-                                             string totpIssuer = null,
-                                             int? totpTimeStep = null,
-                                             int? totpCodeLength = null,
-                                             int? totpSkew = null,
-                                             string defaultTemplateSid = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, CodeLength = codeLength, LookupEnabled = lookupEnabled, SkipSmsToLandlines = skipSmsToLandlines, DtmfInputRequired = dtmfInputRequired, TtsName = ttsName, Psd2Enabled = psd2Enabled, DoNotShareWarningEnabled = doNotShareWarningEnabled, CustomCodeEnabled = customCodeEnabled, PushIncludeDate = pushIncludeDate, PushApnCredentialSid = pushApnCredentialSid, PushFcmCredentialSid = pushFcmCredentialSid, TotpIssuer = totpIssuer, TotpTimeStep = totpTimeStep, TotpCodeLength = totpCodeLength, TotpSkew = totpSkew, DefaultTemplateSid = defaultTemplateSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update a specific Verification Service.
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the verification service </param>
-        /// <param name="codeLength"> The length of the verification code to generate </param>
-        /// <param name="lookupEnabled"> Whether to perform a lookup with each verification </param>
-        /// <param name="skipSmsToLandlines"> Whether to skip sending SMS verifications to landlines </param>
-        /// <param name="dtmfInputRequired"> Whether to ask the user to press a number before delivering the verify code in a
-        ///                         phone call </param>
-        /// <param name="ttsName"> The name of an alternative text-to-speech service to use in phone calls </param>
-        /// <param name="psd2Enabled"> Whether to pass PSD2 transaction parameters when starting a verification </param>
-        /// <param name="doNotShareWarningEnabled"> Whether to add a privacy warning at the end of an SMS. </param>
-        /// <param name="customCodeEnabled"> Whether to allow sending verifications with a custom code. </param>
-        /// <param name="pushIncludeDate"> Optional. Include the date in the Challenge's reponse. Default: true </param>
-        /// <param name="pushApnCredentialSid"> Optional. Set APN Credential for this service. </param>
-        /// <param name="pushFcmCredentialSid"> Optional. Set FCM Credential for this service. </param>
-        /// <param name="totpIssuer"> Optional. Set TOTP Issuer for this service. </param>
-        /// <param name="totpTimeStep"> Optional. How often, in seconds, are TOTP codes generated </param>
-        /// <param name="totpCodeLength"> Optional. Number of digits for generated TOTP codes </param>
-        /// <param name="totpSkew"> Optional. The number of past and future time-steps valid at a given time </param>
-        /// <param name="defaultTemplateSid"> The verification template SMS messages. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Service </returns>
-        public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
-                                                                                     string friendlyName = null,
-                                                                                     int? codeLength = null,
-                                                                                     bool? lookupEnabled = null,
-                                                                                     bool? skipSmsToLandlines = null,
-                                                                                     bool? dtmfInputRequired = null,
-                                                                                     string ttsName = null,
-                                                                                     bool? psd2Enabled = null,
-                                                                                     bool? doNotShareWarningEnabled = null,
-                                                                                     bool? customCodeEnabled = null,
-                                                                                     bool? pushIncludeDate = null,
-                                                                                     string pushApnCredentialSid = null,
-                                                                                     string pushFcmCredentialSid = null,
-                                                                                     string totpIssuer = null,
-                                                                                     int? totpTimeStep = null,
-                                                                                     int? totpCodeLength = null,
-                                                                                     int? totpSkew = null,
-                                                                                     string defaultTemplateSid = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateServiceOptions(pathSid){FriendlyName = friendlyName, CodeLength = codeLength, LookupEnabled = lookupEnabled, SkipSmsToLandlines = skipSmsToLandlines, DtmfInputRequired = dtmfInputRequired, TtsName = ttsName, Psd2Enabled = psd2Enabled, DoNotShareWarningEnabled = doNotShareWarningEnabled, CustomCodeEnabled = customCodeEnabled, PushIncludeDate = pushIncludeDate, PushApnCredentialSid = pushApnCredentialSid, PushFcmCredentialSid = pushFcmCredentialSid, TotpIssuer = totpIssuer, TotpTimeStep = totpTimeStep, TotpCodeLength = totpCodeLength, TotpSkew = totpSkew, DefaultTemplateSid = defaultTemplateSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ServiceResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ServiceResource object represented by the provided JSON </returns>
-        public static ServiceResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ServiceResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the verification service
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The length of the verification code
-        /// </summary>
-        [JsonProperty("code_length")]
-        public int? CodeLength { get; private set; }
-        /// <summary>
-        /// Whether to perform a lookup with each verification
-        /// </summary>
-        [JsonProperty("lookup_enabled")]
-        public bool? LookupEnabled { get; private set; }
-        /// <summary>
-        /// Whether to pass PSD2 transaction parameters when starting a verification
-        /// </summary>
-        [JsonProperty("psd2_enabled")]
-        public bool? Psd2Enabled { get; private set; }
-        /// <summary>
-        /// Whether to skip sending SMS verifications to landlines
-        /// </summary>
-        [JsonProperty("skip_sms_to_landlines")]
-        public bool? SkipSmsToLandlines { get; private set; }
-        /// <summary>
-        /// Whether to ask the user to press a number before delivering the verify code in a phone call
-        /// </summary>
-        [JsonProperty("dtmf_input_required")]
-        public bool? DtmfInputRequired { get; private set; }
-        /// <summary>
-        /// The name of an alternative text-to-speech service to use in phone calls
-        /// </summary>
-        [JsonProperty("tts_name")]
-        public string TtsName { get; private set; }
-        /// <summary>
-        /// Whether to add a security warning at the end of an SMS.
-        /// </summary>
-        [JsonProperty("do_not_share_warning_enabled")]
-        public bool? DoNotShareWarningEnabled { get; private set; }
-        /// <summary>
-        /// Whether to allow sending verifications with a custom code.
-        /// </summary>
-        [JsonProperty("custom_code_enabled")]
-        public bool? CustomCodeEnabled { get; private set; }
-        /// <summary>
-        /// The service level configuration of factor push type.
-        /// </summary>
-        [JsonProperty("push")]
-        public object Push { get; private set; }
-        /// <summary>
-        /// The service level configuration of factor TOTP type.
-        /// </summary>
-        [JsonProperty("totp")]
-        public object Totp { get; private set; }
-        /// <summary>
-        /// The default_template_sid
-        /// </summary>
-        [JsonProperty("default_template_sid")]
-        public string DefaultTemplateSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ServiceResource()
-        {
-
-        }
-    }
+{
+
+  public class ServiceResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a new Verification Service.
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(CreateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Verification Service.
+    /// </summary>
+    /// <param name="options"> Create Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(CreateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a new Verification Service.
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the verification service </param>
+    /// <param name="codeLength"> The length of the verification code to generate </param>
+    /// <param name="lookupEnabled"> Whether to perform a lookup with each verification </param>
+    /// <param name="skipSmsToLandlines"> Whether to skip sending SMS verifications to landlines </param>
+    /// <param name="dtmfInputRequired"> Whether to ask the user to press a number before delivering the verify code in a
+    ///                         phone call </param>
+    /// <param name="ttsName"> The name of an alternative text-to-speech service to use in phone calls </param>
+    /// <param name="psd2Enabled"> Whether to pass PSD2 transaction parameters when starting a verification </param>
+    /// <param name="doNotShareWarningEnabled"> Whether to add a security warning at the end of an SMS. </param>
+    /// <param name="customCodeEnabled"> Whether to allow sending verifications with a custom code. </param>
+    /// <param name="pushIncludeDate"> Optional. Include the date in the Challenge's reponse. Default: true </param>
+    /// <param name="pushApnCredentialSid"> Optional. Set APN Credential for this service. </param>
+    /// <param name="pushFcmCredentialSid"> Optional. Set FCM Credential for this service. </param>
+    /// <param name="totpIssuer"> Optional. Set TOTP Issuer for this service. </param>
+    /// <param name="totpTimeStep"> Optional. How often, in seconds, are TOTP codes generated </param>
+    /// <param name="totpCodeLength"> Optional. Number of digits for generated TOTP codes </param>
+    /// <param name="totpSkew"> Optional. The number of past and future time-steps valid at a given time </param>
+    /// <param name="defaultTemplateSid"> The verification template SMS messages. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Create(string friendlyName,
+                                         int? codeLength = null,
+                                         bool? lookupEnabled = null,
+                                         bool? skipSmsToLandlines = null,
+                                         bool? dtmfInputRequired = null,
+                                         string ttsName = null,
+                                         bool? psd2Enabled = null,
+                                         bool? doNotShareWarningEnabled = null,
+                                         bool? customCodeEnabled = null,
+                                         bool? pushIncludeDate = null,
+                                         string pushApnCredentialSid = null,
+                                         string pushFcmCredentialSid = null,
+                                         string totpIssuer = null,
+                                         int? totpTimeStep = null,
+                                         int? totpCodeLength = null,
+                                         int? totpSkew = null,
+                                         string defaultTemplateSid = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName) { CodeLength = codeLength, LookupEnabled = lookupEnabled, SkipSmsToLandlines = skipSmsToLandlines, DtmfInputRequired = dtmfInputRequired, TtsName = ttsName, Psd2Enabled = psd2Enabled, DoNotShareWarningEnabled = doNotShareWarningEnabled, CustomCodeEnabled = customCodeEnabled, PushIncludeDate = pushIncludeDate, PushApnCredentialSid = pushApnCredentialSid, PushFcmCredentialSid = pushFcmCredentialSid, TotpIssuer = totpIssuer, TotpTimeStep = totpTimeStep, TotpCodeLength = totpCodeLength, TotpSkew = totpSkew, DefaultTemplateSid = defaultTemplateSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a new Verification Service.
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the verification service </param>
+    /// <param name="codeLength"> The length of the verification code to generate </param>
+    /// <param name="lookupEnabled"> Whether to perform a lookup with each verification </param>
+    /// <param name="skipSmsToLandlines"> Whether to skip sending SMS verifications to landlines </param>
+    /// <param name="dtmfInputRequired"> Whether to ask the user to press a number before delivering the verify code in a
+    ///                         phone call </param>
+    /// <param name="ttsName"> The name of an alternative text-to-speech service to use in phone calls </param>
+    /// <param name="psd2Enabled"> Whether to pass PSD2 transaction parameters when starting a verification </param>
+    /// <param name="doNotShareWarningEnabled"> Whether to add a security warning at the end of an SMS. </param>
+    /// <param name="customCodeEnabled"> Whether to allow sending verifications with a custom code. </param>
+    /// <param name="pushIncludeDate"> Optional. Include the date in the Challenge's reponse. Default: true </param>
+    /// <param name="pushApnCredentialSid"> Optional. Set APN Credential for this service. </param>
+    /// <param name="pushFcmCredentialSid"> Optional. Set FCM Credential for this service. </param>
+    /// <param name="totpIssuer"> Optional. Set TOTP Issuer for this service. </param>
+    /// <param name="totpTimeStep"> Optional. How often, in seconds, are TOTP codes generated </param>
+    /// <param name="totpCodeLength"> Optional. Number of digits for generated TOTP codes </param>
+    /// <param name="totpSkew"> Optional. The number of past and future time-steps valid at a given time </param>
+    /// <param name="defaultTemplateSid"> The verification template SMS messages. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> CreateAsync(string friendlyName,
+                                                                                 int? codeLength = null,
+                                                                                 bool? lookupEnabled = null,
+                                                                                 bool? skipSmsToLandlines = null,
+                                                                                 bool? dtmfInputRequired = null,
+                                                                                 string ttsName = null,
+                                                                                 bool? psd2Enabled = null,
+                                                                                 bool? doNotShareWarningEnabled = null,
+                                                                                 bool? customCodeEnabled = null,
+                                                                                 bool? pushIncludeDate = null,
+                                                                                 string pushApnCredentialSid = null,
+                                                                                 string pushFcmCredentialSid = null,
+                                                                                 string totpIssuer = null,
+                                                                                 int? totpTimeStep = null,
+                                                                                 int? totpCodeLength = null,
+                                                                                 int? totpSkew = null,
+                                                                                 string defaultTemplateSid = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateServiceOptions(friendlyName) { CodeLength = codeLength, LookupEnabled = lookupEnabled, SkipSmsToLandlines = skipSmsToLandlines, DtmfInputRequired = dtmfInputRequired, TtsName = ttsName, Psd2Enabled = psd2Enabled, DoNotShareWarningEnabled = doNotShareWarningEnabled, CustomCodeEnabled = customCodeEnabled, PushIncludeDate = pushIncludeDate, PushApnCredentialSid = pushApnCredentialSid, PushFcmCredentialSid = pushFcmCredentialSid, TotpIssuer = totpIssuer, TotpTimeStep = totpTimeStep, TotpCodeLength = totpCodeLength, TotpSkew = totpSkew, DefaultTemplateSid = defaultTemplateSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch specific Verification Service Instance.
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(FetchServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Verification Service Instance.
+    /// </summary>
+    /// <param name="options"> Fetch Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(FetchServiceOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch specific Verification Service Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch specific Verification Service Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchServiceOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a specific Verification Service Instance.
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(DeleteServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Verification Service Instance.
+    /// </summary>
+    /// <param name="options"> Delete Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteServiceOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a specific Verification Service Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a specific Verification Service Instance.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteServiceOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Services",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of all Verification Services for an account.
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(ReadServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Verification Services for an account.
+    /// </summary>
+    /// <param name="options"> Read Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(ReadServiceOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ServiceResource>.FromJson("services", response.Content);
+      return new ResourceSet<ServiceResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of all Verification Services for an account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ResourceSet<ServiceResource> Read(int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of all Verification Services for an account.
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ServiceResource>> ReadAsync(int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadServiceOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ServiceResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ServiceResource> NextPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ServiceResource> PreviousPage(Page<ServiceResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<ServiceResource>.FromJson("services", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateServiceOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Verify,
+          "/v2/Services/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update a specific Verification Service.
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(UpdateServiceOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Verification Service.
+    /// </summary>
+    /// <param name="options"> Update Service parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(UpdateServiceOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update a specific Verification Service.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the verification service </param>
+    /// <param name="codeLength"> The length of the verification code to generate </param>
+    /// <param name="lookupEnabled"> Whether to perform a lookup with each verification </param>
+    /// <param name="skipSmsToLandlines"> Whether to skip sending SMS verifications to landlines </param>
+    /// <param name="dtmfInputRequired"> Whether to ask the user to press a number before delivering the verify code in a
+    ///                         phone call </param>
+    /// <param name="ttsName"> The name of an alternative text-to-speech service to use in phone calls </param>
+    /// <param name="psd2Enabled"> Whether to pass PSD2 transaction parameters when starting a verification </param>
+    /// <param name="doNotShareWarningEnabled"> Whether to add a privacy warning at the end of an SMS. </param>
+    /// <param name="customCodeEnabled"> Whether to allow sending verifications with a custom code. </param>
+    /// <param name="pushIncludeDate"> Optional. Include the date in the Challenge's reponse. Default: true </param>
+    /// <param name="pushApnCredentialSid"> Optional. Set APN Credential for this service. </param>
+    /// <param name="pushFcmCredentialSid"> Optional. Set FCM Credential for this service. </param>
+    /// <param name="totpIssuer"> Optional. Set TOTP Issuer for this service. </param>
+    /// <param name="totpTimeStep"> Optional. How often, in seconds, are TOTP codes generated </param>
+    /// <param name="totpCodeLength"> Optional. Number of digits for generated TOTP codes </param>
+    /// <param name="totpSkew"> Optional. The number of past and future time-steps valid at a given time </param>
+    /// <param name="defaultTemplateSid"> The verification template SMS messages. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Service </returns>
+    public static ServiceResource Update(string pathSid,
+                                         string friendlyName = null,
+                                         int? codeLength = null,
+                                         bool? lookupEnabled = null,
+                                         bool? skipSmsToLandlines = null,
+                                         bool? dtmfInputRequired = null,
+                                         string ttsName = null,
+                                         bool? psd2Enabled = null,
+                                         bool? doNotShareWarningEnabled = null,
+                                         bool? customCodeEnabled = null,
+                                         bool? pushIncludeDate = null,
+                                         string pushApnCredentialSid = null,
+                                         string pushFcmCredentialSid = null,
+                                         string totpIssuer = null,
+                                         int? totpTimeStep = null,
+                                         int? totpCodeLength = null,
+                                         int? totpSkew = null,
+                                         string defaultTemplateSid = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, CodeLength = codeLength, LookupEnabled = lookupEnabled, SkipSmsToLandlines = skipSmsToLandlines, DtmfInputRequired = dtmfInputRequired, TtsName = ttsName, Psd2Enabled = psd2Enabled, DoNotShareWarningEnabled = doNotShareWarningEnabled, CustomCodeEnabled = customCodeEnabled, PushIncludeDate = pushIncludeDate, PushApnCredentialSid = pushApnCredentialSid, PushFcmCredentialSid = pushFcmCredentialSid, TotpIssuer = totpIssuer, TotpTimeStep = totpTimeStep, TotpCodeLength = totpCodeLength, TotpSkew = totpSkew, DefaultTemplateSid = defaultTemplateSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update a specific Verification Service.
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the verification service </param>
+    /// <param name="codeLength"> The length of the verification code to generate </param>
+    /// <param name="lookupEnabled"> Whether to perform a lookup with each verification </param>
+    /// <param name="skipSmsToLandlines"> Whether to skip sending SMS verifications to landlines </param>
+    /// <param name="dtmfInputRequired"> Whether to ask the user to press a number before delivering the verify code in a
+    ///                         phone call </param>
+    /// <param name="ttsName"> The name of an alternative text-to-speech service to use in phone calls </param>
+    /// <param name="psd2Enabled"> Whether to pass PSD2 transaction parameters when starting a verification </param>
+    /// <param name="doNotShareWarningEnabled"> Whether to add a privacy warning at the end of an SMS. </param>
+    /// <param name="customCodeEnabled"> Whether to allow sending verifications with a custom code. </param>
+    /// <param name="pushIncludeDate"> Optional. Include the date in the Challenge's reponse. Default: true </param>
+    /// <param name="pushApnCredentialSid"> Optional. Set APN Credential for this service. </param>
+    /// <param name="pushFcmCredentialSid"> Optional. Set FCM Credential for this service. </param>
+    /// <param name="totpIssuer"> Optional. Set TOTP Issuer for this service. </param>
+    /// <param name="totpTimeStep"> Optional. How often, in seconds, are TOTP codes generated </param>
+    /// <param name="totpCodeLength"> Optional. Number of digits for generated TOTP codes </param>
+    /// <param name="totpSkew"> Optional. The number of past and future time-steps valid at a given time </param>
+    /// <param name="defaultTemplateSid"> The verification template SMS messages. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Service </returns>
+    public static async System.Threading.Tasks.Task<ServiceResource> UpdateAsync(string pathSid,
+                                                                                 string friendlyName = null,
+                                                                                 int? codeLength = null,
+                                                                                 bool? lookupEnabled = null,
+                                                                                 bool? skipSmsToLandlines = null,
+                                                                                 bool? dtmfInputRequired = null,
+                                                                                 string ttsName = null,
+                                                                                 bool? psd2Enabled = null,
+                                                                                 bool? doNotShareWarningEnabled = null,
+                                                                                 bool? customCodeEnabled = null,
+                                                                                 bool? pushIncludeDate = null,
+                                                                                 string pushApnCredentialSid = null,
+                                                                                 string pushFcmCredentialSid = null,
+                                                                                 string totpIssuer = null,
+                                                                                 int? totpTimeStep = null,
+                                                                                 int? totpCodeLength = null,
+                                                                                 int? totpSkew = null,
+                                                                                 string defaultTemplateSid = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateServiceOptions(pathSid) { FriendlyName = friendlyName, CodeLength = codeLength, LookupEnabled = lookupEnabled, SkipSmsToLandlines = skipSmsToLandlines, DtmfInputRequired = dtmfInputRequired, TtsName = ttsName, Psd2Enabled = psd2Enabled, DoNotShareWarningEnabled = doNotShareWarningEnabled, CustomCodeEnabled = customCodeEnabled, PushIncludeDate = pushIncludeDate, PushApnCredentialSid = pushApnCredentialSid, PushFcmCredentialSid = pushFcmCredentialSid, TotpIssuer = totpIssuer, TotpTimeStep = totpTimeStep, TotpCodeLength = totpCodeLength, TotpSkew = totpSkew, DefaultTemplateSid = defaultTemplateSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ServiceResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ServiceResource object represented by the provided JSON </returns>
+    public static ServiceResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ServiceResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the verification service
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The length of the verification code
+    /// </summary>
+    [JsonProperty("code_length")]
+    public int? CodeLength { get; private set; }
+    /// <summary>
+    /// Whether to perform a lookup with each verification
+    /// </summary>
+    [JsonProperty("lookup_enabled")]
+    public bool? LookupEnabled { get; private set; }
+    /// <summary>
+    /// Whether to pass PSD2 transaction parameters when starting a verification
+    /// </summary>
+    [JsonProperty("psd2_enabled")]
+    public bool? Psd2Enabled { get; private set; }
+    /// <summary>
+    /// Whether to skip sending SMS verifications to landlines
+    /// </summary>
+    [JsonProperty("skip_sms_to_landlines")]
+    public bool? SkipSmsToLandlines { get; private set; }
+    /// <summary>
+    /// Whether to ask the user to press a number before delivering the verify code in a phone call
+    /// </summary>
+    [JsonProperty("dtmf_input_required")]
+    public bool? DtmfInputRequired { get; private set; }
+    /// <summary>
+    /// The name of an alternative text-to-speech service to use in phone calls
+    /// </summary>
+    [JsonProperty("tts_name")]
+    public string TtsName { get; private set; }
+    /// <summary>
+    /// Whether to add a security warning at the end of an SMS.
+    /// </summary>
+    [JsonProperty("do_not_share_warning_enabled")]
+    public bool? DoNotShareWarningEnabled { get; private set; }
+    /// <summary>
+    /// Whether to allow sending verifications with a custom code.
+    /// </summary>
+    [JsonProperty("custom_code_enabled")]
+    public bool? CustomCodeEnabled { get; private set; }
+    /// <summary>
+    /// The service level configuration of factor push type.
+    /// </summary>
+    [JsonProperty("push")]
+    public object Push { get; private set; }
+    /// <summary>
+    /// The service level configuration of factor TOTP type.
+    /// </summary>
+    [JsonProperty("totp")]
+    public object Totp { get; private set; }
+    /// <summary>
+    /// The default_template_sid
+    /// </summary>
+    [JsonProperty("default_template_sid")]
+    public string DefaultTemplateSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ServiceResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/TemplateOptions.cs b/src/Twilio/Rest/Verify/V2/TemplateOptions.cs
index 04b1939bc..7bfcfd0a2 100644
--- a/src/Twilio/Rest/Verify/V2/TemplateOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/TemplateOptions.cs
@@ -9,36 +9,36 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2
-{
-
+{
+
+  /// <summary>
+  /// List all the available templates for a given Account.
+  /// </summary>
+  public class ReadTemplateOptions : ReadOptions<TemplateResource>
+  {
     /// <summary>
-    /// List all the available templates for a given Account.
+    /// Filter templates using friendly name
     /// </summary>
-    public class ReadTemplateOptions : ReadOptions<TemplateResource>
-    {
-        /// <summary>
-        /// Filter templates using friendly name
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/TemplateResource.cs b/src/Twilio/Rest/Verify/V2/TemplateResource.cs
index 1cc6f5e6d..47552cfe3 100644
--- a/src/Twilio/Rest/Verify/V2/TemplateResource.cs
+++ b/src/Twilio/Rest/Verify/V2/TemplateResource.cs
@@ -16,186 +16,186 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Verify.V2
-{
-
-    public class TemplateResource : Resource
-    {
-        private static Request BuildReadRequest(ReadTemplateOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Templates",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// List all the available templates for a given Account.
-        /// </summary>
-        /// <param name="options"> Read Template parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Template </returns>
-        public static ResourceSet<TemplateResource> Read(ReadTemplateOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<TemplateResource>.FromJson("templates", response.Content);
-            return new ResourceSet<TemplateResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List all the available templates for a given Account.
-        /// </summary>
-        /// <param name="options"> Read Template parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Template </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TemplateResource>> ReadAsync(ReadTemplateOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<TemplateResource>.FromJson("templates", response.Content);
-            return new ResourceSet<TemplateResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// List all the available templates for a given Account.
-        /// </summary>
-        /// <param name="friendlyName"> Filter templates using friendly name </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Template </returns>
-        public static ResourceSet<TemplateResource> Read(string friendlyName = null,
-                                                         int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadTemplateOptions(){FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List all the available templates for a given Account.
-        /// </summary>
-        /// <param name="friendlyName"> Filter templates using friendly name </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Template </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<TemplateResource>> ReadAsync(string friendlyName = null,
-                                                                                                 int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadTemplateOptions(){FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<TemplateResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<TemplateResource>.FromJson("templates", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<TemplateResource> NextPage(Page<TemplateResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<TemplateResource>.FromJson("templates", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<TemplateResource> PreviousPage(Page<TemplateResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<TemplateResource>.FromJson("templates", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a TemplateResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> TemplateResource object represented by the provided JSON </returns>
-        public static TemplateResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<TemplateResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Template
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Account Sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// A string to describe the verification template
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// Ojbect with the template translations.
-        /// </summary>
-        [JsonProperty("translations")]
-        public object Translations { get; private set; }
-
-        private TemplateResource()
-        {
-
-        }
-    }
+{
+
+  public class TemplateResource : Resource
+  {
+    private static Request BuildReadRequest(ReadTemplateOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Templates",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// List all the available templates for a given Account.
+    /// </summary>
+    /// <param name="options"> Read Template parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Template </returns>
+    public static ResourceSet<TemplateResource> Read(ReadTemplateOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<TemplateResource>.FromJson("templates", response.Content);
+      return new ResourceSet<TemplateResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List all the available templates for a given Account.
+    /// </summary>
+    /// <param name="options"> Read Template parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Template </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TemplateResource>> ReadAsync(ReadTemplateOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<TemplateResource>.FromJson("templates", response.Content);
+      return new ResourceSet<TemplateResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// List all the available templates for a given Account.
+    /// </summary>
+    /// <param name="friendlyName"> Filter templates using friendly name </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Template </returns>
+    public static ResourceSet<TemplateResource> Read(string friendlyName = null,
+                                                     int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadTemplateOptions() { FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List all the available templates for a given Account.
+    /// </summary>
+    /// <param name="friendlyName"> Filter templates using friendly name </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Template </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<TemplateResource>> ReadAsync(string friendlyName = null,
+                                                                                             int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadTemplateOptions() { FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<TemplateResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<TemplateResource>.FromJson("templates", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<TemplateResource> NextPage(Page<TemplateResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<TemplateResource>.FromJson("templates", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<TemplateResource> PreviousPage(Page<TemplateResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<TemplateResource>.FromJson("templates", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a TemplateResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> TemplateResource object represented by the provided JSON </returns>
+    public static TemplateResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<TemplateResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Template
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Account Sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// A string to describe the verification template
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// Ojbect with the template translations.
+    /// </summary>
+    [JsonProperty("translations")]
+    public object Translations { get; private set; }
+
+    private TemplateResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/VerificationAttemptOptions.cs b/src/Twilio/Rest/Verify/V2/VerificationAttemptOptions.cs
index 47a85ab1f..5c88311a0 100644
--- a/src/Twilio/Rest/Verify/V2/VerificationAttemptOptions.cs
+++ b/src/Twilio/Rest/Verify/V2/VerificationAttemptOptions.cs
@@ -9,83 +9,83 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Verify.V2
-{
-
+{
+
+  /// <summary>
+  /// List all the verification attempts for a given Account.
+  /// </summary>
+  public class ReadVerificationAttemptOptions : ReadOptions<VerificationAttemptResource>
+  {
     /// <summary>
-    /// List all the verification attempts for a given Account.
+    /// Filter verification attempts after this date
     /// </summary>
-    public class ReadVerificationAttemptOptions : ReadOptions<VerificationAttemptResource>
-    {
-        /// <summary>
-        /// Filter verification attempts after this date
-        /// </summary>
-        public DateTime? DateCreatedAfter { get; set; }
-        /// <summary>
-        /// Filter verification attempts befor this date
-        /// </summary>
-        public DateTime? DateCreatedBefore { get; set; }
-        /// <summary>
-        /// Destination of a verification
-        /// </summary>
-        public string ChannelDataTo { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DateCreatedAfter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
-            }
-
-            if (DateCreatedBefore != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
-            }
-
-            if (ChannelDataTo != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ChannelData.To", ChannelDataTo));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public DateTime? DateCreatedAfter { get; set; }
     /// <summary>
-    /// Fetch a specific verification attempt.
+    /// Filter verification attempts befor this date
     /// </summary>
-    public class FetchVerificationAttemptOptions : IOptions<VerificationAttemptResource>
-    {
-        /// <summary>
-        /// Verification Attempt Sid.
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchVerificationAttemptOptions
-        /// </summary>
-        /// <param name="pathSid"> Verification Attempt Sid. </param>
-        public FetchVerificationAttemptOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public DateTime? DateCreatedBefore { get; set; }
+    /// <summary>
+    /// Destination of a verification
+    /// </summary>
+    public string ChannelDataTo { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DateCreatedAfter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
+      }
+
+      if (DateCreatedBefore != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
+      }
+
+      if (ChannelDataTo != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ChannelData.To", ChannelDataTo));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Fetch a specific verification attempt.
+  /// </summary>
+  public class FetchVerificationAttemptOptions : IOptions<VerificationAttemptResource>
+  {
+    /// <summary>
+    /// Verification Attempt Sid.
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchVerificationAttemptOptions
+    /// </summary>
+    /// <param name="pathSid"> Verification Attempt Sid. </param>
+    public FetchVerificationAttemptOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Verify/V2/VerificationAttemptResource.cs b/src/Twilio/Rest/Verify/V2/VerificationAttemptResource.cs
index 7ea34a669..7be1ad5b2 100644
--- a/src/Twilio/Rest/Verify/V2/VerificationAttemptResource.cs
+++ b/src/Twilio/Rest/Verify/V2/VerificationAttemptResource.cs
@@ -17,320 +17,320 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Verify.V2
-{
-
-    public class VerificationAttemptResource : Resource
-    {
-        public sealed class ChannelsEnum : StringEnum
-        {
-            private ChannelsEnum(string value) : base(value) {}
-            public ChannelsEnum() {}
-            public static implicit operator ChannelsEnum(string value)
-            {
-                return new ChannelsEnum(value);
-            }
-
-            public static readonly ChannelsEnum Sms = new ChannelsEnum("sms");
-            public static readonly ChannelsEnum Call = new ChannelsEnum("call");
-            public static readonly ChannelsEnum Email = new ChannelsEnum("email");
-            public static readonly ChannelsEnum Whatsapp = new ChannelsEnum("whatsapp");
-        }
-
-        public sealed class ConversionStatusEnum : StringEnum
-        {
-            private ConversionStatusEnum(string value) : base(value) {}
-            public ConversionStatusEnum() {}
-            public static implicit operator ConversionStatusEnum(string value)
-            {
-                return new ConversionStatusEnum(value);
-            }
-
-            public static readonly ConversionStatusEnum Converted = new ConversionStatusEnum("converted");
-            public static readonly ConversionStatusEnum Unconverted = new ConversionStatusEnum("unconverted");
-        }
-
-        private static Request BuildReadRequest(ReadVerificationAttemptOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Attempts",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// List all the verification attempts for a given Account.
-        /// </summary>
-        /// <param name="options"> Read VerificationAttempt parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of VerificationAttempt </returns>
-        public static ResourceSet<VerificationAttemptResource> Read(ReadVerificationAttemptOptions options,
-                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<VerificationAttemptResource>.FromJson("attempts", response.Content);
-            return new ResourceSet<VerificationAttemptResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List all the verification attempts for a given Account.
-        /// </summary>
-        /// <param name="options"> Read VerificationAttempt parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of VerificationAttempt </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<VerificationAttemptResource>> ReadAsync(ReadVerificationAttemptOptions options,
-                                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<VerificationAttemptResource>.FromJson("attempts", response.Content);
-            return new ResourceSet<VerificationAttemptResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// List all the verification attempts for a given Account.
-        /// </summary>
-        /// <param name="dateCreatedAfter"> Filter verification attempts after this date </param>
-        /// <param name="dateCreatedBefore"> Filter verification attempts befor this date </param>
-        /// <param name="channelDataTo"> Destination of a verification </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of VerificationAttempt </returns>
-        public static ResourceSet<VerificationAttemptResource> Read(DateTime? dateCreatedAfter = null,
-                                                                    DateTime? dateCreatedBefore = null,
-                                                                    string channelDataTo = null,
-                                                                    int? pageSize = null,
-                                                                    long? limit = null,
-                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadVerificationAttemptOptions(){DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, ChannelDataTo = channelDataTo, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List all the verification attempts for a given Account.
-        /// </summary>
-        /// <param name="dateCreatedAfter"> Filter verification attempts after this date </param>
-        /// <param name="dateCreatedBefore"> Filter verification attempts befor this date </param>
-        /// <param name="channelDataTo"> Destination of a verification </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of VerificationAttempt </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<VerificationAttemptResource>> ReadAsync(DateTime? dateCreatedAfter = null,
-                                                                                                            DateTime? dateCreatedBefore = null,
-                                                                                                            string channelDataTo = null,
-                                                                                                            int? pageSize = null,
-                                                                                                            long? limit = null,
-                                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadVerificationAttemptOptions(){DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, ChannelDataTo = channelDataTo, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<VerificationAttemptResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<VerificationAttemptResource>.FromJson("attempts", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<VerificationAttemptResource> NextPage(Page<VerificationAttemptResource> page,
-                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<VerificationAttemptResource>.FromJson("attempts", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<VerificationAttemptResource> PreviousPage(Page<VerificationAttemptResource> page,
-                                                                     ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Verify)
-            );
-
-            var response = client.Request(request);
-            return Page<VerificationAttemptResource>.FromJson("attempts", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchVerificationAttemptOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Verify,
-                "/v2/Attempts/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a specific verification attempt.
-        /// </summary>
-        /// <param name="options"> Fetch VerificationAttempt parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of VerificationAttempt </returns>
-        public static VerificationAttemptResource Fetch(FetchVerificationAttemptOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific verification attempt.
-        /// </summary>
-        /// <param name="options"> Fetch VerificationAttempt parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of VerificationAttempt </returns>
-        public static async System.Threading.Tasks.Task<VerificationAttemptResource> FetchAsync(FetchVerificationAttemptOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a specific verification attempt.
-        /// </summary>
-        /// <param name="pathSid"> Verification Attempt Sid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of VerificationAttempt </returns>
-        public static VerificationAttemptResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchVerificationAttemptOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a specific verification attempt.
-        /// </summary>
-        /// <param name="pathSid"> Verification Attempt Sid. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of VerificationAttempt </returns>
-        public static async System.Threading.Tasks.Task<VerificationAttemptResource> FetchAsync(string pathSid,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchVerificationAttemptOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a VerificationAttemptResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> VerificationAttemptResource object represented by the provided JSON </returns>
-        public static VerificationAttemptResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<VerificationAttemptResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A string that uniquely identifies this Verification Attempt
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// Account Sid
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The service_sid
-        /// </summary>
-        [JsonProperty("service_sid")]
-        public string ServiceSid { get; private set; }
-        /// <summary>
-        /// The date this Attempt was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date this Attempt was updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Status of a conversion
-        /// </summary>
-        [JsonProperty("conversion_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public VerificationAttemptResource.ConversionStatusEnum ConversionStatus { get; private set; }
-        /// <summary>
-        /// Channel used for the attempt
-        /// </summary>
-        [JsonProperty("channel")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public VerificationAttemptResource.ChannelsEnum Channel { get; private set; }
-        /// <summary>
-        /// Object with the channel information for an attempt
-        /// </summary>
-        [JsonProperty("channel_data")]
-        public object ChannelData { get; private set; }
-        /// <summary>
-        /// The url
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private VerificationAttemptResource()
-        {
-
-        }
-    }
+{
+
+  public class VerificationAttemptResource : Resource
+  {
+    public sealed class ChannelsEnum : StringEnum
+    {
+      private ChannelsEnum(string value) : base(value) { }
+      public ChannelsEnum() { }
+      public static implicit operator ChannelsEnum(string value)
+      {
+        return new ChannelsEnum(value);
+      }
+
+      public static readonly ChannelsEnum Sms = new ChannelsEnum("sms");
+      public static readonly ChannelsEnum Call = new ChannelsEnum("call");
+      public static readonly ChannelsEnum Email = new ChannelsEnum("email");
+      public static readonly ChannelsEnum Whatsapp = new ChannelsEnum("whatsapp");
+    }
+
+    public sealed class ConversionStatusEnum : StringEnum
+    {
+      private ConversionStatusEnum(string value) : base(value) { }
+      public ConversionStatusEnum() { }
+      public static implicit operator ConversionStatusEnum(string value)
+      {
+        return new ConversionStatusEnum(value);
+      }
+
+      public static readonly ConversionStatusEnum Converted = new ConversionStatusEnum("converted");
+      public static readonly ConversionStatusEnum Unconverted = new ConversionStatusEnum("unconverted");
+    }
+
+    private static Request BuildReadRequest(ReadVerificationAttemptOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Attempts",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// List all the verification attempts for a given Account.
+    /// </summary>
+    /// <param name="options"> Read VerificationAttempt parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of VerificationAttempt </returns>
+    public static ResourceSet<VerificationAttemptResource> Read(ReadVerificationAttemptOptions options,
+                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<VerificationAttemptResource>.FromJson("attempts", response.Content);
+      return new ResourceSet<VerificationAttemptResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List all the verification attempts for a given Account.
+    /// </summary>
+    /// <param name="options"> Read VerificationAttempt parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of VerificationAttempt </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<VerificationAttemptResource>> ReadAsync(ReadVerificationAttemptOptions options,
+                                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<VerificationAttemptResource>.FromJson("attempts", response.Content);
+      return new ResourceSet<VerificationAttemptResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// List all the verification attempts for a given Account.
+    /// </summary>
+    /// <param name="dateCreatedAfter"> Filter verification attempts after this date </param>
+    /// <param name="dateCreatedBefore"> Filter verification attempts befor this date </param>
+    /// <param name="channelDataTo"> Destination of a verification </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of VerificationAttempt </returns>
+    public static ResourceSet<VerificationAttemptResource> Read(DateTime? dateCreatedAfter = null,
+                                                                DateTime? dateCreatedBefore = null,
+                                                                string channelDataTo = null,
+                                                                int? pageSize = null,
+                                                                long? limit = null,
+                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadVerificationAttemptOptions() { DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, ChannelDataTo = channelDataTo, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List all the verification attempts for a given Account.
+    /// </summary>
+    /// <param name="dateCreatedAfter"> Filter verification attempts after this date </param>
+    /// <param name="dateCreatedBefore"> Filter verification attempts befor this date </param>
+    /// <param name="channelDataTo"> Destination of a verification </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of VerificationAttempt </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<VerificationAttemptResource>> ReadAsync(DateTime? dateCreatedAfter = null,
+                                                                                                        DateTime? dateCreatedBefore = null,
+                                                                                                        string channelDataTo = null,
+                                                                                                        int? pageSize = null,
+                                                                                                        long? limit = null,
+                                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadVerificationAttemptOptions() { DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, ChannelDataTo = channelDataTo, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<VerificationAttemptResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<VerificationAttemptResource>.FromJson("attempts", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<VerificationAttemptResource> NextPage(Page<VerificationAttemptResource> page,
+                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<VerificationAttemptResource>.FromJson("attempts", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<VerificationAttemptResource> PreviousPage(Page<VerificationAttemptResource> page,
+                                                                 ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Verify)
+      );
+
+      var response = client.Request(request);
+      return Page<VerificationAttemptResource>.FromJson("attempts", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchVerificationAttemptOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Verify,
+          "/v2/Attempts/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a specific verification attempt.
+    /// </summary>
+    /// <param name="options"> Fetch VerificationAttempt parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of VerificationAttempt </returns>
+    public static VerificationAttemptResource Fetch(FetchVerificationAttemptOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific verification attempt.
+    /// </summary>
+    /// <param name="options"> Fetch VerificationAttempt parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of VerificationAttempt </returns>
+    public static async System.Threading.Tasks.Task<VerificationAttemptResource> FetchAsync(FetchVerificationAttemptOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a specific verification attempt.
+    /// </summary>
+    /// <param name="pathSid"> Verification Attempt Sid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of VerificationAttempt </returns>
+    public static VerificationAttemptResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchVerificationAttemptOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a specific verification attempt.
+    /// </summary>
+    /// <param name="pathSid"> Verification Attempt Sid. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of VerificationAttempt </returns>
+    public static async System.Threading.Tasks.Task<VerificationAttemptResource> FetchAsync(string pathSid,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchVerificationAttemptOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a VerificationAttemptResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> VerificationAttemptResource object represented by the provided JSON </returns>
+    public static VerificationAttemptResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<VerificationAttemptResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A string that uniquely identifies this Verification Attempt
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// Account Sid
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The service_sid
+    /// </summary>
+    [JsonProperty("service_sid")]
+    public string ServiceSid { get; private set; }
+    /// <summary>
+    /// The date this Attempt was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date this Attempt was updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Status of a conversion
+    /// </summary>
+    [JsonProperty("conversion_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public VerificationAttemptResource.ConversionStatusEnum ConversionStatus { get; private set; }
+    /// <summary>
+    /// Channel used for the attempt
+    /// </summary>
+    [JsonProperty("channel")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public VerificationAttemptResource.ChannelsEnum Channel { get; private set; }
+    /// <summary>
+    /// Object with the channel information for an attempt
+    /// </summary>
+    [JsonProperty("channel_data")]
+    public object ChannelData { get; private set; }
+    /// <summary>
+    /// The url
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private VerificationAttemptResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/CompositionHookOptions.cs b/src/Twilio/Rest/Video/V1/CompositionHookOptions.cs
index be8a45551..3d83d971d 100644
--- a/src/Twilio/Rest/Video/V1/CompositionHookOptions.cs
+++ b/src/Twilio/Rest/Video/V1/CompositionHookOptions.cs
@@ -10,361 +10,361 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Video.V1
-{
-
+{
+
+  /// <summary>
+  /// Returns a single CompositionHook resource identified by a CompositionHook SID.
+  /// </summary>
+  public class FetchCompositionHookOptions : IOptions<CompositionHookResource>
+  {
     /// <summary>
-    /// Returns a single CompositionHook resource identified by a CompositionHook SID.
+    /// The SID that identifies the resource to fetch
     /// </summary>
-    public class FetchCompositionHookOptions : IOptions<CompositionHookResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCompositionHookOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchCompositionHookOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// List of all Recording CompositionHook resources.
-    /// </summary>
-    public class ReadCompositionHookOptions : ReadOptions<CompositionHookResource>
-    {
-        /// <summary>
-        /// Read only CompositionHook resources with an enabled value that matches this parameter
-        /// </summary>
-        public bool? Enabled { get; set; }
-        /// <summary>
-        /// Read only CompositionHook resources created on or after this ISO 8601 datetime with time zone
-        /// </summary>
-        public DateTime? DateCreatedAfter { get; set; }
-        /// <summary>
-        /// Read only CompositionHook resources created before this ISO 8601 datetime with time zone
-        /// </summary>
-        public DateTime? DateCreatedBefore { get; set; }
-        /// <summary>
-        /// Read only CompositionHook resources with friendly names that match this string
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            if (DateCreatedAfter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
-            }
-
-            if (DateCreatedBefore != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchCompositionHookOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchCompositionHookOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// Delete a Recording CompositionHook resource identified by a `CompositionHook SID`.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteCompositionHookOptions : IOptions<CompositionHookResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCompositionHookOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeleteCompositionHookOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// List of all Recording CompositionHook resources.
+  /// </summary>
+  public class ReadCompositionHookOptions : ReadOptions<CompositionHookResource>
+  {
     /// <summary>
-    /// CreateCompositionHookOptions
-    /// </summary>
-    public class CreateCompositionHookOptions : IOptions<CompositionHookResource>
-    {
-        /// <summary>
-        /// A unique string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// Whether the composition hook is active
-        /// </summary>
-        public bool? Enabled { get; set; }
-        /// <summary>
-        /// An object that describes the video layout of the composition hook
-        /// </summary>
-        public object VideoLayout { get; set; }
-        /// <summary>
-        /// An array of track names from the same group room to merge
-        /// </summary>
-        public List<string> AudioSources { get; set; }
-        /// <summary>
-        /// An array of track names to exclude
-        /// </summary>
-        public List<string> AudioSourcesExcluded { get; set; }
-        /// <summary>
-        /// A string that describes the rows (width) and columns (height) of the generated composed video in pixels
-        /// </summary>
-        public string Resolution { get; set; }
-        /// <summary>
-        /// The container format of the media files used by the compositions created by the composition hook
-        /// </summary>
-        public CompositionHookResource.FormatEnum Format { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Whether to clip the intervals where there is no active media in the Compositions triggered by the composition hook
-        /// </summary>
-        public bool? Trim { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCompositionHookOptions
-        /// </summary>
-        /// <param name="friendlyName"> A unique string to describe the resource </param>
-        public CreateCompositionHookOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-            AudioSources = new List<string>();
-            AudioSourcesExcluded = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            if (VideoLayout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VideoLayout", Serializers.JsonObject(VideoLayout)));
-            }
-
-            if (AudioSources != null)
-            {
-                p.AddRange(AudioSources.Select(prop => new KeyValuePair<string, string>("AudioSources", prop)));
-            }
-
-            if (AudioSourcesExcluded != null)
-            {
-                p.AddRange(AudioSourcesExcluded.Select(prop => new KeyValuePair<string, string>("AudioSourcesExcluded", prop)));
-            }
-
-            if (Resolution != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Resolution", Resolution));
-            }
-
-            if (Format != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Format", Format.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (Trim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Trim", Trim.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Read only CompositionHook resources with an enabled value that matches this parameter
+    /// </summary>
+    public bool? Enabled { get; set; }
     /// <summary>
-    /// UpdateCompositionHookOptions
-    /// </summary>
-    public class UpdateCompositionHookOptions : IOptions<CompositionHookResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A unique string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// Whether the composition hook is active
-        /// </summary>
-        public bool? Enabled { get; set; }
-        /// <summary>
-        /// A JSON object that describes the video layout of the composition hook
-        /// </summary>
-        public object VideoLayout { get; set; }
-        /// <summary>
-        /// An array of track names from the same group room to merge
-        /// </summary>
-        public List<string> AudioSources { get; set; }
-        /// <summary>
-        /// An array of track names to exclude
-        /// </summary>
-        public List<string> AudioSourcesExcluded { get; set; }
-        /// <summary>
-        /// Whether to clip the intervals where there is no active media in the Compositions triggered by the composition hook
-        /// </summary>
-        public bool? Trim { get; set; }
-        /// <summary>
-        /// The container format of the media files used by the compositions created by the composition hook
-        /// </summary>
-        public CompositionHookResource.FormatEnum Format { get; set; }
-        /// <summary>
-        /// A string that describes the columns (width) and rows (height) of the generated composed video in pixels
-        /// </summary>
-        public string Resolution { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateCompositionHookOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="friendlyName"> A unique string to describe the resource </param>
-        public UpdateCompositionHookOptions(string pathSid, string friendlyName)
-        {
-            PathSid = pathSid;
-            FriendlyName = friendlyName;
-            AudioSources = new List<string>();
-            AudioSourcesExcluded = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            if (VideoLayout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VideoLayout", Serializers.JsonObject(VideoLayout)));
-            }
-
-            if (AudioSources != null)
-            {
-                p.AddRange(AudioSources.Select(prop => new KeyValuePair<string, string>("AudioSources", prop)));
-            }
-
-            if (AudioSourcesExcluded != null)
-            {
-                p.AddRange(AudioSourcesExcluded.Select(prop => new KeyValuePair<string, string>("AudioSourcesExcluded", prop)));
-            }
-
-            if (Trim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Trim", Trim.Value.ToString().ToLower()));
-            }
-
-            if (Format != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Format", Format.ToString()));
-            }
-
-            if (Resolution != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Resolution", Resolution));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Read only CompositionHook resources created on or after this ISO 8601 datetime with time zone
+    /// </summary>
+    public DateTime? DateCreatedAfter { get; set; }
+    /// <summary>
+    /// Read only CompositionHook resources created before this ISO 8601 datetime with time zone
+    /// </summary>
+    public DateTime? DateCreatedBefore { get; set; }
+    /// <summary>
+    /// Read only CompositionHook resources with friendly names that match this string
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      if (DateCreatedAfter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
+      }
+
+      if (DateCreatedBefore != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a Recording CompositionHook resource identified by a `CompositionHook SID`.
+  /// </summary>
+  public class DeleteCompositionHookOptions : IOptions<CompositionHookResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCompositionHookOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeleteCompositionHookOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateCompositionHookOptions
+  /// </summary>
+  public class CreateCompositionHookOptions : IOptions<CompositionHookResource>
+  {
+    /// <summary>
+    /// A unique string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// Whether the composition hook is active
+    /// </summary>
+    public bool? Enabled { get; set; }
+    /// <summary>
+    /// An object that describes the video layout of the composition hook
+    /// </summary>
+    public object VideoLayout { get; set; }
+    /// <summary>
+    /// An array of track names from the same group room to merge
+    /// </summary>
+    public List<string> AudioSources { get; set; }
+    /// <summary>
+    /// An array of track names to exclude
+    /// </summary>
+    public List<string> AudioSourcesExcluded { get; set; }
+    /// <summary>
+    /// A string that describes the rows (width) and columns (height) of the generated composed video in pixels
+    /// </summary>
+    public string Resolution { get; set; }
+    /// <summary>
+    /// The container format of the media files used by the compositions created by the composition hook
+    /// </summary>
+    public CompositionHookResource.FormatEnum Format { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Whether to clip the intervals where there is no active media in the Compositions triggered by the composition hook
+    /// </summary>
+    public bool? Trim { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCompositionHookOptions
+    /// </summary>
+    /// <param name="friendlyName"> A unique string to describe the resource </param>
+    public CreateCompositionHookOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+      AudioSources = new List<string>();
+      AudioSourcesExcluded = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      if (VideoLayout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VideoLayout", Serializers.JsonObject(VideoLayout)));
+      }
+
+      if (AudioSources != null)
+      {
+        p.AddRange(AudioSources.Select(prop => new KeyValuePair<string, string>("AudioSources", prop)));
+      }
+
+      if (AudioSourcesExcluded != null)
+      {
+        p.AddRange(AudioSourcesExcluded.Select(prop => new KeyValuePair<string, string>("AudioSourcesExcluded", prop)));
+      }
+
+      if (Resolution != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Resolution", Resolution));
+      }
+
+      if (Format != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Format", Format.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (Trim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Trim", Trim.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateCompositionHookOptions
+  /// </summary>
+  public class UpdateCompositionHookOptions : IOptions<CompositionHookResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A unique string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; }
+    /// <summary>
+    /// Whether the composition hook is active
+    /// </summary>
+    public bool? Enabled { get; set; }
+    /// <summary>
+    /// A JSON object that describes the video layout of the composition hook
+    /// </summary>
+    public object VideoLayout { get; set; }
+    /// <summary>
+    /// An array of track names from the same group room to merge
+    /// </summary>
+    public List<string> AudioSources { get; set; }
+    /// <summary>
+    /// An array of track names to exclude
+    /// </summary>
+    public List<string> AudioSourcesExcluded { get; set; }
+    /// <summary>
+    /// Whether to clip the intervals where there is no active media in the Compositions triggered by the composition hook
+    /// </summary>
+    public bool? Trim { get; set; }
+    /// <summary>
+    /// The container format of the media files used by the compositions created by the composition hook
+    /// </summary>
+    public CompositionHookResource.FormatEnum Format { get; set; }
+    /// <summary>
+    /// A string that describes the columns (width) and rows (height) of the generated composed video in pixels
+    /// </summary>
+    public string Resolution { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateCompositionHookOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="friendlyName"> A unique string to describe the resource </param>
+    public UpdateCompositionHookOptions(string pathSid, string friendlyName)
+    {
+      PathSid = pathSid;
+      FriendlyName = friendlyName;
+      AudioSources = new List<string>();
+      AudioSourcesExcluded = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      if (VideoLayout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VideoLayout", Serializers.JsonObject(VideoLayout)));
+      }
+
+      if (AudioSources != null)
+      {
+        p.AddRange(AudioSources.Select(prop => new KeyValuePair<string, string>("AudioSources", prop)));
+      }
+
+      if (AudioSourcesExcluded != null)
+      {
+        p.AddRange(AudioSourcesExcluded.Select(prop => new KeyValuePair<string, string>("AudioSourcesExcluded", prop)));
+      }
+
+      if (Trim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Trim", Trim.Value.ToString().ToLower()));
+      }
+
+      if (Format != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Format", Format.ToString()));
+      }
+
+      if (Resolution != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Resolution", Resolution));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/CompositionHookResource.cs b/src/Twilio/Rest/Video/V1/CompositionHookResource.cs
index 439181b4f..ba4b0fd0d 100644
--- a/src/Twilio/Rest/Video/V1/CompositionHookResource.cs
+++ b/src/Twilio/Rest/Video/V1/CompositionHookResource.cs
@@ -17,633 +17,633 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Video.V1
-{
-
-    public class CompositionHookResource : Resource
-    {
-        public sealed class FormatEnum : StringEnum
-        {
-            private FormatEnum(string value) : base(value) {}
-            public FormatEnum() {}
-            public static implicit operator FormatEnum(string value)
-            {
-                return new FormatEnum(value);
-            }
-
-            public static readonly FormatEnum Mp4 = new FormatEnum("mp4");
-            public static readonly FormatEnum Webm = new FormatEnum("webm");
-        }
-
-        private static Request BuildFetchRequest(FetchCompositionHookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/CompositionHooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a single CompositionHook resource identified by a CompositionHook SID.
-        /// </summary>
-        /// <param name="options"> Fetch CompositionHook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionHook </returns>
-        public static CompositionHookResource Fetch(FetchCompositionHookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single CompositionHook resource identified by a CompositionHook SID.
-        /// </summary>
-        /// <param name="options"> Fetch CompositionHook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionHook </returns>
-        public static async System.Threading.Tasks.Task<CompositionHookResource> FetchAsync(FetchCompositionHookOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a single CompositionHook resource identified by a CompositionHook SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionHook </returns>
-        public static CompositionHookResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCompositionHookOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single CompositionHook resource identified by a CompositionHook SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionHook </returns>
-        public static async System.Threading.Tasks.Task<CompositionHookResource> FetchAsync(string pathSid,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchCompositionHookOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCompositionHookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/CompositionHooks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// List of all Recording CompositionHook resources.
-        /// </summary>
-        /// <param name="options"> Read CompositionHook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionHook </returns>
-        public static ResourceSet<CompositionHookResource> Read(ReadCompositionHookOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CompositionHookResource>.FromJson("composition_hooks", response.Content);
-            return new ResourceSet<CompositionHookResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List of all Recording CompositionHook resources.
-        /// </summary>
-        /// <param name="options"> Read CompositionHook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionHook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CompositionHookResource>> ReadAsync(ReadCompositionHookOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CompositionHookResource>.FromJson("composition_hooks", response.Content);
-            return new ResourceSet<CompositionHookResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// List of all Recording CompositionHook resources.
-        /// </summary>
-        /// <param name="enabled"> Read only CompositionHook resources with an enabled value that matches this parameter
-        ///               </param>
-        /// <param name="dateCreatedAfter"> Read only CompositionHook resources created on or after this ISO 8601 datetime with
-        ///                        time zone </param>
-        /// <param name="dateCreatedBefore"> Read only CompositionHook resources created before this ISO 8601 datetime with
-        ///                         time zone </param>
-        /// <param name="friendlyName"> Read only CompositionHook resources with friendly names that match this string </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionHook </returns>
-        public static ResourceSet<CompositionHookResource> Read(bool? enabled = null,
-                                                                DateTime? dateCreatedAfter = null,
-                                                                DateTime? dateCreatedBefore = null,
-                                                                string friendlyName = null,
-                                                                int? pageSize = null,
-                                                                long? limit = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadCompositionHookOptions(){Enabled = enabled, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List of all Recording CompositionHook resources.
-        /// </summary>
-        /// <param name="enabled"> Read only CompositionHook resources with an enabled value that matches this parameter
-        ///               </param>
-        /// <param name="dateCreatedAfter"> Read only CompositionHook resources created on or after this ISO 8601 datetime with
-        ///                        time zone </param>
-        /// <param name="dateCreatedBefore"> Read only CompositionHook resources created before this ISO 8601 datetime with
-        ///                         time zone </param>
-        /// <param name="friendlyName"> Read only CompositionHook resources with friendly names that match this string </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionHook </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CompositionHookResource>> ReadAsync(bool? enabled = null,
-                                                                                                        DateTime? dateCreatedAfter = null,
-                                                                                                        DateTime? dateCreatedBefore = null,
-                                                                                                        string friendlyName = null,
-                                                                                                        int? pageSize = null,
-                                                                                                        long? limit = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadCompositionHookOptions(){Enabled = enabled, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, FriendlyName = friendlyName, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CompositionHookResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CompositionHookResource>.FromJson("composition_hooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CompositionHookResource> NextPage(Page<CompositionHookResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<CompositionHookResource>.FromJson("composition_hooks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CompositionHookResource> PreviousPage(Page<CompositionHookResource> page,
-                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<CompositionHookResource>.FromJson("composition_hooks", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteCompositionHookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Video,
-                "/v1/CompositionHooks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a Recording CompositionHook resource identified by a `CompositionHook SID`.
-        /// </summary>
-        /// <param name="options"> Delete CompositionHook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionHook </returns>
-        public static bool Delete(DeleteCompositionHookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Recording CompositionHook resource identified by a `CompositionHook SID`.
-        /// </summary>
-        /// <param name="options"> Delete CompositionHook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionHook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCompositionHookOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a Recording CompositionHook resource identified by a `CompositionHook SID`.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionHook </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCompositionHookOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Recording CompositionHook resource identified by a `CompositionHook SID`.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionHook </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCompositionHookOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateCompositionHookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Video,
-                "/v1/CompositionHooks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create CompositionHook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionHook </returns>
-        public static CompositionHookResource Create(CreateCompositionHookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create CompositionHook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionHook </returns>
-        public static async System.Threading.Tasks.Task<CompositionHookResource> CreateAsync(CreateCompositionHookOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A unique string to describe the resource </param>
-        /// <param name="enabled"> Whether the composition hook is active </param>
-        /// <param name="videoLayout"> An object that describes the video layout of the composition hook </param>
-        /// <param name="audioSources"> An array of track names from the same group room to merge </param>
-        /// <param name="audioSourcesExcluded"> An array of track names to exclude </param>
-        /// <param name="resolution"> A string that describes the rows (width) and columns (height) of the generated composed
-        ///                  video in pixels </param>
-        /// <param name="format"> The container format of the media files used by the compositions created by the composition
-        ///              hook </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="trim"> Whether to clip the intervals where there is no active media in the Compositions triggered by
-        ///            the composition hook </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionHook </returns>
-        public static CompositionHookResource Create(string friendlyName,
-                                                     bool? enabled = null,
-                                                     object videoLayout = null,
-                                                     List<string> audioSources = null,
-                                                     List<string> audioSourcesExcluded = null,
-                                                     string resolution = null,
-                                                     CompositionHookResource.FormatEnum format = null,
-                                                     Uri statusCallback = null,
-                                                     Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                     bool? trim = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateCompositionHookOptions(friendlyName){Enabled = enabled, VideoLayout = videoLayout, AudioSources = audioSources, AudioSourcesExcluded = audioSourcesExcluded, Resolution = resolution, Format = format, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Trim = trim};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A unique string to describe the resource </param>
-        /// <param name="enabled"> Whether the composition hook is active </param>
-        /// <param name="videoLayout"> An object that describes the video layout of the composition hook </param>
-        /// <param name="audioSources"> An array of track names from the same group room to merge </param>
-        /// <param name="audioSourcesExcluded"> An array of track names to exclude </param>
-        /// <param name="resolution"> A string that describes the rows (width) and columns (height) of the generated composed
-        ///                  video in pixels </param>
-        /// <param name="format"> The container format of the media files used by the compositions created by the composition
-        ///              hook </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="trim"> Whether to clip the intervals where there is no active media in the Compositions triggered by
-        ///            the composition hook </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionHook </returns>
-        public static async System.Threading.Tasks.Task<CompositionHookResource> CreateAsync(string friendlyName,
-                                                                                             bool? enabled = null,
-                                                                                             object videoLayout = null,
-                                                                                             List<string> audioSources = null,
-                                                                                             List<string> audioSourcesExcluded = null,
-                                                                                             string resolution = null,
-                                                                                             CompositionHookResource.FormatEnum format = null,
-                                                                                             Uri statusCallback = null,
-                                                                                             Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                             bool? trim = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateCompositionHookOptions(friendlyName){Enabled = enabled, VideoLayout = videoLayout, AudioSources = audioSources, AudioSourcesExcluded = audioSourcesExcluded, Resolution = resolution, Format = format, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Trim = trim};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateCompositionHookOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Video,
-                "/v1/CompositionHooks/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update CompositionHook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionHook </returns>
-        public static CompositionHookResource Update(UpdateCompositionHookOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update CompositionHook parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionHook </returns>
-        public static async System.Threading.Tasks.Task<CompositionHookResource> UpdateAsync(UpdateCompositionHookOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="friendlyName"> A unique string to describe the resource </param>
-        /// <param name="enabled"> Whether the composition hook is active </param>
-        /// <param name="videoLayout"> A JSON object that describes the video layout of the composition hook </param>
-        /// <param name="audioSources"> An array of track names from the same group room to merge </param>
-        /// <param name="audioSourcesExcluded"> An array of track names to exclude </param>
-        /// <param name="trim"> Whether to clip the intervals where there is no active media in the Compositions triggered by
-        ///            the composition hook </param>
-        /// <param name="format"> The container format of the media files used by the compositions created by the composition
-        ///              hook </param>
-        /// <param name="resolution"> A string that describes the columns (width) and rows (height) of the generated composed
-        ///                  video in pixels </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionHook </returns>
-        public static CompositionHookResource Update(string pathSid,
-                                                     string friendlyName,
-                                                     bool? enabled = null,
-                                                     object videoLayout = null,
-                                                     List<string> audioSources = null,
-                                                     List<string> audioSourcesExcluded = null,
-                                                     bool? trim = null,
-                                                     CompositionHookResource.FormatEnum format = null,
-                                                     string resolution = null,
-                                                     Uri statusCallback = null,
-                                                     Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new UpdateCompositionHookOptions(pathSid, friendlyName){Enabled = enabled, VideoLayout = videoLayout, AudioSources = audioSources, AudioSourcesExcluded = audioSourcesExcluded, Trim = trim, Format = format, Resolution = resolution, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="friendlyName"> A unique string to describe the resource </param>
-        /// <param name="enabled"> Whether the composition hook is active </param>
-        /// <param name="videoLayout"> A JSON object that describes the video layout of the composition hook </param>
-        /// <param name="audioSources"> An array of track names from the same group room to merge </param>
-        /// <param name="audioSourcesExcluded"> An array of track names to exclude </param>
-        /// <param name="trim"> Whether to clip the intervals where there is no active media in the Compositions triggered by
-        ///            the composition hook </param>
-        /// <param name="format"> The container format of the media files used by the compositions created by the composition
-        ///              hook </param>
-        /// <param name="resolution"> A string that describes the columns (width) and rows (height) of the generated composed
-        ///                  video in pixels </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionHook </returns>
-        public static async System.Threading.Tasks.Task<CompositionHookResource> UpdateAsync(string pathSid,
-                                                                                             string friendlyName,
-                                                                                             bool? enabled = null,
-                                                                                             object videoLayout = null,
-                                                                                             List<string> audioSources = null,
-                                                                                             List<string> audioSourcesExcluded = null,
-                                                                                             bool? trim = null,
-                                                                                             CompositionHookResource.FormatEnum format = null,
-                                                                                             string resolution = null,
-                                                                                             Uri statusCallback = null,
-                                                                                             Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateCompositionHookOptions(pathSid, friendlyName){Enabled = enabled, VideoLayout = videoLayout, AudioSources = audioSources, AudioSourcesExcluded = audioSourcesExcluded, Trim = trim, Format = format, Resolution = resolution, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CompositionHookResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CompositionHookResource object represented by the provided JSON </returns>
-        public static CompositionHookResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CompositionHookResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// Whether the CompositionHook is active
-        /// </summary>
-        [JsonProperty("enabled")]
-        public bool? Enabled { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The array of track names to include in the compositions created by the composition hook
-        /// </summary>
-        [JsonProperty("audio_sources")]
-        public List<string> AudioSources { get; private set; }
-        /// <summary>
-        /// The array of track names to exclude from the compositions created by the composition hook
-        /// </summary>
-        [JsonProperty("audio_sources_excluded")]
-        public List<string> AudioSourcesExcluded { get; private set; }
-        /// <summary>
-        /// A JSON object that describes the video layout of the Composition
-        /// </summary>
-        [JsonProperty("video_layout")]
-        public object VideoLayout { get; private set; }
-        /// <summary>
-        /// The dimensions of the video image in pixels expressed as columns (width) and rows (height)
-        /// </summary>
-        [JsonProperty("resolution")]
-        public string Resolution { get; private set; }
-        /// <summary>
-        /// Whether intervals with no media are clipped
-        /// </summary>
-        [JsonProperty("trim")]
-        public bool? Trim { get; private set; }
-        /// <summary>
-        /// The container format of the media files used by the compositions created by the composition hook
-        /// </summary>
-        [JsonProperty("format")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CompositionHookResource.FormatEnum Format { get; private set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The HTTP method we should use to call status_callback
-        /// </summary>
-        [JsonProperty("status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CompositionHookResource()
-        {
-
-        }
-    }
+{
+
+  public class CompositionHookResource : Resource
+  {
+    public sealed class FormatEnum : StringEnum
+    {
+      private FormatEnum(string value) : base(value) { }
+      public FormatEnum() { }
+      public static implicit operator FormatEnum(string value)
+      {
+        return new FormatEnum(value);
+      }
+
+      public static readonly FormatEnum Mp4 = new FormatEnum("mp4");
+      public static readonly FormatEnum Webm = new FormatEnum("webm");
+    }
+
+    private static Request BuildFetchRequest(FetchCompositionHookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/CompositionHooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a single CompositionHook resource identified by a CompositionHook SID.
+    /// </summary>
+    /// <param name="options"> Fetch CompositionHook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionHook </returns>
+    public static CompositionHookResource Fetch(FetchCompositionHookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single CompositionHook resource identified by a CompositionHook SID.
+    /// </summary>
+    /// <param name="options"> Fetch CompositionHook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionHook </returns>
+    public static async System.Threading.Tasks.Task<CompositionHookResource> FetchAsync(FetchCompositionHookOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a single CompositionHook resource identified by a CompositionHook SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionHook </returns>
+    public static CompositionHookResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCompositionHookOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single CompositionHook resource identified by a CompositionHook SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionHook </returns>
+    public static async System.Threading.Tasks.Task<CompositionHookResource> FetchAsync(string pathSid,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchCompositionHookOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCompositionHookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/CompositionHooks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// List of all Recording CompositionHook resources.
+    /// </summary>
+    /// <param name="options"> Read CompositionHook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionHook </returns>
+    public static ResourceSet<CompositionHookResource> Read(ReadCompositionHookOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CompositionHookResource>.FromJson("composition_hooks", response.Content);
+      return new ResourceSet<CompositionHookResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List of all Recording CompositionHook resources.
+    /// </summary>
+    /// <param name="options"> Read CompositionHook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionHook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CompositionHookResource>> ReadAsync(ReadCompositionHookOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CompositionHookResource>.FromJson("composition_hooks", response.Content);
+      return new ResourceSet<CompositionHookResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// List of all Recording CompositionHook resources.
+    /// </summary>
+    /// <param name="enabled"> Read only CompositionHook resources with an enabled value that matches this parameter
+    ///               </param>
+    /// <param name="dateCreatedAfter"> Read only CompositionHook resources created on or after this ISO 8601 datetime with
+    ///                        time zone </param>
+    /// <param name="dateCreatedBefore"> Read only CompositionHook resources created before this ISO 8601 datetime with
+    ///                         time zone </param>
+    /// <param name="friendlyName"> Read only CompositionHook resources with friendly names that match this string </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionHook </returns>
+    public static ResourceSet<CompositionHookResource> Read(bool? enabled = null,
+                                                            DateTime? dateCreatedAfter = null,
+                                                            DateTime? dateCreatedBefore = null,
+                                                            string friendlyName = null,
+                                                            int? pageSize = null,
+                                                            long? limit = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadCompositionHookOptions() { Enabled = enabled, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List of all Recording CompositionHook resources.
+    /// </summary>
+    /// <param name="enabled"> Read only CompositionHook resources with an enabled value that matches this parameter
+    ///               </param>
+    /// <param name="dateCreatedAfter"> Read only CompositionHook resources created on or after this ISO 8601 datetime with
+    ///                        time zone </param>
+    /// <param name="dateCreatedBefore"> Read only CompositionHook resources created before this ISO 8601 datetime with
+    ///                         time zone </param>
+    /// <param name="friendlyName"> Read only CompositionHook resources with friendly names that match this string </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionHook </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CompositionHookResource>> ReadAsync(bool? enabled = null,
+                                                                                                    DateTime? dateCreatedAfter = null,
+                                                                                                    DateTime? dateCreatedBefore = null,
+                                                                                                    string friendlyName = null,
+                                                                                                    int? pageSize = null,
+                                                                                                    long? limit = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadCompositionHookOptions() { Enabled = enabled, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, FriendlyName = friendlyName, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CompositionHookResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CompositionHookResource>.FromJson("composition_hooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CompositionHookResource> NextPage(Page<CompositionHookResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<CompositionHookResource>.FromJson("composition_hooks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CompositionHookResource> PreviousPage(Page<CompositionHookResource> page,
+                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<CompositionHookResource>.FromJson("composition_hooks", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteCompositionHookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Video,
+          "/v1/CompositionHooks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a Recording CompositionHook resource identified by a `CompositionHook SID`.
+    /// </summary>
+    /// <param name="options"> Delete CompositionHook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionHook </returns>
+    public static bool Delete(DeleteCompositionHookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Recording CompositionHook resource identified by a `CompositionHook SID`.
+    /// </summary>
+    /// <param name="options"> Delete CompositionHook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionHook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCompositionHookOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a Recording CompositionHook resource identified by a `CompositionHook SID`.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionHook </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCompositionHookOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Recording CompositionHook resource identified by a `CompositionHook SID`.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionHook </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCompositionHookOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateCompositionHookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Video,
+          "/v1/CompositionHooks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create CompositionHook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionHook </returns>
+    public static CompositionHookResource Create(CreateCompositionHookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create CompositionHook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionHook </returns>
+    public static async System.Threading.Tasks.Task<CompositionHookResource> CreateAsync(CreateCompositionHookOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A unique string to describe the resource </param>
+    /// <param name="enabled"> Whether the composition hook is active </param>
+    /// <param name="videoLayout"> An object that describes the video layout of the composition hook </param>
+    /// <param name="audioSources"> An array of track names from the same group room to merge </param>
+    /// <param name="audioSourcesExcluded"> An array of track names to exclude </param>
+    /// <param name="resolution"> A string that describes the rows (width) and columns (height) of the generated composed
+    ///                  video in pixels </param>
+    /// <param name="format"> The container format of the media files used by the compositions created by the composition
+    ///              hook </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="trim"> Whether to clip the intervals where there is no active media in the Compositions triggered by
+    ///            the composition hook </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionHook </returns>
+    public static CompositionHookResource Create(string friendlyName,
+                                                 bool? enabled = null,
+                                                 object videoLayout = null,
+                                                 List<string> audioSources = null,
+                                                 List<string> audioSourcesExcluded = null,
+                                                 string resolution = null,
+                                                 CompositionHookResource.FormatEnum format = null,
+                                                 Uri statusCallback = null,
+                                                 Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                 bool? trim = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateCompositionHookOptions(friendlyName) { Enabled = enabled, VideoLayout = videoLayout, AudioSources = audioSources, AudioSourcesExcluded = audioSourcesExcluded, Resolution = resolution, Format = format, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Trim = trim };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A unique string to describe the resource </param>
+    /// <param name="enabled"> Whether the composition hook is active </param>
+    /// <param name="videoLayout"> An object that describes the video layout of the composition hook </param>
+    /// <param name="audioSources"> An array of track names from the same group room to merge </param>
+    /// <param name="audioSourcesExcluded"> An array of track names to exclude </param>
+    /// <param name="resolution"> A string that describes the rows (width) and columns (height) of the generated composed
+    ///                  video in pixels </param>
+    /// <param name="format"> The container format of the media files used by the compositions created by the composition
+    ///              hook </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="trim"> Whether to clip the intervals where there is no active media in the Compositions triggered by
+    ///            the composition hook </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionHook </returns>
+    public static async System.Threading.Tasks.Task<CompositionHookResource> CreateAsync(string friendlyName,
+                                                                                         bool? enabled = null,
+                                                                                         object videoLayout = null,
+                                                                                         List<string> audioSources = null,
+                                                                                         List<string> audioSourcesExcluded = null,
+                                                                                         string resolution = null,
+                                                                                         CompositionHookResource.FormatEnum format = null,
+                                                                                         Uri statusCallback = null,
+                                                                                         Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                         bool? trim = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateCompositionHookOptions(friendlyName) { Enabled = enabled, VideoLayout = videoLayout, AudioSources = audioSources, AudioSourcesExcluded = audioSourcesExcluded, Resolution = resolution, Format = format, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Trim = trim };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateCompositionHookOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Video,
+          "/v1/CompositionHooks/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update CompositionHook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionHook </returns>
+    public static CompositionHookResource Update(UpdateCompositionHookOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update CompositionHook parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionHook </returns>
+    public static async System.Threading.Tasks.Task<CompositionHookResource> UpdateAsync(UpdateCompositionHookOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="friendlyName"> A unique string to describe the resource </param>
+    /// <param name="enabled"> Whether the composition hook is active </param>
+    /// <param name="videoLayout"> A JSON object that describes the video layout of the composition hook </param>
+    /// <param name="audioSources"> An array of track names from the same group room to merge </param>
+    /// <param name="audioSourcesExcluded"> An array of track names to exclude </param>
+    /// <param name="trim"> Whether to clip the intervals where there is no active media in the Compositions triggered by
+    ///            the composition hook </param>
+    /// <param name="format"> The container format of the media files used by the compositions created by the composition
+    ///              hook </param>
+    /// <param name="resolution"> A string that describes the columns (width) and rows (height) of the generated composed
+    ///                  video in pixels </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionHook </returns>
+    public static CompositionHookResource Update(string pathSid,
+                                                 string friendlyName,
+                                                 bool? enabled = null,
+                                                 object videoLayout = null,
+                                                 List<string> audioSources = null,
+                                                 List<string> audioSourcesExcluded = null,
+                                                 bool? trim = null,
+                                                 CompositionHookResource.FormatEnum format = null,
+                                                 string resolution = null,
+                                                 Uri statusCallback = null,
+                                                 Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new UpdateCompositionHookOptions(pathSid, friendlyName) { Enabled = enabled, VideoLayout = videoLayout, AudioSources = audioSources, AudioSourcesExcluded = audioSourcesExcluded, Trim = trim, Format = format, Resolution = resolution, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="friendlyName"> A unique string to describe the resource </param>
+    /// <param name="enabled"> Whether the composition hook is active </param>
+    /// <param name="videoLayout"> A JSON object that describes the video layout of the composition hook </param>
+    /// <param name="audioSources"> An array of track names from the same group room to merge </param>
+    /// <param name="audioSourcesExcluded"> An array of track names to exclude </param>
+    /// <param name="trim"> Whether to clip the intervals where there is no active media in the Compositions triggered by
+    ///            the composition hook </param>
+    /// <param name="format"> The container format of the media files used by the compositions created by the composition
+    ///              hook </param>
+    /// <param name="resolution"> A string that describes the columns (width) and rows (height) of the generated composed
+    ///                  video in pixels </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionHook </returns>
+    public static async System.Threading.Tasks.Task<CompositionHookResource> UpdateAsync(string pathSid,
+                                                                                         string friendlyName,
+                                                                                         bool? enabled = null,
+                                                                                         object videoLayout = null,
+                                                                                         List<string> audioSources = null,
+                                                                                         List<string> audioSourcesExcluded = null,
+                                                                                         bool? trim = null,
+                                                                                         CompositionHookResource.FormatEnum format = null,
+                                                                                         string resolution = null,
+                                                                                         Uri statusCallback = null,
+                                                                                         Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateCompositionHookOptions(pathSid, friendlyName) { Enabled = enabled, VideoLayout = videoLayout, AudioSources = audioSources, AudioSourcesExcluded = audioSourcesExcluded, Trim = trim, Format = format, Resolution = resolution, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CompositionHookResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CompositionHookResource object represented by the provided JSON </returns>
+    public static CompositionHookResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CompositionHookResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// Whether the CompositionHook is active
+    /// </summary>
+    [JsonProperty("enabled")]
+    public bool? Enabled { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The array of track names to include in the compositions created by the composition hook
+    /// </summary>
+    [JsonProperty("audio_sources")]
+    public List<string> AudioSources { get; private set; }
+    /// <summary>
+    /// The array of track names to exclude from the compositions created by the composition hook
+    /// </summary>
+    [JsonProperty("audio_sources_excluded")]
+    public List<string> AudioSourcesExcluded { get; private set; }
+    /// <summary>
+    /// A JSON object that describes the video layout of the Composition
+    /// </summary>
+    [JsonProperty("video_layout")]
+    public object VideoLayout { get; private set; }
+    /// <summary>
+    /// The dimensions of the video image in pixels expressed as columns (width) and rows (height)
+    /// </summary>
+    [JsonProperty("resolution")]
+    public string Resolution { get; private set; }
+    /// <summary>
+    /// Whether intervals with no media are clipped
+    /// </summary>
+    [JsonProperty("trim")]
+    public bool? Trim { get; private set; }
+    /// <summary>
+    /// The container format of the media files used by the compositions created by the composition hook
+    /// </summary>
+    [JsonProperty("format")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CompositionHookResource.FormatEnum Format { get; private set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The HTTP method we should use to call status_callback
+    /// </summary>
+    [JsonProperty("status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CompositionHookResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/CompositionOptions.cs b/src/Twilio/Rest/Video/V1/CompositionOptions.cs
index f5a6e6474..537c2ab5e 100644
--- a/src/Twilio/Rest/Video/V1/CompositionOptions.cs
+++ b/src/Twilio/Rest/Video/V1/CompositionOptions.cs
@@ -10,229 +10,229 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Video.V1
-{
-
+{
+
+  /// <summary>
+  /// Returns a single Composition resource identified by a Composition SID.
+  /// </summary>
+  public class FetchCompositionOptions : IOptions<CompositionResource>
+  {
     /// <summary>
-    /// Returns a single Composition resource identified by a Composition SID.
+    /// The SID that identifies the resource to fetch
     /// </summary>
-    public class FetchCompositionOptions : IOptions<CompositionResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCompositionOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchCompositionOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// List of all Recording compositions.
-    /// </summary>
-    public class ReadCompositionOptions : ReadOptions<CompositionResource>
-    {
-        /// <summary>
-        /// Read only Composition resources with this status
-        /// </summary>
-        public CompositionResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// Read only Composition resources created on or after this [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone
-        /// </summary>
-        public DateTime? DateCreatedAfter { get; set; }
-        /// <summary>
-        /// Read only Composition resources created before this ISO 8601 date-time with time zone
-        /// </summary>
-        public DateTime? DateCreatedBefore { get; set; }
-        /// <summary>
-        /// Read only Composition resources with this Room SID
-        /// </summary>
-        public string RoomSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (DateCreatedAfter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
-            }
-
-            if (DateCreatedBefore != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
-            }
-
-            if (RoomSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoomSid", RoomSid.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchCompositionOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchCompositionOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// Delete a Recording Composition resource identified by a Composition SID.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteCompositionOptions : IOptions<CompositionResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCompositionOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeleteCompositionOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// List of all Recording compositions.
+  /// </summary>
+  public class ReadCompositionOptions : ReadOptions<CompositionResource>
+  {
     /// <summary>
-    /// CreateCompositionOptions
-    /// </summary>
-    public class CreateCompositionOptions : IOptions<CompositionResource>
-    {
-        /// <summary>
-        /// The SID of the Group Room with the media tracks to be used as composition sources
-        /// </summary>
-        public string RoomSid { get; }
-        /// <summary>
-        /// An object that describes the video layout of the composition
-        /// </summary>
-        public object VideoLayout { get; set; }
-        /// <summary>
-        /// An array of track names from the same group room to merge
-        /// </summary>
-        public List<string> AudioSources { get; set; }
-        /// <summary>
-        /// An array of track names to exclude
-        /// </summary>
-        public List<string> AudioSourcesExcluded { get; set; }
-        /// <summary>
-        /// A string that describes the columns (width) and rows (height) of the generated composed video in pixels
-        /// </summary>
-        public string Resolution { get; set; }
-        /// <summary>
-        /// The container format of the composition's media files
-        /// </summary>
-        public CompositionResource.FormatEnum Format { get; set; }
-        /// <summary>
-        /// The URL we should call to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Whether to clip the intervals where there is no active media in the composition
-        /// </summary>
-        public bool? Trim { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCompositionOptions
-        /// </summary>
-        /// <param name="roomSid"> The SID of the Group Room with the media tracks to be used as composition sources </param>
-        public CreateCompositionOptions(string roomSid)
-        {
-            RoomSid = roomSid;
-            AudioSources = new List<string>();
-            AudioSourcesExcluded = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (RoomSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RoomSid", RoomSid.ToString()));
-            }
-
-            if (VideoLayout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VideoLayout", Serializers.JsonObject(VideoLayout)));
-            }
-
-            if (AudioSources != null)
-            {
-                p.AddRange(AudioSources.Select(prop => new KeyValuePair<string, string>("AudioSources", prop)));
-            }
-
-            if (AudioSourcesExcluded != null)
-            {
-                p.AddRange(AudioSourcesExcluded.Select(prop => new KeyValuePair<string, string>("AudioSourcesExcluded", prop)));
-            }
-
-            if (Resolution != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Resolution", Resolution));
-            }
-
-            if (Format != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Format", Format.ToString()));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (Trim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Trim", Trim.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    /// Read only Composition resources with this status
+    /// </summary>
+    public CompositionResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// Read only Composition resources created on or after this [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone
+    /// </summary>
+    public DateTime? DateCreatedAfter { get; set; }
+    /// <summary>
+    /// Read only Composition resources created before this ISO 8601 date-time with time zone
+    /// </summary>
+    public DateTime? DateCreatedBefore { get; set; }
+    /// <summary>
+    /// Read only Composition resources with this Room SID
+    /// </summary>
+    public string RoomSid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (DateCreatedAfter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
+      }
+
+      if (DateCreatedBefore != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
+      }
+
+      if (RoomSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoomSid", RoomSid.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a Recording Composition resource identified by a Composition SID.
+  /// </summary>
+  public class DeleteCompositionOptions : IOptions<CompositionResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCompositionOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeleteCompositionOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateCompositionOptions
+  /// </summary>
+  public class CreateCompositionOptions : IOptions<CompositionResource>
+  {
+    /// <summary>
+    /// The SID of the Group Room with the media tracks to be used as composition sources
+    /// </summary>
+    public string RoomSid { get; }
+    /// <summary>
+    /// An object that describes the video layout of the composition
+    /// </summary>
+    public object VideoLayout { get; set; }
+    /// <summary>
+    /// An array of track names from the same group room to merge
+    /// </summary>
+    public List<string> AudioSources { get; set; }
+    /// <summary>
+    /// An array of track names to exclude
+    /// </summary>
+    public List<string> AudioSourcesExcluded { get; set; }
+    /// <summary>
+    /// A string that describes the columns (width) and rows (height) of the generated composed video in pixels
+    /// </summary>
+    public string Resolution { get; set; }
+    /// <summary>
+    /// The container format of the composition's media files
+    /// </summary>
+    public CompositionResource.FormatEnum Format { get; set; }
+    /// <summary>
+    /// The URL we should call to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Whether to clip the intervals where there is no active media in the composition
+    /// </summary>
+    public bool? Trim { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCompositionOptions
+    /// </summary>
+    /// <param name="roomSid"> The SID of the Group Room with the media tracks to be used as composition sources </param>
+    public CreateCompositionOptions(string roomSid)
+    {
+      RoomSid = roomSid;
+      AudioSources = new List<string>();
+      AudioSourcesExcluded = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (RoomSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RoomSid", RoomSid.ToString()));
+      }
+
+      if (VideoLayout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VideoLayout", Serializers.JsonObject(VideoLayout)));
+      }
+
+      if (AudioSources != null)
+      {
+        p.AddRange(AudioSources.Select(prop => new KeyValuePair<string, string>("AudioSources", prop)));
+      }
+
+      if (AudioSourcesExcluded != null)
+      {
+        p.AddRange(AudioSourcesExcluded.Select(prop => new KeyValuePair<string, string>("AudioSourcesExcluded", prop)));
+      }
+
+      if (Resolution != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Resolution", Resolution));
+      }
+
+      if (Format != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Format", Format.ToString()));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (Trim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Trim", Trim.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/CompositionResource.cs b/src/Twilio/Rest/Video/V1/CompositionResource.cs
index 9a5808c62..5299108a9 100644
--- a/src/Twilio/Rest/Video/V1/CompositionResource.cs
+++ b/src/Twilio/Rest/Video/V1/CompositionResource.cs
@@ -17,538 +17,538 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Video.V1
-{
-
-    public class CompositionResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Enqueued = new StatusEnum("enqueued");
-            public static readonly StatusEnum Processing = new StatusEnum("processing");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Deleted = new StatusEnum("deleted");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        public sealed class FormatEnum : StringEnum
-        {
-            private FormatEnum(string value) : base(value) {}
-            public FormatEnum() {}
-            public static implicit operator FormatEnum(string value)
-            {
-                return new FormatEnum(value);
-            }
-
-            public static readonly FormatEnum Mp4 = new FormatEnum("mp4");
-            public static readonly FormatEnum Webm = new FormatEnum("webm");
-        }
-
-        private static Request BuildFetchRequest(FetchCompositionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Compositions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a single Composition resource identified by a Composition SID.
-        /// </summary>
-        /// <param name="options"> Fetch Composition parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Composition </returns>
-        public static CompositionResource Fetch(FetchCompositionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single Composition resource identified by a Composition SID.
-        /// </summary>
-        /// <param name="options"> Fetch Composition parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Composition </returns>
-        public static async System.Threading.Tasks.Task<CompositionResource> FetchAsync(FetchCompositionOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a single Composition resource identified by a Composition SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Composition </returns>
-        public static CompositionResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCompositionOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single Composition resource identified by a Composition SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Composition </returns>
-        public static async System.Threading.Tasks.Task<CompositionResource> FetchAsync(string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchCompositionOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCompositionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Compositions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// List of all Recording compositions.
-        /// </summary>
-        /// <param name="options"> Read Composition parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Composition </returns>
-        public static ResourceSet<CompositionResource> Read(ReadCompositionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CompositionResource>.FromJson("compositions", response.Content);
-            return new ResourceSet<CompositionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List of all Recording compositions.
-        /// </summary>
-        /// <param name="options"> Read Composition parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Composition </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CompositionResource>> ReadAsync(ReadCompositionOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CompositionResource>.FromJson("compositions", response.Content);
-            return new ResourceSet<CompositionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// List of all Recording compositions.
-        /// </summary>
-        /// <param name="status"> Read only Composition resources with this status </param>
-        /// <param name="dateCreatedAfter"> Read only Composition resources created on or after this [ISO
-        ///                        8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone </param>
-        /// <param name="dateCreatedBefore"> Read only Composition resources created before this ISO 8601 date-time with time
-        ///                         zone </param>
-        /// <param name="roomSid"> Read only Composition resources with this Room SID </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Composition </returns>
-        public static ResourceSet<CompositionResource> Read(CompositionResource.StatusEnum status = null,
-                                                            DateTime? dateCreatedAfter = null,
-                                                            DateTime? dateCreatedBefore = null,
-                                                            string roomSid = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadCompositionOptions(){Status = status, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, RoomSid = roomSid, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List of all Recording compositions.
-        /// </summary>
-        /// <param name="status"> Read only Composition resources with this status </param>
-        /// <param name="dateCreatedAfter"> Read only Composition resources created on or after this [ISO
-        ///                        8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone </param>
-        /// <param name="dateCreatedBefore"> Read only Composition resources created before this ISO 8601 date-time with time
-        ///                         zone </param>
-        /// <param name="roomSid"> Read only Composition resources with this Room SID </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Composition </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CompositionResource>> ReadAsync(CompositionResource.StatusEnum status = null,
-                                                                                                    DateTime? dateCreatedAfter = null,
-                                                                                                    DateTime? dateCreatedBefore = null,
-                                                                                                    string roomSid = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadCompositionOptions(){Status = status, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, RoomSid = roomSid, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CompositionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CompositionResource>.FromJson("compositions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CompositionResource> NextPage(Page<CompositionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<CompositionResource>.FromJson("compositions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CompositionResource> PreviousPage(Page<CompositionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<CompositionResource>.FromJson("compositions", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteCompositionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Video,
-                "/v1/Compositions/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a Recording Composition resource identified by a Composition SID.
-        /// </summary>
-        /// <param name="options"> Delete Composition parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Composition </returns>
-        public static bool Delete(DeleteCompositionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Recording Composition resource identified by a Composition SID.
-        /// </summary>
-        /// <param name="options"> Delete Composition parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Composition </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCompositionOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a Recording Composition resource identified by a Composition SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Composition </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCompositionOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Recording Composition resource identified by a Composition SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Composition </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCompositionOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateCompositionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Video,
-                "/v1/Compositions",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Composition parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Composition </returns>
-        public static CompositionResource Create(CreateCompositionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Composition parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Composition </returns>
-        public static async System.Threading.Tasks.Task<CompositionResource> CreateAsync(CreateCompositionOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="roomSid"> The SID of the Group Room with the media tracks to be used as composition sources </param>
-        /// <param name="videoLayout"> An object that describes the video layout of the composition </param>
-        /// <param name="audioSources"> An array of track names from the same group room to merge </param>
-        /// <param name="audioSourcesExcluded"> An array of track names to exclude </param>
-        /// <param name="resolution"> A string that describes the columns (width) and rows (height) of the generated composed
-        ///                  video in pixels </param>
-        /// <param name="format"> The container format of the composition's media files </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="trim"> Whether to clip the intervals where there is no active media in the composition </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Composition </returns>
-        public static CompositionResource Create(string roomSid,
-                                                 object videoLayout = null,
-                                                 List<string> audioSources = null,
-                                                 List<string> audioSourcesExcluded = null,
-                                                 string resolution = null,
-                                                 CompositionResource.FormatEnum format = null,
-                                                 Uri statusCallback = null,
-                                                 Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                 bool? trim = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateCompositionOptions(roomSid){VideoLayout = videoLayout, AudioSources = audioSources, AudioSourcesExcluded = audioSourcesExcluded, Resolution = resolution, Format = format, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Trim = trim};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="roomSid"> The SID of the Group Room with the media tracks to be used as composition sources </param>
-        /// <param name="videoLayout"> An object that describes the video layout of the composition </param>
-        /// <param name="audioSources"> An array of track names from the same group room to merge </param>
-        /// <param name="audioSourcesExcluded"> An array of track names to exclude </param>
-        /// <param name="resolution"> A string that describes the columns (width) and rows (height) of the generated composed
-        ///                  video in pixels </param>
-        /// <param name="format"> The container format of the composition's media files </param>
-        /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="trim"> Whether to clip the intervals where there is no active media in the composition </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Composition </returns>
-        public static async System.Threading.Tasks.Task<CompositionResource> CreateAsync(string roomSid,
-                                                                                         object videoLayout = null,
-                                                                                         List<string> audioSources = null,
-                                                                                         List<string> audioSourcesExcluded = null,
-                                                                                         string resolution = null,
-                                                                                         CompositionResource.FormatEnum format = null,
-                                                                                         Uri statusCallback = null,
-                                                                                         Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                         bool? trim = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateCompositionOptions(roomSid){VideoLayout = videoLayout, AudioSources = audioSources, AudioSourcesExcluded = audioSourcesExcluded, Resolution = resolution, Format = format, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Trim = trim};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CompositionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CompositionResource object represented by the provided JSON </returns>
-        public static CompositionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CompositionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The status of the composition
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CompositionResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// Date when the media processing task finished
-        /// </summary>
-        [JsonProperty("date_completed")]
-        public DateTime? DateCompleted { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the composition generated media was deleted
-        /// </summary>
-        [JsonProperty("date_deleted")]
-        public DateTime? DateDeleted { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Group Room that generated the audio and video tracks used in the composition
-        /// </summary>
-        [JsonProperty("room_sid")]
-        public string RoomSid { get; private set; }
-        /// <summary>
-        /// The array of track names to include in the composition
-        /// </summary>
-        [JsonProperty("audio_sources")]
-        public List<string> AudioSources { get; private set; }
-        /// <summary>
-        /// The array of track names to exclude from the composition
-        /// </summary>
-        [JsonProperty("audio_sources_excluded")]
-        public List<string> AudioSourcesExcluded { get; private set; }
-        /// <summary>
-        /// An object that describes the video layout of the composition
-        /// </summary>
-        [JsonProperty("video_layout")]
-        public object VideoLayout { get; private set; }
-        /// <summary>
-        /// The dimensions of the video image in pixels expressed as columns (width) and rows (height)
-        /// </summary>
-        [JsonProperty("resolution")]
-        public string Resolution { get; private set; }
-        /// <summary>
-        /// Whether to remove intervals with no media
-        /// </summary>
-        [JsonProperty("trim")]
-        public bool? Trim { get; private set; }
-        /// <summary>
-        /// The container format of the composition's media files as specified in the POST request that created the Composition resource
-        /// </summary>
-        [JsonProperty("format")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CompositionResource.FormatEnum Format { get; private set; }
-        /// <summary>
-        /// The average bit rate of the composition's media
-        /// </summary>
-        [JsonProperty("bitrate")]
-        public int? Bitrate { get; private set; }
-        /// <summary>
-        /// The size of the composed media file in bytes
-        /// </summary>
-        [JsonProperty("size")]
-        public long? Size { get; private set; }
-        /// <summary>
-        /// The duration of the composition's media file in seconds
-        /// </summary>
-        [JsonProperty("duration")]
-        public int? Duration { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URL of the media file associated with the composition
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private CompositionResource()
-        {
-
-        }
-    }
+{
+
+  public class CompositionResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Enqueued = new StatusEnum("enqueued");
+      public static readonly StatusEnum Processing = new StatusEnum("processing");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Deleted = new StatusEnum("deleted");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    public sealed class FormatEnum : StringEnum
+    {
+      private FormatEnum(string value) : base(value) { }
+      public FormatEnum() { }
+      public static implicit operator FormatEnum(string value)
+      {
+        return new FormatEnum(value);
+      }
+
+      public static readonly FormatEnum Mp4 = new FormatEnum("mp4");
+      public static readonly FormatEnum Webm = new FormatEnum("webm");
+    }
+
+    private static Request BuildFetchRequest(FetchCompositionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Compositions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a single Composition resource identified by a Composition SID.
+    /// </summary>
+    /// <param name="options"> Fetch Composition parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Composition </returns>
+    public static CompositionResource Fetch(FetchCompositionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single Composition resource identified by a Composition SID.
+    /// </summary>
+    /// <param name="options"> Fetch Composition parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Composition </returns>
+    public static async System.Threading.Tasks.Task<CompositionResource> FetchAsync(FetchCompositionOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a single Composition resource identified by a Composition SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Composition </returns>
+    public static CompositionResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCompositionOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single Composition resource identified by a Composition SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Composition </returns>
+    public static async System.Threading.Tasks.Task<CompositionResource> FetchAsync(string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchCompositionOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCompositionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Compositions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// List of all Recording compositions.
+    /// </summary>
+    /// <param name="options"> Read Composition parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Composition </returns>
+    public static ResourceSet<CompositionResource> Read(ReadCompositionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CompositionResource>.FromJson("compositions", response.Content);
+      return new ResourceSet<CompositionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List of all Recording compositions.
+    /// </summary>
+    /// <param name="options"> Read Composition parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Composition </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CompositionResource>> ReadAsync(ReadCompositionOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CompositionResource>.FromJson("compositions", response.Content);
+      return new ResourceSet<CompositionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// List of all Recording compositions.
+    /// </summary>
+    /// <param name="status"> Read only Composition resources with this status </param>
+    /// <param name="dateCreatedAfter"> Read only Composition resources created on or after this [ISO
+    ///                        8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone </param>
+    /// <param name="dateCreatedBefore"> Read only Composition resources created before this ISO 8601 date-time with time
+    ///                         zone </param>
+    /// <param name="roomSid"> Read only Composition resources with this Room SID </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Composition </returns>
+    public static ResourceSet<CompositionResource> Read(CompositionResource.StatusEnum status = null,
+                                                        DateTime? dateCreatedAfter = null,
+                                                        DateTime? dateCreatedBefore = null,
+                                                        string roomSid = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadCompositionOptions() { Status = status, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, RoomSid = roomSid, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List of all Recording compositions.
+    /// </summary>
+    /// <param name="status"> Read only Composition resources with this status </param>
+    /// <param name="dateCreatedAfter"> Read only Composition resources created on or after this [ISO
+    ///                        8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone </param>
+    /// <param name="dateCreatedBefore"> Read only Composition resources created before this ISO 8601 date-time with time
+    ///                         zone </param>
+    /// <param name="roomSid"> Read only Composition resources with this Room SID </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Composition </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CompositionResource>> ReadAsync(CompositionResource.StatusEnum status = null,
+                                                                                                DateTime? dateCreatedAfter = null,
+                                                                                                DateTime? dateCreatedBefore = null,
+                                                                                                string roomSid = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadCompositionOptions() { Status = status, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, RoomSid = roomSid, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CompositionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CompositionResource>.FromJson("compositions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CompositionResource> NextPage(Page<CompositionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<CompositionResource>.FromJson("compositions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CompositionResource> PreviousPage(Page<CompositionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<CompositionResource>.FromJson("compositions", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteCompositionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Video,
+          "/v1/Compositions/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a Recording Composition resource identified by a Composition SID.
+    /// </summary>
+    /// <param name="options"> Delete Composition parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Composition </returns>
+    public static bool Delete(DeleteCompositionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Recording Composition resource identified by a Composition SID.
+    /// </summary>
+    /// <param name="options"> Delete Composition parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Composition </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCompositionOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a Recording Composition resource identified by a Composition SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Composition </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCompositionOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Recording Composition resource identified by a Composition SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Composition </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCompositionOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateCompositionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Video,
+          "/v1/Compositions",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Composition parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Composition </returns>
+    public static CompositionResource Create(CreateCompositionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Composition parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Composition </returns>
+    public static async System.Threading.Tasks.Task<CompositionResource> CreateAsync(CreateCompositionOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="roomSid"> The SID of the Group Room with the media tracks to be used as composition sources </param>
+    /// <param name="videoLayout"> An object that describes the video layout of the composition </param>
+    /// <param name="audioSources"> An array of track names from the same group room to merge </param>
+    /// <param name="audioSourcesExcluded"> An array of track names to exclude </param>
+    /// <param name="resolution"> A string that describes the columns (width) and rows (height) of the generated composed
+    ///                  video in pixels </param>
+    /// <param name="format"> The container format of the composition's media files </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="trim"> Whether to clip the intervals where there is no active media in the composition </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Composition </returns>
+    public static CompositionResource Create(string roomSid,
+                                             object videoLayout = null,
+                                             List<string> audioSources = null,
+                                             List<string> audioSourcesExcluded = null,
+                                             string resolution = null,
+                                             CompositionResource.FormatEnum format = null,
+                                             Uri statusCallback = null,
+                                             Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                             bool? trim = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateCompositionOptions(roomSid) { VideoLayout = videoLayout, AudioSources = audioSources, AudioSourcesExcluded = audioSourcesExcluded, Resolution = resolution, Format = format, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Trim = trim };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="roomSid"> The SID of the Group Room with the media tracks to be used as composition sources </param>
+    /// <param name="videoLayout"> An object that describes the video layout of the composition </param>
+    /// <param name="audioSources"> An array of track names from the same group room to merge </param>
+    /// <param name="audioSourcesExcluded"> An array of track names to exclude </param>
+    /// <param name="resolution"> A string that describes the columns (width) and rows (height) of the generated composed
+    ///                  video in pixels </param>
+    /// <param name="format"> The container format of the composition's media files </param>
+    /// <param name="statusCallback"> The URL we should call to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="trim"> Whether to clip the intervals where there is no active media in the composition </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Composition </returns>
+    public static async System.Threading.Tasks.Task<CompositionResource> CreateAsync(string roomSid,
+                                                                                     object videoLayout = null,
+                                                                                     List<string> audioSources = null,
+                                                                                     List<string> audioSourcesExcluded = null,
+                                                                                     string resolution = null,
+                                                                                     CompositionResource.FormatEnum format = null,
+                                                                                     Uri statusCallback = null,
+                                                                                     Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                     bool? trim = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateCompositionOptions(roomSid) { VideoLayout = videoLayout, AudioSources = audioSources, AudioSourcesExcluded = audioSourcesExcluded, Resolution = resolution, Format = format, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, Trim = trim };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CompositionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CompositionResource object represented by the provided JSON </returns>
+    public static CompositionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CompositionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The status of the composition
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CompositionResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// Date when the media processing task finished
+    /// </summary>
+    [JsonProperty("date_completed")]
+    public DateTime? DateCompleted { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the composition generated media was deleted
+    /// </summary>
+    [JsonProperty("date_deleted")]
+    public DateTime? DateDeleted { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Group Room that generated the audio and video tracks used in the composition
+    /// </summary>
+    [JsonProperty("room_sid")]
+    public string RoomSid { get; private set; }
+    /// <summary>
+    /// The array of track names to include in the composition
+    /// </summary>
+    [JsonProperty("audio_sources")]
+    public List<string> AudioSources { get; private set; }
+    /// <summary>
+    /// The array of track names to exclude from the composition
+    /// </summary>
+    [JsonProperty("audio_sources_excluded")]
+    public List<string> AudioSourcesExcluded { get; private set; }
+    /// <summary>
+    /// An object that describes the video layout of the composition
+    /// </summary>
+    [JsonProperty("video_layout")]
+    public object VideoLayout { get; private set; }
+    /// <summary>
+    /// The dimensions of the video image in pixels expressed as columns (width) and rows (height)
+    /// </summary>
+    [JsonProperty("resolution")]
+    public string Resolution { get; private set; }
+    /// <summary>
+    /// Whether to remove intervals with no media
+    /// </summary>
+    [JsonProperty("trim")]
+    public bool? Trim { get; private set; }
+    /// <summary>
+    /// The container format of the composition's media files as specified in the POST request that created the Composition resource
+    /// </summary>
+    [JsonProperty("format")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CompositionResource.FormatEnum Format { get; private set; }
+    /// <summary>
+    /// The average bit rate of the composition's media
+    /// </summary>
+    [JsonProperty("bitrate")]
+    public int? Bitrate { get; private set; }
+    /// <summary>
+    /// The size of the composed media file in bytes
+    /// </summary>
+    [JsonProperty("size")]
+    public long? Size { get; private set; }
+    /// <summary>
+    /// The duration of the composition's media file in seconds
+    /// </summary>
+    [JsonProperty("duration")]
+    public int? Duration { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URL of the media file associated with the composition
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private CompositionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/CompositionSettingsOptions.cs b/src/Twilio/Rest/Video/V1/CompositionSettingsOptions.cs
index 15d961ea9..0cda8114f 100644
--- a/src/Twilio/Rest/Video/V1/CompositionSettingsOptions.cs
+++ b/src/Twilio/Rest/Video/V1/CompositionSettingsOptions.cs
@@ -9,100 +9,100 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Video.V1
-{
-
+{
+
+  /// <summary>
+  /// FetchCompositionSettingsOptions
+  /// </summary>
+  public class FetchCompositionSettingsOptions : IOptions<CompositionSettingsResource>
+  {
     /// <summary>
-    /// FetchCompositionSettingsOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchCompositionSettingsOptions : IOptions<CompositionSettingsResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateCompositionSettingsOptions
+  /// </summary>
+  public class CreateCompositionSettingsOptions : IOptions<CompositionSettingsResource>
+  {
     /// <summary>
-    /// CreateCompositionSettingsOptions
+    /// A descriptive string that you create to describe the resource
     /// </summary>
-    public class CreateCompositionSettingsOptions : IOptions<CompositionSettingsResource>
-    {
-        /// <summary>
-        /// A descriptive string that you create to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The SID of the stored Credential resource
-        /// </summary>
-        public string AwsCredentialsSid { get; set; }
-        /// <summary>
-        /// The SID of the Public Key resource to use for encryption
-        /// </summary>
-        public string EncryptionKeySid { get; set; }
-        /// <summary>
-        /// The URL of the AWS S3 bucket where the compositions should be stored
-        /// </summary>
-        public Uri AwsS3Url { get; set; }
-        /// <summary>
-        /// Whether all compositions should be written to the aws_s3_url
-        /// </summary>
-        public bool? AwsStorageEnabled { get; set; }
-        /// <summary>
-        /// Whether all compositions should be stored in an encrypted form
-        /// </summary>
-        public bool? EncryptionEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCompositionSettingsOptions
-        /// </summary>
-        /// <param name="friendlyName"> A descriptive string that you create to describe the resource </param>
-        public CreateCompositionSettingsOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (AwsCredentialsSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AwsCredentialsSid", AwsCredentialsSid.ToString()));
-            }
-
-            if (EncryptionKeySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EncryptionKeySid", EncryptionKeySid.ToString()));
-            }
-
-            if (AwsS3Url != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AwsS3Url", Serializers.Url(AwsS3Url)));
-            }
-
-            if (AwsStorageEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AwsStorageEnabled", AwsStorageEnabled.Value.ToString().ToLower()));
-            }
-
-            if (EncryptionEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EncryptionEnabled", EncryptionEnabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The SID of the stored Credential resource
+    /// </summary>
+    public string AwsCredentialsSid { get; set; }
+    /// <summary>
+    /// The SID of the Public Key resource to use for encryption
+    /// </summary>
+    public string EncryptionKeySid { get; set; }
+    /// <summary>
+    /// The URL of the AWS S3 bucket where the compositions should be stored
+    /// </summary>
+    public Uri AwsS3Url { get; set; }
+    /// <summary>
+    /// Whether all compositions should be written to the aws_s3_url
+    /// </summary>
+    public bool? AwsStorageEnabled { get; set; }
+    /// <summary>
+    /// Whether all compositions should be stored in an encrypted form
+    /// </summary>
+    public bool? EncryptionEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCompositionSettingsOptions
+    /// </summary>
+    /// <param name="friendlyName"> A descriptive string that you create to describe the resource </param>
+    public CreateCompositionSettingsOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (AwsCredentialsSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AwsCredentialsSid", AwsCredentialsSid.ToString()));
+      }
+
+      if (EncryptionKeySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EncryptionKeySid", EncryptionKeySid.ToString()));
+      }
+
+      if (AwsS3Url != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AwsS3Url", Serializers.Url(AwsS3Url)));
+      }
+
+      if (AwsStorageEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AwsStorageEnabled", AwsStorageEnabled.Value.ToString().ToLower()));
+      }
+
+      if (EncryptionEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EncryptionEnabled", EncryptionEnabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/CompositionSettingsResource.cs b/src/Twilio/Rest/Video/V1/CompositionSettingsResource.cs
index 4de288020..65ae37f9d 100644
--- a/src/Twilio/Rest/Video/V1/CompositionSettingsResource.cs
+++ b/src/Twilio/Rest/Video/V1/CompositionSettingsResource.cs
@@ -16,227 +16,227 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Video.V1
-{
-
-    public class CompositionSettingsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchCompositionSettingsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/CompositionSettings/Default",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch CompositionSettings parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionSettings </returns>
-        public static CompositionSettingsResource Fetch(FetchCompositionSettingsOptions options,
-                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch CompositionSettings parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionSettings </returns>
-        public static async System.Threading.Tasks.Task<CompositionSettingsResource> FetchAsync(FetchCompositionSettingsOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionSettings </returns>
-        public static CompositionSettingsResource Fetch(ITwilioRestClient client = null)
-        {
-            var options = new FetchCompositionSettingsOptions();
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionSettings </returns>
-        public static async System.Threading.Tasks.Task<CompositionSettingsResource> FetchAsync(ITwilioRestClient client = null)
-        {
-            var options = new FetchCompositionSettingsOptions();
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateCompositionSettingsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Video,
-                "/v1/CompositionSettings/Default",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create CompositionSettings parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionSettings </returns>
-        public static CompositionSettingsResource Create(CreateCompositionSettingsOptions options,
-                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create CompositionSettings parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionSettings </returns>
-        public static async System.Threading.Tasks.Task<CompositionSettingsResource> CreateAsync(CreateCompositionSettingsOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A descriptive string that you create to describe the resource </param>
-        /// <param name="awsCredentialsSid"> The SID of the stored Credential resource </param>
-        /// <param name="encryptionKeySid"> The SID of the Public Key resource to use for encryption </param>
-        /// <param name="awsS3Url"> The URL of the AWS S3 bucket where the compositions should be stored </param>
-        /// <param name="awsStorageEnabled"> Whether all compositions should be written to the aws_s3_url </param>
-        /// <param name="encryptionEnabled"> Whether all compositions should be stored in an encrypted form </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of CompositionSettings </returns>
-        public static CompositionSettingsResource Create(string friendlyName,
-                                                         string awsCredentialsSid = null,
-                                                         string encryptionKeySid = null,
-                                                         Uri awsS3Url = null,
-                                                         bool? awsStorageEnabled = null,
-                                                         bool? encryptionEnabled = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new CreateCompositionSettingsOptions(friendlyName){AwsCredentialsSid = awsCredentialsSid, EncryptionKeySid = encryptionKeySid, AwsS3Url = awsS3Url, AwsStorageEnabled = awsStorageEnabled, EncryptionEnabled = encryptionEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A descriptive string that you create to describe the resource </param>
-        /// <param name="awsCredentialsSid"> The SID of the stored Credential resource </param>
-        /// <param name="encryptionKeySid"> The SID of the Public Key resource to use for encryption </param>
-        /// <param name="awsS3Url"> The URL of the AWS S3 bucket where the compositions should be stored </param>
-        /// <param name="awsStorageEnabled"> Whether all compositions should be written to the aws_s3_url </param>
-        /// <param name="encryptionEnabled"> Whether all compositions should be stored in an encrypted form </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of CompositionSettings </returns>
-        public static async System.Threading.Tasks.Task<CompositionSettingsResource> CreateAsync(string friendlyName,
-                                                                                                 string awsCredentialsSid = null,
-                                                                                                 string encryptionKeySid = null,
-                                                                                                 Uri awsS3Url = null,
-                                                                                                 bool? awsStorageEnabled = null,
-                                                                                                 bool? encryptionEnabled = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new CreateCompositionSettingsOptions(friendlyName){AwsCredentialsSid = awsCredentialsSid, EncryptionKeySid = encryptionKeySid, AwsS3Url = awsS3Url, AwsStorageEnabled = awsStorageEnabled, EncryptionEnabled = encryptionEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CompositionSettingsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CompositionSettingsResource object represented by the provided JSON </returns>
-        public static CompositionSettingsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CompositionSettingsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The SID of the stored Credential resource
-        /// </summary>
-        [JsonProperty("aws_credentials_sid")]
-        public string AwsCredentialsSid { get; private set; }
-        /// <summary>
-        /// The URL of the AWS S3 bucket where the compositions are stored
-        /// </summary>
-        [JsonProperty("aws_s3_url")]
-        public Uri AwsS3Url { get; private set; }
-        /// <summary>
-        /// Whether all compositions are written to the aws_s3_url
-        /// </summary>
-        [JsonProperty("aws_storage_enabled")]
-        public bool? AwsStorageEnabled { get; private set; }
-        /// <summary>
-        /// The SID of the Public Key resource used for encryption
-        /// </summary>
-        [JsonProperty("encryption_key_sid")]
-        public string EncryptionKeySid { get; private set; }
-        /// <summary>
-        /// Whether all compositions are stored in an encrypted form
-        /// </summary>
-        [JsonProperty("encryption_enabled")]
-        public bool? EncryptionEnabled { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CompositionSettingsResource()
-        {
-
-        }
-    }
+{
+
+  public class CompositionSettingsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchCompositionSettingsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/CompositionSettings/Default",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch CompositionSettings parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionSettings </returns>
+    public static CompositionSettingsResource Fetch(FetchCompositionSettingsOptions options,
+                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch CompositionSettings parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionSettings </returns>
+    public static async System.Threading.Tasks.Task<CompositionSettingsResource> FetchAsync(FetchCompositionSettingsOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionSettings </returns>
+    public static CompositionSettingsResource Fetch(ITwilioRestClient client = null)
+    {
+      var options = new FetchCompositionSettingsOptions();
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionSettings </returns>
+    public static async System.Threading.Tasks.Task<CompositionSettingsResource> FetchAsync(ITwilioRestClient client = null)
+    {
+      var options = new FetchCompositionSettingsOptions();
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateCompositionSettingsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Video,
+          "/v1/CompositionSettings/Default",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create CompositionSettings parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionSettings </returns>
+    public static CompositionSettingsResource Create(CreateCompositionSettingsOptions options,
+                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create CompositionSettings parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionSettings </returns>
+    public static async System.Threading.Tasks.Task<CompositionSettingsResource> CreateAsync(CreateCompositionSettingsOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A descriptive string that you create to describe the resource </param>
+    /// <param name="awsCredentialsSid"> The SID of the stored Credential resource </param>
+    /// <param name="encryptionKeySid"> The SID of the Public Key resource to use for encryption </param>
+    /// <param name="awsS3Url"> The URL of the AWS S3 bucket where the compositions should be stored </param>
+    /// <param name="awsStorageEnabled"> Whether all compositions should be written to the aws_s3_url </param>
+    /// <param name="encryptionEnabled"> Whether all compositions should be stored in an encrypted form </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of CompositionSettings </returns>
+    public static CompositionSettingsResource Create(string friendlyName,
+                                                     string awsCredentialsSid = null,
+                                                     string encryptionKeySid = null,
+                                                     Uri awsS3Url = null,
+                                                     bool? awsStorageEnabled = null,
+                                                     bool? encryptionEnabled = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new CreateCompositionSettingsOptions(friendlyName) { AwsCredentialsSid = awsCredentialsSid, EncryptionKeySid = encryptionKeySid, AwsS3Url = awsS3Url, AwsStorageEnabled = awsStorageEnabled, EncryptionEnabled = encryptionEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A descriptive string that you create to describe the resource </param>
+    /// <param name="awsCredentialsSid"> The SID of the stored Credential resource </param>
+    /// <param name="encryptionKeySid"> The SID of the Public Key resource to use for encryption </param>
+    /// <param name="awsS3Url"> The URL of the AWS S3 bucket where the compositions should be stored </param>
+    /// <param name="awsStorageEnabled"> Whether all compositions should be written to the aws_s3_url </param>
+    /// <param name="encryptionEnabled"> Whether all compositions should be stored in an encrypted form </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of CompositionSettings </returns>
+    public static async System.Threading.Tasks.Task<CompositionSettingsResource> CreateAsync(string friendlyName,
+                                                                                             string awsCredentialsSid = null,
+                                                                                             string encryptionKeySid = null,
+                                                                                             Uri awsS3Url = null,
+                                                                                             bool? awsStorageEnabled = null,
+                                                                                             bool? encryptionEnabled = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new CreateCompositionSettingsOptions(friendlyName) { AwsCredentialsSid = awsCredentialsSid, EncryptionKeySid = encryptionKeySid, AwsS3Url = awsS3Url, AwsStorageEnabled = awsStorageEnabled, EncryptionEnabled = encryptionEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CompositionSettingsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CompositionSettingsResource object represented by the provided JSON </returns>
+    public static CompositionSettingsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CompositionSettingsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The SID of the stored Credential resource
+    /// </summary>
+    [JsonProperty("aws_credentials_sid")]
+    public string AwsCredentialsSid { get; private set; }
+    /// <summary>
+    /// The URL of the AWS S3 bucket where the compositions are stored
+    /// </summary>
+    [JsonProperty("aws_s3_url")]
+    public Uri AwsS3Url { get; private set; }
+    /// <summary>
+    /// Whether all compositions are written to the aws_s3_url
+    /// </summary>
+    [JsonProperty("aws_storage_enabled")]
+    public bool? AwsStorageEnabled { get; private set; }
+    /// <summary>
+    /// The SID of the Public Key resource used for encryption
+    /// </summary>
+    [JsonProperty("encryption_key_sid")]
+    public string EncryptionKeySid { get; private set; }
+    /// <summary>
+    /// Whether all compositions are stored in an encrypted form
+    /// </summary>
+    [JsonProperty("encryption_enabled")]
+    public bool? EncryptionEnabled { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CompositionSettingsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/RecordingOptions.cs b/src/Twilio/Rest/Video/V1/RecordingOptions.cs
index 9f950f642..1c05f2f7a 100644
--- a/src/Twilio/Rest/Video/V1/RecordingOptions.cs
+++ b/src/Twilio/Rest/Video/V1/RecordingOptions.cs
@@ -10,147 +10,147 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Video.V1
-{
-
+{
+
+  /// <summary>
+  /// Returns a single Recording resource identified by a Recording SID.
+  /// </summary>
+  public class FetchRecordingOptions : IOptions<RecordingResource>
+  {
     /// <summary>
-    /// Returns a single Recording resource identified by a Recording SID.
+    /// The SID that identifies the resource to fetch
     /// </summary>
-    public class FetchRecordingOptions : IOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRecordingOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchRecordingOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// List of all Track recordings.
+    /// Construct a new FetchRecordingOptions
     /// </summary>
-    public class ReadRecordingOptions : ReadOptions<RecordingResource>
-    {
-        /// <summary>
-        /// Read only the recordings that have this status
-        /// </summary>
-        public RecordingResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// Read only the recordings that have this source_sid
-        /// </summary>
-        public string SourceSid { get; set; }
-        /// <summary>
-        /// Read only recordings that have this grouping_sid
-        /// </summary>
-        public List<string> GroupingSid { get; set; }
-        /// <summary>
-        /// Read only recordings that started on or after this [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone
-        /// </summary>
-        public DateTime? DateCreatedAfter { get; set; }
-        /// <summary>
-        /// Read only recordings that started before this [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone
-        /// </summary>
-        public DateTime? DateCreatedBefore { get; set; }
-        /// <summary>
-        /// Read only recordings that have this media type
-        /// </summary>
-        public RecordingResource.TypeEnum MediaType { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadRecordingOptions
-        /// </summary>
-        public ReadRecordingOptions()
-        {
-            GroupingSid = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (SourceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SourceSid", SourceSid.ToString()));
-            }
-
-            if (GroupingSid != null)
-            {
-                p.AddRange(GroupingSid.Select(prop => new KeyValuePair<string, string>("GroupingSid", prop.ToString())));
-            }
-
-            if (DateCreatedAfter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
-            }
-
-            if (DateCreatedBefore != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
-            }
-
-            if (MediaType != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MediaType", MediaType.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchRecordingOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// Delete a Recording resource identified by a Recording SID.
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteRecordingOptions : IOptions<RecordingResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRecordingOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeleteRecordingOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// List of all Track recordings.
+  /// </summary>
+  public class ReadRecordingOptions : ReadOptions<RecordingResource>
+  {
+    /// <summary>
+    /// Read only the recordings that have this status
+    /// </summary>
+    public RecordingResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// Read only the recordings that have this source_sid
+    /// </summary>
+    public string SourceSid { get; set; }
+    /// <summary>
+    /// Read only recordings that have this grouping_sid
+    /// </summary>
+    public List<string> GroupingSid { get; set; }
+    /// <summary>
+    /// Read only recordings that started on or after this [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone
+    /// </summary>
+    public DateTime? DateCreatedAfter { get; set; }
+    /// <summary>
+    /// Read only recordings that started before this [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone
+    /// </summary>
+    public DateTime? DateCreatedBefore { get; set; }
+    /// <summary>
+    /// Read only recordings that have this media type
+    /// </summary>
+    public RecordingResource.TypeEnum MediaType { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadRecordingOptions
+    /// </summary>
+    public ReadRecordingOptions()
+    {
+      GroupingSid = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (SourceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SourceSid", SourceSid.ToString()));
+      }
+
+      if (GroupingSid != null)
+      {
+        p.AddRange(GroupingSid.Select(prop => new KeyValuePair<string, string>("GroupingSid", prop.ToString())));
+      }
+
+      if (DateCreatedAfter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
+      }
+
+      if (DateCreatedBefore != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
+      }
+
+      if (MediaType != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MediaType", MediaType.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a Recording resource identified by a Recording SID.
+  /// </summary>
+  public class DeleteRecordingOptions : IOptions<RecordingResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRecordingOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeleteRecordingOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/RecordingResource.cs b/src/Twilio/Rest/Video/V1/RecordingResource.cs
index 9fddab6e8..544bfed7b 100644
--- a/src/Twilio/Rest/Video/V1/RecordingResource.cs
+++ b/src/Twilio/Rest/Video/V1/RecordingResource.cs
@@ -17,459 +17,459 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Video.V1
-{
-
-    public class RecordingResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Processing = new StatusEnum("processing");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Deleted = new StatusEnum("deleted");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        public sealed class TypeEnum : StringEnum
-        {
-            private TypeEnum(string value) : base(value) {}
-            public TypeEnum() {}
-            public static implicit operator TypeEnum(string value)
-            {
-                return new TypeEnum(value);
-            }
-
-            public static readonly TypeEnum Audio = new TypeEnum("audio");
-            public static readonly TypeEnum Video = new TypeEnum("video");
-            public static readonly TypeEnum Data = new TypeEnum("data");
-        }
-
-        public sealed class FormatEnum : StringEnum
-        {
-            private FormatEnum(string value) : base(value) {}
-            public FormatEnum() {}
-            public static implicit operator FormatEnum(string value)
-            {
-                return new FormatEnum(value);
-            }
-
-            public static readonly FormatEnum Mka = new FormatEnum("mka");
-            public static readonly FormatEnum Mkv = new FormatEnum("mkv");
-        }
-
-        public sealed class CodecEnum : StringEnum
-        {
-            private CodecEnum(string value) : base(value) {}
-            public CodecEnum() {}
-            public static implicit operator CodecEnum(string value)
-            {
-                return new CodecEnum(value);
-            }
-
-            public static readonly CodecEnum Vp8 = new CodecEnum("VP8");
-            public static readonly CodecEnum H264 = new CodecEnum("H264");
-            public static readonly CodecEnum Opus = new CodecEnum("OPUS");
-            public static readonly CodecEnum Pcmu = new CodecEnum("PCMU");
-        }
-
-        private static Request BuildFetchRequest(FetchRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Recordings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a single Recording resource identified by a Recording SID.
-        /// </summary>
-        /// <param name="options"> Fetch Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Fetch(FetchRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single Recording resource identified by a Recording SID.
-        /// </summary>
-        /// <param name="options"> Fetch Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(FetchRecordingOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a single Recording resource identified by a Recording SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static RecordingResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single Recording resource identified by a Recording SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Recordings",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// List of all Track recordings.
-        /// </summary>
-        /// <param name="options"> Read Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static ResourceSet<RecordingResource> Read(ReadRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RecordingResource>.FromJson("recordings", response.Content);
-            return new ResourceSet<RecordingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List of all Track recordings.
-        /// </summary>
-        /// <param name="options"> Read Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(ReadRecordingOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RecordingResource>.FromJson("recordings", response.Content);
-            return new ResourceSet<RecordingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// List of all Track recordings.
-        /// </summary>
-        /// <param name="status"> Read only the recordings that have this status </param>
-        /// <param name="sourceSid"> Read only the recordings that have this source_sid </param>
-        /// <param name="groupingSid"> Read only recordings that have this grouping_sid </param>
-        /// <param name="dateCreatedAfter"> Read only recordings that started on or after this [ISO
-        ///                        8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone </param>
-        /// <param name="dateCreatedBefore"> Read only recordings that started before this [ISO
-        ///                         8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone </param>
-        /// <param name="mediaType"> Read only recordings that have this media type </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static ResourceSet<RecordingResource> Read(RecordingResource.StatusEnum status = null,
-                                                          string sourceSid = null,
-                                                          List<string> groupingSid = null,
-                                                          DateTime? dateCreatedAfter = null,
-                                                          DateTime? dateCreatedBefore = null,
-                                                          RecordingResource.TypeEnum mediaType = null,
-                                                          int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadRecordingOptions(){Status = status, SourceSid = sourceSid, GroupingSid = groupingSid, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, MediaType = mediaType, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// List of all Track recordings.
-        /// </summary>
-        /// <param name="status"> Read only the recordings that have this status </param>
-        /// <param name="sourceSid"> Read only the recordings that have this source_sid </param>
-        /// <param name="groupingSid"> Read only recordings that have this grouping_sid </param>
-        /// <param name="dateCreatedAfter"> Read only recordings that started on or after this [ISO
-        ///                        8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone </param>
-        /// <param name="dateCreatedBefore"> Read only recordings that started before this [ISO
-        ///                         8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone </param>
-        /// <param name="mediaType"> Read only recordings that have this media type </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(RecordingResource.StatusEnum status = null,
-                                                                                                  string sourceSid = null,
-                                                                                                  List<string> groupingSid = null,
-                                                                                                  DateTime? dateCreatedAfter = null,
-                                                                                                  DateTime? dateCreatedBefore = null,
-                                                                                                  RecordingResource.TypeEnum mediaType = null,
-                                                                                                  int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadRecordingOptions(){Status = status, SourceSid = sourceSid, GroupingSid = groupingSid, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, MediaType = mediaType, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RecordingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RecordingResource> NextPage(Page<RecordingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<RecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RecordingResource> PreviousPage(Page<RecordingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<RecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Video,
-                "/v1/Recordings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a Recording resource identified by a Recording SID.
-        /// </summary>
-        /// <param name="options"> Delete Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static bool Delete(DeleteRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Recording resource identified by a Recording SID.
-        /// </summary>
-        /// <param name="options"> Delete Recording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRecordingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a Recording resource identified by a Recording SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Recording </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRecordingOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Recording resource identified by a Recording SID.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Recording </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRecordingOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RecordingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RecordingResource object represented by the provided JSON </returns>
-        public static RecordingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RecordingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The status of the recording
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RecordingResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the recording source
-        /// </summary>
-        [JsonProperty("source_sid")]
-        public string SourceSid { get; private set; }
-        /// <summary>
-        /// The size of the recorded track, in bytes
-        /// </summary>
-        [JsonProperty("size")]
-        public long? Size { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The recording's media type
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RecordingResource.TypeEnum Type { get; private set; }
-        /// <summary>
-        /// The duration of the recording in seconds
-        /// </summary>
-        [JsonProperty("duration")]
-        public int? Duration { get; private set; }
-        /// <summary>
-        /// The file format for the recording
-        /// </summary>
-        [JsonProperty("container_format")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RecordingResource.FormatEnum ContainerFormat { get; private set; }
-        /// <summary>
-        /// The codec used to encode the track
-        /// </summary>
-        [JsonProperty("codec")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RecordingResource.CodecEnum Codec { get; private set; }
-        /// <summary>
-        /// A list of SIDs related to the recording
-        /// </summary>
-        [JsonProperty("grouping_sids")]
-        public object GroupingSids { get; private set; }
-        /// <summary>
-        /// The name that was given to the source track of the recording
-        /// </summary>
-        [JsonProperty("track_name")]
-        public string TrackName { get; private set; }
-        /// <summary>
-        /// The number of milliseconds between a point in time that is common to all rooms in a group and when the source room of the recording started
-        /// </summary>
-        [JsonProperty("offset")]
-        public long? Offset { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private RecordingResource()
-        {
-
-        }
-    }
+{
+
+  public class RecordingResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Processing = new StatusEnum("processing");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Deleted = new StatusEnum("deleted");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+      public TypeEnum() { }
+      public static implicit operator TypeEnum(string value)
+      {
+        return new TypeEnum(value);
+      }
+
+      public static readonly TypeEnum Audio = new TypeEnum("audio");
+      public static readonly TypeEnum Video = new TypeEnum("video");
+      public static readonly TypeEnum Data = new TypeEnum("data");
+    }
+
+    public sealed class FormatEnum : StringEnum
+    {
+      private FormatEnum(string value) : base(value) { }
+      public FormatEnum() { }
+      public static implicit operator FormatEnum(string value)
+      {
+        return new FormatEnum(value);
+      }
+
+      public static readonly FormatEnum Mka = new FormatEnum("mka");
+      public static readonly FormatEnum Mkv = new FormatEnum("mkv");
+    }
+
+    public sealed class CodecEnum : StringEnum
+    {
+      private CodecEnum(string value) : base(value) { }
+      public CodecEnum() { }
+      public static implicit operator CodecEnum(string value)
+      {
+        return new CodecEnum(value);
+      }
+
+      public static readonly CodecEnum Vp8 = new CodecEnum("VP8");
+      public static readonly CodecEnum H264 = new CodecEnum("H264");
+      public static readonly CodecEnum Opus = new CodecEnum("OPUS");
+      public static readonly CodecEnum Pcmu = new CodecEnum("PCMU");
+    }
+
+    private static Request BuildFetchRequest(FetchRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Recordings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a single Recording resource identified by a Recording SID.
+    /// </summary>
+    /// <param name="options"> Fetch Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Fetch(FetchRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single Recording resource identified by a Recording SID.
+    /// </summary>
+    /// <param name="options"> Fetch Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(FetchRecordingOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a single Recording resource identified by a Recording SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static RecordingResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single Recording resource identified by a Recording SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<RecordingResource> FetchAsync(string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Recordings",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// List of all Track recordings.
+    /// </summary>
+    /// <param name="options"> Read Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static ResourceSet<RecordingResource> Read(ReadRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RecordingResource>.FromJson("recordings", response.Content);
+      return new ResourceSet<RecordingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List of all Track recordings.
+    /// </summary>
+    /// <param name="options"> Read Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(ReadRecordingOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RecordingResource>.FromJson("recordings", response.Content);
+      return new ResourceSet<RecordingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// List of all Track recordings.
+    /// </summary>
+    /// <param name="status"> Read only the recordings that have this status </param>
+    /// <param name="sourceSid"> Read only the recordings that have this source_sid </param>
+    /// <param name="groupingSid"> Read only recordings that have this grouping_sid </param>
+    /// <param name="dateCreatedAfter"> Read only recordings that started on or after this [ISO
+    ///                        8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone </param>
+    /// <param name="dateCreatedBefore"> Read only recordings that started before this [ISO
+    ///                         8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone </param>
+    /// <param name="mediaType"> Read only recordings that have this media type </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static ResourceSet<RecordingResource> Read(RecordingResource.StatusEnum status = null,
+                                                      string sourceSid = null,
+                                                      List<string> groupingSid = null,
+                                                      DateTime? dateCreatedAfter = null,
+                                                      DateTime? dateCreatedBefore = null,
+                                                      RecordingResource.TypeEnum mediaType = null,
+                                                      int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadRecordingOptions() { Status = status, SourceSid = sourceSid, GroupingSid = groupingSid, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, MediaType = mediaType, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// List of all Track recordings.
+    /// </summary>
+    /// <param name="status"> Read only the recordings that have this status </param>
+    /// <param name="sourceSid"> Read only the recordings that have this source_sid </param>
+    /// <param name="groupingSid"> Read only recordings that have this grouping_sid </param>
+    /// <param name="dateCreatedAfter"> Read only recordings that started on or after this [ISO
+    ///                        8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone </param>
+    /// <param name="dateCreatedBefore"> Read only recordings that started before this [ISO
+    ///                         8601](https://en.wikipedia.org/wiki/ISO_8601) date-time with time zone </param>
+    /// <param name="mediaType"> Read only recordings that have this media type </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RecordingResource>> ReadAsync(RecordingResource.StatusEnum status = null,
+                                                                                              string sourceSid = null,
+                                                                                              List<string> groupingSid = null,
+                                                                                              DateTime? dateCreatedAfter = null,
+                                                                                              DateTime? dateCreatedBefore = null,
+                                                                                              RecordingResource.TypeEnum mediaType = null,
+                                                                                              int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadRecordingOptions() { Status = status, SourceSid = sourceSid, GroupingSid = groupingSid, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, MediaType = mediaType, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RecordingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RecordingResource> NextPage(Page<RecordingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<RecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RecordingResource> PreviousPage(Page<RecordingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<RecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Video,
+          "/v1/Recordings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a Recording resource identified by a Recording SID.
+    /// </summary>
+    /// <param name="options"> Delete Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static bool Delete(DeleteRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Recording resource identified by a Recording SID.
+    /// </summary>
+    /// <param name="options"> Delete Recording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRecordingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a Recording resource identified by a Recording SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Recording </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRecordingOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Recording resource identified by a Recording SID.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Recording </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRecordingOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RecordingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RecordingResource object represented by the provided JSON </returns>
+    public static RecordingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RecordingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The status of the recording
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RecordingResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the recording source
+    /// </summary>
+    [JsonProperty("source_sid")]
+    public string SourceSid { get; private set; }
+    /// <summary>
+    /// The size of the recorded track, in bytes
+    /// </summary>
+    [JsonProperty("size")]
+    public long? Size { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The recording's media type
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RecordingResource.TypeEnum Type { get; private set; }
+    /// <summary>
+    /// The duration of the recording in seconds
+    /// </summary>
+    [JsonProperty("duration")]
+    public int? Duration { get; private set; }
+    /// <summary>
+    /// The file format for the recording
+    /// </summary>
+    [JsonProperty("container_format")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RecordingResource.FormatEnum ContainerFormat { get; private set; }
+    /// <summary>
+    /// The codec used to encode the track
+    /// </summary>
+    [JsonProperty("codec")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RecordingResource.CodecEnum Codec { get; private set; }
+    /// <summary>
+    /// A list of SIDs related to the recording
+    /// </summary>
+    [JsonProperty("grouping_sids")]
+    public object GroupingSids { get; private set; }
+    /// <summary>
+    /// The name that was given to the source track of the recording
+    /// </summary>
+    [JsonProperty("track_name")]
+    public string TrackName { get; private set; }
+    /// <summary>
+    /// The number of milliseconds between a point in time that is common to all rooms in a group and when the source room of the recording started
+    /// </summary>
+    [JsonProperty("offset")]
+    public long? Offset { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private RecordingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/RecordingSettingsOptions.cs b/src/Twilio/Rest/Video/V1/RecordingSettingsOptions.cs
index 66de1cdcf..fb6d60f6c 100644
--- a/src/Twilio/Rest/Video/V1/RecordingSettingsOptions.cs
+++ b/src/Twilio/Rest/Video/V1/RecordingSettingsOptions.cs
@@ -9,100 +9,100 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Video.V1
-{
-
+{
+
+  /// <summary>
+  /// FetchRecordingSettingsOptions
+  /// </summary>
+  public class FetchRecordingSettingsOptions : IOptions<RecordingSettingsResource>
+  {
     /// <summary>
-    /// FetchRecordingSettingsOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchRecordingSettingsOptions : IOptions<RecordingSettingsResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateRecordingSettingsOptions
+  /// </summary>
+  public class CreateRecordingSettingsOptions : IOptions<RecordingSettingsResource>
+  {
     /// <summary>
-    /// CreateRecordingSettingsOptions
+    /// A string to describe the resource
     /// </summary>
-    public class CreateRecordingSettingsOptions : IOptions<RecordingSettingsResource>
-    {
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; }
-        /// <summary>
-        /// The SID of the stored Credential resource
-        /// </summary>
-        public string AwsCredentialsSid { get; set; }
-        /// <summary>
-        /// The SID of the Public Key resource to use for encryption
-        /// </summary>
-        public string EncryptionKeySid { get; set; }
-        /// <summary>
-        /// The URL of the AWS S3 bucket where the recordings should be stored
-        /// </summary>
-        public Uri AwsS3Url { get; set; }
-        /// <summary>
-        /// Whether all recordings should be written to the aws_s3_url
-        /// </summary>
-        public bool? AwsStorageEnabled { get; set; }
-        /// <summary>
-        /// Whether all recordings should be stored in an encrypted form
-        /// </summary>
-        public bool? EncryptionEnabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateRecordingSettingsOptions
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        public CreateRecordingSettingsOptions(string friendlyName)
-        {
-            FriendlyName = friendlyName;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (AwsCredentialsSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AwsCredentialsSid", AwsCredentialsSid.ToString()));
-            }
-
-            if (EncryptionKeySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EncryptionKeySid", EncryptionKeySid.ToString()));
-            }
-
-            if (AwsS3Url != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AwsS3Url", Serializers.Url(AwsS3Url)));
-            }
-
-            if (AwsStorageEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AwsStorageEnabled", AwsStorageEnabled.Value.ToString().ToLower()));
-            }
-
-            if (EncryptionEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EncryptionEnabled", EncryptionEnabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    public string FriendlyName { get; }
+    /// <summary>
+    /// The SID of the stored Credential resource
+    /// </summary>
+    public string AwsCredentialsSid { get; set; }
+    /// <summary>
+    /// The SID of the Public Key resource to use for encryption
+    /// </summary>
+    public string EncryptionKeySid { get; set; }
+    /// <summary>
+    /// The URL of the AWS S3 bucket where the recordings should be stored
+    /// </summary>
+    public Uri AwsS3Url { get; set; }
+    /// <summary>
+    /// Whether all recordings should be written to the aws_s3_url
+    /// </summary>
+    public bool? AwsStorageEnabled { get; set; }
+    /// <summary>
+    /// Whether all recordings should be stored in an encrypted form
+    /// </summary>
+    public bool? EncryptionEnabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateRecordingSettingsOptions
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    public CreateRecordingSettingsOptions(string friendlyName)
+    {
+      FriendlyName = friendlyName;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (AwsCredentialsSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AwsCredentialsSid", AwsCredentialsSid.ToString()));
+      }
+
+      if (EncryptionKeySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EncryptionKeySid", EncryptionKeySid.ToString()));
+      }
+
+      if (AwsS3Url != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AwsS3Url", Serializers.Url(AwsS3Url)));
+      }
+
+      if (AwsStorageEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AwsStorageEnabled", AwsStorageEnabled.Value.ToString().ToLower()));
+      }
+
+      if (EncryptionEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EncryptionEnabled", EncryptionEnabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/RecordingSettingsResource.cs b/src/Twilio/Rest/Video/V1/RecordingSettingsResource.cs
index 5f3a3216b..e39d944e8 100644
--- a/src/Twilio/Rest/Video/V1/RecordingSettingsResource.cs
+++ b/src/Twilio/Rest/Video/V1/RecordingSettingsResource.cs
@@ -16,226 +16,226 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Video.V1
-{
-
-    public class RecordingSettingsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchRecordingSettingsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/RecordingSettings/Default",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch RecordingSettings parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RecordingSettings </returns>
-        public static RecordingSettingsResource Fetch(FetchRecordingSettingsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch RecordingSettings parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RecordingSettings </returns>
-        public static async System.Threading.Tasks.Task<RecordingSettingsResource> FetchAsync(FetchRecordingSettingsOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RecordingSettings </returns>
-        public static RecordingSettingsResource Fetch(ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingSettingsOptions();
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RecordingSettings </returns>
-        public static async System.Threading.Tasks.Task<RecordingSettingsResource> FetchAsync(ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingSettingsOptions();
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateRecordingSettingsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Video,
-                "/v1/RecordingSettings/Default",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create RecordingSettings parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RecordingSettings </returns>
-        public static RecordingSettingsResource Create(CreateRecordingSettingsOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create RecordingSettings parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RecordingSettings </returns>
-        public static async System.Threading.Tasks.Task<RecordingSettingsResource> CreateAsync(CreateRecordingSettingsOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="awsCredentialsSid"> The SID of the stored Credential resource </param>
-        /// <param name="encryptionKeySid"> The SID of the Public Key resource to use for encryption </param>
-        /// <param name="awsS3Url"> The URL of the AWS S3 bucket where the recordings should be stored </param>
-        /// <param name="awsStorageEnabled"> Whether all recordings should be written to the aws_s3_url </param>
-        /// <param name="encryptionEnabled"> Whether all recordings should be stored in an encrypted form </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RecordingSettings </returns>
-        public static RecordingSettingsResource Create(string friendlyName,
-                                                       string awsCredentialsSid = null,
-                                                       string encryptionKeySid = null,
-                                                       Uri awsS3Url = null,
-                                                       bool? awsStorageEnabled = null,
-                                                       bool? encryptionEnabled = null,
-                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateRecordingSettingsOptions(friendlyName){AwsCredentialsSid = awsCredentialsSid, EncryptionKeySid = encryptionKeySid, AwsS3Url = awsS3Url, AwsStorageEnabled = awsStorageEnabled, EncryptionEnabled = encryptionEnabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="awsCredentialsSid"> The SID of the stored Credential resource </param>
-        /// <param name="encryptionKeySid"> The SID of the Public Key resource to use for encryption </param>
-        /// <param name="awsS3Url"> The URL of the AWS S3 bucket where the recordings should be stored </param>
-        /// <param name="awsStorageEnabled"> Whether all recordings should be written to the aws_s3_url </param>
-        /// <param name="encryptionEnabled"> Whether all recordings should be stored in an encrypted form </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RecordingSettings </returns>
-        public static async System.Threading.Tasks.Task<RecordingSettingsResource> CreateAsync(string friendlyName,
-                                                                                               string awsCredentialsSid = null,
-                                                                                               string encryptionKeySid = null,
-                                                                                               Uri awsS3Url = null,
-                                                                                               bool? awsStorageEnabled = null,
-                                                                                               bool? encryptionEnabled = null,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateRecordingSettingsOptions(friendlyName){AwsCredentialsSid = awsCredentialsSid, EncryptionKeySid = encryptionKeySid, AwsS3Url = awsS3Url, AwsStorageEnabled = awsStorageEnabled, EncryptionEnabled = encryptionEnabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RecordingSettingsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RecordingSettingsResource object represented by the provided JSON </returns>
-        public static RecordingSettingsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RecordingSettingsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The SID of the stored Credential resource
-        /// </summary>
-        [JsonProperty("aws_credentials_sid")]
-        public string AwsCredentialsSid { get; private set; }
-        /// <summary>
-        /// The URL of the AWS S3 bucket where the recordings are stored
-        /// </summary>
-        [JsonProperty("aws_s3_url")]
-        public Uri AwsS3Url { get; private set; }
-        /// <summary>
-        /// Whether all recordings are written to the aws_s3_url
-        /// </summary>
-        [JsonProperty("aws_storage_enabled")]
-        public bool? AwsStorageEnabled { get; private set; }
-        /// <summary>
-        /// The SID of the Public Key resource used for encryption
-        /// </summary>
-        [JsonProperty("encryption_key_sid")]
-        public string EncryptionKeySid { get; private set; }
-        /// <summary>
-        /// Whether all recordings are stored in an encrypted form
-        /// </summary>
-        [JsonProperty("encryption_enabled")]
-        public bool? EncryptionEnabled { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private RecordingSettingsResource()
-        {
-
-        }
-    }
+{
+
+  public class RecordingSettingsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchRecordingSettingsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/RecordingSettings/Default",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch RecordingSettings parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RecordingSettings </returns>
+    public static RecordingSettingsResource Fetch(FetchRecordingSettingsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch RecordingSettings parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RecordingSettings </returns>
+    public static async System.Threading.Tasks.Task<RecordingSettingsResource> FetchAsync(FetchRecordingSettingsOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RecordingSettings </returns>
+    public static RecordingSettingsResource Fetch(ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingSettingsOptions();
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RecordingSettings </returns>
+    public static async System.Threading.Tasks.Task<RecordingSettingsResource> FetchAsync(ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingSettingsOptions();
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateRecordingSettingsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Video,
+          "/v1/RecordingSettings/Default",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create RecordingSettings parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RecordingSettings </returns>
+    public static RecordingSettingsResource Create(CreateRecordingSettingsOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create RecordingSettings parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RecordingSettings </returns>
+    public static async System.Threading.Tasks.Task<RecordingSettingsResource> CreateAsync(CreateRecordingSettingsOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="awsCredentialsSid"> The SID of the stored Credential resource </param>
+    /// <param name="encryptionKeySid"> The SID of the Public Key resource to use for encryption </param>
+    /// <param name="awsS3Url"> The URL of the AWS S3 bucket where the recordings should be stored </param>
+    /// <param name="awsStorageEnabled"> Whether all recordings should be written to the aws_s3_url </param>
+    /// <param name="encryptionEnabled"> Whether all recordings should be stored in an encrypted form </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RecordingSettings </returns>
+    public static RecordingSettingsResource Create(string friendlyName,
+                                                   string awsCredentialsSid = null,
+                                                   string encryptionKeySid = null,
+                                                   Uri awsS3Url = null,
+                                                   bool? awsStorageEnabled = null,
+                                                   bool? encryptionEnabled = null,
+                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateRecordingSettingsOptions(friendlyName) { AwsCredentialsSid = awsCredentialsSid, EncryptionKeySid = encryptionKeySid, AwsS3Url = awsS3Url, AwsStorageEnabled = awsStorageEnabled, EncryptionEnabled = encryptionEnabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="awsCredentialsSid"> The SID of the stored Credential resource </param>
+    /// <param name="encryptionKeySid"> The SID of the Public Key resource to use for encryption </param>
+    /// <param name="awsS3Url"> The URL of the AWS S3 bucket where the recordings should be stored </param>
+    /// <param name="awsStorageEnabled"> Whether all recordings should be written to the aws_s3_url </param>
+    /// <param name="encryptionEnabled"> Whether all recordings should be stored in an encrypted form </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RecordingSettings </returns>
+    public static async System.Threading.Tasks.Task<RecordingSettingsResource> CreateAsync(string friendlyName,
+                                                                                           string awsCredentialsSid = null,
+                                                                                           string encryptionKeySid = null,
+                                                                                           Uri awsS3Url = null,
+                                                                                           bool? awsStorageEnabled = null,
+                                                                                           bool? encryptionEnabled = null,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateRecordingSettingsOptions(friendlyName) { AwsCredentialsSid = awsCredentialsSid, EncryptionKeySid = encryptionKeySid, AwsS3Url = awsS3Url, AwsStorageEnabled = awsStorageEnabled, EncryptionEnabled = encryptionEnabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RecordingSettingsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RecordingSettingsResource object represented by the provided JSON </returns>
+    public static RecordingSettingsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RecordingSettingsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The SID of the stored Credential resource
+    /// </summary>
+    [JsonProperty("aws_credentials_sid")]
+    public string AwsCredentialsSid { get; private set; }
+    /// <summary>
+    /// The URL of the AWS S3 bucket where the recordings are stored
+    /// </summary>
+    [JsonProperty("aws_s3_url")]
+    public Uri AwsS3Url { get; private set; }
+    /// <summary>
+    /// Whether all recordings are written to the aws_s3_url
+    /// </summary>
+    [JsonProperty("aws_storage_enabled")]
+    public bool? AwsStorageEnabled { get; private set; }
+    /// <summary>
+    /// The SID of the Public Key resource used for encryption
+    /// </summary>
+    [JsonProperty("encryption_key_sid")]
+    public string EncryptionKeySid { get; private set; }
+    /// <summary>
+    /// Whether all recordings are stored in an encrypted form
+    /// </summary>
+    [JsonProperty("encryption_enabled")]
+    public bool? EncryptionEnabled { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private RecordingSettingsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/Room/Participant/PublishedTrackOptions.cs b/src/Twilio/Rest/Video/V1/Room/Participant/PublishedTrackOptions.cs
index 591b67242..ead9f989e 100644
--- a/src/Twilio/Rest/Video/V1/Room/Participant/PublishedTrackOptions.cs
+++ b/src/Twilio/Rest/Video/V1/Room/Participant/PublishedTrackOptions.cs
@@ -9,88 +9,88 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Video.V1.Room.Participant
-{
-
+{
+
+  /// <summary>
+  /// Returns a single Track resource represented by TrackName or SID.
+  /// </summary>
+  public class FetchPublishedTrackOptions : IOptions<PublishedTrackResource>
+  {
     /// <summary>
-    /// Returns a single Track resource represented by TrackName or SID.
+    /// The SID of the Room resource where the Track resource to fetch is published
     /// </summary>
-    public class FetchPublishedTrackOptions : IOptions<PublishedTrackResource>
-    {
-        /// <summary>
-        /// The SID of the Room resource where the Track resource to fetch is published
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// The SID of the Participant resource with the published track to fetch
-        /// </summary>
-        public string PathParticipantSid { get; }
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchPublishedTrackOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the Track resource to fetch is published </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource with the published track to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchPublishedTrackOptions(string pathRoomSid, string pathParticipantSid, string pathSid)
-        {
-            PathRoomSid = pathRoomSid;
-            PathParticipantSid = pathParticipantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathRoomSid { get; }
     /// <summary>
-    /// Returns a list of tracks associated with a given Participant. Only `currently` Published Tracks are in the list
-    /// resource.
+    /// The SID of the Participant resource with the published track to fetch
     /// </summary>
-    public class ReadPublishedTrackOptions : ReadOptions<PublishedTrackResource>
-    {
-        /// <summary>
-        /// The SID of the Room resource where the Track resources to read are published
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// The SID of the Participant resource with the published tracks to read
-        /// </summary>
-        public string PathParticipantSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadPublishedTrackOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the Track resources to read are published </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource with the published tracks to read </param>
-        public ReadPublishedTrackOptions(string pathRoomSid, string pathParticipantSid)
-        {
-            PathRoomSid = pathRoomSid;
-            PathParticipantSid = pathParticipantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathParticipantSid { get; }
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchPublishedTrackOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the Track resource to fetch is published </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource with the published track to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchPublishedTrackOptions(string pathRoomSid, string pathParticipantSid, string pathSid)
+    {
+      PathRoomSid = pathRoomSid;
+      PathParticipantSid = pathParticipantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Returns a list of tracks associated with a given Participant. Only `currently` Published Tracks are in the list
+  /// resource.
+  /// </summary>
+  public class ReadPublishedTrackOptions : ReadOptions<PublishedTrackResource>
+  {
+    /// <summary>
+    /// The SID of the Room resource where the Track resources to read are published
+    /// </summary>
+    public string PathRoomSid { get; }
+    /// <summary>
+    /// The SID of the Participant resource with the published tracks to read
+    /// </summary>
+    public string PathParticipantSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadPublishedTrackOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the Track resources to read are published </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource with the published tracks to read </param>
+    public ReadPublishedTrackOptions(string pathRoomSid, string pathParticipantSid)
+    {
+      PathRoomSid = pathRoomSid;
+      PathParticipantSid = pathParticipantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/Room/Participant/PublishedTrackResource.cs b/src/Twilio/Rest/Video/V1/Room/Participant/PublishedTrackResource.cs
index 1db3b9f42..07533a73f 100644
--- a/src/Twilio/Rest/Video/V1/Room/Participant/PublishedTrackResource.cs
+++ b/src/Twilio/Rest/Video/V1/Room/Participant/PublishedTrackResource.cs
@@ -17,311 +17,311 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Video.V1.Room.Participant
-{
-
-    public class PublishedTrackResource : Resource
-    {
-        public sealed class KindEnum : StringEnum
-        {
-            private KindEnum(string value) : base(value) {}
-            public KindEnum() {}
-            public static implicit operator KindEnum(string value)
-            {
-                return new KindEnum(value);
-            }
-
-            public static readonly KindEnum Audio = new KindEnum("audio");
-            public static readonly KindEnum Video = new KindEnum("video");
-            public static readonly KindEnum Data = new KindEnum("data");
-        }
-
-        private static Request BuildFetchRequest(FetchPublishedTrackOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "/PublishedTracks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a single Track resource represented by TrackName or SID.
-        /// </summary>
-        /// <param name="options"> Fetch PublishedTrack parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublishedTrack </returns>
-        public static PublishedTrackResource Fetch(FetchPublishedTrackOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single Track resource represented by TrackName or SID.
-        /// </summary>
-        /// <param name="options"> Fetch PublishedTrack parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublishedTrack </returns>
-        public static async System.Threading.Tasks.Task<PublishedTrackResource> FetchAsync(FetchPublishedTrackOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a single Track resource represented by TrackName or SID.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the Track resource to fetch is published </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource with the published track to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublishedTrack </returns>
-        public static PublishedTrackResource Fetch(string pathRoomSid,
-                                                   string pathParticipantSid,
-                                                   string pathSid,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchPublishedTrackOptions(pathRoomSid, pathParticipantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single Track resource represented by TrackName or SID.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the Track resource to fetch is published </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource with the published track to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublishedTrack </returns>
-        public static async System.Threading.Tasks.Task<PublishedTrackResource> FetchAsync(string pathRoomSid,
-                                                                                           string pathParticipantSid,
-                                                                                           string pathSid,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchPublishedTrackOptions(pathRoomSid, pathParticipantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadPublishedTrackOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "/PublishedTracks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a list of tracks associated with a given Participant. Only `currently` Published Tracks are in the list
-        /// resource.
-        /// </summary>
-        /// <param name="options"> Read PublishedTrack parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublishedTrack </returns>
-        public static ResourceSet<PublishedTrackResource> Read(ReadPublishedTrackOptions options,
-                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<PublishedTrackResource>.FromJson("published_tracks", response.Content);
-            return new ResourceSet<PublishedTrackResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of tracks associated with a given Participant. Only `currently` Published Tracks are in the list
-        /// resource.
-        /// </summary>
-        /// <param name="options"> Read PublishedTrack parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublishedTrack </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PublishedTrackResource>> ReadAsync(ReadPublishedTrackOptions options,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<PublishedTrackResource>.FromJson("published_tracks", response.Content);
-            return new ResourceSet<PublishedTrackResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a list of tracks associated with a given Participant. Only `currently` Published Tracks are in the list
-        /// resource.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the Track resources to read are published </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource with the published tracks to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of PublishedTrack </returns>
-        public static ResourceSet<PublishedTrackResource> Read(string pathRoomSid,
-                                                               string pathParticipantSid,
-                                                               int? pageSize = null,
-                                                               long? limit = null,
-                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadPublishedTrackOptions(pathRoomSid, pathParticipantSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of tracks associated with a given Participant. Only `currently` Published Tracks are in the list
-        /// resource.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the Track resources to read are published </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource with the published tracks to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of PublishedTrack </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<PublishedTrackResource>> ReadAsync(string pathRoomSid,
-                                                                                                       string pathParticipantSid,
-                                                                                                       int? pageSize = null,
-                                                                                                       long? limit = null,
-                                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadPublishedTrackOptions(pathRoomSid, pathParticipantSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<PublishedTrackResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<PublishedTrackResource>.FromJson("published_tracks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<PublishedTrackResource> NextPage(Page<PublishedTrackResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<PublishedTrackResource>.FromJson("published_tracks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<PublishedTrackResource> PreviousPage(Page<PublishedTrackResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<PublishedTrackResource>.FromJson("published_tracks", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a PublishedTrackResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> PublishedTrackResource object represented by the provided JSON </returns>
-        public static PublishedTrackResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<PublishedTrackResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Participant resource with the published track
-        /// </summary>
-        [JsonProperty("participant_sid")]
-        public string ParticipantSid { get; private set; }
-        /// <summary>
-        /// The SID of the Room resource where the track is published
-        /// </summary>
-        [JsonProperty("room_sid")]
-        public string RoomSid { get; private set; }
-        /// <summary>
-        /// The track name
-        /// </summary>
-        [JsonProperty("name")]
-        public string Name { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Whether the track is enabled
-        /// </summary>
-        [JsonProperty("enabled")]
-        public bool? Enabled { get; private set; }
-        /// <summary>
-        /// The track type
-        /// </summary>
-        [JsonProperty("kind")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public PublishedTrackResource.KindEnum Kind { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private PublishedTrackResource()
-        {
-
-        }
-    }
+{
+
+  public class PublishedTrackResource : Resource
+  {
+    public sealed class KindEnum : StringEnum
+    {
+      private KindEnum(string value) : base(value) { }
+      public KindEnum() { }
+      public static implicit operator KindEnum(string value)
+      {
+        return new KindEnum(value);
+      }
+
+      public static readonly KindEnum Audio = new KindEnum("audio");
+      public static readonly KindEnum Video = new KindEnum("video");
+      public static readonly KindEnum Data = new KindEnum("data");
+    }
+
+    private static Request BuildFetchRequest(FetchPublishedTrackOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "/PublishedTracks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a single Track resource represented by TrackName or SID.
+    /// </summary>
+    /// <param name="options"> Fetch PublishedTrack parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublishedTrack </returns>
+    public static PublishedTrackResource Fetch(FetchPublishedTrackOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single Track resource represented by TrackName or SID.
+    /// </summary>
+    /// <param name="options"> Fetch PublishedTrack parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublishedTrack </returns>
+    public static async System.Threading.Tasks.Task<PublishedTrackResource> FetchAsync(FetchPublishedTrackOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a single Track resource represented by TrackName or SID.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the Track resource to fetch is published </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource with the published track to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublishedTrack </returns>
+    public static PublishedTrackResource Fetch(string pathRoomSid,
+                                               string pathParticipantSid,
+                                               string pathSid,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchPublishedTrackOptions(pathRoomSid, pathParticipantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single Track resource represented by TrackName or SID.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the Track resource to fetch is published </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource with the published track to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublishedTrack </returns>
+    public static async System.Threading.Tasks.Task<PublishedTrackResource> FetchAsync(string pathRoomSid,
+                                                                                       string pathParticipantSid,
+                                                                                       string pathSid,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchPublishedTrackOptions(pathRoomSid, pathParticipantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadPublishedTrackOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "/PublishedTracks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a list of tracks associated with a given Participant. Only `currently` Published Tracks are in the list
+    /// resource.
+    /// </summary>
+    /// <param name="options"> Read PublishedTrack parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublishedTrack </returns>
+    public static ResourceSet<PublishedTrackResource> Read(ReadPublishedTrackOptions options,
+                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<PublishedTrackResource>.FromJson("published_tracks", response.Content);
+      return new ResourceSet<PublishedTrackResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of tracks associated with a given Participant. Only `currently` Published Tracks are in the list
+    /// resource.
+    /// </summary>
+    /// <param name="options"> Read PublishedTrack parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublishedTrack </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PublishedTrackResource>> ReadAsync(ReadPublishedTrackOptions options,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<PublishedTrackResource>.FromJson("published_tracks", response.Content);
+      return new ResourceSet<PublishedTrackResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a list of tracks associated with a given Participant. Only `currently` Published Tracks are in the list
+    /// resource.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the Track resources to read are published </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource with the published tracks to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of PublishedTrack </returns>
+    public static ResourceSet<PublishedTrackResource> Read(string pathRoomSid,
+                                                           string pathParticipantSid,
+                                                           int? pageSize = null,
+                                                           long? limit = null,
+                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadPublishedTrackOptions(pathRoomSid, pathParticipantSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of tracks associated with a given Participant. Only `currently` Published Tracks are in the list
+    /// resource.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the Track resources to read are published </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource with the published tracks to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of PublishedTrack </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<PublishedTrackResource>> ReadAsync(string pathRoomSid,
+                                                                                                   string pathParticipantSid,
+                                                                                                   int? pageSize = null,
+                                                                                                   long? limit = null,
+                                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadPublishedTrackOptions(pathRoomSid, pathParticipantSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<PublishedTrackResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<PublishedTrackResource>.FromJson("published_tracks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<PublishedTrackResource> NextPage(Page<PublishedTrackResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<PublishedTrackResource>.FromJson("published_tracks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<PublishedTrackResource> PreviousPage(Page<PublishedTrackResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<PublishedTrackResource>.FromJson("published_tracks", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a PublishedTrackResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> PublishedTrackResource object represented by the provided JSON </returns>
+    public static PublishedTrackResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<PublishedTrackResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Participant resource with the published track
+    /// </summary>
+    [JsonProperty("participant_sid")]
+    public string ParticipantSid { get; private set; }
+    /// <summary>
+    /// The SID of the Room resource where the track is published
+    /// </summary>
+    [JsonProperty("room_sid")]
+    public string RoomSid { get; private set; }
+    /// <summary>
+    /// The track name
+    /// </summary>
+    [JsonProperty("name")]
+    public string Name { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Whether the track is enabled
+    /// </summary>
+    [JsonProperty("enabled")]
+    public bool? Enabled { get; private set; }
+    /// <summary>
+    /// The track type
+    /// </summary>
+    [JsonProperty("kind")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public PublishedTrackResource.KindEnum Kind { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private PublishedTrackResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/Room/Participant/SubscribeRulesOptions.cs b/src/Twilio/Rest/Video/V1/Room/Participant/SubscribeRulesOptions.cs
index 82f9a1b97..f6688f42a 100644
--- a/src/Twilio/Rest/Video/V1/Room/Participant/SubscribeRulesOptions.cs
+++ b/src/Twilio/Rest/Video/V1/Room/Participant/SubscribeRulesOptions.cs
@@ -9,85 +9,85 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Video.V1.Room.Participant
-{
-
+{
+
+  /// <summary>
+  /// Returns a list of Subscribe Rules for the Participant.
+  /// </summary>
+  public class FetchSubscribeRulesOptions : IOptions<SubscribeRulesResource>
+  {
     /// <summary>
-    /// Returns a list of Subscribe Rules for the Participant.
+    /// The SID of the Room resource where the subscribe rules to fetch apply
     /// </summary>
-    public class FetchSubscribeRulesOptions : IOptions<SubscribeRulesResource>
-    {
-        /// <summary>
-        /// The SID of the Room resource where the subscribe rules to fetch apply
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// The SID of the Participant resource with the subscribe rules to fetch
-        /// </summary>
-        public string PathParticipantSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSubscribeRulesOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the subscribe rules to fetch apply </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource with the subscribe rules to fetch </param>
-        public FetchSubscribeRulesOptions(string pathRoomSid, string pathParticipantSid)
-        {
-            PathRoomSid = pathRoomSid;
-            PathParticipantSid = pathParticipantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathRoomSid { get; }
     /// <summary>
-    /// Update the Subscribe Rules for the Participant
+    /// The SID of the Participant resource with the subscribe rules to fetch
     /// </summary>
-    public class UpdateSubscribeRulesOptions : IOptions<SubscribeRulesResource>
-    {
-        /// <summary>
-        /// The SID of the Room resource where the subscribe rules to update apply
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// The SID of the Participant resource to update the Subscribe Rules
-        /// </summary>
-        public string PathParticipantSid { get; }
-        /// <summary>
-        /// A JSON-encoded array of subscribe rules
-        /// </summary>
-        public object Rules { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSubscribeRulesOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the subscribe rules to update apply </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource to update the Subscribe Rules </param>
-        public UpdateSubscribeRulesOptions(string pathRoomSid, string pathParticipantSid)
-        {
-            PathRoomSid = pathRoomSid;
-            PathParticipantSid = pathParticipantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Rules != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Rules", Serializers.JsonObject(Rules)));
-            }
-
-            return p;
-        }
-    }
+    public string PathParticipantSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchSubscribeRulesOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the subscribe rules to fetch apply </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource with the subscribe rules to fetch </param>
+    public FetchSubscribeRulesOptions(string pathRoomSid, string pathParticipantSid)
+    {
+      PathRoomSid = pathRoomSid;
+      PathParticipantSid = pathParticipantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update the Subscribe Rules for the Participant
+  /// </summary>
+  public class UpdateSubscribeRulesOptions : IOptions<SubscribeRulesResource>
+  {
+    /// <summary>
+    /// The SID of the Room resource where the subscribe rules to update apply
+    /// </summary>
+    public string PathRoomSid { get; }
+    /// <summary>
+    /// The SID of the Participant resource to update the Subscribe Rules
+    /// </summary>
+    public string PathParticipantSid { get; }
+    /// <summary>
+    /// A JSON-encoded array of subscribe rules
+    /// </summary>
+    public object Rules { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSubscribeRulesOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the subscribe rules to update apply </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource to update the Subscribe Rules </param>
+    public UpdateSubscribeRulesOptions(string pathRoomSid, string pathParticipantSid)
+    {
+      PathRoomSid = pathRoomSid;
+      PathParticipantSid = pathParticipantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Rules != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Rules", Serializers.JsonObject(Rules)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/Room/Participant/SubscribeRulesResource.cs b/src/Twilio/Rest/Video/V1/Room/Participant/SubscribeRulesResource.cs
index c1d0160cc..064257906 100644
--- a/src/Twilio/Rest/Video/V1/Room/Participant/SubscribeRulesResource.cs
+++ b/src/Twilio/Rest/Video/V1/Room/Participant/SubscribeRulesResource.cs
@@ -17,206 +17,206 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Video.V1.Room.Participant
-{
-
-    public class SubscribeRulesResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSubscribeRulesOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "/SubscribeRules",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a list of Subscribe Rules for the Participant.
-        /// </summary>
-        /// <param name="options"> Fetch SubscribeRules parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribeRules </returns>
-        public static SubscribeRulesResource Fetch(FetchSubscribeRulesOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of Subscribe Rules for the Participant.
-        /// </summary>
-        /// <param name="options"> Fetch SubscribeRules parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribeRules </returns>
-        public static async System.Threading.Tasks.Task<SubscribeRulesResource> FetchAsync(FetchSubscribeRulesOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a list of Subscribe Rules for the Participant.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the subscribe rules to fetch apply </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource with the subscribe rules to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribeRules </returns>
-        public static SubscribeRulesResource Fetch(string pathRoomSid,
-                                                   string pathParticipantSid,
-                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchSubscribeRulesOptions(pathRoomSid, pathParticipantSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of Subscribe Rules for the Participant.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the subscribe rules to fetch apply </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource with the subscribe rules to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribeRules </returns>
-        public static async System.Threading.Tasks.Task<SubscribeRulesResource> FetchAsync(string pathRoomSid,
-                                                                                           string pathParticipantSid,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchSubscribeRulesOptions(pathRoomSid, pathParticipantSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSubscribeRulesOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "/SubscribeRules",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update the Subscribe Rules for the Participant
-        /// </summary>
-        /// <param name="options"> Update SubscribeRules parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribeRules </returns>
-        public static SubscribeRulesResource Update(UpdateSubscribeRulesOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the Subscribe Rules for the Participant
-        /// </summary>
-        /// <param name="options"> Update SubscribeRules parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribeRules </returns>
-        public static async System.Threading.Tasks.Task<SubscribeRulesResource> UpdateAsync(UpdateSubscribeRulesOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update the Subscribe Rules for the Participant
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the subscribe rules to update apply </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource to update the Subscribe Rules </param>
-        /// <param name="rules"> A JSON-encoded array of subscribe rules </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribeRules </returns>
-        public static SubscribeRulesResource Update(string pathRoomSid,
-                                                    string pathParticipantSid,
-                                                    object rules = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateSubscribeRulesOptions(pathRoomSid, pathParticipantSid){Rules = rules};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the Subscribe Rules for the Participant
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the subscribe rules to update apply </param>
-        /// <param name="pathParticipantSid"> The SID of the Participant resource to update the Subscribe Rules </param>
-        /// <param name="rules"> A JSON-encoded array of subscribe rules </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribeRules </returns>
-        public static async System.Threading.Tasks.Task<SubscribeRulesResource> UpdateAsync(string pathRoomSid,
-                                                                                            string pathParticipantSid,
-                                                                                            object rules = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateSubscribeRulesOptions(pathRoomSid, pathParticipantSid){Rules = rules};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SubscribeRulesResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SubscribeRulesResource object represented by the provided JSON </returns>
-        public static SubscribeRulesResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SubscribeRulesResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Participant resource for the Subscribe Rules
-        /// </summary>
-        [JsonProperty("participant_sid")]
-        public string ParticipantSid { get; private set; }
-        /// <summary>
-        /// The SID of the Room resource for the Subscribe Rules
-        /// </summary>
-        [JsonProperty("room_sid")]
-        public string RoomSid { get; private set; }
-        /// <summary>
-        /// A collection of Subscribe Rules that describe how to include or exclude matching tracks
-        /// </summary>
-        [JsonProperty("rules")]
-        public List<SubscribeRule> Rules { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private SubscribeRulesResource()
-        {
-
-        }
-    }
+{
+
+  public class SubscribeRulesResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSubscribeRulesOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "/SubscribeRules",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a list of Subscribe Rules for the Participant.
+    /// </summary>
+    /// <param name="options"> Fetch SubscribeRules parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribeRules </returns>
+    public static SubscribeRulesResource Fetch(FetchSubscribeRulesOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of Subscribe Rules for the Participant.
+    /// </summary>
+    /// <param name="options"> Fetch SubscribeRules parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribeRules </returns>
+    public static async System.Threading.Tasks.Task<SubscribeRulesResource> FetchAsync(FetchSubscribeRulesOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a list of Subscribe Rules for the Participant.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the subscribe rules to fetch apply </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource with the subscribe rules to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribeRules </returns>
+    public static SubscribeRulesResource Fetch(string pathRoomSid,
+                                               string pathParticipantSid,
+                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchSubscribeRulesOptions(pathRoomSid, pathParticipantSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of Subscribe Rules for the Participant.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the subscribe rules to fetch apply </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource with the subscribe rules to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribeRules </returns>
+    public static async System.Threading.Tasks.Task<SubscribeRulesResource> FetchAsync(string pathRoomSid,
+                                                                                       string pathParticipantSid,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchSubscribeRulesOptions(pathRoomSid, pathParticipantSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSubscribeRulesOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "/SubscribeRules",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update the Subscribe Rules for the Participant
+    /// </summary>
+    /// <param name="options"> Update SubscribeRules parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribeRules </returns>
+    public static SubscribeRulesResource Update(UpdateSubscribeRulesOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the Subscribe Rules for the Participant
+    /// </summary>
+    /// <param name="options"> Update SubscribeRules parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribeRules </returns>
+    public static async System.Threading.Tasks.Task<SubscribeRulesResource> UpdateAsync(UpdateSubscribeRulesOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update the Subscribe Rules for the Participant
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the subscribe rules to update apply </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource to update the Subscribe Rules </param>
+    /// <param name="rules"> A JSON-encoded array of subscribe rules </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribeRules </returns>
+    public static SubscribeRulesResource Update(string pathRoomSid,
+                                                string pathParticipantSid,
+                                                object rules = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateSubscribeRulesOptions(pathRoomSid, pathParticipantSid) { Rules = rules };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the Subscribe Rules for the Participant
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the subscribe rules to update apply </param>
+    /// <param name="pathParticipantSid"> The SID of the Participant resource to update the Subscribe Rules </param>
+    /// <param name="rules"> A JSON-encoded array of subscribe rules </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribeRules </returns>
+    public static async System.Threading.Tasks.Task<SubscribeRulesResource> UpdateAsync(string pathRoomSid,
+                                                                                        string pathParticipantSid,
+                                                                                        object rules = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateSubscribeRulesOptions(pathRoomSid, pathParticipantSid) { Rules = rules };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SubscribeRulesResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SubscribeRulesResource object represented by the provided JSON </returns>
+    public static SubscribeRulesResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SubscribeRulesResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Participant resource for the Subscribe Rules
+    /// </summary>
+    [JsonProperty("participant_sid")]
+    public string ParticipantSid { get; private set; }
+    /// <summary>
+    /// The SID of the Room resource for the Subscribe Rules
+    /// </summary>
+    [JsonProperty("room_sid")]
+    public string RoomSid { get; private set; }
+    /// <summary>
+    /// A collection of Subscribe Rules that describe how to include or exclude matching tracks
+    /// </summary>
+    [JsonProperty("rules")]
+    public List<SubscribeRule> Rules { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private SubscribeRulesResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/Room/Participant/SubscribedTrackOptions.cs b/src/Twilio/Rest/Video/V1/Room/Participant/SubscribedTrackOptions.cs
index a7e8d9ad7..acdd5704c 100644
--- a/src/Twilio/Rest/Video/V1/Room/Participant/SubscribedTrackOptions.cs
+++ b/src/Twilio/Rest/Video/V1/Room/Participant/SubscribedTrackOptions.cs
@@ -9,88 +9,88 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Video.V1.Room.Participant
-{
-
+{
+
+  /// <summary>
+  /// Returns a single Track resource represented by `track_sid`.  Note: This is one resource with the Video API that
+  /// requires a SID, be Track Name on the subscriber side is not guaranteed to be unique.
+  /// </summary>
+  public class FetchSubscribedTrackOptions : IOptions<SubscribedTrackResource>
+  {
     /// <summary>
-    /// Returns a single Track resource represented by `track_sid`.  Note: This is one resource with the Video API that
-    /// requires a SID, be Track Name on the subscriber side is not guaranteed to be unique.
+    /// The SID of the Room where the Track resource to fetch is subscribed
     /// </summary>
-    public class FetchSubscribedTrackOptions : IOptions<SubscribedTrackResource>
-    {
-        /// <summary>
-        /// The SID of the Room where the Track resource to fetch is subscribed
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// The SID of the participant that subscribes to the Track resource to fetch
-        /// </summary>
-        public string PathParticipantSid { get; }
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSubscribedTrackOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room where the Track resource to fetch is subscribed </param>
-        /// <param name="pathParticipantSid"> The SID of the participant that subscribes to the Track resource to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchSubscribedTrackOptions(string pathRoomSid, string pathParticipantSid, string pathSid)
-        {
-            PathRoomSid = pathRoomSid;
-            PathParticipantSid = pathParticipantSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathRoomSid { get; }
     /// <summary>
-    /// Returns a list of tracks that are subscribed for the participant.
+    /// The SID of the participant that subscribes to the Track resource to fetch
     /// </summary>
-    public class ReadSubscribedTrackOptions : ReadOptions<SubscribedTrackResource>
-    {
-        /// <summary>
-        /// The SID of the Room resource with the Track resources to read
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// The SID of the participant that subscribes to the Track resources to read
-        /// </summary>
-        public string PathParticipantSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadSubscribedTrackOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource with the Track resources to read </param>
-        /// <param name="pathParticipantSid"> The SID of the participant that subscribes to the Track resources to read </param>
-        public ReadSubscribedTrackOptions(string pathRoomSid, string pathParticipantSid)
-        {
-            PathRoomSid = pathRoomSid;
-            PathParticipantSid = pathParticipantSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathParticipantSid { get; }
+    /// <summary>
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchSubscribedTrackOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room where the Track resource to fetch is subscribed </param>
+    /// <param name="pathParticipantSid"> The SID of the participant that subscribes to the Track resource to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchSubscribedTrackOptions(string pathRoomSid, string pathParticipantSid, string pathSid)
+    {
+      PathRoomSid = pathRoomSid;
+      PathParticipantSid = pathParticipantSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Returns a list of tracks that are subscribed for the participant.
+  /// </summary>
+  public class ReadSubscribedTrackOptions : ReadOptions<SubscribedTrackResource>
+  {
+    /// <summary>
+    /// The SID of the Room resource with the Track resources to read
+    /// </summary>
+    public string PathRoomSid { get; }
+    /// <summary>
+    /// The SID of the participant that subscribes to the Track resources to read
+    /// </summary>
+    public string PathParticipantSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadSubscribedTrackOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource with the Track resources to read </param>
+    /// <param name="pathParticipantSid"> The SID of the participant that subscribes to the Track resources to read </param>
+    public ReadSubscribedTrackOptions(string pathRoomSid, string pathParticipantSid)
+    {
+      PathRoomSid = pathRoomSid;
+      PathParticipantSid = pathParticipantSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/Room/Participant/SubscribedTrackResource.cs b/src/Twilio/Rest/Video/V1/Room/Participant/SubscribedTrackResource.cs
index 03e4ca972..0cfc70d13 100644
--- a/src/Twilio/Rest/Video/V1/Room/Participant/SubscribedTrackResource.cs
+++ b/src/Twilio/Rest/Video/V1/Room/Participant/SubscribedTrackResource.cs
@@ -17,317 +17,317 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Video.V1.Room.Participant
-{
-
-    public class SubscribedTrackResource : Resource
-    {
-        public sealed class KindEnum : StringEnum
-        {
-            private KindEnum(string value) : base(value) {}
-            public KindEnum() {}
-            public static implicit operator KindEnum(string value)
-            {
-                return new KindEnum(value);
-            }
-
-            public static readonly KindEnum Audio = new KindEnum("audio");
-            public static readonly KindEnum Video = new KindEnum("video");
-            public static readonly KindEnum Data = new KindEnum("data");
-        }
-
-        private static Request BuildFetchRequest(FetchSubscribedTrackOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "/SubscribedTracks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a single Track resource represented by `track_sid`.  Note: This is one resource with the Video API that
-        /// requires a SID, be Track Name on the subscriber side is not guaranteed to be unique.
-        /// </summary>
-        /// <param name="options"> Fetch SubscribedTrack parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedTrack </returns>
-        public static SubscribedTrackResource Fetch(FetchSubscribedTrackOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single Track resource represented by `track_sid`.  Note: This is one resource with the Video API that
-        /// requires a SID, be Track Name on the subscriber side is not guaranteed to be unique.
-        /// </summary>
-        /// <param name="options"> Fetch SubscribedTrack parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedTrack </returns>
-        public static async System.Threading.Tasks.Task<SubscribedTrackResource> FetchAsync(FetchSubscribedTrackOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a single Track resource represented by `track_sid`.  Note: This is one resource with the Video API that
-        /// requires a SID, be Track Name on the subscriber side is not guaranteed to be unique.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room where the Track resource to fetch is subscribed </param>
-        /// <param name="pathParticipantSid"> The SID of the participant that subscribes to the Track resource to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedTrack </returns>
-        public static SubscribedTrackResource Fetch(string pathRoomSid,
-                                                    string pathParticipantSid,
-                                                    string pathSid,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchSubscribedTrackOptions(pathRoomSid, pathParticipantSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a single Track resource represented by `track_sid`.  Note: This is one resource with the Video API that
-        /// requires a SID, be Track Name on the subscriber side is not guaranteed to be unique.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room where the Track resource to fetch is subscribed </param>
-        /// <param name="pathParticipantSid"> The SID of the participant that subscribes to the Track resource to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedTrack </returns>
-        public static async System.Threading.Tasks.Task<SubscribedTrackResource> FetchAsync(string pathRoomSid,
-                                                                                            string pathParticipantSid,
-                                                                                            string pathSid,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchSubscribedTrackOptions(pathRoomSid, pathParticipantSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSubscribedTrackOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "/SubscribedTracks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a list of tracks that are subscribed for the participant.
-        /// </summary>
-        /// <param name="options"> Read SubscribedTrack parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedTrack </returns>
-        public static ResourceSet<SubscribedTrackResource> Read(ReadSubscribedTrackOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SubscribedTrackResource>.FromJson("subscribed_tracks", response.Content);
-            return new ResourceSet<SubscribedTrackResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of tracks that are subscribed for the participant.
-        /// </summary>
-        /// <param name="options"> Read SubscribedTrack parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedTrack </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SubscribedTrackResource>> ReadAsync(ReadSubscribedTrackOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SubscribedTrackResource>.FromJson("subscribed_tracks", response.Content);
-            return new ResourceSet<SubscribedTrackResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a list of tracks that are subscribed for the participant.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource with the Track resources to read </param>
-        /// <param name="pathParticipantSid"> The SID of the participant that subscribes to the Track resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SubscribedTrack </returns>
-        public static ResourceSet<SubscribedTrackResource> Read(string pathRoomSid,
-                                                                string pathParticipantSid,
-                                                                int? pageSize = null,
-                                                                long? limit = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadSubscribedTrackOptions(pathRoomSid, pathParticipantSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of tracks that are subscribed for the participant.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource with the Track resources to read </param>
-        /// <param name="pathParticipantSid"> The SID of the participant that subscribes to the Track resources to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SubscribedTrack </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SubscribedTrackResource>> ReadAsync(string pathRoomSid,
-                                                                                                        string pathParticipantSid,
-                                                                                                        int? pageSize = null,
-                                                                                                        long? limit = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadSubscribedTrackOptions(pathRoomSid, pathParticipantSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SubscribedTrackResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SubscribedTrackResource>.FromJson("subscribed_tracks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SubscribedTrackResource> NextPage(Page<SubscribedTrackResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<SubscribedTrackResource>.FromJson("subscribed_tracks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SubscribedTrackResource> PreviousPage(Page<SubscribedTrackResource> page,
-                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<SubscribedTrackResource>.FromJson("subscribed_tracks", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a SubscribedTrackResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SubscribedTrackResource object represented by the provided JSON </returns>
-        public static SubscribedTrackResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SubscribedTrackResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the participant that subscribes to the track
-        /// </summary>
-        [JsonProperty("participant_sid")]
-        public string ParticipantSid { get; private set; }
-        /// <summary>
-        /// The SID of the participant that publishes the track
-        /// </summary>
-        [JsonProperty("publisher_sid")]
-        public string PublisherSid { get; private set; }
-        /// <summary>
-        /// The SID of the room where the track is published
-        /// </summary>
-        [JsonProperty("room_sid")]
-        public string RoomSid { get; private set; }
-        /// <summary>
-        /// The track name
-        /// </summary>
-        [JsonProperty("name")]
-        public string Name { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// Whether the track is enabled
-        /// </summary>
-        [JsonProperty("enabled")]
-        public bool? Enabled { get; private set; }
-        /// <summary>
-        /// The track type
-        /// </summary>
-        [JsonProperty("kind")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SubscribedTrackResource.KindEnum Kind { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SubscribedTrackResource()
-        {
-
-        }
-    }
+{
+
+  public class SubscribedTrackResource : Resource
+  {
+    public sealed class KindEnum : StringEnum
+    {
+      private KindEnum(string value) : base(value) { }
+      public KindEnum() { }
+      public static implicit operator KindEnum(string value)
+      {
+        return new KindEnum(value);
+      }
+
+      public static readonly KindEnum Audio = new KindEnum("audio");
+      public static readonly KindEnum Video = new KindEnum("video");
+      public static readonly KindEnum Data = new KindEnum("data");
+    }
+
+    private static Request BuildFetchRequest(FetchSubscribedTrackOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "/SubscribedTracks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a single Track resource represented by `track_sid`.  Note: This is one resource with the Video API that
+    /// requires a SID, be Track Name on the subscriber side is not guaranteed to be unique.
+    /// </summary>
+    /// <param name="options"> Fetch SubscribedTrack parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedTrack </returns>
+    public static SubscribedTrackResource Fetch(FetchSubscribedTrackOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single Track resource represented by `track_sid`.  Note: This is one resource with the Video API that
+    /// requires a SID, be Track Name on the subscriber side is not guaranteed to be unique.
+    /// </summary>
+    /// <param name="options"> Fetch SubscribedTrack parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedTrack </returns>
+    public static async System.Threading.Tasks.Task<SubscribedTrackResource> FetchAsync(FetchSubscribedTrackOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a single Track resource represented by `track_sid`.  Note: This is one resource with the Video API that
+    /// requires a SID, be Track Name on the subscriber side is not guaranteed to be unique.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room where the Track resource to fetch is subscribed </param>
+    /// <param name="pathParticipantSid"> The SID of the participant that subscribes to the Track resource to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedTrack </returns>
+    public static SubscribedTrackResource Fetch(string pathRoomSid,
+                                                string pathParticipantSid,
+                                                string pathSid,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchSubscribedTrackOptions(pathRoomSid, pathParticipantSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a single Track resource represented by `track_sid`.  Note: This is one resource with the Video API that
+    /// requires a SID, be Track Name on the subscriber side is not guaranteed to be unique.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room where the Track resource to fetch is subscribed </param>
+    /// <param name="pathParticipantSid"> The SID of the participant that subscribes to the Track resource to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedTrack </returns>
+    public static async System.Threading.Tasks.Task<SubscribedTrackResource> FetchAsync(string pathRoomSid,
+                                                                                        string pathParticipantSid,
+                                                                                        string pathSid,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchSubscribedTrackOptions(pathRoomSid, pathParticipantSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSubscribedTrackOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathParticipantSid + "/SubscribedTracks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a list of tracks that are subscribed for the participant.
+    /// </summary>
+    /// <param name="options"> Read SubscribedTrack parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedTrack </returns>
+    public static ResourceSet<SubscribedTrackResource> Read(ReadSubscribedTrackOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SubscribedTrackResource>.FromJson("subscribed_tracks", response.Content);
+      return new ResourceSet<SubscribedTrackResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of tracks that are subscribed for the participant.
+    /// </summary>
+    /// <param name="options"> Read SubscribedTrack parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedTrack </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SubscribedTrackResource>> ReadAsync(ReadSubscribedTrackOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SubscribedTrackResource>.FromJson("subscribed_tracks", response.Content);
+      return new ResourceSet<SubscribedTrackResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a list of tracks that are subscribed for the participant.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource with the Track resources to read </param>
+    /// <param name="pathParticipantSid"> The SID of the participant that subscribes to the Track resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SubscribedTrack </returns>
+    public static ResourceSet<SubscribedTrackResource> Read(string pathRoomSid,
+                                                            string pathParticipantSid,
+                                                            int? pageSize = null,
+                                                            long? limit = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadSubscribedTrackOptions(pathRoomSid, pathParticipantSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of tracks that are subscribed for the participant.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource with the Track resources to read </param>
+    /// <param name="pathParticipantSid"> The SID of the participant that subscribes to the Track resources to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SubscribedTrack </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SubscribedTrackResource>> ReadAsync(string pathRoomSid,
+                                                                                                    string pathParticipantSid,
+                                                                                                    int? pageSize = null,
+                                                                                                    long? limit = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadSubscribedTrackOptions(pathRoomSid, pathParticipantSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SubscribedTrackResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SubscribedTrackResource>.FromJson("subscribed_tracks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SubscribedTrackResource> NextPage(Page<SubscribedTrackResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<SubscribedTrackResource>.FromJson("subscribed_tracks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SubscribedTrackResource> PreviousPage(Page<SubscribedTrackResource> page,
+                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<SubscribedTrackResource>.FromJson("subscribed_tracks", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a SubscribedTrackResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SubscribedTrackResource object represented by the provided JSON </returns>
+    public static SubscribedTrackResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SubscribedTrackResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the participant that subscribes to the track
+    /// </summary>
+    [JsonProperty("participant_sid")]
+    public string ParticipantSid { get; private set; }
+    /// <summary>
+    /// The SID of the participant that publishes the track
+    /// </summary>
+    [JsonProperty("publisher_sid")]
+    public string PublisherSid { get; private set; }
+    /// <summary>
+    /// The SID of the room where the track is published
+    /// </summary>
+    [JsonProperty("room_sid")]
+    public string RoomSid { get; private set; }
+    /// <summary>
+    /// The track name
+    /// </summary>
+    [JsonProperty("name")]
+    public string Name { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// Whether the track is enabled
+    /// </summary>
+    [JsonProperty("enabled")]
+    public bool? Enabled { get; private set; }
+    /// <summary>
+    /// The track type
+    /// </summary>
+    [JsonProperty("kind")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public SubscribedTrackResource.KindEnum Kind { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SubscribedTrackResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/Room/ParticipantOptions.cs b/src/Twilio/Rest/Video/V1/Room/ParticipantOptions.cs
index ecd533b41..650917547 100644
--- a/src/Twilio/Rest/Video/V1/Room/ParticipantOptions.cs
+++ b/src/Twilio/Rest/Video/V1/Room/ParticipantOptions.cs
@@ -9,155 +9,155 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Video.V1.Room
-{
-
+{
+
+  /// <summary>
+  /// FetchParticipantOptions
+  /// </summary>
+  public class FetchParticipantOptions : IOptions<ParticipantResource>
+  {
     /// <summary>
-    /// FetchParticipantOptions
-    /// </summary>
-    public class FetchParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the room with the Participant resource to fetch
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchParticipantOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the Participant resource to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchParticipantOptions(string pathRoomSid, string pathSid)
-        {
-            PathRoomSid = pathRoomSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    /// The SID of the room with the Participant resource to fetch
+    /// </summary>
+    public string PathRoomSid { get; }
     /// <summary>
-    /// ReadParticipantOptions
-    /// </summary>
-    public class ReadParticipantOptions : ReadOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the room with the Participant resources to read
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// Read only the participants with this status
-        /// </summary>
-        public ParticipantResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// Read only the Participants with this user identity value
-        /// </summary>
-        public string Identity { get; set; }
-        /// <summary>
-        /// Read only Participants that started after this date in UTC ISO 8601 format
-        /// </summary>
-        public DateTime? DateCreatedAfter { get; set; }
-        /// <summary>
-        /// Read only Participants that started before this date in ISO 8601 format
-        /// </summary>
-        public DateTime? DateCreatedBefore { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadParticipantOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the Participant resources to read </param>
-        public ReadParticipantOptions(string pathRoomSid)
-        {
-            PathRoomSid = pathRoomSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Identity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Identity", Identity));
-            }
-
-            if (DateCreatedAfter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
-            }
-
-            if (DateCreatedBefore != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// The SID that identifies the resource to fetch
+    /// </summary>
+    public string PathSid { get; }
+
     /// <summary>
-    /// UpdateParticipantOptions
-    /// </summary>
-    public class UpdateParticipantOptions : IOptions<ParticipantResource>
-    {
-        /// <summary>
-        /// The SID of the room with the participant to update
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// The SID that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The new status of the resource
-        /// </summary>
-        public ParticipantResource.StatusEnum Status { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateParticipantOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the participant to update </param>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        public UpdateParticipantOptions(string pathRoomSid, string pathSid)
-        {
-            PathRoomSid = pathRoomSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// Construct a new FetchParticipantOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the Participant resource to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchParticipantOptions(string pathRoomSid, string pathSid)
+    {
+      PathRoomSid = pathRoomSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadParticipantOptions
+  /// </summary>
+  public class ReadParticipantOptions : ReadOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the room with the Participant resources to read
+    /// </summary>
+    public string PathRoomSid { get; }
+    /// <summary>
+    /// Read only the participants with this status
+    /// </summary>
+    public ParticipantResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// Read only the Participants with this user identity value
+    /// </summary>
+    public string Identity { get; set; }
+    /// <summary>
+    /// Read only Participants that started after this date in UTC ISO 8601 format
+    /// </summary>
+    public DateTime? DateCreatedAfter { get; set; }
+    /// <summary>
+    /// Read only Participants that started before this date in ISO 8601 format
+    /// </summary>
+    public DateTime? DateCreatedBefore { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadParticipantOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the Participant resources to read </param>
+    public ReadParticipantOptions(string pathRoomSid)
+    {
+      PathRoomSid = pathRoomSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Identity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Identity", Identity));
+      }
+
+      if (DateCreatedAfter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
+      }
+
+      if (DateCreatedBefore != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateParticipantOptions
+  /// </summary>
+  public class UpdateParticipantOptions : IOptions<ParticipantResource>
+  {
+    /// <summary>
+    /// The SID of the room with the participant to update
+    /// </summary>
+    public string PathRoomSid { get; }
+    /// <summary>
+    /// The SID that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The new status of the resource
+    /// </summary>
+    public ParticipantResource.StatusEnum Status { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateParticipantOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the participant to update </param>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    public UpdateParticipantOptions(string pathRoomSid, string pathSid)
+    {
+      PathRoomSid = pathRoomSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/Room/ParticipantResource.cs b/src/Twilio/Rest/Video/V1/Room/ParticipantResource.cs
index 336c015b7..682082016 100644
--- a/src/Twilio/Rest/Video/V1/Room/ParticipantResource.cs
+++ b/src/Twilio/Rest/Video/V1/Room/ParticipantResource.cs
@@ -17,402 +17,402 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Video.V1.Room
-{
-
-    public class ParticipantResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Connected = new StatusEnum("connected");
-            public static readonly StatusEnum Disconnected = new StatusEnum("disconnected");
-        }
-
-        private static Request BuildFetchRequest(FetchParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Fetch(FetchParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(FetchParticipantOptions options,
-                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the Participant resource to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Fetch(string pathRoomSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchParticipantOptions(pathRoomSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the Participant resource to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(string pathRoomSid,
-                                                                                        string pathSid,
-                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new FetchParticipantOptions(pathRoomSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/Participants",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ResourceSet<ParticipantResource> Read(ReadParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantResource>.FromJson("participants", response.Content);
-            return new ResourceSet<ParticipantResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(ReadParticipantOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ParticipantResource>.FromJson("participants", response.Content);
-            return new ResourceSet<ParticipantResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the Participant resources to read </param>
-        /// <param name="status"> Read only the participants with this status </param>
-        /// <param name="identity"> Read only the Participants with this user identity value </param>
-        /// <param name="dateCreatedAfter"> Read only Participants that started after this date in UTC ISO 8601 format </param>
-        /// <param name="dateCreatedBefore"> Read only Participants that started before this date in ISO 8601 format </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ResourceSet<ParticipantResource> Read(string pathRoomSid,
-                                                            ParticipantResource.StatusEnum status = null,
-                                                            string identity = null,
-                                                            DateTime? dateCreatedAfter = null,
-                                                            DateTime? dateCreatedBefore = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantOptions(pathRoomSid){Status = status, Identity = identity, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the Participant resources to read </param>
-        /// <param name="status"> Read only the participants with this status </param>
-        /// <param name="identity"> Read only the Participants with this user identity value </param>
-        /// <param name="dateCreatedAfter"> Read only Participants that started after this date in UTC ISO 8601 format </param>
-        /// <param name="dateCreatedBefore"> Read only Participants that started before this date in ISO 8601 format </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(string pathRoomSid,
-                                                                                                    ParticipantResource.StatusEnum status = null,
-                                                                                                    string identity = null,
-                                                                                                    DateTime? dateCreatedAfter = null,
-                                                                                                    DateTime? dateCreatedBefore = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadParticipantOptions(pathRoomSid){Status = status, Identity = identity, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ParticipantResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ParticipantResource> NextPage(Page<ParticipantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ParticipantResource> PreviousPage(Page<ParticipantResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<ParticipantResource>.FromJson("participants", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateParticipantOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Update(UpdateParticipantOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Participant parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(UpdateParticipantOptions options,
-                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the participant to update </param>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Participant </returns>
-        public static ParticipantResource Update(string pathRoomSid,
-                                                 string pathSid,
-                                                 ParticipantResource.StatusEnum status = null,
-                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateParticipantOptions(pathRoomSid, pathSid){Status = status};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the participant to update </param>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Participant </returns>
-        public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(string pathRoomSid,
-                                                                                         string pathSid,
-                                                                                         ParticipantResource.StatusEnum status = null,
-                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateParticipantOptions(pathRoomSid, pathSid){Status = status};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ParticipantResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ParticipantResource object represented by the provided JSON </returns>
-        public static ParticipantResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ParticipantResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the participant's room
-        /// </summary>
-        [JsonProperty("room_sid")]
-        public string RoomSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The status of the Participant
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public ParticipantResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The string that identifies the resource's User
-        /// </summary>
-        [JsonProperty("identity")]
-        public string Identity { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The time of participant connected to the room in ISO 8601 format
-        /// </summary>
-        [JsonProperty("start_time")]
-        public DateTime? StartTime { get; private set; }
-        /// <summary>
-        /// The time when the participant disconnected from the room in ISO 8601 format
-        /// </summary>
-        [JsonProperty("end_time")]
-        public DateTime? EndTime { get; private set; }
-        /// <summary>
-        /// Duration of time in seconds the participant was connected
-        /// </summary>
-        [JsonProperty("duration")]
-        public int? Duration { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ParticipantResource()
-        {
-
-        }
-    }
+{
+
+  public class ParticipantResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Connected = new StatusEnum("connected");
+      public static readonly StatusEnum Disconnected = new StatusEnum("disconnected");
+    }
+
+    private static Request BuildFetchRequest(FetchParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Fetch(FetchParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(FetchParticipantOptions options,
+                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the Participant resource to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Fetch(string pathRoomSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchParticipantOptions(pathRoomSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the Participant resource to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> FetchAsync(string pathRoomSid,
+                                                                                    string pathSid,
+                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new FetchParticipantOptions(pathRoomSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/Participants",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ResourceSet<ParticipantResource> Read(ReadParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantResource>.FromJson("participants", response.Content);
+      return new ResourceSet<ParticipantResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(ReadParticipantOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ParticipantResource>.FromJson("participants", response.Content);
+      return new ResourceSet<ParticipantResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the Participant resources to read </param>
+    /// <param name="status"> Read only the participants with this status </param>
+    /// <param name="identity"> Read only the Participants with this user identity value </param>
+    /// <param name="dateCreatedAfter"> Read only Participants that started after this date in UTC ISO 8601 format </param>
+    /// <param name="dateCreatedBefore"> Read only Participants that started before this date in ISO 8601 format </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ResourceSet<ParticipantResource> Read(string pathRoomSid,
+                                                        ParticipantResource.StatusEnum status = null,
+                                                        string identity = null,
+                                                        DateTime? dateCreatedAfter = null,
+                                                        DateTime? dateCreatedBefore = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantOptions(pathRoomSid) { Status = status, Identity = identity, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the Participant resources to read </param>
+    /// <param name="status"> Read only the participants with this status </param>
+    /// <param name="identity"> Read only the Participants with this user identity value </param>
+    /// <param name="dateCreatedAfter"> Read only Participants that started after this date in UTC ISO 8601 format </param>
+    /// <param name="dateCreatedBefore"> Read only Participants that started before this date in ISO 8601 format </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ParticipantResource>> ReadAsync(string pathRoomSid,
+                                                                                                ParticipantResource.StatusEnum status = null,
+                                                                                                string identity = null,
+                                                                                                DateTime? dateCreatedAfter = null,
+                                                                                                DateTime? dateCreatedBefore = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadParticipantOptions(pathRoomSid) { Status = status, Identity = identity, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ParticipantResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ParticipantResource> NextPage(Page<ParticipantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ParticipantResource> PreviousPage(Page<ParticipantResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<ParticipantResource>.FromJson("participants", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateParticipantOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/Participants/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Update(UpdateParticipantOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Participant parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(UpdateParticipantOptions options,
+                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the participant to update </param>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Participant </returns>
+    public static ParticipantResource Update(string pathRoomSid,
+                                             string pathSid,
+                                             ParticipantResource.StatusEnum status = null,
+                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateParticipantOptions(pathRoomSid, pathSid) { Status = status };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the participant to update </param>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Participant </returns>
+    public static async System.Threading.Tasks.Task<ParticipantResource> UpdateAsync(string pathRoomSid,
+                                                                                     string pathSid,
+                                                                                     ParticipantResource.StatusEnum status = null,
+                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateParticipantOptions(pathRoomSid, pathSid) { Status = status };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ParticipantResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ParticipantResource object represented by the provided JSON </returns>
+    public static ParticipantResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ParticipantResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the participant's room
+    /// </summary>
+    [JsonProperty("room_sid")]
+    public string RoomSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The status of the Participant
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public ParticipantResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The string that identifies the resource's User
+    /// </summary>
+    [JsonProperty("identity")]
+    public string Identity { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The time of participant connected to the room in ISO 8601 format
+    /// </summary>
+    [JsonProperty("start_time")]
+    public DateTime? StartTime { get; private set; }
+    /// <summary>
+    /// The time when the participant disconnected from the room in ISO 8601 format
+    /// </summary>
+    [JsonProperty("end_time")]
+    public DateTime? EndTime { get; private set; }
+    /// <summary>
+    /// Duration of time in seconds the participant was connected
+    /// </summary>
+    [JsonProperty("duration")]
+    public int? Duration { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ParticipantResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/Room/RecordingRulesOptions.cs b/src/Twilio/Rest/Video/V1/Room/RecordingRulesOptions.cs
index e437de313..6f50da847 100644
--- a/src/Twilio/Rest/Video/V1/Room/RecordingRulesOptions.cs
+++ b/src/Twilio/Rest/Video/V1/Room/RecordingRulesOptions.cs
@@ -9,73 +9,73 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Video.V1.Room
-{
-
+{
+
+  /// <summary>
+  /// Returns a list of Recording Rules for the Room.
+  /// </summary>
+  public class FetchRecordingRulesOptions : IOptions<RecordingRulesResource>
+  {
     /// <summary>
-    /// Returns a list of Recording Rules for the Room.
+    /// The SID of the Room resource where the recording rules to fetch apply
     /// </summary>
-    public class FetchRecordingRulesOptions : IOptions<RecordingRulesResource>
-    {
-        /// <summary>
-        /// The SID of the Room resource where the recording rules to fetch apply
-        /// </summary>
-        public string PathRoomSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRecordingRulesOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the recording rules to fetch apply </param>
-        public FetchRecordingRulesOptions(string pathRoomSid)
-        {
-            PathRoomSid = pathRoomSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathRoomSid { get; }
+
     /// <summary>
-    /// Update the Recording Rules for the Room
+    /// Construct a new FetchRecordingRulesOptions
     /// </summary>
-    public class UpdateRecordingRulesOptions : IOptions<RecordingRulesResource>
-    {
-        /// <summary>
-        /// The SID of the Room resource where the recording rules to update apply
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// A JSON-encoded array of recording rules
-        /// </summary>
-        public object Rules { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateRecordingRulesOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the recording rules to update apply </param>
-        public UpdateRecordingRulesOptions(string pathRoomSid)
-        {
-            PathRoomSid = pathRoomSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Rules != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Rules", Serializers.JsonObject(Rules)));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathRoomSid"> The SID of the Room resource where the recording rules to fetch apply </param>
+    public FetchRecordingRulesOptions(string pathRoomSid)
+    {
+      PathRoomSid = pathRoomSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Update the Recording Rules for the Room
+  /// </summary>
+  public class UpdateRecordingRulesOptions : IOptions<RecordingRulesResource>
+  {
+    /// <summary>
+    /// The SID of the Room resource where the recording rules to update apply
+    /// </summary>
+    public string PathRoomSid { get; }
+    /// <summary>
+    /// A JSON-encoded array of recording rules
+    /// </summary>
+    public object Rules { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateRecordingRulesOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the recording rules to update apply </param>
+    public UpdateRecordingRulesOptions(string pathRoomSid)
+    {
+      PathRoomSid = pathRoomSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Rules != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Rules", Serializers.JsonObject(Rules)));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/Room/RecordingRulesResource.cs b/src/Twilio/Rest/Video/V1/Room/RecordingRulesResource.cs
index c2358e238..d2373f315 100644
--- a/src/Twilio/Rest/Video/V1/Room/RecordingRulesResource.cs
+++ b/src/Twilio/Rest/Video/V1/Room/RecordingRulesResource.cs
@@ -17,190 +17,190 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Video.V1.Room
-{
-
-    public class RecordingRulesResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchRecordingRulesOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/RecordingRules",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Returns a list of Recording Rules for the Room.
-        /// </summary>
-        /// <param name="options"> Fetch RecordingRules parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RecordingRules </returns>
-        public static RecordingRulesResource Fetch(FetchRecordingRulesOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of Recording Rules for the Room.
-        /// </summary>
-        /// <param name="options"> Fetch RecordingRules parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RecordingRules </returns>
-        public static async System.Threading.Tasks.Task<RecordingRulesResource> FetchAsync(FetchRecordingRulesOptions options,
-                                                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Returns a list of Recording Rules for the Room.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the recording rules to fetch apply </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RecordingRules </returns>
-        public static RecordingRulesResource Fetch(string pathRoomSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingRulesOptions(pathRoomSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Returns a list of Recording Rules for the Room.
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the recording rules to fetch apply </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RecordingRules </returns>
-        public static async System.Threading.Tasks.Task<RecordingRulesResource> FetchAsync(string pathRoomSid,
-                                                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchRecordingRulesOptions(pathRoomSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateRecordingRulesOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/RecordingRules",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update the Recording Rules for the Room
-        /// </summary>
-        /// <param name="options"> Update RecordingRules parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RecordingRules </returns>
-        public static RecordingRulesResource Update(UpdateRecordingRulesOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the Recording Rules for the Room
-        /// </summary>
-        /// <param name="options"> Update RecordingRules parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RecordingRules </returns>
-        public static async System.Threading.Tasks.Task<RecordingRulesResource> UpdateAsync(UpdateRecordingRulesOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update the Recording Rules for the Room
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the recording rules to update apply </param>
-        /// <param name="rules"> A JSON-encoded array of recording rules </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RecordingRules </returns>
-        public static RecordingRulesResource Update(string pathRoomSid, object rules = null, ITwilioRestClient client = null)
-        {
-            var options = new UpdateRecordingRulesOptions(pathRoomSid){Rules = rules};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update the Recording Rules for the Room
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource where the recording rules to update apply </param>
-        /// <param name="rules"> A JSON-encoded array of recording rules </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RecordingRules </returns>
-        public static async System.Threading.Tasks.Task<RecordingRulesResource> UpdateAsync(string pathRoomSid,
-                                                                                            object rules = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateRecordingRulesOptions(pathRoomSid){Rules = rules};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RecordingRulesResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RecordingRulesResource object represented by the provided JSON </returns>
-        public static RecordingRulesResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RecordingRulesResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Room resource for the Recording Rules
-        /// </summary>
-        [JsonProperty("room_sid")]
-        public string RoomSid { get; private set; }
-        /// <summary>
-        /// A collection of recording Rules that describe how to include or exclude matching tracks for recording
-        /// </summary>
-        [JsonProperty("rules")]
-        public List<RecordingRule> Rules { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-
-        private RecordingRulesResource()
-        {
-
-        }
-    }
+{
+
+  public class RecordingRulesResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchRecordingRulesOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/RecordingRules",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Returns a list of Recording Rules for the Room.
+    /// </summary>
+    /// <param name="options"> Fetch RecordingRules parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RecordingRules </returns>
+    public static RecordingRulesResource Fetch(FetchRecordingRulesOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of Recording Rules for the Room.
+    /// </summary>
+    /// <param name="options"> Fetch RecordingRules parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RecordingRules </returns>
+    public static async System.Threading.Tasks.Task<RecordingRulesResource> FetchAsync(FetchRecordingRulesOptions options,
+                                                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Returns a list of Recording Rules for the Room.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the recording rules to fetch apply </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RecordingRules </returns>
+    public static RecordingRulesResource Fetch(string pathRoomSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingRulesOptions(pathRoomSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Returns a list of Recording Rules for the Room.
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the recording rules to fetch apply </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RecordingRules </returns>
+    public static async System.Threading.Tasks.Task<RecordingRulesResource> FetchAsync(string pathRoomSid,
+                                                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchRecordingRulesOptions(pathRoomSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateRecordingRulesOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/RecordingRules",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update the Recording Rules for the Room
+    /// </summary>
+    /// <param name="options"> Update RecordingRules parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RecordingRules </returns>
+    public static RecordingRulesResource Update(UpdateRecordingRulesOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the Recording Rules for the Room
+    /// </summary>
+    /// <param name="options"> Update RecordingRules parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RecordingRules </returns>
+    public static async System.Threading.Tasks.Task<RecordingRulesResource> UpdateAsync(UpdateRecordingRulesOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update the Recording Rules for the Room
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the recording rules to update apply </param>
+    /// <param name="rules"> A JSON-encoded array of recording rules </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RecordingRules </returns>
+    public static RecordingRulesResource Update(string pathRoomSid, object rules = null, ITwilioRestClient client = null)
+    {
+      var options = new UpdateRecordingRulesOptions(pathRoomSid) { Rules = rules };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update the Recording Rules for the Room
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource where the recording rules to update apply </param>
+    /// <param name="rules"> A JSON-encoded array of recording rules </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RecordingRules </returns>
+    public static async System.Threading.Tasks.Task<RecordingRulesResource> UpdateAsync(string pathRoomSid,
+                                                                                        object rules = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateRecordingRulesOptions(pathRoomSid) { Rules = rules };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RecordingRulesResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RecordingRulesResource object represented by the provided JSON </returns>
+    public static RecordingRulesResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RecordingRulesResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Room resource for the Recording Rules
+    /// </summary>
+    [JsonProperty("room_sid")]
+    public string RoomSid { get; private set; }
+    /// <summary>
+    /// A collection of recording Rules that describe how to include or exclude matching tracks for recording
+    /// </summary>
+    [JsonProperty("rules")]
+    public List<RecordingRule> Rules { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+
+    private RecordingRulesResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/Room/RoomRecordingOptions.cs b/src/Twilio/Rest/Video/V1/Room/RoomRecordingOptions.cs
index e53d72aa0..37a95259d 100644
--- a/src/Twilio/Rest/Video/V1/Room/RoomRecordingOptions.cs
+++ b/src/Twilio/Rest/Video/V1/Room/RoomRecordingOptions.cs
@@ -9,146 +9,146 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Video.V1.Room
-{
-
+{
+
+  /// <summary>
+  /// FetchRoomRecordingOptions
+  /// </summary>
+  public class FetchRoomRecordingOptions : IOptions<RoomRecordingResource>
+  {
     /// <summary>
-    /// FetchRoomRecordingOptions
+    /// The SID of the Room resource with the recording to fetch
     /// </summary>
-    public class FetchRoomRecordingOptions : IOptions<RoomRecordingResource>
-    {
-        /// <summary>
-        /// The SID of the Room resource with the recording to fetch
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRoomRecordingOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource with the recording to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchRoomRecordingOptions(string pathRoomSid, string pathSid)
-        {
-            PathRoomSid = pathRoomSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathRoomSid { get; }
     /// <summary>
-    /// ReadRoomRecordingOptions
+    /// The SID that identifies the resource to fetch
     /// </summary>
-    public class ReadRoomRecordingOptions : ReadOptions<RoomRecordingResource>
-    {
-        /// <summary>
-        /// The SID of the room with the RoomRecording resources to read
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// Read only the recordings with this status
-        /// </summary>
-        public RoomRecordingResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// Read only the recordings that have this source_sid
-        /// </summary>
-        public string SourceSid { get; set; }
-        /// <summary>
-        /// Read only Recordings that started on or after this ISO 8601 datetime with time zone
-        /// </summary>
-        public DateTime? DateCreatedAfter { get; set; }
-        /// <summary>
-        /// Read only Recordings that started before this ISO 8601 date-time with time zone
-        /// </summary>
-        public DateTime? DateCreatedBefore { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadRoomRecordingOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the RoomRecording resources to read </param>
-        public ReadRoomRecordingOptions(string pathRoomSid)
-        {
-            PathRoomSid = pathRoomSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (SourceSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SourceSid", SourceSid.ToString()));
-            }
-
-            if (DateCreatedAfter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
-            }
-
-            if (DateCreatedBefore != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// DeleteRoomRecordingOptions
+    /// Construct a new FetchRoomRecordingOptions
     /// </summary>
-    public class DeleteRoomRecordingOptions : IOptions<RoomRecordingResource>
-    {
-        /// <summary>
-        /// The SID of the room with the RoomRecording resource to delete
-        /// </summary>
-        public string PathRoomSid { get; }
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRoomRecordingOptions
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the RoomRecording resource to delete </param>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeleteRoomRecordingOptions(string pathRoomSid, string pathSid)
-        {
-            PathRoomSid = pathRoomSid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    /// <param name="pathRoomSid"> The SID of the Room resource with the recording to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchRoomRecordingOptions(string pathRoomSid, string pathSid)
+    {
+      PathRoomSid = pathRoomSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadRoomRecordingOptions
+  /// </summary>
+  public class ReadRoomRecordingOptions : ReadOptions<RoomRecordingResource>
+  {
+    /// <summary>
+    /// The SID of the room with the RoomRecording resources to read
+    /// </summary>
+    public string PathRoomSid { get; }
+    /// <summary>
+    /// Read only the recordings with this status
+    /// </summary>
+    public RoomRecordingResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// Read only the recordings that have this source_sid
+    /// </summary>
+    public string SourceSid { get; set; }
+    /// <summary>
+    /// Read only Recordings that started on or after this ISO 8601 datetime with time zone
+    /// </summary>
+    public DateTime? DateCreatedAfter { get; set; }
+    /// <summary>
+    /// Read only Recordings that started before this ISO 8601 date-time with time zone
+    /// </summary>
+    public DateTime? DateCreatedBefore { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadRoomRecordingOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the RoomRecording resources to read </param>
+    public ReadRoomRecordingOptions(string pathRoomSid)
+    {
+      PathRoomSid = pathRoomSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (SourceSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SourceSid", SourceSid.ToString()));
+      }
+
+      if (DateCreatedAfter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
+      }
+
+      if (DateCreatedBefore != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteRoomRecordingOptions
+  /// </summary>
+  public class DeleteRoomRecordingOptions : IOptions<RoomRecordingResource>
+  {
+    /// <summary>
+    /// The SID of the room with the RoomRecording resource to delete
+    /// </summary>
+    public string PathRoomSid { get; }
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRoomRecordingOptions
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the RoomRecording resource to delete </param>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeleteRoomRecordingOptions(string pathRoomSid, string pathSid)
+    {
+      PathRoomSid = pathRoomSid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/Room/RoomRecordingResource.cs b/src/Twilio/Rest/Video/V1/Room/RoomRecordingResource.cs
index e31e63718..76216f22c 100644
--- a/src/Twilio/Rest/Video/V1/Room/RoomRecordingResource.cs
+++ b/src/Twilio/Rest/Video/V1/Room/RoomRecordingResource.cs
@@ -17,468 +17,468 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Video.V1.Room
-{
-
-    public class RoomRecordingResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Processing = new StatusEnum("processing");
-            public static readonly StatusEnum Completed = new StatusEnum("completed");
-            public static readonly StatusEnum Deleted = new StatusEnum("deleted");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        public sealed class TypeEnum : StringEnum
-        {
-            private TypeEnum(string value) : base(value) {}
-            public TypeEnum() {}
-            public static implicit operator TypeEnum(string value)
-            {
-                return new TypeEnum(value);
-            }
-
-            public static readonly TypeEnum Audio = new TypeEnum("audio");
-            public static readonly TypeEnum Video = new TypeEnum("video");
-            public static readonly TypeEnum Data = new TypeEnum("data");
-        }
-
-        public sealed class FormatEnum : StringEnum
-        {
-            private FormatEnum(string value) : base(value) {}
-            public FormatEnum() {}
-            public static implicit operator FormatEnum(string value)
-            {
-                return new FormatEnum(value);
-            }
-
-            public static readonly FormatEnum Mka = new FormatEnum("mka");
-            public static readonly FormatEnum Mkv = new FormatEnum("mkv");
-        }
-
-        public sealed class CodecEnum : StringEnum
-        {
-            private CodecEnum(string value) : base(value) {}
-            public CodecEnum() {}
-            public static implicit operator CodecEnum(string value)
-            {
-                return new CodecEnum(value);
-            }
-
-            public static readonly CodecEnum Vp8 = new CodecEnum("VP8");
-            public static readonly CodecEnum H264 = new CodecEnum("H264");
-            public static readonly CodecEnum Opus = new CodecEnum("OPUS");
-            public static readonly CodecEnum Pcmu = new CodecEnum("PCMU");
-        }
-
-        private static Request BuildFetchRequest(FetchRoomRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/Recordings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch RoomRecording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RoomRecording </returns>
-        public static RoomRecordingResource Fetch(FetchRoomRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch RoomRecording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RoomRecording </returns>
-        public static async System.Threading.Tasks.Task<RoomRecordingResource> FetchAsync(FetchRoomRecordingOptions options,
-                                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource with the recording to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RoomRecording </returns>
-        public static RoomRecordingResource Fetch(string pathRoomSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRoomRecordingOptions(pathRoomSid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the Room resource with the recording to fetch </param>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RoomRecording </returns>
-        public static async System.Threading.Tasks.Task<RoomRecordingResource> FetchAsync(string pathRoomSid,
-                                                                                          string pathSid,
-                                                                                          ITwilioRestClient client = null)
-        {
-            var options = new FetchRoomRecordingOptions(pathRoomSid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRoomRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/Recordings",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read RoomRecording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RoomRecording </returns>
-        public static ResourceSet<RoomRecordingResource> Read(ReadRoomRecordingOptions options,
-                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RoomRecordingResource>.FromJson("recordings", response.Content);
-            return new ResourceSet<RoomRecordingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read RoomRecording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RoomRecording </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoomRecordingResource>> ReadAsync(ReadRoomRecordingOptions options,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RoomRecordingResource>.FromJson("recordings", response.Content);
-            return new ResourceSet<RoomRecordingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the RoomRecording resources to read </param>
-        /// <param name="status"> Read only the recordings with this status </param>
-        /// <param name="sourceSid"> Read only the recordings that have this source_sid </param>
-        /// <param name="dateCreatedAfter"> Read only Recordings that started on or after this ISO 8601 datetime with time zone
-        ///                        </param>
-        /// <param name="dateCreatedBefore"> Read only Recordings that started before this ISO 8601 date-time with time zone
-        ///                         </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RoomRecording </returns>
-        public static ResourceSet<RoomRecordingResource> Read(string pathRoomSid,
-                                                              RoomRecordingResource.StatusEnum status = null,
-                                                              string sourceSid = null,
-                                                              DateTime? dateCreatedAfter = null,
-                                                              DateTime? dateCreatedBefore = null,
-                                                              int? pageSize = null,
-                                                              long? limit = null,
-                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadRoomRecordingOptions(pathRoomSid){Status = status, SourceSid = sourceSid, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the RoomRecording resources to read </param>
-        /// <param name="status"> Read only the recordings with this status </param>
-        /// <param name="sourceSid"> Read only the recordings that have this source_sid </param>
-        /// <param name="dateCreatedAfter"> Read only Recordings that started on or after this ISO 8601 datetime with time zone
-        ///                        </param>
-        /// <param name="dateCreatedBefore"> Read only Recordings that started before this ISO 8601 date-time with time zone
-        ///                         </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RoomRecording </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoomRecordingResource>> ReadAsync(string pathRoomSid,
-                                                                                                      RoomRecordingResource.StatusEnum status = null,
-                                                                                                      string sourceSid = null,
-                                                                                                      DateTime? dateCreatedAfter = null,
-                                                                                                      DateTime? dateCreatedBefore = null,
-                                                                                                      int? pageSize = null,
-                                                                                                      long? limit = null,
-                                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadRoomRecordingOptions(pathRoomSid){Status = status, SourceSid = sourceSid, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RoomRecordingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RoomRecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RoomRecordingResource> NextPage(Page<RoomRecordingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<RoomRecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RoomRecordingResource> PreviousPage(Page<RoomRecordingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<RoomRecordingResource>.FromJson("recordings", response.Content);
-        }
-
-        private static Request BuildDeleteRequest(DeleteRoomRecordingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathRoomSid + "/Recordings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete RoomRecording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RoomRecording </returns>
-        public static bool Delete(DeleteRoomRecordingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete RoomRecording parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RoomRecording </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoomRecordingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the RoomRecording resource to delete </param>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RoomRecording </returns>
-        public static bool Delete(string pathRoomSid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoomRecordingOptions(pathRoomSid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathRoomSid"> The SID of the room with the RoomRecording resource to delete </param>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RoomRecording </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathRoomSid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteRoomRecordingOptions(pathRoomSid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RoomRecordingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RoomRecordingResource object represented by the provided JSON </returns>
-        public static RoomRecordingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RoomRecordingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The status of the recording
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoomRecordingResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the recording source
-        /// </summary>
-        [JsonProperty("source_sid")]
-        public string SourceSid { get; private set; }
-        /// <summary>
-        /// The size of the recorded track in bytes
-        /// </summary>
-        [JsonProperty("size")]
-        public long? Size { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The recording's media type
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoomRecordingResource.TypeEnum Type { get; private set; }
-        /// <summary>
-        /// The duration of the recording in seconds
-        /// </summary>
-        [JsonProperty("duration")]
-        public int? Duration { get; private set; }
-        /// <summary>
-        /// The file format for the recording
-        /// </summary>
-        [JsonProperty("container_format")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoomRecordingResource.FormatEnum ContainerFormat { get; private set; }
-        /// <summary>
-        /// The codec used for the recording
-        /// </summary>
-        [JsonProperty("codec")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoomRecordingResource.CodecEnum Codec { get; private set; }
-        /// <summary>
-        /// A list of SIDs related to the Recording
-        /// </summary>
-        [JsonProperty("grouping_sids")]
-        public object GroupingSids { get; private set; }
-        /// <summary>
-        /// The name that was given to the source track of the recording
-        /// </summary>
-        [JsonProperty("track_name")]
-        public string TrackName { get; private set; }
-        /// <summary>
-        /// The number of milliseconds between a point in time that is common to all rooms in a group and when the source room of the recording started
-        /// </summary>
-        [JsonProperty("offset")]
-        public long? Offset { get; private set; }
-        /// <summary>
-        /// The SID of the Room resource the recording is associated with
-        /// </summary>
-        [JsonProperty("room_sid")]
-        public string RoomSid { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private RoomRecordingResource()
-        {
-
-        }
-    }
+{
+
+  public class RoomRecordingResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Processing = new StatusEnum("processing");
+      public static readonly StatusEnum Completed = new StatusEnum("completed");
+      public static readonly StatusEnum Deleted = new StatusEnum("deleted");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+      public TypeEnum() { }
+      public static implicit operator TypeEnum(string value)
+      {
+        return new TypeEnum(value);
+      }
+
+      public static readonly TypeEnum Audio = new TypeEnum("audio");
+      public static readonly TypeEnum Video = new TypeEnum("video");
+      public static readonly TypeEnum Data = new TypeEnum("data");
+    }
+
+    public sealed class FormatEnum : StringEnum
+    {
+      private FormatEnum(string value) : base(value) { }
+      public FormatEnum() { }
+      public static implicit operator FormatEnum(string value)
+      {
+        return new FormatEnum(value);
+      }
+
+      public static readonly FormatEnum Mka = new FormatEnum("mka");
+      public static readonly FormatEnum Mkv = new FormatEnum("mkv");
+    }
+
+    public sealed class CodecEnum : StringEnum
+    {
+      private CodecEnum(string value) : base(value) { }
+      public CodecEnum() { }
+      public static implicit operator CodecEnum(string value)
+      {
+        return new CodecEnum(value);
+      }
+
+      public static readonly CodecEnum Vp8 = new CodecEnum("VP8");
+      public static readonly CodecEnum H264 = new CodecEnum("H264");
+      public static readonly CodecEnum Opus = new CodecEnum("OPUS");
+      public static readonly CodecEnum Pcmu = new CodecEnum("PCMU");
+    }
+
+    private static Request BuildFetchRequest(FetchRoomRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/Recordings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch RoomRecording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RoomRecording </returns>
+    public static RoomRecordingResource Fetch(FetchRoomRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch RoomRecording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RoomRecording </returns>
+    public static async System.Threading.Tasks.Task<RoomRecordingResource> FetchAsync(FetchRoomRecordingOptions options,
+                                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource with the recording to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RoomRecording </returns>
+    public static RoomRecordingResource Fetch(string pathRoomSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRoomRecordingOptions(pathRoomSid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the Room resource with the recording to fetch </param>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RoomRecording </returns>
+    public static async System.Threading.Tasks.Task<RoomRecordingResource> FetchAsync(string pathRoomSid,
+                                                                                      string pathSid,
+                                                                                      ITwilioRestClient client = null)
+    {
+      var options = new FetchRoomRecordingOptions(pathRoomSid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRoomRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/Recordings",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read RoomRecording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RoomRecording </returns>
+    public static ResourceSet<RoomRecordingResource> Read(ReadRoomRecordingOptions options,
+                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RoomRecordingResource>.FromJson("recordings", response.Content);
+      return new ResourceSet<RoomRecordingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read RoomRecording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RoomRecording </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoomRecordingResource>> ReadAsync(ReadRoomRecordingOptions options,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RoomRecordingResource>.FromJson("recordings", response.Content);
+      return new ResourceSet<RoomRecordingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the RoomRecording resources to read </param>
+    /// <param name="status"> Read only the recordings with this status </param>
+    /// <param name="sourceSid"> Read only the recordings that have this source_sid </param>
+    /// <param name="dateCreatedAfter"> Read only Recordings that started on or after this ISO 8601 datetime with time zone
+    ///                        </param>
+    /// <param name="dateCreatedBefore"> Read only Recordings that started before this ISO 8601 date-time with time zone
+    ///                         </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RoomRecording </returns>
+    public static ResourceSet<RoomRecordingResource> Read(string pathRoomSid,
+                                                          RoomRecordingResource.StatusEnum status = null,
+                                                          string sourceSid = null,
+                                                          DateTime? dateCreatedAfter = null,
+                                                          DateTime? dateCreatedBefore = null,
+                                                          int? pageSize = null,
+                                                          long? limit = null,
+                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadRoomRecordingOptions(pathRoomSid) { Status = status, SourceSid = sourceSid, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the RoomRecording resources to read </param>
+    /// <param name="status"> Read only the recordings with this status </param>
+    /// <param name="sourceSid"> Read only the recordings that have this source_sid </param>
+    /// <param name="dateCreatedAfter"> Read only Recordings that started on or after this ISO 8601 datetime with time zone
+    ///                        </param>
+    /// <param name="dateCreatedBefore"> Read only Recordings that started before this ISO 8601 date-time with time zone
+    ///                         </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RoomRecording </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoomRecordingResource>> ReadAsync(string pathRoomSid,
+                                                                                                  RoomRecordingResource.StatusEnum status = null,
+                                                                                                  string sourceSid = null,
+                                                                                                  DateTime? dateCreatedAfter = null,
+                                                                                                  DateTime? dateCreatedBefore = null,
+                                                                                                  int? pageSize = null,
+                                                                                                  long? limit = null,
+                                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadRoomRecordingOptions(pathRoomSid) { Status = status, SourceSid = sourceSid, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RoomRecordingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RoomRecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RoomRecordingResource> NextPage(Page<RoomRecordingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<RoomRecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RoomRecordingResource> PreviousPage(Page<RoomRecordingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<RoomRecordingResource>.FromJson("recordings", response.Content);
+    }
+
+    private static Request BuildDeleteRequest(DeleteRoomRecordingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathRoomSid + "/Recordings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete RoomRecording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RoomRecording </returns>
+    public static bool Delete(DeleteRoomRecordingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete RoomRecording parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RoomRecording </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRoomRecordingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the RoomRecording resource to delete </param>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RoomRecording </returns>
+    public static bool Delete(string pathRoomSid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoomRecordingOptions(pathRoomSid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathRoomSid"> The SID of the room with the RoomRecording resource to delete </param>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RoomRecording </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathRoomSid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteRoomRecordingOptions(pathRoomSid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RoomRecordingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RoomRecordingResource object represented by the provided JSON </returns>
+    public static RoomRecordingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RoomRecordingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The status of the recording
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoomRecordingResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the recording source
+    /// </summary>
+    [JsonProperty("source_sid")]
+    public string SourceSid { get; private set; }
+    /// <summary>
+    /// The size of the recorded track in bytes
+    /// </summary>
+    [JsonProperty("size")]
+    public long? Size { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The recording's media type
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoomRecordingResource.TypeEnum Type { get; private set; }
+    /// <summary>
+    /// The duration of the recording in seconds
+    /// </summary>
+    [JsonProperty("duration")]
+    public int? Duration { get; private set; }
+    /// <summary>
+    /// The file format for the recording
+    /// </summary>
+    [JsonProperty("container_format")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoomRecordingResource.FormatEnum ContainerFormat { get; private set; }
+    /// <summary>
+    /// The codec used for the recording
+    /// </summary>
+    [JsonProperty("codec")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoomRecordingResource.CodecEnum Codec { get; private set; }
+    /// <summary>
+    /// A list of SIDs related to the Recording
+    /// </summary>
+    [JsonProperty("grouping_sids")]
+    public object GroupingSids { get; private set; }
+    /// <summary>
+    /// The name that was given to the source track of the recording
+    /// </summary>
+    [JsonProperty("track_name")]
+    public string TrackName { get; private set; }
+    /// <summary>
+    /// The number of milliseconds between a point in time that is common to all rooms in a group and when the source room of the recording started
+    /// </summary>
+    [JsonProperty("offset")]
+    public long? Offset { get; private set; }
+    /// <summary>
+    /// The SID of the Room resource the recording is associated with
+    /// </summary>
+    [JsonProperty("room_sid")]
+    public string RoomSid { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private RoomRecordingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/RoomOptions.cs b/src/Twilio/Rest/Video/V1/RoomOptions.cs
index d381c2ec8..16a32e2c6 100644
--- a/src/Twilio/Rest/Video/V1/RoomOptions.cs
+++ b/src/Twilio/Rest/Video/V1/RoomOptions.cs
@@ -10,282 +10,282 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Video.V1
-{
-
+{
+
+  /// <summary>
+  /// FetchRoomOptions
+  /// </summary>
+  public class FetchRoomOptions : IOptions<RoomResource>
+  {
     /// <summary>
-    /// FetchRoomOptions
+    /// The SID that identifies the resource to fetch
     /// </summary>
-    public class FetchRoomOptions : IOptions<RoomResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRoomOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchRoomOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateRoomOptions
+    /// Construct a new FetchRoomOptions
     /// </summary>
-    public class CreateRoomOptions : IOptions<RoomResource>
-    {
-        /// <summary>
-        /// Enable Twilio's Network Traversal TURN service
-        /// </summary>
-        public bool? EnableTurn { get; set; }
-        /// <summary>
-        /// The type of room
-        /// </summary>
-        public RoomResource.RoomTypeEnum Type { get; set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call status_callback
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// The maximum number of concurrent Participants allowed in the room
-        /// </summary>
-        public int? MaxParticipants { get; set; }
-        /// <summary>
-        /// Whether to start recording when Participants connect
-        /// </summary>
-        public bool? RecordParticipantsOnConnect { get; set; }
-        /// <summary>
-        /// An array of the video codecs that are supported when publishing a track in the room
-        /// </summary>
-        public List<RoomResource.VideoCodecEnum> VideoCodecs { get; set; }
-        /// <summary>
-        /// The region for the media server in Group Rooms
-        /// </summary>
-        public string MediaRegion { get; set; }
-        /// <summary>
-        /// A collection of Recording Rules
-        /// </summary>
-        public object RecordingRules { get; set; }
-        /// <summary>
-        /// Indicates whether the room will only contain audio track participants for group rooms.
-        /// </summary>
-        public bool? AudioOnly { get; set; }
-        /// <summary>
-        /// The maximum number of seconds a Participant can be connected to the room
-        /// </summary>
-        public int? MaxParticipantDuration { get; set; }
-        /// <summary>
-        /// Configures the time a room will remain active after last participant leaves.
-        /// </summary>
-        public int? EmptyRoomTimeout { get; set; }
-        /// <summary>
-        /// Configures the time a room will remain active when no one joins.
-        /// </summary>
-        public int? UnusedRoomTimeout { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateRoomOptions
-        /// </summary>
-        public CreateRoomOptions()
-        {
-            VideoCodecs = new List<RoomResource.VideoCodecEnum>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (EnableTurn != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EnableTurn", EnableTurn.Value.ToString().ToLower()));
-            }
-
-            if (Type != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (StatusCallback != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (MaxParticipants != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MaxParticipants", MaxParticipants.ToString()));
-            }
-
-            if (RecordParticipantsOnConnect != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordParticipantsOnConnect", RecordParticipantsOnConnect.Value.ToString().ToLower()));
-            }
-
-            if (VideoCodecs != null)
-            {
-                p.AddRange(VideoCodecs.Select(prop => new KeyValuePair<string, string>("VideoCodecs", prop.ToString())));
-            }
-
-            if (MediaRegion != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MediaRegion", MediaRegion));
-            }
-
-            if (RecordingRules != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RecordingRules", Serializers.JsonObject(RecordingRules)));
-            }
-
-            if (AudioOnly != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AudioOnly", AudioOnly.Value.ToString().ToLower()));
-            }
-
-            if (MaxParticipantDuration != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MaxParticipantDuration", MaxParticipantDuration.ToString()));
-            }
-
-            if (EmptyRoomTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EmptyRoomTimeout", EmptyRoomTimeout.ToString()));
-            }
-
-            if (UnusedRoomTimeout != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UnusedRoomTimeout", UnusedRoomTimeout.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchRoomOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// ReadRoomOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadRoomOptions : ReadOptions<RoomResource>
-    {
-        /// <summary>
-        /// Read only the rooms with this status
-        /// </summary>
-        public RoomResource.RoomStatusEnum Status { get; set; }
-        /// <summary>
-        /// Read only rooms with this unique_name
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// Read only rooms that started on or after this date, given as YYYY-MM-DD
-        /// </summary>
-        public DateTime? DateCreatedAfter { get; set; }
-        /// <summary>
-        /// Read only rooms that started before this date, given as YYYY-MM-DD
-        /// </summary>
-        public DateTime? DateCreatedBefore { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (DateCreatedAfter != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
-            }
-
-            if (DateCreatedBefore != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateRoomOptions
+  /// </summary>
+  public class CreateRoomOptions : IOptions<RoomResource>
+  {
     /// <summary>
-    /// UpdateRoomOptions
+    /// Enable Twilio's Network Traversal TURN service
     /// </summary>
-    public class UpdateRoomOptions : IOptions<RoomResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The new status of the resource
-        /// </summary>
-        public RoomResource.RoomStatusEnum Status { get; }
-
-        /// <summary>
-        /// Construct a new UpdateRoomOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="status"> The new status of the resource </param>
-        public UpdateRoomOptions(string pathSid, RoomResource.RoomStatusEnum status)
-        {
-            PathSid = pathSid;
-            Status = status;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public bool? EnableTurn { get; set; }
+    /// <summary>
+    /// The type of room
+    /// </summary>
+    public RoomResource.RoomTypeEnum Type { get; set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call status_callback
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// The maximum number of concurrent Participants allowed in the room
+    /// </summary>
+    public int? MaxParticipants { get; set; }
+    /// <summary>
+    /// Whether to start recording when Participants connect
+    /// </summary>
+    public bool? RecordParticipantsOnConnect { get; set; }
+    /// <summary>
+    /// An array of the video codecs that are supported when publishing a track in the room
+    /// </summary>
+    public List<RoomResource.VideoCodecEnum> VideoCodecs { get; set; }
+    /// <summary>
+    /// The region for the media server in Group Rooms
+    /// </summary>
+    public string MediaRegion { get; set; }
+    /// <summary>
+    /// A collection of Recording Rules
+    /// </summary>
+    public object RecordingRules { get; set; }
+    /// <summary>
+    /// Indicates whether the room will only contain audio track participants for group rooms.
+    /// </summary>
+    public bool? AudioOnly { get; set; }
+    /// <summary>
+    /// The maximum number of seconds a Participant can be connected to the room
+    /// </summary>
+    public int? MaxParticipantDuration { get; set; }
+    /// <summary>
+    /// Configures the time a room will remain active after last participant leaves.
+    /// </summary>
+    public int? EmptyRoomTimeout { get; set; }
+    /// <summary>
+    /// Configures the time a room will remain active when no one joins.
+    /// </summary>
+    public int? UnusedRoomTimeout { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateRoomOptions
+    /// </summary>
+    public CreateRoomOptions()
+    {
+      VideoCodecs = new List<RoomResource.VideoCodecEnum>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (EnableTurn != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EnableTurn", EnableTurn.Value.ToString().ToLower()));
+      }
+
+      if (Type != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Type", Type.ToString()));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (StatusCallback != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallback", Serializers.Url(StatusCallback)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (MaxParticipants != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MaxParticipants", MaxParticipants.ToString()));
+      }
+
+      if (RecordParticipantsOnConnect != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordParticipantsOnConnect", RecordParticipantsOnConnect.Value.ToString().ToLower()));
+      }
+
+      if (VideoCodecs != null)
+      {
+        p.AddRange(VideoCodecs.Select(prop => new KeyValuePair<string, string>("VideoCodecs", prop.ToString())));
+      }
+
+      if (MediaRegion != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MediaRegion", MediaRegion));
+      }
+
+      if (RecordingRules != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RecordingRules", Serializers.JsonObject(RecordingRules)));
+      }
+
+      if (AudioOnly != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AudioOnly", AudioOnly.Value.ToString().ToLower()));
+      }
+
+      if (MaxParticipantDuration != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MaxParticipantDuration", MaxParticipantDuration.ToString()));
+      }
+
+      if (EmptyRoomTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EmptyRoomTimeout", EmptyRoomTimeout.ToString()));
+      }
+
+      if (UnusedRoomTimeout != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UnusedRoomTimeout", UnusedRoomTimeout.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadRoomOptions
+  /// </summary>
+  public class ReadRoomOptions : ReadOptions<RoomResource>
+  {
+    /// <summary>
+    /// Read only the rooms with this status
+    /// </summary>
+    public RoomResource.RoomStatusEnum Status { get; set; }
+    /// <summary>
+    /// Read only rooms with this unique_name
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// Read only rooms that started on or after this date, given as YYYY-MM-DD
+    /// </summary>
+    public DateTime? DateCreatedAfter { get; set; }
+    /// <summary>
+    /// Read only rooms that started before this date, given as YYYY-MM-DD
+    /// </summary>
+    public DateTime? DateCreatedBefore { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (DateCreatedAfter != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedAfter", Serializers.DateTimeIso8601(DateCreatedAfter)));
+      }
+
+      if (DateCreatedBefore != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DateCreatedBefore", Serializers.DateTimeIso8601(DateCreatedBefore)));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateRoomOptions
+  /// </summary>
+  public class UpdateRoomOptions : IOptions<RoomResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The new status of the resource
+    /// </summary>
+    public RoomResource.RoomStatusEnum Status { get; }
+
+    /// <summary>
+    /// Construct a new UpdateRoomOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="status"> The new status of the resource </param>
+    public UpdateRoomOptions(string pathSid, RoomResource.RoomStatusEnum status)
+    {
+      PathSid = pathSid;
+      Status = status;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Video/V1/RoomResource.cs b/src/Twilio/Rest/Video/V1/RoomResource.cs
index d9a24eb3a..ba2825175 100644
--- a/src/Twilio/Rest/Video/V1/RoomResource.cs
+++ b/src/Twilio/Rest/Video/V1/RoomResource.cs
@@ -17,606 +17,606 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Video.V1
-{
-
-    public class RoomResource : Resource
-    {
-        public sealed class RoomStatusEnum : StringEnum
-        {
-            private RoomStatusEnum(string value) : base(value) {}
-            public RoomStatusEnum() {}
-            public static implicit operator RoomStatusEnum(string value)
-            {
-                return new RoomStatusEnum(value);
-            }
-
-            public static readonly RoomStatusEnum InProgress = new RoomStatusEnum("in-progress");
-            public static readonly RoomStatusEnum Completed = new RoomStatusEnum("completed");
-            public static readonly RoomStatusEnum Failed = new RoomStatusEnum("failed");
-        }
-
-        public sealed class RoomTypeEnum : StringEnum
-        {
-            private RoomTypeEnum(string value) : base(value) {}
-            public RoomTypeEnum() {}
-            public static implicit operator RoomTypeEnum(string value)
-            {
-                return new RoomTypeEnum(value);
-            }
-
-            public static readonly RoomTypeEnum Go = new RoomTypeEnum("go");
-            public static readonly RoomTypeEnum PeerToPeer = new RoomTypeEnum("peer-to-peer");
-            public static readonly RoomTypeEnum Group = new RoomTypeEnum("group");
-            public static readonly RoomTypeEnum GroupSmall = new RoomTypeEnum("group-small");
-        }
-
-        public sealed class VideoCodecEnum : StringEnum
-        {
-            private VideoCodecEnum(string value) : base(value) {}
-            public VideoCodecEnum() {}
-            public static implicit operator VideoCodecEnum(string value)
-            {
-                return new VideoCodecEnum(value);
-            }
-
-            public static readonly VideoCodecEnum Vp8 = new VideoCodecEnum("VP8");
-            public static readonly VideoCodecEnum H264 = new VideoCodecEnum("H264");
-        }
-
-        private static Request BuildFetchRequest(FetchRoomOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Room parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Room </returns>
-        public static RoomResource Fetch(FetchRoomOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch Room parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Room </returns>
-        public static async System.Threading.Tasks.Task<RoomResource> FetchAsync(FetchRoomOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Room </returns>
-        public static RoomResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRoomOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Room </returns>
-        public static async System.Threading.Tasks.Task<RoomResource> FetchAsync(string pathSid,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new FetchRoomOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateRoomOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Video,
-                "/v1/Rooms",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Room parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Room </returns>
-        public static RoomResource Create(CreateRoomOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create Room parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Room </returns>
-        public static async System.Threading.Tasks.Task<RoomResource> CreateAsync(CreateRoomOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="enableTurn"> Enable Twilio's Network Traversal TURN service </param>
-        /// <param name="type"> The type of room </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="statusCallback"> The URL to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="maxParticipants"> The maximum number of concurrent Participants allowed in the room </param>
-        /// <param name="recordParticipantsOnConnect"> Whether to start recording when Participants connect </param>
-        /// <param name="videoCodecs"> An array of the video codecs that are supported when publishing a track in the room
-        ///                   </param>
-        /// <param name="mediaRegion"> The region for the media server in Group Rooms </param>
-        /// <param name="recordingRules"> A collection of Recording Rules </param>
-        /// <param name="audioOnly"> Indicates whether the room will only contain audio track participants for group rooms.
-        ///                 </param>
-        /// <param name="maxParticipantDuration"> The maximum number of seconds a Participant can be connected to the room
-        ///                              </param>
-        /// <param name="emptyRoomTimeout"> Configures the time a room will remain active after last participant leaves.
-        ///                        </param>
-        /// <param name="unusedRoomTimeout"> Configures the time a room will remain active when no one joins. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Room </returns>
-        public static RoomResource Create(bool? enableTurn = null,
-                                          RoomResource.RoomTypeEnum type = null,
-                                          string uniqueName = null,
-                                          Uri statusCallback = null,
-                                          Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                          int? maxParticipants = null,
-                                          bool? recordParticipantsOnConnect = null,
-                                          List<RoomResource.VideoCodecEnum> videoCodecs = null,
-                                          string mediaRegion = null,
-                                          object recordingRules = null,
-                                          bool? audioOnly = null,
-                                          int? maxParticipantDuration = null,
-                                          int? emptyRoomTimeout = null,
-                                          int? unusedRoomTimeout = null,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new CreateRoomOptions(){EnableTurn = enableTurn, Type = type, UniqueName = uniqueName, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, MaxParticipants = maxParticipants, RecordParticipantsOnConnect = recordParticipantsOnConnect, VideoCodecs = videoCodecs, MediaRegion = mediaRegion, RecordingRules = recordingRules, AudioOnly = audioOnly, MaxParticipantDuration = maxParticipantDuration, EmptyRoomTimeout = emptyRoomTimeout, UnusedRoomTimeout = unusedRoomTimeout};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="enableTurn"> Enable Twilio's Network Traversal TURN service </param>
-        /// <param name="type"> The type of room </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="statusCallback"> The URL to send status information to your application </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
-        /// <param name="maxParticipants"> The maximum number of concurrent Participants allowed in the room </param>
-        /// <param name="recordParticipantsOnConnect"> Whether to start recording when Participants connect </param>
-        /// <param name="videoCodecs"> An array of the video codecs that are supported when publishing a track in the room
-        ///                   </param>
-        /// <param name="mediaRegion"> The region for the media server in Group Rooms </param>
-        /// <param name="recordingRules"> A collection of Recording Rules </param>
-        /// <param name="audioOnly"> Indicates whether the room will only contain audio track participants for group rooms.
-        ///                 </param>
-        /// <param name="maxParticipantDuration"> The maximum number of seconds a Participant can be connected to the room
-        ///                              </param>
-        /// <param name="emptyRoomTimeout"> Configures the time a room will remain active after last participant leaves.
-        ///                        </param>
-        /// <param name="unusedRoomTimeout"> Configures the time a room will remain active when no one joins. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Room </returns>
-        public static async System.Threading.Tasks.Task<RoomResource> CreateAsync(bool? enableTurn = null,
-                                                                                  RoomResource.RoomTypeEnum type = null,
-                                                                                  string uniqueName = null,
-                                                                                  Uri statusCallback = null,
-                                                                                  Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                  int? maxParticipants = null,
-                                                                                  bool? recordParticipantsOnConnect = null,
-                                                                                  List<RoomResource.VideoCodecEnum> videoCodecs = null,
-                                                                                  string mediaRegion = null,
-                                                                                  object recordingRules = null,
-                                                                                  bool? audioOnly = null,
-                                                                                  int? maxParticipantDuration = null,
-                                                                                  int? emptyRoomTimeout = null,
-                                                                                  int? unusedRoomTimeout = null,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new CreateRoomOptions(){EnableTurn = enableTurn, Type = type, UniqueName = uniqueName, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, MaxParticipants = maxParticipants, RecordParticipantsOnConnect = recordParticipantsOnConnect, VideoCodecs = videoCodecs, MediaRegion = mediaRegion, RecordingRules = recordingRules, AudioOnly = audioOnly, MaxParticipantDuration = maxParticipantDuration, EmptyRoomTimeout = emptyRoomTimeout, UnusedRoomTimeout = unusedRoomTimeout};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadRoomOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Video,
-                "/v1/Rooms",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Room parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Room </returns>
-        public static ResourceSet<RoomResource> Read(ReadRoomOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RoomResource>.FromJson("rooms", response.Content);
-            return new ResourceSet<RoomResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read Room parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Room </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoomResource>> ReadAsync(ReadRoomOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RoomResource>.FromJson("rooms", response.Content);
-            return new ResourceSet<RoomResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="status"> Read only the rooms with this status </param>
-        /// <param name="uniqueName"> Read only rooms with this unique_name </param>
-        /// <param name="dateCreatedAfter"> Read only rooms that started on or after this date, given as YYYY-MM-DD </param>
-        /// <param name="dateCreatedBefore"> Read only rooms that started before this date, given as YYYY-MM-DD </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Room </returns>
-        public static ResourceSet<RoomResource> Read(RoomResource.RoomStatusEnum status = null,
-                                                     string uniqueName = null,
-                                                     DateTime? dateCreatedAfter = null,
-                                                     DateTime? dateCreatedBefore = null,
-                                                     int? pageSize = null,
-                                                     long? limit = null,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new ReadRoomOptions(){Status = status, UniqueName = uniqueName, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="status"> Read only the rooms with this status </param>
-        /// <param name="uniqueName"> Read only rooms with this unique_name </param>
-        /// <param name="dateCreatedAfter"> Read only rooms that started on or after this date, given as YYYY-MM-DD </param>
-        /// <param name="dateCreatedBefore"> Read only rooms that started before this date, given as YYYY-MM-DD </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Room </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RoomResource>> ReadAsync(RoomResource.RoomStatusEnum status = null,
-                                                                                             string uniqueName = null,
-                                                                                             DateTime? dateCreatedAfter = null,
-                                                                                             DateTime? dateCreatedBefore = null,
-                                                                                             int? pageSize = null,
-                                                                                             long? limit = null,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new ReadRoomOptions(){Status = status, UniqueName = uniqueName, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RoomResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RoomResource>.FromJson("rooms", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RoomResource> NextPage(Page<RoomResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<RoomResource>.FromJson("rooms", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RoomResource> PreviousPage(Page<RoomResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Video)
-            );
-
-            var response = client.Request(request);
-            return Page<RoomResource>.FromJson("rooms", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateRoomOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Video,
-                "/v1/Rooms/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Room parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Room </returns>
-        public static RoomResource Update(UpdateRoomOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update Room parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Room </returns>
-        public static async System.Threading.Tasks.Task<RoomResource> UpdateAsync(UpdateRoomOptions options,
-                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Room </returns>
-        public static RoomResource Update(string pathSid,
-                                          RoomResource.RoomStatusEnum status,
-                                          ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoomOptions(pathSid, status);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="status"> The new status of the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Room </returns>
-        public static async System.Threading.Tasks.Task<RoomResource> UpdateAsync(string pathSid,
-                                                                                  RoomResource.RoomStatusEnum status,
-                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new UpdateRoomOptions(pathSid, status);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RoomResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RoomResource object represented by the provided JSON </returns>
-        public static RoomResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RoomResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The status of the room
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoomResource.RoomStatusEnum Status { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// Enable Twilio's Network Traversal TURN service
-        /// </summary>
-        [JsonProperty("enable_turn")]
-        public bool? EnableTurn { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The URL to send status information to your application
-        /// </summary>
-        [JsonProperty("status_callback")]
-        public Uri StatusCallback { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call status_callback
-        /// </summary>
-        [JsonProperty("status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// The UTC end time of the room in UTC ISO 8601 format
-        /// </summary>
-        [JsonProperty("end_time")]
-        public DateTime? EndTime { get; private set; }
-        /// <summary>
-        /// The duration of the room in seconds
-        /// </summary>
-        [JsonProperty("duration")]
-        public int? Duration { get; private set; }
-        /// <summary>
-        /// The type of room
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public RoomResource.RoomTypeEnum Type { get; private set; }
-        /// <summary>
-        /// The maximum number of concurrent Participants allowed in the room
-        /// </summary>
-        [JsonProperty("max_participants")]
-        public int? MaxParticipants { get; private set; }
-        /// <summary>
-        /// The maximum number of seconds a Participant can be connected to the room
-        /// </summary>
-        [JsonProperty("max_participant_duration")]
-        public int? MaxParticipantDuration { get; private set; }
-        /// <summary>
-        /// The maximum number of published tracks allowed in the room at the same time
-        /// </summary>
-        [JsonProperty("max_concurrent_published_tracks")]
-        public int? MaxConcurrentPublishedTracks { get; private set; }
-        /// <summary>
-        /// Whether to start recording when Participants connect
-        /// </summary>
-        [JsonProperty("record_participants_on_connect")]
-        public bool? RecordParticipantsOnConnect { get; private set; }
-        /// <summary>
-        /// An array of the video codecs that are supported when publishing a track in the room
-        /// </summary>
-        [JsonProperty("video_codecs")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public List<RoomResource.VideoCodecEnum> VideoCodecs { get; private set; }
-        /// <summary>
-        /// The region for the media server in Group Rooms
-        /// </summary>
-        [JsonProperty("media_region")]
-        public string MediaRegion { get; private set; }
-        /// <summary>
-        /// Indicates whether the room will only contain audio track participants for group rooms.
-        /// </summary>
-        [JsonProperty("audio_only")]
-        public bool? AudioOnly { get; private set; }
-        /// <summary>
-        /// The time a room will remain active after last participant leaves.
-        /// </summary>
-        [JsonProperty("empty_room_timeout")]
-        public int? EmptyRoomTimeout { get; private set; }
-        /// <summary>
-        /// The time a room will remain active when no one joins.
-        /// </summary>
-        [JsonProperty("unused_room_timeout")]
-        public int? UnusedRoomTimeout { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private RoomResource()
-        {
-
-        }
-    }
+{
+
+  public class RoomResource : Resource
+  {
+    public sealed class RoomStatusEnum : StringEnum
+    {
+      private RoomStatusEnum(string value) : base(value) { }
+      public RoomStatusEnum() { }
+      public static implicit operator RoomStatusEnum(string value)
+      {
+        return new RoomStatusEnum(value);
+      }
+
+      public static readonly RoomStatusEnum InProgress = new RoomStatusEnum("in-progress");
+      public static readonly RoomStatusEnum Completed = new RoomStatusEnum("completed");
+      public static readonly RoomStatusEnum Failed = new RoomStatusEnum("failed");
+    }
+
+    public sealed class RoomTypeEnum : StringEnum
+    {
+      private RoomTypeEnum(string value) : base(value) { }
+      public RoomTypeEnum() { }
+      public static implicit operator RoomTypeEnum(string value)
+      {
+        return new RoomTypeEnum(value);
+      }
+
+      public static readonly RoomTypeEnum Go = new RoomTypeEnum("go");
+      public static readonly RoomTypeEnum PeerToPeer = new RoomTypeEnum("peer-to-peer");
+      public static readonly RoomTypeEnum Group = new RoomTypeEnum("group");
+      public static readonly RoomTypeEnum GroupSmall = new RoomTypeEnum("group-small");
+    }
+
+    public sealed class VideoCodecEnum : StringEnum
+    {
+      private VideoCodecEnum(string value) : base(value) { }
+      public VideoCodecEnum() { }
+      public static implicit operator VideoCodecEnum(string value)
+      {
+        return new VideoCodecEnum(value);
+      }
+
+      public static readonly VideoCodecEnum Vp8 = new VideoCodecEnum("VP8");
+      public static readonly VideoCodecEnum H264 = new VideoCodecEnum("H264");
+    }
+
+    private static Request BuildFetchRequest(FetchRoomOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Room parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Room </returns>
+    public static RoomResource Fetch(FetchRoomOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch Room parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Room </returns>
+    public static async System.Threading.Tasks.Task<RoomResource> FetchAsync(FetchRoomOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Room </returns>
+    public static RoomResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRoomOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Room </returns>
+    public static async System.Threading.Tasks.Task<RoomResource> FetchAsync(string pathSid,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new FetchRoomOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateRoomOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Video,
+          "/v1/Rooms",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Room parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Room </returns>
+    public static RoomResource Create(CreateRoomOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create Room parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Room </returns>
+    public static async System.Threading.Tasks.Task<RoomResource> CreateAsync(CreateRoomOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="enableTurn"> Enable Twilio's Network Traversal TURN service </param>
+    /// <param name="type"> The type of room </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="statusCallback"> The URL to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="maxParticipants"> The maximum number of concurrent Participants allowed in the room </param>
+    /// <param name="recordParticipantsOnConnect"> Whether to start recording when Participants connect </param>
+    /// <param name="videoCodecs"> An array of the video codecs that are supported when publishing a track in the room
+    ///                   </param>
+    /// <param name="mediaRegion"> The region for the media server in Group Rooms </param>
+    /// <param name="recordingRules"> A collection of Recording Rules </param>
+    /// <param name="audioOnly"> Indicates whether the room will only contain audio track participants for group rooms.
+    ///                 </param>
+    /// <param name="maxParticipantDuration"> The maximum number of seconds a Participant can be connected to the room
+    ///                              </param>
+    /// <param name="emptyRoomTimeout"> Configures the time a room will remain active after last participant leaves.
+    ///                        </param>
+    /// <param name="unusedRoomTimeout"> Configures the time a room will remain active when no one joins. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Room </returns>
+    public static RoomResource Create(bool? enableTurn = null,
+                                      RoomResource.RoomTypeEnum type = null,
+                                      string uniqueName = null,
+                                      Uri statusCallback = null,
+                                      Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                      int? maxParticipants = null,
+                                      bool? recordParticipantsOnConnect = null,
+                                      List<RoomResource.VideoCodecEnum> videoCodecs = null,
+                                      string mediaRegion = null,
+                                      object recordingRules = null,
+                                      bool? audioOnly = null,
+                                      int? maxParticipantDuration = null,
+                                      int? emptyRoomTimeout = null,
+                                      int? unusedRoomTimeout = null,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new CreateRoomOptions() { EnableTurn = enableTurn, Type = type, UniqueName = uniqueName, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, MaxParticipants = maxParticipants, RecordParticipantsOnConnect = recordParticipantsOnConnect, VideoCodecs = videoCodecs, MediaRegion = mediaRegion, RecordingRules = recordingRules, AudioOnly = audioOnly, MaxParticipantDuration = maxParticipantDuration, EmptyRoomTimeout = emptyRoomTimeout, UnusedRoomTimeout = unusedRoomTimeout };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="enableTurn"> Enable Twilio's Network Traversal TURN service </param>
+    /// <param name="type"> The type of room </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="statusCallback"> The URL to send status information to your application </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback </param>
+    /// <param name="maxParticipants"> The maximum number of concurrent Participants allowed in the room </param>
+    /// <param name="recordParticipantsOnConnect"> Whether to start recording when Participants connect </param>
+    /// <param name="videoCodecs"> An array of the video codecs that are supported when publishing a track in the room
+    ///                   </param>
+    /// <param name="mediaRegion"> The region for the media server in Group Rooms </param>
+    /// <param name="recordingRules"> A collection of Recording Rules </param>
+    /// <param name="audioOnly"> Indicates whether the room will only contain audio track participants for group rooms.
+    ///                 </param>
+    /// <param name="maxParticipantDuration"> The maximum number of seconds a Participant can be connected to the room
+    ///                              </param>
+    /// <param name="emptyRoomTimeout"> Configures the time a room will remain active after last participant leaves.
+    ///                        </param>
+    /// <param name="unusedRoomTimeout"> Configures the time a room will remain active when no one joins. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Room </returns>
+    public static async System.Threading.Tasks.Task<RoomResource> CreateAsync(bool? enableTurn = null,
+                                                                              RoomResource.RoomTypeEnum type = null,
+                                                                              string uniqueName = null,
+                                                                              Uri statusCallback = null,
+                                                                              Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                              int? maxParticipants = null,
+                                                                              bool? recordParticipantsOnConnect = null,
+                                                                              List<RoomResource.VideoCodecEnum> videoCodecs = null,
+                                                                              string mediaRegion = null,
+                                                                              object recordingRules = null,
+                                                                              bool? audioOnly = null,
+                                                                              int? maxParticipantDuration = null,
+                                                                              int? emptyRoomTimeout = null,
+                                                                              int? unusedRoomTimeout = null,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new CreateRoomOptions() { EnableTurn = enableTurn, Type = type, UniqueName = uniqueName, StatusCallback = statusCallback, StatusCallbackMethod = statusCallbackMethod, MaxParticipants = maxParticipants, RecordParticipantsOnConnect = recordParticipantsOnConnect, VideoCodecs = videoCodecs, MediaRegion = mediaRegion, RecordingRules = recordingRules, AudioOnly = audioOnly, MaxParticipantDuration = maxParticipantDuration, EmptyRoomTimeout = emptyRoomTimeout, UnusedRoomTimeout = unusedRoomTimeout };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadRoomOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Video,
+          "/v1/Rooms",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Room parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Room </returns>
+    public static ResourceSet<RoomResource> Read(ReadRoomOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RoomResource>.FromJson("rooms", response.Content);
+      return new ResourceSet<RoomResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read Room parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Room </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoomResource>> ReadAsync(ReadRoomOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RoomResource>.FromJson("rooms", response.Content);
+      return new ResourceSet<RoomResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="status"> Read only the rooms with this status </param>
+    /// <param name="uniqueName"> Read only rooms with this unique_name </param>
+    /// <param name="dateCreatedAfter"> Read only rooms that started on or after this date, given as YYYY-MM-DD </param>
+    /// <param name="dateCreatedBefore"> Read only rooms that started before this date, given as YYYY-MM-DD </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Room </returns>
+    public static ResourceSet<RoomResource> Read(RoomResource.RoomStatusEnum status = null,
+                                                 string uniqueName = null,
+                                                 DateTime? dateCreatedAfter = null,
+                                                 DateTime? dateCreatedBefore = null,
+                                                 int? pageSize = null,
+                                                 long? limit = null,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new ReadRoomOptions() { Status = status, UniqueName = uniqueName, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="status"> Read only the rooms with this status </param>
+    /// <param name="uniqueName"> Read only rooms with this unique_name </param>
+    /// <param name="dateCreatedAfter"> Read only rooms that started on or after this date, given as YYYY-MM-DD </param>
+    /// <param name="dateCreatedBefore"> Read only rooms that started before this date, given as YYYY-MM-DD </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Room </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RoomResource>> ReadAsync(RoomResource.RoomStatusEnum status = null,
+                                                                                         string uniqueName = null,
+                                                                                         DateTime? dateCreatedAfter = null,
+                                                                                         DateTime? dateCreatedBefore = null,
+                                                                                         int? pageSize = null,
+                                                                                         long? limit = null,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new ReadRoomOptions() { Status = status, UniqueName = uniqueName, DateCreatedAfter = dateCreatedAfter, DateCreatedBefore = dateCreatedBefore, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RoomResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RoomResource>.FromJson("rooms", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RoomResource> NextPage(Page<RoomResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<RoomResource>.FromJson("rooms", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RoomResource> PreviousPage(Page<RoomResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Video)
+      );
+
+      var response = client.Request(request);
+      return Page<RoomResource>.FromJson("rooms", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateRoomOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Video,
+          "/v1/Rooms/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Room parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Room </returns>
+    public static RoomResource Update(UpdateRoomOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update Room parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Room </returns>
+    public static async System.Threading.Tasks.Task<RoomResource> UpdateAsync(UpdateRoomOptions options,
+                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Room </returns>
+    public static RoomResource Update(string pathSid,
+                                      RoomResource.RoomStatusEnum status,
+                                      ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoomOptions(pathSid, status);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="status"> The new status of the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Room </returns>
+    public static async System.Threading.Tasks.Task<RoomResource> UpdateAsync(string pathSid,
+                                                                              RoomResource.RoomStatusEnum status,
+                                                                              ITwilioRestClient client = null)
+    {
+      var options = new UpdateRoomOptions(pathSid, status);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RoomResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RoomResource object represented by the provided JSON </returns>
+    public static RoomResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RoomResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The status of the room
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoomResource.RoomStatusEnum Status { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// Enable Twilio's Network Traversal TURN service
+    /// </summary>
+    [JsonProperty("enable_turn")]
+    public bool? EnableTurn { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The URL to send status information to your application
+    /// </summary>
+    [JsonProperty("status_callback")]
+    public Uri StatusCallback { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call status_callback
+    /// </summary>
+    [JsonProperty("status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// The UTC end time of the room in UTC ISO 8601 format
+    /// </summary>
+    [JsonProperty("end_time")]
+    public DateTime? EndTime { get; private set; }
+    /// <summary>
+    /// The duration of the room in seconds
+    /// </summary>
+    [JsonProperty("duration")]
+    public int? Duration { get; private set; }
+    /// <summary>
+    /// The type of room
+    /// </summary>
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RoomResource.RoomTypeEnum Type { get; private set; }
+    /// <summary>
+    /// The maximum number of concurrent Participants allowed in the room
+    /// </summary>
+    [JsonProperty("max_participants")]
+    public int? MaxParticipants { get; private set; }
+    /// <summary>
+    /// The maximum number of seconds a Participant can be connected to the room
+    /// </summary>
+    [JsonProperty("max_participant_duration")]
+    public int? MaxParticipantDuration { get; private set; }
+    /// <summary>
+    /// The maximum number of published tracks allowed in the room at the same time
+    /// </summary>
+    [JsonProperty("max_concurrent_published_tracks")]
+    public int? MaxConcurrentPublishedTracks { get; private set; }
+    /// <summary>
+    /// Whether to start recording when Participants connect
+    /// </summary>
+    [JsonProperty("record_participants_on_connect")]
+    public bool? RecordParticipantsOnConnect { get; private set; }
+    /// <summary>
+    /// An array of the video codecs that are supported when publishing a track in the room
+    /// </summary>
+    [JsonProperty("video_codecs")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public List<RoomResource.VideoCodecEnum> VideoCodecs { get; private set; }
+    /// <summary>
+    /// The region for the media server in Group Rooms
+    /// </summary>
+    [JsonProperty("media_region")]
+    public string MediaRegion { get; private set; }
+    /// <summary>
+    /// Indicates whether the room will only contain audio track participants for group rooms.
+    /// </summary>
+    [JsonProperty("audio_only")]
+    public bool? AudioOnly { get; private set; }
+    /// <summary>
+    /// The time a room will remain active after last participant leaves.
+    /// </summary>
+    [JsonProperty("empty_room_timeout")]
+    public int? EmptyRoomTimeout { get; private set; }
+    /// <summary>
+    /// The time a room will remain active when no one joins.
+    /// </summary>
+    [JsonProperty("unused_room_timeout")]
+    public int? UnusedRoomTimeout { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private RoomResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/ArchivedCallOptions.cs b/src/Twilio/Rest/Voice/V1/ArchivedCallOptions.cs
index 064e64848..ab16fcba9 100644
--- a/src/Twilio/Rest/Voice/V1/ArchivedCallOptions.cs
+++ b/src/Twilio/Rest/Voice/V1/ArchivedCallOptions.cs
@@ -9,43 +9,43 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Voice.V1
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
+  ///
+  /// Delete an archived call record from Bulk Export. Note: this does not also delete the record from the Voice API.
+  /// </summary>
+  public class DeleteArchivedCallOptions : IOptions<ArchivedCallResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains beta products that are subject to change. Use them with caution.
-    ///
-    /// Delete an archived call record from Bulk Export. Note: this does not also delete the record from the Voice API.
+    /// The date of the Call in UTC.
     /// </summary>
-    public class DeleteArchivedCallOptions : IOptions<ArchivedCallResource>
-    {
-        /// <summary>
-        /// The date of the Call in UTC.
-        /// </summary>
-        public DateTime? PathDate { get; }
-        /// <summary>
-        /// The unique string that identifies this resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteArchivedCallOptions
-        /// </summary>
-        /// <param name="pathDate"> The date of the Call in UTC. </param>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        public DeleteArchivedCallOptions(DateTime? pathDate, string pathSid)
-        {
-            PathDate = pathDate;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public DateTime? PathDate { get; }
+    /// <summary>
+    /// The unique string that identifies this resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteArchivedCallOptions
+    /// </summary>
+    /// <param name="pathDate"> The date of the Call in UTC. </param>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    public DeleteArchivedCallOptions(DateTime? pathDate, string pathSid)
+    {
+      PathDate = pathDate;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/ArchivedCallResource.cs b/src/Twilio/Rest/Voice/V1/ArchivedCallResource.cs
index 179809438..7f71a5d02 100644
--- a/src/Twilio/Rest/Voice/V1/ArchivedCallResource.cs
+++ b/src/Twilio/Rest/Voice/V1/ArchivedCallResource.cs
@@ -18,118 +18,118 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Voice.V1
-{
-
-    public class ArchivedCallResource : Resource
-    {
-        private static Request BuildDeleteRequest(DeleteArchivedCallOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Voice,
-                "/v1/Archives/" + (options.PathDate.Value.ToString("yyyy-MM-dd")) + "/Calls/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete an archived call record from Bulk Export. Note: this does not also delete the record from the Voice API.
-        /// </summary>
-        /// <param name="options"> Delete ArchivedCall parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ArchivedCall </returns>
-        public static bool Delete(DeleteArchivedCallOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an archived call record from Bulk Export. Note: this does not also delete the record from the Voice API.
-        /// </summary>
-        /// <param name="options"> Delete ArchivedCall parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ArchivedCall </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteArchivedCallOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete an archived call record from Bulk Export. Note: this does not also delete the record from the Voice API.
-        /// </summary>
-        /// <param name="pathDate"> The date of the Call in UTC. </param>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ArchivedCall </returns>
-        public static bool Delete(DateTime? pathDate, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteArchivedCallOptions(pathDate, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete an archived call record from Bulk Export. Note: this does not also delete the record from the Voice API.
-        /// </summary>
-        /// <param name="pathDate"> The date of the Call in UTC. </param>
-        /// <param name="pathSid"> The unique string that identifies this resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ArchivedCall </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DateTime? pathDate,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteArchivedCallOptions(pathDate, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ArchivedCallResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ArchivedCallResource object represented by the provided JSON </returns>
-        public static ArchivedCallResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ArchivedCallResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// date
-        /// </summary>
-        [JsonProperty("date")]
-        public DateTime? Date { get; private set; }
-        /// <summary>
-        /// sid
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private ArchivedCallResource()
-        {
-
-        }
-    }
+{
+
+  public class ArchivedCallResource : Resource
+  {
+    private static Request BuildDeleteRequest(DeleteArchivedCallOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Voice,
+          "/v1/Archives/" + (options.PathDate.Value.ToString("yyyy-MM-dd")) + "/Calls/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete an archived call record from Bulk Export. Note: this does not also delete the record from the Voice API.
+    /// </summary>
+    /// <param name="options"> Delete ArchivedCall parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ArchivedCall </returns>
+    public static bool Delete(DeleteArchivedCallOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an archived call record from Bulk Export. Note: this does not also delete the record from the Voice API.
+    /// </summary>
+    /// <param name="options"> Delete ArchivedCall parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ArchivedCall </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteArchivedCallOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete an archived call record from Bulk Export. Note: this does not also delete the record from the Voice API.
+    /// </summary>
+    /// <param name="pathDate"> The date of the Call in UTC. </param>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ArchivedCall </returns>
+    public static bool Delete(DateTime? pathDate, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteArchivedCallOptions(pathDate, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete an archived call record from Bulk Export. Note: this does not also delete the record from the Voice API.
+    /// </summary>
+    /// <param name="pathDate"> The date of the Call in UTC. </param>
+    /// <param name="pathSid"> The unique string that identifies this resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ArchivedCall </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DateTime? pathDate,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteArchivedCallOptions(pathDate, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ArchivedCallResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ArchivedCallResource object represented by the provided JSON </returns>
+    public static ArchivedCallResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ArchivedCallResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// date
+    /// </summary>
+    [JsonProperty("date")]
+    public DateTime? Date { get; private set; }
+    /// <summary>
+    /// sid
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private ArchivedCallResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/ByocTrunkOptions.cs b/src/Twilio/Rest/Voice/V1/ByocTrunkOptions.cs
index a7094bf3c..5ac2fffbd 100644
--- a/src/Twilio/Rest/Voice/V1/ByocTrunkOptions.cs
+++ b/src/Twilio/Rest/Voice/V1/ByocTrunkOptions.cs
@@ -9,309 +9,309 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Voice.V1
-{
-
+{
+
+  /// <summary>
+  /// CreateByocTrunkOptions
+  /// </summary>
+  public class CreateByocTrunkOptions : IOptions<ByocTrunkResource>
+  {
     /// <summary>
-    /// CreateByocTrunkOptions
+    /// A string to describe the resource
     /// </summary>
-    public class CreateByocTrunkOptions : IOptions<ByocTrunkResource>
-    {
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The URL we should call when receiving a call
-        /// </summary>
-        public Uri VoiceUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with voice_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when an error occurs in executing TwiML
-        /// </summary>
-        public Uri VoiceFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use with voice_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL that we should call to pass status updates
-        /// </summary>
-        public Uri StatusCallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call `status_callback_url`
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Whether Caller ID Name (CNAM) lookup is enabled for the trunk
-        /// </summary>
-        public bool? CnamLookupEnabled { get; set; }
-        /// <summary>
-        /// Origination Connection Policy (to your Carrier)
-        /// </summary>
-        public string ConnectionPolicySid { get; set; }
-        /// <summary>
-        /// The SID of the SIP Domain that should be used in the `From` header of originating calls
-        /// </summary>
-        public string FromDomainSid { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (VoiceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
-            }
-
-            if (VoiceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
-            }
-
-            if (VoiceFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
-            }
-
-            if (VoiceFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
-            }
-
-            if (StatusCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackUrl", Serializers.Url(StatusCallbackUrl)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (CnamLookupEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CnamLookupEnabled", CnamLookupEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ConnectionPolicySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConnectionPolicySid", ConnectionPolicySid.ToString()));
-            }
-
-            if (FromDomainSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FromDomainSid", FromDomainSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// FetchByocTrunkOptions
+    /// The URL we should call when receiving a call
     /// </summary>
-    public class FetchByocTrunkOptions : IOptions<ByocTrunkResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchByocTrunkOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchByocTrunkOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public Uri VoiceUrl { get; set; }
     /// <summary>
-    /// ReadByocTrunkOptions
+    /// The HTTP method to use with voice_url
     /// </summary>
-    public class ReadByocTrunkOptions : ReadOptions<ByocTrunkResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public Twilio.Http.HttpMethod VoiceMethod { get; set; }
     /// <summary>
-    /// UpdateByocTrunkOptions
+    /// The URL we should call when an error occurs in executing TwiML
     /// </summary>
-    public class UpdateByocTrunkOptions : IOptions<ByocTrunkResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The URL we should call when receiving a call
-        /// </summary>
-        public Uri VoiceUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use with voice_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when an error occurs in executing TwiML
-        /// </summary>
-        public Uri VoiceFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL that we should call to pass status updates
-        /// </summary>
-        public Uri StatusCallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call status_callback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Whether Caller ID Name (CNAM) lookup is enabled for the trunk
-        /// </summary>
-        public bool? CnamLookupEnabled { get; set; }
-        /// <summary>
-        /// Origination Connection Policy (to your Carrier)
-        /// </summary>
-        public string ConnectionPolicySid { get; set; }
-        /// <summary>
-        /// The SID of the SIP Domain that should be used in the `From` header of originating calls
-        /// </summary>
-        public string FromDomainSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateByocTrunkOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateByocTrunkOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (VoiceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
-            }
-
-            if (VoiceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
-            }
-
-            if (VoiceFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
-            }
-
-            if (VoiceFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
-            }
-
-            if (StatusCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackUrl", Serializers.Url(StatusCallbackUrl)));
-            }
-
-            if (StatusCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
-            }
-
-            if (CnamLookupEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CnamLookupEnabled", CnamLookupEnabled.Value.ToString().ToLower()));
-            }
-
-            if (ConnectionPolicySid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ConnectionPolicySid", ConnectionPolicySid.ToString()));
-            }
-
-            if (FromDomainSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FromDomainSid", FromDomainSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public Uri VoiceFallbackUrl { get; set; }
     /// <summary>
-    /// DeleteByocTrunkOptions
+    /// The HTTP method to use with voice_fallback_url
     /// </summary>
-    public class DeleteByocTrunkOptions : IOptions<ByocTrunkResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteByocTrunkOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteByocTrunkOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL that we should call to pass status updates
+    /// </summary>
+    public Uri StatusCallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call `status_callback_url`
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Whether Caller ID Name (CNAM) lookup is enabled for the trunk
+    /// </summary>
+    public bool? CnamLookupEnabled { get; set; }
+    /// <summary>
+    /// Origination Connection Policy (to your Carrier)
+    /// </summary>
+    public string ConnectionPolicySid { get; set; }
+    /// <summary>
+    /// The SID of the SIP Domain that should be used in the `From` header of originating calls
+    /// </summary>
+    public string FromDomainSid { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (VoiceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
+      }
+
+      if (VoiceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
+      }
+
+      if (VoiceFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
+      }
+
+      if (VoiceFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
+      }
+
+      if (StatusCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackUrl", Serializers.Url(StatusCallbackUrl)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (CnamLookupEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CnamLookupEnabled", CnamLookupEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ConnectionPolicySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConnectionPolicySid", ConnectionPolicySid.ToString()));
+      }
+
+      if (FromDomainSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FromDomainSid", FromDomainSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchByocTrunkOptions
+  /// </summary>
+  public class FetchByocTrunkOptions : IOptions<ByocTrunkResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchByocTrunkOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchByocTrunkOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadByocTrunkOptions
+  /// </summary>
+  public class ReadByocTrunkOptions : ReadOptions<ByocTrunkResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateByocTrunkOptions
+  /// </summary>
+  public class UpdateByocTrunkOptions : IOptions<ByocTrunkResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The URL we should call when receiving a call
+    /// </summary>
+    public Uri VoiceUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use with voice_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when an error occurs in executing TwiML
+    /// </summary>
+    public Uri VoiceFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL that we should call to pass status updates
+    /// </summary>
+    public Uri StatusCallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call status_callback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Whether Caller ID Name (CNAM) lookup is enabled for the trunk
+    /// </summary>
+    public bool? CnamLookupEnabled { get; set; }
+    /// <summary>
+    /// Origination Connection Policy (to your Carrier)
+    /// </summary>
+    public string ConnectionPolicySid { get; set; }
+    /// <summary>
+    /// The SID of the SIP Domain that should be used in the `From` header of originating calls
+    /// </summary>
+    public string FromDomainSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateByocTrunkOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateByocTrunkOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (VoiceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
+      }
+
+      if (VoiceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
+      }
+
+      if (VoiceFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
+      }
+
+      if (VoiceFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
+      }
+
+      if (StatusCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackUrl", Serializers.Url(StatusCallbackUrl)));
+      }
+
+      if (StatusCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("StatusCallbackMethod", StatusCallbackMethod.ToString()));
+      }
+
+      if (CnamLookupEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CnamLookupEnabled", CnamLookupEnabled.Value.ToString().ToLower()));
+      }
+
+      if (ConnectionPolicySid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ConnectionPolicySid", ConnectionPolicySid.ToString()));
+      }
+
+      if (FromDomainSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FromDomainSid", FromDomainSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteByocTrunkOptions
+  /// </summary>
+  public class DeleteByocTrunkOptions : IOptions<ByocTrunkResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteByocTrunkOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteByocTrunkOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/ByocTrunkResource.cs b/src/Twilio/Rest/Voice/V1/ByocTrunkResource.cs
index 51ceb6946..07cb6aa0d 100644
--- a/src/Twilio/Rest/Voice/V1/ByocTrunkResource.cs
+++ b/src/Twilio/Rest/Voice/V1/ByocTrunkResource.cs
@@ -16,589 +16,589 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Voice.V1
-{
-
-    public class ByocTrunkResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateByocTrunkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Voice,
-                "/v1/ByocTrunks",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ByocTrunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ByocTrunk </returns>
-        public static ByocTrunkResource Create(CreateByocTrunkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ByocTrunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
-        public static async System.Threading.Tasks.Task<ByocTrunkResource> CreateAsync(CreateByocTrunkOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
-        /// <param name="voiceMethod"> The HTTP method to use with voice_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
-        /// <param name="statusCallbackUrl"> The URL that we should call to pass status updates </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call `status_callback_url` </param>
-        /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup is enabled for the trunk </param>
-        /// <param name="connectionPolicySid"> Origination Connection Policy (to your Carrier) </param>
-        /// <param name="fromDomainSid"> The SID of the SIP Domain that should be used in the `From` header of originating
-        ///                     calls </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ByocTrunk </returns>
-        public static ByocTrunkResource Create(string friendlyName = null,
-                                               Uri voiceUrl = null,
-                                               Twilio.Http.HttpMethod voiceMethod = null,
-                                               Uri voiceFallbackUrl = null,
-                                               Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                               Uri statusCallbackUrl = null,
-                                               Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                               bool? cnamLookupEnabled = null,
-                                               string connectionPolicySid = null,
-                                               string fromDomainSid = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateByocTrunkOptions(){FriendlyName = friendlyName, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallbackUrl = statusCallbackUrl, StatusCallbackMethod = statusCallbackMethod, CnamLookupEnabled = cnamLookupEnabled, ConnectionPolicySid = connectionPolicySid, FromDomainSid = fromDomainSid};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
-        /// <param name="voiceMethod"> The HTTP method to use with voice_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
-        /// <param name="statusCallbackUrl"> The URL that we should call to pass status updates </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call `status_callback_url` </param>
-        /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup is enabled for the trunk </param>
-        /// <param name="connectionPolicySid"> Origination Connection Policy (to your Carrier) </param>
-        /// <param name="fromDomainSid"> The SID of the SIP Domain that should be used in the `From` header of originating
-        ///                     calls </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
-        public static async System.Threading.Tasks.Task<ByocTrunkResource> CreateAsync(string friendlyName = null,
-                                                                                       Uri voiceUrl = null,
-                                                                                       Twilio.Http.HttpMethod voiceMethod = null,
-                                                                                       Uri voiceFallbackUrl = null,
-                                                                                       Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                                                       Uri statusCallbackUrl = null,
-                                                                                       Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                       bool? cnamLookupEnabled = null,
-                                                                                       string connectionPolicySid = null,
-                                                                                       string fromDomainSid = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new CreateByocTrunkOptions(){FriendlyName = friendlyName, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallbackUrl = statusCallbackUrl, StatusCallbackMethod = statusCallbackMethod, CnamLookupEnabled = cnamLookupEnabled, ConnectionPolicySid = connectionPolicySid, FromDomainSid = fromDomainSid};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchByocTrunkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/ByocTrunks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch ByocTrunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ByocTrunk </returns>
-        public static ByocTrunkResource Fetch(FetchByocTrunkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch ByocTrunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
-        public static async System.Threading.Tasks.Task<ByocTrunkResource> FetchAsync(FetchByocTrunkOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ByocTrunk </returns>
-        public static ByocTrunkResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchByocTrunkOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
-        public static async System.Threading.Tasks.Task<ByocTrunkResource> FetchAsync(string pathSid,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new FetchByocTrunkOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadByocTrunkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/ByocTrunks",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ByocTrunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ByocTrunk </returns>
-        public static ResourceSet<ByocTrunkResource> Read(ReadByocTrunkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ByocTrunkResource>.FromJson("byoc_trunks", response.Content);
-            return new ResourceSet<ByocTrunkResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ByocTrunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ByocTrunkResource>> ReadAsync(ReadByocTrunkOptions options,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ByocTrunkResource>.FromJson("byoc_trunks", response.Content);
-            return new ResourceSet<ByocTrunkResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ByocTrunk </returns>
-        public static ResourceSet<ByocTrunkResource> Read(int? pageSize = null,
-                                                          long? limit = null,
-                                                          ITwilioRestClient client = null)
-        {
-            var options = new ReadByocTrunkOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ByocTrunkResource>> ReadAsync(int? pageSize = null,
-                                                                                                  long? limit = null,
-                                                                                                  ITwilioRestClient client = null)
-        {
-            var options = new ReadByocTrunkOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ByocTrunkResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ByocTrunkResource>.FromJson("byoc_trunks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ByocTrunkResource> NextPage(Page<ByocTrunkResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<ByocTrunkResource>.FromJson("byoc_trunks", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ByocTrunkResource> PreviousPage(Page<ByocTrunkResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<ByocTrunkResource>.FromJson("byoc_trunks", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateByocTrunkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Voice,
-                "/v1/ByocTrunks/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update ByocTrunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ByocTrunk </returns>
-        public static ByocTrunkResource Update(UpdateByocTrunkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update ByocTrunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
-        public static async System.Threading.Tasks.Task<ByocTrunkResource> UpdateAsync(UpdateByocTrunkOptions options,
-                                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
-        /// <param name="voiceMethod"> The HTTP method we should use with voice_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
-        /// <param name="statusCallbackUrl"> The URL that we should call to pass status updates </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback_url </param>
-        /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup is enabled for the trunk </param>
-        /// <param name="connectionPolicySid"> Origination Connection Policy (to your Carrier) </param>
-        /// <param name="fromDomainSid"> The SID of the SIP Domain that should be used in the `From` header of originating
-        ///                     calls </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ByocTrunk </returns>
-        public static ByocTrunkResource Update(string pathSid,
-                                               string friendlyName = null,
-                                               Uri voiceUrl = null,
-                                               Twilio.Http.HttpMethod voiceMethod = null,
-                                               Uri voiceFallbackUrl = null,
-                                               Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                               Uri statusCallbackUrl = null,
-                                               Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                               bool? cnamLookupEnabled = null,
-                                               string connectionPolicySid = null,
-                                               string fromDomainSid = null,
-                                               ITwilioRestClient client = null)
-        {
-            var options = new UpdateByocTrunkOptions(pathSid){FriendlyName = friendlyName, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallbackUrl = statusCallbackUrl, StatusCallbackMethod = statusCallbackMethod, CnamLookupEnabled = cnamLookupEnabled, ConnectionPolicySid = connectionPolicySid, FromDomainSid = fromDomainSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
-        /// <param name="voiceMethod"> The HTTP method we should use with voice_url </param>
-        /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
-        /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
-        /// <param name="statusCallbackUrl"> The URL that we should call to pass status updates </param>
-        /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback_url </param>
-        /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup is enabled for the trunk </param>
-        /// <param name="connectionPolicySid"> Origination Connection Policy (to your Carrier) </param>
-        /// <param name="fromDomainSid"> The SID of the SIP Domain that should be used in the `From` header of originating
-        ///                     calls </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
-        public static async System.Threading.Tasks.Task<ByocTrunkResource> UpdateAsync(string pathSid,
-                                                                                       string friendlyName = null,
-                                                                                       Uri voiceUrl = null,
-                                                                                       Twilio.Http.HttpMethod voiceMethod = null,
-                                                                                       Uri voiceFallbackUrl = null,
-                                                                                       Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                                                       Uri statusCallbackUrl = null,
-                                                                                       Twilio.Http.HttpMethod statusCallbackMethod = null,
-                                                                                       bool? cnamLookupEnabled = null,
-                                                                                       string connectionPolicySid = null,
-                                                                                       string fromDomainSid = null,
-                                                                                       ITwilioRestClient client = null)
-        {
-            var options = new UpdateByocTrunkOptions(pathSid){FriendlyName = friendlyName, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallbackUrl = statusCallbackUrl, StatusCallbackMethod = statusCallbackMethod, CnamLookupEnabled = cnamLookupEnabled, ConnectionPolicySid = connectionPolicySid, FromDomainSid = fromDomainSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteByocTrunkOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Voice,
-                "/v1/ByocTrunks/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete ByocTrunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ByocTrunk </returns>
-        public static bool Delete(DeleteByocTrunkOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete ByocTrunk parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteByocTrunkOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ByocTrunk </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteByocTrunkOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteByocTrunkOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ByocTrunkResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ByocTrunkResource object represented by the provided JSON </returns>
-        public static ByocTrunkResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ByocTrunkResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The URL we call when receiving a call
-        /// </summary>
-        [JsonProperty("voice_url")]
-        public Uri VoiceUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method to use with voice_url
-        /// </summary>
-        [JsonProperty("voice_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
-        /// <summary>
-        /// The URL we call when an error occurs while executing TwiML
-        /// </summary>
-        [JsonProperty("voice_fallback_url")]
-        public Uri VoiceFallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method used with voice_fallback_url
-        /// </summary>
-        [JsonProperty("voice_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
-        /// <summary>
-        /// The URL that we call with status updates
-        /// </summary>
-        [JsonProperty("status_callback_url")]
-        public Uri StatusCallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call status_callback_url
-        /// </summary>
-        [JsonProperty("status_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
-        /// <summary>
-        /// Whether Caller ID Name (CNAM) lookup is enabled for the trunk
-        /// </summary>
-        [JsonProperty("cnam_lookup_enabled")]
-        public bool? CnamLookupEnabled { get; private set; }
-        /// <summary>
-        /// Origination Connection Policy (to your Carrier)
-        /// </summary>
-        [JsonProperty("connection_policy_sid")]
-        public string ConnectionPolicySid { get; private set; }
-        /// <summary>
-        /// The SID of the SIP Domain that should be used in the `From` header of originating calls
-        /// </summary>
-        [JsonProperty("from_domain_sid")]
-        public string FromDomainSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private ByocTrunkResource()
-        {
-
-        }
-    }
+{
+
+  public class ByocTrunkResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateByocTrunkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Voice,
+          "/v1/ByocTrunks",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ByocTrunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ByocTrunk </returns>
+    public static ByocTrunkResource Create(CreateByocTrunkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ByocTrunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
+    public static async System.Threading.Tasks.Task<ByocTrunkResource> CreateAsync(CreateByocTrunkOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
+    /// <param name="voiceMethod"> The HTTP method to use with voice_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
+    /// <param name="statusCallbackUrl"> The URL that we should call to pass status updates </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call `status_callback_url` </param>
+    /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup is enabled for the trunk </param>
+    /// <param name="connectionPolicySid"> Origination Connection Policy (to your Carrier) </param>
+    /// <param name="fromDomainSid"> The SID of the SIP Domain that should be used in the `From` header of originating
+    ///                     calls </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ByocTrunk </returns>
+    public static ByocTrunkResource Create(string friendlyName = null,
+                                           Uri voiceUrl = null,
+                                           Twilio.Http.HttpMethod voiceMethod = null,
+                                           Uri voiceFallbackUrl = null,
+                                           Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                           Uri statusCallbackUrl = null,
+                                           Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                           bool? cnamLookupEnabled = null,
+                                           string connectionPolicySid = null,
+                                           string fromDomainSid = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateByocTrunkOptions() { FriendlyName = friendlyName, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallbackUrl = statusCallbackUrl, StatusCallbackMethod = statusCallbackMethod, CnamLookupEnabled = cnamLookupEnabled, ConnectionPolicySid = connectionPolicySid, FromDomainSid = fromDomainSid };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
+    /// <param name="voiceMethod"> The HTTP method to use with voice_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method to use with voice_fallback_url </param>
+    /// <param name="statusCallbackUrl"> The URL that we should call to pass status updates </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call `status_callback_url` </param>
+    /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup is enabled for the trunk </param>
+    /// <param name="connectionPolicySid"> Origination Connection Policy (to your Carrier) </param>
+    /// <param name="fromDomainSid"> The SID of the SIP Domain that should be used in the `From` header of originating
+    ///                     calls </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
+    public static async System.Threading.Tasks.Task<ByocTrunkResource> CreateAsync(string friendlyName = null,
+                                                                                   Uri voiceUrl = null,
+                                                                                   Twilio.Http.HttpMethod voiceMethod = null,
+                                                                                   Uri voiceFallbackUrl = null,
+                                                                                   Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                                                   Uri statusCallbackUrl = null,
+                                                                                   Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                   bool? cnamLookupEnabled = null,
+                                                                                   string connectionPolicySid = null,
+                                                                                   string fromDomainSid = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new CreateByocTrunkOptions() { FriendlyName = friendlyName, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallbackUrl = statusCallbackUrl, StatusCallbackMethod = statusCallbackMethod, CnamLookupEnabled = cnamLookupEnabled, ConnectionPolicySid = connectionPolicySid, FromDomainSid = fromDomainSid };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchByocTrunkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/ByocTrunks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch ByocTrunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ByocTrunk </returns>
+    public static ByocTrunkResource Fetch(FetchByocTrunkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch ByocTrunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
+    public static async System.Threading.Tasks.Task<ByocTrunkResource> FetchAsync(FetchByocTrunkOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ByocTrunk </returns>
+    public static ByocTrunkResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchByocTrunkOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
+    public static async System.Threading.Tasks.Task<ByocTrunkResource> FetchAsync(string pathSid,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new FetchByocTrunkOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadByocTrunkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/ByocTrunks",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ByocTrunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ByocTrunk </returns>
+    public static ResourceSet<ByocTrunkResource> Read(ReadByocTrunkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ByocTrunkResource>.FromJson("byoc_trunks", response.Content);
+      return new ResourceSet<ByocTrunkResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ByocTrunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ByocTrunkResource>> ReadAsync(ReadByocTrunkOptions options,
+                                                                                              ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ByocTrunkResource>.FromJson("byoc_trunks", response.Content);
+      return new ResourceSet<ByocTrunkResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ByocTrunk </returns>
+    public static ResourceSet<ByocTrunkResource> Read(int? pageSize = null,
+                                                      long? limit = null,
+                                                      ITwilioRestClient client = null)
+    {
+      var options = new ReadByocTrunkOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ByocTrunkResource>> ReadAsync(int? pageSize = null,
+                                                                                              long? limit = null,
+                                                                                              ITwilioRestClient client = null)
+    {
+      var options = new ReadByocTrunkOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ByocTrunkResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ByocTrunkResource>.FromJson("byoc_trunks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ByocTrunkResource> NextPage(Page<ByocTrunkResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<ByocTrunkResource>.FromJson("byoc_trunks", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ByocTrunkResource> PreviousPage(Page<ByocTrunkResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<ByocTrunkResource>.FromJson("byoc_trunks", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateByocTrunkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Voice,
+          "/v1/ByocTrunks/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update ByocTrunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ByocTrunk </returns>
+    public static ByocTrunkResource Update(UpdateByocTrunkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update ByocTrunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
+    public static async System.Threading.Tasks.Task<ByocTrunkResource> UpdateAsync(UpdateByocTrunkOptions options,
+                                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
+    /// <param name="voiceMethod"> The HTTP method we should use with voice_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
+    /// <param name="statusCallbackUrl"> The URL that we should call to pass status updates </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback_url </param>
+    /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup is enabled for the trunk </param>
+    /// <param name="connectionPolicySid"> Origination Connection Policy (to your Carrier) </param>
+    /// <param name="fromDomainSid"> The SID of the SIP Domain that should be used in the `From` header of originating
+    ///                     calls </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ByocTrunk </returns>
+    public static ByocTrunkResource Update(string pathSid,
+                                           string friendlyName = null,
+                                           Uri voiceUrl = null,
+                                           Twilio.Http.HttpMethod voiceMethod = null,
+                                           Uri voiceFallbackUrl = null,
+                                           Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                           Uri statusCallbackUrl = null,
+                                           Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                           bool? cnamLookupEnabled = null,
+                                           string connectionPolicySid = null,
+                                           string fromDomainSid = null,
+                                           ITwilioRestClient client = null)
+    {
+      var options = new UpdateByocTrunkOptions(pathSid) { FriendlyName = friendlyName, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallbackUrl = statusCallbackUrl, StatusCallbackMethod = statusCallbackMethod, CnamLookupEnabled = cnamLookupEnabled, ConnectionPolicySid = connectionPolicySid, FromDomainSid = fromDomainSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="voiceUrl"> The URL we should call when receiving a call </param>
+    /// <param name="voiceMethod"> The HTTP method we should use with voice_url </param>
+    /// <param name="voiceFallbackUrl"> The URL we should call when an error occurs in executing TwiML </param>
+    /// <param name="voiceFallbackMethod"> The HTTP method used with voice_fallback_url </param>
+    /// <param name="statusCallbackUrl"> The URL that we should call to pass status updates </param>
+    /// <param name="statusCallbackMethod"> The HTTP method we should use to call status_callback_url </param>
+    /// <param name="cnamLookupEnabled"> Whether Caller ID Name (CNAM) lookup is enabled for the trunk </param>
+    /// <param name="connectionPolicySid"> Origination Connection Policy (to your Carrier) </param>
+    /// <param name="fromDomainSid"> The SID of the SIP Domain that should be used in the `From` header of originating
+    ///                     calls </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
+    public static async System.Threading.Tasks.Task<ByocTrunkResource> UpdateAsync(string pathSid,
+                                                                                   string friendlyName = null,
+                                                                                   Uri voiceUrl = null,
+                                                                                   Twilio.Http.HttpMethod voiceMethod = null,
+                                                                                   Uri voiceFallbackUrl = null,
+                                                                                   Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                                                   Uri statusCallbackUrl = null,
+                                                                                   Twilio.Http.HttpMethod statusCallbackMethod = null,
+                                                                                   bool? cnamLookupEnabled = null,
+                                                                                   string connectionPolicySid = null,
+                                                                                   string fromDomainSid = null,
+                                                                                   ITwilioRestClient client = null)
+    {
+      var options = new UpdateByocTrunkOptions(pathSid) { FriendlyName = friendlyName, VoiceUrl = voiceUrl, VoiceMethod = voiceMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceFallbackMethod = voiceFallbackMethod, StatusCallbackUrl = statusCallbackUrl, StatusCallbackMethod = statusCallbackMethod, CnamLookupEnabled = cnamLookupEnabled, ConnectionPolicySid = connectionPolicySid, FromDomainSid = fromDomainSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteByocTrunkOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Voice,
+          "/v1/ByocTrunks/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete ByocTrunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ByocTrunk </returns>
+    public static bool Delete(DeleteByocTrunkOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete ByocTrunk parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteByocTrunkOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ByocTrunk </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteByocTrunkOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ByocTrunk </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteByocTrunkOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ByocTrunkResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ByocTrunkResource object represented by the provided JSON </returns>
+    public static ByocTrunkResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ByocTrunkResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The URL we call when receiving a call
+    /// </summary>
+    [JsonProperty("voice_url")]
+    public Uri VoiceUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method to use with voice_url
+    /// </summary>
+    [JsonProperty("voice_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
+    /// <summary>
+    /// The URL we call when an error occurs while executing TwiML
+    /// </summary>
+    [JsonProperty("voice_fallback_url")]
+    public Uri VoiceFallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method used with voice_fallback_url
+    /// </summary>
+    [JsonProperty("voice_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
+    /// <summary>
+    /// The URL that we call with status updates
+    /// </summary>
+    [JsonProperty("status_callback_url")]
+    public Uri StatusCallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call status_callback_url
+    /// </summary>
+    [JsonProperty("status_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; private set; }
+    /// <summary>
+    /// Whether Caller ID Name (CNAM) lookup is enabled for the trunk
+    /// </summary>
+    [JsonProperty("cnam_lookup_enabled")]
+    public bool? CnamLookupEnabled { get; private set; }
+    /// <summary>
+    /// Origination Connection Policy (to your Carrier)
+    /// </summary>
+    [JsonProperty("connection_policy_sid")]
+    public string ConnectionPolicySid { get; private set; }
+    /// <summary>
+    /// The SID of the SIP Domain that should be used in the `From` header of originating calls
+    /// </summary>
+    [JsonProperty("from_domain_sid")]
+    public string FromDomainSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private ByocTrunkResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/ConnectionPolicy/ConnectionPolicyTargetOptions.cs b/src/Twilio/Rest/Voice/V1/ConnectionPolicy/ConnectionPolicyTargetOptions.cs
index 098a1089e..d43e5b19a 100644
--- a/src/Twilio/Rest/Voice/V1/ConnectionPolicy/ConnectionPolicyTargetOptions.cs
+++ b/src/Twilio/Rest/Voice/V1/ConnectionPolicy/ConnectionPolicyTargetOptions.cs
@@ -9,266 +9,266 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Voice.V1.ConnectionPolicy
-{
-
+{
+
+  /// <summary>
+  /// CreateConnectionPolicyTargetOptions
+  /// </summary>
+  public class CreateConnectionPolicyTargetOptions : IOptions<ConnectionPolicyTargetResource>
+  {
     /// <summary>
-    /// CreateConnectionPolicyTargetOptions
+    /// The SID of the Connection Policy that owns the Target
     /// </summary>
-    public class CreateConnectionPolicyTargetOptions : IOptions<ConnectionPolicyTargetResource>
-    {
-        /// <summary>
-        /// The SID of the Connection Policy that owns the Target
-        /// </summary>
-        public string PathConnectionPolicySid { get; }
-        /// <summary>
-        /// The SIP address you want Twilio to route your calls to
-        /// </summary>
-        public Uri Target { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The relative importance of the target
-        /// </summary>
-        public int? Priority { get; set; }
-        /// <summary>
-        /// The value that determines the relative load the Target should receive compared to others with the same priority
-        /// </summary>
-        public int? Weight { get; set; }
-        /// <summary>
-        /// Whether the Target is enabled
-        /// </summary>
-        public bool? Enabled { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateConnectionPolicyTargetOptions
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
-        /// <param name="target"> The SIP address you want Twilio to route your calls to </param>
-        public CreateConnectionPolicyTargetOptions(string pathConnectionPolicySid, Uri target)
-        {
-            PathConnectionPolicySid = pathConnectionPolicySid;
-            Target = target;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Target != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Target", Serializers.Url(Target)));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Priority != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
-            }
-
-            if (Weight != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Weight", Weight.ToString()));
-            }
-
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathConnectionPolicySid { get; }
     /// <summary>
-    /// FetchConnectionPolicyTargetOptions
+    /// The SIP address you want Twilio to route your calls to
     /// </summary>
-    public class FetchConnectionPolicyTargetOptions : IOptions<ConnectionPolicyTargetResource>
-    {
-        /// <summary>
-        /// The SID of the Connection Policy that owns the Target
-        /// </summary>
-        public string PathConnectionPolicySid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchConnectionPolicyTargetOptions
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchConnectionPolicyTargetOptions(string pathConnectionPolicySid, string pathSid)
-        {
-            PathConnectionPolicySid = pathConnectionPolicySid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public Uri Target { get; }
     /// <summary>
-    /// ReadConnectionPolicyTargetOptions
+    /// A string to describe the resource
     /// </summary>
-    public class ReadConnectionPolicyTargetOptions : ReadOptions<ConnectionPolicyTargetResource>
-    {
-        /// <summary>
-        /// The SID of the Connection Policy from which to read the Targets
-        /// </summary>
-        public string PathConnectionPolicySid { get; }
-
-        /// <summary>
-        /// Construct a new ReadConnectionPolicyTargetOptions
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy from which to read the Targets </param>
-        public ReadConnectionPolicyTargetOptions(string pathConnectionPolicySid)
-        {
-            PathConnectionPolicySid = pathConnectionPolicySid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// UpdateConnectionPolicyTargetOptions
+    /// The relative importance of the target
     /// </summary>
-    public class UpdateConnectionPolicyTargetOptions : IOptions<ConnectionPolicyTargetResource>
-    {
-        /// <summary>
-        /// The SID of the Connection Policy that owns the Target
-        /// </summary>
-        public string PathConnectionPolicySid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The SIP address you want Twilio to route your calls to
-        /// </summary>
-        public Uri Target { get; set; }
-        /// <summary>
-        /// The relative importance of the target
-        /// </summary>
-        public int? Priority { get; set; }
-        /// <summary>
-        /// The value that determines the relative load the Target should receive compared to others with the same priority
-        /// </summary>
-        public int? Weight { get; set; }
-        /// <summary>
-        /// Whether the Target is enabled
-        /// </summary>
-        public bool? Enabled { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateConnectionPolicyTargetOptions
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateConnectionPolicyTargetOptions(string pathConnectionPolicySid, string pathSid)
-        {
-            PathConnectionPolicySid = pathConnectionPolicySid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (Target != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Target", Serializers.Url(Target)));
-            }
-
-            if (Priority != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
-            }
-
-            if (Weight != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Weight", Weight.ToString()));
-            }
-
-            if (Enabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    public int? Priority { get; set; }
     /// <summary>
-    /// DeleteConnectionPolicyTargetOptions
+    /// The value that determines the relative load the Target should receive compared to others with the same priority
     /// </summary>
-    public class DeleteConnectionPolicyTargetOptions : IOptions<ConnectionPolicyTargetResource>
-    {
-        /// <summary>
-        /// The SID of the Connection Policy that owns the Target
-        /// </summary>
-        public string PathConnectionPolicySid { get; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteConnectionPolicyTargetOptions
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteConnectionPolicyTargetOptions(string pathConnectionPolicySid, string pathSid)
-        {
-            PathConnectionPolicySid = pathConnectionPolicySid;
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public int? Weight { get; set; }
+    /// <summary>
+    /// Whether the Target is enabled
+    /// </summary>
+    public bool? Enabled { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateConnectionPolicyTargetOptions
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
+    /// <param name="target"> The SIP address you want Twilio to route your calls to </param>
+    public CreateConnectionPolicyTargetOptions(string pathConnectionPolicySid, Uri target)
+    {
+      PathConnectionPolicySid = pathConnectionPolicySid;
+      Target = target;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Target != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Target", Serializers.Url(Target)));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Priority != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
+      }
+
+      if (Weight != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Weight", Weight.ToString()));
+      }
+
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchConnectionPolicyTargetOptions
+  /// </summary>
+  public class FetchConnectionPolicyTargetOptions : IOptions<ConnectionPolicyTargetResource>
+  {
+    /// <summary>
+    /// The SID of the Connection Policy that owns the Target
+    /// </summary>
+    public string PathConnectionPolicySid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchConnectionPolicyTargetOptions
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchConnectionPolicyTargetOptions(string pathConnectionPolicySid, string pathSid)
+    {
+      PathConnectionPolicySid = pathConnectionPolicySid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadConnectionPolicyTargetOptions
+  /// </summary>
+  public class ReadConnectionPolicyTargetOptions : ReadOptions<ConnectionPolicyTargetResource>
+  {
+    /// <summary>
+    /// The SID of the Connection Policy from which to read the Targets
+    /// </summary>
+    public string PathConnectionPolicySid { get; }
+
+    /// <summary>
+    /// Construct a new ReadConnectionPolicyTargetOptions
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy from which to read the Targets </param>
+    public ReadConnectionPolicyTargetOptions(string pathConnectionPolicySid)
+    {
+      PathConnectionPolicySid = pathConnectionPolicySid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateConnectionPolicyTargetOptions
+  /// </summary>
+  public class UpdateConnectionPolicyTargetOptions : IOptions<ConnectionPolicyTargetResource>
+  {
+    /// <summary>
+    /// The SID of the Connection Policy that owns the Target
+    /// </summary>
+    public string PathConnectionPolicySid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The SIP address you want Twilio to route your calls to
+    /// </summary>
+    public Uri Target { get; set; }
+    /// <summary>
+    /// The relative importance of the target
+    /// </summary>
+    public int? Priority { get; set; }
+    /// <summary>
+    /// The value that determines the relative load the Target should receive compared to others with the same priority
+    /// </summary>
+    public int? Weight { get; set; }
+    /// <summary>
+    /// Whether the Target is enabled
+    /// </summary>
+    public bool? Enabled { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateConnectionPolicyTargetOptions
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateConnectionPolicyTargetOptions(string pathConnectionPolicySid, string pathSid)
+    {
+      PathConnectionPolicySid = pathConnectionPolicySid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (Target != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Target", Serializers.Url(Target)));
+      }
+
+      if (Priority != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Priority", Priority.ToString()));
+      }
+
+      if (Weight != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Weight", Weight.ToString()));
+      }
+
+      if (Enabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Enabled", Enabled.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteConnectionPolicyTargetOptions
+  /// </summary>
+  public class DeleteConnectionPolicyTargetOptions : IOptions<ConnectionPolicyTargetResource>
+  {
+    /// <summary>
+    /// The SID of the Connection Policy that owns the Target
+    /// </summary>
+    public string PathConnectionPolicySid { get; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteConnectionPolicyTargetOptions
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteConnectionPolicyTargetOptions(string pathConnectionPolicySid, string pathSid)
+    {
+      PathConnectionPolicySid = pathConnectionPolicySid;
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/ConnectionPolicy/ConnectionPolicyTargetResource.cs b/src/Twilio/Rest/Voice/V1/ConnectionPolicy/ConnectionPolicyTargetResource.cs
index d75990c24..46af3c732 100644
--- a/src/Twilio/Rest/Voice/V1/ConnectionPolicy/ConnectionPolicyTargetResource.cs
+++ b/src/Twilio/Rest/Voice/V1/ConnectionPolicy/ConnectionPolicyTargetResource.cs
@@ -16,553 +16,553 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Voice.V1.ConnectionPolicy
-{
-
-    public class ConnectionPolicyTargetResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateConnectionPolicyTargetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Voice,
-                "/v1/ConnectionPolicies/" + options.PathConnectionPolicySid + "/Targets",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ConnectionPolicyTarget parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicyTarget </returns>
-        public static ConnectionPolicyTargetResource Create(CreateConnectionPolicyTargetOptions options,
-                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ConnectionPolicyTarget parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
-        public static async System.Threading.Tasks.Task<ConnectionPolicyTargetResource> CreateAsync(CreateConnectionPolicyTargetOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
-        /// <param name="target"> The SIP address you want Twilio to route your calls to </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="priority"> The relative importance of the target </param>
-        /// <param name="weight"> The value that determines the relative load the Target should receive compared to others with
-        ///              the same priority </param>
-        /// <param name="enabled"> Whether the Target is enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicyTarget </returns>
-        public static ConnectionPolicyTargetResource Create(string pathConnectionPolicySid,
-                                                            Uri target,
-                                                            string friendlyName = null,
-                                                            int? priority = null,
-                                                            int? weight = null,
-                                                            bool? enabled = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new CreateConnectionPolicyTargetOptions(pathConnectionPolicySid, target){FriendlyName = friendlyName, Priority = priority, Weight = weight, Enabled = enabled};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
-        /// <param name="target"> The SIP address you want Twilio to route your calls to </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="priority"> The relative importance of the target </param>
-        /// <param name="weight"> The value that determines the relative load the Target should receive compared to others with
-        ///              the same priority </param>
-        /// <param name="enabled"> Whether the Target is enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
-        public static async System.Threading.Tasks.Task<ConnectionPolicyTargetResource> CreateAsync(string pathConnectionPolicySid,
-                                                                                                    Uri target,
-                                                                                                    string friendlyName = null,
-                                                                                                    int? priority = null,
-                                                                                                    int? weight = null,
-                                                                                                    bool? enabled = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new CreateConnectionPolicyTargetOptions(pathConnectionPolicySid, target){FriendlyName = friendlyName, Priority = priority, Weight = weight, Enabled = enabled};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchConnectionPolicyTargetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/ConnectionPolicies/" + options.PathConnectionPolicySid + "/Targets/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch ConnectionPolicyTarget parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicyTarget </returns>
-        public static ConnectionPolicyTargetResource Fetch(FetchConnectionPolicyTargetOptions options,
-                                                           ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch ConnectionPolicyTarget parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
-        public static async System.Threading.Tasks.Task<ConnectionPolicyTargetResource> FetchAsync(FetchConnectionPolicyTargetOptions options,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicyTarget </returns>
-        public static ConnectionPolicyTargetResource Fetch(string pathConnectionPolicySid,
-                                                           string pathSid,
-                                                           ITwilioRestClient client = null)
-        {
-            var options = new FetchConnectionPolicyTargetOptions(pathConnectionPolicySid, pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
-        public static async System.Threading.Tasks.Task<ConnectionPolicyTargetResource> FetchAsync(string pathConnectionPolicySid,
-                                                                                                   string pathSid,
-                                                                                                   ITwilioRestClient client = null)
-        {
-            var options = new FetchConnectionPolicyTargetOptions(pathConnectionPolicySid, pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadConnectionPolicyTargetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/ConnectionPolicies/" + options.PathConnectionPolicySid + "/Targets",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ConnectionPolicyTarget parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicyTarget </returns>
-        public static ResourceSet<ConnectionPolicyTargetResource> Read(ReadConnectionPolicyTargetOptions options,
-                                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ConnectionPolicyTargetResource>.FromJson("targets", response.Content);
-            return new ResourceSet<ConnectionPolicyTargetResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ConnectionPolicyTarget parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ConnectionPolicyTargetResource>> ReadAsync(ReadConnectionPolicyTargetOptions options,
-                                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ConnectionPolicyTargetResource>.FromJson("targets", response.Content);
-            return new ResourceSet<ConnectionPolicyTargetResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy from which to read the Targets </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicyTarget </returns>
-        public static ResourceSet<ConnectionPolicyTargetResource> Read(string pathConnectionPolicySid,
-                                                                       int? pageSize = null,
-                                                                       long? limit = null,
-                                                                       ITwilioRestClient client = null)
-        {
-            var options = new ReadConnectionPolicyTargetOptions(pathConnectionPolicySid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy from which to read the Targets </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ConnectionPolicyTargetResource>> ReadAsync(string pathConnectionPolicySid,
-                                                                                                               int? pageSize = null,
-                                                                                                               long? limit = null,
-                                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new ReadConnectionPolicyTargetOptions(pathConnectionPolicySid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ConnectionPolicyTargetResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ConnectionPolicyTargetResource>.FromJson("targets", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ConnectionPolicyTargetResource> NextPage(Page<ConnectionPolicyTargetResource> page,
-                                                                    ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<ConnectionPolicyTargetResource>.FromJson("targets", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ConnectionPolicyTargetResource> PreviousPage(Page<ConnectionPolicyTargetResource> page,
-                                                                        ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<ConnectionPolicyTargetResource>.FromJson("targets", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateConnectionPolicyTargetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Voice,
-                "/v1/ConnectionPolicies/" + options.PathConnectionPolicySid + "/Targets/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update ConnectionPolicyTarget parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicyTarget </returns>
-        public static ConnectionPolicyTargetResource Update(UpdateConnectionPolicyTargetOptions options,
-                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update ConnectionPolicyTarget parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
-        public static async System.Threading.Tasks.Task<ConnectionPolicyTargetResource> UpdateAsync(UpdateConnectionPolicyTargetOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="target"> The SIP address you want Twilio to route your calls to </param>
-        /// <param name="priority"> The relative importance of the target </param>
-        /// <param name="weight"> The value that determines the relative load the Target should receive compared to others with
-        ///              the same priority </param>
-        /// <param name="enabled"> Whether the Target is enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicyTarget </returns>
-        public static ConnectionPolicyTargetResource Update(string pathConnectionPolicySid,
-                                                            string pathSid,
-                                                            string friendlyName = null,
-                                                            Uri target = null,
-                                                            int? priority = null,
-                                                            int? weight = null,
-                                                            bool? enabled = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new UpdateConnectionPolicyTargetOptions(pathConnectionPolicySid, pathSid){FriendlyName = friendlyName, Target = target, Priority = priority, Weight = weight, Enabled = enabled};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="target"> The SIP address you want Twilio to route your calls to </param>
-        /// <param name="priority"> The relative importance of the target </param>
-        /// <param name="weight"> The value that determines the relative load the Target should receive compared to others with
-        ///              the same priority </param>
-        /// <param name="enabled"> Whether the Target is enabled </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
-        public static async System.Threading.Tasks.Task<ConnectionPolicyTargetResource> UpdateAsync(string pathConnectionPolicySid,
-                                                                                                    string pathSid,
-                                                                                                    string friendlyName = null,
-                                                                                                    Uri target = null,
-                                                                                                    int? priority = null,
-                                                                                                    int? weight = null,
-                                                                                                    bool? enabled = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new UpdateConnectionPolicyTargetOptions(pathConnectionPolicySid, pathSid){FriendlyName = friendlyName, Target = target, Priority = priority, Weight = weight, Enabled = enabled};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteConnectionPolicyTargetOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Voice,
-                "/v1/ConnectionPolicies/" + options.PathConnectionPolicySid + "/Targets/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete ConnectionPolicyTarget parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicyTarget </returns>
-        public static bool Delete(DeleteConnectionPolicyTargetOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete ConnectionPolicyTarget parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteConnectionPolicyTargetOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicyTarget </returns>
-        public static bool Delete(string pathConnectionPolicySid, string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteConnectionPolicyTargetOptions(pathConnectionPolicySid, pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathConnectionPolicySid,
-                                                                          string pathSid,
-                                                                          ITwilioRestClient client = null)
-        {
-            var options = new DeleteConnectionPolicyTargetOptions(pathConnectionPolicySid, pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ConnectionPolicyTargetResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ConnectionPolicyTargetResource object represented by the provided JSON </returns>
-        public static ConnectionPolicyTargetResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ConnectionPolicyTargetResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Connection Policy that owns the Target
-        /// </summary>
-        [JsonProperty("connection_policy_sid")]
-        public string ConnectionPolicySid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The SIP address you want Twilio to route your calls to
-        /// </summary>
-        [JsonProperty("target")]
-        public Uri Target { get; private set; }
-        /// <summary>
-        /// The relative importance of the target
-        /// </summary>
-        [JsonProperty("priority")]
-        public int? Priority { get; private set; }
-        /// <summary>
-        /// The value that determines the relative load the Target should receive compared to others with the same priority
-        /// </summary>
-        [JsonProperty("weight")]
-        public int? Weight { get; private set; }
-        /// <summary>
-        /// Whether the target is enabled
-        /// </summary>
-        [JsonProperty("enabled")]
-        public bool? Enabled { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private ConnectionPolicyTargetResource()
-        {
-
-        }
-    }
+{
+
+  public class ConnectionPolicyTargetResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateConnectionPolicyTargetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Voice,
+          "/v1/ConnectionPolicies/" + options.PathConnectionPolicySid + "/Targets",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ConnectionPolicyTarget parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicyTarget </returns>
+    public static ConnectionPolicyTargetResource Create(CreateConnectionPolicyTargetOptions options,
+                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ConnectionPolicyTarget parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
+    public static async System.Threading.Tasks.Task<ConnectionPolicyTargetResource> CreateAsync(CreateConnectionPolicyTargetOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
+    /// <param name="target"> The SIP address you want Twilio to route your calls to </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="priority"> The relative importance of the target </param>
+    /// <param name="weight"> The value that determines the relative load the Target should receive compared to others with
+    ///              the same priority </param>
+    /// <param name="enabled"> Whether the Target is enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicyTarget </returns>
+    public static ConnectionPolicyTargetResource Create(string pathConnectionPolicySid,
+                                                        Uri target,
+                                                        string friendlyName = null,
+                                                        int? priority = null,
+                                                        int? weight = null,
+                                                        bool? enabled = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new CreateConnectionPolicyTargetOptions(pathConnectionPolicySid, target) { FriendlyName = friendlyName, Priority = priority, Weight = weight, Enabled = enabled };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
+    /// <param name="target"> The SIP address you want Twilio to route your calls to </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="priority"> The relative importance of the target </param>
+    /// <param name="weight"> The value that determines the relative load the Target should receive compared to others with
+    ///              the same priority </param>
+    /// <param name="enabled"> Whether the Target is enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
+    public static async System.Threading.Tasks.Task<ConnectionPolicyTargetResource> CreateAsync(string pathConnectionPolicySid,
+                                                                                                Uri target,
+                                                                                                string friendlyName = null,
+                                                                                                int? priority = null,
+                                                                                                int? weight = null,
+                                                                                                bool? enabled = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new CreateConnectionPolicyTargetOptions(pathConnectionPolicySid, target) { FriendlyName = friendlyName, Priority = priority, Weight = weight, Enabled = enabled };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchConnectionPolicyTargetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/ConnectionPolicies/" + options.PathConnectionPolicySid + "/Targets/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch ConnectionPolicyTarget parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicyTarget </returns>
+    public static ConnectionPolicyTargetResource Fetch(FetchConnectionPolicyTargetOptions options,
+                                                       ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch ConnectionPolicyTarget parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
+    public static async System.Threading.Tasks.Task<ConnectionPolicyTargetResource> FetchAsync(FetchConnectionPolicyTargetOptions options,
+                                                                                               ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicyTarget </returns>
+    public static ConnectionPolicyTargetResource Fetch(string pathConnectionPolicySid,
+                                                       string pathSid,
+                                                       ITwilioRestClient client = null)
+    {
+      var options = new FetchConnectionPolicyTargetOptions(pathConnectionPolicySid, pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
+    public static async System.Threading.Tasks.Task<ConnectionPolicyTargetResource> FetchAsync(string pathConnectionPolicySid,
+                                                                                               string pathSid,
+                                                                                               ITwilioRestClient client = null)
+    {
+      var options = new FetchConnectionPolicyTargetOptions(pathConnectionPolicySid, pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadConnectionPolicyTargetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/ConnectionPolicies/" + options.PathConnectionPolicySid + "/Targets",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ConnectionPolicyTarget parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicyTarget </returns>
+    public static ResourceSet<ConnectionPolicyTargetResource> Read(ReadConnectionPolicyTargetOptions options,
+                                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ConnectionPolicyTargetResource>.FromJson("targets", response.Content);
+      return new ResourceSet<ConnectionPolicyTargetResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ConnectionPolicyTarget parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ConnectionPolicyTargetResource>> ReadAsync(ReadConnectionPolicyTargetOptions options,
+                                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ConnectionPolicyTargetResource>.FromJson("targets", response.Content);
+      return new ResourceSet<ConnectionPolicyTargetResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy from which to read the Targets </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicyTarget </returns>
+    public static ResourceSet<ConnectionPolicyTargetResource> Read(string pathConnectionPolicySid,
+                                                                   int? pageSize = null,
+                                                                   long? limit = null,
+                                                                   ITwilioRestClient client = null)
+    {
+      var options = new ReadConnectionPolicyTargetOptions(pathConnectionPolicySid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy from which to read the Targets </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ConnectionPolicyTargetResource>> ReadAsync(string pathConnectionPolicySid,
+                                                                                                           int? pageSize = null,
+                                                                                                           long? limit = null,
+                                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new ReadConnectionPolicyTargetOptions(pathConnectionPolicySid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ConnectionPolicyTargetResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ConnectionPolicyTargetResource>.FromJson("targets", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ConnectionPolicyTargetResource> NextPage(Page<ConnectionPolicyTargetResource> page,
+                                                                ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<ConnectionPolicyTargetResource>.FromJson("targets", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ConnectionPolicyTargetResource> PreviousPage(Page<ConnectionPolicyTargetResource> page,
+                                                                    ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<ConnectionPolicyTargetResource>.FromJson("targets", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateConnectionPolicyTargetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Voice,
+          "/v1/ConnectionPolicies/" + options.PathConnectionPolicySid + "/Targets/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update ConnectionPolicyTarget parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicyTarget </returns>
+    public static ConnectionPolicyTargetResource Update(UpdateConnectionPolicyTargetOptions options,
+                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update ConnectionPolicyTarget parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
+    public static async System.Threading.Tasks.Task<ConnectionPolicyTargetResource> UpdateAsync(UpdateConnectionPolicyTargetOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="target"> The SIP address you want Twilio to route your calls to </param>
+    /// <param name="priority"> The relative importance of the target </param>
+    /// <param name="weight"> The value that determines the relative load the Target should receive compared to others with
+    ///              the same priority </param>
+    /// <param name="enabled"> Whether the Target is enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicyTarget </returns>
+    public static ConnectionPolicyTargetResource Update(string pathConnectionPolicySid,
+                                                        string pathSid,
+                                                        string friendlyName = null,
+                                                        Uri target = null,
+                                                        int? priority = null,
+                                                        int? weight = null,
+                                                        bool? enabled = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new UpdateConnectionPolicyTargetOptions(pathConnectionPolicySid, pathSid) { FriendlyName = friendlyName, Target = target, Priority = priority, Weight = weight, Enabled = enabled };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="target"> The SIP address you want Twilio to route your calls to </param>
+    /// <param name="priority"> The relative importance of the target </param>
+    /// <param name="weight"> The value that determines the relative load the Target should receive compared to others with
+    ///              the same priority </param>
+    /// <param name="enabled"> Whether the Target is enabled </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
+    public static async System.Threading.Tasks.Task<ConnectionPolicyTargetResource> UpdateAsync(string pathConnectionPolicySid,
+                                                                                                string pathSid,
+                                                                                                string friendlyName = null,
+                                                                                                Uri target = null,
+                                                                                                int? priority = null,
+                                                                                                int? weight = null,
+                                                                                                bool? enabled = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new UpdateConnectionPolicyTargetOptions(pathConnectionPolicySid, pathSid) { FriendlyName = friendlyName, Target = target, Priority = priority, Weight = weight, Enabled = enabled };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteConnectionPolicyTargetOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Voice,
+          "/v1/ConnectionPolicies/" + options.PathConnectionPolicySid + "/Targets/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete ConnectionPolicyTarget parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicyTarget </returns>
+    public static bool Delete(DeleteConnectionPolicyTargetOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete ConnectionPolicyTarget parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteConnectionPolicyTargetOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicyTarget </returns>
+    public static bool Delete(string pathConnectionPolicySid, string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteConnectionPolicyTargetOptions(pathConnectionPolicySid, pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathConnectionPolicySid"> The SID of the Connection Policy that owns the Target </param>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicyTarget </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathConnectionPolicySid,
+                                                                      string pathSid,
+                                                                      ITwilioRestClient client = null)
+    {
+      var options = new DeleteConnectionPolicyTargetOptions(pathConnectionPolicySid, pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ConnectionPolicyTargetResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ConnectionPolicyTargetResource object represented by the provided JSON </returns>
+    public static ConnectionPolicyTargetResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ConnectionPolicyTargetResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Connection Policy that owns the Target
+    /// </summary>
+    [JsonProperty("connection_policy_sid")]
+    public string ConnectionPolicySid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The SIP address you want Twilio to route your calls to
+    /// </summary>
+    [JsonProperty("target")]
+    public Uri Target { get; private set; }
+    /// <summary>
+    /// The relative importance of the target
+    /// </summary>
+    [JsonProperty("priority")]
+    public int? Priority { get; private set; }
+    /// <summary>
+    /// The value that determines the relative load the Target should receive compared to others with the same priority
+    /// </summary>
+    [JsonProperty("weight")]
+    public int? Weight { get; private set; }
+    /// <summary>
+    /// Whether the target is enabled
+    /// </summary>
+    [JsonProperty("enabled")]
+    public bool? Enabled { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private ConnectionPolicyTargetResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/ConnectionPolicyOptions.cs b/src/Twilio/Rest/Voice/V1/ConnectionPolicyOptions.cs
index a837e8ecf..5dd930dfa 100644
--- a/src/Twilio/Rest/Voice/V1/ConnectionPolicyOptions.cs
+++ b/src/Twilio/Rest/Voice/V1/ConnectionPolicyOptions.cs
@@ -9,147 +9,147 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Voice.V1
-{
-
+{
+
+  /// <summary>
+  /// CreateConnectionPolicyOptions
+  /// </summary>
+  public class CreateConnectionPolicyOptions : IOptions<ConnectionPolicyResource>
+  {
     /// <summary>
-    /// CreateConnectionPolicyOptions
+    /// A string to describe the resource
     /// </summary>
-    public class CreateConnectionPolicyOptions : IOptions<ConnectionPolicyResource>
-    {
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
+
     /// <summary>
-    /// FetchConnectionPolicyOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchConnectionPolicyOptions : IOptions<ConnectionPolicyResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchConnectionPolicyOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchConnectionPolicyOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchConnectionPolicyOptions
+  /// </summary>
+  public class FetchConnectionPolicyOptions : IOptions<ConnectionPolicyResource>
+  {
     /// <summary>
-    /// ReadConnectionPolicyOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class ReadConnectionPolicyOptions : ReadOptions<ConnectionPolicyResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// UpdateConnectionPolicyOptions
+    /// Construct a new FetchConnectionPolicyOptions
     /// </summary>
-    public class UpdateConnectionPolicyOptions : IOptions<ConnectionPolicyResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateConnectionPolicyOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateConnectionPolicyOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchConnectionPolicyOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// DeleteConnectionPolicyOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteConnectionPolicyOptions : IOptions<ConnectionPolicyResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteConnectionPolicyOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteConnectionPolicyOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadConnectionPolicyOptions
+  /// </summary>
+  public class ReadConnectionPolicyOptions : ReadOptions<ConnectionPolicyResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateConnectionPolicyOptions
+  /// </summary>
+  public class UpdateConnectionPolicyOptions : IOptions<ConnectionPolicyResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateConnectionPolicyOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateConnectionPolicyOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteConnectionPolicyOptions
+  /// </summary>
+  public class DeleteConnectionPolicyOptions : IOptions<ConnectionPolicyResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteConnectionPolicyOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteConnectionPolicyOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/ConnectionPolicyResource.cs b/src/Twilio/Rest/Voice/V1/ConnectionPolicyResource.cs
index 57192c1a1..cf7dc1d4d 100644
--- a/src/Twilio/Rest/Voice/V1/ConnectionPolicyResource.cs
+++ b/src/Twilio/Rest/Voice/V1/ConnectionPolicyResource.cs
@@ -16,471 +16,471 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Voice.V1
-{
-
-    public class ConnectionPolicyResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateConnectionPolicyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Voice,
-                "/v1/ConnectionPolicies",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ConnectionPolicy parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicy </returns>
-        public static ConnectionPolicyResource Create(CreateConnectionPolicyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create ConnectionPolicy parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
-        public static async System.Threading.Tasks.Task<ConnectionPolicyResource> CreateAsync(CreateConnectionPolicyOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicy </returns>
-        public static ConnectionPolicyResource Create(string friendlyName = null, ITwilioRestClient client = null)
-        {
-            var options = new CreateConnectionPolicyOptions(){FriendlyName = friendlyName};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
-        public static async System.Threading.Tasks.Task<ConnectionPolicyResource> CreateAsync(string friendlyName = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateConnectionPolicyOptions(){FriendlyName = friendlyName};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchConnectionPolicyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/ConnectionPolicies/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch ConnectionPolicy parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicy </returns>
-        public static ConnectionPolicyResource Fetch(FetchConnectionPolicyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch ConnectionPolicy parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
-        public static async System.Threading.Tasks.Task<ConnectionPolicyResource> FetchAsync(FetchConnectionPolicyOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicy </returns>
-        public static ConnectionPolicyResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchConnectionPolicyOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
-        public static async System.Threading.Tasks.Task<ConnectionPolicyResource> FetchAsync(string pathSid,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new FetchConnectionPolicyOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadConnectionPolicyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/ConnectionPolicies",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ConnectionPolicy parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicy </returns>
-        public static ResourceSet<ConnectionPolicyResource> Read(ReadConnectionPolicyOptions options,
-                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<ConnectionPolicyResource>.FromJson("connection_policies", response.Content);
-            return new ResourceSet<ConnectionPolicyResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read ConnectionPolicy parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ConnectionPolicyResource>> ReadAsync(ReadConnectionPolicyOptions options,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<ConnectionPolicyResource>.FromJson("connection_policies", response.Content);
-            return new ResourceSet<ConnectionPolicyResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicy </returns>
-        public static ResourceSet<ConnectionPolicyResource> Read(int? pageSize = null,
-                                                                 long? limit = null,
-                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadConnectionPolicyOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<ConnectionPolicyResource>> ReadAsync(int? pageSize = null,
-                                                                                                         long? limit = null,
-                                                                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadConnectionPolicyOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<ConnectionPolicyResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<ConnectionPolicyResource>.FromJson("connection_policies", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<ConnectionPolicyResource> NextPage(Page<ConnectionPolicyResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<ConnectionPolicyResource>.FromJson("connection_policies", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<ConnectionPolicyResource> PreviousPage(Page<ConnectionPolicyResource> page,
-                                                                  ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<ConnectionPolicyResource>.FromJson("connection_policies", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateConnectionPolicyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Voice,
-                "/v1/ConnectionPolicies/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update ConnectionPolicy parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicy </returns>
-        public static ConnectionPolicyResource Update(UpdateConnectionPolicyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update ConnectionPolicy parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
-        public static async System.Threading.Tasks.Task<ConnectionPolicyResource> UpdateAsync(UpdateConnectionPolicyOptions options,
-                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicy </returns>
-        public static ConnectionPolicyResource Update(string pathSid,
-                                                      string friendlyName = null,
-                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateConnectionPolicyOptions(pathSid){FriendlyName = friendlyName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
-        public static async System.Threading.Tasks.Task<ConnectionPolicyResource> UpdateAsync(string pathSid,
-                                                                                              string friendlyName = null,
-                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateConnectionPolicyOptions(pathSid){FriendlyName = friendlyName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteConnectionPolicyOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Voice,
-                "/v1/ConnectionPolicies/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete ConnectionPolicy parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicy </returns>
-        public static bool Delete(DeleteConnectionPolicyOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete ConnectionPolicy parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteConnectionPolicyOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of ConnectionPolicy </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteConnectionPolicyOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteConnectionPolicyOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a ConnectionPolicyResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> ConnectionPolicyResource object represented by the provided JSON </returns>
-        public static ConnectionPolicyResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<ConnectionPolicyResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT when the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related resources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private ConnectionPolicyResource()
-        {
-
-        }
-    }
+{
+
+  public class ConnectionPolicyResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateConnectionPolicyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Voice,
+          "/v1/ConnectionPolicies",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ConnectionPolicy parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicy </returns>
+    public static ConnectionPolicyResource Create(CreateConnectionPolicyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create ConnectionPolicy parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
+    public static async System.Threading.Tasks.Task<ConnectionPolicyResource> CreateAsync(CreateConnectionPolicyOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicy </returns>
+    public static ConnectionPolicyResource Create(string friendlyName = null, ITwilioRestClient client = null)
+    {
+      var options = new CreateConnectionPolicyOptions() { FriendlyName = friendlyName };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
+    public static async System.Threading.Tasks.Task<ConnectionPolicyResource> CreateAsync(string friendlyName = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateConnectionPolicyOptions() { FriendlyName = friendlyName };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchConnectionPolicyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/ConnectionPolicies/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch ConnectionPolicy parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicy </returns>
+    public static ConnectionPolicyResource Fetch(FetchConnectionPolicyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch ConnectionPolicy parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
+    public static async System.Threading.Tasks.Task<ConnectionPolicyResource> FetchAsync(FetchConnectionPolicyOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicy </returns>
+    public static ConnectionPolicyResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchConnectionPolicyOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
+    public static async System.Threading.Tasks.Task<ConnectionPolicyResource> FetchAsync(string pathSid,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new FetchConnectionPolicyOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadConnectionPolicyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/ConnectionPolicies",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ConnectionPolicy parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicy </returns>
+    public static ResourceSet<ConnectionPolicyResource> Read(ReadConnectionPolicyOptions options,
+                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<ConnectionPolicyResource>.FromJson("connection_policies", response.Content);
+      return new ResourceSet<ConnectionPolicyResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read ConnectionPolicy parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ConnectionPolicyResource>> ReadAsync(ReadConnectionPolicyOptions options,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<ConnectionPolicyResource>.FromJson("connection_policies", response.Content);
+      return new ResourceSet<ConnectionPolicyResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicy </returns>
+    public static ResourceSet<ConnectionPolicyResource> Read(int? pageSize = null,
+                                                             long? limit = null,
+                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadConnectionPolicyOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<ConnectionPolicyResource>> ReadAsync(int? pageSize = null,
+                                                                                                     long? limit = null,
+                                                                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadConnectionPolicyOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<ConnectionPolicyResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<ConnectionPolicyResource>.FromJson("connection_policies", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<ConnectionPolicyResource> NextPage(Page<ConnectionPolicyResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<ConnectionPolicyResource>.FromJson("connection_policies", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<ConnectionPolicyResource> PreviousPage(Page<ConnectionPolicyResource> page,
+                                                              ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<ConnectionPolicyResource>.FromJson("connection_policies", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateConnectionPolicyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Voice,
+          "/v1/ConnectionPolicies/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update ConnectionPolicy parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicy </returns>
+    public static ConnectionPolicyResource Update(UpdateConnectionPolicyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update ConnectionPolicy parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
+    public static async System.Threading.Tasks.Task<ConnectionPolicyResource> UpdateAsync(UpdateConnectionPolicyOptions options,
+                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicy </returns>
+    public static ConnectionPolicyResource Update(string pathSid,
+                                                  string friendlyName = null,
+                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateConnectionPolicyOptions(pathSid) { FriendlyName = friendlyName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
+    public static async System.Threading.Tasks.Task<ConnectionPolicyResource> UpdateAsync(string pathSid,
+                                                                                          string friendlyName = null,
+                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateConnectionPolicyOptions(pathSid) { FriendlyName = friendlyName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteConnectionPolicyOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Voice,
+          "/v1/ConnectionPolicies/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete ConnectionPolicy parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicy </returns>
+    public static bool Delete(DeleteConnectionPolicyOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete ConnectionPolicy parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteConnectionPolicyOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of ConnectionPolicy </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteConnectionPolicyOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of ConnectionPolicy </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteConnectionPolicyOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a ConnectionPolicyResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> ConnectionPolicyResource object represented by the provided JSON </returns>
+    public static ConnectionPolicyResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<ConnectionPolicyResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT when the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related resources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private ConnectionPolicyResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/DialingPermissions/BulkCountryUpdateOptions.cs b/src/Twilio/Rest/Voice/V1/DialingPermissions/BulkCountryUpdateOptions.cs
index 2da0f2496..1d0c25daf 100644
--- a/src/Twilio/Rest/Voice/V1/DialingPermissions/BulkCountryUpdateOptions.cs
+++ b/src/Twilio/Rest/Voice/V1/DialingPermissions/BulkCountryUpdateOptions.cs
@@ -9,44 +9,44 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Voice.V1.DialingPermissions
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Create a bulk update request to change voice dialing country permissions of one or more countries identified by the
+  /// corresponding [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+  /// </summary>
+  public class CreateBulkCountryUpdateOptions : IOptions<BulkCountryUpdateResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Create a bulk update request to change voice dialing country permissions of one or more countries identified by the
-    /// corresponding [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+    /// URL encoded JSON array of update objects
     /// </summary>
-    public class CreateBulkCountryUpdateOptions : IOptions<BulkCountryUpdateResource>
-    {
-        /// <summary>
-        /// URL encoded JSON array of update objects
-        /// </summary>
-        public string UpdateRequest { get; }
-
-        /// <summary>
-        /// Construct a new CreateBulkCountryUpdateOptions
-        /// </summary>
-        /// <param name="updateRequest"> URL encoded JSON array of update objects </param>
-        public CreateBulkCountryUpdateOptions(string updateRequest)
-        {
-            UpdateRequest = updateRequest;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UpdateRequest != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UpdateRequest", UpdateRequest));
-            }
-
-            return p;
-        }
-    }
+    public string UpdateRequest { get; }
+
+    /// <summary>
+    /// Construct a new CreateBulkCountryUpdateOptions
+    /// </summary>
+    /// <param name="updateRequest"> URL encoded JSON array of update objects </param>
+    public CreateBulkCountryUpdateOptions(string updateRequest)
+    {
+      UpdateRequest = updateRequest;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UpdateRequest != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UpdateRequest", UpdateRequest));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/DialingPermissions/BulkCountryUpdateResource.cs b/src/Twilio/Rest/Voice/V1/DialingPermissions/BulkCountryUpdateResource.cs
index 6e3850b99..b43aeacdb 100644
--- a/src/Twilio/Rest/Voice/V1/DialingPermissions/BulkCountryUpdateResource.cs
+++ b/src/Twilio/Rest/Voice/V1/DialingPermissions/BulkCountryUpdateResource.cs
@@ -19,115 +19,115 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Voice.V1.DialingPermissions
-{
-
-    public class BulkCountryUpdateResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateBulkCountryUpdateOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Voice,
-                "/v1/DialingPermissions/BulkCountryUpdates",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Create a bulk update request to change voice dialing country permissions of one or more countries identified by the
-        /// corresponding [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
-        /// </summary>
-        /// <param name="options"> Create BulkCountryUpdate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BulkCountryUpdate </returns>
-        public static BulkCountryUpdateResource Create(CreateBulkCountryUpdateOptions options,
-                                                       ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a bulk update request to change voice dialing country permissions of one or more countries identified by the
-        /// corresponding [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
-        /// </summary>
-        /// <param name="options"> Create BulkCountryUpdate parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BulkCountryUpdate </returns>
-        public static async System.Threading.Tasks.Task<BulkCountryUpdateResource> CreateAsync(CreateBulkCountryUpdateOptions options,
-                                                                                               ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Create a bulk update request to change voice dialing country permissions of one or more countries identified by the
-        /// corresponding [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
-        /// </summary>
-        /// <param name="updateRequest"> URL encoded JSON array of update objects </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of BulkCountryUpdate </returns>
-        public static BulkCountryUpdateResource Create(string updateRequest, ITwilioRestClient client = null)
-        {
-            var options = new CreateBulkCountryUpdateOptions(updateRequest);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Create a bulk update request to change voice dialing country permissions of one or more countries identified by the
-        /// corresponding [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
-        /// </summary>
-        /// <param name="updateRequest"> URL encoded JSON array of update objects </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of BulkCountryUpdate </returns>
-        public static async System.Threading.Tasks.Task<BulkCountryUpdateResource> CreateAsync(string updateRequest,
-                                                                                               ITwilioRestClient client = null)
-        {
-            var options = new CreateBulkCountryUpdateOptions(updateRequest);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a BulkCountryUpdateResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> BulkCountryUpdateResource object represented by the provided JSON </returns>
-        public static BulkCountryUpdateResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<BulkCountryUpdateResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The number of countries updated
-        /// </summary>
-        [JsonProperty("update_count")]
-        public int? UpdateCount { get; private set; }
-        /// <summary>
-        /// A URL encoded JSON array of update objects
-        /// </summary>
-        [JsonProperty("update_request")]
-        public string UpdateRequest { get; private set; }
-
-        private BulkCountryUpdateResource()
-        {
-
-        }
-    }
+{
+
+  public class BulkCountryUpdateResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateBulkCountryUpdateOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Voice,
+          "/v1/DialingPermissions/BulkCountryUpdates",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Create a bulk update request to change voice dialing country permissions of one or more countries identified by the
+    /// corresponding [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+    /// </summary>
+    /// <param name="options"> Create BulkCountryUpdate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BulkCountryUpdate </returns>
+    public static BulkCountryUpdateResource Create(CreateBulkCountryUpdateOptions options,
+                                                   ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a bulk update request to change voice dialing country permissions of one or more countries identified by the
+    /// corresponding [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+    /// </summary>
+    /// <param name="options"> Create BulkCountryUpdate parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BulkCountryUpdate </returns>
+    public static async System.Threading.Tasks.Task<BulkCountryUpdateResource> CreateAsync(CreateBulkCountryUpdateOptions options,
+                                                                                           ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Create a bulk update request to change voice dialing country permissions of one or more countries identified by the
+    /// corresponding [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+    /// </summary>
+    /// <param name="updateRequest"> URL encoded JSON array of update objects </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of BulkCountryUpdate </returns>
+    public static BulkCountryUpdateResource Create(string updateRequest, ITwilioRestClient client = null)
+    {
+      var options = new CreateBulkCountryUpdateOptions(updateRequest);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Create a bulk update request to change voice dialing country permissions of one or more countries identified by the
+    /// corresponding [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+    /// </summary>
+    /// <param name="updateRequest"> URL encoded JSON array of update objects </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of BulkCountryUpdate </returns>
+    public static async System.Threading.Tasks.Task<BulkCountryUpdateResource> CreateAsync(string updateRequest,
+                                                                                           ITwilioRestClient client = null)
+    {
+      var options = new CreateBulkCountryUpdateOptions(updateRequest);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a BulkCountryUpdateResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> BulkCountryUpdateResource object represented by the provided JSON </returns>
+    public static BulkCountryUpdateResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<BulkCountryUpdateResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The number of countries updated
+    /// </summary>
+    [JsonProperty("update_count")]
+    public int? UpdateCount { get; private set; }
+    /// <summary>
+    /// A URL encoded JSON array of update objects
+    /// </summary>
+    [JsonProperty("update_request")]
+    public string UpdateRequest { get; private set; }
+
+    private BulkCountryUpdateResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/DialingPermissions/Country/HighriskSpecialPrefixOptions.cs b/src/Twilio/Rest/Voice/V1/DialingPermissions/Country/HighriskSpecialPrefixOptions.cs
index e5460dbd2..205e6b4aa 100644
--- a/src/Twilio/Rest/Voice/V1/DialingPermissions/Country/HighriskSpecialPrefixOptions.cs
+++ b/src/Twilio/Rest/Voice/V1/DialingPermissions/Country/HighriskSpecialPrefixOptions.cs
@@ -9,44 +9,44 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Voice.V1.DialingPermissions.Country
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Fetch the high-risk special services prefixes from the country resource corresponding to the [ISO country
+  /// code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+  /// </summary>
+  public class ReadHighriskSpecialPrefixOptions : ReadOptions<HighriskSpecialPrefixResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Fetch the high-risk special services prefixes from the country resource corresponding to the [ISO country
-    /// code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+    /// The ISO 3166-1 country code
     /// </summary>
-    public class ReadHighriskSpecialPrefixOptions : ReadOptions<HighriskSpecialPrefixResource>
-    {
-        /// <summary>
-        /// The ISO 3166-1 country code
-        /// </summary>
-        public string PathIsoCode { get; }
-
-        /// <summary>
-        /// Construct a new ReadHighriskSpecialPrefixOptions
-        /// </summary>
-        /// <param name="pathIsoCode"> The ISO 3166-1 country code </param>
-        public ReadHighriskSpecialPrefixOptions(string pathIsoCode)
-        {
-            PathIsoCode = pathIsoCode;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathIsoCode { get; }
+
+    /// <summary>
+    /// Construct a new ReadHighriskSpecialPrefixOptions
+    /// </summary>
+    /// <param name="pathIsoCode"> The ISO 3166-1 country code </param>
+    public ReadHighriskSpecialPrefixOptions(string pathIsoCode)
+    {
+      PathIsoCode = pathIsoCode;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/DialingPermissions/Country/HighriskSpecialPrefixResource.cs b/src/Twilio/Rest/Voice/V1/DialingPermissions/Country/HighriskSpecialPrefixResource.cs
index 107f81f1e..cbbb065e7 100644
--- a/src/Twilio/Rest/Voice/V1/DialingPermissions/Country/HighriskSpecialPrefixResource.cs
+++ b/src/Twilio/Rest/Voice/V1/DialingPermissions/Country/HighriskSpecialPrefixResource.cs
@@ -19,178 +19,178 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Voice.V1.DialingPermissions.Country
-{
-
-    public class HighriskSpecialPrefixResource : Resource
-    {
-        private static Request BuildReadRequest(ReadHighriskSpecialPrefixOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/DialingPermissions/Countries/" + options.PathIsoCode + "/HighRiskSpecialPrefixes",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch the high-risk special services prefixes from the country resource corresponding to the [ISO country
-        /// code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
-        /// </summary>
-        /// <param name="options"> Read HighriskSpecialPrefix parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of HighriskSpecialPrefix </returns>
-        public static ResourceSet<HighriskSpecialPrefixResource> Read(ReadHighriskSpecialPrefixOptions options,
-                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<HighriskSpecialPrefixResource>.FromJson("content", response.Content);
-            return new ResourceSet<HighriskSpecialPrefixResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the high-risk special services prefixes from the country resource corresponding to the [ISO country
-        /// code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
-        /// </summary>
-        /// <param name="options"> Read HighriskSpecialPrefix parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of HighriskSpecialPrefix </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<HighriskSpecialPrefixResource>> ReadAsync(ReadHighriskSpecialPrefixOptions options,
-                                                                                                              ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<HighriskSpecialPrefixResource>.FromJson("content", response.Content);
-            return new ResourceSet<HighriskSpecialPrefixResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the high-risk special services prefixes from the country resource corresponding to the [ISO country
-        /// code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
-        /// </summary>
-        /// <param name="pathIsoCode"> The ISO 3166-1 country code </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of HighriskSpecialPrefix </returns>
-        public static ResourceSet<HighriskSpecialPrefixResource> Read(string pathIsoCode,
-                                                                      int? pageSize = null,
-                                                                      long? limit = null,
-                                                                      ITwilioRestClient client = null)
-        {
-            var options = new ReadHighriskSpecialPrefixOptions(pathIsoCode){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch the high-risk special services prefixes from the country resource corresponding to the [ISO country
-        /// code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
-        /// </summary>
-        /// <param name="pathIsoCode"> The ISO 3166-1 country code </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of HighriskSpecialPrefix </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<HighriskSpecialPrefixResource>> ReadAsync(string pathIsoCode,
-                                                                                                              int? pageSize = null,
-                                                                                                              long? limit = null,
-                                                                                                              ITwilioRestClient client = null)
-        {
-            var options = new ReadHighriskSpecialPrefixOptions(pathIsoCode){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<HighriskSpecialPrefixResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<HighriskSpecialPrefixResource>.FromJson("content", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<HighriskSpecialPrefixResource> NextPage(Page<HighriskSpecialPrefixResource> page,
-                                                                   ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<HighriskSpecialPrefixResource>.FromJson("content", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<HighriskSpecialPrefixResource> PreviousPage(Page<HighriskSpecialPrefixResource> page,
-                                                                       ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<HighriskSpecialPrefixResource>.FromJson("content", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a HighriskSpecialPrefixResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> HighriskSpecialPrefixResource object represented by the provided JSON </returns>
-        public static HighriskSpecialPrefixResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<HighriskSpecialPrefixResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// A prefix that includes the E.164 assigned country code
-        /// </summary>
-        [JsonProperty("prefix")]
-        public string Prefix { get; private set; }
-
-        private HighriskSpecialPrefixResource()
-        {
-
-        }
-    }
+{
+
+  public class HighriskSpecialPrefixResource : Resource
+  {
+    private static Request BuildReadRequest(ReadHighriskSpecialPrefixOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/DialingPermissions/Countries/" + options.PathIsoCode + "/HighRiskSpecialPrefixes",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch the high-risk special services prefixes from the country resource corresponding to the [ISO country
+    /// code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+    /// </summary>
+    /// <param name="options"> Read HighriskSpecialPrefix parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of HighriskSpecialPrefix </returns>
+    public static ResourceSet<HighriskSpecialPrefixResource> Read(ReadHighriskSpecialPrefixOptions options,
+                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<HighriskSpecialPrefixResource>.FromJson("content", response.Content);
+      return new ResourceSet<HighriskSpecialPrefixResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the high-risk special services prefixes from the country resource corresponding to the [ISO country
+    /// code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+    /// </summary>
+    /// <param name="options"> Read HighriskSpecialPrefix parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of HighriskSpecialPrefix </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<HighriskSpecialPrefixResource>> ReadAsync(ReadHighriskSpecialPrefixOptions options,
+                                                                                                          ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<HighriskSpecialPrefixResource>.FromJson("content", response.Content);
+      return new ResourceSet<HighriskSpecialPrefixResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the high-risk special services prefixes from the country resource corresponding to the [ISO country
+    /// code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+    /// </summary>
+    /// <param name="pathIsoCode"> The ISO 3166-1 country code </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of HighriskSpecialPrefix </returns>
+    public static ResourceSet<HighriskSpecialPrefixResource> Read(string pathIsoCode,
+                                                                  int? pageSize = null,
+                                                                  long? limit = null,
+                                                                  ITwilioRestClient client = null)
+    {
+      var options = new ReadHighriskSpecialPrefixOptions(pathIsoCode) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch the high-risk special services prefixes from the country resource corresponding to the [ISO country
+    /// code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
+    /// </summary>
+    /// <param name="pathIsoCode"> The ISO 3166-1 country code </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of HighriskSpecialPrefix </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<HighriskSpecialPrefixResource>> ReadAsync(string pathIsoCode,
+                                                                                                          int? pageSize = null,
+                                                                                                          long? limit = null,
+                                                                                                          ITwilioRestClient client = null)
+    {
+      var options = new ReadHighriskSpecialPrefixOptions(pathIsoCode) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<HighriskSpecialPrefixResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<HighriskSpecialPrefixResource>.FromJson("content", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<HighriskSpecialPrefixResource> NextPage(Page<HighriskSpecialPrefixResource> page,
+                                                               ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<HighriskSpecialPrefixResource>.FromJson("content", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<HighriskSpecialPrefixResource> PreviousPage(Page<HighriskSpecialPrefixResource> page,
+                                                                   ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<HighriskSpecialPrefixResource>.FromJson("content", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a HighriskSpecialPrefixResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> HighriskSpecialPrefixResource object represented by the provided JSON </returns>
+    public static HighriskSpecialPrefixResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<HighriskSpecialPrefixResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// A prefix that includes the E.164 assigned country code
+    /// </summary>
+    [JsonProperty("prefix")]
+    public string Prefix { get; private set; }
+
+    private HighriskSpecialPrefixResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/DialingPermissions/CountryOptions.cs b/src/Twilio/Rest/Voice/V1/DialingPermissions/CountryOptions.cs
index 933f854fa..5489b1b4e 100644
--- a/src/Twilio/Rest/Voice/V1/DialingPermissions/CountryOptions.cs
+++ b/src/Twilio/Rest/Voice/V1/DialingPermissions/CountryOptions.cs
@@ -9,116 +9,116 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Voice.V1.DialingPermissions
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve voice dialing country permissions identified by the given ISO country code
+  /// </summary>
+  public class FetchCountryOptions : IOptions<CountryResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve voice dialing country permissions identified by the given ISO country code
+    /// The ISO country code
     /// </summary>
-    public class FetchCountryOptions : IOptions<CountryResource>
-    {
-        /// <summary>
-        /// The ISO country code
-        /// </summary>
-        public string PathIsoCode { get; }
-
-        /// <summary>
-        /// Construct a new FetchCountryOptions
-        /// </summary>
-        /// <param name="pathIsoCode"> The ISO country code </param>
-        public FetchCountryOptions(string pathIsoCode)
-        {
-            PathIsoCode = pathIsoCode;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathIsoCode { get; }
+
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve all voice dialing country permissions for this account
+    /// Construct a new FetchCountryOptions
     /// </summary>
-    public class ReadCountryOptions : ReadOptions<CountryResource>
-    {
-        /// <summary>
-        /// Filter to retrieve the country permissions by specifying the ISO country code
-        /// </summary>
-        public string IsoCode { get; set; }
-        /// <summary>
-        /// Filter to retrieve the country permissions by specifying the continent
-        /// </summary>
-        public string Continent { get; set; }
-        /// <summary>
-        /// Country code filter
-        /// </summary>
-        public string CountryCode { get; set; }
-        /// <summary>
-        /// Filter to retrieve the country permissions with dialing to low-risk numbers enabled
-        /// </summary>
-        public bool? LowRiskNumbersEnabled { get; set; }
-        /// <summary>
-        /// Filter to retrieve the country permissions with dialing to high-risk special service numbers enabled
-        /// </summary>
-        public bool? HighRiskSpecialNumbersEnabled { get; set; }
-        /// <summary>
-        /// Filter to retrieve the country permissions with dialing to high-risk toll fraud numbers enabled
-        /// </summary>
-        public bool? HighRiskTollfraudNumbersEnabled { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IsoCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IsoCode", IsoCode.ToString()));
-            }
-
-            if (Continent != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Continent", Continent));
-            }
-
-            if (CountryCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CountryCode", CountryCode));
-            }
-
-            if (LowRiskNumbersEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("LowRiskNumbersEnabled", LowRiskNumbersEnabled.Value.ToString().ToLower()));
-            }
-
-            if (HighRiskSpecialNumbersEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("HighRiskSpecialNumbersEnabled", HighRiskSpecialNumbersEnabled.Value.ToString().ToLower()));
-            }
-
-            if (HighRiskTollfraudNumbersEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("HighRiskTollfraudNumbersEnabled", HighRiskTollfraudNumbersEnabled.Value.ToString().ToLower()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    /// <param name="pathIsoCode"> The ISO country code </param>
+    public FetchCountryOptions(string pathIsoCode)
+    {
+      PathIsoCode = pathIsoCode;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve all voice dialing country permissions for this account
+  /// </summary>
+  public class ReadCountryOptions : ReadOptions<CountryResource>
+  {
+    /// <summary>
+    /// Filter to retrieve the country permissions by specifying the ISO country code
+    /// </summary>
+    public string IsoCode { get; set; }
+    /// <summary>
+    /// Filter to retrieve the country permissions by specifying the continent
+    /// </summary>
+    public string Continent { get; set; }
+    /// <summary>
+    /// Country code filter
+    /// </summary>
+    public string CountryCode { get; set; }
+    /// <summary>
+    /// Filter to retrieve the country permissions with dialing to low-risk numbers enabled
+    /// </summary>
+    public bool? LowRiskNumbersEnabled { get; set; }
+    /// <summary>
+    /// Filter to retrieve the country permissions with dialing to high-risk special service numbers enabled
+    /// </summary>
+    public bool? HighRiskSpecialNumbersEnabled { get; set; }
+    /// <summary>
+    /// Filter to retrieve the country permissions with dialing to high-risk toll fraud numbers enabled
+    /// </summary>
+    public bool? HighRiskTollfraudNumbersEnabled { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IsoCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IsoCode", IsoCode.ToString()));
+      }
+
+      if (Continent != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Continent", Continent));
+      }
+
+      if (CountryCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CountryCode", CountryCode));
+      }
+
+      if (LowRiskNumbersEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("LowRiskNumbersEnabled", LowRiskNumbersEnabled.Value.ToString().ToLower()));
+      }
+
+      if (HighRiskSpecialNumbersEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("HighRiskSpecialNumbersEnabled", HighRiskSpecialNumbersEnabled.Value.ToString().ToLower()));
+      }
+
+      if (HighRiskTollfraudNumbersEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("HighRiskTollfraudNumbersEnabled", HighRiskTollfraudNumbersEnabled.Value.ToString().ToLower()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/DialingPermissions/CountryResource.cs b/src/Twilio/Rest/Voice/V1/DialingPermissions/CountryResource.cs
index e73737a2b..39f816920 100644
--- a/src/Twilio/Rest/Voice/V1/DialingPermissions/CountryResource.cs
+++ b/src/Twilio/Rest/Voice/V1/DialingPermissions/CountryResource.cs
@@ -19,304 +19,304 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Voice.V1.DialingPermissions
-{
-
-    public class CountryResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/DialingPermissions/Countries/" + options.PathIsoCode + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve voice dialing country permissions identified by the given ISO country code
-        /// </summary>
-        /// <param name="options"> Fetch Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static CountryResource Fetch(FetchCountryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve voice dialing country permissions identified by the given ISO country code
-        /// </summary>
-        /// <param name="options"> Fetch Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(FetchCountryOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve voice dialing country permissions identified by the given ISO country code
-        /// </summary>
-        /// <param name="pathIsoCode"> The ISO country code </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static CountryResource Fetch(string pathIsoCode, ITwilioRestClient client = null)
-        {
-            var options = new FetchCountryOptions(pathIsoCode);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve voice dialing country permissions identified by the given ISO country code
-        /// </summary>
-        /// <param name="pathIsoCode"> The ISO country code </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(string pathIsoCode,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchCountryOptions(pathIsoCode);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCountryOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/DialingPermissions/Countries",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve all voice dialing country permissions for this account
-        /// </summary>
-        /// <param name="options"> Read Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static ResourceSet<CountryResource> Read(ReadCountryOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CountryResource>.FromJson("content", response.Content);
-            return new ResourceSet<CountryResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve all voice dialing country permissions for this account
-        /// </summary>
-        /// <param name="options"> Read Country parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(ReadCountryOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CountryResource>.FromJson("content", response.Content);
-            return new ResourceSet<CountryResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve all voice dialing country permissions for this account
-        /// </summary>
-        /// <param name="isoCode"> Filter to retrieve the country permissions by specifying the ISO country code </param>
-        /// <param name="continent"> Filter to retrieve the country permissions by specifying the continent </param>
-        /// <param name="countryCode"> Country code filter </param>
-        /// <param name="lowRiskNumbersEnabled"> Filter to retrieve the country permissions with dialing to low-risk numbers
-        ///                             enabled </param>
-        /// <param name="highRiskSpecialNumbersEnabled"> Filter to retrieve the country permissions with dialing to high-risk
-        ///                                     special service numbers enabled </param>
-        /// <param name="highRiskTollfraudNumbersEnabled"> Filter to retrieve the country permissions with dialing to high-risk
-        ///                                       toll fraud numbers enabled </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Country </returns>
-        public static ResourceSet<CountryResource> Read(string isoCode = null,
-                                                        string continent = null,
-                                                        string countryCode = null,
-                                                        bool? lowRiskNumbersEnabled = null,
-                                                        bool? highRiskSpecialNumbersEnabled = null,
-                                                        bool? highRiskTollfraudNumbersEnabled = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadCountryOptions(){IsoCode = isoCode, Continent = continent, CountryCode = countryCode, LowRiskNumbersEnabled = lowRiskNumbersEnabled, HighRiskSpecialNumbersEnabled = highRiskSpecialNumbersEnabled, HighRiskTollfraudNumbersEnabled = highRiskTollfraudNumbersEnabled, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve all voice dialing country permissions for this account
-        /// </summary>
-        /// <param name="isoCode"> Filter to retrieve the country permissions by specifying the ISO country code </param>
-        /// <param name="continent"> Filter to retrieve the country permissions by specifying the continent </param>
-        /// <param name="countryCode"> Country code filter </param>
-        /// <param name="lowRiskNumbersEnabled"> Filter to retrieve the country permissions with dialing to low-risk numbers
-        ///                             enabled </param>
-        /// <param name="highRiskSpecialNumbersEnabled"> Filter to retrieve the country permissions with dialing to high-risk
-        ///                                     special service numbers enabled </param>
-        /// <param name="highRiskTollfraudNumbersEnabled"> Filter to retrieve the country permissions with dialing to high-risk
-        ///                                       toll fraud numbers enabled </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Country </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(string isoCode = null,
-                                                                                                string continent = null,
-                                                                                                string countryCode = null,
-                                                                                                bool? lowRiskNumbersEnabled = null,
-                                                                                                bool? highRiskSpecialNumbersEnabled = null,
-                                                                                                bool? highRiskTollfraudNumbersEnabled = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadCountryOptions(){IsoCode = isoCode, Continent = continent, CountryCode = countryCode, LowRiskNumbersEnabled = lowRiskNumbersEnabled, HighRiskSpecialNumbersEnabled = highRiskSpecialNumbersEnabled, HighRiskTollfraudNumbersEnabled = highRiskTollfraudNumbersEnabled, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CountryResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("content", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CountryResource> NextPage(Page<CountryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("content", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CountryResource> PreviousPage(Page<CountryResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<CountryResource>.FromJson("content", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a CountryResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CountryResource object represented by the provided JSON </returns>
-        public static CountryResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CountryResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The ISO country code
-        /// </summary>
-        [JsonProperty("iso_code")]
-        public string IsoCode { get; private set; }
-        /// <summary>
-        /// The name of the country
-        /// </summary>
-        [JsonProperty("name")]
-        public string Name { get; private set; }
-        /// <summary>
-        /// The name of the continent in which the country is located
-        /// </summary>
-        [JsonProperty("continent")]
-        public string Continent { get; private set; }
-        /// <summary>
-        /// The E.164 assigned country codes(s)
-        /// </summary>
-        [JsonProperty("country_codes")]
-        public List<string> CountryCodes { get; private set; }
-        /// <summary>
-        /// Whether dialing to low-risk numbers is enabled
-        /// </summary>
-        [JsonProperty("low_risk_numbers_enabled")]
-        public bool? LowRiskNumbersEnabled { get; private set; }
-        /// <summary>
-        /// Whether dialing to high-risk special services numbers is enabled
-        /// </summary>
-        [JsonProperty("high_risk_special_numbers_enabled")]
-        public bool? HighRiskSpecialNumbersEnabled { get; private set; }
-        /// <summary>
-        /// Whether dialing to high-risk toll fraud numbers is enabled, else `false`
-        /// </summary>
-        [JsonProperty("high_risk_tollfraud_numbers_enabled")]
-        public bool? HighRiskTollfraudNumbersEnabled { get; private set; }
-        /// <summary>
-        /// The absolute URL of this resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// A list of URLs related to this resource
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-
-        private CountryResource()
-        {
-
-        }
-    }
+{
+
+  public class CountryResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/DialingPermissions/Countries/" + options.PathIsoCode + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve voice dialing country permissions identified by the given ISO country code
+    /// </summary>
+    /// <param name="options"> Fetch Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static CountryResource Fetch(FetchCountryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve voice dialing country permissions identified by the given ISO country code
+    /// </summary>
+    /// <param name="options"> Fetch Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(FetchCountryOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve voice dialing country permissions identified by the given ISO country code
+    /// </summary>
+    /// <param name="pathIsoCode"> The ISO country code </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static CountryResource Fetch(string pathIsoCode, ITwilioRestClient client = null)
+    {
+      var options = new FetchCountryOptions(pathIsoCode);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve voice dialing country permissions identified by the given ISO country code
+    /// </summary>
+    /// <param name="pathIsoCode"> The ISO country code </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<CountryResource> FetchAsync(string pathIsoCode,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchCountryOptions(pathIsoCode);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCountryOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/DialingPermissions/Countries",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve all voice dialing country permissions for this account
+    /// </summary>
+    /// <param name="options"> Read Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static ResourceSet<CountryResource> Read(ReadCountryOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CountryResource>.FromJson("content", response.Content);
+      return new ResourceSet<CountryResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve all voice dialing country permissions for this account
+    /// </summary>
+    /// <param name="options"> Read Country parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(ReadCountryOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CountryResource>.FromJson("content", response.Content);
+      return new ResourceSet<CountryResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve all voice dialing country permissions for this account
+    /// </summary>
+    /// <param name="isoCode"> Filter to retrieve the country permissions by specifying the ISO country code </param>
+    /// <param name="continent"> Filter to retrieve the country permissions by specifying the continent </param>
+    /// <param name="countryCode"> Country code filter </param>
+    /// <param name="lowRiskNumbersEnabled"> Filter to retrieve the country permissions with dialing to low-risk numbers
+    ///                             enabled </param>
+    /// <param name="highRiskSpecialNumbersEnabled"> Filter to retrieve the country permissions with dialing to high-risk
+    ///                                     special service numbers enabled </param>
+    /// <param name="highRiskTollfraudNumbersEnabled"> Filter to retrieve the country permissions with dialing to high-risk
+    ///                                       toll fraud numbers enabled </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Country </returns>
+    public static ResourceSet<CountryResource> Read(string isoCode = null,
+                                                    string continent = null,
+                                                    string countryCode = null,
+                                                    bool? lowRiskNumbersEnabled = null,
+                                                    bool? highRiskSpecialNumbersEnabled = null,
+                                                    bool? highRiskTollfraudNumbersEnabled = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadCountryOptions() { IsoCode = isoCode, Continent = continent, CountryCode = countryCode, LowRiskNumbersEnabled = lowRiskNumbersEnabled, HighRiskSpecialNumbersEnabled = highRiskSpecialNumbersEnabled, HighRiskTollfraudNumbersEnabled = highRiskTollfraudNumbersEnabled, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve all voice dialing country permissions for this account
+    /// </summary>
+    /// <param name="isoCode"> Filter to retrieve the country permissions by specifying the ISO country code </param>
+    /// <param name="continent"> Filter to retrieve the country permissions by specifying the continent </param>
+    /// <param name="countryCode"> Country code filter </param>
+    /// <param name="lowRiskNumbersEnabled"> Filter to retrieve the country permissions with dialing to low-risk numbers
+    ///                             enabled </param>
+    /// <param name="highRiskSpecialNumbersEnabled"> Filter to retrieve the country permissions with dialing to high-risk
+    ///                                     special service numbers enabled </param>
+    /// <param name="highRiskTollfraudNumbersEnabled"> Filter to retrieve the country permissions with dialing to high-risk
+    ///                                       toll fraud numbers enabled </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Country </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CountryResource>> ReadAsync(string isoCode = null,
+                                                                                            string continent = null,
+                                                                                            string countryCode = null,
+                                                                                            bool? lowRiskNumbersEnabled = null,
+                                                                                            bool? highRiskSpecialNumbersEnabled = null,
+                                                                                            bool? highRiskTollfraudNumbersEnabled = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadCountryOptions() { IsoCode = isoCode, Continent = continent, CountryCode = countryCode, LowRiskNumbersEnabled = lowRiskNumbersEnabled, HighRiskSpecialNumbersEnabled = highRiskSpecialNumbersEnabled, HighRiskTollfraudNumbersEnabled = highRiskTollfraudNumbersEnabled, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CountryResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("content", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CountryResource> NextPage(Page<CountryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("content", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CountryResource> PreviousPage(Page<CountryResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<CountryResource>.FromJson("content", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a CountryResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CountryResource object represented by the provided JSON </returns>
+    public static CountryResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CountryResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The ISO country code
+    /// </summary>
+    [JsonProperty("iso_code")]
+    public string IsoCode { get; private set; }
+    /// <summary>
+    /// The name of the country
+    /// </summary>
+    [JsonProperty("name")]
+    public string Name { get; private set; }
+    /// <summary>
+    /// The name of the continent in which the country is located
+    /// </summary>
+    [JsonProperty("continent")]
+    public string Continent { get; private set; }
+    /// <summary>
+    /// The E.164 assigned country codes(s)
+    /// </summary>
+    [JsonProperty("country_codes")]
+    public List<string> CountryCodes { get; private set; }
+    /// <summary>
+    /// Whether dialing to low-risk numbers is enabled
+    /// </summary>
+    [JsonProperty("low_risk_numbers_enabled")]
+    public bool? LowRiskNumbersEnabled { get; private set; }
+    /// <summary>
+    /// Whether dialing to high-risk special services numbers is enabled
+    /// </summary>
+    [JsonProperty("high_risk_special_numbers_enabled")]
+    public bool? HighRiskSpecialNumbersEnabled { get; private set; }
+    /// <summary>
+    /// Whether dialing to high-risk toll fraud numbers is enabled, else `false`
+    /// </summary>
+    [JsonProperty("high_risk_tollfraud_numbers_enabled")]
+    public bool? HighRiskTollfraudNumbersEnabled { get; private set; }
+    /// <summary>
+    /// The absolute URL of this resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// A list of URLs related to this resource
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+
+    private CountryResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/DialingPermissions/SettingsOptions.cs b/src/Twilio/Rest/Voice/V1/DialingPermissions/SettingsOptions.cs
index 4daf42ed8..17c49911b 100644
--- a/src/Twilio/Rest/Voice/V1/DialingPermissions/SettingsOptions.cs
+++ b/src/Twilio/Rest/Voice/V1/DialingPermissions/SettingsOptions.cs
@@ -9,52 +9,52 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Voice.V1.DialingPermissions
-{
-
+{
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Retrieve voice dialing permissions inheritance for the sub-account
+  /// </summary>
+  public class FetchSettingsOptions : IOptions<SettingsResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Retrieve voice dialing permissions inheritance for the sub-account
+    /// Generate the necessary parameters
     /// </summary>
-    public class FetchSettingsOptions : IOptions<SettingsResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
+  /// currently do not have developer preview access, please contact help@twilio.com.
+  ///
+  /// Update voice dialing permissions inheritance for the sub-account
+  /// </summary>
+  public class UpdateSettingsOptions : IOptions<SettingsResource>
+  {
     /// <summary>
-    /// PLEASE NOTE that this class contains preview products that are subject to change. Use them with caution. If you
-    /// currently do not have developer preview access, please contact help@twilio.com.
-    ///
-    /// Update voice dialing permissions inheritance for the sub-account
+    /// `true` for the sub-account to inherit voice dialing permissions from the Master Project; otherwise `false`
     /// </summary>
-    public class UpdateSettingsOptions : IOptions<SettingsResource>
-    {
-        /// <summary>
-        /// `true` for the sub-account to inherit voice dialing permissions from the Master Project; otherwise `false`
-        /// </summary>
-        public bool? DialingPermissionsInheritance { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (DialingPermissionsInheritance != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DialingPermissionsInheritance", DialingPermissionsInheritance.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
+    public bool? DialingPermissionsInheritance { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (DialingPermissionsInheritance != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DialingPermissionsInheritance", DialingPermissionsInheritance.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/DialingPermissions/SettingsResource.cs b/src/Twilio/Rest/Voice/V1/DialingPermissions/SettingsResource.cs
index 805f7fa1b..cafc05b09 100644
--- a/src/Twilio/Rest/Voice/V1/DialingPermissions/SettingsResource.cs
+++ b/src/Twilio/Rest/Voice/V1/DialingPermissions/SettingsResource.cs
@@ -19,176 +19,176 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Voice.V1.DialingPermissions
-{
-
-    public class SettingsResource : Resource
-    {
-        private static Request BuildFetchRequest(FetchSettingsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/Settings",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve voice dialing permissions inheritance for the sub-account
-        /// </summary>
-        /// <param name="options"> Fetch Settings parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Settings </returns>
-        public static SettingsResource Fetch(FetchSettingsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve voice dialing permissions inheritance for the sub-account
-        /// </summary>
-        /// <param name="options"> Fetch Settings parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Settings </returns>
-        public static async System.Threading.Tasks.Task<SettingsResource> FetchAsync(FetchSettingsOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve voice dialing permissions inheritance for the sub-account
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Settings </returns>
-        public static SettingsResource Fetch(ITwilioRestClient client = null)
-        {
-            var options = new FetchSettingsOptions();
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve voice dialing permissions inheritance for the sub-account
-        /// </summary>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Settings </returns>
-        public static async System.Threading.Tasks.Task<SettingsResource> FetchAsync(ITwilioRestClient client = null)
-        {
-            var options = new FetchSettingsOptions();
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateSettingsOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Voice,
-                "/v1/Settings",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Update voice dialing permissions inheritance for the sub-account
-        /// </summary>
-        /// <param name="options"> Update Settings parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Settings </returns>
-        public static SettingsResource Update(UpdateSettingsOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update voice dialing permissions inheritance for the sub-account
-        /// </summary>
-        /// <param name="options"> Update Settings parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Settings </returns>
-        public static async System.Threading.Tasks.Task<SettingsResource> UpdateAsync(UpdateSettingsOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Update voice dialing permissions inheritance for the sub-account
-        /// </summary>
-        /// <param name="dialingPermissionsInheritance"> `true` for the sub-account to inherit voice dialing permissions from
-        ///                                     the Master Project; otherwise `false` </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Settings </returns>
-        public static SettingsResource Update(bool? dialingPermissionsInheritance = null, ITwilioRestClient client = null)
-        {
-            var options = new UpdateSettingsOptions(){DialingPermissionsInheritance = dialingPermissionsInheritance};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Update voice dialing permissions inheritance for the sub-account
-        /// </summary>
-        /// <param name="dialingPermissionsInheritance"> `true` for the sub-account to inherit voice dialing permissions from
-        ///                                     the Master Project; otherwise `false` </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Settings </returns>
-        public static async System.Threading.Tasks.Task<SettingsResource> UpdateAsync(bool? dialingPermissionsInheritance = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateSettingsOptions(){DialingPermissionsInheritance = dialingPermissionsInheritance};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SettingsResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SettingsResource object represented by the provided JSON </returns>
-        public static SettingsResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SettingsResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// `true` if the sub-account will inherit voice dialing permissions from the Master Project; otherwise `false`
-        /// </summary>
-        [JsonProperty("dialing_permissions_inheritance")]
-        public bool? DialingPermissionsInheritance { get; private set; }
-        /// <summary>
-        /// The absolute URL of this resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SettingsResource()
-        {
-
-        }
-    }
+{
+
+  public class SettingsResource : Resource
+  {
+    private static Request BuildFetchRequest(FetchSettingsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/Settings",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve voice dialing permissions inheritance for the sub-account
+    /// </summary>
+    /// <param name="options"> Fetch Settings parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Settings </returns>
+    public static SettingsResource Fetch(FetchSettingsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve voice dialing permissions inheritance for the sub-account
+    /// </summary>
+    /// <param name="options"> Fetch Settings parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Settings </returns>
+    public static async System.Threading.Tasks.Task<SettingsResource> FetchAsync(FetchSettingsOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve voice dialing permissions inheritance for the sub-account
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Settings </returns>
+    public static SettingsResource Fetch(ITwilioRestClient client = null)
+    {
+      var options = new FetchSettingsOptions();
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve voice dialing permissions inheritance for the sub-account
+    /// </summary>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Settings </returns>
+    public static async System.Threading.Tasks.Task<SettingsResource> FetchAsync(ITwilioRestClient client = null)
+    {
+      var options = new FetchSettingsOptions();
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateSettingsOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Voice,
+          "/v1/Settings",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Update voice dialing permissions inheritance for the sub-account
+    /// </summary>
+    /// <param name="options"> Update Settings parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Settings </returns>
+    public static SettingsResource Update(UpdateSettingsOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update voice dialing permissions inheritance for the sub-account
+    /// </summary>
+    /// <param name="options"> Update Settings parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Settings </returns>
+    public static async System.Threading.Tasks.Task<SettingsResource> UpdateAsync(UpdateSettingsOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Update voice dialing permissions inheritance for the sub-account
+    /// </summary>
+    /// <param name="dialingPermissionsInheritance"> `true` for the sub-account to inherit voice dialing permissions from
+    ///                                     the Master Project; otherwise `false` </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Settings </returns>
+    public static SettingsResource Update(bool? dialingPermissionsInheritance = null, ITwilioRestClient client = null)
+    {
+      var options = new UpdateSettingsOptions() { DialingPermissionsInheritance = dialingPermissionsInheritance };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Update voice dialing permissions inheritance for the sub-account
+    /// </summary>
+    /// <param name="dialingPermissionsInheritance"> `true` for the sub-account to inherit voice dialing permissions from
+    ///                                     the Master Project; otherwise `false` </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Settings </returns>
+    public static async System.Threading.Tasks.Task<SettingsResource> UpdateAsync(bool? dialingPermissionsInheritance = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateSettingsOptions() { DialingPermissionsInheritance = dialingPermissionsInheritance };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SettingsResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SettingsResource object represented by the provided JSON </returns>
+    public static SettingsResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SettingsResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// `true` if the sub-account will inherit voice dialing permissions from the Master Project; otherwise `false`
+    /// </summary>
+    [JsonProperty("dialing_permissions_inheritance")]
+    public bool? DialingPermissionsInheritance { get; private set; }
+    /// <summary>
+    /// The absolute URL of this resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SettingsResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/IpRecordOptions.cs b/src/Twilio/Rest/Voice/V1/IpRecordOptions.cs
index ba2e308c9..3cd23815a 100644
--- a/src/Twilio/Rest/Voice/V1/IpRecordOptions.cs
+++ b/src/Twilio/Rest/Voice/V1/IpRecordOptions.cs
@@ -9,174 +9,174 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Voice.V1
-{
-
+{
+
+  /// <summary>
+  /// CreateIpRecordOptions
+  /// </summary>
+  public class CreateIpRecordOptions : IOptions<IpRecordResource>
+  {
     /// <summary>
-    /// CreateIpRecordOptions
-    /// </summary>
-    public class CreateIpRecordOptions : IOptions<IpRecordResource>
-    {
-        /// <summary>
-        /// An IP address in dotted decimal notation, IPv4 only.
-        /// </summary>
-        public string IpAddress { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// An integer representing the length of the [CIDR](https://tools.ietf.org/html/rfc4632) prefix to use with this IP address. By default the entire IP address is used, which for IPv4 is value 32.
-        /// </summary>
-        public int? CidrPrefixLength { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateIpRecordOptions
-        /// </summary>
-        /// <param name="ipAddress"> An IP address in dotted decimal notation, IPv4 only. </param>
-        public CreateIpRecordOptions(string ipAddress)
-        {
-            IpAddress = ipAddress;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IpAddress != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IpAddress", IpAddress));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (CidrPrefixLength != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CidrPrefixLength", CidrPrefixLength.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// An IP address in dotted decimal notation, IPv4 only.
+    /// </summary>
+    public string IpAddress { get; }
     /// <summary>
-    /// FetchIpRecordOptions
+    /// A string to describe the resource
     /// </summary>
-    public class FetchIpRecordOptions : IOptions<IpRecordResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchIpRecordOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchIpRecordOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string FriendlyName { get; set; }
     /// <summary>
-    /// ReadIpRecordOptions
-    /// </summary>
-    public class ReadIpRecordOptions : ReadOptions<IpRecordResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// An integer representing the length of the [CIDR](https://tools.ietf.org/html/rfc4632) prefix to use with this IP address. By default the entire IP address is used, which for IPv4 is value 32.
+    /// </summary>
+    public int? CidrPrefixLength { get; set; }
+
     /// <summary>
-    /// UpdateIpRecordOptions
-    /// </summary>
-    public class UpdateIpRecordOptions : IOptions<IpRecordResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateIpRecordOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public UpdateIpRecordOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new CreateIpRecordOptions
+    /// </summary>
+    /// <param name="ipAddress"> An IP address in dotted decimal notation, IPv4 only. </param>
+    public CreateIpRecordOptions(string ipAddress)
+    {
+      IpAddress = ipAddress;
+    }
+
     /// <summary>
-    /// DeleteIpRecordOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class DeleteIpRecordOptions : IOptions<IpRecordResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteIpRecordOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteIpRecordOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IpAddress != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IpAddress", IpAddress));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (CidrPrefixLength != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CidrPrefixLength", CidrPrefixLength.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchIpRecordOptions
+  /// </summary>
+  public class FetchIpRecordOptions : IOptions<IpRecordResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchIpRecordOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchIpRecordOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadIpRecordOptions
+  /// </summary>
+  public class ReadIpRecordOptions : ReadOptions<IpRecordResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateIpRecordOptions
+  /// </summary>
+  public class UpdateIpRecordOptions : IOptions<IpRecordResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateIpRecordOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public UpdateIpRecordOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteIpRecordOptions
+  /// </summary>
+  public class DeleteIpRecordOptions : IOptions<IpRecordResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteIpRecordOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteIpRecordOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/IpRecordResource.cs b/src/Twilio/Rest/Voice/V1/IpRecordResource.cs
index d9f591111..4a2dec423 100644
--- a/src/Twilio/Rest/Voice/V1/IpRecordResource.cs
+++ b/src/Twilio/Rest/Voice/V1/IpRecordResource.cs
@@ -16,485 +16,485 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Voice.V1
-{
-
-    public class IpRecordResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateIpRecordOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Voice,
-                "/v1/IpRecords",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create IpRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpRecord </returns>
-        public static IpRecordResource Create(CreateIpRecordOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create IpRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpRecord </returns>
-        public static async System.Threading.Tasks.Task<IpRecordResource> CreateAsync(CreateIpRecordOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="ipAddress"> An IP address in dotted decimal notation, IPv4 only. </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="cidrPrefixLength"> An integer representing the length of the
-        ///                        [CIDR](https://tools.ietf.org/html/rfc4632) prefix to use with this IP address. By default
-        ///                        the entire IP address is used, which for IPv4 is value 32. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpRecord </returns>
-        public static IpRecordResource Create(string ipAddress,
-                                              string friendlyName = null,
-                                              int? cidrPrefixLength = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateIpRecordOptions(ipAddress){FriendlyName = friendlyName, CidrPrefixLength = cidrPrefixLength};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="ipAddress"> An IP address in dotted decimal notation, IPv4 only. </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="cidrPrefixLength"> An integer representing the length of the
-        ///                        [CIDR](https://tools.ietf.org/html/rfc4632) prefix to use with this IP address. By default
-        ///                        the entire IP address is used, which for IPv4 is value 32. </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpRecord </returns>
-        public static async System.Threading.Tasks.Task<IpRecordResource> CreateAsync(string ipAddress,
-                                                                                      string friendlyName = null,
-                                                                                      int? cidrPrefixLength = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateIpRecordOptions(ipAddress){FriendlyName = friendlyName, CidrPrefixLength = cidrPrefixLength};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchIpRecordOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/IpRecords/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch IpRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpRecord </returns>
-        public static IpRecordResource Fetch(FetchIpRecordOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch IpRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpRecord </returns>
-        public static async System.Threading.Tasks.Task<IpRecordResource> FetchAsync(FetchIpRecordOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpRecord </returns>
-        public static IpRecordResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchIpRecordOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpRecord </returns>
-        public static async System.Threading.Tasks.Task<IpRecordResource> FetchAsync(string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchIpRecordOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadIpRecordOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/IpRecords",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read IpRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpRecord </returns>
-        public static ResourceSet<IpRecordResource> Read(ReadIpRecordOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<IpRecordResource>.FromJson("ip_records", response.Content);
-            return new ResourceSet<IpRecordResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read IpRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpRecord </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IpRecordResource>> ReadAsync(ReadIpRecordOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<IpRecordResource>.FromJson("ip_records", response.Content);
-            return new ResourceSet<IpRecordResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpRecord </returns>
-        public static ResourceSet<IpRecordResource> Read(int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadIpRecordOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpRecord </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<IpRecordResource>> ReadAsync(int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadIpRecordOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<IpRecordResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<IpRecordResource>.FromJson("ip_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<IpRecordResource> NextPage(Page<IpRecordResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<IpRecordResource>.FromJson("ip_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<IpRecordResource> PreviousPage(Page<IpRecordResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<IpRecordResource>.FromJson("ip_records", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateIpRecordOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Voice,
-                "/v1/IpRecords/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update IpRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpRecord </returns>
-        public static IpRecordResource Update(UpdateIpRecordOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update IpRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpRecord </returns>
-        public static async System.Threading.Tasks.Task<IpRecordResource> UpdateAsync(UpdateIpRecordOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpRecord </returns>
-        public static IpRecordResource Update(string pathSid, string friendlyName = null, ITwilioRestClient client = null)
-        {
-            var options = new UpdateIpRecordOptions(pathSid){FriendlyName = friendlyName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpRecord </returns>
-        public static async System.Threading.Tasks.Task<IpRecordResource> UpdateAsync(string pathSid,
-                                                                                      string friendlyName = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateIpRecordOptions(pathSid){FriendlyName = friendlyName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteIpRecordOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Voice,
-                "/v1/IpRecords/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete IpRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpRecord </returns>
-        public static bool Delete(DeleteIpRecordOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete IpRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpRecord </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteIpRecordOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of IpRecord </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteIpRecordOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of IpRecord </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteIpRecordOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a IpRecordResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> IpRecordResource object represented by the provided JSON </returns>
-        public static IpRecordResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<IpRecordResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// An IP address in dotted decimal notation, IPv4 only.
-        /// </summary>
-        [JsonProperty("ip_address")]
-        public string IpAddress { get; private set; }
-        /// <summary>
-        /// An integer representing the length of the [CIDR](https://tools.ietf.org/html/rfc4632) prefix to use with this IP address. By default the entire IP address is used, which for IPv4 is value 32.
-        /// </summary>
-        [JsonProperty("cidr_prefix_length")]
-        public int? CidrPrefixLength { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private IpRecordResource()
-        {
-
-        }
-    }
+{
+
+  public class IpRecordResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateIpRecordOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Voice,
+          "/v1/IpRecords",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create IpRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpRecord </returns>
+    public static IpRecordResource Create(CreateIpRecordOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create IpRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpRecord </returns>
+    public static async System.Threading.Tasks.Task<IpRecordResource> CreateAsync(CreateIpRecordOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="ipAddress"> An IP address in dotted decimal notation, IPv4 only. </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="cidrPrefixLength"> An integer representing the length of the
+    ///                        [CIDR](https://tools.ietf.org/html/rfc4632) prefix to use with this IP address. By default
+    ///                        the entire IP address is used, which for IPv4 is value 32. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpRecord </returns>
+    public static IpRecordResource Create(string ipAddress,
+                                          string friendlyName = null,
+                                          int? cidrPrefixLength = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateIpRecordOptions(ipAddress) { FriendlyName = friendlyName, CidrPrefixLength = cidrPrefixLength };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="ipAddress"> An IP address in dotted decimal notation, IPv4 only. </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="cidrPrefixLength"> An integer representing the length of the
+    ///                        [CIDR](https://tools.ietf.org/html/rfc4632) prefix to use with this IP address. By default
+    ///                        the entire IP address is used, which for IPv4 is value 32. </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpRecord </returns>
+    public static async System.Threading.Tasks.Task<IpRecordResource> CreateAsync(string ipAddress,
+                                                                                  string friendlyName = null,
+                                                                                  int? cidrPrefixLength = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateIpRecordOptions(ipAddress) { FriendlyName = friendlyName, CidrPrefixLength = cidrPrefixLength };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchIpRecordOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/IpRecords/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch IpRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpRecord </returns>
+    public static IpRecordResource Fetch(FetchIpRecordOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch IpRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpRecord </returns>
+    public static async System.Threading.Tasks.Task<IpRecordResource> FetchAsync(FetchIpRecordOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpRecord </returns>
+    public static IpRecordResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchIpRecordOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpRecord </returns>
+    public static async System.Threading.Tasks.Task<IpRecordResource> FetchAsync(string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchIpRecordOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadIpRecordOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/IpRecords",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read IpRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpRecord </returns>
+    public static ResourceSet<IpRecordResource> Read(ReadIpRecordOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<IpRecordResource>.FromJson("ip_records", response.Content);
+      return new ResourceSet<IpRecordResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read IpRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpRecord </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IpRecordResource>> ReadAsync(ReadIpRecordOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<IpRecordResource>.FromJson("ip_records", response.Content);
+      return new ResourceSet<IpRecordResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpRecord </returns>
+    public static ResourceSet<IpRecordResource> Read(int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadIpRecordOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpRecord </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<IpRecordResource>> ReadAsync(int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadIpRecordOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<IpRecordResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<IpRecordResource>.FromJson("ip_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<IpRecordResource> NextPage(Page<IpRecordResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<IpRecordResource>.FromJson("ip_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<IpRecordResource> PreviousPage(Page<IpRecordResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<IpRecordResource>.FromJson("ip_records", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateIpRecordOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Voice,
+          "/v1/IpRecords/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update IpRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpRecord </returns>
+    public static IpRecordResource Update(UpdateIpRecordOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update IpRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpRecord </returns>
+    public static async System.Threading.Tasks.Task<IpRecordResource> UpdateAsync(UpdateIpRecordOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpRecord </returns>
+    public static IpRecordResource Update(string pathSid, string friendlyName = null, ITwilioRestClient client = null)
+    {
+      var options = new UpdateIpRecordOptions(pathSid) { FriendlyName = friendlyName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpRecord </returns>
+    public static async System.Threading.Tasks.Task<IpRecordResource> UpdateAsync(string pathSid,
+                                                                                  string friendlyName = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateIpRecordOptions(pathSid) { FriendlyName = friendlyName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteIpRecordOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Voice,
+          "/v1/IpRecords/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete IpRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpRecord </returns>
+    public static bool Delete(DeleteIpRecordOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete IpRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpRecord </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteIpRecordOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of IpRecord </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteIpRecordOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of IpRecord </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteIpRecordOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a IpRecordResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> IpRecordResource object represented by the provided JSON </returns>
+    public static IpRecordResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<IpRecordResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// An IP address in dotted decimal notation, IPv4 only.
+    /// </summary>
+    [JsonProperty("ip_address")]
+    public string IpAddress { get; private set; }
+    /// <summary>
+    /// An integer representing the length of the [CIDR](https://tools.ietf.org/html/rfc4632) prefix to use with this IP address. By default the entire IP address is used, which for IPv4 is value 32.
+    /// </summary>
+    [JsonProperty("cidr_prefix_length")]
+    public int? CidrPrefixLength { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private IpRecordResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/SourceIpMappingOptions.cs b/src/Twilio/Rest/Voice/V1/SourceIpMappingOptions.cs
index 6818c0c6b..bb5900da9 100644
--- a/src/Twilio/Rest/Voice/V1/SourceIpMappingOptions.cs
+++ b/src/Twilio/Rest/Voice/V1/SourceIpMappingOptions.cs
@@ -9,169 +9,169 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Voice.V1
-{
-
+{
+
+  /// <summary>
+  /// CreateSourceIpMappingOptions
+  /// </summary>
+  public class CreateSourceIpMappingOptions : IOptions<SourceIpMappingResource>
+  {
     /// <summary>
-    /// CreateSourceIpMappingOptions
+    /// The unique string that identifies an IP Record
     /// </summary>
-    public class CreateSourceIpMappingOptions : IOptions<SourceIpMappingResource>
-    {
-        /// <summary>
-        /// The unique string that identifies an IP Record
-        /// </summary>
-        public string IpRecordSid { get; }
-        /// <summary>
-        /// The unique string that identifies a SIP Domain
-        /// </summary>
-        public string SipDomainSid { get; }
-
-        /// <summary>
-        /// Construct a new CreateSourceIpMappingOptions
-        /// </summary>
-        /// <param name="ipRecordSid"> The unique string that identifies an IP Record </param>
-        /// <param name="sipDomainSid"> The unique string that identifies a SIP Domain </param>
-        public CreateSourceIpMappingOptions(string ipRecordSid, string sipDomainSid)
-        {
-            IpRecordSid = ipRecordSid;
-            SipDomainSid = sipDomainSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (IpRecordSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IpRecordSid", IpRecordSid.ToString()));
-            }
-
-            if (SipDomainSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipDomainSid", SipDomainSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public string IpRecordSid { get; }
     /// <summary>
-    /// FetchSourceIpMappingOptions
+    /// The unique string that identifies a SIP Domain
     /// </summary>
-    public class FetchSourceIpMappingOptions : IOptions<SourceIpMappingResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSourceIpMappingOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public FetchSourceIpMappingOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string SipDomainSid { get; }
+
     /// <summary>
-    /// ReadSourceIpMappingOptions
+    /// Construct a new CreateSourceIpMappingOptions
     /// </summary>
-    public class ReadSourceIpMappingOptions : ReadOptions<SourceIpMappingResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="ipRecordSid"> The unique string that identifies an IP Record </param>
+    /// <param name="sipDomainSid"> The unique string that identifies a SIP Domain </param>
+    public CreateSourceIpMappingOptions(string ipRecordSid, string sipDomainSid)
+    {
+      IpRecordSid = ipRecordSid;
+      SipDomainSid = sipDomainSid;
+    }
+
     /// <summary>
-    /// UpdateSourceIpMappingOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateSourceIpMappingOptions : IOptions<SourceIpMappingResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// The unique string that identifies a SIP Domain
-        /// </summary>
-        public string SipDomainSid { get; }
-
-        /// <summary>
-        /// Construct a new UpdateSourceIpMappingOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="sipDomainSid"> The unique string that identifies a SIP Domain </param>
-        public UpdateSourceIpMappingOptions(string pathSid, string sipDomainSid)
-        {
-            PathSid = pathSid;
-            SipDomainSid = sipDomainSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (SipDomainSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SipDomainSid", SipDomainSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (IpRecordSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IpRecordSid", IpRecordSid.ToString()));
+      }
+
+      if (SipDomainSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipDomainSid", SipDomainSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchSourceIpMappingOptions
+  /// </summary>
+  public class FetchSourceIpMappingOptions : IOptions<SourceIpMappingResource>
+  {
     /// <summary>
-    /// DeleteSourceIpMappingOptions
+    /// The unique string that identifies the resource
     /// </summary>
-    public class DeleteSourceIpMappingOptions : IOptions<SourceIpMappingResource>
-    {
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSourceIpMappingOptions
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        public DeleteSourceIpMappingOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new FetchSourceIpMappingOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public FetchSourceIpMappingOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// ReadSourceIpMappingOptions
+  /// </summary>
+  public class ReadSourceIpMappingOptions : ReadOptions<SourceIpMappingResource>
+  {
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateSourceIpMappingOptions
+  /// </summary>
+  public class UpdateSourceIpMappingOptions : IOptions<SourceIpMappingResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// The unique string that identifies a SIP Domain
+    /// </summary>
+    public string SipDomainSid { get; }
+
+    /// <summary>
+    /// Construct a new UpdateSourceIpMappingOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="sipDomainSid"> The unique string that identifies a SIP Domain </param>
+    public UpdateSourceIpMappingOptions(string pathSid, string sipDomainSid)
+    {
+      PathSid = pathSid;
+      SipDomainSid = sipDomainSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (SipDomainSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SipDomainSid", SipDomainSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteSourceIpMappingOptions
+  /// </summary>
+  public class DeleteSourceIpMappingOptions : IOptions<SourceIpMappingResource>
+  {
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSourceIpMappingOptions
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    public DeleteSourceIpMappingOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Voice/V1/SourceIpMappingResource.cs b/src/Twilio/Rest/Voice/V1/SourceIpMappingResource.cs
index 305dcdb24..bd9e47cb1 100644
--- a/src/Twilio/Rest/Voice/V1/SourceIpMappingResource.cs
+++ b/src/Twilio/Rest/Voice/V1/SourceIpMappingResource.cs
@@ -16,469 +16,469 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Voice.V1
-{
-
-    public class SourceIpMappingResource : Resource
-    {
-        private static Request BuildCreateRequest(CreateSourceIpMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Voice,
-                "/v1/SourceIpMappings",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SourceIpMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SourceIpMapping </returns>
-        public static SourceIpMappingResource Create(CreateSourceIpMappingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create SourceIpMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
-        public static async System.Threading.Tasks.Task<SourceIpMappingResource> CreateAsync(CreateSourceIpMappingOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="ipRecordSid"> The unique string that identifies an IP Record </param>
-        /// <param name="sipDomainSid"> The unique string that identifies a SIP Domain </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SourceIpMapping </returns>
-        public static SourceIpMappingResource Create(string ipRecordSid,
-                                                     string sipDomainSid,
-                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateSourceIpMappingOptions(ipRecordSid, sipDomainSid);
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="ipRecordSid"> The unique string that identifies an IP Record </param>
-        /// <param name="sipDomainSid"> The unique string that identifies a SIP Domain </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
-        public static async System.Threading.Tasks.Task<SourceIpMappingResource> CreateAsync(string ipRecordSid,
-                                                                                             string sipDomainSid,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateSourceIpMappingOptions(ipRecordSid, sipDomainSid);
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildFetchRequest(FetchSourceIpMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/SourceIpMappings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SourceIpMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SourceIpMapping </returns>
-        public static SourceIpMappingResource Fetch(FetchSourceIpMappingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch SourceIpMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
-        public static async System.Threading.Tasks.Task<SourceIpMappingResource> FetchAsync(FetchSourceIpMappingOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SourceIpMapping </returns>
-        public static SourceIpMappingResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSourceIpMappingOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
-        public static async System.Threading.Tasks.Task<SourceIpMappingResource> FetchAsync(string pathSid,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new FetchSourceIpMappingOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSourceIpMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Voice,
-                "/v1/SourceIpMappings",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SourceIpMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SourceIpMapping </returns>
-        public static ResourceSet<SourceIpMappingResource> Read(ReadSourceIpMappingOptions options,
-                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SourceIpMappingResource>.FromJson("source_ip_mappings", response.Content);
-            return new ResourceSet<SourceIpMappingResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read SourceIpMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SourceIpMappingResource>> ReadAsync(ReadSourceIpMappingOptions options,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SourceIpMappingResource>.FromJson("source_ip_mappings", response.Content);
-            return new ResourceSet<SourceIpMappingResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SourceIpMapping </returns>
-        public static ResourceSet<SourceIpMappingResource> Read(int? pageSize = null,
-                                                                long? limit = null,
-                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadSourceIpMappingOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SourceIpMappingResource>> ReadAsync(int? pageSize = null,
-                                                                                                        long? limit = null,
-                                                                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadSourceIpMappingOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SourceIpMappingResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SourceIpMappingResource>.FromJson("source_ip_mappings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SourceIpMappingResource> NextPage(Page<SourceIpMappingResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<SourceIpMappingResource>.FromJson("source_ip_mappings", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SourceIpMappingResource> PreviousPage(Page<SourceIpMappingResource> page,
-                                                                 ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Voice)
-            );
-
-            var response = client.Request(request);
-            return Page<SourceIpMappingResource>.FromJson("source_ip_mappings", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateSourceIpMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Voice,
-                "/v1/SourceIpMappings/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SourceIpMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SourceIpMapping </returns>
-        public static SourceIpMappingResource Update(UpdateSourceIpMappingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update SourceIpMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
-        public static async System.Threading.Tasks.Task<SourceIpMappingResource> UpdateAsync(UpdateSourceIpMappingOptions options,
-                                                                                             ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="sipDomainSid"> The unique string that identifies a SIP Domain </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SourceIpMapping </returns>
-        public static SourceIpMappingResource Update(string pathSid, string sipDomainSid, ITwilioRestClient client = null)
-        {
-            var options = new UpdateSourceIpMappingOptions(pathSid, sipDomainSid);
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="sipDomainSid"> The unique string that identifies a SIP Domain </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
-        public static async System.Threading.Tasks.Task<SourceIpMappingResource> UpdateAsync(string pathSid,
-                                                                                             string sipDomainSid,
-                                                                                             ITwilioRestClient client = null)
-        {
-            var options = new UpdateSourceIpMappingOptions(pathSid, sipDomainSid);
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSourceIpMappingOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Voice,
-                "/v1/SourceIpMappings/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SourceIpMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SourceIpMapping </returns>
-        public static bool Delete(DeleteSourceIpMappingOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete SourceIpMapping parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSourceIpMappingOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of SourceIpMapping </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSourceIpMappingOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The unique string that identifies the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSourceIpMappingOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SourceIpMappingResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SourceIpMappingResource object represented by the provided JSON </returns>
-        public static SourceIpMappingResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SourceIpMappingResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies an IP Record
-        /// </summary>
-        [JsonProperty("ip_record_sid")]
-        public string IpRecordSid { get; private set; }
-        /// <summary>
-        /// The unique string that identifies a SIP Domain
-        /// </summary>
-        [JsonProperty("sip_domain_sid")]
-        public string SipDomainSid { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The RFC 2822 date and time in GMT that the resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private SourceIpMappingResource()
-        {
-
-        }
-    }
+{
+
+  public class SourceIpMappingResource : Resource
+  {
+    private static Request BuildCreateRequest(CreateSourceIpMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Voice,
+          "/v1/SourceIpMappings",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SourceIpMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SourceIpMapping </returns>
+    public static SourceIpMappingResource Create(CreateSourceIpMappingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create SourceIpMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
+    public static async System.Threading.Tasks.Task<SourceIpMappingResource> CreateAsync(CreateSourceIpMappingOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="ipRecordSid"> The unique string that identifies an IP Record </param>
+    /// <param name="sipDomainSid"> The unique string that identifies a SIP Domain </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SourceIpMapping </returns>
+    public static SourceIpMappingResource Create(string ipRecordSid,
+                                                 string sipDomainSid,
+                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateSourceIpMappingOptions(ipRecordSid, sipDomainSid);
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="ipRecordSid"> The unique string that identifies an IP Record </param>
+    /// <param name="sipDomainSid"> The unique string that identifies a SIP Domain </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
+    public static async System.Threading.Tasks.Task<SourceIpMappingResource> CreateAsync(string ipRecordSid,
+                                                                                         string sipDomainSid,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateSourceIpMappingOptions(ipRecordSid, sipDomainSid);
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildFetchRequest(FetchSourceIpMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/SourceIpMappings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SourceIpMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SourceIpMapping </returns>
+    public static SourceIpMappingResource Fetch(FetchSourceIpMappingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch SourceIpMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
+    public static async System.Threading.Tasks.Task<SourceIpMappingResource> FetchAsync(FetchSourceIpMappingOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SourceIpMapping </returns>
+    public static SourceIpMappingResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSourceIpMappingOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
+    public static async System.Threading.Tasks.Task<SourceIpMappingResource> FetchAsync(string pathSid,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new FetchSourceIpMappingOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSourceIpMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Voice,
+          "/v1/SourceIpMappings",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SourceIpMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SourceIpMapping </returns>
+    public static ResourceSet<SourceIpMappingResource> Read(ReadSourceIpMappingOptions options,
+                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SourceIpMappingResource>.FromJson("source_ip_mappings", response.Content);
+      return new ResourceSet<SourceIpMappingResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read SourceIpMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SourceIpMappingResource>> ReadAsync(ReadSourceIpMappingOptions options,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SourceIpMappingResource>.FromJson("source_ip_mappings", response.Content);
+      return new ResourceSet<SourceIpMappingResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SourceIpMapping </returns>
+    public static ResourceSet<SourceIpMappingResource> Read(int? pageSize = null,
+                                                            long? limit = null,
+                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadSourceIpMappingOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SourceIpMappingResource>> ReadAsync(int? pageSize = null,
+                                                                                                    long? limit = null,
+                                                                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadSourceIpMappingOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SourceIpMappingResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SourceIpMappingResource>.FromJson("source_ip_mappings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SourceIpMappingResource> NextPage(Page<SourceIpMappingResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<SourceIpMappingResource>.FromJson("source_ip_mappings", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SourceIpMappingResource> PreviousPage(Page<SourceIpMappingResource> page,
+                                                             ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Voice)
+      );
+
+      var response = client.Request(request);
+      return Page<SourceIpMappingResource>.FromJson("source_ip_mappings", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateSourceIpMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Voice,
+          "/v1/SourceIpMappings/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SourceIpMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SourceIpMapping </returns>
+    public static SourceIpMappingResource Update(UpdateSourceIpMappingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update SourceIpMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
+    public static async System.Threading.Tasks.Task<SourceIpMappingResource> UpdateAsync(UpdateSourceIpMappingOptions options,
+                                                                                         ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="sipDomainSid"> The unique string that identifies a SIP Domain </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SourceIpMapping </returns>
+    public static SourceIpMappingResource Update(string pathSid, string sipDomainSid, ITwilioRestClient client = null)
+    {
+      var options = new UpdateSourceIpMappingOptions(pathSid, sipDomainSid);
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="sipDomainSid"> The unique string that identifies a SIP Domain </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
+    public static async System.Threading.Tasks.Task<SourceIpMappingResource> UpdateAsync(string pathSid,
+                                                                                         string sipDomainSid,
+                                                                                         ITwilioRestClient client = null)
+    {
+      var options = new UpdateSourceIpMappingOptions(pathSid, sipDomainSid);
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSourceIpMappingOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Voice,
+          "/v1/SourceIpMappings/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SourceIpMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SourceIpMapping </returns>
+    public static bool Delete(DeleteSourceIpMappingOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete SourceIpMapping parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSourceIpMappingOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of SourceIpMapping </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSourceIpMappingOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The unique string that identifies the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of SourceIpMapping </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSourceIpMappingOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SourceIpMappingResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SourceIpMappingResource object represented by the provided JSON </returns>
+    public static SourceIpMappingResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SourceIpMappingResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies an IP Record
+    /// </summary>
+    [JsonProperty("ip_record_sid")]
+    public string IpRecordSid { get; private set; }
+    /// <summary>
+    /// The unique string that identifies a SIP Domain
+    /// </summary>
+    [JsonProperty("sip_domain_sid")]
+    public string SipDomainSid { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The RFC 2822 date and time in GMT that the resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private SourceIpMappingResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Wireless/V1/CommandOptions.cs b/src/Twilio/Rest/Wireless/V1/CommandOptions.cs
index 836e4ac73..a67f07161 100644
--- a/src/Twilio/Rest/Wireless/V1/CommandOptions.cs
+++ b/src/Twilio/Rest/Wireless/V1/CommandOptions.cs
@@ -9,209 +9,209 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Wireless.V1
-{
-
+{
+
+  /// <summary>
+  /// Fetch a Command instance from your account.
+  /// </summary>
+  public class FetchCommandOptions : IOptions<CommandResource>
+  {
     /// <summary>
-    /// Fetch a Command instance from your account.
+    /// The SID that identifies the resource to fetch
     /// </summary>
-    public class FetchCommandOptions : IOptions<CommandResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchCommandOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchCommandOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// Retrieve a list of Commands from your account.
-    /// </summary>
-    public class ReadCommandOptions : ReadOptions<CommandResource>
-    {
-        /// <summary>
-        /// The sid or unique_name of the Sim resources to read
-        /// </summary>
-        public string Sim { get; set; }
-        /// <summary>
-        /// The status of the resources to read
-        /// </summary>
-        public CommandResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// Only return Commands with this direction value
-        /// </summary>
-        public CommandResource.DirectionEnum Direction { get; set; }
-        /// <summary>
-        /// Only return Commands with this transport value
-        /// </summary>
-        public CommandResource.TransportEnum Transport { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Sim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sim", Sim));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Direction != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Direction", Direction.ToString()));
-            }
-
-            if (Transport != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Transport", Transport.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchCommandOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchCommandOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// Send a Command to a Sim.
-    /// </summary>
-    public class CreateCommandOptions : IOptions<CommandResource>
-    {
-        /// <summary>
-        /// The message body of the Command or a Base64 encoded byte string in binary mode
-        /// </summary>
-        public string Command { get; }
-        /// <summary>
-        /// The sid or unique_name of the SIM to send the Command to
-        /// </summary>
-        public string Sim { get; set; }
-        /// <summary>
-        /// The HTTP method we use to call callback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod CallbackMethod { get; set; }
-        /// <summary>
-        /// he URL we call when the Command has finished sending
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-        /// <summary>
-        /// The mode to use when sending the SMS message
-        /// </summary>
-        public CommandResource.CommandModeEnum CommandMode { get; set; }
-        /// <summary>
-        /// Whether to include the SID of the command in the message body
-        /// </summary>
-        public string IncludeSid { get; set; }
-        /// <summary>
-        /// Whether to request delivery receipt from the recipient
-        /// </summary>
-        public bool? DeliveryReceiptRequested { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateCommandOptions
-        /// </summary>
-        /// <param name="command"> The message body of the Command or a Base64 encoded byte string in binary mode </param>
-        public CreateCommandOptions(string command)
-        {
-            Command = command;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Command != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Command", Command));
-            }
-
-            if (Sim != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Sim", Sim));
-            }
-
-            if (CallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (CommandMode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommandMode", CommandMode.ToString()));
-            }
-
-            if (IncludeSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("IncludeSid", IncludeSid));
-            }
-
-            if (DeliveryReceiptRequested != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DeliveryReceiptRequested", DeliveryReceiptRequested.Value.ToString().ToLower()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of Commands from your account.
+  /// </summary>
+  public class ReadCommandOptions : ReadOptions<CommandResource>
+  {
     /// <summary>
-    /// Delete a Command instance from your account.
+    /// The sid or unique_name of the Sim resources to read
     /// </summary>
-    public class DeleteCommandOptions : IOptions<CommandResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteCommandOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeleteCommandOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string Sim { get; set; }
+    /// <summary>
+    /// The status of the resources to read
+    /// </summary>
+    public CommandResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// Only return Commands with this direction value
+    /// </summary>
+    public CommandResource.DirectionEnum Direction { get; set; }
+    /// <summary>
+    /// Only return Commands with this transport value
+    /// </summary>
+    public CommandResource.TransportEnum Transport { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Sim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sim", Sim));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Direction != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Direction", Direction.ToString()));
+      }
+
+      if (Transport != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Transport", Transport.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Send a Command to a Sim.
+  /// </summary>
+  public class CreateCommandOptions : IOptions<CommandResource>
+  {
+    /// <summary>
+    /// The message body of the Command or a Base64 encoded byte string in binary mode
+    /// </summary>
+    public string Command { get; }
+    /// <summary>
+    /// The sid or unique_name of the SIM to send the Command to
+    /// </summary>
+    public string Sim { get; set; }
+    /// <summary>
+    /// The HTTP method we use to call callback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod CallbackMethod { get; set; }
+    /// <summary>
+    /// he URL we call when the Command has finished sending
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+    /// <summary>
+    /// The mode to use when sending the SMS message
+    /// </summary>
+    public CommandResource.CommandModeEnum CommandMode { get; set; }
+    /// <summary>
+    /// Whether to include the SID of the command in the message body
+    /// </summary>
+    public string IncludeSid { get; set; }
+    /// <summary>
+    /// Whether to request delivery receipt from the recipient
+    /// </summary>
+    public bool? DeliveryReceiptRequested { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateCommandOptions
+    /// </summary>
+    /// <param name="command"> The message body of the Command or a Base64 encoded byte string in binary mode </param>
+    public CreateCommandOptions(string command)
+    {
+      Command = command;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Command != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Command", Command));
+      }
+
+      if (Sim != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Sim", Sim));
+      }
+
+      if (CallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (CommandMode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommandMode", CommandMode.ToString()));
+      }
+
+      if (IncludeSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("IncludeSid", IncludeSid));
+      }
+
+      if (DeliveryReceiptRequested != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DeliveryReceiptRequested", DeliveryReceiptRequested.Value.ToString().ToLower()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a Command instance from your account.
+  /// </summary>
+  public class DeleteCommandOptions : IOptions<CommandResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteCommandOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeleteCommandOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Wireless/V1/CommandResource.cs b/src/Twilio/Rest/Wireless/V1/CommandResource.cs
index 8bb3fcee2..c275ffbc5 100644
--- a/src/Twilio/Rest/Wireless/V1/CommandResource.cs
+++ b/src/Twilio/Rest/Wireless/V1/CommandResource.cs
@@ -17,522 +17,522 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Wireless.V1
-{
-
-    public class CommandResource : Resource
-    {
-        public sealed class DirectionEnum : StringEnum
-        {
-            private DirectionEnum(string value) : base(value) {}
-            public DirectionEnum() {}
-            public static implicit operator DirectionEnum(string value)
-            {
-                return new DirectionEnum(value);
-            }
-
-            public static readonly DirectionEnum FromSim = new DirectionEnum("from_sim");
-            public static readonly DirectionEnum ToSim = new DirectionEnum("to_sim");
-        }
-
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum Queued = new StatusEnum("queued");
-            public static readonly StatusEnum Sent = new StatusEnum("sent");
-            public static readonly StatusEnum Delivered = new StatusEnum("delivered");
-            public static readonly StatusEnum Received = new StatusEnum("received");
-            public static readonly StatusEnum Failed = new StatusEnum("failed");
-        }
-
-        public sealed class CommandModeEnum : StringEnum
-        {
-            private CommandModeEnum(string value) : base(value) {}
-            public CommandModeEnum() {}
-            public static implicit operator CommandModeEnum(string value)
-            {
-                return new CommandModeEnum(value);
-            }
-
-            public static readonly CommandModeEnum Text = new CommandModeEnum("text");
-            public static readonly CommandModeEnum Binary = new CommandModeEnum("binary");
-        }
-
-        public sealed class TransportEnum : StringEnum
-        {
-            private TransportEnum(string value) : base(value) {}
-            public TransportEnum() {}
-            public static implicit operator TransportEnum(string value)
-            {
-                return new TransportEnum(value);
-            }
-
-            public static readonly TransportEnum Sms = new TransportEnum("sms");
-            public static readonly TransportEnum Ip = new TransportEnum("ip");
-        }
-
-        private static Request BuildFetchRequest(FetchCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Wireless,
-                "/v1/Commands/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a Command instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static CommandResource Fetch(FetchCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Command instance from your account.
-        /// </summary>
-        /// <param name="options"> Fetch Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<CommandResource> FetchAsync(FetchCommandOptions options,
-                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a Command instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static CommandResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchCommandOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Command instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<CommandResource> FetchAsync(string pathSid,
-                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new FetchCommandOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Wireless,
-                "/v1/Commands",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Commands from your account.
-        /// </summary>
-        /// <param name="options"> Read Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static ResourceSet<CommandResource> Read(ReadCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<CommandResource>.FromJson("commands", response.Content);
-            return new ResourceSet<CommandResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Commands from your account.
-        /// </summary>
-        /// <param name="options"> Read Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CommandResource>> ReadAsync(ReadCommandOptions options,
-                                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<CommandResource>.FromJson("commands", response.Content);
-            return new ResourceSet<CommandResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Commands from your account.
-        /// </summary>
-        /// <param name="sim"> The sid or unique_name of the Sim resources to read </param>
-        /// <param name="status"> The status of the resources to read </param>
-        /// <param name="direction"> Only return Commands with this direction value </param>
-        /// <param name="transport"> Only return Commands with this transport value </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static ResourceSet<CommandResource> Read(string sim = null,
-                                                        CommandResource.StatusEnum status = null,
-                                                        CommandResource.DirectionEnum direction = null,
-                                                        CommandResource.TransportEnum transport = null,
-                                                        int? pageSize = null,
-                                                        long? limit = null,
-                                                        ITwilioRestClient client = null)
-        {
-            var options = new ReadCommandOptions(){Sim = sim, Status = status, Direction = direction, Transport = transport, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Commands from your account.
-        /// </summary>
-        /// <param name="sim"> The sid or unique_name of the Sim resources to read </param>
-        /// <param name="status"> The status of the resources to read </param>
-        /// <param name="direction"> Only return Commands with this direction value </param>
-        /// <param name="transport"> Only return Commands with this transport value </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<CommandResource>> ReadAsync(string sim = null,
-                                                                                                CommandResource.StatusEnum status = null,
-                                                                                                CommandResource.DirectionEnum direction = null,
-                                                                                                CommandResource.TransportEnum transport = null,
-                                                                                                int? pageSize = null,
-                                                                                                long? limit = null,
-                                                                                                ITwilioRestClient client = null)
-        {
-            var options = new ReadCommandOptions(){Sim = sim, Status = status, Direction = direction, Transport = transport, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<CommandResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<CommandResource>.FromJson("commands", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<CommandResource> NextPage(Page<CommandResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Wireless)
-            );
-
-            var response = client.Request(request);
-            return Page<CommandResource>.FromJson("commands", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<CommandResource> PreviousPage(Page<CommandResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Wireless)
-            );
-
-            var response = client.Request(request);
-            return Page<CommandResource>.FromJson("commands", response.Content);
-        }
-
-        private static Request BuildCreateRequest(CreateCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Wireless,
-                "/v1/Commands",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Send a Command to a Sim.
-        /// </summary>
-        /// <param name="options"> Create Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static CommandResource Create(CreateCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Send a Command to a Sim.
-        /// </summary>
-        /// <param name="options"> Create Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<CommandResource> CreateAsync(CreateCommandOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Send a Command to a Sim.
-        /// </summary>
-        /// <param name="command"> The message body of the Command or a Base64 encoded byte string in binary mode </param>
-        /// <param name="sim"> The sid or unique_name of the SIM to send the Command to </param>
-        /// <param name="callbackMethod"> The HTTP method we use to call callback_url </param>
-        /// <param name="callbackUrl"> he URL we call when the Command has finished sending </param>
-        /// <param name="commandMode"> The mode to use when sending the SMS message </param>
-        /// <param name="includeSid"> Whether to include the SID of the command in the message body </param>
-        /// <param name="deliveryReceiptRequested"> Whether to request delivery receipt from the recipient </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static CommandResource Create(string command,
-                                             string sim = null,
-                                             Twilio.Http.HttpMethod callbackMethod = null,
-                                             Uri callbackUrl = null,
-                                             CommandResource.CommandModeEnum commandMode = null,
-                                             string includeSid = null,
-                                             bool? deliveryReceiptRequested = null,
-                                             ITwilioRestClient client = null)
-        {
-            var options = new CreateCommandOptions(command){Sim = sim, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, CommandMode = commandMode, IncludeSid = includeSid, DeliveryReceiptRequested = deliveryReceiptRequested};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Send a Command to a Sim.
-        /// </summary>
-        /// <param name="command"> The message body of the Command or a Base64 encoded byte string in binary mode </param>
-        /// <param name="sim"> The sid or unique_name of the SIM to send the Command to </param>
-        /// <param name="callbackMethod"> The HTTP method we use to call callback_url </param>
-        /// <param name="callbackUrl"> he URL we call when the Command has finished sending </param>
-        /// <param name="commandMode"> The mode to use when sending the SMS message </param>
-        /// <param name="includeSid"> Whether to include the SID of the command in the message body </param>
-        /// <param name="deliveryReceiptRequested"> Whether to request delivery receipt from the recipient </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<CommandResource> CreateAsync(string command,
-                                                                                     string sim = null,
-                                                                                     Twilio.Http.HttpMethod callbackMethod = null,
-                                                                                     Uri callbackUrl = null,
-                                                                                     CommandResource.CommandModeEnum commandMode = null,
-                                                                                     string includeSid = null,
-                                                                                     bool? deliveryReceiptRequested = null,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new CreateCommandOptions(command){Sim = sim, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, CommandMode = commandMode, IncludeSid = includeSid, DeliveryReceiptRequested = deliveryReceiptRequested};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteCommandOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Wireless,
-                "/v1/Commands/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a Command instance from your account.
-        /// </summary>
-        /// <param name="options"> Delete Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static bool Delete(DeleteCommandOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Command instance from your account.
-        /// </summary>
-        /// <param name="options"> Delete Command parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCommandOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a Command instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Command </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCommandOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Command instance from your account.
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Command </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteCommandOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a CommandResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> CommandResource object represented by the provided JSON </returns>
-        public static CommandResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<CommandResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the Sim resource that the Command was sent to or from
-        /// </summary>
-        [JsonProperty("sim_sid")]
-        public string SimSid { get; private set; }
-        /// <summary>
-        /// The message being sent to or from the SIM
-        /// </summary>
-        [JsonProperty("command")]
-        public string Command { get; private set; }
-        /// <summary>
-        /// The mode used to send the SMS message
-        /// </summary>
-        [JsonProperty("command_mode")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CommandResource.CommandModeEnum CommandMode { get; private set; }
-        /// <summary>
-        /// The type of transport used
-        /// </summary>
-        [JsonProperty("transport")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CommandResource.TransportEnum Transport { get; private set; }
-        /// <summary>
-        /// Whether to request a delivery receipt
-        /// </summary>
-        [JsonProperty("delivery_receipt_requested")]
-        public bool? DeliveryReceiptRequested { get; private set; }
-        /// <summary>
-        /// The status of the Command
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CommandResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The direction of the Command
-        /// </summary>
-        [JsonProperty("direction")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public CommandResource.DirectionEnum Direction { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was last updated format
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private CommandResource()
-        {
-
-        }
-    }
+{
+
+  public class CommandResource : Resource
+  {
+    public sealed class DirectionEnum : StringEnum
+    {
+      private DirectionEnum(string value) : base(value) { }
+      public DirectionEnum() { }
+      public static implicit operator DirectionEnum(string value)
+      {
+        return new DirectionEnum(value);
+      }
+
+      public static readonly DirectionEnum FromSim = new DirectionEnum("from_sim");
+      public static readonly DirectionEnum ToSim = new DirectionEnum("to_sim");
+    }
+
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum Queued = new StatusEnum("queued");
+      public static readonly StatusEnum Sent = new StatusEnum("sent");
+      public static readonly StatusEnum Delivered = new StatusEnum("delivered");
+      public static readonly StatusEnum Received = new StatusEnum("received");
+      public static readonly StatusEnum Failed = new StatusEnum("failed");
+    }
+
+    public sealed class CommandModeEnum : StringEnum
+    {
+      private CommandModeEnum(string value) : base(value) { }
+      public CommandModeEnum() { }
+      public static implicit operator CommandModeEnum(string value)
+      {
+        return new CommandModeEnum(value);
+      }
+
+      public static readonly CommandModeEnum Text = new CommandModeEnum("text");
+      public static readonly CommandModeEnum Binary = new CommandModeEnum("binary");
+    }
+
+    public sealed class TransportEnum : StringEnum
+    {
+      private TransportEnum(string value) : base(value) { }
+      public TransportEnum() { }
+      public static implicit operator TransportEnum(string value)
+      {
+        return new TransportEnum(value);
+      }
+
+      public static readonly TransportEnum Sms = new TransportEnum("sms");
+      public static readonly TransportEnum Ip = new TransportEnum("ip");
+    }
+
+    private static Request BuildFetchRequest(FetchCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Wireless,
+          "/v1/Commands/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a Command instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static CommandResource Fetch(FetchCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Command instance from your account.
+    /// </summary>
+    /// <param name="options"> Fetch Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<CommandResource> FetchAsync(FetchCommandOptions options,
+                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a Command instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static CommandResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchCommandOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Command instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<CommandResource> FetchAsync(string pathSid,
+                                                                                ITwilioRestClient client = null)
+    {
+      var options = new FetchCommandOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Wireless,
+          "/v1/Commands",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Commands from your account.
+    /// </summary>
+    /// <param name="options"> Read Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static ResourceSet<CommandResource> Read(ReadCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<CommandResource>.FromJson("commands", response.Content);
+      return new ResourceSet<CommandResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Commands from your account.
+    /// </summary>
+    /// <param name="options"> Read Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CommandResource>> ReadAsync(ReadCommandOptions options,
+                                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<CommandResource>.FromJson("commands", response.Content);
+      return new ResourceSet<CommandResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Commands from your account.
+    /// </summary>
+    /// <param name="sim"> The sid or unique_name of the Sim resources to read </param>
+    /// <param name="status"> The status of the resources to read </param>
+    /// <param name="direction"> Only return Commands with this direction value </param>
+    /// <param name="transport"> Only return Commands with this transport value </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static ResourceSet<CommandResource> Read(string sim = null,
+                                                    CommandResource.StatusEnum status = null,
+                                                    CommandResource.DirectionEnum direction = null,
+                                                    CommandResource.TransportEnum transport = null,
+                                                    int? pageSize = null,
+                                                    long? limit = null,
+                                                    ITwilioRestClient client = null)
+    {
+      var options = new ReadCommandOptions() { Sim = sim, Status = status, Direction = direction, Transport = transport, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Commands from your account.
+    /// </summary>
+    /// <param name="sim"> The sid or unique_name of the Sim resources to read </param>
+    /// <param name="status"> The status of the resources to read </param>
+    /// <param name="direction"> Only return Commands with this direction value </param>
+    /// <param name="transport"> Only return Commands with this transport value </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<CommandResource>> ReadAsync(string sim = null,
+                                                                                            CommandResource.StatusEnum status = null,
+                                                                                            CommandResource.DirectionEnum direction = null,
+                                                                                            CommandResource.TransportEnum transport = null,
+                                                                                            int? pageSize = null,
+                                                                                            long? limit = null,
+                                                                                            ITwilioRestClient client = null)
+    {
+      var options = new ReadCommandOptions() { Sim = sim, Status = status, Direction = direction, Transport = transport, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<CommandResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<CommandResource>.FromJson("commands", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<CommandResource> NextPage(Page<CommandResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Wireless)
+      );
+
+      var response = client.Request(request);
+      return Page<CommandResource>.FromJson("commands", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<CommandResource> PreviousPage(Page<CommandResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Wireless)
+      );
+
+      var response = client.Request(request);
+      return Page<CommandResource>.FromJson("commands", response.Content);
+    }
+
+    private static Request BuildCreateRequest(CreateCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Wireless,
+          "/v1/Commands",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Send a Command to a Sim.
+    /// </summary>
+    /// <param name="options"> Create Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static CommandResource Create(CreateCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Send a Command to a Sim.
+    /// </summary>
+    /// <param name="options"> Create Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<CommandResource> CreateAsync(CreateCommandOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Send a Command to a Sim.
+    /// </summary>
+    /// <param name="command"> The message body of the Command or a Base64 encoded byte string in binary mode </param>
+    /// <param name="sim"> The sid or unique_name of the SIM to send the Command to </param>
+    /// <param name="callbackMethod"> The HTTP method we use to call callback_url </param>
+    /// <param name="callbackUrl"> he URL we call when the Command has finished sending </param>
+    /// <param name="commandMode"> The mode to use when sending the SMS message </param>
+    /// <param name="includeSid"> Whether to include the SID of the command in the message body </param>
+    /// <param name="deliveryReceiptRequested"> Whether to request delivery receipt from the recipient </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static CommandResource Create(string command,
+                                         string sim = null,
+                                         Twilio.Http.HttpMethod callbackMethod = null,
+                                         Uri callbackUrl = null,
+                                         CommandResource.CommandModeEnum commandMode = null,
+                                         string includeSid = null,
+                                         bool? deliveryReceiptRequested = null,
+                                         ITwilioRestClient client = null)
+    {
+      var options = new CreateCommandOptions(command) { Sim = sim, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, CommandMode = commandMode, IncludeSid = includeSid, DeliveryReceiptRequested = deliveryReceiptRequested };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Send a Command to a Sim.
+    /// </summary>
+    /// <param name="command"> The message body of the Command or a Base64 encoded byte string in binary mode </param>
+    /// <param name="sim"> The sid or unique_name of the SIM to send the Command to </param>
+    /// <param name="callbackMethod"> The HTTP method we use to call callback_url </param>
+    /// <param name="callbackUrl"> he URL we call when the Command has finished sending </param>
+    /// <param name="commandMode"> The mode to use when sending the SMS message </param>
+    /// <param name="includeSid"> Whether to include the SID of the command in the message body </param>
+    /// <param name="deliveryReceiptRequested"> Whether to request delivery receipt from the recipient </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<CommandResource> CreateAsync(string command,
+                                                                                 string sim = null,
+                                                                                 Twilio.Http.HttpMethod callbackMethod = null,
+                                                                                 Uri callbackUrl = null,
+                                                                                 CommandResource.CommandModeEnum commandMode = null,
+                                                                                 string includeSid = null,
+                                                                                 bool? deliveryReceiptRequested = null,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new CreateCommandOptions(command) { Sim = sim, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, CommandMode = commandMode, IncludeSid = includeSid, DeliveryReceiptRequested = deliveryReceiptRequested };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteCommandOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Wireless,
+          "/v1/Commands/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a Command instance from your account.
+    /// </summary>
+    /// <param name="options"> Delete Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static bool Delete(DeleteCommandOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Command instance from your account.
+    /// </summary>
+    /// <param name="options"> Delete Command parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteCommandOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a Command instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Command </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCommandOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Command instance from your account.
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Command </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteCommandOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a CommandResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> CommandResource object represented by the provided JSON </returns>
+    public static CommandResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<CommandResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the Sim resource that the Command was sent to or from
+    /// </summary>
+    [JsonProperty("sim_sid")]
+    public string SimSid { get; private set; }
+    /// <summary>
+    /// The message being sent to or from the SIM
+    /// </summary>
+    [JsonProperty("command")]
+    public string Command { get; private set; }
+    /// <summary>
+    /// The mode used to send the SMS message
+    /// </summary>
+    [JsonProperty("command_mode")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CommandResource.CommandModeEnum CommandMode { get; private set; }
+    /// <summary>
+    /// The type of transport used
+    /// </summary>
+    [JsonProperty("transport")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CommandResource.TransportEnum Transport { get; private set; }
+    /// <summary>
+    /// Whether to request a delivery receipt
+    /// </summary>
+    [JsonProperty("delivery_receipt_requested")]
+    public bool? DeliveryReceiptRequested { get; private set; }
+    /// <summary>
+    /// The status of the Command
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CommandResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The direction of the Command
+    /// </summary>
+    [JsonProperty("direction")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public CommandResource.DirectionEnum Direction { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was last updated format
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private CommandResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Wireless/V1/RatePlanOptions.cs b/src/Twilio/Rest/Wireless/V1/RatePlanOptions.cs
index db056b0eb..850c6e430 100644
--- a/src/Twilio/Rest/Wireless/V1/RatePlanOptions.cs
+++ b/src/Twilio/Rest/Wireless/V1/RatePlanOptions.cs
@@ -10,254 +10,254 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Wireless.V1
-{
-
+{
+
+  /// <summary>
+  /// ReadRatePlanOptions
+  /// </summary>
+  public class ReadRatePlanOptions : ReadOptions<RatePlanResource>
+  {
     /// <summary>
-    /// ReadRatePlanOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class ReadRatePlanOptions : ReadOptions<RatePlanResource>
-    {
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// FetchRatePlanOptions
+  /// </summary>
+  public class FetchRatePlanOptions : IOptions<RatePlanResource>
+  {
     /// <summary>
-    /// FetchRatePlanOptions
+    /// The SID that identifies the resource to fetch
     /// </summary>
-    public class FetchRatePlanOptions : IOptions<RatePlanResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchRatePlanOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        public FetchRatePlanOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// CreateRatePlanOptions
+    /// Construct a new FetchRatePlanOptions
     /// </summary>
-    public class CreateRatePlanOptions : IOptions<RatePlanResource>
-    {
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// Whether SIMs can use GPRS/3G/4G/LTE data connectivity
-        /// </summary>
-        public bool? DataEnabled { get; set; }
-        /// <summary>
-        /// The total data usage in Megabytes that the Network allows during one month on the home network
-        /// </summary>
-        public int? DataLimit { get; set; }
-        /// <summary>
-        /// The model used to meter data usage
-        /// </summary>
-        public string DataMetering { get; set; }
-        /// <summary>
-        /// Whether SIMs can make, send, and receive SMS using Commands
-        /// </summary>
-        public bool? MessagingEnabled { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public bool? VoiceEnabled { get; set; }
-        /// <summary>
-        /// Whether SIMs can roam on networks other than the home network in the United States
-        /// </summary>
-        public bool? NationalRoamingEnabled { get; set; }
-        /// <summary>
-        /// The services that SIMs capable of using GPRS/3G/4G/LTE data connectivity can use outside of the United States
-        /// </summary>
-        public List<string> InternationalRoaming { get; set; }
-        /// <summary>
-        /// The total data usage in Megabytes that the Network allows during one month on non-home networks in the United States
-        /// </summary>
-        public int? NationalRoamingDataLimit { get; set; }
-        /// <summary>
-        /// The total data usage (download and upload combined) in Megabytes that the Network allows during one month when roaming outside the United States
-        /// </summary>
-        public int? InternationalRoamingDataLimit { get; set; }
-
-        /// <summary>
-        /// Construct a new CreateRatePlanOptions
-        /// </summary>
-        public CreateRatePlanOptions()
-        {
-            InternationalRoaming = new List<string>();
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (DataEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DataEnabled", DataEnabled.Value.ToString().ToLower()));
-            }
-
-            if (DataLimit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DataLimit", DataLimit.ToString()));
-            }
-
-            if (DataMetering != null)
-            {
-                p.Add(new KeyValuePair<string, string>("DataMetering", DataMetering));
-            }
-
-            if (MessagingEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("MessagingEnabled", MessagingEnabled.Value.ToString().ToLower()));
-            }
-
-            if (VoiceEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
-            }
-
-            if (NationalRoamingEnabled != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NationalRoamingEnabled", NationalRoamingEnabled.Value.ToString().ToLower()));
-            }
-
-            if (InternationalRoaming != null)
-            {
-                p.AddRange(InternationalRoaming.Select(prop => new KeyValuePair<string, string>("InternationalRoaming", prop)));
-            }
-
-            if (NationalRoamingDataLimit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("NationalRoamingDataLimit", NationalRoamingDataLimit.ToString()));
-            }
-
-            if (InternationalRoamingDataLimit != null)
-            {
-                p.Add(new KeyValuePair<string, string>("InternationalRoamingDataLimit", InternationalRoamingDataLimit.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    public FetchRatePlanOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// UpdateRatePlanOptions
+    /// Generate the necessary parameters
     /// </summary>
-    public class UpdateRatePlanOptions : IOptions<RatePlanResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// A string to describe the resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateRatePlanOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        public UpdateRatePlanOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            return p;
-        }
-    }
-
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// CreateRatePlanOptions
+  /// </summary>
+  public class CreateRatePlanOptions : IOptions<RatePlanResource>
+  {
     /// <summary>
-    /// DeleteRatePlanOptions
+    /// An application-defined string that uniquely identifies the resource
     /// </summary>
-    public class DeleteRatePlanOptions : IOptions<RatePlanResource>
-    {
-        /// <summary>
-        /// The SID that identifies the resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteRatePlanOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        public DeleteRatePlanOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// Whether SIMs can use GPRS/3G/4G/LTE data connectivity
+    /// </summary>
+    public bool? DataEnabled { get; set; }
+    /// <summary>
+    /// The total data usage in Megabytes that the Network allows during one month on the home network
+    /// </summary>
+    public int? DataLimit { get; set; }
+    /// <summary>
+    /// The model used to meter data usage
+    /// </summary>
+    public string DataMetering { get; set; }
+    /// <summary>
+    /// Whether SIMs can make, send, and receive SMS using Commands
+    /// </summary>
+    public bool? MessagingEnabled { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public bool? VoiceEnabled { get; set; }
+    /// <summary>
+    /// Whether SIMs can roam on networks other than the home network in the United States
+    /// </summary>
+    public bool? NationalRoamingEnabled { get; set; }
+    /// <summary>
+    /// The services that SIMs capable of using GPRS/3G/4G/LTE data connectivity can use outside of the United States
+    /// </summary>
+    public List<string> InternationalRoaming { get; set; }
+    /// <summary>
+    /// The total data usage in Megabytes that the Network allows during one month on non-home networks in the United States
+    /// </summary>
+    public int? NationalRoamingDataLimit { get; set; }
+    /// <summary>
+    /// The total data usage (download and upload combined) in Megabytes that the Network allows during one month when roaming outside the United States
+    /// </summary>
+    public int? InternationalRoamingDataLimit { get; set; }
+
+    /// <summary>
+    /// Construct a new CreateRatePlanOptions
+    /// </summary>
+    public CreateRatePlanOptions()
+    {
+      InternationalRoaming = new List<string>();
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (DataEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DataEnabled", DataEnabled.Value.ToString().ToLower()));
+      }
+
+      if (DataLimit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DataLimit", DataLimit.ToString()));
+      }
+
+      if (DataMetering != null)
+      {
+        p.Add(new KeyValuePair<string, string>("DataMetering", DataMetering));
+      }
+
+      if (MessagingEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("MessagingEnabled", MessagingEnabled.Value.ToString().ToLower()));
+      }
+
+      if (VoiceEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceEnabled", VoiceEnabled.Value.ToString().ToLower()));
+      }
+
+      if (NationalRoamingEnabled != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NationalRoamingEnabled", NationalRoamingEnabled.Value.ToString().ToLower()));
+      }
+
+      if (InternationalRoaming != null)
+      {
+        p.AddRange(InternationalRoaming.Select(prop => new KeyValuePair<string, string>("InternationalRoaming", prop)));
+      }
+
+      if (NationalRoamingDataLimit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("NationalRoamingDataLimit", NationalRoamingDataLimit.ToString()));
+      }
+
+      if (InternationalRoamingDataLimit != null)
+      {
+        p.Add(new KeyValuePair<string, string>("InternationalRoamingDataLimit", InternationalRoamingDataLimit.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// UpdateRatePlanOptions
+  /// </summary>
+  public class UpdateRatePlanOptions : IOptions<RatePlanResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// A string to describe the resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateRatePlanOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    public UpdateRatePlanOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// DeleteRatePlanOptions
+  /// </summary>
+  public class DeleteRatePlanOptions : IOptions<RatePlanResource>
+  {
+    /// <summary>
+    /// The SID that identifies the resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteRatePlanOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    public DeleteRatePlanOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Wireless/V1/RatePlanResource.cs b/src/Twilio/Rest/Wireless/V1/RatePlanResource.cs
index af00c39e5..7d691347f 100644
--- a/src/Twilio/Rest/Wireless/V1/RatePlanResource.cs
+++ b/src/Twilio/Rest/Wireless/V1/RatePlanResource.cs
@@ -17,584 +17,584 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Wireless.V1
-{
-
-    public class RatePlanResource : Resource
-    {
-        public sealed class DataLimitStrategyEnum : StringEnum
-        {
-            private DataLimitStrategyEnum(string value) : base(value) {}
-            public DataLimitStrategyEnum() {}
-            public static implicit operator DataLimitStrategyEnum(string value)
-            {
-                return new DataLimitStrategyEnum(value);
-            }
-
-            public static readonly DataLimitStrategyEnum Block = new DataLimitStrategyEnum("block");
-            public static readonly DataLimitStrategyEnum Throttle = new DataLimitStrategyEnum("throttle");
-        }
-
-        private static Request BuildReadRequest(ReadRatePlanOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Wireless,
-                "/v1/RatePlans",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static ResourceSet<RatePlanResource> Read(ReadRatePlanOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<RatePlanResource>.FromJson("rate_plans", response.Content);
-            return new ResourceSet<RatePlanResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RatePlanResource>> ReadAsync(ReadRatePlanOptions options,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<RatePlanResource>.FromJson("rate_plans", response.Content);
-            return new ResourceSet<RatePlanResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static ResourceSet<RatePlanResource> Read(int? pageSize = null,
-                                                         long? limit = null,
-                                                         ITwilioRestClient client = null)
-        {
-            var options = new ReadRatePlanOptions(){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<RatePlanResource>> ReadAsync(int? pageSize = null,
-                                                                                                 long? limit = null,
-                                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new ReadRatePlanOptions(){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<RatePlanResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<RatePlanResource>.FromJson("rate_plans", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<RatePlanResource> NextPage(Page<RatePlanResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Wireless)
-            );
-
-            var response = client.Request(request);
-            return Page<RatePlanResource>.FromJson("rate_plans", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<RatePlanResource> PreviousPage(Page<RatePlanResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Wireless)
-            );
-
-            var response = client.Request(request);
-            return Page<RatePlanResource>.FromJson("rate_plans", response.Content);
-        }
-
-        private static Request BuildFetchRequest(FetchRatePlanOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Wireless,
-                "/v1/RatePlans/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static RatePlanResource Fetch(FetchRatePlanOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="options"> Fetch RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<RatePlanResource> FetchAsync(FetchRatePlanOptions options,
-                                                                                     ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static RatePlanResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchRatePlanOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// fetch
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<RatePlanResource> FetchAsync(string pathSid,
-                                                                                     ITwilioRestClient client = null)
-        {
-            var options = new FetchRatePlanOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildCreateRequest(CreateRatePlanOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Wireless,
-                "/v1/RatePlans",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static RatePlanResource Create(CreateRatePlanOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="options"> Create RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<RatePlanResource> CreateAsync(CreateRatePlanOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildCreateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="dataEnabled"> Whether SIMs can use GPRS/3G/4G/LTE data connectivity </param>
-        /// <param name="dataLimit"> The total data usage in Megabytes that the Network allows during one month on the home
-        ///                 network </param>
-        /// <param name="dataMetering"> The model used to meter data usage </param>
-        /// <param name="messagingEnabled"> Whether SIMs can make, send, and receive SMS using Commands </param>
-        /// <param name="voiceEnabled"> Deprecated </param>
-        /// <param name="nationalRoamingEnabled"> Whether SIMs can roam on networks other than the home network in the United
-        ///                              States </param>
-        /// <param name="internationalRoaming"> The services that SIMs capable of using GPRS/3G/4G/LTE data connectivity can
-        ///                            use outside of the United States </param>
-        /// <param name="nationalRoamingDataLimit"> The total data usage in Megabytes that the Network allows during one month
-        ///                                on non-home networks in the United States </param>
-        /// <param name="internationalRoamingDataLimit"> The total data usage (download and upload combined) in Megabytes that
-        ///                                     the Network allows during one month when roaming outside the United States
-        ///                                     </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static RatePlanResource Create(string uniqueName = null,
-                                              string friendlyName = null,
-                                              bool? dataEnabled = null,
-                                              int? dataLimit = null,
-                                              string dataMetering = null,
-                                              bool? messagingEnabled = null,
-                                              bool? voiceEnabled = null,
-                                              bool? nationalRoamingEnabled = null,
-                                              List<string> internationalRoaming = null,
-                                              int? nationalRoamingDataLimit = null,
-                                              int? internationalRoamingDataLimit = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new CreateRatePlanOptions(){UniqueName = uniqueName, FriendlyName = friendlyName, DataEnabled = dataEnabled, DataLimit = dataLimit, DataMetering = dataMetering, MessagingEnabled = messagingEnabled, VoiceEnabled = voiceEnabled, NationalRoamingEnabled = nationalRoamingEnabled, InternationalRoaming = internationalRoaming, NationalRoamingDataLimit = nationalRoamingDataLimit, InternationalRoamingDataLimit = internationalRoamingDataLimit};
-            return Create(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// create
-        /// </summary>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="dataEnabled"> Whether SIMs can use GPRS/3G/4G/LTE data connectivity </param>
-        /// <param name="dataLimit"> The total data usage in Megabytes that the Network allows during one month on the home
-        ///                 network </param>
-        /// <param name="dataMetering"> The model used to meter data usage </param>
-        /// <param name="messagingEnabled"> Whether SIMs can make, send, and receive SMS using Commands </param>
-        /// <param name="voiceEnabled"> Deprecated </param>
-        /// <param name="nationalRoamingEnabled"> Whether SIMs can roam on networks other than the home network in the United
-        ///                              States </param>
-        /// <param name="internationalRoaming"> The services that SIMs capable of using GPRS/3G/4G/LTE data connectivity can
-        ///                            use outside of the United States </param>
-        /// <param name="nationalRoamingDataLimit"> The total data usage in Megabytes that the Network allows during one month
-        ///                                on non-home networks in the United States </param>
-        /// <param name="internationalRoamingDataLimit"> The total data usage (download and upload combined) in Megabytes that
-        ///                                     the Network allows during one month when roaming outside the United States
-        ///                                     </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<RatePlanResource> CreateAsync(string uniqueName = null,
-                                                                                      string friendlyName = null,
-                                                                                      bool? dataEnabled = null,
-                                                                                      int? dataLimit = null,
-                                                                                      string dataMetering = null,
-                                                                                      bool? messagingEnabled = null,
-                                                                                      bool? voiceEnabled = null,
-                                                                                      bool? nationalRoamingEnabled = null,
-                                                                                      List<string> internationalRoaming = null,
-                                                                                      int? nationalRoamingDataLimit = null,
-                                                                                      int? internationalRoamingDataLimit = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new CreateRatePlanOptions(){UniqueName = uniqueName, FriendlyName = friendlyName, DataEnabled = dataEnabled, DataLimit = dataLimit, DataMetering = dataMetering, MessagingEnabled = messagingEnabled, VoiceEnabled = voiceEnabled, NationalRoamingEnabled = nationalRoamingEnabled, InternationalRoaming = internationalRoaming, NationalRoamingDataLimit = nationalRoamingDataLimit, InternationalRoamingDataLimit = internationalRoamingDataLimit};
-            return await CreateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildUpdateRequest(UpdateRatePlanOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Wireless,
-                "/v1/RatePlans/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static RatePlanResource Update(UpdateRatePlanOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="options"> Update RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<RatePlanResource> UpdateAsync(UpdateRatePlanOptions options,
-                                                                                      ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static RatePlanResource Update(string pathSid,
-                                              string uniqueName = null,
-                                              string friendlyName = null,
-                                              ITwilioRestClient client = null)
-        {
-            var options = new UpdateRatePlanOptions(pathSid){UniqueName = uniqueName, FriendlyName = friendlyName};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// update
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to update </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="friendlyName"> A string to describe the resource </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<RatePlanResource> UpdateAsync(string pathSid,
-                                                                                      string uniqueName = null,
-                                                                                      string friendlyName = null,
-                                                                                      ITwilioRestClient client = null)
-        {
-            var options = new UpdateRatePlanOptions(pathSid){UniqueName = uniqueName, FriendlyName = friendlyName};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteRatePlanOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Wireless,
-                "/v1/RatePlans/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static bool Delete(DeleteRatePlanOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="options"> Delete RatePlan parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRatePlanOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of RatePlan </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRatePlanOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// delete
-        /// </summary>
-        /// <param name="pathSid"> The SID that identifies the resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of RatePlan </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteRatePlanOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a RatePlanResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> RatePlanResource object represented by the provided JSON </returns>
-        public static RatePlanResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<RatePlanResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// Whether SIMs can use GPRS/3G/4G/LTE data connectivity
-        /// </summary>
-        [JsonProperty("data_enabled")]
-        public bool? DataEnabled { get; private set; }
-        /// <summary>
-        /// The model used to meter data usage
-        /// </summary>
-        [JsonProperty("data_metering")]
-        public string DataMetering { get; private set; }
-        /// <summary>
-        /// The total data usage in Megabytes that the Network allows during one month on the home network
-        /// </summary>
-        [JsonProperty("data_limit")]
-        public int? DataLimit { get; private set; }
-        /// <summary>
-        /// Whether SIMs can make, send, and receive SMS using Commands
-        /// </summary>
-        [JsonProperty("messaging_enabled")]
-        public bool? MessagingEnabled { get; private set; }
-        /// <summary>
-        /// Deprecated. Whether SIMs can make and receive voice calls
-        /// </summary>
-        [JsonProperty("voice_enabled")]
-        public bool? VoiceEnabled { get; private set; }
-        /// <summary>
-        /// Whether SIMs can roam on networks other than the home network in the United States
-        /// </summary>
-        [JsonProperty("national_roaming_enabled")]
-        public bool? NationalRoamingEnabled { get; private set; }
-        /// <summary>
-        /// The total data usage in Megabytes that the Network allows during one month on non-home networks in the United States
-        /// </summary>
-        [JsonProperty("national_roaming_data_limit")]
-        public int? NationalRoamingDataLimit { get; private set; }
-        /// <summary>
-        /// The services that SIMs capable of using GPRS/3G/4G/LTE data connectivity can use outside of the United States
-        /// </summary>
-        [JsonProperty("international_roaming")]
-        public List<string> InternationalRoaming { get; private set; }
-        /// <summary>
-        /// The total data usage (download and upload combined) in Megabytes that the Network allows during one month when roaming outside the United States
-        /// </summary>
-        [JsonProperty("international_roaming_data_limit")]
-        public int? InternationalRoamingDataLimit { get; private set; }
-        /// <summary>
-        /// The date when the resource was created, given as GMT in ISO 8601 format
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The date when the resource was last updated, given as GMT in ISO 8601 format
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-
-        private RatePlanResource()
-        {
-
-        }
-    }
+{
+
+  public class RatePlanResource : Resource
+  {
+    public sealed class DataLimitStrategyEnum : StringEnum
+    {
+      private DataLimitStrategyEnum(string value) : base(value) { }
+      public DataLimitStrategyEnum() { }
+      public static implicit operator DataLimitStrategyEnum(string value)
+      {
+        return new DataLimitStrategyEnum(value);
+      }
+
+      public static readonly DataLimitStrategyEnum Block = new DataLimitStrategyEnum("block");
+      public static readonly DataLimitStrategyEnum Throttle = new DataLimitStrategyEnum("throttle");
+    }
+
+    private static Request BuildReadRequest(ReadRatePlanOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Wireless,
+          "/v1/RatePlans",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static ResourceSet<RatePlanResource> Read(ReadRatePlanOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<RatePlanResource>.FromJson("rate_plans", response.Content);
+      return new ResourceSet<RatePlanResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RatePlanResource>> ReadAsync(ReadRatePlanOptions options,
+                                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<RatePlanResource>.FromJson("rate_plans", response.Content);
+      return new ResourceSet<RatePlanResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static ResourceSet<RatePlanResource> Read(int? pageSize = null,
+                                                     long? limit = null,
+                                                     ITwilioRestClient client = null)
+    {
+      var options = new ReadRatePlanOptions() { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<RatePlanResource>> ReadAsync(int? pageSize = null,
+                                                                                             long? limit = null,
+                                                                                             ITwilioRestClient client = null)
+    {
+      var options = new ReadRatePlanOptions() { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<RatePlanResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<RatePlanResource>.FromJson("rate_plans", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<RatePlanResource> NextPage(Page<RatePlanResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Wireless)
+      );
+
+      var response = client.Request(request);
+      return Page<RatePlanResource>.FromJson("rate_plans", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<RatePlanResource> PreviousPage(Page<RatePlanResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Wireless)
+      );
+
+      var response = client.Request(request);
+      return Page<RatePlanResource>.FromJson("rate_plans", response.Content);
+    }
+
+    private static Request BuildFetchRequest(FetchRatePlanOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Wireless,
+          "/v1/RatePlans/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static RatePlanResource Fetch(FetchRatePlanOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="options"> Fetch RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<RatePlanResource> FetchAsync(FetchRatePlanOptions options,
+                                                                                 ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static RatePlanResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchRatePlanOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// fetch
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<RatePlanResource> FetchAsync(string pathSid,
+                                                                                 ITwilioRestClient client = null)
+    {
+      var options = new FetchRatePlanOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildCreateRequest(CreateRatePlanOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Wireless,
+          "/v1/RatePlans",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static RatePlanResource Create(CreateRatePlanOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="options"> Create RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<RatePlanResource> CreateAsync(CreateRatePlanOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildCreateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="dataEnabled"> Whether SIMs can use GPRS/3G/4G/LTE data connectivity </param>
+    /// <param name="dataLimit"> The total data usage in Megabytes that the Network allows during one month on the home
+    ///                 network </param>
+    /// <param name="dataMetering"> The model used to meter data usage </param>
+    /// <param name="messagingEnabled"> Whether SIMs can make, send, and receive SMS using Commands </param>
+    /// <param name="voiceEnabled"> Deprecated </param>
+    /// <param name="nationalRoamingEnabled"> Whether SIMs can roam on networks other than the home network in the United
+    ///                              States </param>
+    /// <param name="internationalRoaming"> The services that SIMs capable of using GPRS/3G/4G/LTE data connectivity can
+    ///                            use outside of the United States </param>
+    /// <param name="nationalRoamingDataLimit"> The total data usage in Megabytes that the Network allows during one month
+    ///                                on non-home networks in the United States </param>
+    /// <param name="internationalRoamingDataLimit"> The total data usage (download and upload combined) in Megabytes that
+    ///                                     the Network allows during one month when roaming outside the United States
+    ///                                     </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static RatePlanResource Create(string uniqueName = null,
+                                          string friendlyName = null,
+                                          bool? dataEnabled = null,
+                                          int? dataLimit = null,
+                                          string dataMetering = null,
+                                          bool? messagingEnabled = null,
+                                          bool? voiceEnabled = null,
+                                          bool? nationalRoamingEnabled = null,
+                                          List<string> internationalRoaming = null,
+                                          int? nationalRoamingDataLimit = null,
+                                          int? internationalRoamingDataLimit = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new CreateRatePlanOptions() { UniqueName = uniqueName, FriendlyName = friendlyName, DataEnabled = dataEnabled, DataLimit = dataLimit, DataMetering = dataMetering, MessagingEnabled = messagingEnabled, VoiceEnabled = voiceEnabled, NationalRoamingEnabled = nationalRoamingEnabled, InternationalRoaming = internationalRoaming, NationalRoamingDataLimit = nationalRoamingDataLimit, InternationalRoamingDataLimit = internationalRoamingDataLimit };
+      return Create(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// create
+    /// </summary>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="dataEnabled"> Whether SIMs can use GPRS/3G/4G/LTE data connectivity </param>
+    /// <param name="dataLimit"> The total data usage in Megabytes that the Network allows during one month on the home
+    ///                 network </param>
+    /// <param name="dataMetering"> The model used to meter data usage </param>
+    /// <param name="messagingEnabled"> Whether SIMs can make, send, and receive SMS using Commands </param>
+    /// <param name="voiceEnabled"> Deprecated </param>
+    /// <param name="nationalRoamingEnabled"> Whether SIMs can roam on networks other than the home network in the United
+    ///                              States </param>
+    /// <param name="internationalRoaming"> The services that SIMs capable of using GPRS/3G/4G/LTE data connectivity can
+    ///                            use outside of the United States </param>
+    /// <param name="nationalRoamingDataLimit"> The total data usage in Megabytes that the Network allows during one month
+    ///                                on non-home networks in the United States </param>
+    /// <param name="internationalRoamingDataLimit"> The total data usage (download and upload combined) in Megabytes that
+    ///                                     the Network allows during one month when roaming outside the United States
+    ///                                     </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<RatePlanResource> CreateAsync(string uniqueName = null,
+                                                                                  string friendlyName = null,
+                                                                                  bool? dataEnabled = null,
+                                                                                  int? dataLimit = null,
+                                                                                  string dataMetering = null,
+                                                                                  bool? messagingEnabled = null,
+                                                                                  bool? voiceEnabled = null,
+                                                                                  bool? nationalRoamingEnabled = null,
+                                                                                  List<string> internationalRoaming = null,
+                                                                                  int? nationalRoamingDataLimit = null,
+                                                                                  int? internationalRoamingDataLimit = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new CreateRatePlanOptions() { UniqueName = uniqueName, FriendlyName = friendlyName, DataEnabled = dataEnabled, DataLimit = dataLimit, DataMetering = dataMetering, MessagingEnabled = messagingEnabled, VoiceEnabled = voiceEnabled, NationalRoamingEnabled = nationalRoamingEnabled, InternationalRoaming = internationalRoaming, NationalRoamingDataLimit = nationalRoamingDataLimit, InternationalRoamingDataLimit = internationalRoamingDataLimit };
+      return await CreateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildUpdateRequest(UpdateRatePlanOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Wireless,
+          "/v1/RatePlans/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static RatePlanResource Update(UpdateRatePlanOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="options"> Update RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<RatePlanResource> UpdateAsync(UpdateRatePlanOptions options,
+                                                                                  ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static RatePlanResource Update(string pathSid,
+                                          string uniqueName = null,
+                                          string friendlyName = null,
+                                          ITwilioRestClient client = null)
+    {
+      var options = new UpdateRatePlanOptions(pathSid) { UniqueName = uniqueName, FriendlyName = friendlyName };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// update
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to update </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="friendlyName"> A string to describe the resource </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<RatePlanResource> UpdateAsync(string pathSid,
+                                                                                  string uniqueName = null,
+                                                                                  string friendlyName = null,
+                                                                                  ITwilioRestClient client = null)
+    {
+      var options = new UpdateRatePlanOptions(pathSid) { UniqueName = uniqueName, FriendlyName = friendlyName };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteRatePlanOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Wireless,
+          "/v1/RatePlans/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static bool Delete(DeleteRatePlanOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="options"> Delete RatePlan parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteRatePlanOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of RatePlan </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRatePlanOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// delete
+    /// </summary>
+    /// <param name="pathSid"> The SID that identifies the resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of RatePlan </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteRatePlanOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a RatePlanResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> RatePlanResource object represented by the provided JSON </returns>
+    public static RatePlanResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<RatePlanResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// Whether SIMs can use GPRS/3G/4G/LTE data connectivity
+    /// </summary>
+    [JsonProperty("data_enabled")]
+    public bool? DataEnabled { get; private set; }
+    /// <summary>
+    /// The model used to meter data usage
+    /// </summary>
+    [JsonProperty("data_metering")]
+    public string DataMetering { get; private set; }
+    /// <summary>
+    /// The total data usage in Megabytes that the Network allows during one month on the home network
+    /// </summary>
+    [JsonProperty("data_limit")]
+    public int? DataLimit { get; private set; }
+    /// <summary>
+    /// Whether SIMs can make, send, and receive SMS using Commands
+    /// </summary>
+    [JsonProperty("messaging_enabled")]
+    public bool? MessagingEnabled { get; private set; }
+    /// <summary>
+    /// Deprecated. Whether SIMs can make and receive voice calls
+    /// </summary>
+    [JsonProperty("voice_enabled")]
+    public bool? VoiceEnabled { get; private set; }
+    /// <summary>
+    /// Whether SIMs can roam on networks other than the home network in the United States
+    /// </summary>
+    [JsonProperty("national_roaming_enabled")]
+    public bool? NationalRoamingEnabled { get; private set; }
+    /// <summary>
+    /// The total data usage in Megabytes that the Network allows during one month on non-home networks in the United States
+    /// </summary>
+    [JsonProperty("national_roaming_data_limit")]
+    public int? NationalRoamingDataLimit { get; private set; }
+    /// <summary>
+    /// The services that SIMs capable of using GPRS/3G/4G/LTE data connectivity can use outside of the United States
+    /// </summary>
+    [JsonProperty("international_roaming")]
+    public List<string> InternationalRoaming { get; private set; }
+    /// <summary>
+    /// The total data usage (download and upload combined) in Megabytes that the Network allows during one month when roaming outside the United States
+    /// </summary>
+    [JsonProperty("international_roaming_data_limit")]
+    public int? InternationalRoamingDataLimit { get; private set; }
+    /// <summary>
+    /// The date when the resource was created, given as GMT in ISO 8601 format
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The date when the resource was last updated, given as GMT in ISO 8601 format
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+
+    private RatePlanResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Wireless/V1/Sim/DataSessionOptions.cs b/src/Twilio/Rest/Wireless/V1/Sim/DataSessionOptions.cs
index 87b3f79fd..67b47a2d6 100644
--- a/src/Twilio/Rest/Wireless/V1/Sim/DataSessionOptions.cs
+++ b/src/Twilio/Rest/Wireless/V1/Sim/DataSessionOptions.cs
@@ -9,40 +9,40 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Wireless.V1.Sim
-{
-
+{
+
+  /// <summary>
+  /// ReadDataSessionOptions
+  /// </summary>
+  public class ReadDataSessionOptions : ReadOptions<DataSessionResource>
+  {
     /// <summary>
-    /// ReadDataSessionOptions
+    /// The SID of the Sim resource with the Data Sessions to read
     /// </summary>
-    public class ReadDataSessionOptions : ReadOptions<DataSessionResource>
-    {
-        /// <summary>
-        /// The SID of the Sim resource with the Data Sessions to read
-        /// </summary>
-        public string PathSimSid { get; }
-
-        /// <summary>
-        /// Construct a new ReadDataSessionOptions
-        /// </summary>
-        /// <param name="pathSimSid"> The SID of the Sim resource with the Data Sessions to read </param>
-        public ReadDataSessionOptions(string pathSimSid)
-        {
-            PathSimSid = pathSimSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathSimSid { get; }
+
+    /// <summary>
+    /// Construct a new ReadDataSessionOptions
+    /// </summary>
+    /// <param name="pathSimSid"> The SID of the Sim resource with the Data Sessions to read </param>
+    public ReadDataSessionOptions(string pathSimSid)
+    {
+      PathSimSid = pathSimSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Wireless/V1/Sim/DataSessionResource.cs b/src/Twilio/Rest/Wireless/V1/Sim/DataSessionResource.cs
index 4b9010a9a..5df72ad45 100644
--- a/src/Twilio/Rest/Wireless/V1/Sim/DataSessionResource.cs
+++ b/src/Twilio/Rest/Wireless/V1/Sim/DataSessionResource.cs
@@ -16,246 +16,246 @@
 using Twilio.Http;
 
 namespace Twilio.Rest.Wireless.V1.Sim
-{
-
-    public class DataSessionResource : Resource
-    {
-        private static Request BuildReadRequest(ReadDataSessionOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Wireless,
-                "/v1/Sims/" + options.PathSimSid + "/DataSessions",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read DataSession parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DataSession </returns>
-        public static ResourceSet<DataSessionResource> Read(ReadDataSessionOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<DataSessionResource>.FromJson("data_sessions", response.Content);
-            return new ResourceSet<DataSessionResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read DataSession parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DataSession </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DataSessionResource>> ReadAsync(ReadDataSessionOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<DataSessionResource>.FromJson("data_sessions", response.Content);
-            return new ResourceSet<DataSessionResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathSimSid"> The SID of the Sim resource with the Data Sessions to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of DataSession </returns>
-        public static ResourceSet<DataSessionResource> Read(string pathSimSid,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadDataSessionOptions(pathSimSid){PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathSimSid"> The SID of the Sim resource with the Data Sessions to read </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of DataSession </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<DataSessionResource>> ReadAsync(string pathSimSid,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadDataSessionOptions(pathSimSid){PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<DataSessionResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<DataSessionResource>.FromJson("data_sessions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<DataSessionResource> NextPage(Page<DataSessionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Wireless)
-            );
-
-            var response = client.Request(request);
-            return Page<DataSessionResource>.FromJson("data_sessions", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<DataSessionResource> PreviousPage(Page<DataSessionResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Wireless)
-            );
-
-            var response = client.Request(request);
-            return Page<DataSessionResource>.FromJson("data_sessions", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a DataSessionResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> DataSessionResource object represented by the provided JSON </returns>
-        public static DataSessionResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<DataSessionResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// The SID of the Sim resource that the Data Session is for
-        /// </summary>
-        [JsonProperty("sim_sid")]
-        public string SimSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The generation of wireless technology that the device was using
-        /// </summary>
-        [JsonProperty("radio_link")]
-        public string RadioLink { get; private set; }
-        /// <summary>
-        /// The 'mobile country code' is the unique ID of the home country where the Data Session took place
-        /// </summary>
-        [JsonProperty("operator_mcc")]
-        public string OperatorMcc { get; private set; }
-        /// <summary>
-        /// The 'mobile network code' is the unique ID specific to the mobile operator network where the Data Session took place
-        /// </summary>
-        [JsonProperty("operator_mnc")]
-        public string OperatorMnc { get; private set; }
-        /// <summary>
-        /// The three letter country code representing where the device's Data Session took place
-        /// </summary>
-        [JsonProperty("operator_country")]
-        public string OperatorCountry { get; private set; }
-        /// <summary>
-        /// The friendly name of the mobile operator network that the SIM-connected device is attached to
-        /// </summary>
-        [JsonProperty("operator_name")]
-        public string OperatorName { get; private set; }
-        /// <summary>
-        /// The unique ID of the cellular tower that the device was attached to at the moment when the Data Session was last updated
-        /// </summary>
-        [JsonProperty("cell_id")]
-        public string CellId { get; private set; }
-        /// <summary>
-        /// An object with the estimated location where the device's Data Session took place
-        /// </summary>
-        [JsonProperty("cell_location_estimate")]
-        public object CellLocationEstimate { get; private set; }
-        /// <summary>
-        /// The number of packets uploaded by the device between the start time and when the Data Session was last updated
-        /// </summary>
-        [JsonProperty("packets_uploaded")]
-        public int? PacketsUploaded { get; private set; }
-        /// <summary>
-        /// The number of packets downloaded by the device between the start time and when the Data Session was last updated
-        /// </summary>
-        [JsonProperty("packets_downloaded")]
-        public int? PacketsDownloaded { get; private set; }
-        /// <summary>
-        /// The date that the resource was last updated, given as GMT in ISO 8601 format
-        /// </summary>
-        [JsonProperty("last_updated")]
-        public DateTime? LastUpdated { get; private set; }
-        /// <summary>
-        /// The date that the Data Session started, given as GMT in ISO 8601 format
-        /// </summary>
-        [JsonProperty("start")]
-        public DateTime? Start { get; private set; }
-        /// <summary>
-        /// The date that the record ended, given as GMT in ISO 8601 format
-        /// </summary>
-        [JsonProperty("end")]
-        public DateTime? End { get; private set; }
-        /// <summary>
-        /// The unique ID of the device using the SIM to connect
-        /// </summary>
-        [JsonProperty("imei")]
-        public string Imei { get; private set; }
-
-        private DataSessionResource()
-        {
-
-        }
-    }
+{
+
+  public class DataSessionResource : Resource
+  {
+    private static Request BuildReadRequest(ReadDataSessionOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Wireless,
+          "/v1/Sims/" + options.PathSimSid + "/DataSessions",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read DataSession parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DataSession </returns>
+    public static ResourceSet<DataSessionResource> Read(ReadDataSessionOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<DataSessionResource>.FromJson("data_sessions", response.Content);
+      return new ResourceSet<DataSessionResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read DataSession parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DataSession </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DataSessionResource>> ReadAsync(ReadDataSessionOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<DataSessionResource>.FromJson("data_sessions", response.Content);
+      return new ResourceSet<DataSessionResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathSimSid"> The SID of the Sim resource with the Data Sessions to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of DataSession </returns>
+    public static ResourceSet<DataSessionResource> Read(string pathSimSid,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadDataSessionOptions(pathSimSid) { PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathSimSid"> The SID of the Sim resource with the Data Sessions to read </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of DataSession </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<DataSessionResource>> ReadAsync(string pathSimSid,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadDataSessionOptions(pathSimSid) { PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<DataSessionResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<DataSessionResource>.FromJson("data_sessions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<DataSessionResource> NextPage(Page<DataSessionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Wireless)
+      );
+
+      var response = client.Request(request);
+      return Page<DataSessionResource>.FromJson("data_sessions", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<DataSessionResource> PreviousPage(Page<DataSessionResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Wireless)
+      );
+
+      var response = client.Request(request);
+      return Page<DataSessionResource>.FromJson("data_sessions", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a DataSessionResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> DataSessionResource object represented by the provided JSON </returns>
+    public static DataSessionResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<DataSessionResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// The SID of the Sim resource that the Data Session is for
+    /// </summary>
+    [JsonProperty("sim_sid")]
+    public string SimSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The generation of wireless technology that the device was using
+    /// </summary>
+    [JsonProperty("radio_link")]
+    public string RadioLink { get; private set; }
+    /// <summary>
+    /// The 'mobile country code' is the unique ID of the home country where the Data Session took place
+    /// </summary>
+    [JsonProperty("operator_mcc")]
+    public string OperatorMcc { get; private set; }
+    /// <summary>
+    /// The 'mobile network code' is the unique ID specific to the mobile operator network where the Data Session took place
+    /// </summary>
+    [JsonProperty("operator_mnc")]
+    public string OperatorMnc { get; private set; }
+    /// <summary>
+    /// The three letter country code representing where the device's Data Session took place
+    /// </summary>
+    [JsonProperty("operator_country")]
+    public string OperatorCountry { get; private set; }
+    /// <summary>
+    /// The friendly name of the mobile operator network that the SIM-connected device is attached to
+    /// </summary>
+    [JsonProperty("operator_name")]
+    public string OperatorName { get; private set; }
+    /// <summary>
+    /// The unique ID of the cellular tower that the device was attached to at the moment when the Data Session was last updated
+    /// </summary>
+    [JsonProperty("cell_id")]
+    public string CellId { get; private set; }
+    /// <summary>
+    /// An object with the estimated location where the device's Data Session took place
+    /// </summary>
+    [JsonProperty("cell_location_estimate")]
+    public object CellLocationEstimate { get; private set; }
+    /// <summary>
+    /// The number of packets uploaded by the device between the start time and when the Data Session was last updated
+    /// </summary>
+    [JsonProperty("packets_uploaded")]
+    public int? PacketsUploaded { get; private set; }
+    /// <summary>
+    /// The number of packets downloaded by the device between the start time and when the Data Session was last updated
+    /// </summary>
+    [JsonProperty("packets_downloaded")]
+    public int? PacketsDownloaded { get; private set; }
+    /// <summary>
+    /// The date that the resource was last updated, given as GMT in ISO 8601 format
+    /// </summary>
+    [JsonProperty("last_updated")]
+    public DateTime? LastUpdated { get; private set; }
+    /// <summary>
+    /// The date that the Data Session started, given as GMT in ISO 8601 format
+    /// </summary>
+    [JsonProperty("start")]
+    public DateTime? Start { get; private set; }
+    /// <summary>
+    /// The date that the record ended, given as GMT in ISO 8601 format
+    /// </summary>
+    [JsonProperty("end")]
+    public DateTime? End { get; private set; }
+    /// <summary>
+    /// The unique ID of the device using the SIM to connect
+    /// </summary>
+    [JsonProperty("imei")]
+    public string Imei { get; private set; }
+
+    private DataSessionResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Wireless/V1/Sim/UsageRecordOptions.cs b/src/Twilio/Rest/Wireless/V1/Sim/UsageRecordOptions.cs
index dff66844f..3124f7df3 100644
--- a/src/Twilio/Rest/Wireless/V1/Sim/UsageRecordOptions.cs
+++ b/src/Twilio/Rest/Wireless/V1/Sim/UsageRecordOptions.cs
@@ -9,67 +9,67 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Wireless.V1.Sim
-{
-
+{
+
+  /// <summary>
+  /// ReadUsageRecordOptions
+  /// </summary>
+  public class ReadUsageRecordOptions : ReadOptions<UsageRecordResource>
+  {
     /// <summary>
-    /// ReadUsageRecordOptions
+    /// The SID of the Sim resource to read the usage from
     /// </summary>
-    public class ReadUsageRecordOptions : ReadOptions<UsageRecordResource>
-    {
-        /// <summary>
-        /// The SID of the Sim resource to read the usage from
-        /// </summary>
-        public string PathSimSid { get; }
-        /// <summary>
-        /// Only include usage that occurred on or before this date
-        /// </summary>
-        public DateTime? End { get; set; }
-        /// <summary>
-        /// Only include usage that has occurred on or after this date
-        /// </summary>
-        public DateTime? Start { get; set; }
-        /// <summary>
-        /// The time-based grouping that results are aggregated by
-        /// </summary>
-        public UsageRecordResource.GranularityEnum Granularity { get; set; }
-
-        /// <summary>
-        /// Construct a new ReadUsageRecordOptions
-        /// </summary>
-        /// <param name="pathSimSid"> The SID of the Sim resource to read the usage from </param>
-        public ReadUsageRecordOptions(string pathSimSid)
-        {
-            PathSimSid = pathSimSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (End != null)
-            {
-                p.Add(new KeyValuePair<string, string>("End", Serializers.DateTimeIso8601(End)));
-            }
-
-            if (Start != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Start", Serializers.DateTimeIso8601(Start)));
-            }
-
-            if (Granularity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Granularity", Granularity.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public string PathSimSid { get; }
+    /// <summary>
+    /// Only include usage that occurred on or before this date
+    /// </summary>
+    public DateTime? End { get; set; }
+    /// <summary>
+    /// Only include usage that has occurred on or after this date
+    /// </summary>
+    public DateTime? Start { get; set; }
+    /// <summary>
+    /// The time-based grouping that results are aggregated by
+    /// </summary>
+    public UsageRecordResource.GranularityEnum Granularity { get; set; }
+
+    /// <summary>
+    /// Construct a new ReadUsageRecordOptions
+    /// </summary>
+    /// <param name="pathSimSid"> The SID of the Sim resource to read the usage from </param>
+    public ReadUsageRecordOptions(string pathSimSid)
+    {
+      PathSimSid = pathSimSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (End != null)
+      {
+        p.Add(new KeyValuePair<string, string>("End", Serializers.DateTimeIso8601(End)));
+      }
+
+      if (Start != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Start", Serializers.DateTimeIso8601(Start)));
+      }
+
+      if (Granularity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Granularity", Granularity.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Wireless/V1/Sim/UsageRecordResource.cs b/src/Twilio/Rest/Wireless/V1/Sim/UsageRecordResource.cs
index 2ca090238..9fff4a120 100644
--- a/src/Twilio/Rest/Wireless/V1/Sim/UsageRecordResource.cs
+++ b/src/Twilio/Rest/Wireless/V1/Sim/UsageRecordResource.cs
@@ -17,217 +17,217 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Wireless.V1.Sim
-{
-
-    public class UsageRecordResource : Resource
-    {
-        public sealed class GranularityEnum : StringEnum
-        {
-            private GranularityEnum(string value) : base(value) {}
-            public GranularityEnum() {}
-            public static implicit operator GranularityEnum(string value)
-            {
-                return new GranularityEnum(value);
-            }
-
-            public static readonly GranularityEnum Hourly = new GranularityEnum("hourly");
-            public static readonly GranularityEnum Daily = new GranularityEnum("daily");
-            public static readonly GranularityEnum All = new GranularityEnum("all");
-        }
-
-        private static Request BuildReadRequest(ReadUsageRecordOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Wireless,
-                "/v1/Sims/" + options.PathSimSid + "/UsageRecords",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UsageRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsageRecord </returns>
-        public static ResourceSet<UsageRecordResource> Read(ReadUsageRecordOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<UsageRecordResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UsageRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsageRecord </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UsageRecordResource>> ReadAsync(ReadUsageRecordOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<UsageRecordResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathSimSid"> The SID of the Sim resource to read the usage from </param>
-        /// <param name="end"> Only include usage that occurred on or before this date </param>
-        /// <param name="start"> Only include usage that has occurred on or after this date </param>
-        /// <param name="granularity"> The time-based grouping that results are aggregated by </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsageRecord </returns>
-        public static ResourceSet<UsageRecordResource> Read(string pathSimSid,
-                                                            DateTime? end = null,
-                                                            DateTime? start = null,
-                                                            UsageRecordResource.GranularityEnum granularity = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadUsageRecordOptions(pathSimSid){End = end, Start = start, Granularity = granularity, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="pathSimSid"> The SID of the Sim resource to read the usage from </param>
-        /// <param name="end"> Only include usage that occurred on or before this date </param>
-        /// <param name="start"> Only include usage that has occurred on or after this date </param>
-        /// <param name="granularity"> The time-based grouping that results are aggregated by </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsageRecord </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UsageRecordResource>> ReadAsync(string pathSimSid,
-                                                                                                    DateTime? end = null,
-                                                                                                    DateTime? start = null,
-                                                                                                    UsageRecordResource.GranularityEnum granularity = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadUsageRecordOptions(pathSimSid){End = end, Start = start, Granularity = granularity, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UsageRecordResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UsageRecordResource> NextPage(Page<UsageRecordResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Wireless)
-            );
-
-            var response = client.Request(request);
-            return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UsageRecordResource> PreviousPage(Page<UsageRecordResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Wireless)
-            );
-
-            var response = client.Request(request);
-            return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a UsageRecordResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UsageRecordResource object represented by the provided JSON </returns>
-        public static UsageRecordResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UsageRecordResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Sim resource that this Usage Record is for
-        /// </summary>
-        [JsonProperty("sim_sid")]
-        public string SimSid { get; private set; }
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The time period for which the usage is reported
-        /// </summary>
-        [JsonProperty("period")]
-        public object Period { get; private set; }
-        /// <summary>
-        /// An object that describes the SIM's usage of Commands during the specified period
-        /// </summary>
-        [JsonProperty("commands")]
-        public object Commands { get; private set; }
-        /// <summary>
-        /// An object that describes the SIM's data usage during the specified period
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-
-        private UsageRecordResource()
-        {
-
-        }
-    }
+{
+
+  public class UsageRecordResource : Resource
+  {
+    public sealed class GranularityEnum : StringEnum
+    {
+      private GranularityEnum(string value) : base(value) { }
+      public GranularityEnum() { }
+      public static implicit operator GranularityEnum(string value)
+      {
+        return new GranularityEnum(value);
+      }
+
+      public static readonly GranularityEnum Hourly = new GranularityEnum("hourly");
+      public static readonly GranularityEnum Daily = new GranularityEnum("daily");
+      public static readonly GranularityEnum All = new GranularityEnum("all");
+    }
+
+    private static Request BuildReadRequest(ReadUsageRecordOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Wireless,
+          "/v1/Sims/" + options.PathSimSid + "/UsageRecords",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UsageRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsageRecord </returns>
+    public static ResourceSet<UsageRecordResource> Read(ReadUsageRecordOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<UsageRecordResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UsageRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsageRecord </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UsageRecordResource>> ReadAsync(ReadUsageRecordOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<UsageRecordResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathSimSid"> The SID of the Sim resource to read the usage from </param>
+    /// <param name="end"> Only include usage that occurred on or before this date </param>
+    /// <param name="start"> Only include usage that has occurred on or after this date </param>
+    /// <param name="granularity"> The time-based grouping that results are aggregated by </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsageRecord </returns>
+    public static ResourceSet<UsageRecordResource> Read(string pathSimSid,
+                                                        DateTime? end = null,
+                                                        DateTime? start = null,
+                                                        UsageRecordResource.GranularityEnum granularity = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadUsageRecordOptions(pathSimSid) { End = end, Start = start, Granularity = granularity, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="pathSimSid"> The SID of the Sim resource to read the usage from </param>
+    /// <param name="end"> Only include usage that occurred on or before this date </param>
+    /// <param name="start"> Only include usage that has occurred on or after this date </param>
+    /// <param name="granularity"> The time-based grouping that results are aggregated by </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsageRecord </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UsageRecordResource>> ReadAsync(string pathSimSid,
+                                                                                                DateTime? end = null,
+                                                                                                DateTime? start = null,
+                                                                                                UsageRecordResource.GranularityEnum granularity = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadUsageRecordOptions(pathSimSid) { End = end, Start = start, Granularity = granularity, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UsageRecordResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UsageRecordResource> NextPage(Page<UsageRecordResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Wireless)
+      );
+
+      var response = client.Request(request);
+      return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UsageRecordResource> PreviousPage(Page<UsageRecordResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Wireless)
+      );
+
+      var response = client.Request(request);
+      return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a UsageRecordResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UsageRecordResource object represented by the provided JSON </returns>
+    public static UsageRecordResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UsageRecordResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Sim resource that this Usage Record is for
+    /// </summary>
+    [JsonProperty("sim_sid")]
+    public string SimSid { get; private set; }
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The time period for which the usage is reported
+    /// </summary>
+    [JsonProperty("period")]
+    public object Period { get; private set; }
+    /// <summary>
+    /// An object that describes the SIM's usage of Commands during the specified period
+    /// </summary>
+    [JsonProperty("commands")]
+    public object Commands { get; private set; }
+    /// <summary>
+    /// An object that describes the SIM's data usage during the specified period
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+
+    private UsageRecordResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Wireless/V1/SimOptions.cs b/src/Twilio/Rest/Wireless/V1/SimOptions.cs
index e5fb05f85..9f0539348 100644
--- a/src/Twilio/Rest/Wireless/V1/SimOptions.cs
+++ b/src/Twilio/Rest/Wireless/V1/SimOptions.cs
@@ -9,321 +9,321 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Wireless.V1
-{
-
+{
+
+  /// <summary>
+  /// Fetch a Sim resource on your Account.
+  /// </summary>
+  public class FetchSimOptions : IOptions<SimResource>
+  {
     /// <summary>
-    /// Fetch a Sim resource on your Account.
+    /// The SID of the Sim resource to fetch
     /// </summary>
-    public class FetchSimOptions : IOptions<SimResource>
-    {
-        /// <summary>
-        /// The SID of the Sim resource to fetch
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new FetchSimOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Sim resource to fetch </param>
-        public FetchSimOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
-
+    public string PathSid { get; }
+
     /// <summary>
-    /// Retrieve a list of Sim resources on your Account.
-    /// </summary>
-    public class ReadSimOptions : ReadOptions<SimResource>
-    {
-        /// <summary>
-        /// Only return Sim resources with this status
-        /// </summary>
-        public SimResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// Only return Sim resources with this ICCID
-        /// </summary>
-        public string Iccid { get; set; }
-        /// <summary>
-        /// Only return Sim resources assigned to this RatePlan resource
-        /// </summary>
-        public string RatePlan { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public string EId { get; set; }
-        /// <summary>
-        /// Only return Sim resources with this registration code
-        /// </summary>
-        public string SimRegistrationCode { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (Iccid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Iccid", Iccid));
-            }
-
-            if (RatePlan != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RatePlan", RatePlan));
-            }
-
-            if (EId != null)
-            {
-                p.Add(new KeyValuePair<string, string>("EId", EId));
-            }
-
-            if (SimRegistrationCode != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SimRegistrationCode", SimRegistrationCode));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Construct a new FetchSimOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Sim resource to fetch </param>
+    public FetchSimOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
     /// <summary>
-    /// Updates the given properties of a Sim resource on your Account.
-    /// </summary>
-    public class UpdateSimOptions : IOptions<SimResource>
-    {
-        /// <summary>
-        /// The SID of the Sim resource to update
-        /// </summary>
-        public string PathSid { get; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        public string UniqueName { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call callback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod CallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when the Sim resource has finished updating
-        /// </summary>
-        public Uri CallbackUrl { get; set; }
-        /// <summary>
-        /// A string to describe the Sim resource
-        /// </summary>
-        public string FriendlyName { get; set; }
-        /// <summary>
-        /// The SID or unique name of the RatePlan resource to which the Sim resource should be assigned
-        /// </summary>
-        public string RatePlan { get; set; }
-        /// <summary>
-        /// The new status of the Sim resource
-        /// </summary>
-        public SimResource.StatusEnum Status { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call commands_callback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod CommandsCallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when the SIM sends a Command
-        /// </summary>
-        public Uri CommandsCallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call sms_fallback_url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when an error occurs while retrieving or executing the TwiML requested from sms_url
-        /// </summary>
-        public Uri SmsFallbackUrl { get; set; }
-        /// <summary>
-        /// The HTTP method we should use to call sms_url
-        /// </summary>
-        public Twilio.Http.HttpMethod SmsMethod { get; set; }
-        /// <summary>
-        /// The URL we should call when the SIM-connected device sends an SMS message that is not a Command
-        /// </summary>
-        public Uri SmsUrl { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public Uri VoiceFallbackUrl { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public Twilio.Http.HttpMethod VoiceMethod { get; set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        public Uri VoiceUrl { get; set; }
-        /// <summary>
-        /// Initiate a connectivity reset on a SIM
-        /// </summary>
-        public SimResource.ResetStatusEnum ResetStatus { get; set; }
-        /// <summary>
-        /// The SID of the Account to which the Sim resource should belong
-        /// </summary>
-        public string AccountSid { get; set; }
-
-        /// <summary>
-        /// Construct a new UpdateSimOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Sim resource to update </param>
-        public UpdateSimOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (UniqueName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
-            }
-
-            if (CallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
-            }
-
-            if (CallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
-            }
-
-            if (FriendlyName != null)
-            {
-                p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
-            }
-
-            if (RatePlan != null)
-            {
-                p.Add(new KeyValuePair<string, string>("RatePlan", RatePlan.ToString()));
-            }
-
-            if (Status != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
-            }
-
-            if (CommandsCallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommandsCallbackMethod", CommandsCallbackMethod.ToString()));
-            }
-
-            if (CommandsCallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("CommandsCallbackUrl", Serializers.Url(CommandsCallbackUrl)));
-            }
-
-            if (SmsFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
-            }
-
-            if (SmsFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
-            }
-
-            if (SmsMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
-            }
-
-            if (SmsUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
-            }
-
-            if (VoiceFallbackMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
-            }
-
-            if (VoiceFallbackUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
-            }
-
-            if (VoiceMethod != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
-            }
-
-            if (VoiceUrl != null)
-            {
-                p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
-            }
-
-            if (ResetStatus != null)
-            {
-                p.Add(new KeyValuePair<string, string>("ResetStatus", ResetStatus.ToString()));
-            }
-
-            if (AccountSid != null)
-            {
-                p.Add(new KeyValuePair<string, string>("AccountSid", AccountSid.ToString()));
-            }
-
-            return p;
-        }
-    }
-
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Retrieve a list of Sim resources on your Account.
+  /// </summary>
+  public class ReadSimOptions : ReadOptions<SimResource>
+  {
     /// <summary>
-    /// Delete a Sim resource on your Account.
+    /// Only return Sim resources with this status
     /// </summary>
-    public class DeleteSimOptions : IOptions<SimResource>
-    {
-        /// <summary>
-        /// The SID of the Sim Resource to delete
-        /// </summary>
-        public string PathSid { get; }
-
-        /// <summary>
-        /// Construct a new DeleteSimOptions
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Sim Resource to delete </param>
-        public DeleteSimOptions(string pathSid)
-        {
-            PathSid = pathSid;
-        }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            return p;
-        }
-    }
+    public SimResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// Only return Sim resources with this ICCID
+    /// </summary>
+    public string Iccid { get; set; }
+    /// <summary>
+    /// Only return Sim resources assigned to this RatePlan resource
+    /// </summary>
+    public string RatePlan { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public string EId { get; set; }
+    /// <summary>
+    /// Only return Sim resources with this registration code
+    /// </summary>
+    public string SimRegistrationCode { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (Iccid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Iccid", Iccid));
+      }
+
+      if (RatePlan != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RatePlan", RatePlan));
+      }
+
+      if (EId != null)
+      {
+        p.Add(new KeyValuePair<string, string>("EId", EId));
+      }
+
+      if (SimRegistrationCode != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SimRegistrationCode", SimRegistrationCode));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Updates the given properties of a Sim resource on your Account.
+  /// </summary>
+  public class UpdateSimOptions : IOptions<SimResource>
+  {
+    /// <summary>
+    /// The SID of the Sim resource to update
+    /// </summary>
+    public string PathSid { get; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    public string UniqueName { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call callback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod CallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when the Sim resource has finished updating
+    /// </summary>
+    public Uri CallbackUrl { get; set; }
+    /// <summary>
+    /// A string to describe the Sim resource
+    /// </summary>
+    public string FriendlyName { get; set; }
+    /// <summary>
+    /// The SID or unique name of the RatePlan resource to which the Sim resource should be assigned
+    /// </summary>
+    public string RatePlan { get; set; }
+    /// <summary>
+    /// The new status of the Sim resource
+    /// </summary>
+    public SimResource.StatusEnum Status { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call commands_callback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod CommandsCallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when the SIM sends a Command
+    /// </summary>
+    public Uri CommandsCallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call sms_fallback_url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when an error occurs while retrieving or executing the TwiML requested from sms_url
+    /// </summary>
+    public Uri SmsFallbackUrl { get; set; }
+    /// <summary>
+    /// The HTTP method we should use to call sms_url
+    /// </summary>
+    public Twilio.Http.HttpMethod SmsMethod { get; set; }
+    /// <summary>
+    /// The URL we should call when the SIM-connected device sends an SMS message that is not a Command
+    /// </summary>
+    public Uri SmsUrl { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public Uri VoiceFallbackUrl { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public Twilio.Http.HttpMethod VoiceMethod { get; set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    public Uri VoiceUrl { get; set; }
+    /// <summary>
+    /// Initiate a connectivity reset on a SIM
+    /// </summary>
+    public SimResource.ResetStatusEnum ResetStatus { get; set; }
+    /// <summary>
+    /// The SID of the Account to which the Sim resource should belong
+    /// </summary>
+    public string AccountSid { get; set; }
+
+    /// <summary>
+    /// Construct a new UpdateSimOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Sim resource to update </param>
+    public UpdateSimOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (UniqueName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("UniqueName", UniqueName));
+      }
+
+      if (CallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackMethod", CallbackMethod.ToString()));
+      }
+
+      if (CallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CallbackUrl", Serializers.Url(CallbackUrl)));
+      }
+
+      if (FriendlyName != null)
+      {
+        p.Add(new KeyValuePair<string, string>("FriendlyName", FriendlyName));
+      }
+
+      if (RatePlan != null)
+      {
+        p.Add(new KeyValuePair<string, string>("RatePlan", RatePlan.ToString()));
+      }
+
+      if (Status != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Status", Status.ToString()));
+      }
+
+      if (CommandsCallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommandsCallbackMethod", CommandsCallbackMethod.ToString()));
+      }
+
+      if (CommandsCallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("CommandsCallbackUrl", Serializers.Url(CommandsCallbackUrl)));
+      }
+
+      if (SmsFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackMethod", SmsFallbackMethod.ToString()));
+      }
+
+      if (SmsFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsFallbackUrl", Serializers.Url(SmsFallbackUrl)));
+      }
+
+      if (SmsMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsMethod", SmsMethod.ToString()));
+      }
+
+      if (SmsUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("SmsUrl", Serializers.Url(SmsUrl)));
+      }
+
+      if (VoiceFallbackMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackMethod", VoiceFallbackMethod.ToString()));
+      }
+
+      if (VoiceFallbackUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceFallbackUrl", Serializers.Url(VoiceFallbackUrl)));
+      }
+
+      if (VoiceMethod != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceMethod", VoiceMethod.ToString()));
+      }
+
+      if (VoiceUrl != null)
+      {
+        p.Add(new KeyValuePair<string, string>("VoiceUrl", Serializers.Url(VoiceUrl)));
+      }
+
+      if (ResetStatus != null)
+      {
+        p.Add(new KeyValuePair<string, string>("ResetStatus", ResetStatus.ToString()));
+      }
+
+      if (AccountSid != null)
+      {
+        p.Add(new KeyValuePair<string, string>("AccountSid", AccountSid.ToString()));
+      }
+
+      return p;
+    }
+  }
+
+  /// <summary>
+  /// Delete a Sim resource on your Account.
+  /// </summary>
+  public class DeleteSimOptions : IOptions<SimResource>
+  {
+    /// <summary>
+    /// The SID of the Sim Resource to delete
+    /// </summary>
+    public string PathSid { get; }
+
+    /// <summary>
+    /// Construct a new DeleteSimOptions
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Sim Resource to delete </param>
+    public DeleteSimOptions(string pathSid)
+    {
+      PathSid = pathSid;
+    }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Wireless/V1/SimResource.cs b/src/Twilio/Rest/Wireless/V1/SimResource.cs
index 09aec8385..9dc4942f2 100644
--- a/src/Twilio/Rest/Wireless/V1/SimResource.cs
+++ b/src/Twilio/Rest/Wireless/V1/SimResource.cs
@@ -17,619 +17,619 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Wireless.V1
-{
-
-    public class SimResource : Resource
-    {
-        public sealed class StatusEnum : StringEnum
-        {
-            private StatusEnum(string value) : base(value) {}
-            public StatusEnum() {}
-            public static implicit operator StatusEnum(string value)
-            {
-                return new StatusEnum(value);
-            }
-
-            public static readonly StatusEnum New = new StatusEnum("new");
-            public static readonly StatusEnum Ready = new StatusEnum("ready");
-            public static readonly StatusEnum Active = new StatusEnum("active");
-            public static readonly StatusEnum Suspended = new StatusEnum("suspended");
-            public static readonly StatusEnum Deactivated = new StatusEnum("deactivated");
-            public static readonly StatusEnum Canceled = new StatusEnum("canceled");
-            public static readonly StatusEnum Scheduled = new StatusEnum("scheduled");
-            public static readonly StatusEnum Updating = new StatusEnum("updating");
-        }
-
-        public sealed class ResetStatusEnum : StringEnum
-        {
-            private ResetStatusEnum(string value) : base(value) {}
-            public ResetStatusEnum() {}
-            public static implicit operator ResetStatusEnum(string value)
-            {
-                return new ResetStatusEnum(value);
-            }
-
-            public static readonly ResetStatusEnum Resetting = new ResetStatusEnum("resetting");
-        }
-
-        private static Request BuildFetchRequest(FetchSimOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Wireless,
-                "/v1/Sims/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Fetch a Sim resource on your Account.
-        /// </summary>
-        /// <param name="options"> Fetch Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Fetch(FetchSimOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Sim resource on your Account.
-        /// </summary>
-        /// <param name="options"> Fetch Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> FetchAsync(FetchSimOptions options,
-                                                                                ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildFetchRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch a Sim resource on your Account.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Sim resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Fetch(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new FetchSimOptions(pathSid);
-            return Fetch(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Fetch a Sim resource on your Account.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Sim resource to fetch </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> FetchAsync(string pathSid,
-                                                                                ITwilioRestClient client = null)
-        {
-            var options = new FetchSimOptions(pathSid);
-            return await FetchAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildReadRequest(ReadSimOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Wireless,
-                "/v1/Sims",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Retrieve a list of Sim resources on your Account.
-        /// </summary>
-        /// <param name="options"> Read Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static ResourceSet<SimResource> Read(ReadSimOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<SimResource>.FromJson("sims", response.Content);
-            return new ResourceSet<SimResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Sim resources on your Account.
-        /// </summary>
-        /// <param name="options"> Read Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SimResource>> ReadAsync(ReadSimOptions options,
-                                                                                            ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<SimResource>.FromJson("sims", response.Content);
-            return new ResourceSet<SimResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Retrieve a list of Sim resources on your Account.
-        /// </summary>
-        /// <param name="status"> Only return Sim resources with this status </param>
-        /// <param name="iccid"> Only return Sim resources with this ICCID </param>
-        /// <param name="ratePlan"> Only return Sim resources assigned to this RatePlan resource </param>
-        /// <param name="eId"> Deprecated </param>
-        /// <param name="simRegistrationCode"> Only return Sim resources with this registration code </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static ResourceSet<SimResource> Read(SimResource.StatusEnum status = null,
-                                                    string iccid = null,
-                                                    string ratePlan = null,
-                                                    string eId = null,
-                                                    string simRegistrationCode = null,
-                                                    int? pageSize = null,
-                                                    long? limit = null,
-                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadSimOptions(){Status = status, Iccid = iccid, RatePlan = ratePlan, EId = eId, SimRegistrationCode = simRegistrationCode, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Retrieve a list of Sim resources on your Account.
-        /// </summary>
-        /// <param name="status"> Only return Sim resources with this status </param>
-        /// <param name="iccid"> Only return Sim resources with this ICCID </param>
-        /// <param name="ratePlan"> Only return Sim resources assigned to this RatePlan resource </param>
-        /// <param name="eId"> Deprecated </param>
-        /// <param name="simRegistrationCode"> Only return Sim resources with this registration code </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<SimResource>> ReadAsync(SimResource.StatusEnum status = null,
-                                                                                            string iccid = null,
-                                                                                            string ratePlan = null,
-                                                                                            string eId = null,
-                                                                                            string simRegistrationCode = null,
-                                                                                            int? pageSize = null,
-                                                                                            long? limit = null,
-                                                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadSimOptions(){Status = status, Iccid = iccid, RatePlan = ratePlan, EId = eId, SimRegistrationCode = simRegistrationCode, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<SimResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<SimResource>.FromJson("sims", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<SimResource> NextPage(Page<SimResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Wireless)
-            );
-
-            var response = client.Request(request);
-            return Page<SimResource>.FromJson("sims", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<SimResource> PreviousPage(Page<SimResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Wireless)
-            );
-
-            var response = client.Request(request);
-            return Page<SimResource>.FromJson("sims", response.Content);
-        }
-
-        private static Request BuildUpdateRequest(UpdateSimOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Post,
-                Rest.Domain.Wireless,
-                "/v1/Sims/" + options.PathSid + "",
-                postParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Updates the given properties of a Sim resource on your Account.
-        /// </summary>
-        /// <param name="options"> Update Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Update(UpdateSimOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the given properties of a Sim resource on your Account.
-        /// </summary>
-        /// <param name="options"> Update Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> UpdateAsync(UpdateSimOptions options,
-                                                                                 ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildUpdateRequest(options, client));
-            return FromJson(response.Content);
-        }
-        #endif
-
-        /// <summary>
-        /// Updates the given properties of a Sim resource on your Account.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Sim resource to update </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
-        /// <param name="callbackUrl"> The URL we should call when the Sim resource has finished updating </param>
-        /// <param name="friendlyName"> A string to describe the Sim resource </param>
-        /// <param name="ratePlan"> The SID or unique name of the RatePlan resource to which the Sim resource should be
-        ///                assigned </param>
-        /// <param name="status"> The new status of the Sim resource </param>
-        /// <param name="commandsCallbackMethod"> The HTTP method we should use to call commands_callback_url </param>
-        /// <param name="commandsCallbackUrl"> The URL we should call when the SIM sends a Command </param>
-        /// <param name="smsFallbackMethod"> The HTTP method we should use to call sms_fallback_url </param>
-        /// <param name="smsFallbackUrl"> The URL we should call when an error occurs while retrieving or executing the TwiML
-        ///                      requested from sms_url </param>
-        /// <param name="smsMethod"> The HTTP method we should use to call sms_url </param>
-        /// <param name="smsUrl"> The URL we should call when the SIM-connected device sends an SMS message that is not a
-        ///              Command </param>
-        /// <param name="voiceFallbackMethod"> Deprecated </param>
-        /// <param name="voiceFallbackUrl"> Deprecated </param>
-        /// <param name="voiceMethod"> Deprecated </param>
-        /// <param name="voiceUrl"> Deprecated </param>
-        /// <param name="resetStatus"> Initiate a connectivity reset on a SIM </param>
-        /// <param name="accountSid"> The SID of the Account to which the Sim resource should belong </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static SimResource Update(string pathSid,
-                                         string uniqueName = null,
-                                         Twilio.Http.HttpMethod callbackMethod = null,
-                                         Uri callbackUrl = null,
-                                         string friendlyName = null,
-                                         string ratePlan = null,
-                                         SimResource.StatusEnum status = null,
-                                         Twilio.Http.HttpMethod commandsCallbackMethod = null,
-                                         Uri commandsCallbackUrl = null,
-                                         Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                         Uri smsFallbackUrl = null,
-                                         Twilio.Http.HttpMethod smsMethod = null,
-                                         Uri smsUrl = null,
-                                         Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                         Uri voiceFallbackUrl = null,
-                                         Twilio.Http.HttpMethod voiceMethod = null,
-                                         Uri voiceUrl = null,
-                                         SimResource.ResetStatusEnum resetStatus = null,
-                                         string accountSid = null,
-                                         ITwilioRestClient client = null)
-        {
-            var options = new UpdateSimOptions(pathSid){UniqueName = uniqueName, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, FriendlyName = friendlyName, RatePlan = ratePlan, Status = status, CommandsCallbackMethod = commandsCallbackMethod, CommandsCallbackUrl = commandsCallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, ResetStatus = resetStatus, AccountSid = accountSid};
-            return Update(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Updates the given properties of a Sim resource on your Account.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Sim resource to update </param>
-        /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
-        /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
-        /// <param name="callbackUrl"> The URL we should call when the Sim resource has finished updating </param>
-        /// <param name="friendlyName"> A string to describe the Sim resource </param>
-        /// <param name="ratePlan"> The SID or unique name of the RatePlan resource to which the Sim resource should be
-        ///                assigned </param>
-        /// <param name="status"> The new status of the Sim resource </param>
-        /// <param name="commandsCallbackMethod"> The HTTP method we should use to call commands_callback_url </param>
-        /// <param name="commandsCallbackUrl"> The URL we should call when the SIM sends a Command </param>
-        /// <param name="smsFallbackMethod"> The HTTP method we should use to call sms_fallback_url </param>
-        /// <param name="smsFallbackUrl"> The URL we should call when an error occurs while retrieving or executing the TwiML
-        ///                      requested from sms_url </param>
-        /// <param name="smsMethod"> The HTTP method we should use to call sms_url </param>
-        /// <param name="smsUrl"> The URL we should call when the SIM-connected device sends an SMS message that is not a
-        ///              Command </param>
-        /// <param name="voiceFallbackMethod"> Deprecated </param>
-        /// <param name="voiceFallbackUrl"> Deprecated </param>
-        /// <param name="voiceMethod"> Deprecated </param>
-        /// <param name="voiceUrl"> Deprecated </param>
-        /// <param name="resetStatus"> Initiate a connectivity reset on a SIM </param>
-        /// <param name="accountSid"> The SID of the Account to which the Sim resource should belong </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<SimResource> UpdateAsync(string pathSid,
-                                                                                 string uniqueName = null,
-                                                                                 Twilio.Http.HttpMethod callbackMethod = null,
-                                                                                 Uri callbackUrl = null,
-                                                                                 string friendlyName = null,
-                                                                                 string ratePlan = null,
-                                                                                 SimResource.StatusEnum status = null,
-                                                                                 Twilio.Http.HttpMethod commandsCallbackMethod = null,
-                                                                                 Uri commandsCallbackUrl = null,
-                                                                                 Twilio.Http.HttpMethod smsFallbackMethod = null,
-                                                                                 Uri smsFallbackUrl = null,
-                                                                                 Twilio.Http.HttpMethod smsMethod = null,
-                                                                                 Uri smsUrl = null,
-                                                                                 Twilio.Http.HttpMethod voiceFallbackMethod = null,
-                                                                                 Uri voiceFallbackUrl = null,
-                                                                                 Twilio.Http.HttpMethod voiceMethod = null,
-                                                                                 Uri voiceUrl = null,
-                                                                                 SimResource.ResetStatusEnum resetStatus = null,
-                                                                                 string accountSid = null,
-                                                                                 ITwilioRestClient client = null)
-        {
-            var options = new UpdateSimOptions(pathSid){UniqueName = uniqueName, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, FriendlyName = friendlyName, RatePlan = ratePlan, Status = status, CommandsCallbackMethod = commandsCallbackMethod, CommandsCallbackUrl = commandsCallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, ResetStatus = resetStatus, AccountSid = accountSid};
-            return await UpdateAsync(options, client);
-        }
-        #endif
-
-        private static Request BuildDeleteRequest(DeleteSimOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Delete,
-                Rest.Domain.Wireless,
-                "/v1/Sims/" + options.PathSid + "",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// Delete a Sim resource on your Account.
-        /// </summary>
-        /// <param name="options"> Delete Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static bool Delete(DeleteSimOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Sim resource on your Account.
-        /// </summary>
-        /// <param name="options"> Delete Sim parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSimOptions options,
-                                                                          ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildDeleteRequest(options, client));
-            return response.StatusCode == System.Net.HttpStatusCode.NoContent;
-        }
-        #endif
-
-        /// <summary>
-        /// Delete a Sim resource on your Account.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Sim Resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of Sim </returns>
-        public static bool Delete(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSimOptions(pathSid);
-            return Delete(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// Delete a Sim resource on your Account.
-        /// </summary>
-        /// <param name="pathSid"> The SID of the Sim Resource to delete </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of Sim </returns>
-        public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
-        {
-            var options = new DeleteSimOptions(pathSid);
-            return await DeleteAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Converts a JSON string into a SimResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> SimResource object represented by the provided JSON </returns>
-        public static SimResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<SimResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The unique string that identifies the Sim resource
-        /// </summary>
-        [JsonProperty("sid")]
-        public string Sid { get; private set; }
-        /// <summary>
-        /// An application-defined string that uniquely identifies the resource
-        /// </summary>
-        [JsonProperty("unique_name")]
-        public string UniqueName { get; private set; }
-        /// <summary>
-        /// The SID of the Account to which the Sim resource belongs
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The SID of the RatePlan resource to which the Sim resource is assigned.
-        /// </summary>
-        [JsonProperty("rate_plan_sid")]
-        public string RatePlanSid { get; private set; }
-        /// <summary>
-        /// The string that you assigned to describe the Sim resource
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; private set; }
-        /// <summary>
-        /// The ICCID associated with the SIM
-        /// </summary>
-        [JsonProperty("iccid")]
-        public string Iccid { get; private set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        [JsonProperty("e_id")]
-        public string EId { get; private set; }
-        /// <summary>
-        /// The status of the Sim resource
-        /// </summary>
-        [JsonProperty("status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SimResource.StatusEnum Status { get; private set; }
-        /// <summary>
-        /// The connectivity reset status of the SIM
-        /// </summary>
-        [JsonProperty("reset_status")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public SimResource.ResetStatusEnum ResetStatus { get; private set; }
-        /// <summary>
-        /// The URL we call when the SIM originates a machine-to-machine Command
-        /// </summary>
-        [JsonProperty("commands_callback_url")]
-        public Uri CommandsCallbackUrl { get; private set; }
-        /// <summary>
-        /// The HTTP method we use to call commands_callback_url
-        /// </summary>
-        [JsonProperty("commands_callback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod CommandsCallbackMethod { get; private set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        [JsonProperty("sms_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        [JsonProperty("sms_fallback_url")]
-        public Uri SmsFallbackUrl { get; private set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        [JsonProperty("sms_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod SmsMethod { get; private set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        [JsonProperty("sms_url")]
-        public Uri SmsUrl { get; private set; }
-        /// <summary>
-        /// Deprecated. The HTTP method we use to call voice_fallback_url
-        /// </summary>
-        [JsonProperty("voice_fallback_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
-        /// <summary>
-        /// Deprecated. The URL we call when an error occurs while retrieving or executing the TwiML requested from voice_url
-        /// </summary>
-        [JsonProperty("voice_fallback_url")]
-        public Uri VoiceFallbackUrl { get; private set; }
-        /// <summary>
-        /// Deprecated. The HTTP method we use to call voice_url
-        /// </summary>
-        [JsonProperty("voice_method")]
-        [JsonConverter(typeof(HttpMethodConverter))]
-        public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
-        /// <summary>
-        /// Deprecated. The URL we call when the SIM-connected device makes a voice call
-        /// </summary>
-        [JsonProperty("voice_url")]
-        public Uri VoiceUrl { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the resource was created
-        /// </summary>
-        [JsonProperty("date_created")]
-        public DateTime? DateCreated { get; private set; }
-        /// <summary>
-        /// The ISO 8601 date and time in GMT when the Sim resource was last updated
-        /// </summary>
-        [JsonProperty("date_updated")]
-        public DateTime? DateUpdated { get; private set; }
-        /// <summary>
-        /// The absolute URL of the resource
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; private set; }
-        /// <summary>
-        /// The URLs of related subresources
-        /// </summary>
-        [JsonProperty("links")]
-        public Dictionary<string, string> Links { get; private set; }
-        /// <summary>
-        /// Deprecated
-        /// </summary>
-        [JsonProperty("ip_address")]
-        public string IpAddress { get; private set; }
-
-        private SimResource()
-        {
-
-        }
-    }
+{
+
+  public class SimResource : Resource
+  {
+    public sealed class StatusEnum : StringEnum
+    {
+      private StatusEnum(string value) : base(value) { }
+      public StatusEnum() { }
+      public static implicit operator StatusEnum(string value)
+      {
+        return new StatusEnum(value);
+      }
+
+      public static readonly StatusEnum New = new StatusEnum("new");
+      public static readonly StatusEnum Ready = new StatusEnum("ready");
+      public static readonly StatusEnum Active = new StatusEnum("active");
+      public static readonly StatusEnum Suspended = new StatusEnum("suspended");
+      public static readonly StatusEnum Deactivated = new StatusEnum("deactivated");
+      public static readonly StatusEnum Canceled = new StatusEnum("canceled");
+      public static readonly StatusEnum Scheduled = new StatusEnum("scheduled");
+      public static readonly StatusEnum Updating = new StatusEnum("updating");
+    }
+
+    public sealed class ResetStatusEnum : StringEnum
+    {
+      private ResetStatusEnum(string value) : base(value) { }
+      public ResetStatusEnum() { }
+      public static implicit operator ResetStatusEnum(string value)
+      {
+        return new ResetStatusEnum(value);
+      }
+
+      public static readonly ResetStatusEnum Resetting = new ResetStatusEnum("resetting");
+    }
+
+    private static Request BuildFetchRequest(FetchSimOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Wireless,
+          "/v1/Sims/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Fetch a Sim resource on your Account.
+    /// </summary>
+    /// <param name="options"> Fetch Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Fetch(FetchSimOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Sim resource on your Account.
+    /// </summary>
+    /// <param name="options"> Fetch Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> FetchAsync(FetchSimOptions options,
+                                                                            ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildFetchRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch a Sim resource on your Account.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Sim resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Fetch(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new FetchSimOptions(pathSid);
+      return Fetch(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Fetch a Sim resource on your Account.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Sim resource to fetch </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> FetchAsync(string pathSid,
+                                                                            ITwilioRestClient client = null)
+    {
+      var options = new FetchSimOptions(pathSid);
+      return await FetchAsync(options, client);
+    }
+#endif
+
+    private static Request BuildReadRequest(ReadSimOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Wireless,
+          "/v1/Sims",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Retrieve a list of Sim resources on your Account.
+    /// </summary>
+    /// <param name="options"> Read Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static ResourceSet<SimResource> Read(ReadSimOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<SimResource>.FromJson("sims", response.Content);
+      return new ResourceSet<SimResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Sim resources on your Account.
+    /// </summary>
+    /// <param name="options"> Read Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SimResource>> ReadAsync(ReadSimOptions options,
+                                                                                        ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<SimResource>.FromJson("sims", response.Content);
+      return new ResourceSet<SimResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Retrieve a list of Sim resources on your Account.
+    /// </summary>
+    /// <param name="status"> Only return Sim resources with this status </param>
+    /// <param name="iccid"> Only return Sim resources with this ICCID </param>
+    /// <param name="ratePlan"> Only return Sim resources assigned to this RatePlan resource </param>
+    /// <param name="eId"> Deprecated </param>
+    /// <param name="simRegistrationCode"> Only return Sim resources with this registration code </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static ResourceSet<SimResource> Read(SimResource.StatusEnum status = null,
+                                                string iccid = null,
+                                                string ratePlan = null,
+                                                string eId = null,
+                                                string simRegistrationCode = null,
+                                                int? pageSize = null,
+                                                long? limit = null,
+                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadSimOptions() { Status = status, Iccid = iccid, RatePlan = ratePlan, EId = eId, SimRegistrationCode = simRegistrationCode, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Retrieve a list of Sim resources on your Account.
+    /// </summary>
+    /// <param name="status"> Only return Sim resources with this status </param>
+    /// <param name="iccid"> Only return Sim resources with this ICCID </param>
+    /// <param name="ratePlan"> Only return Sim resources assigned to this RatePlan resource </param>
+    /// <param name="eId"> Deprecated </param>
+    /// <param name="simRegistrationCode"> Only return Sim resources with this registration code </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<SimResource>> ReadAsync(SimResource.StatusEnum status = null,
+                                                                                        string iccid = null,
+                                                                                        string ratePlan = null,
+                                                                                        string eId = null,
+                                                                                        string simRegistrationCode = null,
+                                                                                        int? pageSize = null,
+                                                                                        long? limit = null,
+                                                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadSimOptions() { Status = status, Iccid = iccid, RatePlan = ratePlan, EId = eId, SimRegistrationCode = simRegistrationCode, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<SimResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<SimResource>.FromJson("sims", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<SimResource> NextPage(Page<SimResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Wireless)
+      );
+
+      var response = client.Request(request);
+      return Page<SimResource>.FromJson("sims", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<SimResource> PreviousPage(Page<SimResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Wireless)
+      );
+
+      var response = client.Request(request);
+      return Page<SimResource>.FromJson("sims", response.Content);
+    }
+
+    private static Request BuildUpdateRequest(UpdateSimOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Post,
+          Rest.Domain.Wireless,
+          "/v1/Sims/" + options.PathSid + "",
+          postParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Updates the given properties of a Sim resource on your Account.
+    /// </summary>
+    /// <param name="options"> Update Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Update(UpdateSimOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the given properties of a Sim resource on your Account.
+    /// </summary>
+    /// <param name="options"> Update Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> UpdateAsync(UpdateSimOptions options,
+                                                                             ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildUpdateRequest(options, client));
+      return FromJson(response.Content);
+    }
+#endif
+
+    /// <summary>
+    /// Updates the given properties of a Sim resource on your Account.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Sim resource to update </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
+    /// <param name="callbackUrl"> The URL we should call when the Sim resource has finished updating </param>
+    /// <param name="friendlyName"> A string to describe the Sim resource </param>
+    /// <param name="ratePlan"> The SID or unique name of the RatePlan resource to which the Sim resource should be
+    ///                assigned </param>
+    /// <param name="status"> The new status of the Sim resource </param>
+    /// <param name="commandsCallbackMethod"> The HTTP method we should use to call commands_callback_url </param>
+    /// <param name="commandsCallbackUrl"> The URL we should call when the SIM sends a Command </param>
+    /// <param name="smsFallbackMethod"> The HTTP method we should use to call sms_fallback_url </param>
+    /// <param name="smsFallbackUrl"> The URL we should call when an error occurs while retrieving or executing the TwiML
+    ///                      requested from sms_url </param>
+    /// <param name="smsMethod"> The HTTP method we should use to call sms_url </param>
+    /// <param name="smsUrl"> The URL we should call when the SIM-connected device sends an SMS message that is not a
+    ///              Command </param>
+    /// <param name="voiceFallbackMethod"> Deprecated </param>
+    /// <param name="voiceFallbackUrl"> Deprecated </param>
+    /// <param name="voiceMethod"> Deprecated </param>
+    /// <param name="voiceUrl"> Deprecated </param>
+    /// <param name="resetStatus"> Initiate a connectivity reset on a SIM </param>
+    /// <param name="accountSid"> The SID of the Account to which the Sim resource should belong </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static SimResource Update(string pathSid,
+                                     string uniqueName = null,
+                                     Twilio.Http.HttpMethod callbackMethod = null,
+                                     Uri callbackUrl = null,
+                                     string friendlyName = null,
+                                     string ratePlan = null,
+                                     SimResource.StatusEnum status = null,
+                                     Twilio.Http.HttpMethod commandsCallbackMethod = null,
+                                     Uri commandsCallbackUrl = null,
+                                     Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                     Uri smsFallbackUrl = null,
+                                     Twilio.Http.HttpMethod smsMethod = null,
+                                     Uri smsUrl = null,
+                                     Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                     Uri voiceFallbackUrl = null,
+                                     Twilio.Http.HttpMethod voiceMethod = null,
+                                     Uri voiceUrl = null,
+                                     SimResource.ResetStatusEnum resetStatus = null,
+                                     string accountSid = null,
+                                     ITwilioRestClient client = null)
+    {
+      var options = new UpdateSimOptions(pathSid) { UniqueName = uniqueName, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, FriendlyName = friendlyName, RatePlan = ratePlan, Status = status, CommandsCallbackMethod = commandsCallbackMethod, CommandsCallbackUrl = commandsCallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, ResetStatus = resetStatus, AccountSid = accountSid };
+      return Update(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Updates the given properties of a Sim resource on your Account.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Sim resource to update </param>
+    /// <param name="uniqueName"> An application-defined string that uniquely identifies the resource </param>
+    /// <param name="callbackMethod"> The HTTP method we should use to call callback_url </param>
+    /// <param name="callbackUrl"> The URL we should call when the Sim resource has finished updating </param>
+    /// <param name="friendlyName"> A string to describe the Sim resource </param>
+    /// <param name="ratePlan"> The SID or unique name of the RatePlan resource to which the Sim resource should be
+    ///                assigned </param>
+    /// <param name="status"> The new status of the Sim resource </param>
+    /// <param name="commandsCallbackMethod"> The HTTP method we should use to call commands_callback_url </param>
+    /// <param name="commandsCallbackUrl"> The URL we should call when the SIM sends a Command </param>
+    /// <param name="smsFallbackMethod"> The HTTP method we should use to call sms_fallback_url </param>
+    /// <param name="smsFallbackUrl"> The URL we should call when an error occurs while retrieving or executing the TwiML
+    ///                      requested from sms_url </param>
+    /// <param name="smsMethod"> The HTTP method we should use to call sms_url </param>
+    /// <param name="smsUrl"> The URL we should call when the SIM-connected device sends an SMS message that is not a
+    ///              Command </param>
+    /// <param name="voiceFallbackMethod"> Deprecated </param>
+    /// <param name="voiceFallbackUrl"> Deprecated </param>
+    /// <param name="voiceMethod"> Deprecated </param>
+    /// <param name="voiceUrl"> Deprecated </param>
+    /// <param name="resetStatus"> Initiate a connectivity reset on a SIM </param>
+    /// <param name="accountSid"> The SID of the Account to which the Sim resource should belong </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<SimResource> UpdateAsync(string pathSid,
+                                                                             string uniqueName = null,
+                                                                             Twilio.Http.HttpMethod callbackMethod = null,
+                                                                             Uri callbackUrl = null,
+                                                                             string friendlyName = null,
+                                                                             string ratePlan = null,
+                                                                             SimResource.StatusEnum status = null,
+                                                                             Twilio.Http.HttpMethod commandsCallbackMethod = null,
+                                                                             Uri commandsCallbackUrl = null,
+                                                                             Twilio.Http.HttpMethod smsFallbackMethod = null,
+                                                                             Uri smsFallbackUrl = null,
+                                                                             Twilio.Http.HttpMethod smsMethod = null,
+                                                                             Uri smsUrl = null,
+                                                                             Twilio.Http.HttpMethod voiceFallbackMethod = null,
+                                                                             Uri voiceFallbackUrl = null,
+                                                                             Twilio.Http.HttpMethod voiceMethod = null,
+                                                                             Uri voiceUrl = null,
+                                                                             SimResource.ResetStatusEnum resetStatus = null,
+                                                                             string accountSid = null,
+                                                                             ITwilioRestClient client = null)
+    {
+      var options = new UpdateSimOptions(pathSid) { UniqueName = uniqueName, CallbackMethod = callbackMethod, CallbackUrl = callbackUrl, FriendlyName = friendlyName, RatePlan = ratePlan, Status = status, CommandsCallbackMethod = commandsCallbackMethod, CommandsCallbackUrl = commandsCallbackUrl, SmsFallbackMethod = smsFallbackMethod, SmsFallbackUrl = smsFallbackUrl, SmsMethod = smsMethod, SmsUrl = smsUrl, VoiceFallbackMethod = voiceFallbackMethod, VoiceFallbackUrl = voiceFallbackUrl, VoiceMethod = voiceMethod, VoiceUrl = voiceUrl, ResetStatus = resetStatus, AccountSid = accountSid };
+      return await UpdateAsync(options, client);
+    }
+#endif
+
+    private static Request BuildDeleteRequest(DeleteSimOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Delete,
+          Rest.Domain.Wireless,
+          "/v1/Sims/" + options.PathSid + "",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// Delete a Sim resource on your Account.
+    /// </summary>
+    /// <param name="options"> Delete Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static bool Delete(DeleteSimOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Sim resource on your Account.
+    /// </summary>
+    /// <param name="options"> Delete Sim parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(DeleteSimOptions options,
+                                                                      ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildDeleteRequest(options, client));
+      return response.StatusCode == System.Net.HttpStatusCode.NoContent;
+    }
+#endif
+
+    /// <summary>
+    /// Delete a Sim resource on your Account.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Sim Resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of Sim </returns>
+    public static bool Delete(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSimOptions(pathSid);
+      return Delete(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// Delete a Sim resource on your Account.
+    /// </summary>
+    /// <param name="pathSid"> The SID of the Sim Resource to delete </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of Sim </returns>
+    public static async System.Threading.Tasks.Task<bool> DeleteAsync(string pathSid, ITwilioRestClient client = null)
+    {
+      var options = new DeleteSimOptions(pathSid);
+      return await DeleteAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Converts a JSON string into a SimResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> SimResource object represented by the provided JSON </returns>
+    public static SimResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<SimResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The unique string that identifies the Sim resource
+    /// </summary>
+    [JsonProperty("sid")]
+    public string Sid { get; private set; }
+    /// <summary>
+    /// An application-defined string that uniquely identifies the resource
+    /// </summary>
+    [JsonProperty("unique_name")]
+    public string UniqueName { get; private set; }
+    /// <summary>
+    /// The SID of the Account to which the Sim resource belongs
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The SID of the RatePlan resource to which the Sim resource is assigned.
+    /// </summary>
+    [JsonProperty("rate_plan_sid")]
+    public string RatePlanSid { get; private set; }
+    /// <summary>
+    /// The string that you assigned to describe the Sim resource
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; private set; }
+    /// <summary>
+    /// The ICCID associated with the SIM
+    /// </summary>
+    [JsonProperty("iccid")]
+    public string Iccid { get; private set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    [JsonProperty("e_id")]
+    public string EId { get; private set; }
+    /// <summary>
+    /// The status of the Sim resource
+    /// </summary>
+    [JsonProperty("status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public SimResource.StatusEnum Status { get; private set; }
+    /// <summary>
+    /// The connectivity reset status of the SIM
+    /// </summary>
+    [JsonProperty("reset_status")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public SimResource.ResetStatusEnum ResetStatus { get; private set; }
+    /// <summary>
+    /// The URL we call when the SIM originates a machine-to-machine Command
+    /// </summary>
+    [JsonProperty("commands_callback_url")]
+    public Uri CommandsCallbackUrl { get; private set; }
+    /// <summary>
+    /// The HTTP method we use to call commands_callback_url
+    /// </summary>
+    [JsonProperty("commands_callback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod CommandsCallbackMethod { get; private set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    [JsonProperty("sms_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsFallbackMethod { get; private set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    [JsonProperty("sms_fallback_url")]
+    public Uri SmsFallbackUrl { get; private set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    [JsonProperty("sms_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod SmsMethod { get; private set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    [JsonProperty("sms_url")]
+    public Uri SmsUrl { get; private set; }
+    /// <summary>
+    /// Deprecated. The HTTP method we use to call voice_fallback_url
+    /// </summary>
+    [JsonProperty("voice_fallback_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceFallbackMethod { get; private set; }
+    /// <summary>
+    /// Deprecated. The URL we call when an error occurs while retrieving or executing the TwiML requested from voice_url
+    /// </summary>
+    [JsonProperty("voice_fallback_url")]
+    public Uri VoiceFallbackUrl { get; private set; }
+    /// <summary>
+    /// Deprecated. The HTTP method we use to call voice_url
+    /// </summary>
+    [JsonProperty("voice_method")]
+    [JsonConverter(typeof(HttpMethodConverter))]
+    public Twilio.Http.HttpMethod VoiceMethod { get; private set; }
+    /// <summary>
+    /// Deprecated. The URL we call when the SIM-connected device makes a voice call
+    /// </summary>
+    [JsonProperty("voice_url")]
+    public Uri VoiceUrl { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the resource was created
+    /// </summary>
+    [JsonProperty("date_created")]
+    public DateTime? DateCreated { get; private set; }
+    /// <summary>
+    /// The ISO 8601 date and time in GMT when the Sim resource was last updated
+    /// </summary>
+    [JsonProperty("date_updated")]
+    public DateTime? DateUpdated { get; private set; }
+    /// <summary>
+    /// The absolute URL of the resource
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; private set; }
+    /// <summary>
+    /// The URLs of related subresources
+    /// </summary>
+    [JsonProperty("links")]
+    public Dictionary<string, string> Links { get; private set; }
+    /// <summary>
+    /// Deprecated
+    /// </summary>
+    [JsonProperty("ip_address")]
+    public string IpAddress { get; private set; }
+
+    private SimResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Wireless/V1/UsageRecordOptions.cs b/src/Twilio/Rest/Wireless/V1/UsageRecordOptions.cs
index d643ad188..dbfd12ba3 100644
--- a/src/Twilio/Rest/Wireless/V1/UsageRecordOptions.cs
+++ b/src/Twilio/Rest/Wireless/V1/UsageRecordOptions.cs
@@ -9,54 +9,54 @@
 using Twilio.Converters;
 
 namespace Twilio.Rest.Wireless.V1
-{
-
+{
+
+  /// <summary>
+  /// ReadUsageRecordOptions
+  /// </summary>
+  public class ReadUsageRecordOptions : ReadOptions<UsageRecordResource>
+  {
     /// <summary>
-    /// ReadUsageRecordOptions
+    /// Only include usage that has occurred on or before this date
     /// </summary>
-    public class ReadUsageRecordOptions : ReadOptions<UsageRecordResource>
-    {
-        /// <summary>
-        /// Only include usage that has occurred on or before this date
-        /// </summary>
-        public DateTime? End { get; set; }
-        /// <summary>
-        /// Only include usage that has occurred on or after this date
-        /// </summary>
-        public DateTime? Start { get; set; }
-        /// <summary>
-        /// The time-based grouping that results are aggregated by
-        /// </summary>
-        public UsageRecordResource.GranularityEnum Granularity { get; set; }
-
-        /// <summary>
-        /// Generate the necessary parameters
-        /// </summary>
-        public override List<KeyValuePair<string, string>> GetParams()
-        {
-            var p = new List<KeyValuePair<string, string>>();
-            if (End != null)
-            {
-                p.Add(new KeyValuePair<string, string>("End", Serializers.DateTimeIso8601(End)));
-            }
-
-            if (Start != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Start", Serializers.DateTimeIso8601(Start)));
-            }
-
-            if (Granularity != null)
-            {
-                p.Add(new KeyValuePair<string, string>("Granularity", Granularity.ToString()));
-            }
-
-            if (PageSize != null)
-            {
-                p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
-            }
-
-            return p;
-        }
-    }
+    public DateTime? End { get; set; }
+    /// <summary>
+    /// Only include usage that has occurred on or after this date
+    /// </summary>
+    public DateTime? Start { get; set; }
+    /// <summary>
+    /// The time-based grouping that results are aggregated by
+    /// </summary>
+    public UsageRecordResource.GranularityEnum Granularity { get; set; }
+
+    /// <summary>
+    /// Generate the necessary parameters
+    /// </summary>
+    public override List<KeyValuePair<string, string>> GetParams()
+    {
+      var p = new List<KeyValuePair<string, string>>();
+      if (End != null)
+      {
+        p.Add(new KeyValuePair<string, string>("End", Serializers.DateTimeIso8601(End)));
+      }
+
+      if (Start != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Start", Serializers.DateTimeIso8601(Start)));
+      }
+
+      if (Granularity != null)
+      {
+        p.Add(new KeyValuePair<string, string>("Granularity", Granularity.ToString()));
+      }
+
+      if (PageSize != null)
+      {
+        p.Add(new KeyValuePair<string, string>("PageSize", PageSize.ToString()));
+      }
+
+      return p;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Rest/Wireless/V1/UsageRecordResource.cs b/src/Twilio/Rest/Wireless/V1/UsageRecordResource.cs
index 1d1abd5a3..646b0293b 100644
--- a/src/Twilio/Rest/Wireless/V1/UsageRecordResource.cs
+++ b/src/Twilio/Rest/Wireless/V1/UsageRecordResource.cs
@@ -17,208 +17,208 @@
 using Twilio.Types;
 
 namespace Twilio.Rest.Wireless.V1
-{
-
-    public class UsageRecordResource : Resource
-    {
-        public sealed class GranularityEnum : StringEnum
-        {
-            private GranularityEnum(string value) : base(value) {}
-            public GranularityEnum() {}
-            public static implicit operator GranularityEnum(string value)
-            {
-                return new GranularityEnum(value);
-            }
-
-            public static readonly GranularityEnum Hourly = new GranularityEnum("hourly");
-            public static readonly GranularityEnum Daily = new GranularityEnum("daily");
-            public static readonly GranularityEnum All = new GranularityEnum("all");
-        }
-
-        private static Request BuildReadRequest(ReadUsageRecordOptions options, ITwilioRestClient client)
-        {
-            return new Request(
-                HttpMethod.Get,
-                Rest.Domain.Wireless,
-                "/v1/UsageRecords",
-                queryParams: options.GetParams(),
-                headerParams: null
-            );
-        }
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UsageRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsageRecord </returns>
-        public static ResourceSet<UsageRecordResource> Read(ReadUsageRecordOptions options, ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = client.Request(BuildReadRequest(options, client));
-
-            var page = Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<UsageRecordResource>(page, options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="options"> Read UsageRecord parameters </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsageRecord </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UsageRecordResource>> ReadAsync(ReadUsageRecordOptions options,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-            var response = await client.RequestAsync(BuildReadRequest(options, client));
-
-            var page = Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-            return new ResourceSet<UsageRecordResource>(page, options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="end"> Only include usage that has occurred on or before this date </param>
-        /// <param name="start"> Only include usage that has occurred on or after this date </param>
-        /// <param name="granularity"> The time-based grouping that results are aggregated by </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> A single instance of UsageRecord </returns>
-        public static ResourceSet<UsageRecordResource> Read(DateTime? end = null,
-                                                            DateTime? start = null,
-                                                            UsageRecordResource.GranularityEnum granularity = null,
-                                                            int? pageSize = null,
-                                                            long? limit = null,
-                                                            ITwilioRestClient client = null)
-        {
-            var options = new ReadUsageRecordOptions(){End = end, Start = start, Granularity = granularity, PageSize = pageSize, Limit = limit};
-            return Read(options, client);
-        }
-
-        #if !NET35
-        /// <summary>
-        /// read
-        /// </summary>
-        /// <param name="end"> Only include usage that has occurred on or before this date </param>
-        /// <param name="start"> Only include usage that has occurred on or after this date </param>
-        /// <param name="granularity"> The time-based grouping that results are aggregated by </param>
-        /// <param name="pageSize"> Page size </param>
-        /// <param name="limit"> Record limit </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> Task that resolves to A single instance of UsageRecord </returns>
-        public static async System.Threading.Tasks.Task<ResourceSet<UsageRecordResource>> ReadAsync(DateTime? end = null,
-                                                                                                    DateTime? start = null,
-                                                                                                    UsageRecordResource.GranularityEnum granularity = null,
-                                                                                                    int? pageSize = null,
-                                                                                                    long? limit = null,
-                                                                                                    ITwilioRestClient client = null)
-        {
-            var options = new ReadUsageRecordOptions(){End = end, Start = start, Granularity = granularity, PageSize = pageSize, Limit = limit};
-            return await ReadAsync(options, client);
-        }
-        #endif
-
-        /// <summary>
-        /// Fetch the target page of records
-        /// </summary>
-        /// <param name="targetUrl"> API-generated URL for the requested results page </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The target page of records </returns>
-        public static Page<UsageRecordResource> GetPage(string targetUrl, ITwilioRestClient client)
-        {
-            client = client ?? TwilioClient.GetRestClient();
-
-            var request = new Request(
-                HttpMethod.Get,
-                targetUrl
-            );
-
-            var response = client.Request(request);
-            return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the next page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The next page of records </returns>
-        public static Page<UsageRecordResource> NextPage(Page<UsageRecordResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetNextPageUrl(Rest.Domain.Wireless)
-            );
-
-            var response = client.Request(request);
-            return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Fetch the previous page of records
-        /// </summary>
-        /// <param name="page"> current page of records </param>
-        /// <param name="client"> Client to make requests to Twilio </param>
-        /// <returns> The previous page of records </returns>
-        public static Page<UsageRecordResource> PreviousPage(Page<UsageRecordResource> page, ITwilioRestClient client)
-        {
-            var request = new Request(
-                HttpMethod.Get,
-                page.GetPreviousPageUrl(Rest.Domain.Wireless)
-            );
-
-            var response = client.Request(request);
-            return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
-        }
-
-        /// <summary>
-        /// Converts a JSON string into a UsageRecordResource object
-        /// </summary>
-        /// <param name="json"> Raw JSON string </param>
-        /// <returns> UsageRecordResource object represented by the provided JSON </returns>
-        public static UsageRecordResource FromJson(string json)
-        {
-            // Convert all checked exceptions to Runtime
-            try
-            {
-                return JsonConvert.DeserializeObject<UsageRecordResource>(json);
-            }
-            catch (JsonException e)
-            {
-                throw new ApiException(e.Message, e);
-            }
-        }
-
-        /// <summary>
-        /// The SID of the Account that created the resource
-        /// </summary>
-        [JsonProperty("account_sid")]
-        public string AccountSid { get; private set; }
-        /// <summary>
-        /// The time period for which usage is reported
-        /// </summary>
-        [JsonProperty("period")]
-        public object Period { get; private set; }
-        /// <summary>
-        /// An object that describes the aggregated Commands usage for all SIMs during the specified period
-        /// </summary>
-        [JsonProperty("commands")]
-        public object Commands { get; private set; }
-        /// <summary>
-        /// An object that describes the aggregated Data usage for all SIMs over the period
-        /// </summary>
-        [JsonProperty("data")]
-        public object Data { get; private set; }
-
-        private UsageRecordResource()
-        {
-
-        }
-    }
+{
+
+  public class UsageRecordResource : Resource
+  {
+    public sealed class GranularityEnum : StringEnum
+    {
+      private GranularityEnum(string value) : base(value) { }
+      public GranularityEnum() { }
+      public static implicit operator GranularityEnum(string value)
+      {
+        return new GranularityEnum(value);
+      }
+
+      public static readonly GranularityEnum Hourly = new GranularityEnum("hourly");
+      public static readonly GranularityEnum Daily = new GranularityEnum("daily");
+      public static readonly GranularityEnum All = new GranularityEnum("all");
+    }
+
+    private static Request BuildReadRequest(ReadUsageRecordOptions options, ITwilioRestClient client)
+    {
+      return new Request(
+          HttpMethod.Get,
+          Rest.Domain.Wireless,
+          "/v1/UsageRecords",
+          queryParams: options.GetParams(),
+          headerParams: null
+      );
+    }
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UsageRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsageRecord </returns>
+    public static ResourceSet<UsageRecordResource> Read(ReadUsageRecordOptions options, ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = client.Request(BuildReadRequest(options, client));
+
+      var page = Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<UsageRecordResource>(page, options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="options"> Read UsageRecord parameters </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsageRecord </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UsageRecordResource>> ReadAsync(ReadUsageRecordOptions options,
+                                                                                                ITwilioRestClient client = null)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+      var response = await client.RequestAsync(BuildReadRequest(options, client));
+
+      var page = Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+      return new ResourceSet<UsageRecordResource>(page, options, client);
+    }
+#endif
+
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="end"> Only include usage that has occurred on or before this date </param>
+    /// <param name="start"> Only include usage that has occurred on or after this date </param>
+    /// <param name="granularity"> The time-based grouping that results are aggregated by </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> A single instance of UsageRecord </returns>
+    public static ResourceSet<UsageRecordResource> Read(DateTime? end = null,
+                                                        DateTime? start = null,
+                                                        UsageRecordResource.GranularityEnum granularity = null,
+                                                        int? pageSize = null,
+                                                        long? limit = null,
+                                                        ITwilioRestClient client = null)
+    {
+      var options = new ReadUsageRecordOptions() { End = end, Start = start, Granularity = granularity, PageSize = pageSize, Limit = limit };
+      return Read(options, client);
+    }
+
+#if !NET35
+    /// <summary>
+    /// read
+    /// </summary>
+    /// <param name="end"> Only include usage that has occurred on or before this date </param>
+    /// <param name="start"> Only include usage that has occurred on or after this date </param>
+    /// <param name="granularity"> The time-based grouping that results are aggregated by </param>
+    /// <param name="pageSize"> Page size </param>
+    /// <param name="limit"> Record limit </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> Task that resolves to A single instance of UsageRecord </returns>
+    public static async System.Threading.Tasks.Task<ResourceSet<UsageRecordResource>> ReadAsync(DateTime? end = null,
+                                                                                                DateTime? start = null,
+                                                                                                UsageRecordResource.GranularityEnum granularity = null,
+                                                                                                int? pageSize = null,
+                                                                                                long? limit = null,
+                                                                                                ITwilioRestClient client = null)
+    {
+      var options = new ReadUsageRecordOptions() { End = end, Start = start, Granularity = granularity, PageSize = pageSize, Limit = limit };
+      return await ReadAsync(options, client);
+    }
+#endif
+
+    /// <summary>
+    /// Fetch the target page of records
+    /// </summary>
+    /// <param name="targetUrl"> API-generated URL for the requested results page </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The target page of records </returns>
+    public static Page<UsageRecordResource> GetPage(string targetUrl, ITwilioRestClient client)
+    {
+      client = client ?? TwilioClient.GetRestClient();
+
+      var request = new Request(
+          HttpMethod.Get,
+          targetUrl
+      );
+
+      var response = client.Request(request);
+      return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the next page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The next page of records </returns>
+    public static Page<UsageRecordResource> NextPage(Page<UsageRecordResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetNextPageUrl(Rest.Domain.Wireless)
+      );
+
+      var response = client.Request(request);
+      return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Fetch the previous page of records
+    /// </summary>
+    /// <param name="page"> current page of records </param>
+    /// <param name="client"> Client to make requests to Twilio </param>
+    /// <returns> The previous page of records </returns>
+    public static Page<UsageRecordResource> PreviousPage(Page<UsageRecordResource> page, ITwilioRestClient client)
+    {
+      var request = new Request(
+          HttpMethod.Get,
+          page.GetPreviousPageUrl(Rest.Domain.Wireless)
+      );
+
+      var response = client.Request(request);
+      return Page<UsageRecordResource>.FromJson("usage_records", response.Content);
+    }
+
+    /// <summary>
+    /// Converts a JSON string into a UsageRecordResource object
+    /// </summary>
+    /// <param name="json"> Raw JSON string </param>
+    /// <returns> UsageRecordResource object represented by the provided JSON </returns>
+    public static UsageRecordResource FromJson(string json)
+    {
+      // Convert all checked exceptions to Runtime
+      try
+      {
+        return JsonConvert.DeserializeObject<UsageRecordResource>(json);
+      }
+      catch (JsonException e)
+      {
+        throw new ApiException(e.Message, e);
+      }
+    }
+
+    /// <summary>
+    /// The SID of the Account that created the resource
+    /// </summary>
+    [JsonProperty("account_sid")]
+    public string AccountSid { get; private set; }
+    /// <summary>
+    /// The time period for which usage is reported
+    /// </summary>
+    [JsonProperty("period")]
+    public object Period { get; private set; }
+    /// <summary>
+    /// An object that describes the aggregated Commands usage for all SIMs during the specified period
+    /// </summary>
+    [JsonProperty("commands")]
+    public object Commands { get; private set; }
+    /// <summary>
+    /// An object that describes the aggregated Data usage for all SIMs over the period
+    /// </summary>
+    [JsonProperty("data")]
+    public object Data { get; private set; }
+
+    private UsageRecordResource()
+    {
+
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Security/RequestValidator.cs b/src/Twilio/Security/RequestValidator.cs
index aa94ada48..21a9d6c88 100644
--- a/src/Twilio/Security/RequestValidator.cs
+++ b/src/Twilio/Security/RequestValidator.cs
@@ -5,160 +5,160 @@
 using System.Text;
 
 namespace Twilio.Security
-{
+{
+  /// <summary>
+  /// Twilio request validator
+  /// </summary>
+  public class RequestValidator
+  {
+    private readonly HMACSHA1 _hmac;
+    private readonly SHA256 _sha;
+
     /// <summary>
-    /// Twilio request validator
+    /// Create a new RequestValidator
     /// </summary>
-    public class RequestValidator
-    {
-        private readonly HMACSHA1 _hmac;
-        private readonly SHA256 _sha;
-
-        /// <summary>
-        /// Create a new RequestValidator
-        /// </summary>
-        /// <param name="secret">Signing secret</param>
-        public RequestValidator(string secret)
-        {
-            _hmac = new HMACSHA1(Encoding.UTF8.GetBytes(secret));
-            _sha = SHA256.Create();
-        }
-
-        /// <summary>
-        /// Validate against a request
-        /// </summary>
-        /// <param name="url">Request URL</param>
-        /// <param name="parameters">Request parameters</param>
-        /// <param name="expected">Expected result</param>
-        /// <returns>true if the signature matches the result; false otherwise</returns>
-        public bool Validate(string url, NameValueCollection parameters, string expected)
-        {
-            return Validate(url, ToDictionary(parameters), expected);
-        }
-
-        /// <summary>
-        /// Validate against a request
-        /// </summary>
-        /// <param name="url">Request URL</param>
-        /// <param name="parameters">Request parameters</param>
-        /// <param name="expected">Expected result</param>
-        /// <returns>true if the signature matches the result; false otherwise</returns>
-        public bool Validate(string url, IDictionary<string, string> parameters, string expected)
-        {
-            // check signature of url with and without port, since sig generation on back end is inconsistent
-            var signatureWithoutPort = GetValidationSignature(RemovePort(url), parameters);
-            var signatureWithPort = GetValidationSignature(AddPort(url), parameters);
-            // If either url produces a valid signature, we accept the request as valid
-            return SecureCompare(signatureWithoutPort, expected) || SecureCompare(signatureWithPort, expected);
-        }
-
-        public bool Validate(string url, string body, string expected)
-        {
-            var paramString = new UriBuilder(url).Query.TrimStart('?');
-            var bodyHash = "";
-            foreach (var param in paramString.Split('&'))
-            {
-                var split = param.Split('=');
-                if (split[0] == "bodySHA256")
-                {
-                    bodyHash = Uri.UnescapeDataString(split[1]);
-                }
-            }
-
-            return Validate(url, new Dictionary<string, string>(), expected) && ValidateBody(body, bodyHash);
-        }
-
-        public bool ValidateBody(string rawBody, string expected)
-        {
-            var signature = _sha.ComputeHash(Encoding.UTF8.GetBytes(rawBody));
-            return SecureCompare(BitConverter.ToString(signature).Replace("-","").ToLower(), expected);
-        }
-
-        private static IDictionary<string, string> ToDictionary(NameValueCollection col)
-        {
-            var dict = new Dictionary<string, string>();
-            foreach (var k in col.AllKeys)
-            {
-                dict.Add(k, col[k]);
-            }
-            return dict;
-        }
-
-        private string GetValidationSignature(string url, IDictionary<string, string> parameters)
-        {
-            var b = new StringBuilder(url);
-            if (parameters != null)
-            {
-                var sortedKeys = new List<string>(parameters.Keys);
-                sortedKeys.Sort(StringComparer.Ordinal);
-
-                foreach (var key in sortedKeys)
-                {
-                    b.Append(key).Append(parameters[key] ?? "");
-                }
-            }
-
-            var hash = _hmac.ComputeHash(Encoding.UTF8.GetBytes(b.ToString()));
-            return Convert.ToBase64String(hash);
-        }
-
-        private static bool SecureCompare(string a, string b)
-        {
-            if (a == null || b == null)
-            {
-                return false;
-            }
-
-            var n = a.Length;
-            if (n != b.Length)
-            {
-                return false;
-            }
-
-            var mismatch = 0;
-            for (var i = 0; i < n; i++)
-            {
-                mismatch |= a[i] ^ b[i];
-            }
-
-            return mismatch == 0;
-        }
-
-        private string RemovePort(string url)
-        {
-            return SetPort(url, -1);
-        }
-
-        private string AddPort(string url)
-        {
-            var uri = new UriBuilder(url);
-            return SetPort(url, uri.Port);
-        }
-
-        private string SetPort(string url, int port)
-        {
-            var uri = new UriBuilder(url);
-            uri.Host = PreserveCase(url, uri.Host);
-            if (port == -1)
-            {
-                uri.Port = port;
-            }
-            else if ((port != 443) && (port != 80))
-            {
-                uri.Port = port;
-            }
-            else
-            {
-                uri.Port = uri.Scheme == "https" ? 443 : 80;
-            }
-            var scheme = PreserveCase(url, uri.Scheme);
-            return uri.Uri.OriginalString.Replace(uri.Scheme, scheme);
-        }
-
-        private string PreserveCase(string url, string replacementString)
-        {
-            var startIndex = url.IndexOf(replacementString, StringComparison.OrdinalIgnoreCase);
-            return url.Substring(startIndex, replacementString.Length);
-        }
-    }
+    /// <param name="secret">Signing secret</param>
+    public RequestValidator(string secret)
+    {
+      _hmac = new HMACSHA1(Encoding.UTF8.GetBytes(secret));
+      _sha = SHA256.Create();
+    }
+
+    /// <summary>
+    /// Validate against a request
+    /// </summary>
+    /// <param name="url">Request URL</param>
+    /// <param name="parameters">Request parameters</param>
+    /// <param name="expected">Expected result</param>
+    /// <returns>true if the signature matches the result; false otherwise</returns>
+    public bool Validate(string url, NameValueCollection parameters, string expected)
+    {
+      return Validate(url, ToDictionary(parameters), expected);
+    }
+
+    /// <summary>
+    /// Validate against a request
+    /// </summary>
+    /// <param name="url">Request URL</param>
+    /// <param name="parameters">Request parameters</param>
+    /// <param name="expected">Expected result</param>
+    /// <returns>true if the signature matches the result; false otherwise</returns>
+    public bool Validate(string url, IDictionary<string, string> parameters, string expected)
+    {
+      // check signature of url with and without port, since sig generation on back end is inconsistent
+      var signatureWithoutPort = GetValidationSignature(RemovePort(url), parameters);
+      var signatureWithPort = GetValidationSignature(AddPort(url), parameters);
+      // If either url produces a valid signature, we accept the request as valid
+      return SecureCompare(signatureWithoutPort, expected) || SecureCompare(signatureWithPort, expected);
+    }
+
+    public bool Validate(string url, string body, string expected)
+    {
+      var paramString = new UriBuilder(url).Query.TrimStart('?');
+      var bodyHash = "";
+      foreach (var param in paramString.Split('&'))
+      {
+        var split = param.Split('=');
+        if (split[0] == "bodySHA256")
+        {
+          bodyHash = Uri.UnescapeDataString(split[1]);
+        }
+      }
+
+      return Validate(url, new Dictionary<string, string>(), expected) && ValidateBody(body, bodyHash);
+    }
+
+    public bool ValidateBody(string rawBody, string expected)
+    {
+      var signature = _sha.ComputeHash(Encoding.UTF8.GetBytes(rawBody));
+      return SecureCompare(BitConverter.ToString(signature).Replace("-", "").ToLower(), expected);
+    }
+
+    private static IDictionary<string, string> ToDictionary(NameValueCollection col)
+    {
+      var dict = new Dictionary<string, string>();
+      foreach (var k in col.AllKeys)
+      {
+        dict.Add(k, col[k]);
+      }
+      return dict;
+    }
+
+    private string GetValidationSignature(string url, IDictionary<string, string> parameters)
+    {
+      var b = new StringBuilder(url);
+      if (parameters != null)
+      {
+        var sortedKeys = new List<string>(parameters.Keys);
+        sortedKeys.Sort(StringComparer.Ordinal);
+
+        foreach (var key in sortedKeys)
+        {
+          b.Append(key).Append(parameters[key] ?? "");
+        }
+      }
+
+      var hash = _hmac.ComputeHash(Encoding.UTF8.GetBytes(b.ToString()));
+      return Convert.ToBase64String(hash);
+    }
+
+    private static bool SecureCompare(string a, string b)
+    {
+      if (a == null || b == null)
+      {
+        return false;
+      }
+
+      var n = a.Length;
+      if (n != b.Length)
+      {
+        return false;
+      }
+
+      var mismatch = 0;
+      for (var i = 0; i < n; i++)
+      {
+        mismatch |= a[i] ^ b[i];
+      }
+
+      return mismatch == 0;
+    }
+
+    private string RemovePort(string url)
+    {
+      return SetPort(url, -1);
+    }
+
+    private string AddPort(string url)
+    {
+      var uri = new UriBuilder(url);
+      return SetPort(url, uri.Port);
+    }
+
+    private string SetPort(string url, int port)
+    {
+      var uri = new UriBuilder(url);
+      uri.Host = PreserveCase(url, uri.Host);
+      if (port == -1)
+      {
+        uri.Port = port;
+      }
+      else if ((port != 443) && (port != 80))
+      {
+        uri.Port = port;
+      }
+      else
+      {
+        uri.Port = uri.Scheme == "https" ? 443 : 80;
+      }
+      var scheme = PreserveCase(url, uri.Scheme);
+      return uri.Uri.OriginalString.Replace(uri.Scheme, scheme);
+    }
+
+    private string PreserveCase(string url, string replacementString)
+    {
+      var startIndex = url.IndexOf(replacementString, StringComparison.OrdinalIgnoreCase);
+      return url.Substring(startIndex, replacementString.Length);
+    }
+  }
 }
diff --git a/src/Twilio/TwiML/Fax/Receive.cs b/src/Twilio/TwiML/Fax/Receive.cs
index a30217243..b509e9791 100644
--- a/src/Twilio/TwiML/Fax/Receive.cs
+++ b/src/Twilio/TwiML/Fax/Receive.cs
@@ -12,129 +12,129 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Fax
-{
-
+{
+
+  /// <summary>
+  /// Receive TwiML Verb
+  /// </summary>
+  public class Receive : TwiML
+  {
+    public sealed class MediaTypeEnum : StringEnum
+    {
+      private MediaTypeEnum(string value) : base(value) { }
+      public MediaTypeEnum() { }
+      public static implicit operator MediaTypeEnum(string value)
+      {
+        return new MediaTypeEnum(value);
+      }
+
+      public static readonly MediaTypeEnum ApplicationPdf = new MediaTypeEnum("application/pdf");
+      public static readonly MediaTypeEnum ImageTiff = new MediaTypeEnum("image/tiff");
+    }
+
+    public sealed class PageSizeEnum : StringEnum
+    {
+      private PageSizeEnum(string value) : base(value) { }
+      public PageSizeEnum() { }
+      public static implicit operator PageSizeEnum(string value)
+      {
+        return new PageSizeEnum(value);
+      }
+
+      public static readonly PageSizeEnum Letter = new PageSizeEnum("letter");
+      public static readonly PageSizeEnum Legal = new PageSizeEnum("legal");
+      public static readonly PageSizeEnum A4 = new PageSizeEnum("a4");
+    }
+
     /// <summary>
-    /// Receive TwiML Verb
+    /// Receive action URL
     /// </summary>
-    public class Receive : TwiML
-    {
-        public sealed class MediaTypeEnum : StringEnum
-        {
-            private MediaTypeEnum(string value) : base(value) {}
-            public MediaTypeEnum() {}
-            public static implicit operator MediaTypeEnum(string value)
-            {
-                return new MediaTypeEnum(value);
-            }
-
-            public static readonly MediaTypeEnum ApplicationPdf = new MediaTypeEnum("application/pdf");
-            public static readonly MediaTypeEnum ImageTiff = new MediaTypeEnum("image/tiff");
-        }
-
-        public sealed class PageSizeEnum : StringEnum
-        {
-            private PageSizeEnum(string value) : base(value) {}
-            public PageSizeEnum() {}
-            public static implicit operator PageSizeEnum(string value)
-            {
-                return new PageSizeEnum(value);
-            }
-
-            public static readonly PageSizeEnum Letter = new PageSizeEnum("letter");
-            public static readonly PageSizeEnum Legal = new PageSizeEnum("legal");
-            public static readonly PageSizeEnum A4 = new PageSizeEnum("a4");
-        }
-
-        /// <summary>
-        /// Receive action URL
-        /// </summary>
-        public Uri Action { get; set; }
-        /// <summary>
-        /// Receive action URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-        /// <summary>
-        /// The media type used to store media in the fax media store
-        /// </summary>
-        public Receive.MediaTypeEnum MediaType { get; set; }
-        /// <summary>
-        /// What size to interpret received pages as
-        /// </summary>
-        public Receive.PageSizeEnum PageSize { get; set; }
-        /// <summary>
-        /// Whether or not to store received media in the fax media store
-        /// </summary>
-        public bool? StoreMedia { get; set; }
-
-        /// <summary>
-        /// Create a new Receive
-        /// </summary>
-        /// <param name="action"> Receive action URL </param>
-        /// <param name="method"> Receive action URL method </param>
-        /// <param name="mediaType"> The media type used to store media in the fax media store </param>
-        /// <param name="pageSize"> What size to interpret received pages as </param>
-        /// <param name="storeMedia"> Whether or not to store received media in the fax media store </param>
-        public Receive(Uri action = null,
-                       Twilio.Http.HttpMethod method = null,
-                       Receive.MediaTypeEnum mediaType = null,
-                       Receive.PageSizeEnum pageSize = null,
-                       bool? storeMedia = null) : base("Receive")
-        {
-            this.Action = action;
-            this.Method = method;
-            this.MediaType = mediaType;
-            this.PageSize = pageSize;
-            this.StoreMedia = storeMedia;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Action != null)
-            {
-                attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            if (this.MediaType != null)
-            {
-                attributes.Add(new XAttribute("mediaType", this.MediaType.ToString()));
-            }
-            if (this.PageSize != null)
-            {
-                attributes.Add(new XAttribute("pageSize", this.PageSize.ToString()));
-            }
-            if (this.StoreMedia != null)
-            {
-                attributes.Add(new XAttribute("storeMedia", this.StoreMedia.Value.ToString().ToLower()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Receive Append(TwiML childElem)
-        {
-            return (Receive) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Receive SetOption(string key, object value)
-        {
-            return (Receive) base.SetOption(key, value);
-        }
-    }
+    public Uri Action { get; set; }
+    /// <summary>
+    /// Receive action URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+    /// <summary>
+    /// The media type used to store media in the fax media store
+    /// </summary>
+    public Receive.MediaTypeEnum MediaType { get; set; }
+    /// <summary>
+    /// What size to interpret received pages as
+    /// </summary>
+    public Receive.PageSizeEnum PageSize { get; set; }
+    /// <summary>
+    /// Whether or not to store received media in the fax media store
+    /// </summary>
+    public bool? StoreMedia { get; set; }
+
+    /// <summary>
+    /// Create a new Receive
+    /// </summary>
+    /// <param name="action"> Receive action URL </param>
+    /// <param name="method"> Receive action URL method </param>
+    /// <param name="mediaType"> The media type used to store media in the fax media store </param>
+    /// <param name="pageSize"> What size to interpret received pages as </param>
+    /// <param name="storeMedia"> Whether or not to store received media in the fax media store </param>
+    public Receive(Uri action = null,
+                   Twilio.Http.HttpMethod method = null,
+                   Receive.MediaTypeEnum mediaType = null,
+                   Receive.PageSizeEnum pageSize = null,
+                   bool? storeMedia = null) : base("Receive")
+    {
+      this.Action = action;
+      this.Method = method;
+      this.MediaType = mediaType;
+      this.PageSize = pageSize;
+      this.StoreMedia = storeMedia;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Action != null)
+      {
+        attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      if (this.MediaType != null)
+      {
+        attributes.Add(new XAttribute("mediaType", this.MediaType.ToString()));
+      }
+      if (this.PageSize != null)
+      {
+        attributes.Add(new XAttribute("pageSize", this.PageSize.ToString()));
+      }
+      if (this.StoreMedia != null)
+      {
+        attributes.Add(new XAttribute("storeMedia", this.StoreMedia.Value.ToString().ToLower()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Receive Append(TwiML childElem)
+    {
+      return (Receive)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Receive SetOption(string key, object value)
+    {
+      return (Receive)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/FaxResponse.cs b/src/Twilio/TwiML/FaxResponse.cs
index 107a913a4..6a974162d 100644
--- a/src/Twilio/TwiML/FaxResponse.cs
+++ b/src/Twilio/TwiML/FaxResponse.cs
@@ -11,68 +11,68 @@
 using Twilio.TwiML.Fax;
 
 namespace Twilio.TwiML
-{
-
+{
+
+  /// <summary>
+  /// Response TwiML for Faxes
+  /// </summary>
+  public class FaxResponse : TwiML
+  {
     /// <summary>
-    /// Response TwiML for Faxes
+    /// Create a new FaxResponse
     /// </summary>
-    public class FaxResponse : TwiML
-    {
-        /// <summary>
-        /// Create a new FaxResponse
-        /// </summary>
-        public FaxResponse() : base("Response")
-        {
-        }
-
-        /// <summary>
-        /// Create a new <Receive/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="action"> Receive action URL </param>
-        /// <param name="method"> Receive action URL method </param>
-        /// <param name="mediaType"> The media type used to store media in the fax media store </param>
-        /// <param name="pageSize"> What size to interpret received pages as </param>
-        /// <param name="storeMedia"> Whether or not to store received media in the fax media store </param>
-        public FaxResponse Receive(Uri action = null,
-                                   Twilio.Http.HttpMethod method = null,
-                                   Receive.MediaTypeEnum mediaType = null,
-                                   Receive.PageSizeEnum pageSize = null,
-                                   bool? storeMedia = null)
-        {
-            var newChild = new Receive(action, method, mediaType, pageSize, storeMedia);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Receive/> element as a child of this element
-        /// </summary>
-        /// <param name="receive"> A Receive instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public FaxResponse Receive(Receive receive)
-        {
-            this.Append(receive);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new FaxResponse Append(TwiML childElem)
-        {
-            return (FaxResponse) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new FaxResponse SetOption(string key, object value)
-        {
-            return (FaxResponse) base.SetOption(key, value);
-        }
-    }
+    public FaxResponse() : base("Response")
+    {
+    }
+
+    /// <summary>
+    /// Create a new <Receive/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="action"> Receive action URL </param>
+    /// <param name="method"> Receive action URL method </param>
+    /// <param name="mediaType"> The media type used to store media in the fax media store </param>
+    /// <param name="pageSize"> What size to interpret received pages as </param>
+    /// <param name="storeMedia"> Whether or not to store received media in the fax media store </param>
+    public FaxResponse Receive(Uri action = null,
+                               Twilio.Http.HttpMethod method = null,
+                               Receive.MediaTypeEnum mediaType = null,
+                               Receive.PageSizeEnum pageSize = null,
+                               bool? storeMedia = null)
+    {
+      var newChild = new Receive(action, method, mediaType, pageSize, storeMedia);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Receive/> element as a child of this element
+    /// </summary>
+    /// <param name="receive"> A Receive instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public FaxResponse Receive(Receive receive)
+    {
+      this.Append(receive);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new FaxResponse Append(TwiML childElem)
+    {
+      return (FaxResponse)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new FaxResponse SetOption(string key, object value)
+    {
+      return (FaxResponse)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Messaging/Body.cs b/src/Twilio/TwiML/Messaging/Body.cs
index 06e6fafc8..7115ac61b 100644
--- a/src/Twilio/TwiML/Messaging/Body.cs
+++ b/src/Twilio/TwiML/Messaging/Body.cs
@@ -8,53 +8,53 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Messaging
-{
-
+{
+
+  /// <summary>
+  /// Body TwiML Noun
+  /// </summary>
+  public class Body : TwiML
+  {
     /// <summary>
-    /// Body TwiML Noun
+    /// Message Body
     /// </summary>
-    public class Body : TwiML
-    {
-        /// <summary>
-        /// Message Body
-        /// </summary>
-        public string Message { get; set; }
-
-        /// <summary>
-        /// Create a new Body
-        /// </summary>
-        /// <param name="message"> Message Body, the body of the TwiML Element. </param>
-        public Body(string message = null) : base("Body")
-        {
-            this.Message = message;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Message != null ? this.Message : string.Empty;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Body Append(TwiML childElem)
-        {
-            return (Body) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Body SetOption(string key, object value)
-        {
-            return (Body) base.SetOption(key, value);
-        }
-    }
+    public string Message { get; set; }
+
+    /// <summary>
+    /// Create a new Body
+    /// </summary>
+    /// <param name="message"> Message Body, the body of the TwiML Element. </param>
+    public Body(string message = null) : base("Body")
+    {
+      this.Message = message;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Message != null ? this.Message : string.Empty;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Body Append(TwiML childElem)
+    {
+      return (Body)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Body SetOption(string key, object value)
+    {
+      return (Body)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Messaging/Media.cs b/src/Twilio/TwiML/Messaging/Media.cs
index f8184b565..b1a5f7847 100644
--- a/src/Twilio/TwiML/Messaging/Media.cs
+++ b/src/Twilio/TwiML/Messaging/Media.cs
@@ -10,53 +10,53 @@
 using Twilio.Converters;
 
 namespace Twilio.TwiML.Messaging
-{
-
+{
+
+  /// <summary>
+  /// Media TwiML Noun
+  /// </summary>
+  public class Media : TwiML
+  {
     /// <summary>
-    /// Media TwiML Noun
+    /// Media URL
     /// </summary>
-    public class Media : TwiML
-    {
-        /// <summary>
-        /// Media URL
-        /// </summary>
-        public Uri Url { get; set; }
-
-        /// <summary>
-        /// Create a new Media
-        /// </summary>
-        /// <param name="url"> Media URL, the body of the TwiML Element. </param>
-        public Media(Uri url = null) : base("Media")
-        {
-            this.Url = url;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Url != null ? Serializers.Url(this.Url) : string.Empty;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Media Append(TwiML childElem)
-        {
-            return (Media) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Media SetOption(string key, object value)
-        {
-            return (Media) base.SetOption(key, value);
-        }
-    }
+    public Uri Url { get; set; }
+
+    /// <summary>
+    /// Create a new Media
+    /// </summary>
+    /// <param name="url"> Media URL, the body of the TwiML Element. </param>
+    public Media(Uri url = null) : base("Media")
+    {
+      this.Url = url;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Url != null ? Serializers.Url(this.Url) : string.Empty;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Media Append(TwiML childElem)
+    {
+      return (Media)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Media SetOption(string key, object value)
+    {
+      return (Media)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Messaging/Message.cs b/src/Twilio/TwiML/Messaging/Message.cs
index 85ffda8eb..3d71f1e8f 100644
--- a/src/Twilio/TwiML/Messaging/Message.cs
+++ b/src/Twilio/TwiML/Messaging/Message.cs
@@ -11,161 +11,161 @@
 using Twilio.Converters;
 
 namespace Twilio.TwiML.Messaging
-{
-
+{
+
+  /// <summary>
+  /// Message TwiML Verb
+  /// </summary>
+  public class Message : TwiML
+  {
     /// <summary>
-    /// Message TwiML Verb
+    /// Message Body
     /// </summary>
-    public class Message : TwiML
-    {
-        /// <summary>
-        /// Message Body
-        /// </summary>
-        public string BodyAttribute { get; set; }
-        /// <summary>
-        /// Phone Number to send Message to
-        /// </summary>
-        public string To { get; set; }
-        /// <summary>
-        /// Phone Number to send Message from
-        /// </summary>
-        public string From { get; set; }
-        /// <summary>
-        /// Action URL
-        /// </summary>
-        public Uri Action { get; set; }
-        /// <summary>
-        /// Action URL Method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-        /// <summary>
-        /// Status callback URL. Deprecated in favor of action.
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-
-        /// <summary>
-        /// Create a new Message
-        /// </summary>
-        /// <param name="body"> Message Body, the body of the TwiML Element. </param>
-        /// <param name="to"> Phone Number to send Message to. Also accepts stringified Types.PhoneNumber </param>
-        /// <param name="from"> Phone Number to send Message from. Also accepts stringified Types.PhoneNumber </param>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL Method </param>
-        /// <param name="statusCallback"> Status callback URL. Deprecated in favor of action. </param>
-        public Message(string body = null,
-                       string to = null,
-                       string from = null,
-                       Uri action = null,
-                       Twilio.Http.HttpMethod method = null,
-                       Uri statusCallback = null) : base("Message")
-        {
-            this.BodyAttribute = body;
-            this.To = to;
-            this.From = from;
-            this.Action = action;
-            this.Method = method;
-            this.StatusCallback = statusCallback;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.BodyAttribute != null ? this.BodyAttribute : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.To != null)
-            {
-                attributes.Add(new XAttribute("to", this.To));
-            }
-            if (this.From != null)
-            {
-                attributes.Add(new XAttribute("from", this.From));
-            }
-            if (this.Action != null)
-            {
-                attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            if (this.StatusCallback != null)
-            {
-                attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Body/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="message"> Message Body, the body of the TwiML Element. </param>
-        public Message Body(string message = null)
-        {
-            var newChild = new Body(message);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Body/> element as a child of this element
-        /// </summary>
-        /// <param name="body"> A Body instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Message Body(Body body)
-        {
-            this.Append(body);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Media/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="url"> Media URL, the body of the TwiML Element. </param>
-        public Message Media(Uri url = null)
-        {
-            var newChild = new Media(url);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Media/> element as a child of this element
-        /// </summary>
-        /// <param name="media"> A Media instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Message Media(Media media)
-        {
-            this.Append(media);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Message Append(TwiML childElem)
-        {
-            return (Message) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Message SetOption(string key, object value)
-        {
-            return (Message) base.SetOption(key, value);
-        }
-    }
+    public string BodyAttribute { get; set; }
+    /// <summary>
+    /// Phone Number to send Message to
+    /// </summary>
+    public string To { get; set; }
+    /// <summary>
+    /// Phone Number to send Message from
+    /// </summary>
+    public string From { get; set; }
+    /// <summary>
+    /// Action URL
+    /// </summary>
+    public Uri Action { get; set; }
+    /// <summary>
+    /// Action URL Method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+    /// <summary>
+    /// Status callback URL. Deprecated in favor of action.
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+
+    /// <summary>
+    /// Create a new Message
+    /// </summary>
+    /// <param name="body"> Message Body, the body of the TwiML Element. </param>
+    /// <param name="to"> Phone Number to send Message to. Also accepts stringified Types.PhoneNumber </param>
+    /// <param name="from"> Phone Number to send Message from. Also accepts stringified Types.PhoneNumber </param>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL Method </param>
+    /// <param name="statusCallback"> Status callback URL. Deprecated in favor of action. </param>
+    public Message(string body = null,
+                   string to = null,
+                   string from = null,
+                   Uri action = null,
+                   Twilio.Http.HttpMethod method = null,
+                   Uri statusCallback = null) : base("Message")
+    {
+      this.BodyAttribute = body;
+      this.To = to;
+      this.From = from;
+      this.Action = action;
+      this.Method = method;
+      this.StatusCallback = statusCallback;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.BodyAttribute != null ? this.BodyAttribute : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.To != null)
+      {
+        attributes.Add(new XAttribute("to", this.To));
+      }
+      if (this.From != null)
+      {
+        attributes.Add(new XAttribute("from", this.From));
+      }
+      if (this.Action != null)
+      {
+        attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      if (this.StatusCallback != null)
+      {
+        attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Body/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="message"> Message Body, the body of the TwiML Element. </param>
+    public Message Body(string message = null)
+    {
+      var newChild = new Body(message);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Body/> element as a child of this element
+    /// </summary>
+    /// <param name="body"> A Body instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Message Body(Body body)
+    {
+      this.Append(body);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Media/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="url"> Media URL, the body of the TwiML Element. </param>
+    public Message Media(Uri url = null)
+    {
+      var newChild = new Media(url);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Media/> element as a child of this element
+    /// </summary>
+    /// <param name="media"> A Media instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Message Media(Media media)
+    {
+      this.Append(media);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Message Append(TwiML childElem)
+    {
+      return (Message)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Message SetOption(string key, object value)
+    {
+      return (Message)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Messaging/Redirect.cs b/src/Twilio/TwiML/Messaging/Redirect.cs
index 2a7647caf..73231845a 100644
--- a/src/Twilio/TwiML/Messaging/Redirect.cs
+++ b/src/Twilio/TwiML/Messaging/Redirect.cs
@@ -11,72 +11,72 @@
 using Twilio.Converters;
 
 namespace Twilio.TwiML.Messaging
-{
-
+{
+
+  /// <summary>
+  /// Redirect TwiML Verb
+  /// </summary>
+  public class Redirect : TwiML
+  {
     /// <summary>
-    /// Redirect TwiML Verb
+    /// Redirect URL
     /// </summary>
-    public class Redirect : TwiML
-    {
-        /// <summary>
-        /// Redirect URL
-        /// </summary>
-        public Uri Url { get; set; }
-        /// <summary>
-        /// Redirect URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-
-        /// <summary>
-        /// Create a new Redirect
-        /// </summary>
-        /// <param name="url"> Redirect URL, the body of the TwiML Element. </param>
-        /// <param name="method"> Redirect URL method </param>
-        public Redirect(Uri url = null, Twilio.Http.HttpMethod method = null) : base("Redirect")
-        {
-            this.Url = url;
-            this.Method = method;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Url != null ? Serializers.Url(this.Url) : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Redirect Append(TwiML childElem)
-        {
-            return (Redirect) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Redirect SetOption(string key, object value)
-        {
-            return (Redirect) base.SetOption(key, value);
-        }
-    }
+    public Uri Url { get; set; }
+    /// <summary>
+    /// Redirect URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+
+    /// <summary>
+    /// Create a new Redirect
+    /// </summary>
+    /// <param name="url"> Redirect URL, the body of the TwiML Element. </param>
+    /// <param name="method"> Redirect URL method </param>
+    public Redirect(Uri url = null, Twilio.Http.HttpMethod method = null) : base("Redirect")
+    {
+      this.Url = url;
+      this.Method = method;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Url != null ? Serializers.Url(this.Url) : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Redirect Append(TwiML childElem)
+    {
+      return (Redirect)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Redirect SetOption(string key, object value)
+    {
+      return (Redirect)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/MessagingResponse.cs b/src/Twilio/TwiML/MessagingResponse.cs
index ef6d3462b..e214c0c04 100644
--- a/src/Twilio/TwiML/MessagingResponse.cs
+++ b/src/Twilio/TwiML/MessagingResponse.cs
@@ -11,93 +11,93 @@
 using Twilio.TwiML.Messaging;
 
 namespace Twilio.TwiML
-{
-
+{
+
+  /// <summary>
+  /// Response TwiML for Messages
+  /// </summary>
+  public class MessagingResponse : TwiML
+  {
     /// <summary>
-    /// Response TwiML for Messages
+    /// Create a new MessagingResponse
     /// </summary>
-    public class MessagingResponse : TwiML
-    {
-        /// <summary>
-        /// Create a new MessagingResponse
-        /// </summary>
-        public MessagingResponse() : base("Response")
-        {
-        }
-
-        /// <summary>
-        /// Create a new <Message/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="body"> Message Body, the body of the TwiML Element. </param>
-        /// <param name="to"> Phone Number to send Message to. Also accepts stringified Types.PhoneNumber </param>
-        /// <param name="from"> Phone Number to send Message from. Also accepts stringified Types.PhoneNumber </param>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL Method </param>
-        /// <param name="statusCallback"> Status callback URL. Deprecated in favor of action. </param>
-        public MessagingResponse Message(string body = null,
-                                         string to = null,
-                                         string from = null,
-                                         Uri action = null,
-                                         Twilio.Http.HttpMethod method = null,
-                                         Uri statusCallback = null)
-        {
-            var newChild = new Message(body, to, from, action, method, statusCallback);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Message/> element as a child of this element
-        /// </summary>
-        /// <param name="message"> A Message instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public MessagingResponse Message(Message message)
-        {
-            this.Append(message);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Redirect/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="url"> Redirect URL, the body of the TwiML Element. </param>
-        /// <param name="method"> Redirect URL method </param>
-        public MessagingResponse Redirect(Uri url = null, Twilio.Http.HttpMethod method = null)
-        {
-            var newChild = new Redirect(url, method);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Redirect/> element as a child of this element
-        /// </summary>
-        /// <param name="redirect"> A Redirect instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public MessagingResponse Redirect(Redirect redirect)
-        {
-            this.Append(redirect);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new MessagingResponse Append(TwiML childElem)
-        {
-            return (MessagingResponse) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new MessagingResponse SetOption(string key, object value)
-        {
-            return (MessagingResponse) base.SetOption(key, value);
-        }
-    }
+    public MessagingResponse() : base("Response")
+    {
+    }
+
+    /// <summary>
+    /// Create a new <Message/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="body"> Message Body, the body of the TwiML Element. </param>
+    /// <param name="to"> Phone Number to send Message to. Also accepts stringified Types.PhoneNumber </param>
+    /// <param name="from"> Phone Number to send Message from. Also accepts stringified Types.PhoneNumber </param>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL Method </param>
+    /// <param name="statusCallback"> Status callback URL. Deprecated in favor of action. </param>
+    public MessagingResponse Message(string body = null,
+                                     string to = null,
+                                     string from = null,
+                                     Uri action = null,
+                                     Twilio.Http.HttpMethod method = null,
+                                     Uri statusCallback = null)
+    {
+      var newChild = new Message(body, to, from, action, method, statusCallback);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Message/> element as a child of this element
+    /// </summary>
+    /// <param name="message"> A Message instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public MessagingResponse Message(Message message)
+    {
+      this.Append(message);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Redirect/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="url"> Redirect URL, the body of the TwiML Element. </param>
+    /// <param name="method"> Redirect URL method </param>
+    public MessagingResponse Redirect(Uri url = null, Twilio.Http.HttpMethod method = null)
+    {
+      var newChild = new Redirect(url, method);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Redirect/> element as a child of this element
+    /// </summary>
+    /// <param name="redirect"> A Redirect instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public MessagingResponse Redirect(Redirect redirect)
+    {
+      this.Append(redirect);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new MessagingResponse Append(TwiML childElem)
+    {
+      return (MessagingResponse)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new MessagingResponse SetOption(string key, object value)
+    {
+      return (MessagingResponse)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Text.cs b/src/Twilio/TwiML/Text.cs
index 5efb4a6e6..e3ad28ef9 100644
--- a/src/Twilio/TwiML/Text.cs
+++ b/src/Twilio/TwiML/Text.cs
@@ -1,19 +1,19 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML
-{
-    internal class Text : TwiML
-    {
-        private readonly string _content;
-
-        internal Text(string content) : base(null)
-        {
-            _content = content;
-        }
-
-        protected override XNode ToXml()
-        {
-            return new XText(_content);
-        }
-    }
+{
+  internal class Text : TwiML
+  {
+    private readonly string _content;
+
+    internal Text(string content) : base(null)
+    {
+      _content = content;
+    }
+
+    protected override XNode ToXml()
+    {
+      return new XText(_content);
+    }
+  }
 }
diff --git a/src/Twilio/TwiML/TwiML.cs b/src/Twilio/TwiML/TwiML.cs
index f69e71668..34d1bcdba 100644
--- a/src/Twilio/TwiML/TwiML.cs
+++ b/src/Twilio/TwiML/TwiML.cs
@@ -6,177 +6,177 @@
 using Twilio.Exceptions;
 
 namespace Twilio.TwiML
-{
-
+{
+
+  /// <summary>
+  /// Base class for all TwiML Objects.
+  /// </summary>
+  public class TwiML
+  {
     /// <summary>
-    /// Base class for all TwiML Objects.
+    /// Tag name
     /// </summary>
-    public class TwiML
-    {
-        /// <summary>
-        /// Tag name
-        /// </summary>
-        private string TagName { get; }
-        /// <summary>
-        /// Children elements
-        /// </summary>
-        private List<TwiML> Children { get; }
-        /// <summary>
-        /// Additional tag attributes to set on the generated xml
-        /// </summary>
-        private List<KeyValuePair<string,string>> Options { get; }
-        /// <summary>
-        /// Attribute names to be transformed on the generated xml
-        /// </summary>
-        private Dictionary<string, string> AttributeNameMapper = new Dictionary<string, string> { { "for_", "for" } };
-
-        /// <summary>
-        /// Base constructor to create any TwiML instance.
-        /// </summary>
-        /// <param name="tagName"> TwiML tag name </param>
-        protected TwiML(string tagName)
-        {
-            this.TagName = tagName;
-            this.Children = new List<TwiML>();
-            this.Options = new List<KeyValuePair<string,string>>();
-        }
-
-        /// <summary>
-        /// Get the TwiML element body.
-        /// </summary>
-        protected virtual string GetElementBody()
-        {
-            return string.Empty;
-        }
-
-        /// <summary>
-        /// Get the TwiML element attributes.
-        /// </summary>
-        protected virtual List<XAttribute> GetElementAttributes()
-        {
-            return new List<XAttribute>();
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public virtual TwiML Append(TwiML childElem)
-        {
-            this.Children.Add(childElem);
-            return this;
-        }
-
-        public TwiML AddText(string text)
-        {
-            this.Children.Add(new Text(text));
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning the newly created element.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public T Nest<T>(T childElem) where T : TwiML
-        {
-            this.Children.Add(childElem);
-            return childElem;
-        }
-
-        /// <summary>
-        /// Add a generic child TwiML object
-        /// </summary>
-        /// <param name="tagName"> TwiML tag name </param>
-        public TwiML AddChild(string tagName)
-        {
-            return this.Nest(new TwiML(tagName));
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public TwiML SetOption(string key, object value)
-        {
-            if (this.Options.Exists(e => e.Key.Equals(key)))
-            {
-                this.Options.Remove(this.Options.Find(e => e.Key.Equals(key)));
-            }
-
-            this.Options.Add(new KeyValuePair<string, string>(key, value.ToString()));
-            return this;
-        }
-
-        /// <summary>
-        /// Get freeform key-value attributes attached to this class
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        public virtual string GetOption(string key)
-        {
-            return this.Options.Find(e => e.Key.Equals(key)).Value;
-        }
-
-        /// <summary>
-        /// Generate XElement from TwiML object
-        /// </summary>
-        protected virtual XNode ToXml()
-        {
-            var elem = new XElement(this.TagName, this.GetElementBody());
-
-            this.GetElementAttributes().ForEach(attr =>
-            {
-                string transformedAttr = attr.Name.LocalName;
-                if (AttributeNameMapper.TryGetValue(attr.Name.LocalName, out transformedAttr))
-                {
-                    elem.Add(new XAttribute(transformedAttr, attr.Value));
-                }
-                else
-                {
-                    elem.Add(attr);
-                }
-            });
-
-            this.Options.ForEach(e =>
-            {
-                if (e.Key.StartsWith("xml:"))
-                {
-                    var attribute = new XAttribute(XNamespace.Xml + e.Key.Substring(4), e.Value);
-                    elem.Add(attribute);
-                }
-                else
-                {
-                    elem.Add(new XAttribute(e.Key, e.Value));
-                }
-            });
-
-            this.Children.ForEach(child => elem.Add(child.ToXml()));
-
-            return elem;
-        }
-
-        /// <summary>
-        /// Generate XML string from TwiML object
-        /// </summary>
-        /// <param name="formattingOptions"> Change generated string format. </param>
-        public string ToString(SaveOptions formattingOptions = SaveOptions.None)
-        {
-            var declaration = new XDeclaration("1.0", "utf-8", null);
-            var elem = this.ToXml();
-
-            var document = new XDocument(declaration, elem);
-            var writer = new Utf8StringWriter();
-            document.Save(writer, formattingOptions);
-            return writer.GetStringBuilder().ToString();
-        }
-    }
-
+    private string TagName { get; }
+    /// <summary>
+    /// Children elements
+    /// </summary>
+    private List<TwiML> Children { get; }
+    /// <summary>
+    /// Additional tag attributes to set on the generated xml
+    /// </summary>
+    private List<KeyValuePair<string, string>> Options { get; }
+    /// <summary>
+    /// Attribute names to be transformed on the generated xml
+    /// </summary>
+    private Dictionary<string, string> AttributeNameMapper = new Dictionary<string, string> { { "for_", "for" } };
+
+    /// <summary>
+    /// Base constructor to create any TwiML instance.
+    /// </summary>
+    /// <param name="tagName"> TwiML tag name </param>
+    protected TwiML(string tagName)
+    {
+      this.TagName = tagName;
+      this.Children = new List<TwiML>();
+      this.Options = new List<KeyValuePair<string, string>>();
+    }
+
+    /// <summary>
+    /// Get the TwiML element body.
+    /// </summary>
+    protected virtual string GetElementBody()
+    {
+      return string.Empty;
+    }
+
+    /// <summary>
+    /// Get the TwiML element attributes.
+    /// </summary>
+    protected virtual List<XAttribute> GetElementAttributes()
+    {
+      return new List<XAttribute>();
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public virtual TwiML Append(TwiML childElem)
+    {
+      this.Children.Add(childElem);
+      return this;
+    }
+
+    public TwiML AddText(string text)
+    {
+      this.Children.Add(new Text(text));
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning the newly created element.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public T Nest<T>(T childElem) where T : TwiML
+    {
+      this.Children.Add(childElem);
+      return childElem;
+    }
+
+    /// <summary>
+    /// Add a generic child TwiML object
+    /// </summary>
+    /// <param name="tagName"> TwiML tag name </param>
+    public TwiML AddChild(string tagName)
+    {
+      return this.Nest(new TwiML(tagName));
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public TwiML SetOption(string key, object value)
+    {
+      if (this.Options.Exists(e => e.Key.Equals(key)))
+      {
+        this.Options.Remove(this.Options.Find(e => e.Key.Equals(key)));
+      }
+
+      this.Options.Add(new KeyValuePair<string, string>(key, value.ToString()));
+      return this;
+    }
+
+    /// <summary>
+    /// Get freeform key-value attributes attached to this class
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    public virtual string GetOption(string key)
+    {
+      return this.Options.Find(e => e.Key.Equals(key)).Value;
+    }
+
+    /// <summary>
+    /// Generate XElement from TwiML object
+    /// </summary>
+    protected virtual XNode ToXml()
+    {
+      var elem = new XElement(this.TagName, this.GetElementBody());
+
+      this.GetElementAttributes().ForEach(attr =>
+      {
+        string transformedAttr = attr.Name.LocalName;
+        if (AttributeNameMapper.TryGetValue(attr.Name.LocalName, out transformedAttr))
+        {
+          elem.Add(new XAttribute(transformedAttr, attr.Value));
+        }
+        else
+        {
+          elem.Add(attr);
+        }
+      });
+
+      this.Options.ForEach(e =>
+      {
+        if (e.Key.StartsWith("xml:"))
+        {
+          var attribute = new XAttribute(XNamespace.Xml + e.Key.Substring(4), e.Value);
+          elem.Add(attribute);
+        }
+        else
+        {
+          elem.Add(new XAttribute(e.Key, e.Value));
+        }
+      });
+
+      this.Children.ForEach(child => elem.Add(child.ToXml()));
+
+      return elem;
+    }
+
     /// <summary>
-    /// StringWriter which overrides default encoding to use UTF8.
+    /// Generate XML string from TwiML object
     /// </summary>
-    public class Utf8StringWriter : StringWriter
-    {
-        public override Encoding Encoding => Encoding.UTF8;
-    }
+    /// <param name="formattingOptions"> Change generated string format. </param>
+    public string ToString(SaveOptions formattingOptions = SaveOptions.None)
+    {
+      var declaration = new XDeclaration("1.0", "utf-8", null);
+      var elem = this.ToXml();
+
+      var document = new XDocument(declaration, elem);
+      var writer = new Utf8StringWriter();
+      document.Save(writer, formattingOptions);
+      return writer.GetStringBuilder().ToString();
+    }
+  }
+
+  /// <summary>
+  /// StringWriter which overrides default encoding to use UTF8.
+  /// </summary>
+  public class Utf8StringWriter : StringWriter
+  {
+    public override Encoding Encoding => Encoding.UTF8;
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Video/Room.cs b/src/Twilio/TwiML/Video/Room.cs
index 285281812..8d18019d6 100644
--- a/src/Twilio/TwiML/Video/Room.cs
+++ b/src/Twilio/TwiML/Video/Room.cs
@@ -7,54 +7,54 @@
 using System.Text;
 using System.Xml.Linq;
 
-namespace Twilio.TwiML.Video 
-{
-
+namespace Twilio.TwiML.Video
+{
+
+  /// <summary>
+  /// Room TwiML Noun
+  /// </summary>
+  public class Room : TwiML
+  {
     /// <summary>
-    /// Room TwiML Noun
+    /// Room name
     /// </summary>
-    public class Room : TwiML 
-    {
-        /// <summary>
-        /// Room name
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Create a new Room
-        /// </summary>
-        /// <param name="name"> Room name, the body of the TwiML Element. </param>
-        public Room(string name = null) : base("Room")
-        {
-            this.Name = name;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Name != null ? this.Name : string.Empty;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Room Append(TwiML childElem)
-        {
-            return (Room) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Room SetOption(string key, object value)
-        {
-            return (Room) base.SetOption(key, value);
-        }
-    }
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Create a new Room
+    /// </summary>
+    /// <param name="name"> Room name, the body of the TwiML Element. </param>
+    public Room(string name = null) : base("Room")
+    {
+      this.Name = name;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Name != null ? this.Name : string.Empty;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Room Append(TwiML childElem)
+    {
+      return (Room)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Room SetOption(string key, object value)
+    {
+      return (Room)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Autopilot.cs b/src/Twilio/TwiML/Voice/Autopilot.cs
index b81d49d1e..de4fe7ab5 100644
--- a/src/Twilio/TwiML/Voice/Autopilot.cs
+++ b/src/Twilio/TwiML/Voice/Autopilot.cs
@@ -8,53 +8,53 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Autopilot TwiML Noun
+  /// </summary>
+  public class Autopilot : TwiML
+  {
     /// <summary>
-    /// Autopilot TwiML Noun
+    /// Autopilot assistant sid or unique name
     /// </summary>
-    public class Autopilot : TwiML
-    {
-        /// <summary>
-        /// Autopilot assistant sid or unique name
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// Create a new Autopilot
-        /// </summary>
-        /// <param name="name"> Autopilot assistant sid or unique name, the body of the TwiML Element. </param>
-        public Autopilot(string name = null) : base("Autopilot")
-        {
-            this.Name = name;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Name != null ? this.Name : string.Empty;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Autopilot Append(TwiML childElem)
-        {
-            return (Autopilot) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Autopilot SetOption(string key, object value)
-        {
-            return (Autopilot) base.SetOption(key, value);
-        }
-    }
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Create a new Autopilot
+    /// </summary>
+    /// <param name="name"> Autopilot assistant sid or unique name, the body of the TwiML Element. </param>
+    public Autopilot(string name = null) : base("Autopilot")
+    {
+      this.Name = name;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Name != null ? this.Name : string.Empty;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Autopilot Append(TwiML childElem)
+    {
+      return (Autopilot)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Autopilot SetOption(string key, object value)
+    {
+      return (Autopilot)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Client.cs b/src/Twilio/TwiML/Voice/Client.cs
index 7096b05db..973bf04b2 100644
--- a/src/Twilio/TwiML/Voice/Client.cs
+++ b/src/Twilio/TwiML/Voice/Client.cs
@@ -13,177 +13,177 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Client TwiML Noun
+  /// </summary>
+  public class Client : TwiML
+  {
+    public sealed class EventEnum : StringEnum
+    {
+      private EventEnum(string value) : base(value) { }
+      public EventEnum() { }
+      public static implicit operator EventEnum(string value)
+      {
+        return new EventEnum(value);
+      }
+
+      public static readonly EventEnum Initiated = new EventEnum("initiated");
+      public static readonly EventEnum Ringing = new EventEnum("ringing");
+      public static readonly EventEnum Answered = new EventEnum("answered");
+      public static readonly EventEnum Completed = new EventEnum("completed");
+    }
+
     /// <summary>
-    /// Client TwiML Noun
+    /// Client identity
     /// </summary>
-    public class Client : TwiML
-    {
-        public sealed class EventEnum : StringEnum
-        {
-            private EventEnum(string value) : base(value) {}
-            public EventEnum() {}
-            public static implicit operator EventEnum(string value)
-            {
-                return new EventEnum(value);
-            }
-
-            public static readonly EventEnum Initiated = new EventEnum("initiated");
-            public static readonly EventEnum Ringing = new EventEnum("ringing");
-            public static readonly EventEnum Answered = new EventEnum("answered");
-            public static readonly EventEnum Completed = new EventEnum("completed");
-        }
-
-        /// <summary>
-        /// Client identity
-        /// </summary>
-        public string IdentityAttribute { get; set; }
-        /// <summary>
-        /// Client URL
-        /// </summary>
-        public Uri Url { get; set; }
-        /// <summary>
-        /// Client URL Method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-        /// <summary>
-        /// Events to trigger status callback
-        /// </summary>
-        public List<Client.EventEnum> StatusCallbackEvent { get; set; }
-        /// <summary>
-        /// Status Callback URL
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// Status Callback URL Method
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-
-        /// <summary>
-        /// Create a new Client
-        /// </summary>
-        /// <param name="identity"> Client identity, the body of the TwiML Element. </param>
-        /// <param name="url"> Client URL </param>
-        /// <param name="method"> Client URL Method </param>
-        /// <param name="statusCallbackEvent"> Events to trigger status callback </param>
-        /// <param name="statusCallback"> Status Callback URL </param>
-        /// <param name="statusCallbackMethod"> Status Callback URL Method </param>
-        public Client(string identity = null,
-                      Uri url = null,
-                      Twilio.Http.HttpMethod method = null,
-                      List<Client.EventEnum> statusCallbackEvent = null,
-                      Uri statusCallback = null,
-                      Twilio.Http.HttpMethod statusCallbackMethod = null) : base("Client")
-        {
-            this.IdentityAttribute = identity;
-            this.Url = url;
-            this.Method = method;
-            this.StatusCallbackEvent = statusCallbackEvent;
-            this.StatusCallback = statusCallback;
-            this.StatusCallbackMethod = statusCallbackMethod;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.IdentityAttribute != null ? this.IdentityAttribute : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Url != null)
-            {
-                attributes.Add(new XAttribute("url", Serializers.Url(this.Url)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            if (this.StatusCallbackEvent != null)
-            {
-                attributes.Add(new XAttribute("statusCallbackEvent", String.Join(" ", this.StatusCallbackEvent.Select(e => e.ToString()).ToArray())));
-            }
-            if (this.StatusCallback != null)
-            {
-                attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
-            }
-            if (this.StatusCallbackMethod != null)
-            {
-                attributes.Add(new XAttribute("statusCallbackMethod", this.StatusCallbackMethod.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Identity/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="clientIdentity"> Identity of the client to dial, the body of the TwiML Element. </param>
-        public Client Identity(string clientIdentity = null)
-        {
-            var newChild = new Identity(clientIdentity);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Identity/> element as a child of this element
-        /// </summary>
-        /// <param name="identity"> A Identity instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Client Identity(Identity identity)
-        {
-            this.Append(identity);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Parameter/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> The name of the custom parameter </param>
-        /// <param name="value"> The value of the custom parameter </param>
-        public Client Parameter(string name = null, string value = null)
-        {
-            var newChild = new Parameter(name, value);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Parameter/> element as a child of this element
-        /// </summary>
-        /// <param name="parameter"> A Parameter instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Client Parameter(Parameter parameter)
-        {
-            this.Append(parameter);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Client Append(TwiML childElem)
-        {
-            return (Client) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Client SetOption(string key, object value)
-        {
-            return (Client) base.SetOption(key, value);
-        }
-    }
+    public string IdentityAttribute { get; set; }
+    /// <summary>
+    /// Client URL
+    /// </summary>
+    public Uri Url { get; set; }
+    /// <summary>
+    /// Client URL Method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+    /// <summary>
+    /// Events to trigger status callback
+    /// </summary>
+    public List<Client.EventEnum> StatusCallbackEvent { get; set; }
+    /// <summary>
+    /// Status Callback URL
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// Status Callback URL Method
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+
+    /// <summary>
+    /// Create a new Client
+    /// </summary>
+    /// <param name="identity"> Client identity, the body of the TwiML Element. </param>
+    /// <param name="url"> Client URL </param>
+    /// <param name="method"> Client URL Method </param>
+    /// <param name="statusCallbackEvent"> Events to trigger status callback </param>
+    /// <param name="statusCallback"> Status Callback URL </param>
+    /// <param name="statusCallbackMethod"> Status Callback URL Method </param>
+    public Client(string identity = null,
+                  Uri url = null,
+                  Twilio.Http.HttpMethod method = null,
+                  List<Client.EventEnum> statusCallbackEvent = null,
+                  Uri statusCallback = null,
+                  Twilio.Http.HttpMethod statusCallbackMethod = null) : base("Client")
+    {
+      this.IdentityAttribute = identity;
+      this.Url = url;
+      this.Method = method;
+      this.StatusCallbackEvent = statusCallbackEvent;
+      this.StatusCallback = statusCallback;
+      this.StatusCallbackMethod = statusCallbackMethod;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.IdentityAttribute != null ? this.IdentityAttribute : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Url != null)
+      {
+        attributes.Add(new XAttribute("url", Serializers.Url(this.Url)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      if (this.StatusCallbackEvent != null)
+      {
+        attributes.Add(new XAttribute("statusCallbackEvent", String.Join(" ", this.StatusCallbackEvent.Select(e => e.ToString()).ToArray())));
+      }
+      if (this.StatusCallback != null)
+      {
+        attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
+      }
+      if (this.StatusCallbackMethod != null)
+      {
+        attributes.Add(new XAttribute("statusCallbackMethod", this.StatusCallbackMethod.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Identity/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="clientIdentity"> Identity of the client to dial, the body of the TwiML Element. </param>
+    public Client Identity(string clientIdentity = null)
+    {
+      var newChild = new Identity(clientIdentity);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Identity/> element as a child of this element
+    /// </summary>
+    /// <param name="identity"> A Identity instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Client Identity(Identity identity)
+    {
+      this.Append(identity);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Parameter/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> The name of the custom parameter </param>
+    /// <param name="value"> The value of the custom parameter </param>
+    public Client Parameter(string name = null, string value = null)
+    {
+      var newChild = new Parameter(name, value);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Parameter/> element as a child of this element
+    /// </summary>
+    /// <param name="parameter"> A Parameter instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Client Parameter(Parameter parameter)
+    {
+      this.Append(parameter);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Client Append(TwiML childElem)
+    {
+      return (Client)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Client SetOption(string key, object value)
+    {
+      return (Client)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Conference.cs b/src/Twilio/TwiML/Voice/Conference.cs
index f88d7814d..8ae858b3b 100644
--- a/src/Twilio/TwiML/Voice/Conference.cs
+++ b/src/Twilio/TwiML/Voice/Conference.cs
@@ -13,390 +13,390 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Conference TwiML Noun
+  /// </summary>
+  public class Conference : TwiML
+  {
+    public sealed class BeepEnum : StringEnum
+    {
+      private BeepEnum(string value) : base(value) { }
+      public BeepEnum() { }
+      public static implicit operator BeepEnum(string value)
+      {
+        return new BeepEnum(value);
+      }
+
+      public static readonly BeepEnum True = new BeepEnum("true");
+      public static readonly BeepEnum False = new BeepEnum("false");
+      public static readonly BeepEnum Onenter = new BeepEnum("onEnter");
+      public static readonly BeepEnum Onexit = new BeepEnum("onExit");
+    }
+
+    public sealed class RecordEnum : StringEnum
+    {
+      private RecordEnum(string value) : base(value) { }
+      public RecordEnum() { }
+      public static implicit operator RecordEnum(string value)
+      {
+        return new RecordEnum(value);
+      }
+
+      public static readonly RecordEnum DoNotRecord = new RecordEnum("do-not-record");
+      public static readonly RecordEnum RecordFromStart = new RecordEnum("record-from-start");
+    }
+
+    public sealed class RegionEnum : StringEnum
+    {
+      private RegionEnum(string value) : base(value) { }
+      public RegionEnum() { }
+      public static implicit operator RegionEnum(string value)
+      {
+        return new RegionEnum(value);
+      }
+
+      public static readonly RegionEnum Us1 = new RegionEnum("us1");
+      public static readonly RegionEnum Ie1 = new RegionEnum("ie1");
+      public static readonly RegionEnum Sg1 = new RegionEnum("sg1");
+      public static readonly RegionEnum Br1 = new RegionEnum("br1");
+      public static readonly RegionEnum Au1 = new RegionEnum("au1");
+      public static readonly RegionEnum Jp1 = new RegionEnum("jp1");
+      public static readonly RegionEnum De1 = new RegionEnum("de1");
+    }
+
+    public sealed class EventEnum : StringEnum
+    {
+      private EventEnum(string value) : base(value) { }
+      public EventEnum() { }
+      public static implicit operator EventEnum(string value)
+      {
+        return new EventEnum(value);
+      }
+
+      public static readonly EventEnum Start = new EventEnum("start");
+      public static readonly EventEnum End = new EventEnum("end");
+      public static readonly EventEnum Join = new EventEnum("join");
+      public static readonly EventEnum Leave = new EventEnum("leave");
+      public static readonly EventEnum Mute = new EventEnum("mute");
+      public static readonly EventEnum Hold = new EventEnum("hold");
+      public static readonly EventEnum Modify = new EventEnum("modify");
+      public static readonly EventEnum Speaker = new EventEnum("speaker");
+      public static readonly EventEnum Announcement = new EventEnum("announcement");
+    }
+
+    public sealed class TrimEnum : StringEnum
+    {
+      private TrimEnum(string value) : base(value) { }
+      public TrimEnum() { }
+      public static implicit operator TrimEnum(string value)
+      {
+        return new TrimEnum(value);
+      }
+
+      public static readonly TrimEnum TrimSilence = new TrimEnum("trim-silence");
+      public static readonly TrimEnum DoNotTrim = new TrimEnum("do-not-trim");
+    }
+
+    public sealed class RecordingEventEnum : StringEnum
+    {
+      private RecordingEventEnum(string value) : base(value) { }
+      public RecordingEventEnum() { }
+      public static implicit operator RecordingEventEnum(string value)
+      {
+        return new RecordingEventEnum(value);
+      }
+
+      public static readonly RecordingEventEnum InProgress = new RecordingEventEnum("in-progress");
+      public static readonly RecordingEventEnum Completed = new RecordingEventEnum("completed");
+      public static readonly RecordingEventEnum Absent = new RecordingEventEnum("absent");
+    }
+
+    public sealed class JitterBufferSizeEnum : StringEnum
+    {
+      private JitterBufferSizeEnum(string value) : base(value) { }
+      public JitterBufferSizeEnum() { }
+      public static implicit operator JitterBufferSizeEnum(string value)
+      {
+        return new JitterBufferSizeEnum(value);
+      }
+
+      public static readonly JitterBufferSizeEnum Large = new JitterBufferSizeEnum("large");
+      public static readonly JitterBufferSizeEnum Medium = new JitterBufferSizeEnum("medium");
+      public static readonly JitterBufferSizeEnum Small = new JitterBufferSizeEnum("small");
+      public static readonly JitterBufferSizeEnum Off = new JitterBufferSizeEnum("off");
+    }
+
     /// <summary>
-    /// Conference TwiML Noun
+    /// Conference name
     /// </summary>
-    public class Conference : TwiML
-    {
-        public sealed class BeepEnum : StringEnum
-        {
-            private BeepEnum(string value) : base(value) {}
-            public BeepEnum() {}
-            public static implicit operator BeepEnum(string value)
-            {
-                return new BeepEnum(value);
-            }
-
-            public static readonly BeepEnum True = new BeepEnum("true");
-            public static readonly BeepEnum False = new BeepEnum("false");
-            public static readonly BeepEnum Onenter = new BeepEnum("onEnter");
-            public static readonly BeepEnum Onexit = new BeepEnum("onExit");
-        }
-
-        public sealed class RecordEnum : StringEnum
-        {
-            private RecordEnum(string value) : base(value) {}
-            public RecordEnum() {}
-            public static implicit operator RecordEnum(string value)
-            {
-                return new RecordEnum(value);
-            }
-
-            public static readonly RecordEnum DoNotRecord = new RecordEnum("do-not-record");
-            public static readonly RecordEnum RecordFromStart = new RecordEnum("record-from-start");
-        }
-
-        public sealed class RegionEnum : StringEnum
-        {
-            private RegionEnum(string value) : base(value) {}
-            public RegionEnum() {}
-            public static implicit operator RegionEnum(string value)
-            {
-                return new RegionEnum(value);
-            }
-
-            public static readonly RegionEnum Us1 = new RegionEnum("us1");
-            public static readonly RegionEnum Ie1 = new RegionEnum("ie1");
-            public static readonly RegionEnum Sg1 = new RegionEnum("sg1");
-            public static readonly RegionEnum Br1 = new RegionEnum("br1");
-            public static readonly RegionEnum Au1 = new RegionEnum("au1");
-            public static readonly RegionEnum Jp1 = new RegionEnum("jp1");
-            public static readonly RegionEnum De1 = new RegionEnum("de1");
-        }
-
-        public sealed class EventEnum : StringEnum
-        {
-            private EventEnum(string value) : base(value) {}
-            public EventEnum() {}
-            public static implicit operator EventEnum(string value)
-            {
-                return new EventEnum(value);
-            }
-
-            public static readonly EventEnum Start = new EventEnum("start");
-            public static readonly EventEnum End = new EventEnum("end");
-            public static readonly EventEnum Join = new EventEnum("join");
-            public static readonly EventEnum Leave = new EventEnum("leave");
-            public static readonly EventEnum Mute = new EventEnum("mute");
-            public static readonly EventEnum Hold = new EventEnum("hold");
-            public static readonly EventEnum Modify = new EventEnum("modify");
-            public static readonly EventEnum Speaker = new EventEnum("speaker");
-            public static readonly EventEnum Announcement = new EventEnum("announcement");
-        }
-
-        public sealed class TrimEnum : StringEnum
-        {
-            private TrimEnum(string value) : base(value) {}
-            public TrimEnum() {}
-            public static implicit operator TrimEnum(string value)
-            {
-                return new TrimEnum(value);
-            }
-
-            public static readonly TrimEnum TrimSilence = new TrimEnum("trim-silence");
-            public static readonly TrimEnum DoNotTrim = new TrimEnum("do-not-trim");
-        }
-
-        public sealed class RecordingEventEnum : StringEnum
-        {
-            private RecordingEventEnum(string value) : base(value) {}
-            public RecordingEventEnum() {}
-            public static implicit operator RecordingEventEnum(string value)
-            {
-                return new RecordingEventEnum(value);
-            }
-
-            public static readonly RecordingEventEnum InProgress = new RecordingEventEnum("in-progress");
-            public static readonly RecordingEventEnum Completed = new RecordingEventEnum("completed");
-            public static readonly RecordingEventEnum Absent = new RecordingEventEnum("absent");
-        }
-
-        public sealed class JitterBufferSizeEnum : StringEnum
-        {
-            private JitterBufferSizeEnum(string value) : base(value) {}
-            public JitterBufferSizeEnum() {}
-            public static implicit operator JitterBufferSizeEnum(string value)
-            {
-                return new JitterBufferSizeEnum(value);
-            }
-
-            public static readonly JitterBufferSizeEnum Large = new JitterBufferSizeEnum("large");
-            public static readonly JitterBufferSizeEnum Medium = new JitterBufferSizeEnum("medium");
-            public static readonly JitterBufferSizeEnum Small = new JitterBufferSizeEnum("small");
-            public static readonly JitterBufferSizeEnum Off = new JitterBufferSizeEnum("off");
-        }
-
-        /// <summary>
-        /// Conference name
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// Join the conference muted
-        /// </summary>
-        public bool? Muted { get; set; }
-        /// <summary>
-        /// Play beep when joining
-        /// </summary>
-        public Conference.BeepEnum Beep { get; set; }
-        /// <summary>
-        /// Start the conference on enter
-        /// </summary>
-        public bool? StartConferenceOnEnter { get; set; }
-        /// <summary>
-        /// End the conferenceon exit
-        /// </summary>
-        public bool? EndConferenceOnExit { get; set; }
-        /// <summary>
-        /// Wait URL
-        /// </summary>
-        public Uri WaitUrl { get; set; }
-        /// <summary>
-        /// Wait URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod WaitMethod { get; set; }
-        /// <summary>
-        /// Maximum number of participants
-        /// </summary>
-        public int? MaxParticipants { get; set; }
-        /// <summary>
-        /// Record the conference
-        /// </summary>
-        public Conference.RecordEnum Record { get; set; }
-        /// <summary>
-        /// Conference region
-        /// </summary>
-        public Conference.RegionEnum Region { get; set; }
-        /// <summary>
-        /// Call coach
-        /// </summary>
-        public string Coach { get; set; }
-        /// <summary>
-        /// Trim the conference recording
-        /// </summary>
-        public Conference.TrimEnum Trim { get; set; }
-        /// <summary>
-        /// Events to call status callback URL
-        /// </summary>
-        public List<Conference.EventEnum> StatusCallbackEvent { get; set; }
-        /// <summary>
-        /// Status callback URL
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// Status callback URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Recording status callback URL
-        /// </summary>
-        public Uri RecordingStatusCallback { get; set; }
-        /// <summary>
-        /// Recording status callback URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Recording status callback events
-        /// </summary>
-        public List<Conference.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
-        /// <summary>
-        /// Event callback URL
-        /// </summary>
-        public Uri EventCallbackUrl { get; set; }
-        /// <summary>
-        /// Size of jitter buffer for participant
-        /// </summary>
-        public Conference.JitterBufferSizeEnum JitterBufferSize { get; set; }
-        /// <summary>
-        /// A label for participant
-        /// </summary>
-        public string ParticipantLabel { get; set; }
-
-        /// <summary>
-        /// Create a new Conference
-        /// </summary>
-        /// <param name="name"> Conference name, the body of the TwiML Element. </param>
-        /// <param name="muted"> Join the conference muted </param>
-        /// <param name="beep"> Play beep when joining </param>
-        /// <param name="startConferenceOnEnter"> Start the conference on enter </param>
-        /// <param name="endConferenceOnExit"> End the conferenceon exit </param>
-        /// <param name="waitUrl"> Wait URL </param>
-        /// <param name="waitMethod"> Wait URL method </param>
-        /// <param name="maxParticipants"> Maximum number of participants </param>
-        /// <param name="record"> Record the conference </param>
-        /// <param name="region"> Conference region </param>
-        /// <param name="coach"> Call coach </param>
-        /// <param name="trim"> Trim the conference recording </param>
-        /// <param name="statusCallbackEvent"> Events to call status callback URL </param>
-        /// <param name="statusCallback"> Status callback URL </param>
-        /// <param name="statusCallbackMethod"> Status callback URL method </param>
-        /// <param name="recordingStatusCallback"> Recording status callback URL </param>
-        /// <param name="recordingStatusCallbackMethod"> Recording status callback URL method </param>
-        /// <param name="recordingStatusCallbackEvent"> Recording status callback events </param>
-        /// <param name="eventCallbackUrl"> Event callback URL </param>
-        /// <param name="jitterBufferSize"> Size of jitter buffer for participant </param>
-        /// <param name="participantLabel"> A label for participant </param>
-        public Conference(string name = null,
-                          bool? muted = null,
-                          Conference.BeepEnum beep = null,
-                          bool? startConferenceOnEnter = null,
-                          bool? endConferenceOnExit = null,
-                          Uri waitUrl = null,
-                          Twilio.Http.HttpMethod waitMethod = null,
-                          int? maxParticipants = null,
-                          Conference.RecordEnum record = null,
-                          Conference.RegionEnum region = null,
-                          string coach = null,
-                          Conference.TrimEnum trim = null,
-                          List<Conference.EventEnum> statusCallbackEvent = null,
-                          Uri statusCallback = null,
-                          Twilio.Http.HttpMethod statusCallbackMethod = null,
-                          Uri recordingStatusCallback = null,
-                          Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                          List<Conference.RecordingEventEnum> recordingStatusCallbackEvent = null,
-                          Uri eventCallbackUrl = null,
-                          Conference.JitterBufferSizeEnum jitterBufferSize = null,
-                          string participantLabel = null) : base("Conference")
-        {
-            this.Name = name;
-            this.Muted = muted;
-            this.Beep = beep;
-            this.StartConferenceOnEnter = startConferenceOnEnter;
-            this.EndConferenceOnExit = endConferenceOnExit;
-            this.WaitUrl = waitUrl;
-            this.WaitMethod = waitMethod;
-            this.MaxParticipants = maxParticipants;
-            this.Record = record;
-            this.Region = region;
-            this.Coach = coach;
-            this.Trim = trim;
-            this.StatusCallbackEvent = statusCallbackEvent;
-            this.StatusCallback = statusCallback;
-            this.StatusCallbackMethod = statusCallbackMethod;
-            this.RecordingStatusCallback = recordingStatusCallback;
-            this.RecordingStatusCallbackMethod = recordingStatusCallbackMethod;
-            this.RecordingStatusCallbackEvent = recordingStatusCallbackEvent;
-            this.EventCallbackUrl = eventCallbackUrl;
-            this.JitterBufferSize = jitterBufferSize;
-            this.ParticipantLabel = participantLabel;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Name != null ? this.Name : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Muted != null)
-            {
-                attributes.Add(new XAttribute("muted", this.Muted.Value.ToString().ToLower()));
-            }
-            if (this.Beep != null)
-            {
-                attributes.Add(new XAttribute("beep", this.Beep.ToString()));
-            }
-            if (this.StartConferenceOnEnter != null)
-            {
-                attributes.Add(new XAttribute("startConferenceOnEnter", this.StartConferenceOnEnter.Value.ToString().ToLower()));
-            }
-            if (this.EndConferenceOnExit != null)
-            {
-                attributes.Add(new XAttribute("endConferenceOnExit", this.EndConferenceOnExit.Value.ToString().ToLower()));
-            }
-            if (this.WaitUrl != null)
-            {
-                attributes.Add(new XAttribute("waitUrl", Serializers.Url(this.WaitUrl)));
-            }
-            if (this.WaitMethod != null)
-            {
-                attributes.Add(new XAttribute("waitMethod", this.WaitMethod.ToString()));
-            }
-            if (this.MaxParticipants != null)
-            {
-                attributes.Add(new XAttribute("maxParticipants", this.MaxParticipants.ToString()));
-            }
-            if (this.Record != null)
-            {
-                attributes.Add(new XAttribute("record", this.Record.ToString()));
-            }
-            if (this.Region != null)
-            {
-                attributes.Add(new XAttribute("region", this.Region.ToString()));
-            }
-            if (this.Coach != null)
-            {
-                attributes.Add(new XAttribute("coach", this.Coach.ToString()));
-            }
-            if (this.Trim != null)
-            {
-                attributes.Add(new XAttribute("trim", this.Trim.ToString()));
-            }
-            if (this.StatusCallbackEvent != null)
-            {
-                attributes.Add(new XAttribute("statusCallbackEvent", String.Join(" ", this.StatusCallbackEvent.Select(e => e.ToString()).ToArray())));
-            }
-            if (this.StatusCallback != null)
-            {
-                attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
-            }
-            if (this.StatusCallbackMethod != null)
-            {
-                attributes.Add(new XAttribute("statusCallbackMethod", this.StatusCallbackMethod.ToString()));
-            }
-            if (this.RecordingStatusCallback != null)
-            {
-                attributes.Add(new XAttribute("recordingStatusCallback", Serializers.Url(this.RecordingStatusCallback)));
-            }
-            if (this.RecordingStatusCallbackMethod != null)
-            {
-                attributes.Add(new XAttribute("recordingStatusCallbackMethod", this.RecordingStatusCallbackMethod.ToString()));
-            }
-            if (this.RecordingStatusCallbackEvent != null)
-            {
-                attributes.Add(new XAttribute("recordingStatusCallbackEvent", String.Join(" ", this.RecordingStatusCallbackEvent.Select(e => e.ToString()).ToArray())));
-            }
-            if (this.EventCallbackUrl != null)
-            {
-                attributes.Add(new XAttribute("eventCallbackUrl", Serializers.Url(this.EventCallbackUrl)));
-            }
-            if (this.JitterBufferSize != null)
-            {
-                attributes.Add(new XAttribute("jitterBufferSize", this.JitterBufferSize.ToString()));
-            }
-            if (this.ParticipantLabel != null)
-            {
-                attributes.Add(new XAttribute("participantLabel", this.ParticipantLabel));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Conference Append(TwiML childElem)
-        {
-            return (Conference) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Conference SetOption(string key, object value)
-        {
-            return (Conference) base.SetOption(key, value);
-        }
-    }
+    public string Name { get; set; }
+    /// <summary>
+    /// Join the conference muted
+    /// </summary>
+    public bool? Muted { get; set; }
+    /// <summary>
+    /// Play beep when joining
+    /// </summary>
+    public Conference.BeepEnum Beep { get; set; }
+    /// <summary>
+    /// Start the conference on enter
+    /// </summary>
+    public bool? StartConferenceOnEnter { get; set; }
+    /// <summary>
+    /// End the conferenceon exit
+    /// </summary>
+    public bool? EndConferenceOnExit { get; set; }
+    /// <summary>
+    /// Wait URL
+    /// </summary>
+    public Uri WaitUrl { get; set; }
+    /// <summary>
+    /// Wait URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod WaitMethod { get; set; }
+    /// <summary>
+    /// Maximum number of participants
+    /// </summary>
+    public int? MaxParticipants { get; set; }
+    /// <summary>
+    /// Record the conference
+    /// </summary>
+    public Conference.RecordEnum Record { get; set; }
+    /// <summary>
+    /// Conference region
+    /// </summary>
+    public Conference.RegionEnum Region { get; set; }
+    /// <summary>
+    /// Call coach
+    /// </summary>
+    public string Coach { get; set; }
+    /// <summary>
+    /// Trim the conference recording
+    /// </summary>
+    public Conference.TrimEnum Trim { get; set; }
+    /// <summary>
+    /// Events to call status callback URL
+    /// </summary>
+    public List<Conference.EventEnum> StatusCallbackEvent { get; set; }
+    /// <summary>
+    /// Status callback URL
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// Status callback URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Recording status callback URL
+    /// </summary>
+    public Uri RecordingStatusCallback { get; set; }
+    /// <summary>
+    /// Recording status callback URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Recording status callback events
+    /// </summary>
+    public List<Conference.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
+    /// <summary>
+    /// Event callback URL
+    /// </summary>
+    public Uri EventCallbackUrl { get; set; }
+    /// <summary>
+    /// Size of jitter buffer for participant
+    /// </summary>
+    public Conference.JitterBufferSizeEnum JitterBufferSize { get; set; }
+    /// <summary>
+    /// A label for participant
+    /// </summary>
+    public string ParticipantLabel { get; set; }
+
+    /// <summary>
+    /// Create a new Conference
+    /// </summary>
+    /// <param name="name"> Conference name, the body of the TwiML Element. </param>
+    /// <param name="muted"> Join the conference muted </param>
+    /// <param name="beep"> Play beep when joining </param>
+    /// <param name="startConferenceOnEnter"> Start the conference on enter </param>
+    /// <param name="endConferenceOnExit"> End the conferenceon exit </param>
+    /// <param name="waitUrl"> Wait URL </param>
+    /// <param name="waitMethod"> Wait URL method </param>
+    /// <param name="maxParticipants"> Maximum number of participants </param>
+    /// <param name="record"> Record the conference </param>
+    /// <param name="region"> Conference region </param>
+    /// <param name="coach"> Call coach </param>
+    /// <param name="trim"> Trim the conference recording </param>
+    /// <param name="statusCallbackEvent"> Events to call status callback URL </param>
+    /// <param name="statusCallback"> Status callback URL </param>
+    /// <param name="statusCallbackMethod"> Status callback URL method </param>
+    /// <param name="recordingStatusCallback"> Recording status callback URL </param>
+    /// <param name="recordingStatusCallbackMethod"> Recording status callback URL method </param>
+    /// <param name="recordingStatusCallbackEvent"> Recording status callback events </param>
+    /// <param name="eventCallbackUrl"> Event callback URL </param>
+    /// <param name="jitterBufferSize"> Size of jitter buffer for participant </param>
+    /// <param name="participantLabel"> A label for participant </param>
+    public Conference(string name = null,
+                      bool? muted = null,
+                      Conference.BeepEnum beep = null,
+                      bool? startConferenceOnEnter = null,
+                      bool? endConferenceOnExit = null,
+                      Uri waitUrl = null,
+                      Twilio.Http.HttpMethod waitMethod = null,
+                      int? maxParticipants = null,
+                      Conference.RecordEnum record = null,
+                      Conference.RegionEnum region = null,
+                      string coach = null,
+                      Conference.TrimEnum trim = null,
+                      List<Conference.EventEnum> statusCallbackEvent = null,
+                      Uri statusCallback = null,
+                      Twilio.Http.HttpMethod statusCallbackMethod = null,
+                      Uri recordingStatusCallback = null,
+                      Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                      List<Conference.RecordingEventEnum> recordingStatusCallbackEvent = null,
+                      Uri eventCallbackUrl = null,
+                      Conference.JitterBufferSizeEnum jitterBufferSize = null,
+                      string participantLabel = null) : base("Conference")
+    {
+      this.Name = name;
+      this.Muted = muted;
+      this.Beep = beep;
+      this.StartConferenceOnEnter = startConferenceOnEnter;
+      this.EndConferenceOnExit = endConferenceOnExit;
+      this.WaitUrl = waitUrl;
+      this.WaitMethod = waitMethod;
+      this.MaxParticipants = maxParticipants;
+      this.Record = record;
+      this.Region = region;
+      this.Coach = coach;
+      this.Trim = trim;
+      this.StatusCallbackEvent = statusCallbackEvent;
+      this.StatusCallback = statusCallback;
+      this.StatusCallbackMethod = statusCallbackMethod;
+      this.RecordingStatusCallback = recordingStatusCallback;
+      this.RecordingStatusCallbackMethod = recordingStatusCallbackMethod;
+      this.RecordingStatusCallbackEvent = recordingStatusCallbackEvent;
+      this.EventCallbackUrl = eventCallbackUrl;
+      this.JitterBufferSize = jitterBufferSize;
+      this.ParticipantLabel = participantLabel;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Name != null ? this.Name : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Muted != null)
+      {
+        attributes.Add(new XAttribute("muted", this.Muted.Value.ToString().ToLower()));
+      }
+      if (this.Beep != null)
+      {
+        attributes.Add(new XAttribute("beep", this.Beep.ToString()));
+      }
+      if (this.StartConferenceOnEnter != null)
+      {
+        attributes.Add(new XAttribute("startConferenceOnEnter", this.StartConferenceOnEnter.Value.ToString().ToLower()));
+      }
+      if (this.EndConferenceOnExit != null)
+      {
+        attributes.Add(new XAttribute("endConferenceOnExit", this.EndConferenceOnExit.Value.ToString().ToLower()));
+      }
+      if (this.WaitUrl != null)
+      {
+        attributes.Add(new XAttribute("waitUrl", Serializers.Url(this.WaitUrl)));
+      }
+      if (this.WaitMethod != null)
+      {
+        attributes.Add(new XAttribute("waitMethod", this.WaitMethod.ToString()));
+      }
+      if (this.MaxParticipants != null)
+      {
+        attributes.Add(new XAttribute("maxParticipants", this.MaxParticipants.ToString()));
+      }
+      if (this.Record != null)
+      {
+        attributes.Add(new XAttribute("record", this.Record.ToString()));
+      }
+      if (this.Region != null)
+      {
+        attributes.Add(new XAttribute("region", this.Region.ToString()));
+      }
+      if (this.Coach != null)
+      {
+        attributes.Add(new XAttribute("coach", this.Coach.ToString()));
+      }
+      if (this.Trim != null)
+      {
+        attributes.Add(new XAttribute("trim", this.Trim.ToString()));
+      }
+      if (this.StatusCallbackEvent != null)
+      {
+        attributes.Add(new XAttribute("statusCallbackEvent", String.Join(" ", this.StatusCallbackEvent.Select(e => e.ToString()).ToArray())));
+      }
+      if (this.StatusCallback != null)
+      {
+        attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
+      }
+      if (this.StatusCallbackMethod != null)
+      {
+        attributes.Add(new XAttribute("statusCallbackMethod", this.StatusCallbackMethod.ToString()));
+      }
+      if (this.RecordingStatusCallback != null)
+      {
+        attributes.Add(new XAttribute("recordingStatusCallback", Serializers.Url(this.RecordingStatusCallback)));
+      }
+      if (this.RecordingStatusCallbackMethod != null)
+      {
+        attributes.Add(new XAttribute("recordingStatusCallbackMethod", this.RecordingStatusCallbackMethod.ToString()));
+      }
+      if (this.RecordingStatusCallbackEvent != null)
+      {
+        attributes.Add(new XAttribute("recordingStatusCallbackEvent", String.Join(" ", this.RecordingStatusCallbackEvent.Select(e => e.ToString()).ToArray())));
+      }
+      if (this.EventCallbackUrl != null)
+      {
+        attributes.Add(new XAttribute("eventCallbackUrl", Serializers.Url(this.EventCallbackUrl)));
+      }
+      if (this.JitterBufferSize != null)
+      {
+        attributes.Add(new XAttribute("jitterBufferSize", this.JitterBufferSize.ToString()));
+      }
+      if (this.ParticipantLabel != null)
+      {
+        attributes.Add(new XAttribute("participantLabel", this.ParticipantLabel));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Conference Append(TwiML childElem)
+    {
+      return (Conference)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Conference SetOption(string key, object value)
+    {
+      return (Conference)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Connect.cs b/src/Twilio/TwiML/Voice/Connect.cs
index ca0ebbdc8..3e6364dd2 100644
--- a/src/Twilio/TwiML/Voice/Connect.cs
+++ b/src/Twilio/TwiML/Voice/Connect.cs
@@ -11,173 +11,173 @@
 using Twilio.Converters;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Connect TwiML Verb
+  /// </summary>
+  public class Connect : TwiML
+  {
     /// <summary>
-    /// Connect TwiML Verb
+    /// Action URL
     /// </summary>
-    public class Connect : TwiML
-    {
-        /// <summary>
-        /// Action URL
-        /// </summary>
-        public Uri Action { get; set; }
-        /// <summary>
-        /// Action URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-
-        /// <summary>
-        /// Create a new Connect
-        /// </summary>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        public Connect(Uri action = null, Twilio.Http.HttpMethod method = null) : base("Connect")
-        {
-            this.Action = action;
-            this.Method = method;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Action != null)
-            {
-                attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Room/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> Room name, the body of the TwiML Element. </param>
-        /// <param name="participantIdentity"> Participant identity when connecting to the Room </param>
-        public Connect Room(string name = null, string participantIdentity = null)
-        {
-            var newChild = new Room(name, participantIdentity);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Room/> element as a child of this element
-        /// </summary>
-        /// <param name="room"> A Room instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Connect Room(Room room)
-        {
-            this.Append(room);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Autopilot/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> Autopilot assistant sid or unique name, the body of the TwiML Element. </param>
-        public Connect Autopilot(string name = null)
-        {
-            var newChild = new Autopilot(name);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Autopilot/> element as a child of this element
-        /// </summary>
-        /// <param name="autopilot"> A Autopilot instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Connect Autopilot(Autopilot autopilot)
-        {
-            this.Append(autopilot);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Stream/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> Friendly name given to the Stream </param>
-        /// <param name="connectorName"> Unique name for Stream Connector </param>
-        /// <param name="url"> URL of the remote service where the Stream is routed </param>
-        /// <param name="track"> Track to be streamed to remote service </param>
-        /// <param name="statusCallback"> Status Callback URL </param>
-        /// <param name="statusCallbackMethod"> Status Callback URL method </param>
-        public Connect Stream(string name = null,
-                              string connectorName = null,
-                              string url = null,
-                              Stream.TrackEnum track = null,
-                              string statusCallback = null,
-                              Stream.StatusCallbackMethodEnum statusCallbackMethod = null)
-        {
-            var newChild = new Stream(name, connectorName, url, track, statusCallback, statusCallbackMethod);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Stream/> element as a child of this element
-        /// </summary>
-        /// <param name="stream"> A Stream instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Connect Stream(Stream stream)
-        {
-            this.Append(stream);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <VirtualAgent/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="connectorName"> Defines the conversation profile Dialogflow needs to use </param>
-        /// <param name="language"> Language to be used by Dialogflow to transcribe speech </param>
-        /// <param name="sentimentAnalysis"> Whether sentiment analysis needs to be enabled or not </param>
-        /// <param name="statusCallback"> URL to post status callbacks from Twilio </param>
-        public Connect VirtualAgent(string connectorName = null,
-                                    string language = null,
-                                    bool? sentimentAnalysis = null,
-                                    string statusCallback = null)
-        {
-            var newChild = new VirtualAgent(connectorName, language, sentimentAnalysis, statusCallback);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <VirtualAgent/> element as a child of this element
-        /// </summary>
-        /// <param name="virtualAgent"> A VirtualAgent instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Connect VirtualAgent(VirtualAgent virtualAgent)
-        {
-            this.Append(virtualAgent);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Connect Append(TwiML childElem)
-        {
-            return (Connect) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Connect SetOption(string key, object value)
-        {
-            return (Connect) base.SetOption(key, value);
-        }
-    }
+    public Uri Action { get; set; }
+    /// <summary>
+    /// Action URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+
+    /// <summary>
+    /// Create a new Connect
+    /// </summary>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    public Connect(Uri action = null, Twilio.Http.HttpMethod method = null) : base("Connect")
+    {
+      this.Action = action;
+      this.Method = method;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Action != null)
+      {
+        attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Room/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> Room name, the body of the TwiML Element. </param>
+    /// <param name="participantIdentity"> Participant identity when connecting to the Room </param>
+    public Connect Room(string name = null, string participantIdentity = null)
+    {
+      var newChild = new Room(name, participantIdentity);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Room/> element as a child of this element
+    /// </summary>
+    /// <param name="room"> A Room instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Connect Room(Room room)
+    {
+      this.Append(room);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Autopilot/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> Autopilot assistant sid or unique name, the body of the TwiML Element. </param>
+    public Connect Autopilot(string name = null)
+    {
+      var newChild = new Autopilot(name);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Autopilot/> element as a child of this element
+    /// </summary>
+    /// <param name="autopilot"> A Autopilot instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Connect Autopilot(Autopilot autopilot)
+    {
+      this.Append(autopilot);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Stream/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> Friendly name given to the Stream </param>
+    /// <param name="connectorName"> Unique name for Stream Connector </param>
+    /// <param name="url"> URL of the remote service where the Stream is routed </param>
+    /// <param name="track"> Track to be streamed to remote service </param>
+    /// <param name="statusCallback"> Status Callback URL </param>
+    /// <param name="statusCallbackMethod"> Status Callback URL method </param>
+    public Connect Stream(string name = null,
+                          string connectorName = null,
+                          string url = null,
+                          Stream.TrackEnum track = null,
+                          string statusCallback = null,
+                          Stream.StatusCallbackMethodEnum statusCallbackMethod = null)
+    {
+      var newChild = new Stream(name, connectorName, url, track, statusCallback, statusCallbackMethod);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Stream/> element as a child of this element
+    /// </summary>
+    /// <param name="stream"> A Stream instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Connect Stream(Stream stream)
+    {
+      this.Append(stream);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <VirtualAgent/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="connectorName"> Defines the conversation profile Dialogflow needs to use </param>
+    /// <param name="language"> Language to be used by Dialogflow to transcribe speech </param>
+    /// <param name="sentimentAnalysis"> Whether sentiment analysis needs to be enabled or not </param>
+    /// <param name="statusCallback"> URL to post status callbacks from Twilio </param>
+    public Connect VirtualAgent(string connectorName = null,
+                                string language = null,
+                                bool? sentimentAnalysis = null,
+                                string statusCallback = null)
+    {
+      var newChild = new VirtualAgent(connectorName, language, sentimentAnalysis, statusCallback);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <VirtualAgent/> element as a child of this element
+    /// </summary>
+    /// <param name="virtualAgent"> A VirtualAgent instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Connect VirtualAgent(VirtualAgent virtualAgent)
+    {
+      this.Append(virtualAgent);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Connect Append(TwiML childElem)
+    {
+      return (Connect)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Connect SetOption(string key, object value)
+    {
+      return (Connect)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Dial.cs b/src/Twilio/TwiML/Voice/Dial.cs
index a30e28c46..b8de10d10 100644
--- a/src/Twilio/TwiML/Voice/Dial.cs
+++ b/src/Twilio/TwiML/Voice/Dial.cs
@@ -13,625 +13,625 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Dial TwiML Verb
+  /// </summary>
+  public class Dial : TwiML
+  {
+    public sealed class TrimEnum : StringEnum
+    {
+      private TrimEnum(string value) : base(value) { }
+      public TrimEnum() { }
+      public static implicit operator TrimEnum(string value)
+      {
+        return new TrimEnum(value);
+      }
+
+      public static readonly TrimEnum TrimSilence = new TrimEnum("trim-silence");
+      public static readonly TrimEnum DoNotTrim = new TrimEnum("do-not-trim");
+    }
+
+    public sealed class RecordEnum : StringEnum
+    {
+      private RecordEnum(string value) : base(value) { }
+      public RecordEnum() { }
+      public static implicit operator RecordEnum(string value)
+      {
+        return new RecordEnum(value);
+      }
+
+      public static readonly RecordEnum DoNotRecord = new RecordEnum("do-not-record");
+      public static readonly RecordEnum RecordFromAnswer = new RecordEnum("record-from-answer");
+      public static readonly RecordEnum RecordFromRinging = new RecordEnum("record-from-ringing");
+      public static readonly RecordEnum RecordFromAnswerDual = new RecordEnum("record-from-answer-dual");
+      public static readonly RecordEnum RecordFromRingingDual = new RecordEnum("record-from-ringing-dual");
+    }
+
+    public sealed class RecordingEventEnum : StringEnum
+    {
+      private RecordingEventEnum(string value) : base(value) { }
+      public RecordingEventEnum() { }
+      public static implicit operator RecordingEventEnum(string value)
+      {
+        return new RecordingEventEnum(value);
+      }
+
+      public static readonly RecordingEventEnum InProgress = new RecordingEventEnum("in-progress");
+      public static readonly RecordingEventEnum Completed = new RecordingEventEnum("completed");
+      public static readonly RecordingEventEnum Absent = new RecordingEventEnum("absent");
+    }
+
+    public sealed class RingToneEnum : StringEnum
+    {
+      private RingToneEnum(string value) : base(value) { }
+      public RingToneEnum() { }
+      public static implicit operator RingToneEnum(string value)
+      {
+        return new RingToneEnum(value);
+      }
+
+      public static readonly RingToneEnum At = new RingToneEnum("at");
+      public static readonly RingToneEnum Au = new RingToneEnum("au");
+      public static readonly RingToneEnum Bg = new RingToneEnum("bg");
+      public static readonly RingToneEnum Br = new RingToneEnum("br");
+      public static readonly RingToneEnum Be = new RingToneEnum("be");
+      public static readonly RingToneEnum Ch = new RingToneEnum("ch");
+      public static readonly RingToneEnum Cl = new RingToneEnum("cl");
+      public static readonly RingToneEnum Cn = new RingToneEnum("cn");
+      public static readonly RingToneEnum Cz = new RingToneEnum("cz");
+      public static readonly RingToneEnum De = new RingToneEnum("de");
+      public static readonly RingToneEnum Dk = new RingToneEnum("dk");
+      public static readonly RingToneEnum Ee = new RingToneEnum("ee");
+      public static readonly RingToneEnum Es = new RingToneEnum("es");
+      public static readonly RingToneEnum Fi = new RingToneEnum("fi");
+      public static readonly RingToneEnum Fr = new RingToneEnum("fr");
+      public static readonly RingToneEnum Gr = new RingToneEnum("gr");
+      public static readonly RingToneEnum Hu = new RingToneEnum("hu");
+      public static readonly RingToneEnum Il = new RingToneEnum("il");
+      public static readonly RingToneEnum In = new RingToneEnum("in");
+      public static readonly RingToneEnum It = new RingToneEnum("it");
+      public static readonly RingToneEnum Lt = new RingToneEnum("lt");
+      public static readonly RingToneEnum Jp = new RingToneEnum("jp");
+      public static readonly RingToneEnum Mx = new RingToneEnum("mx");
+      public static readonly RingToneEnum My = new RingToneEnum("my");
+      public static readonly RingToneEnum Nl = new RingToneEnum("nl");
+      public static readonly RingToneEnum No = new RingToneEnum("no");
+      public static readonly RingToneEnum Nz = new RingToneEnum("nz");
+      public static readonly RingToneEnum Ph = new RingToneEnum("ph");
+      public static readonly RingToneEnum Pl = new RingToneEnum("pl");
+      public static readonly RingToneEnum Pt = new RingToneEnum("pt");
+      public static readonly RingToneEnum Ru = new RingToneEnum("ru");
+      public static readonly RingToneEnum Se = new RingToneEnum("se");
+      public static readonly RingToneEnum Sg = new RingToneEnum("sg");
+      public static readonly RingToneEnum Th = new RingToneEnum("th");
+      public static readonly RingToneEnum Uk = new RingToneEnum("uk");
+      public static readonly RingToneEnum Us = new RingToneEnum("us");
+      public static readonly RingToneEnum UsOld = new RingToneEnum("us-old");
+      public static readonly RingToneEnum Tw = new RingToneEnum("tw");
+      public static readonly RingToneEnum Ve = new RingToneEnum("ve");
+      public static readonly RingToneEnum Za = new RingToneEnum("za");
+    }
+
+    public sealed class RecordingTrackEnum : StringEnum
+    {
+      private RecordingTrackEnum(string value) : base(value) { }
+      public RecordingTrackEnum() { }
+      public static implicit operator RecordingTrackEnum(string value)
+      {
+        return new RecordingTrackEnum(value);
+      }
+
+      public static readonly RecordingTrackEnum Both = new RecordingTrackEnum("both");
+      public static readonly RecordingTrackEnum Inbound = new RecordingTrackEnum("inbound");
+      public static readonly RecordingTrackEnum Outbound = new RecordingTrackEnum("outbound");
+    }
+
     /// <summary>
-    /// Dial TwiML Verb
-    /// </summary>
-    public class Dial : TwiML
-    {
-        public sealed class TrimEnum : StringEnum
-        {
-            private TrimEnum(string value) : base(value) {}
-            public TrimEnum() {}
-            public static implicit operator TrimEnum(string value)
-            {
-                return new TrimEnum(value);
-            }
-
-            public static readonly TrimEnum TrimSilence = new TrimEnum("trim-silence");
-            public static readonly TrimEnum DoNotTrim = new TrimEnum("do-not-trim");
-        }
-
-        public sealed class RecordEnum : StringEnum
-        {
-            private RecordEnum(string value) : base(value) {}
-            public RecordEnum() {}
-            public static implicit operator RecordEnum(string value)
-            {
-                return new RecordEnum(value);
-            }
-
-            public static readonly RecordEnum DoNotRecord = new RecordEnum("do-not-record");
-            public static readonly RecordEnum RecordFromAnswer = new RecordEnum("record-from-answer");
-            public static readonly RecordEnum RecordFromRinging = new RecordEnum("record-from-ringing");
-            public static readonly RecordEnum RecordFromAnswerDual = new RecordEnum("record-from-answer-dual");
-            public static readonly RecordEnum RecordFromRingingDual = new RecordEnum("record-from-ringing-dual");
-        }
-
-        public sealed class RecordingEventEnum : StringEnum
-        {
-            private RecordingEventEnum(string value) : base(value) {}
-            public RecordingEventEnum() {}
-            public static implicit operator RecordingEventEnum(string value)
-            {
-                return new RecordingEventEnum(value);
-            }
-
-            public static readonly RecordingEventEnum InProgress = new RecordingEventEnum("in-progress");
-            public static readonly RecordingEventEnum Completed = new RecordingEventEnum("completed");
-            public static readonly RecordingEventEnum Absent = new RecordingEventEnum("absent");
-        }
-
-        public sealed class RingToneEnum : StringEnum
-        {
-            private RingToneEnum(string value) : base(value) {}
-            public RingToneEnum() {}
-            public static implicit operator RingToneEnum(string value)
-            {
-                return new RingToneEnum(value);
-            }
-
-            public static readonly RingToneEnum At = new RingToneEnum("at");
-            public static readonly RingToneEnum Au = new RingToneEnum("au");
-            public static readonly RingToneEnum Bg = new RingToneEnum("bg");
-            public static readonly RingToneEnum Br = new RingToneEnum("br");
-            public static readonly RingToneEnum Be = new RingToneEnum("be");
-            public static readonly RingToneEnum Ch = new RingToneEnum("ch");
-            public static readonly RingToneEnum Cl = new RingToneEnum("cl");
-            public static readonly RingToneEnum Cn = new RingToneEnum("cn");
-            public static readonly RingToneEnum Cz = new RingToneEnum("cz");
-            public static readonly RingToneEnum De = new RingToneEnum("de");
-            public static readonly RingToneEnum Dk = new RingToneEnum("dk");
-            public static readonly RingToneEnum Ee = new RingToneEnum("ee");
-            public static readonly RingToneEnum Es = new RingToneEnum("es");
-            public static readonly RingToneEnum Fi = new RingToneEnum("fi");
-            public static readonly RingToneEnum Fr = new RingToneEnum("fr");
-            public static readonly RingToneEnum Gr = new RingToneEnum("gr");
-            public static readonly RingToneEnum Hu = new RingToneEnum("hu");
-            public static readonly RingToneEnum Il = new RingToneEnum("il");
-            public static readonly RingToneEnum In = new RingToneEnum("in");
-            public static readonly RingToneEnum It = new RingToneEnum("it");
-            public static readonly RingToneEnum Lt = new RingToneEnum("lt");
-            public static readonly RingToneEnum Jp = new RingToneEnum("jp");
-            public static readonly RingToneEnum Mx = new RingToneEnum("mx");
-            public static readonly RingToneEnum My = new RingToneEnum("my");
-            public static readonly RingToneEnum Nl = new RingToneEnum("nl");
-            public static readonly RingToneEnum No = new RingToneEnum("no");
-            public static readonly RingToneEnum Nz = new RingToneEnum("nz");
-            public static readonly RingToneEnum Ph = new RingToneEnum("ph");
-            public static readonly RingToneEnum Pl = new RingToneEnum("pl");
-            public static readonly RingToneEnum Pt = new RingToneEnum("pt");
-            public static readonly RingToneEnum Ru = new RingToneEnum("ru");
-            public static readonly RingToneEnum Se = new RingToneEnum("se");
-            public static readonly RingToneEnum Sg = new RingToneEnum("sg");
-            public static readonly RingToneEnum Th = new RingToneEnum("th");
-            public static readonly RingToneEnum Uk = new RingToneEnum("uk");
-            public static readonly RingToneEnum Us = new RingToneEnum("us");
-            public static readonly RingToneEnum UsOld = new RingToneEnum("us-old");
-            public static readonly RingToneEnum Tw = new RingToneEnum("tw");
-            public static readonly RingToneEnum Ve = new RingToneEnum("ve");
-            public static readonly RingToneEnum Za = new RingToneEnum("za");
-        }
-
-        public sealed class RecordingTrackEnum : StringEnum
-        {
-            private RecordingTrackEnum(string value) : base(value) {}
-            public RecordingTrackEnum() {}
-            public static implicit operator RecordingTrackEnum(string value)
-            {
-                return new RecordingTrackEnum(value);
-            }
-
-            public static readonly RecordingTrackEnum Both = new RecordingTrackEnum("both");
-            public static readonly RecordingTrackEnum Inbound = new RecordingTrackEnum("inbound");
-            public static readonly RecordingTrackEnum Outbound = new RecordingTrackEnum("outbound");
-        }
-
-        /// <summary>
-        /// Phone number to dial
-        /// </summary>
-        public string NumberAttribute { get; set; }
-        /// <summary>
-        /// Action URL
-        /// </summary>
-        public Uri Action { get; set; }
-        /// <summary>
-        /// Action URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-        /// <summary>
-        /// Time to wait for answer
-        /// </summary>
-        public int? Timeout { get; set; }
-        /// <summary>
-        /// Hangup call on star press
-        /// </summary>
-        public bool? HangupOnStar { get; set; }
-        /// <summary>
-        /// Max time length
-        /// </summary>
-        public int? TimeLimit { get; set; }
-        /// <summary>
-        /// Caller ID to display
-        /// </summary>
-        public string CallerId { get; set; }
-        /// <summary>
-        /// Record the call
-        /// </summary>
-        public Dial.RecordEnum Record { get; set; }
-        /// <summary>
-        /// Trim the recording
-        /// </summary>
-        public Dial.TrimEnum Trim { get; set; }
-        /// <summary>
-        /// Recording status callback URL
-        /// </summary>
-        public Uri RecordingStatusCallback { get; set; }
-        /// <summary>
-        /// Recording status callback URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Recording status callback events
-        /// </summary>
-        public List<Dial.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
-        /// <summary>
-        /// Preserve the ringing behavior of the inbound call until the Dialed call picks up
-        /// </summary>
-        public bool? AnswerOnBridge { get; set; }
-        /// <summary>
-        /// Ringtone allows you to override the ringback tone that Twilio will play back to the caller while executing the Dial
-        /// </summary>
-        public Dial.RingToneEnum RingTone { get; set; }
-        /// <summary>
-        /// To indicate which audio track should be recorded
-        /// </summary>
-        public Dial.RecordingTrackEnum RecordingTrack { get; set; }
-        /// <summary>
-        /// Used to determine if child TwiML nouns should be dialed in order, one after the other (sequential) or dial all at once (parallel). Default is false, parallel
-        /// </summary>
-        public bool? Sequential { get; set; }
-        /// <summary>
-        /// Webhook that will receive future SIP REFER requests
-        /// </summary>
-        public Uri ReferUrl { get; set; }
-        /// <summary>
-        /// The HTTP method to use for the refer Webhook
-        /// </summary>
-        public Twilio.Http.HttpMethod ReferMethod { get; set; }
-
-        /// <summary>
-        /// Create a new Dial
-        /// </summary>
-        /// <param name="number"> Phone number to dial, the body of the TwiML Element. </param>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="timeout"> Time to wait for answer </param>
-        /// <param name="hangupOnStar"> Hangup call on star press </param>
-        /// <param name="timeLimit"> Max time length </param>
-        /// <param name="callerId"> Caller ID to display </param>
-        /// <param name="record"> Record the call </param>
-        /// <param name="trim"> Trim the recording </param>
-        /// <param name="recordingStatusCallback"> Recording status callback URL </param>
-        /// <param name="recordingStatusCallbackMethod"> Recording status callback URL method </param>
-        /// <param name="recordingStatusCallbackEvent"> Recording status callback events </param>
-        /// <param name="answerOnBridge"> Preserve the ringing behavior of the inbound call until the Dialed call picks up
-        ///                      </param>
-        /// <param name="ringTone"> Ringtone allows you to override the ringback tone that Twilio will play back to the caller
-        ///                while executing the Dial </param>
-        /// <param name="recordingTrack"> To indicate which audio track should be recorded </param>
-        /// <param name="sequential"> Used to determine if child TwiML nouns should be dialed in order, one after the other
-        ///                  (sequential) or dial all at once (parallel). Default is false, parallel </param>
-        /// <param name="referUrl"> Webhook that will receive future SIP REFER requests </param>
-        /// <param name="referMethod"> The HTTP method to use for the refer Webhook </param>
-        public Dial(string number = null,
-                    Uri action = null,
-                    Twilio.Http.HttpMethod method = null,
-                    int? timeout = null,
-                    bool? hangupOnStar = null,
-                    int? timeLimit = null,
-                    string callerId = null,
-                    Dial.RecordEnum record = null,
-                    Dial.TrimEnum trim = null,
-                    Uri recordingStatusCallback = null,
-                    Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                    List<Dial.RecordingEventEnum> recordingStatusCallbackEvent = null,
-                    bool? answerOnBridge = null,
-                    Dial.RingToneEnum ringTone = null,
-                    Dial.RecordingTrackEnum recordingTrack = null,
-                    bool? sequential = null,
-                    Uri referUrl = null,
-                    Twilio.Http.HttpMethod referMethod = null) : base("Dial")
-        {
-            this.NumberAttribute = number;
-            this.Action = action;
-            this.Method = method;
-            this.Timeout = timeout;
-            this.HangupOnStar = hangupOnStar;
-            this.TimeLimit = timeLimit;
-            this.CallerId = callerId;
-            this.Record = record;
-            this.Trim = trim;
-            this.RecordingStatusCallback = recordingStatusCallback;
-            this.RecordingStatusCallbackMethod = recordingStatusCallbackMethod;
-            this.RecordingStatusCallbackEvent = recordingStatusCallbackEvent;
-            this.AnswerOnBridge = answerOnBridge;
-            this.RingTone = ringTone;
-            this.RecordingTrack = recordingTrack;
-            this.Sequential = sequential;
-            this.ReferUrl = referUrl;
-            this.ReferMethod = referMethod;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.NumberAttribute != null ? this.NumberAttribute : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Action != null)
-            {
-                attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            if (this.Timeout != null)
-            {
-                attributes.Add(new XAttribute("timeout", this.Timeout.ToString()));
-            }
-            if (this.HangupOnStar != null)
-            {
-                attributes.Add(new XAttribute("hangupOnStar", this.HangupOnStar.Value.ToString().ToLower()));
-            }
-            if (this.TimeLimit != null)
-            {
-                attributes.Add(new XAttribute("timeLimit", this.TimeLimit.ToString()));
-            }
-            if (this.CallerId != null)
-            {
-                attributes.Add(new XAttribute("callerId", this.CallerId));
-            }
-            if (this.Record != null)
-            {
-                attributes.Add(new XAttribute("record", this.Record.ToString()));
-            }
-            if (this.Trim != null)
-            {
-                attributes.Add(new XAttribute("trim", this.Trim.ToString()));
-            }
-            if (this.RecordingStatusCallback != null)
-            {
-                attributes.Add(new XAttribute("recordingStatusCallback", Serializers.Url(this.RecordingStatusCallback)));
-            }
-            if (this.RecordingStatusCallbackMethod != null)
-            {
-                attributes.Add(new XAttribute("recordingStatusCallbackMethod", this.RecordingStatusCallbackMethod.ToString()));
-            }
-            if (this.RecordingStatusCallbackEvent != null)
-            {
-                attributes.Add(new XAttribute("recordingStatusCallbackEvent", String.Join(" ", this.RecordingStatusCallbackEvent.Select(e => e.ToString()).ToArray())));
-            }
-            if (this.AnswerOnBridge != null)
-            {
-                attributes.Add(new XAttribute("answerOnBridge", this.AnswerOnBridge.Value.ToString().ToLower()));
-            }
-            if (this.RingTone != null)
-            {
-                attributes.Add(new XAttribute("ringTone", this.RingTone.ToString()));
-            }
-            if (this.RecordingTrack != null)
-            {
-                attributes.Add(new XAttribute("recordingTrack", this.RecordingTrack.ToString()));
-            }
-            if (this.Sequential != null)
-            {
-                attributes.Add(new XAttribute("sequential", this.Sequential.Value.ToString().ToLower()));
-            }
-            if (this.ReferUrl != null)
-            {
-                attributes.Add(new XAttribute("referUrl", Serializers.Url(this.ReferUrl)));
-            }
-            if (this.ReferMethod != null)
-            {
-                attributes.Add(new XAttribute("referMethod", this.ReferMethod.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Client/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="identity"> Client identity, the body of the TwiML Element. </param>
-        /// <param name="url"> Client URL </param>
-        /// <param name="method"> Client URL Method </param>
-        /// <param name="statusCallbackEvent"> Events to trigger status callback </param>
-        /// <param name="statusCallback"> Status Callback URL </param>
-        /// <param name="statusCallbackMethod"> Status Callback URL Method </param>
-        public Dial Client(string identity = null,
-                           Uri url = null,
-                           Twilio.Http.HttpMethod method = null,
-                           List<Client.EventEnum> statusCallbackEvent = null,
-                           Uri statusCallback = null,
-                           Twilio.Http.HttpMethod statusCallbackMethod = null)
-        {
-            var newChild = new Client(
-                identity,
-                url,
-                method,
-                statusCallbackEvent,
-                statusCallback,
-                statusCallbackMethod
-            );
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Client/> element as a child of this element
-        /// </summary>
-        /// <param name="client"> A Client instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Dial Client(Client client)
-        {
-            this.Append(client);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Conference/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> Conference name, the body of the TwiML Element. </param>
-        /// <param name="muted"> Join the conference muted </param>
-        /// <param name="beep"> Play beep when joining </param>
-        /// <param name="startConferenceOnEnter"> Start the conference on enter </param>
-        /// <param name="endConferenceOnExit"> End the conferenceon exit </param>
-        /// <param name="waitUrl"> Wait URL </param>
-        /// <param name="waitMethod"> Wait URL method </param>
-        /// <param name="maxParticipants"> Maximum number of participants </param>
-        /// <param name="record"> Record the conference </param>
-        /// <param name="region"> Conference region </param>
-        /// <param name="coach"> Call coach </param>
-        /// <param name="trim"> Trim the conference recording </param>
-        /// <param name="statusCallbackEvent"> Events to call status callback URL </param>
-        /// <param name="statusCallback"> Status callback URL </param>
-        /// <param name="statusCallbackMethod"> Status callback URL method </param>
-        /// <param name="recordingStatusCallback"> Recording status callback URL </param>
-        /// <param name="recordingStatusCallbackMethod"> Recording status callback URL method </param>
-        /// <param name="recordingStatusCallbackEvent"> Recording status callback events </param>
-        /// <param name="eventCallbackUrl"> Event callback URL </param>
-        /// <param name="jitterBufferSize"> Size of jitter buffer for participant </param>
-        /// <param name="participantLabel"> A label for participant </param>
-        public Dial Conference(string name = null,
-                               bool? muted = null,
-                               Conference.BeepEnum beep = null,
-                               bool? startConferenceOnEnter = null,
-                               bool? endConferenceOnExit = null,
-                               Uri waitUrl = null,
-                               Twilio.Http.HttpMethod waitMethod = null,
-                               int? maxParticipants = null,
-                               Conference.RecordEnum record = null,
-                               Conference.RegionEnum region = null,
-                               string coach = null,
-                               Conference.TrimEnum trim = null,
-                               List<Conference.EventEnum> statusCallbackEvent = null,
-                               Uri statusCallback = null,
-                               Twilio.Http.HttpMethod statusCallbackMethod = null,
-                               Uri recordingStatusCallback = null,
-                               Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                               List<Conference.RecordingEventEnum> recordingStatusCallbackEvent = null,
-                               Uri eventCallbackUrl = null,
-                               Conference.JitterBufferSizeEnum jitterBufferSize = null,
-                               string participantLabel = null)
-        {
-            var newChild = new Conference(
-                name,
-                muted,
-                beep,
-                startConferenceOnEnter,
-                endConferenceOnExit,
-                waitUrl,
-                waitMethod,
-                maxParticipants,
-                record,
-                region,
-                coach,
-                trim,
-                statusCallbackEvent,
-                statusCallback,
-                statusCallbackMethod,
-                recordingStatusCallback,
-                recordingStatusCallbackMethod,
-                recordingStatusCallbackEvent,
-                eventCallbackUrl,
-                jitterBufferSize,
-                participantLabel
-            );
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Conference/> element as a child of this element
-        /// </summary>
-        /// <param name="conference"> A Conference instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Dial Conference(Conference conference)
-        {
-            this.Append(conference);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Number/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="phoneNumber"> Phone Number to dial, the body of the TwiML Element. </param>
-        /// <param name="sendDigits"> DTMF tones to play when the call is answered </param>
-        /// <param name="url"> TwiML URL </param>
-        /// <param name="method"> TwiML URL method </param>
-        /// <param name="statusCallbackEvent"> Events to call status callback </param>
-        /// <param name="statusCallback"> Status callback URL </param>
-        /// <param name="statusCallbackMethod"> Status callback URL method </param>
-        /// <param name="byoc"> BYOC trunk SID (Beta) </param>
-        public Dial Number(Types.PhoneNumber phoneNumber = null,
-                           string sendDigits = null,
-                           Uri url = null,
-                           Twilio.Http.HttpMethod method = null,
-                           List<Number.EventEnum> statusCallbackEvent = null,
-                           Uri statusCallback = null,
-                           Twilio.Http.HttpMethod statusCallbackMethod = null,
-                           string byoc = null)
-        {
-            var newChild = new Number(
-                phoneNumber,
-                sendDigits,
-                url,
-                method,
-                statusCallbackEvent,
-                statusCallback,
-                statusCallbackMethod,
-                byoc
-            );
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Number/> element as a child of this element
-        /// </summary>
-        /// <param name="number"> A Number instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Dial Number(Number number)
-        {
-            this.Append(number);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Queue/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> Queue name, the body of the TwiML Element. </param>
-        /// <param name="url"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="reservationSid"> TaskRouter Reservation SID </param>
-        /// <param name="postWorkActivitySid"> TaskRouter Activity SID </param>
-        public Dial Queue(string name = null,
-                          Uri url = null,
-                          Twilio.Http.HttpMethod method = null,
-                          string reservationSid = null,
-                          string postWorkActivitySid = null)
-        {
-            var newChild = new Queue(name, url, method, reservationSid, postWorkActivitySid);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Queue/> element as a child of this element
-        /// </summary>
-        /// <param name="queue"> A Queue instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Dial Queue(Queue queue)
-        {
-            this.Append(queue);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Sim/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="simSid"> SIM SID, the body of the TwiML Element. </param>
-        public Dial Sim(string simSid = null)
-        {
-            var newChild = new Sim(simSid);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Sim/> element as a child of this element
-        /// </summary>
-        /// <param name="sim"> A Sim instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Dial Sim(Sim sim)
-        {
-            this.Append(sim);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Sip/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="sipUrl"> SIP URL, the body of the TwiML Element. </param>
-        /// <param name="username"> SIP Username </param>
-        /// <param name="password"> SIP Password </param>
-        /// <param name="url"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="statusCallbackEvent"> Status callback events </param>
-        /// <param name="statusCallback"> Status callback URL </param>
-        /// <param name="statusCallbackMethod"> Status callback URL method </param>
-        public Dial Sip(Uri sipUrl = null,
-                        string username = null,
-                        string password = null,
-                        Uri url = null,
-                        Twilio.Http.HttpMethod method = null,
-                        List<Sip.EventEnum> statusCallbackEvent = null,
-                        Uri statusCallback = null,
-                        Twilio.Http.HttpMethod statusCallbackMethod = null)
-        {
-            var newChild = new Sip(
-                sipUrl,
-                username,
-                password,
-                url,
-                method,
-                statusCallbackEvent,
-                statusCallback,
-                statusCallbackMethod
-            );
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Sip/> element as a child of this element
-        /// </summary>
-        /// <param name="sip"> A Sip instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Dial Sip(Sip sip)
-        {
-            this.Append(sip);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Dial Append(TwiML childElem)
-        {
-            return (Dial) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Dial SetOption(string key, object value)
-        {
-            return (Dial) base.SetOption(key, value);
-        }
-    }
+    /// Phone number to dial
+    /// </summary>
+    public string NumberAttribute { get; set; }
+    /// <summary>
+    /// Action URL
+    /// </summary>
+    public Uri Action { get; set; }
+    /// <summary>
+    /// Action URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+    /// <summary>
+    /// Time to wait for answer
+    /// </summary>
+    public int? Timeout { get; set; }
+    /// <summary>
+    /// Hangup call on star press
+    /// </summary>
+    public bool? HangupOnStar { get; set; }
+    /// <summary>
+    /// Max time length
+    /// </summary>
+    public int? TimeLimit { get; set; }
+    /// <summary>
+    /// Caller ID to display
+    /// </summary>
+    public string CallerId { get; set; }
+    /// <summary>
+    /// Record the call
+    /// </summary>
+    public Dial.RecordEnum Record { get; set; }
+    /// <summary>
+    /// Trim the recording
+    /// </summary>
+    public Dial.TrimEnum Trim { get; set; }
+    /// <summary>
+    /// Recording status callback URL
+    /// </summary>
+    public Uri RecordingStatusCallback { get; set; }
+    /// <summary>
+    /// Recording status callback URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Recording status callback events
+    /// </summary>
+    public List<Dial.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
+    /// <summary>
+    /// Preserve the ringing behavior of the inbound call until the Dialed call picks up
+    /// </summary>
+    public bool? AnswerOnBridge { get; set; }
+    /// <summary>
+    /// Ringtone allows you to override the ringback tone that Twilio will play back to the caller while executing the Dial
+    /// </summary>
+    public Dial.RingToneEnum RingTone { get; set; }
+    /// <summary>
+    /// To indicate which audio track should be recorded
+    /// </summary>
+    public Dial.RecordingTrackEnum RecordingTrack { get; set; }
+    /// <summary>
+    /// Used to determine if child TwiML nouns should be dialed in order, one after the other (sequential) or dial all at once (parallel). Default is false, parallel
+    /// </summary>
+    public bool? Sequential { get; set; }
+    /// <summary>
+    /// Webhook that will receive future SIP REFER requests
+    /// </summary>
+    public Uri ReferUrl { get; set; }
+    /// <summary>
+    /// The HTTP method to use for the refer Webhook
+    /// </summary>
+    public Twilio.Http.HttpMethod ReferMethod { get; set; }
+
+    /// <summary>
+    /// Create a new Dial
+    /// </summary>
+    /// <param name="number"> Phone number to dial, the body of the TwiML Element. </param>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="timeout"> Time to wait for answer </param>
+    /// <param name="hangupOnStar"> Hangup call on star press </param>
+    /// <param name="timeLimit"> Max time length </param>
+    /// <param name="callerId"> Caller ID to display </param>
+    /// <param name="record"> Record the call </param>
+    /// <param name="trim"> Trim the recording </param>
+    /// <param name="recordingStatusCallback"> Recording status callback URL </param>
+    /// <param name="recordingStatusCallbackMethod"> Recording status callback URL method </param>
+    /// <param name="recordingStatusCallbackEvent"> Recording status callback events </param>
+    /// <param name="answerOnBridge"> Preserve the ringing behavior of the inbound call until the Dialed call picks up
+    ///                      </param>
+    /// <param name="ringTone"> Ringtone allows you to override the ringback tone that Twilio will play back to the caller
+    ///                while executing the Dial </param>
+    /// <param name="recordingTrack"> To indicate which audio track should be recorded </param>
+    /// <param name="sequential"> Used to determine if child TwiML nouns should be dialed in order, one after the other
+    ///                  (sequential) or dial all at once (parallel). Default is false, parallel </param>
+    /// <param name="referUrl"> Webhook that will receive future SIP REFER requests </param>
+    /// <param name="referMethod"> The HTTP method to use for the refer Webhook </param>
+    public Dial(string number = null,
+                Uri action = null,
+                Twilio.Http.HttpMethod method = null,
+                int? timeout = null,
+                bool? hangupOnStar = null,
+                int? timeLimit = null,
+                string callerId = null,
+                Dial.RecordEnum record = null,
+                Dial.TrimEnum trim = null,
+                Uri recordingStatusCallback = null,
+                Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                List<Dial.RecordingEventEnum> recordingStatusCallbackEvent = null,
+                bool? answerOnBridge = null,
+                Dial.RingToneEnum ringTone = null,
+                Dial.RecordingTrackEnum recordingTrack = null,
+                bool? sequential = null,
+                Uri referUrl = null,
+                Twilio.Http.HttpMethod referMethod = null) : base("Dial")
+    {
+      this.NumberAttribute = number;
+      this.Action = action;
+      this.Method = method;
+      this.Timeout = timeout;
+      this.HangupOnStar = hangupOnStar;
+      this.TimeLimit = timeLimit;
+      this.CallerId = callerId;
+      this.Record = record;
+      this.Trim = trim;
+      this.RecordingStatusCallback = recordingStatusCallback;
+      this.RecordingStatusCallbackMethod = recordingStatusCallbackMethod;
+      this.RecordingStatusCallbackEvent = recordingStatusCallbackEvent;
+      this.AnswerOnBridge = answerOnBridge;
+      this.RingTone = ringTone;
+      this.RecordingTrack = recordingTrack;
+      this.Sequential = sequential;
+      this.ReferUrl = referUrl;
+      this.ReferMethod = referMethod;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.NumberAttribute != null ? this.NumberAttribute : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Action != null)
+      {
+        attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      if (this.Timeout != null)
+      {
+        attributes.Add(new XAttribute("timeout", this.Timeout.ToString()));
+      }
+      if (this.HangupOnStar != null)
+      {
+        attributes.Add(new XAttribute("hangupOnStar", this.HangupOnStar.Value.ToString().ToLower()));
+      }
+      if (this.TimeLimit != null)
+      {
+        attributes.Add(new XAttribute("timeLimit", this.TimeLimit.ToString()));
+      }
+      if (this.CallerId != null)
+      {
+        attributes.Add(new XAttribute("callerId", this.CallerId));
+      }
+      if (this.Record != null)
+      {
+        attributes.Add(new XAttribute("record", this.Record.ToString()));
+      }
+      if (this.Trim != null)
+      {
+        attributes.Add(new XAttribute("trim", this.Trim.ToString()));
+      }
+      if (this.RecordingStatusCallback != null)
+      {
+        attributes.Add(new XAttribute("recordingStatusCallback", Serializers.Url(this.RecordingStatusCallback)));
+      }
+      if (this.RecordingStatusCallbackMethod != null)
+      {
+        attributes.Add(new XAttribute("recordingStatusCallbackMethod", this.RecordingStatusCallbackMethod.ToString()));
+      }
+      if (this.RecordingStatusCallbackEvent != null)
+      {
+        attributes.Add(new XAttribute("recordingStatusCallbackEvent", String.Join(" ", this.RecordingStatusCallbackEvent.Select(e => e.ToString()).ToArray())));
+      }
+      if (this.AnswerOnBridge != null)
+      {
+        attributes.Add(new XAttribute("answerOnBridge", this.AnswerOnBridge.Value.ToString().ToLower()));
+      }
+      if (this.RingTone != null)
+      {
+        attributes.Add(new XAttribute("ringTone", this.RingTone.ToString()));
+      }
+      if (this.RecordingTrack != null)
+      {
+        attributes.Add(new XAttribute("recordingTrack", this.RecordingTrack.ToString()));
+      }
+      if (this.Sequential != null)
+      {
+        attributes.Add(new XAttribute("sequential", this.Sequential.Value.ToString().ToLower()));
+      }
+      if (this.ReferUrl != null)
+      {
+        attributes.Add(new XAttribute("referUrl", Serializers.Url(this.ReferUrl)));
+      }
+      if (this.ReferMethod != null)
+      {
+        attributes.Add(new XAttribute("referMethod", this.ReferMethod.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Client/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="identity"> Client identity, the body of the TwiML Element. </param>
+    /// <param name="url"> Client URL </param>
+    /// <param name="method"> Client URL Method </param>
+    /// <param name="statusCallbackEvent"> Events to trigger status callback </param>
+    /// <param name="statusCallback"> Status Callback URL </param>
+    /// <param name="statusCallbackMethod"> Status Callback URL Method </param>
+    public Dial Client(string identity = null,
+                       Uri url = null,
+                       Twilio.Http.HttpMethod method = null,
+                       List<Client.EventEnum> statusCallbackEvent = null,
+                       Uri statusCallback = null,
+                       Twilio.Http.HttpMethod statusCallbackMethod = null)
+    {
+      var newChild = new Client(
+          identity,
+          url,
+          method,
+          statusCallbackEvent,
+          statusCallback,
+          statusCallbackMethod
+      );
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Client/> element as a child of this element
+    /// </summary>
+    /// <param name="client"> A Client instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Dial Client(Client client)
+    {
+      this.Append(client);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Conference/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> Conference name, the body of the TwiML Element. </param>
+    /// <param name="muted"> Join the conference muted </param>
+    /// <param name="beep"> Play beep when joining </param>
+    /// <param name="startConferenceOnEnter"> Start the conference on enter </param>
+    /// <param name="endConferenceOnExit"> End the conferenceon exit </param>
+    /// <param name="waitUrl"> Wait URL </param>
+    /// <param name="waitMethod"> Wait URL method </param>
+    /// <param name="maxParticipants"> Maximum number of participants </param>
+    /// <param name="record"> Record the conference </param>
+    /// <param name="region"> Conference region </param>
+    /// <param name="coach"> Call coach </param>
+    /// <param name="trim"> Trim the conference recording </param>
+    /// <param name="statusCallbackEvent"> Events to call status callback URL </param>
+    /// <param name="statusCallback"> Status callback URL </param>
+    /// <param name="statusCallbackMethod"> Status callback URL method </param>
+    /// <param name="recordingStatusCallback"> Recording status callback URL </param>
+    /// <param name="recordingStatusCallbackMethod"> Recording status callback URL method </param>
+    /// <param name="recordingStatusCallbackEvent"> Recording status callback events </param>
+    /// <param name="eventCallbackUrl"> Event callback URL </param>
+    /// <param name="jitterBufferSize"> Size of jitter buffer for participant </param>
+    /// <param name="participantLabel"> A label for participant </param>
+    public Dial Conference(string name = null,
+                           bool? muted = null,
+                           Conference.BeepEnum beep = null,
+                           bool? startConferenceOnEnter = null,
+                           bool? endConferenceOnExit = null,
+                           Uri waitUrl = null,
+                           Twilio.Http.HttpMethod waitMethod = null,
+                           int? maxParticipants = null,
+                           Conference.RecordEnum record = null,
+                           Conference.RegionEnum region = null,
+                           string coach = null,
+                           Conference.TrimEnum trim = null,
+                           List<Conference.EventEnum> statusCallbackEvent = null,
+                           Uri statusCallback = null,
+                           Twilio.Http.HttpMethod statusCallbackMethod = null,
+                           Uri recordingStatusCallback = null,
+                           Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                           List<Conference.RecordingEventEnum> recordingStatusCallbackEvent = null,
+                           Uri eventCallbackUrl = null,
+                           Conference.JitterBufferSizeEnum jitterBufferSize = null,
+                           string participantLabel = null)
+    {
+      var newChild = new Conference(
+          name,
+          muted,
+          beep,
+          startConferenceOnEnter,
+          endConferenceOnExit,
+          waitUrl,
+          waitMethod,
+          maxParticipants,
+          record,
+          region,
+          coach,
+          trim,
+          statusCallbackEvent,
+          statusCallback,
+          statusCallbackMethod,
+          recordingStatusCallback,
+          recordingStatusCallbackMethod,
+          recordingStatusCallbackEvent,
+          eventCallbackUrl,
+          jitterBufferSize,
+          participantLabel
+      );
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Conference/> element as a child of this element
+    /// </summary>
+    /// <param name="conference"> A Conference instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Dial Conference(Conference conference)
+    {
+      this.Append(conference);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Number/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="phoneNumber"> Phone Number to dial, the body of the TwiML Element. </param>
+    /// <param name="sendDigits"> DTMF tones to play when the call is answered </param>
+    /// <param name="url"> TwiML URL </param>
+    /// <param name="method"> TwiML URL method </param>
+    /// <param name="statusCallbackEvent"> Events to call status callback </param>
+    /// <param name="statusCallback"> Status callback URL </param>
+    /// <param name="statusCallbackMethod"> Status callback URL method </param>
+    /// <param name="byoc"> BYOC trunk SID (Beta) </param>
+    public Dial Number(Types.PhoneNumber phoneNumber = null,
+                       string sendDigits = null,
+                       Uri url = null,
+                       Twilio.Http.HttpMethod method = null,
+                       List<Number.EventEnum> statusCallbackEvent = null,
+                       Uri statusCallback = null,
+                       Twilio.Http.HttpMethod statusCallbackMethod = null,
+                       string byoc = null)
+    {
+      var newChild = new Number(
+          phoneNumber,
+          sendDigits,
+          url,
+          method,
+          statusCallbackEvent,
+          statusCallback,
+          statusCallbackMethod,
+          byoc
+      );
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Number/> element as a child of this element
+    /// </summary>
+    /// <param name="number"> A Number instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Dial Number(Number number)
+    {
+      this.Append(number);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Queue/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> Queue name, the body of the TwiML Element. </param>
+    /// <param name="url"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="reservationSid"> TaskRouter Reservation SID </param>
+    /// <param name="postWorkActivitySid"> TaskRouter Activity SID </param>
+    public Dial Queue(string name = null,
+                      Uri url = null,
+                      Twilio.Http.HttpMethod method = null,
+                      string reservationSid = null,
+                      string postWorkActivitySid = null)
+    {
+      var newChild = new Queue(name, url, method, reservationSid, postWorkActivitySid);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Queue/> element as a child of this element
+    /// </summary>
+    /// <param name="queue"> A Queue instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Dial Queue(Queue queue)
+    {
+      this.Append(queue);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Sim/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="simSid"> SIM SID, the body of the TwiML Element. </param>
+    public Dial Sim(string simSid = null)
+    {
+      var newChild = new Sim(simSid);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Sim/> element as a child of this element
+    /// </summary>
+    /// <param name="sim"> A Sim instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Dial Sim(Sim sim)
+    {
+      this.Append(sim);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Sip/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="sipUrl"> SIP URL, the body of the TwiML Element. </param>
+    /// <param name="username"> SIP Username </param>
+    /// <param name="password"> SIP Password </param>
+    /// <param name="url"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="statusCallbackEvent"> Status callback events </param>
+    /// <param name="statusCallback"> Status callback URL </param>
+    /// <param name="statusCallbackMethod"> Status callback URL method </param>
+    public Dial Sip(Uri sipUrl = null,
+                    string username = null,
+                    string password = null,
+                    Uri url = null,
+                    Twilio.Http.HttpMethod method = null,
+                    List<Sip.EventEnum> statusCallbackEvent = null,
+                    Uri statusCallback = null,
+                    Twilio.Http.HttpMethod statusCallbackMethod = null)
+    {
+      var newChild = new Sip(
+          sipUrl,
+          username,
+          password,
+          url,
+          method,
+          statusCallbackEvent,
+          statusCallback,
+          statusCallbackMethod
+      );
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Sip/> element as a child of this element
+    /// </summary>
+    /// <param name="sip"> A Sip instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Dial Sip(Sip sip)
+    {
+      this.Append(sip);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Dial Append(TwiML childElem)
+    {
+      return (Dial)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Dial SetOption(string key, object value)
+    {
+      return (Dial)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Echo.cs b/src/Twilio/TwiML/Voice/Echo.cs
index 551332ed5..33b8564f7 100644
--- a/src/Twilio/TwiML/Voice/Echo.cs
+++ b/src/Twilio/TwiML/Voice/Echo.cs
@@ -8,38 +8,38 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Echo TwiML Verb
+  /// </summary>
+  public class Echo : TwiML
+  {
     /// <summary>
-    /// Echo TwiML Verb
+    /// Create a new Echo
     /// </summary>
-    public class Echo : TwiML
-    {
-        /// <summary>
-        /// Create a new Echo
-        /// </summary>
-        public Echo() : base("Echo")
-        {
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Echo Append(TwiML childElem)
-        {
-            return (Echo) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Echo SetOption(string key, object value)
-        {
-            return (Echo) base.SetOption(key, value);
-        }
-    }
+    public Echo() : base("Echo")
+    {
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Echo Append(TwiML childElem)
+    {
+      return (Echo)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Echo SetOption(string key, object value)
+    {
+      return (Echo)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Enqueue.cs b/src/Twilio/TwiML/Voice/Enqueue.cs
index ab678c7bb..ab7ab9acf 100644
--- a/src/Twilio/TwiML/Voice/Enqueue.cs
+++ b/src/Twilio/TwiML/Voice/Enqueue.cs
@@ -11,142 +11,142 @@
 using Twilio.Converters;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Enqueue TwiML Noun
+  /// </summary>
+  public class Enqueue : TwiML
+  {
     /// <summary>
-    /// Enqueue TwiML Noun
+    /// Friendly name
     /// </summary>
-    public class Enqueue : TwiML
-    {
-        /// <summary>
-        /// Friendly name
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// Action URL
-        /// </summary>
-        public Uri Action { get; set; }
-        /// <summary>
-        /// Action URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-        /// <summary>
-        /// Wait URL
-        /// </summary>
-        public Uri WaitUrl { get; set; }
-        /// <summary>
-        /// Wait URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod WaitUrlMethod { get; set; }
-        /// <summary>
-        /// TaskRouter Workflow SID
-        /// </summary>
-        public string WorkflowSid { get; set; }
-
-        /// <summary>
-        /// Create a new Enqueue
-        /// </summary>
-        /// <param name="name"> Friendly name, the body of the TwiML Element. </param>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="waitUrl"> Wait URL </param>
-        /// <param name="waitUrlMethod"> Wait URL method </param>
-        /// <param name="workflowSid"> TaskRouter Workflow SID </param>
-        public Enqueue(string name = null,
-                       Uri action = null,
-                       Twilio.Http.HttpMethod method = null,
-                       Uri waitUrl = null,
-                       Twilio.Http.HttpMethod waitUrlMethod = null,
-                       string workflowSid = null) : base("Enqueue")
-        {
-            this.Name = name;
-            this.Action = action;
-            this.Method = method;
-            this.WaitUrl = waitUrl;
-            this.WaitUrlMethod = waitUrlMethod;
-            this.WorkflowSid = workflowSid;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Name != null ? this.Name : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Action != null)
-            {
-                attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            if (this.WaitUrl != null)
-            {
-                attributes.Add(new XAttribute("waitUrl", Serializers.Url(this.WaitUrl)));
-            }
-            if (this.WaitUrlMethod != null)
-            {
-                attributes.Add(new XAttribute("waitUrlMethod", this.WaitUrlMethod.ToString()));
-            }
-            if (this.WorkflowSid != null)
-            {
-                attributes.Add(new XAttribute("workflowSid", this.WorkflowSid));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Task/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="body"> TaskRouter task attributes, the body of the TwiML Element. Also accepts stringified object
-        ///            </param>
-        /// <param name="priority"> Task priority </param>
-        /// <param name="timeout"> Timeout associated with task </param>
-        public Enqueue Task(string body = null, int? priority = null, int? timeout = null)
-        {
-            var newChild = new Task(body, priority, timeout);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Task/> element as a child of this element
-        /// </summary>
-        /// <param name="task"> A Task instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Enqueue Task(Task task)
-        {
-            this.Append(task);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Enqueue Append(TwiML childElem)
-        {
-            return (Enqueue) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Enqueue SetOption(string key, object value)
-        {
-            return (Enqueue) base.SetOption(key, value);
-        }
-    }
+    public string Name { get; set; }
+    /// <summary>
+    /// Action URL
+    /// </summary>
+    public Uri Action { get; set; }
+    /// <summary>
+    /// Action URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+    /// <summary>
+    /// Wait URL
+    /// </summary>
+    public Uri WaitUrl { get; set; }
+    /// <summary>
+    /// Wait URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod WaitUrlMethod { get; set; }
+    /// <summary>
+    /// TaskRouter Workflow SID
+    /// </summary>
+    public string WorkflowSid { get; set; }
+
+    /// <summary>
+    /// Create a new Enqueue
+    /// </summary>
+    /// <param name="name"> Friendly name, the body of the TwiML Element. </param>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="waitUrl"> Wait URL </param>
+    /// <param name="waitUrlMethod"> Wait URL method </param>
+    /// <param name="workflowSid"> TaskRouter Workflow SID </param>
+    public Enqueue(string name = null,
+                   Uri action = null,
+                   Twilio.Http.HttpMethod method = null,
+                   Uri waitUrl = null,
+                   Twilio.Http.HttpMethod waitUrlMethod = null,
+                   string workflowSid = null) : base("Enqueue")
+    {
+      this.Name = name;
+      this.Action = action;
+      this.Method = method;
+      this.WaitUrl = waitUrl;
+      this.WaitUrlMethod = waitUrlMethod;
+      this.WorkflowSid = workflowSid;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Name != null ? this.Name : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Action != null)
+      {
+        attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      if (this.WaitUrl != null)
+      {
+        attributes.Add(new XAttribute("waitUrl", Serializers.Url(this.WaitUrl)));
+      }
+      if (this.WaitUrlMethod != null)
+      {
+        attributes.Add(new XAttribute("waitUrlMethod", this.WaitUrlMethod.ToString()));
+      }
+      if (this.WorkflowSid != null)
+      {
+        attributes.Add(new XAttribute("workflowSid", this.WorkflowSid));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Task/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="body"> TaskRouter task attributes, the body of the TwiML Element. Also accepts stringified object
+    ///            </param>
+    /// <param name="priority"> Task priority </param>
+    /// <param name="timeout"> Timeout associated with task </param>
+    public Enqueue Task(string body = null, int? priority = null, int? timeout = null)
+    {
+      var newChild = new Task(body, priority, timeout);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Task/> element as a child of this element
+    /// </summary>
+    /// <param name="task"> A Task instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Enqueue Task(Task task)
+    {
+      this.Append(task);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Enqueue Append(TwiML childElem)
+    {
+      return (Enqueue)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Enqueue SetOption(string key, object value)
+    {
+      return (Enqueue)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Gather.cs b/src/Twilio/TwiML/Voice/Gather.cs
index c4ad47932..1d3fa3476 100644
--- a/src/Twilio/TwiML/Voice/Gather.cs
+++ b/src/Twilio/TwiML/Voice/Gather.cs
@@ -13,488 +13,488 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Gather TwiML Verb
+  /// </summary>
+  public class Gather : TwiML
+  {
+    public sealed class InputEnum : StringEnum
+    {
+      private InputEnum(string value) : base(value) { }
+      public InputEnum() { }
+      public static implicit operator InputEnum(string value)
+      {
+        return new InputEnum(value);
+      }
+
+      public static readonly InputEnum Dtmf = new InputEnum("dtmf");
+      public static readonly InputEnum Speech = new InputEnum("speech");
+    }
+
+    public sealed class LanguageEnum : StringEnum
+    {
+      private LanguageEnum(string value) : base(value) { }
+      public LanguageEnum() { }
+      public static implicit operator LanguageEnum(string value)
+      {
+        return new LanguageEnum(value);
+      }
+
+      public static readonly LanguageEnum AfZa = new LanguageEnum("af-ZA");
+      public static readonly LanguageEnum AmEt = new LanguageEnum("am-ET");
+      public static readonly LanguageEnum ArAe = new LanguageEnum("ar-AE");
+      public static readonly LanguageEnum ArBh = new LanguageEnum("ar-BH");
+      public static readonly LanguageEnum ArDz = new LanguageEnum("ar-DZ");
+      public static readonly LanguageEnum ArEg = new LanguageEnum("ar-EG");
+      public static readonly LanguageEnum ArIl = new LanguageEnum("ar-IL");
+      public static readonly LanguageEnum ArIq = new LanguageEnum("ar-IQ");
+      public static readonly LanguageEnum ArJo = new LanguageEnum("ar-JO");
+      public static readonly LanguageEnum ArKw = new LanguageEnum("ar-KW");
+      public static readonly LanguageEnum ArLb = new LanguageEnum("ar-LB");
+      public static readonly LanguageEnum ArMa = new LanguageEnum("ar-MA");
+      public static readonly LanguageEnum ArOm = new LanguageEnum("ar-OM");
+      public static readonly LanguageEnum ArPs = new LanguageEnum("ar-PS");
+      public static readonly LanguageEnum ArQa = new LanguageEnum("ar-QA");
+      public static readonly LanguageEnum ArSa = new LanguageEnum("ar-SA");
+      public static readonly LanguageEnum ArTn = new LanguageEnum("ar-TN");
+      public static readonly LanguageEnum AzAz = new LanguageEnum("az-AZ");
+      public static readonly LanguageEnum BgBg = new LanguageEnum("bg-BG");
+      public static readonly LanguageEnum BnBd = new LanguageEnum("bn-BD");
+      public static readonly LanguageEnum BnIn = new LanguageEnum("bn-IN");
+      public static readonly LanguageEnum CaEs = new LanguageEnum("ca-ES");
+      public static readonly LanguageEnum CsCz = new LanguageEnum("cs-CZ");
+      public static readonly LanguageEnum DaDk = new LanguageEnum("da-DK");
+      public static readonly LanguageEnum DeDe = new LanguageEnum("de-DE");
+      public static readonly LanguageEnum ElGr = new LanguageEnum("el-GR");
+      public static readonly LanguageEnum EnAu = new LanguageEnum("en-AU");
+      public static readonly LanguageEnum EnCa = new LanguageEnum("en-CA");
+      public static readonly LanguageEnum EnGb = new LanguageEnum("en-GB");
+      public static readonly LanguageEnum EnGh = new LanguageEnum("en-GH");
+      public static readonly LanguageEnum EnIe = new LanguageEnum("en-IE");
+      public static readonly LanguageEnum EnIn = new LanguageEnum("en-IN");
+      public static readonly LanguageEnum EnKe = new LanguageEnum("en-KE");
+      public static readonly LanguageEnum EnNg = new LanguageEnum("en-NG");
+      public static readonly LanguageEnum EnNz = new LanguageEnum("en-NZ");
+      public static readonly LanguageEnum EnPh = new LanguageEnum("en-PH");
+      public static readonly LanguageEnum EnSg = new LanguageEnum("en-SG");
+      public static readonly LanguageEnum EnTz = new LanguageEnum("en-TZ");
+      public static readonly LanguageEnum EnUs = new LanguageEnum("en-US");
+      public static readonly LanguageEnum EnZa = new LanguageEnum("en-ZA");
+      public static readonly LanguageEnum EsAr = new LanguageEnum("es-AR");
+      public static readonly LanguageEnum EsBo = new LanguageEnum("es-BO");
+      public static readonly LanguageEnum EsCl = new LanguageEnum("es-CL");
+      public static readonly LanguageEnum EsCo = new LanguageEnum("es-CO");
+      public static readonly LanguageEnum EsCr = new LanguageEnum("es-CR");
+      public static readonly LanguageEnum EsDo = new LanguageEnum("es-DO");
+      public static readonly LanguageEnum EsEc = new LanguageEnum("es-EC");
+      public static readonly LanguageEnum EsEs = new LanguageEnum("es-ES");
+      public static readonly LanguageEnum EsGt = new LanguageEnum("es-GT");
+      public static readonly LanguageEnum EsHn = new LanguageEnum("es-HN");
+      public static readonly LanguageEnum EsMx = new LanguageEnum("es-MX");
+      public static readonly LanguageEnum EsNi = new LanguageEnum("es-NI");
+      public static readonly LanguageEnum EsPa = new LanguageEnum("es-PA");
+      public static readonly LanguageEnum EsPe = new LanguageEnum("es-PE");
+      public static readonly LanguageEnum EsPr = new LanguageEnum("es-PR");
+      public static readonly LanguageEnum EsPy = new LanguageEnum("es-PY");
+      public static readonly LanguageEnum EsSv = new LanguageEnum("es-SV");
+      public static readonly LanguageEnum EsUs = new LanguageEnum("es-US");
+      public static readonly LanguageEnum EsUy = new LanguageEnum("es-UY");
+      public static readonly LanguageEnum EsVe = new LanguageEnum("es-VE");
+      public static readonly LanguageEnum EtEe = new LanguageEnum("et-EE");
+      public static readonly LanguageEnum EuEs = new LanguageEnum("eu-ES");
+      public static readonly LanguageEnum FaIr = new LanguageEnum("fa-IR");
+      public static readonly LanguageEnum FiFi = new LanguageEnum("fi-FI");
+      public static readonly LanguageEnum FilPh = new LanguageEnum("fil-PH");
+      public static readonly LanguageEnum FrCa = new LanguageEnum("fr-CA");
+      public static readonly LanguageEnum FrFr = new LanguageEnum("fr-FR");
+      public static readonly LanguageEnum GlEs = new LanguageEnum("gl-ES");
+      public static readonly LanguageEnum GuIn = new LanguageEnum("gu-IN");
+      public static readonly LanguageEnum HeIl = new LanguageEnum("he-IL");
+      public static readonly LanguageEnum HiIn = new LanguageEnum("hi-IN");
+      public static readonly LanguageEnum HrHr = new LanguageEnum("hr-HR");
+      public static readonly LanguageEnum HuHu = new LanguageEnum("hu-HU");
+      public static readonly LanguageEnum HyAm = new LanguageEnum("hy-AM");
+      public static readonly LanguageEnum IdId = new LanguageEnum("id-ID");
+      public static readonly LanguageEnum IsIs = new LanguageEnum("is-IS");
+      public static readonly LanguageEnum ItIt = new LanguageEnum("it-IT");
+      public static readonly LanguageEnum JaJp = new LanguageEnum("ja-JP");
+      public static readonly LanguageEnum JvId = new LanguageEnum("jv-ID");
+      public static readonly LanguageEnum KaGe = new LanguageEnum("ka-GE");
+      public static readonly LanguageEnum KmKh = new LanguageEnum("km-KH");
+      public static readonly LanguageEnum KnIn = new LanguageEnum("kn-IN");
+      public static readonly LanguageEnum KoKr = new LanguageEnum("ko-KR");
+      public static readonly LanguageEnum LoLa = new LanguageEnum("lo-LA");
+      public static readonly LanguageEnum LtLt = new LanguageEnum("lt-LT");
+      public static readonly LanguageEnum LvLv = new LanguageEnum("lv-LV");
+      public static readonly LanguageEnum MkMk = new LanguageEnum("mk-MK");
+      public static readonly LanguageEnum MlIn = new LanguageEnum("ml-IN");
+      public static readonly LanguageEnum MnMn = new LanguageEnum("mn-MN");
+      public static readonly LanguageEnum MrIn = new LanguageEnum("mr-IN");
+      public static readonly LanguageEnum MsMy = new LanguageEnum("ms-MY");
+      public static readonly LanguageEnum MyMm = new LanguageEnum("my-MM");
+      public static readonly LanguageEnum NarIq = new LanguageEnum("nar-IQ");
+      public static readonly LanguageEnum NbNo = new LanguageEnum("nb-NO");
+      public static readonly LanguageEnum NeNp = new LanguageEnum("ne-NP");
+      public static readonly LanguageEnum NlBe = new LanguageEnum("nl-BE");
+      public static readonly LanguageEnum NlNl = new LanguageEnum("nl-NL");
+      public static readonly LanguageEnum PaGuruIn = new LanguageEnum("pa-guru-IN");
+      public static readonly LanguageEnum PlPl = new LanguageEnum("pl-PL");
+      public static readonly LanguageEnum PtBr = new LanguageEnum("pt-BR");
+      public static readonly LanguageEnum PtPt = new LanguageEnum("pt-PT");
+      public static readonly LanguageEnum RoRo = new LanguageEnum("ro-RO");
+      public static readonly LanguageEnum RuRu = new LanguageEnum("ru-RU");
+      public static readonly LanguageEnum SiLk = new LanguageEnum("si-LK");
+      public static readonly LanguageEnum SkSk = new LanguageEnum("sk-SK");
+      public static readonly LanguageEnum SlSi = new LanguageEnum("sl-SI");
+      public static readonly LanguageEnum SqAl = new LanguageEnum("sq-AL");
+      public static readonly LanguageEnum SrRs = new LanguageEnum("sr-RS");
+      public static readonly LanguageEnum SuId = new LanguageEnum("su-ID");
+      public static readonly LanguageEnum SvSe = new LanguageEnum("sv-SE");
+      public static readonly LanguageEnum SwKe = new LanguageEnum("sw-KE");
+      public static readonly LanguageEnum SwTz = new LanguageEnum("sw-TZ");
+      public static readonly LanguageEnum TaIn = new LanguageEnum("ta-IN");
+      public static readonly LanguageEnum TaLk = new LanguageEnum("ta-LK");
+      public static readonly LanguageEnum TaMy = new LanguageEnum("ta-MY");
+      public static readonly LanguageEnum TaSg = new LanguageEnum("ta-SG");
+      public static readonly LanguageEnum TeIn = new LanguageEnum("te-IN");
+      public static readonly LanguageEnum ThTh = new LanguageEnum("th-TH");
+      public static readonly LanguageEnum TrTr = new LanguageEnum("tr-TR");
+      public static readonly LanguageEnum UkUa = new LanguageEnum("uk-UA");
+      public static readonly LanguageEnum UrIn = new LanguageEnum("ur-IN");
+      public static readonly LanguageEnum UrPk = new LanguageEnum("ur-PK");
+      public static readonly LanguageEnum UzUz = new LanguageEnum("uz-UZ");
+      public static readonly LanguageEnum ViVn = new LanguageEnum("vi-VN");
+      public static readonly LanguageEnum YueHantHk = new LanguageEnum("yue-Hant-HK");
+      public static readonly LanguageEnum Zh = new LanguageEnum("zh");
+      public static readonly LanguageEnum CmnHansCn = new LanguageEnum("cmn-Hans-CN");
+      public static readonly LanguageEnum ZhTw = new LanguageEnum("zh-TW");
+      public static readonly LanguageEnum CmnHantTw = new LanguageEnum("cmn-Hant-TW");
+      public static readonly LanguageEnum ZuZa = new LanguageEnum("zu-ZA");
+    }
+
+    public sealed class SpeechModelEnum : StringEnum
+    {
+      private SpeechModelEnum(string value) : base(value) { }
+      public SpeechModelEnum() { }
+      public static implicit operator SpeechModelEnum(string value)
+      {
+        return new SpeechModelEnum(value);
+      }
+
+      public static readonly SpeechModelEnum Default = new SpeechModelEnum("default");
+      public static readonly SpeechModelEnum NumbersAndCommands = new SpeechModelEnum("numbers_and_commands");
+      public static readonly SpeechModelEnum PhoneCall = new SpeechModelEnum("phone_call");
+    }
+
     /// <summary>
-    /// Gather TwiML Verb
+    /// Input type Twilio should accept
     /// </summary>
-    public class Gather : TwiML
-    {
-        public sealed class InputEnum : StringEnum
-        {
-            private InputEnum(string value) : base(value) {}
-            public InputEnum() {}
-            public static implicit operator InputEnum(string value)
-            {
-                return new InputEnum(value);
-            }
-
-            public static readonly InputEnum Dtmf = new InputEnum("dtmf");
-            public static readonly InputEnum Speech = new InputEnum("speech");
-        }
-
-        public sealed class LanguageEnum : StringEnum
-        {
-            private LanguageEnum(string value) : base(value) {}
-            public LanguageEnum() {}
-            public static implicit operator LanguageEnum(string value)
-            {
-                return new LanguageEnum(value);
-            }
-
-            public static readonly LanguageEnum AfZa = new LanguageEnum("af-ZA");
-            public static readonly LanguageEnum AmEt = new LanguageEnum("am-ET");
-            public static readonly LanguageEnum ArAe = new LanguageEnum("ar-AE");
-            public static readonly LanguageEnum ArBh = new LanguageEnum("ar-BH");
-            public static readonly LanguageEnum ArDz = new LanguageEnum("ar-DZ");
-            public static readonly LanguageEnum ArEg = new LanguageEnum("ar-EG");
-            public static readonly LanguageEnum ArIl = new LanguageEnum("ar-IL");
-            public static readonly LanguageEnum ArIq = new LanguageEnum("ar-IQ");
-            public static readonly LanguageEnum ArJo = new LanguageEnum("ar-JO");
-            public static readonly LanguageEnum ArKw = new LanguageEnum("ar-KW");
-            public static readonly LanguageEnum ArLb = new LanguageEnum("ar-LB");
-            public static readonly LanguageEnum ArMa = new LanguageEnum("ar-MA");
-            public static readonly LanguageEnum ArOm = new LanguageEnum("ar-OM");
-            public static readonly LanguageEnum ArPs = new LanguageEnum("ar-PS");
-            public static readonly LanguageEnum ArQa = new LanguageEnum("ar-QA");
-            public static readonly LanguageEnum ArSa = new LanguageEnum("ar-SA");
-            public static readonly LanguageEnum ArTn = new LanguageEnum("ar-TN");
-            public static readonly LanguageEnum AzAz = new LanguageEnum("az-AZ");
-            public static readonly LanguageEnum BgBg = new LanguageEnum("bg-BG");
-            public static readonly LanguageEnum BnBd = new LanguageEnum("bn-BD");
-            public static readonly LanguageEnum BnIn = new LanguageEnum("bn-IN");
-            public static readonly LanguageEnum CaEs = new LanguageEnum("ca-ES");
-            public static readonly LanguageEnum CsCz = new LanguageEnum("cs-CZ");
-            public static readonly LanguageEnum DaDk = new LanguageEnum("da-DK");
-            public static readonly LanguageEnum DeDe = new LanguageEnum("de-DE");
-            public static readonly LanguageEnum ElGr = new LanguageEnum("el-GR");
-            public static readonly LanguageEnum EnAu = new LanguageEnum("en-AU");
-            public static readonly LanguageEnum EnCa = new LanguageEnum("en-CA");
-            public static readonly LanguageEnum EnGb = new LanguageEnum("en-GB");
-            public static readonly LanguageEnum EnGh = new LanguageEnum("en-GH");
-            public static readonly LanguageEnum EnIe = new LanguageEnum("en-IE");
-            public static readonly LanguageEnum EnIn = new LanguageEnum("en-IN");
-            public static readonly LanguageEnum EnKe = new LanguageEnum("en-KE");
-            public static readonly LanguageEnum EnNg = new LanguageEnum("en-NG");
-            public static readonly LanguageEnum EnNz = new LanguageEnum("en-NZ");
-            public static readonly LanguageEnum EnPh = new LanguageEnum("en-PH");
-            public static readonly LanguageEnum EnSg = new LanguageEnum("en-SG");
-            public static readonly LanguageEnum EnTz = new LanguageEnum("en-TZ");
-            public static readonly LanguageEnum EnUs = new LanguageEnum("en-US");
-            public static readonly LanguageEnum EnZa = new LanguageEnum("en-ZA");
-            public static readonly LanguageEnum EsAr = new LanguageEnum("es-AR");
-            public static readonly LanguageEnum EsBo = new LanguageEnum("es-BO");
-            public static readonly LanguageEnum EsCl = new LanguageEnum("es-CL");
-            public static readonly LanguageEnum EsCo = new LanguageEnum("es-CO");
-            public static readonly LanguageEnum EsCr = new LanguageEnum("es-CR");
-            public static readonly LanguageEnum EsDo = new LanguageEnum("es-DO");
-            public static readonly LanguageEnum EsEc = new LanguageEnum("es-EC");
-            public static readonly LanguageEnum EsEs = new LanguageEnum("es-ES");
-            public static readonly LanguageEnum EsGt = new LanguageEnum("es-GT");
-            public static readonly LanguageEnum EsHn = new LanguageEnum("es-HN");
-            public static readonly LanguageEnum EsMx = new LanguageEnum("es-MX");
-            public static readonly LanguageEnum EsNi = new LanguageEnum("es-NI");
-            public static readonly LanguageEnum EsPa = new LanguageEnum("es-PA");
-            public static readonly LanguageEnum EsPe = new LanguageEnum("es-PE");
-            public static readonly LanguageEnum EsPr = new LanguageEnum("es-PR");
-            public static readonly LanguageEnum EsPy = new LanguageEnum("es-PY");
-            public static readonly LanguageEnum EsSv = new LanguageEnum("es-SV");
-            public static readonly LanguageEnum EsUs = new LanguageEnum("es-US");
-            public static readonly LanguageEnum EsUy = new LanguageEnum("es-UY");
-            public static readonly LanguageEnum EsVe = new LanguageEnum("es-VE");
-            public static readonly LanguageEnum EtEe = new LanguageEnum("et-EE");
-            public static readonly LanguageEnum EuEs = new LanguageEnum("eu-ES");
-            public static readonly LanguageEnum FaIr = new LanguageEnum("fa-IR");
-            public static readonly LanguageEnum FiFi = new LanguageEnum("fi-FI");
-            public static readonly LanguageEnum FilPh = new LanguageEnum("fil-PH");
-            public static readonly LanguageEnum FrCa = new LanguageEnum("fr-CA");
-            public static readonly LanguageEnum FrFr = new LanguageEnum("fr-FR");
-            public static readonly LanguageEnum GlEs = new LanguageEnum("gl-ES");
-            public static readonly LanguageEnum GuIn = new LanguageEnum("gu-IN");
-            public static readonly LanguageEnum HeIl = new LanguageEnum("he-IL");
-            public static readonly LanguageEnum HiIn = new LanguageEnum("hi-IN");
-            public static readonly LanguageEnum HrHr = new LanguageEnum("hr-HR");
-            public static readonly LanguageEnum HuHu = new LanguageEnum("hu-HU");
-            public static readonly LanguageEnum HyAm = new LanguageEnum("hy-AM");
-            public static readonly LanguageEnum IdId = new LanguageEnum("id-ID");
-            public static readonly LanguageEnum IsIs = new LanguageEnum("is-IS");
-            public static readonly LanguageEnum ItIt = new LanguageEnum("it-IT");
-            public static readonly LanguageEnum JaJp = new LanguageEnum("ja-JP");
-            public static readonly LanguageEnum JvId = new LanguageEnum("jv-ID");
-            public static readonly LanguageEnum KaGe = new LanguageEnum("ka-GE");
-            public static readonly LanguageEnum KmKh = new LanguageEnum("km-KH");
-            public static readonly LanguageEnum KnIn = new LanguageEnum("kn-IN");
-            public static readonly LanguageEnum KoKr = new LanguageEnum("ko-KR");
-            public static readonly LanguageEnum LoLa = new LanguageEnum("lo-LA");
-            public static readonly LanguageEnum LtLt = new LanguageEnum("lt-LT");
-            public static readonly LanguageEnum LvLv = new LanguageEnum("lv-LV");
-            public static readonly LanguageEnum MkMk = new LanguageEnum("mk-MK");
-            public static readonly LanguageEnum MlIn = new LanguageEnum("ml-IN");
-            public static readonly LanguageEnum MnMn = new LanguageEnum("mn-MN");
-            public static readonly LanguageEnum MrIn = new LanguageEnum("mr-IN");
-            public static readonly LanguageEnum MsMy = new LanguageEnum("ms-MY");
-            public static readonly LanguageEnum MyMm = new LanguageEnum("my-MM");
-            public static readonly LanguageEnum NarIq = new LanguageEnum("nar-IQ");
-            public static readonly LanguageEnum NbNo = new LanguageEnum("nb-NO");
-            public static readonly LanguageEnum NeNp = new LanguageEnum("ne-NP");
-            public static readonly LanguageEnum NlBe = new LanguageEnum("nl-BE");
-            public static readonly LanguageEnum NlNl = new LanguageEnum("nl-NL");
-            public static readonly LanguageEnum PaGuruIn = new LanguageEnum("pa-guru-IN");
-            public static readonly LanguageEnum PlPl = new LanguageEnum("pl-PL");
-            public static readonly LanguageEnum PtBr = new LanguageEnum("pt-BR");
-            public static readonly LanguageEnum PtPt = new LanguageEnum("pt-PT");
-            public static readonly LanguageEnum RoRo = new LanguageEnum("ro-RO");
-            public static readonly LanguageEnum RuRu = new LanguageEnum("ru-RU");
-            public static readonly LanguageEnum SiLk = new LanguageEnum("si-LK");
-            public static readonly LanguageEnum SkSk = new LanguageEnum("sk-SK");
-            public static readonly LanguageEnum SlSi = new LanguageEnum("sl-SI");
-            public static readonly LanguageEnum SqAl = new LanguageEnum("sq-AL");
-            public static readonly LanguageEnum SrRs = new LanguageEnum("sr-RS");
-            public static readonly LanguageEnum SuId = new LanguageEnum("su-ID");
-            public static readonly LanguageEnum SvSe = new LanguageEnum("sv-SE");
-            public static readonly LanguageEnum SwKe = new LanguageEnum("sw-KE");
-            public static readonly LanguageEnum SwTz = new LanguageEnum("sw-TZ");
-            public static readonly LanguageEnum TaIn = new LanguageEnum("ta-IN");
-            public static readonly LanguageEnum TaLk = new LanguageEnum("ta-LK");
-            public static readonly LanguageEnum TaMy = new LanguageEnum("ta-MY");
-            public static readonly LanguageEnum TaSg = new LanguageEnum("ta-SG");
-            public static readonly LanguageEnum TeIn = new LanguageEnum("te-IN");
-            public static readonly LanguageEnum ThTh = new LanguageEnum("th-TH");
-            public static readonly LanguageEnum TrTr = new LanguageEnum("tr-TR");
-            public static readonly LanguageEnum UkUa = new LanguageEnum("uk-UA");
-            public static readonly LanguageEnum UrIn = new LanguageEnum("ur-IN");
-            public static readonly LanguageEnum UrPk = new LanguageEnum("ur-PK");
-            public static readonly LanguageEnum UzUz = new LanguageEnum("uz-UZ");
-            public static readonly LanguageEnum ViVn = new LanguageEnum("vi-VN");
-            public static readonly LanguageEnum YueHantHk = new LanguageEnum("yue-Hant-HK");
-            public static readonly LanguageEnum Zh = new LanguageEnum("zh");
-            public static readonly LanguageEnum CmnHansCn = new LanguageEnum("cmn-Hans-CN");
-            public static readonly LanguageEnum ZhTw = new LanguageEnum("zh-TW");
-            public static readonly LanguageEnum CmnHantTw = new LanguageEnum("cmn-Hant-TW");
-            public static readonly LanguageEnum ZuZa = new LanguageEnum("zu-ZA");
-        }
-
-        public sealed class SpeechModelEnum : StringEnum
-        {
-            private SpeechModelEnum(string value) : base(value) {}
-            public SpeechModelEnum() {}
-            public static implicit operator SpeechModelEnum(string value)
-            {
-                return new SpeechModelEnum(value);
-            }
-
-            public static readonly SpeechModelEnum Default = new SpeechModelEnum("default");
-            public static readonly SpeechModelEnum NumbersAndCommands = new SpeechModelEnum("numbers_and_commands");
-            public static readonly SpeechModelEnum PhoneCall = new SpeechModelEnum("phone_call");
-        }
-
-        /// <summary>
-        /// Input type Twilio should accept
-        /// </summary>
-        public List<Gather.InputEnum> Input { get; set; }
-        /// <summary>
-        /// Action URL
-        /// </summary>
-        public Uri Action { get; set; }
-        /// <summary>
-        /// Action URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-        /// <summary>
-        /// Time to wait to gather input
-        /// </summary>
-        public int? Timeout { get; set; }
-        /// <summary>
-        /// Time to wait to gather speech input and it should be either auto or a positive integer.
-        /// </summary>
-        public string SpeechTimeout { get; set; }
-        /// <summary>
-        /// Max allowed time for speech input
-        /// </summary>
-        public int? MaxSpeechTime { get; set; }
-        /// <summary>
-        /// Profanity Filter on speech
-        /// </summary>
-        public bool? ProfanityFilter { get; set; }
-        /// <summary>
-        /// Finish gather on key
-        /// </summary>
-        public string FinishOnKey { get; set; }
-        /// <summary>
-        /// Number of digits to collect
-        /// </summary>
-        public int? NumDigits { get; set; }
-        /// <summary>
-        /// Partial result callback URL
-        /// </summary>
-        public Uri PartialResultCallback { get; set; }
-        /// <summary>
-        /// Partial result callback URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod PartialResultCallbackMethod { get; set; }
-        /// <summary>
-        /// Language to use
-        /// </summary>
-        public Gather.LanguageEnum Language { get; set; }
-        /// <summary>
-        /// Speech recognition hints
-        /// </summary>
-        public string Hints { get; set; }
-        /// <summary>
-        /// Stop playing media upon speech
-        /// </summary>
-        public bool? BargeIn { get; set; }
-        /// <summary>
-        /// Allow debug for gather
-        /// </summary>
-        public bool? Debug { get; set; }
-        /// <summary>
-        /// Force webhook to the action URL event if there is no input
-        /// </summary>
-        public bool? ActionOnEmptyResult { get; set; }
-        /// <summary>
-        /// Specify the model that is best suited for your use case
-        /// </summary>
-        public Gather.SpeechModelEnum SpeechModel { get; set; }
-        /// <summary>
-        /// Use enhanced speech model
-        /// </summary>
-        public bool? Enhanced { get; set; }
-
-        /// <summary>
-        /// Create a new Gather
-        /// </summary>
-        /// <param name="input"> Input type Twilio should accept </param>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="timeout"> Time to wait to gather input </param>
-        /// <param name="speechTimeout"> Time to wait to gather speech input and it should be either auto or a positive
-        ///                     integer. </param>
-        /// <param name="maxSpeechTime"> Max allowed time for speech input </param>
-        /// <param name="profanityFilter"> Profanity Filter on speech </param>
-        /// <param name="finishOnKey"> Finish gather on key </param>
-        /// <param name="numDigits"> Number of digits to collect </param>
-        /// <param name="partialResultCallback"> Partial result callback URL </param>
-        /// <param name="partialResultCallbackMethod"> Partial result callback URL method </param>
-        /// <param name="language"> Language to use </param>
-        /// <param name="hints"> Speech recognition hints </param>
-        /// <param name="bargeIn"> Stop playing media upon speech </param>
-        /// <param name="debug"> Allow debug for gather </param>
-        /// <param name="actionOnEmptyResult"> Force webhook to the action URL event if there is no input </param>
-        /// <param name="speechModel"> Specify the model that is best suited for your use case </param>
-        /// <param name="enhanced"> Use enhanced speech model </param>
-        public Gather(List<Gather.InputEnum> input = null,
-                      Uri action = null,
-                      Twilio.Http.HttpMethod method = null,
-                      int? timeout = null,
-                      string speechTimeout = null,
-                      int? maxSpeechTime = null,
-                      bool? profanityFilter = null,
-                      string finishOnKey = null,
-                      int? numDigits = null,
-                      Uri partialResultCallback = null,
-                      Twilio.Http.HttpMethod partialResultCallbackMethod = null,
-                      Gather.LanguageEnum language = null,
-                      string hints = null,
-                      bool? bargeIn = null,
-                      bool? debug = null,
-                      bool? actionOnEmptyResult = null,
-                      Gather.SpeechModelEnum speechModel = null,
-                      bool? enhanced = null) : base("Gather")
-        {
-            this.Input = input;
-            this.Action = action;
-            this.Method = method;
-            this.Timeout = timeout;
-            this.SpeechTimeout = speechTimeout;
-            this.MaxSpeechTime = maxSpeechTime;
-            this.ProfanityFilter = profanityFilter;
-            this.FinishOnKey = finishOnKey;
-            this.NumDigits = numDigits;
-            this.PartialResultCallback = partialResultCallback;
-            this.PartialResultCallbackMethod = partialResultCallbackMethod;
-            this.Language = language;
-            this.Hints = hints;
-            this.BargeIn = bargeIn;
-            this.Debug = debug;
-            this.ActionOnEmptyResult = actionOnEmptyResult;
-            this.SpeechModel = speechModel;
-            this.Enhanced = enhanced;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Input != null)
-            {
-                attributes.Add(new XAttribute("input", String.Join(" ", this.Input.Select(e => e.ToString()).ToArray())));
-            }
-            if (this.Action != null)
-            {
-                attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            if (this.Timeout != null)
-            {
-                attributes.Add(new XAttribute("timeout", this.Timeout.ToString()));
-            }
-            if (this.SpeechTimeout != null)
-            {
-                attributes.Add(new XAttribute("speechTimeout", this.SpeechTimeout));
-            }
-            if (this.MaxSpeechTime != null)
-            {
-                attributes.Add(new XAttribute("maxSpeechTime", this.MaxSpeechTime.ToString()));
-            }
-            if (this.ProfanityFilter != null)
-            {
-                attributes.Add(new XAttribute("profanityFilter", this.ProfanityFilter.Value.ToString().ToLower()));
-            }
-            if (this.FinishOnKey != null)
-            {
-                attributes.Add(new XAttribute("finishOnKey", this.FinishOnKey));
-            }
-            if (this.NumDigits != null)
-            {
-                attributes.Add(new XAttribute("numDigits", this.NumDigits.ToString()));
-            }
-            if (this.PartialResultCallback != null)
-            {
-                attributes.Add(new XAttribute("partialResultCallback", Serializers.Url(this.PartialResultCallback)));
-            }
-            if (this.PartialResultCallbackMethod != null)
-            {
-                attributes.Add(new XAttribute("partialResultCallbackMethod", this.PartialResultCallbackMethod.ToString()));
-            }
-            if (this.Language != null)
-            {
-                attributes.Add(new XAttribute("language", this.Language.ToString()));
-            }
-            if (this.Hints != null)
-            {
-                attributes.Add(new XAttribute("hints", this.Hints));
-            }
-            if (this.BargeIn != null)
-            {
-                attributes.Add(new XAttribute("bargeIn", this.BargeIn.Value.ToString().ToLower()));
-            }
-            if (this.Debug != null)
-            {
-                attributes.Add(new XAttribute("debug", this.Debug.Value.ToString().ToLower()));
-            }
-            if (this.ActionOnEmptyResult != null)
-            {
-                attributes.Add(new XAttribute("actionOnEmptyResult", this.ActionOnEmptyResult.Value.ToString().ToLower()));
-            }
-            if (this.SpeechModel != null)
-            {
-                attributes.Add(new XAttribute("speechModel", this.SpeechModel.ToString()));
-            }
-            if (this.Enhanced != null)
-            {
-                attributes.Add(new XAttribute("enhanced", this.Enhanced.Value.ToString().ToLower()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Say/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="message"> Message to say, the body of the TwiML Element. </param>
-        /// <param name="voice"> Voice to use </param>
-        /// <param name="loop"> Times to loop message </param>
-        /// <param name="language"> Message langauge </param>
-        public Gather Say(string message = null,
-                          Say.VoiceEnum voice = null,
-                          int? loop = null,
-                          Say.LanguageEnum language = null)
-        {
-            var newChild = new Say(message, voice, loop, language);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Say/> element as a child of this element
-        /// </summary>
-        /// <param name="say"> A Say instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Gather Say(Say say)
-        {
-            this.Append(say);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Pause/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="length"> Length in seconds to pause </param>
-        public Gather Pause(int? length = null)
-        {
-            var newChild = new Pause(length);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Pause/> element as a child of this element
-        /// </summary>
-        /// <param name="pause"> A Pause instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Gather Pause(Pause pause)
-        {
-            this.Append(pause);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Play/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="url"> Media URL, the body of the TwiML Element. </param>
-        /// <param name="loop"> Times to loop media </param>
-        /// <param name="digits"> Play DTMF tones for digits </param>
-        public Gather Play(Uri url = null, int? loop = null, string digits = null)
-        {
-            var newChild = new Play(url, loop, digits);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Play/> element as a child of this element
-        /// </summary>
-        /// <param name="play"> A Play instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Gather Play(Play play)
-        {
-            this.Append(play);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Gather Append(TwiML childElem)
-        {
-            return (Gather) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Gather SetOption(string key, object value)
-        {
-            return (Gather) base.SetOption(key, value);
-        }
-    }
+    public List<Gather.InputEnum> Input { get; set; }
+    /// <summary>
+    /// Action URL
+    /// </summary>
+    public Uri Action { get; set; }
+    /// <summary>
+    /// Action URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+    /// <summary>
+    /// Time to wait to gather input
+    /// </summary>
+    public int? Timeout { get; set; }
+    /// <summary>
+    /// Time to wait to gather speech input and it should be either auto or a positive integer.
+    /// </summary>
+    public string SpeechTimeout { get; set; }
+    /// <summary>
+    /// Max allowed time for speech input
+    /// </summary>
+    public int? MaxSpeechTime { get; set; }
+    /// <summary>
+    /// Profanity Filter on speech
+    /// </summary>
+    public bool? ProfanityFilter { get; set; }
+    /// <summary>
+    /// Finish gather on key
+    /// </summary>
+    public string FinishOnKey { get; set; }
+    /// <summary>
+    /// Number of digits to collect
+    /// </summary>
+    public int? NumDigits { get; set; }
+    /// <summary>
+    /// Partial result callback URL
+    /// </summary>
+    public Uri PartialResultCallback { get; set; }
+    /// <summary>
+    /// Partial result callback URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod PartialResultCallbackMethod { get; set; }
+    /// <summary>
+    /// Language to use
+    /// </summary>
+    public Gather.LanguageEnum Language { get; set; }
+    /// <summary>
+    /// Speech recognition hints
+    /// </summary>
+    public string Hints { get; set; }
+    /// <summary>
+    /// Stop playing media upon speech
+    /// </summary>
+    public bool? BargeIn { get; set; }
+    /// <summary>
+    /// Allow debug for gather
+    /// </summary>
+    public bool? Debug { get; set; }
+    /// <summary>
+    /// Force webhook to the action URL event if there is no input
+    /// </summary>
+    public bool? ActionOnEmptyResult { get; set; }
+    /// <summary>
+    /// Specify the model that is best suited for your use case
+    /// </summary>
+    public Gather.SpeechModelEnum SpeechModel { get; set; }
+    /// <summary>
+    /// Use enhanced speech model
+    /// </summary>
+    public bool? Enhanced { get; set; }
+
+    /// <summary>
+    /// Create a new Gather
+    /// </summary>
+    /// <param name="input"> Input type Twilio should accept </param>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="timeout"> Time to wait to gather input </param>
+    /// <param name="speechTimeout"> Time to wait to gather speech input and it should be either auto or a positive
+    ///                     integer. </param>
+    /// <param name="maxSpeechTime"> Max allowed time for speech input </param>
+    /// <param name="profanityFilter"> Profanity Filter on speech </param>
+    /// <param name="finishOnKey"> Finish gather on key </param>
+    /// <param name="numDigits"> Number of digits to collect </param>
+    /// <param name="partialResultCallback"> Partial result callback URL </param>
+    /// <param name="partialResultCallbackMethod"> Partial result callback URL method </param>
+    /// <param name="language"> Language to use </param>
+    /// <param name="hints"> Speech recognition hints </param>
+    /// <param name="bargeIn"> Stop playing media upon speech </param>
+    /// <param name="debug"> Allow debug for gather </param>
+    /// <param name="actionOnEmptyResult"> Force webhook to the action URL event if there is no input </param>
+    /// <param name="speechModel"> Specify the model that is best suited for your use case </param>
+    /// <param name="enhanced"> Use enhanced speech model </param>
+    public Gather(List<Gather.InputEnum> input = null,
+                  Uri action = null,
+                  Twilio.Http.HttpMethod method = null,
+                  int? timeout = null,
+                  string speechTimeout = null,
+                  int? maxSpeechTime = null,
+                  bool? profanityFilter = null,
+                  string finishOnKey = null,
+                  int? numDigits = null,
+                  Uri partialResultCallback = null,
+                  Twilio.Http.HttpMethod partialResultCallbackMethod = null,
+                  Gather.LanguageEnum language = null,
+                  string hints = null,
+                  bool? bargeIn = null,
+                  bool? debug = null,
+                  bool? actionOnEmptyResult = null,
+                  Gather.SpeechModelEnum speechModel = null,
+                  bool? enhanced = null) : base("Gather")
+    {
+      this.Input = input;
+      this.Action = action;
+      this.Method = method;
+      this.Timeout = timeout;
+      this.SpeechTimeout = speechTimeout;
+      this.MaxSpeechTime = maxSpeechTime;
+      this.ProfanityFilter = profanityFilter;
+      this.FinishOnKey = finishOnKey;
+      this.NumDigits = numDigits;
+      this.PartialResultCallback = partialResultCallback;
+      this.PartialResultCallbackMethod = partialResultCallbackMethod;
+      this.Language = language;
+      this.Hints = hints;
+      this.BargeIn = bargeIn;
+      this.Debug = debug;
+      this.ActionOnEmptyResult = actionOnEmptyResult;
+      this.SpeechModel = speechModel;
+      this.Enhanced = enhanced;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Input != null)
+      {
+        attributes.Add(new XAttribute("input", String.Join(" ", this.Input.Select(e => e.ToString()).ToArray())));
+      }
+      if (this.Action != null)
+      {
+        attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      if (this.Timeout != null)
+      {
+        attributes.Add(new XAttribute("timeout", this.Timeout.ToString()));
+      }
+      if (this.SpeechTimeout != null)
+      {
+        attributes.Add(new XAttribute("speechTimeout", this.SpeechTimeout));
+      }
+      if (this.MaxSpeechTime != null)
+      {
+        attributes.Add(new XAttribute("maxSpeechTime", this.MaxSpeechTime.ToString()));
+      }
+      if (this.ProfanityFilter != null)
+      {
+        attributes.Add(new XAttribute("profanityFilter", this.ProfanityFilter.Value.ToString().ToLower()));
+      }
+      if (this.FinishOnKey != null)
+      {
+        attributes.Add(new XAttribute("finishOnKey", this.FinishOnKey));
+      }
+      if (this.NumDigits != null)
+      {
+        attributes.Add(new XAttribute("numDigits", this.NumDigits.ToString()));
+      }
+      if (this.PartialResultCallback != null)
+      {
+        attributes.Add(new XAttribute("partialResultCallback", Serializers.Url(this.PartialResultCallback)));
+      }
+      if (this.PartialResultCallbackMethod != null)
+      {
+        attributes.Add(new XAttribute("partialResultCallbackMethod", this.PartialResultCallbackMethod.ToString()));
+      }
+      if (this.Language != null)
+      {
+        attributes.Add(new XAttribute("language", this.Language.ToString()));
+      }
+      if (this.Hints != null)
+      {
+        attributes.Add(new XAttribute("hints", this.Hints));
+      }
+      if (this.BargeIn != null)
+      {
+        attributes.Add(new XAttribute("bargeIn", this.BargeIn.Value.ToString().ToLower()));
+      }
+      if (this.Debug != null)
+      {
+        attributes.Add(new XAttribute("debug", this.Debug.Value.ToString().ToLower()));
+      }
+      if (this.ActionOnEmptyResult != null)
+      {
+        attributes.Add(new XAttribute("actionOnEmptyResult", this.ActionOnEmptyResult.Value.ToString().ToLower()));
+      }
+      if (this.SpeechModel != null)
+      {
+        attributes.Add(new XAttribute("speechModel", this.SpeechModel.ToString()));
+      }
+      if (this.Enhanced != null)
+      {
+        attributes.Add(new XAttribute("enhanced", this.Enhanced.Value.ToString().ToLower()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Say/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="message"> Message to say, the body of the TwiML Element. </param>
+    /// <param name="voice"> Voice to use </param>
+    /// <param name="loop"> Times to loop message </param>
+    /// <param name="language"> Message langauge </param>
+    public Gather Say(string message = null,
+                      Say.VoiceEnum voice = null,
+                      int? loop = null,
+                      Say.LanguageEnum language = null)
+    {
+      var newChild = new Say(message, voice, loop, language);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Say/> element as a child of this element
+    /// </summary>
+    /// <param name="say"> A Say instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Gather Say(Say say)
+    {
+      this.Append(say);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Pause/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="length"> Length in seconds to pause </param>
+    public Gather Pause(int? length = null)
+    {
+      var newChild = new Pause(length);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Pause/> element as a child of this element
+    /// </summary>
+    /// <param name="pause"> A Pause instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Gather Pause(Pause pause)
+    {
+      this.Append(pause);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Play/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="url"> Media URL, the body of the TwiML Element. </param>
+    /// <param name="loop"> Times to loop media </param>
+    /// <param name="digits"> Play DTMF tones for digits </param>
+    public Gather Play(Uri url = null, int? loop = null, string digits = null)
+    {
+      var newChild = new Play(url, loop, digits);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Play/> element as a child of this element
+    /// </summary>
+    /// <param name="play"> A Play instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Gather Play(Play play)
+    {
+      this.Append(play);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Gather Append(TwiML childElem)
+    {
+      return (Gather)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Gather SetOption(string key, object value)
+    {
+      return (Gather)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Hangup.cs b/src/Twilio/TwiML/Voice/Hangup.cs
index b3c6e8fd2..4b52f84ce 100644
--- a/src/Twilio/TwiML/Voice/Hangup.cs
+++ b/src/Twilio/TwiML/Voice/Hangup.cs
@@ -8,38 +8,38 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Hangup TwiML Verb
+  /// </summary>
+  public class Hangup : TwiML
+  {
     /// <summary>
-    /// Hangup TwiML Verb
+    /// Create a new Hangup
     /// </summary>
-    public class Hangup : TwiML
-    {
-        /// <summary>
-        /// Create a new Hangup
-        /// </summary>
-        public Hangup() : base("Hangup")
-        {
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Hangup Append(TwiML childElem)
-        {
-            return (Hangup) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Hangup SetOption(string key, object value)
-        {
-            return (Hangup) base.SetOption(key, value);
-        }
-    }
+    public Hangup() : base("Hangup")
+    {
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Hangup Append(TwiML childElem)
+    {
+      return (Hangup)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Hangup SetOption(string key, object value)
+    {
+      return (Hangup)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Identity.cs b/src/Twilio/TwiML/Voice/Identity.cs
index 063328535..ba70c1643 100644
--- a/src/Twilio/TwiML/Voice/Identity.cs
+++ b/src/Twilio/TwiML/Voice/Identity.cs
@@ -8,53 +8,53 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Identity TwiML Noun
+  /// </summary>
+  public class Identity : TwiML
+  {
     /// <summary>
-    /// Identity TwiML Noun
+    /// Identity of the client to dial
     /// </summary>
-    public class Identity : TwiML
-    {
-        /// <summary>
-        /// Identity of the client to dial
-        /// </summary>
-        public string ClientIdentity { get; set; }
-
-        /// <summary>
-        /// Create a new Identity
-        /// </summary>
-        /// <param name="clientIdentity"> Identity of the client to dial, the body of the TwiML Element. </param>
-        public Identity(string clientIdentity = null) : base("Identity")
-        {
-            this.ClientIdentity = clientIdentity;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.ClientIdentity != null ? this.ClientIdentity : string.Empty;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Identity Append(TwiML childElem)
-        {
-            return (Identity) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Identity SetOption(string key, object value)
-        {
-            return (Identity) base.SetOption(key, value);
-        }
-    }
+    public string ClientIdentity { get; set; }
+
+    /// <summary>
+    /// Create a new Identity
+    /// </summary>
+    /// <param name="clientIdentity"> Identity of the client to dial, the body of the TwiML Element. </param>
+    public Identity(string clientIdentity = null) : base("Identity")
+    {
+      this.ClientIdentity = clientIdentity;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.ClientIdentity != null ? this.ClientIdentity : string.Empty;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Identity Append(TwiML childElem)
+    {
+      return (Identity)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Identity SetOption(string key, object value)
+    {
+      return (Identity)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Leave.cs b/src/Twilio/TwiML/Voice/Leave.cs
index 39690d168..b53ff7ff4 100644
--- a/src/Twilio/TwiML/Voice/Leave.cs
+++ b/src/Twilio/TwiML/Voice/Leave.cs
@@ -8,38 +8,38 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Leave TwiML Verb
+  /// </summary>
+  public class Leave : TwiML
+  {
     /// <summary>
-    /// Leave TwiML Verb
+    /// Create a new Leave
     /// </summary>
-    public class Leave : TwiML
-    {
-        /// <summary>
-        /// Create a new Leave
-        /// </summary>
-        public Leave() : base("Leave")
-        {
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Leave Append(TwiML childElem)
-        {
-            return (Leave) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Leave SetOption(string key, object value)
-        {
-            return (Leave) base.SetOption(key, value);
-        }
-    }
+    public Leave() : base("Leave")
+    {
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Leave Append(TwiML childElem)
+    {
+      return (Leave)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Leave SetOption(string key, object value)
+    {
+      return (Leave)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Number.cs b/src/Twilio/TwiML/Voice/Number.cs
index 3e128bec0..88886b9b4 100644
--- a/src/Twilio/TwiML/Voice/Number.cs
+++ b/src/Twilio/TwiML/Voice/Number.cs
@@ -13,154 +13,154 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Number TwiML Noun
+  /// </summary>
+  public class Number : TwiML
+  {
+    public sealed class EventEnum : StringEnum
+    {
+      private EventEnum(string value) : base(value) { }
+      public EventEnum() { }
+      public static implicit operator EventEnum(string value)
+      {
+        return new EventEnum(value);
+      }
+
+      public static readonly EventEnum Initiated = new EventEnum("initiated");
+      public static readonly EventEnum Ringing = new EventEnum("ringing");
+      public static readonly EventEnum Answered = new EventEnum("answered");
+      public static readonly EventEnum Completed = new EventEnum("completed");
+    }
+
     /// <summary>
-    /// Number TwiML Noun
+    /// Phone Number to dial
     /// </summary>
-    public class Number : TwiML
-    {
-        public sealed class EventEnum : StringEnum
-        {
-            private EventEnum(string value) : base(value) {}
-            public EventEnum() {}
-            public static implicit operator EventEnum(string value)
-            {
-                return new EventEnum(value);
-            }
-
-            public static readonly EventEnum Initiated = new EventEnum("initiated");
-            public static readonly EventEnum Ringing = new EventEnum("ringing");
-            public static readonly EventEnum Answered = new EventEnum("answered");
-            public static readonly EventEnum Completed = new EventEnum("completed");
-        }
-
-        /// <summary>
-        /// Phone Number to dial
-        /// </summary>
-        public Types.PhoneNumber PhoneNumber { get; set; }
-        /// <summary>
-        /// DTMF tones to play when the call is answered
-        /// </summary>
-        public string SendDigits { get; set; }
-        /// <summary>
-        /// TwiML URL
-        /// </summary>
-        public Uri Url { get; set; }
-        /// <summary>
-        /// TwiML URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-        /// <summary>
-        /// Events to call status callback
-        /// </summary>
-        public List<Number.EventEnum> StatusCallbackEvent { get; set; }
-        /// <summary>
-        /// Status callback URL
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// Status callback URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// BYOC trunk SID (Beta)
-        /// </summary>
-        public string Byoc { get; set; }
-
-        /// <summary>
-        /// Create a new Number
-        /// </summary>
-        /// <param name="phoneNumber"> Phone Number to dial, the body of the TwiML Element. </param>
-        /// <param name="sendDigits"> DTMF tones to play when the call is answered </param>
-        /// <param name="url"> TwiML URL </param>
-        /// <param name="method"> TwiML URL method </param>
-        /// <param name="statusCallbackEvent"> Events to call status callback </param>
-        /// <param name="statusCallback"> Status callback URL </param>
-        /// <param name="statusCallbackMethod"> Status callback URL method </param>
-        /// <param name="byoc"> BYOC trunk SID (Beta) </param>
-        public Number(Types.PhoneNumber phoneNumber = null,
-                      string sendDigits = null,
-                      Uri url = null,
-                      Twilio.Http.HttpMethod method = null,
-                      List<Number.EventEnum> statusCallbackEvent = null,
-                      Uri statusCallback = null,
-                      Twilio.Http.HttpMethod statusCallbackMethod = null,
-                      string byoc = null) : base("Number")
-        {
-            this.PhoneNumber = phoneNumber;
-            this.SendDigits = sendDigits;
-            this.Url = url;
-            this.Method = method;
-            this.StatusCallbackEvent = statusCallbackEvent;
-            this.StatusCallback = statusCallback;
-            this.StatusCallbackMethod = statusCallbackMethod;
-            this.Byoc = byoc;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.PhoneNumber != null ? this.PhoneNumber.ToString() : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.SendDigits != null)
-            {
-                attributes.Add(new XAttribute("sendDigits", this.SendDigits));
-            }
-            if (this.Url != null)
-            {
-                attributes.Add(new XAttribute("url", Serializers.Url(this.Url)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            if (this.StatusCallbackEvent != null)
-            {
-                attributes.Add(new XAttribute("statusCallbackEvent", String.Join(" ", this.StatusCallbackEvent.Select(e => e.ToString()).ToArray())));
-            }
-            if (this.StatusCallback != null)
-            {
-                attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
-            }
-            if (this.StatusCallbackMethod != null)
-            {
-                attributes.Add(new XAttribute("statusCallbackMethod", this.StatusCallbackMethod.ToString()));
-            }
-            if (this.Byoc != null)
-            {
-                attributes.Add(new XAttribute("byoc", this.Byoc.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Number Append(TwiML childElem)
-        {
-            return (Number) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Number SetOption(string key, object value)
-        {
-            return (Number) base.SetOption(key, value);
-        }
-    }
+    public Types.PhoneNumber PhoneNumber { get; set; }
+    /// <summary>
+    /// DTMF tones to play when the call is answered
+    /// </summary>
+    public string SendDigits { get; set; }
+    /// <summary>
+    /// TwiML URL
+    /// </summary>
+    public Uri Url { get; set; }
+    /// <summary>
+    /// TwiML URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+    /// <summary>
+    /// Events to call status callback
+    /// </summary>
+    public List<Number.EventEnum> StatusCallbackEvent { get; set; }
+    /// <summary>
+    /// Status callback URL
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// Status callback URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// BYOC trunk SID (Beta)
+    /// </summary>
+    public string Byoc { get; set; }
+
+    /// <summary>
+    /// Create a new Number
+    /// </summary>
+    /// <param name="phoneNumber"> Phone Number to dial, the body of the TwiML Element. </param>
+    /// <param name="sendDigits"> DTMF tones to play when the call is answered </param>
+    /// <param name="url"> TwiML URL </param>
+    /// <param name="method"> TwiML URL method </param>
+    /// <param name="statusCallbackEvent"> Events to call status callback </param>
+    /// <param name="statusCallback"> Status callback URL </param>
+    /// <param name="statusCallbackMethod"> Status callback URL method </param>
+    /// <param name="byoc"> BYOC trunk SID (Beta) </param>
+    public Number(Types.PhoneNumber phoneNumber = null,
+                  string sendDigits = null,
+                  Uri url = null,
+                  Twilio.Http.HttpMethod method = null,
+                  List<Number.EventEnum> statusCallbackEvent = null,
+                  Uri statusCallback = null,
+                  Twilio.Http.HttpMethod statusCallbackMethod = null,
+                  string byoc = null) : base("Number")
+    {
+      this.PhoneNumber = phoneNumber;
+      this.SendDigits = sendDigits;
+      this.Url = url;
+      this.Method = method;
+      this.StatusCallbackEvent = statusCallbackEvent;
+      this.StatusCallback = statusCallback;
+      this.StatusCallbackMethod = statusCallbackMethod;
+      this.Byoc = byoc;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.PhoneNumber != null ? this.PhoneNumber.ToString() : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.SendDigits != null)
+      {
+        attributes.Add(new XAttribute("sendDigits", this.SendDigits));
+      }
+      if (this.Url != null)
+      {
+        attributes.Add(new XAttribute("url", Serializers.Url(this.Url)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      if (this.StatusCallbackEvent != null)
+      {
+        attributes.Add(new XAttribute("statusCallbackEvent", String.Join(" ", this.StatusCallbackEvent.Select(e => e.ToString()).ToArray())));
+      }
+      if (this.StatusCallback != null)
+      {
+        attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
+      }
+      if (this.StatusCallbackMethod != null)
+      {
+        attributes.Add(new XAttribute("statusCallbackMethod", this.StatusCallbackMethod.ToString()));
+      }
+      if (this.Byoc != null)
+      {
+        attributes.Add(new XAttribute("byoc", this.Byoc.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Number Append(TwiML childElem)
+    {
+      return (Number)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Number SetOption(string key, object value)
+    {
+      return (Number)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Parameter.cs b/src/Twilio/TwiML/Voice/Parameter.cs
index 4e09c9188..aa2a3cc61 100644
--- a/src/Twilio/TwiML/Voice/Parameter.cs
+++ b/src/Twilio/TwiML/Voice/Parameter.cs
@@ -9,68 +9,68 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Parameter TwiML Noun
+  /// </summary>
+  public class Parameter : TwiML
+  {
     /// <summary>
-    /// Parameter TwiML Noun
+    /// The name of the custom parameter
     /// </summary>
-    public class Parameter : TwiML
-    {
-        /// <summary>
-        /// The name of the custom parameter
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// The value of the custom parameter
-        /// </summary>
-        public string Value { get; set; }
-
-        /// <summary>
-        /// Create a new Parameter
-        /// </summary>
-        /// <param name="name"> The name of the custom parameter </param>
-        /// <param name="value"> The value of the custom parameter </param>
-        public Parameter(string name = null, string value = null) : base("Parameter")
-        {
-            this.Name = name;
-            this.Value = value;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Name != null)
-            {
-                attributes.Add(new XAttribute("name", this.Name));
-            }
-            if (this.Value != null)
-            {
-                attributes.Add(new XAttribute("value", this.Value));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Parameter Append(TwiML childElem)
-        {
-            return (Parameter) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Parameter SetOption(string key, object value)
-        {
-            return (Parameter) base.SetOption(key, value);
-        }
-    }
+    public string Name { get; set; }
+    /// <summary>
+    /// The value of the custom parameter
+    /// </summary>
+    public string Value { get; set; }
+
+    /// <summary>
+    /// Create a new Parameter
+    /// </summary>
+    /// <param name="name"> The name of the custom parameter </param>
+    /// <param name="value"> The value of the custom parameter </param>
+    public Parameter(string name = null, string value = null) : base("Parameter")
+    {
+      this.Name = name;
+      this.Value = value;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Name != null)
+      {
+        attributes.Add(new XAttribute("name", this.Name));
+      }
+      if (this.Value != null)
+      {
+        attributes.Add(new XAttribute("value", this.Value));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Parameter Append(TwiML childElem)
+    {
+      return (Parameter)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Parameter SetOption(string key, object value)
+    {
+      return (Parameter)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Pause.cs b/src/Twilio/TwiML/Voice/Pause.cs
index b48553de1..b33561ef4 100644
--- a/src/Twilio/TwiML/Voice/Pause.cs
+++ b/src/Twilio/TwiML/Voice/Pause.cs
@@ -9,58 +9,58 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Pause TwiML Verb
+  /// </summary>
+  public class Pause : TwiML
+  {
     /// <summary>
-    /// Pause TwiML Verb
+    /// Length in seconds to pause
     /// </summary>
-    public class Pause : TwiML
-    {
-        /// <summary>
-        /// Length in seconds to pause
-        /// </summary>
-        public int? Length { get; set; }
-
-        /// <summary>
-        /// Create a new Pause
-        /// </summary>
-        /// <param name="length"> Length in seconds to pause </param>
-        public Pause(int? length = null) : base("Pause")
-        {
-            this.Length = length;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Length != null)
-            {
-                attributes.Add(new XAttribute("length", this.Length.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Pause Append(TwiML childElem)
-        {
-            return (Pause) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Pause SetOption(string key, object value)
-        {
-            return (Pause) base.SetOption(key, value);
-        }
-    }
+    public int? Length { get; set; }
+
+    /// <summary>
+    /// Create a new Pause
+    /// </summary>
+    /// <param name="length"> Length in seconds to pause </param>
+    public Pause(int? length = null) : base("Pause")
+    {
+      this.Length = length;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Length != null)
+      {
+        attributes.Add(new XAttribute("length", this.Length.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Pause Append(TwiML childElem)
+    {
+      return (Pause)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Pause SetOption(string key, object value)
+    {
+      return (Pause)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Pay.cs b/src/Twilio/TwiML/Voice/Pay.cs
index 534aa70b9..82e69f05a 100644
--- a/src/Twilio/TwiML/Voice/Pay.cs
+++ b/src/Twilio/TwiML/Voice/Pay.cs
@@ -13,410 +13,410 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Pay Twiml Verb
+  /// </summary>
+  public class Pay : TwiML
+  {
+    public sealed class InputEnum : StringEnum
+    {
+      private InputEnum(string value) : base(value) { }
+      public InputEnum() { }
+      public static implicit operator InputEnum(string value)
+      {
+        return new InputEnum(value);
+      }
+
+      public static readonly InputEnum Dtmf = new InputEnum("dtmf");
+    }
+
+    public sealed class StatusCallbackMethodEnum : StringEnum
+    {
+      private StatusCallbackMethodEnum(string value) : base(value) { }
+      public StatusCallbackMethodEnum() { }
+      public static implicit operator StatusCallbackMethodEnum(string value)
+      {
+        return new StatusCallbackMethodEnum(value);
+      }
+
+      public static readonly StatusCallbackMethodEnum Get = new StatusCallbackMethodEnum("GET");
+      public static readonly StatusCallbackMethodEnum Post = new StatusCallbackMethodEnum("POST");
+    }
+
+    public sealed class TokenTypeEnum : StringEnum
+    {
+      private TokenTypeEnum(string value) : base(value) { }
+      public TokenTypeEnum() { }
+      public static implicit operator TokenTypeEnum(string value)
+      {
+        return new TokenTypeEnum(value);
+      }
+
+      public static readonly TokenTypeEnum OneTime = new TokenTypeEnum("one-time");
+      public static readonly TokenTypeEnum Reusable = new TokenTypeEnum("reusable");
+    }
+
+    public sealed class ValidCardTypesEnum : StringEnum
+    {
+      private ValidCardTypesEnum(string value) : base(value) { }
+      public ValidCardTypesEnum() { }
+      public static implicit operator ValidCardTypesEnum(string value)
+      {
+        return new ValidCardTypesEnum(value);
+      }
+
+      public static readonly ValidCardTypesEnum Visa = new ValidCardTypesEnum("visa");
+      public static readonly ValidCardTypesEnum Mastercard = new ValidCardTypesEnum("mastercard");
+      public static readonly ValidCardTypesEnum Amex = new ValidCardTypesEnum("amex");
+      public static readonly ValidCardTypesEnum Maestro = new ValidCardTypesEnum("maestro");
+      public static readonly ValidCardTypesEnum Discover = new ValidCardTypesEnum("discover");
+      public static readonly ValidCardTypesEnum Optima = new ValidCardTypesEnum("optima");
+      public static readonly ValidCardTypesEnum Jcb = new ValidCardTypesEnum("jcb");
+      public static readonly ValidCardTypesEnum DinersClub = new ValidCardTypesEnum("diners-club");
+      public static readonly ValidCardTypesEnum Enroute = new ValidCardTypesEnum("enroute");
+    }
+
+    public sealed class LanguageEnum : StringEnum
+    {
+      private LanguageEnum(string value) : base(value) { }
+      public LanguageEnum() { }
+      public static implicit operator LanguageEnum(string value)
+      {
+        return new LanguageEnum(value);
+      }
+
+      public static readonly LanguageEnum DeDe = new LanguageEnum("de-DE");
+      public static readonly LanguageEnum EnAu = new LanguageEnum("en-AU");
+      public static readonly LanguageEnum EnCa = new LanguageEnum("en-CA");
+      public static readonly LanguageEnum EnGb = new LanguageEnum("en-GB");
+      public static readonly LanguageEnum EnIn = new LanguageEnum("en-IN");
+      public static readonly LanguageEnum EnIe = new LanguageEnum("en-IE");
+      public static readonly LanguageEnum EnNz = new LanguageEnum("en-NZ");
+      public static readonly LanguageEnum EnPh = new LanguageEnum("en-PH");
+      public static readonly LanguageEnum EnZa = new LanguageEnum("en-ZA");
+      public static readonly LanguageEnum EnUs = new LanguageEnum("en-US");
+      public static readonly LanguageEnum EsEs = new LanguageEnum("es-ES");
+      public static readonly LanguageEnum EsUs = new LanguageEnum("es-US");
+      public static readonly LanguageEnum FrCa = new LanguageEnum("fr-CA");
+      public static readonly LanguageEnum FrFr = new LanguageEnum("fr-FR");
+      public static readonly LanguageEnum ItIt = new LanguageEnum("it-IT");
+    }
+
+    public sealed class BankAccountTypeEnum : StringEnum
+    {
+      private BankAccountTypeEnum(string value) : base(value) { }
+      public BankAccountTypeEnum() { }
+      public static implicit operator BankAccountTypeEnum(string value)
+      {
+        return new BankAccountTypeEnum(value);
+      }
+
+      public static readonly BankAccountTypeEnum ConsumerChecking = new BankAccountTypeEnum("consumer-checking");
+      public static readonly BankAccountTypeEnum ConsumerSavings = new BankAccountTypeEnum("consumer-savings");
+      public static readonly BankAccountTypeEnum CommercialChecking = new BankAccountTypeEnum("commercial-checking");
+      public static readonly BankAccountTypeEnum CommercialSavings = new BankAccountTypeEnum("commercial-savings");
+    }
+
+    public sealed class PaymentMethodEnum : StringEnum
+    {
+      private PaymentMethodEnum(string value) : base(value) { }
+      public PaymentMethodEnum() { }
+      public static implicit operator PaymentMethodEnum(string value)
+      {
+        return new PaymentMethodEnum(value);
+      }
+
+      public static readonly PaymentMethodEnum AchDebit = new PaymentMethodEnum("ach-debit");
+      public static readonly PaymentMethodEnum CreditCard = new PaymentMethodEnum("credit-card");
+    }
+
     /// <summary>
-    /// Pay Twiml Verb
+    /// Input type Twilio should accept
     /// </summary>
-    public class Pay : TwiML
-    {
-        public sealed class InputEnum : StringEnum
-        {
-            private InputEnum(string value) : base(value) {}
-            public InputEnum() {}
-            public static implicit operator InputEnum(string value)
-            {
-                return new InputEnum(value);
-            }
-
-            public static readonly InputEnum Dtmf = new InputEnum("dtmf");
-        }
-
-        public sealed class StatusCallbackMethodEnum : StringEnum
-        {
-            private StatusCallbackMethodEnum(string value) : base(value) {}
-            public StatusCallbackMethodEnum() {}
-            public static implicit operator StatusCallbackMethodEnum(string value)
-            {
-                return new StatusCallbackMethodEnum(value);
-            }
-
-            public static readonly StatusCallbackMethodEnum Get = new StatusCallbackMethodEnum("GET");
-            public static readonly StatusCallbackMethodEnum Post = new StatusCallbackMethodEnum("POST");
-        }
-
-        public sealed class TokenTypeEnum : StringEnum
-        {
-            private TokenTypeEnum(string value) : base(value) {}
-            public TokenTypeEnum() {}
-            public static implicit operator TokenTypeEnum(string value)
-            {
-                return new TokenTypeEnum(value);
-            }
-
-            public static readonly TokenTypeEnum OneTime = new TokenTypeEnum("one-time");
-            public static readonly TokenTypeEnum Reusable = new TokenTypeEnum("reusable");
-        }
-
-        public sealed class ValidCardTypesEnum : StringEnum
-        {
-            private ValidCardTypesEnum(string value) : base(value) {}
-            public ValidCardTypesEnum() {}
-            public static implicit operator ValidCardTypesEnum(string value)
-            {
-                return new ValidCardTypesEnum(value);
-            }
-
-            public static readonly ValidCardTypesEnum Visa = new ValidCardTypesEnum("visa");
-            public static readonly ValidCardTypesEnum Mastercard = new ValidCardTypesEnum("mastercard");
-            public static readonly ValidCardTypesEnum Amex = new ValidCardTypesEnum("amex");
-            public static readonly ValidCardTypesEnum Maestro = new ValidCardTypesEnum("maestro");
-            public static readonly ValidCardTypesEnum Discover = new ValidCardTypesEnum("discover");
-            public static readonly ValidCardTypesEnum Optima = new ValidCardTypesEnum("optima");
-            public static readonly ValidCardTypesEnum Jcb = new ValidCardTypesEnum("jcb");
-            public static readonly ValidCardTypesEnum DinersClub = new ValidCardTypesEnum("diners-club");
-            public static readonly ValidCardTypesEnum Enroute = new ValidCardTypesEnum("enroute");
-        }
-
-        public sealed class LanguageEnum : StringEnum
-        {
-            private LanguageEnum(string value) : base(value) {}
-            public LanguageEnum() {}
-            public static implicit operator LanguageEnum(string value)
-            {
-                return new LanguageEnum(value);
-            }
-
-            public static readonly LanguageEnum DeDe = new LanguageEnum("de-DE");
-            public static readonly LanguageEnum EnAu = new LanguageEnum("en-AU");
-            public static readonly LanguageEnum EnCa = new LanguageEnum("en-CA");
-            public static readonly LanguageEnum EnGb = new LanguageEnum("en-GB");
-            public static readonly LanguageEnum EnIn = new LanguageEnum("en-IN");
-            public static readonly LanguageEnum EnIe = new LanguageEnum("en-IE");
-            public static readonly LanguageEnum EnNz = new LanguageEnum("en-NZ");
-            public static readonly LanguageEnum EnPh = new LanguageEnum("en-PH");
-            public static readonly LanguageEnum EnZa = new LanguageEnum("en-ZA");
-            public static readonly LanguageEnum EnUs = new LanguageEnum("en-US");
-            public static readonly LanguageEnum EsEs = new LanguageEnum("es-ES");
-            public static readonly LanguageEnum EsUs = new LanguageEnum("es-US");
-            public static readonly LanguageEnum FrCa = new LanguageEnum("fr-CA");
-            public static readonly LanguageEnum FrFr = new LanguageEnum("fr-FR");
-            public static readonly LanguageEnum ItIt = new LanguageEnum("it-IT");
-        }
-
-        public sealed class BankAccountTypeEnum : StringEnum
-        {
-            private BankAccountTypeEnum(string value) : base(value) {}
-            public BankAccountTypeEnum() {}
-            public static implicit operator BankAccountTypeEnum(string value)
-            {
-                return new BankAccountTypeEnum(value);
-            }
-
-            public static readonly BankAccountTypeEnum ConsumerChecking = new BankAccountTypeEnum("consumer-checking");
-            public static readonly BankAccountTypeEnum ConsumerSavings = new BankAccountTypeEnum("consumer-savings");
-            public static readonly BankAccountTypeEnum CommercialChecking = new BankAccountTypeEnum("commercial-checking");
-            public static readonly BankAccountTypeEnum CommercialSavings = new BankAccountTypeEnum("commercial-savings");
-        }
-
-        public sealed class PaymentMethodEnum : StringEnum
-        {
-            private PaymentMethodEnum(string value) : base(value) {}
-            public PaymentMethodEnum() {}
-            public static implicit operator PaymentMethodEnum(string value)
-            {
-                return new PaymentMethodEnum(value);
-            }
-
-            public static readonly PaymentMethodEnum AchDebit = new PaymentMethodEnum("ach-debit");
-            public static readonly PaymentMethodEnum CreditCard = new PaymentMethodEnum("credit-card");
-        }
-
-        /// <summary>
-        /// Input type Twilio should accept
-        /// </summary>
-        public Pay.InputEnum Input { get; set; }
-        /// <summary>
-        /// Action URL
-        /// </summary>
-        public Uri Action { get; set; }
-        /// <summary>
-        /// Bank account type for ach transactions. If set, payment method attribute must be provided and value should be set to ach-debit. defaults to consumer-checking
-        /// </summary>
-        public Pay.BankAccountTypeEnum BankAccountType { get; set; }
-        /// <summary>
-        /// Status callback URL
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// Status callback method
-        /// </summary>
-        public Pay.StatusCallbackMethodEnum StatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Time to wait to gather input
-        /// </summary>
-        public int? Timeout { get; set; }
-        /// <summary>
-        /// Maximum number of allowed retries when gathering input
-        /// </summary>
-        public int? MaxAttempts { get; set; }
-        /// <summary>
-        /// Prompt for security code
-        /// </summary>
-        public bool? SecurityCode { get; set; }
-        /// <summary>
-        /// Prompt for postal code and it should be true/false or default postal code
-        /// </summary>
-        public string PostalCode { get; set; }
-        /// <summary>
-        /// Prompt for minimum postal code length
-        /// </summary>
-        public int? MinPostalCodeLength { get; set; }
-        /// <summary>
-        /// Unique name for payment connector
-        /// </summary>
-        public string PaymentConnector { get; set; }
-        /// <summary>
-        /// Payment method to be used. defaults to credit-card
-        /// </summary>
-        public Pay.PaymentMethodEnum PaymentMethod { get; set; }
-        /// <summary>
-        /// Type of token
-        /// </summary>
-        public Pay.TokenTypeEnum TokenType { get; set; }
-        /// <summary>
-        /// Amount to process. If value is greater than 0 then make the payment else create a payment token
-        /// </summary>
-        public string ChargeAmount { get; set; }
-        /// <summary>
-        /// Currency of the amount attribute
-        /// </summary>
-        public string Currency { get; set; }
-        /// <summary>
-        /// Details regarding the payment
-        /// </summary>
-        public string Description { get; set; }
-        /// <summary>
-        /// Comma separated accepted card types
-        /// </summary>
-        public List<Pay.ValidCardTypesEnum> ValidCardTypes { get; set; }
-        /// <summary>
-        /// Language to use
-        /// </summary>
-        public Pay.LanguageEnum Language { get; set; }
-
-        /// <summary>
-        /// Create a new Pay
-        /// </summary>
-        /// <param name="input"> Input type Twilio should accept </param>
-        /// <param name="action"> Action URL </param>
-        /// <param name="bankAccountType"> Bank account type for ach transactions. If set, payment method attribute must be
-        ///                       provided and value should be set to ach-debit. defaults to consumer-checking </param>
-        /// <param name="statusCallback"> Status callback URL </param>
-        /// <param name="statusCallbackMethod"> Status callback method </param>
-        /// <param name="timeout"> Time to wait to gather input </param>
-        /// <param name="maxAttempts"> Maximum number of allowed retries when gathering input </param>
-        /// <param name="securityCode"> Prompt for security code </param>
-        /// <param name="postalCode"> Prompt for postal code and it should be true/false or default postal code </param>
-        /// <param name="minPostalCodeLength"> Prompt for minimum postal code length </param>
-        /// <param name="paymentConnector"> Unique name for payment connector </param>
-        /// <param name="paymentMethod"> Payment method to be used. defaults to credit-card </param>
-        /// <param name="tokenType"> Type of token </param>
-        /// <param name="chargeAmount"> Amount to process. If value is greater than 0 then make the payment else create a
-        ///                    payment token </param>
-        /// <param name="currency"> Currency of the amount attribute </param>
-        /// <param name="description"> Details regarding the payment </param>
-        /// <param name="validCardTypes"> Comma separated accepted card types </param>
-        /// <param name="language"> Language to use </param>
-        public Pay(Pay.InputEnum input = null,
-                   Uri action = null,
-                   Pay.BankAccountTypeEnum bankAccountType = null,
-                   Uri statusCallback = null,
-                   Pay.StatusCallbackMethodEnum statusCallbackMethod = null,
-                   int? timeout = null,
-                   int? maxAttempts = null,
-                   bool? securityCode = null,
-                   string postalCode = null,
-                   int? minPostalCodeLength = null,
-                   string paymentConnector = null,
-                   Pay.PaymentMethodEnum paymentMethod = null,
-                   Pay.TokenTypeEnum tokenType = null,
-                   string chargeAmount = null,
-                   string currency = null,
-                   string description = null,
-                   List<Pay.ValidCardTypesEnum> validCardTypes = null,
-                   Pay.LanguageEnum language = null) : base("Pay")
-        {
-            this.Input = input;
-            this.Action = action;
-            this.BankAccountType = bankAccountType;
-            this.StatusCallback = statusCallback;
-            this.StatusCallbackMethod = statusCallbackMethod;
-            this.Timeout = timeout;
-            this.MaxAttempts = maxAttempts;
-            this.SecurityCode = securityCode;
-            this.PostalCode = postalCode;
-            this.MinPostalCodeLength = minPostalCodeLength;
-            this.PaymentConnector = paymentConnector;
-            this.PaymentMethod = paymentMethod;
-            this.TokenType = tokenType;
-            this.ChargeAmount = chargeAmount;
-            this.Currency = currency;
-            this.Description = description;
-            this.ValidCardTypes = validCardTypes;
-            this.Language = language;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Input != null)
-            {
-                attributes.Add(new XAttribute("input", this.Input.ToString()));
-            }
-            if (this.Action != null)
-            {
-                attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
-            }
-            if (this.BankAccountType != null)
-            {
-                attributes.Add(new XAttribute("bankAccountType", this.BankAccountType.ToString()));
-            }
-            if (this.StatusCallback != null)
-            {
-                attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
-            }
-            if (this.StatusCallbackMethod != null)
-            {
-                attributes.Add(new XAttribute("statusCallbackMethod", this.StatusCallbackMethod.ToString()));
-            }
-            if (this.Timeout != null)
-            {
-                attributes.Add(new XAttribute("timeout", this.Timeout.ToString()));
-            }
-            if (this.MaxAttempts != null)
-            {
-                attributes.Add(new XAttribute("maxAttempts", this.MaxAttempts.ToString()));
-            }
-            if (this.SecurityCode != null)
-            {
-                attributes.Add(new XAttribute("securityCode", this.SecurityCode.Value.ToString().ToLower()));
-            }
-            if (this.PostalCode != null)
-            {
-                attributes.Add(new XAttribute("postalCode", this.PostalCode));
-            }
-            if (this.MinPostalCodeLength != null)
-            {
-                attributes.Add(new XAttribute("minPostalCodeLength", this.MinPostalCodeLength.ToString()));
-            }
-            if (this.PaymentConnector != null)
-            {
-                attributes.Add(new XAttribute("paymentConnector", this.PaymentConnector));
-            }
-            if (this.PaymentMethod != null)
-            {
-                attributes.Add(new XAttribute("paymentMethod", this.PaymentMethod.ToString()));
-            }
-            if (this.TokenType != null)
-            {
-                attributes.Add(new XAttribute("tokenType", this.TokenType.ToString()));
-            }
-            if (this.ChargeAmount != null)
-            {
-                attributes.Add(new XAttribute("chargeAmount", this.ChargeAmount));
-            }
-            if (this.Currency != null)
-            {
-                attributes.Add(new XAttribute("currency", this.Currency));
-            }
-            if (this.Description != null)
-            {
-                attributes.Add(new XAttribute("description", this.Description));
-            }
-            if (this.ValidCardTypes != null)
-            {
-                attributes.Add(new XAttribute("validCardTypes", String.Join(" ", this.ValidCardTypes.Select(e => e.ToString()).ToArray())));
-            }
-            if (this.Language != null)
-            {
-                attributes.Add(new XAttribute("language", this.Language.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Prompt/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="for_"> Name of the payment source data element </param>
-        /// <param name="errorType"> Type of error </param>
-        /// <param name="cardType"> Type of the credit card </param>
-        /// <param name="attempt"> Current attempt count </param>
-        public Pay Prompt(Prompt.ForEnum for_ = null,
-                          List<Prompt.ErrorTypeEnum> errorType = null,
-                          List<Prompt.CardTypeEnum> cardType = null,
-                          List<int> attempt = null)
-        {
-            var newChild = new Prompt(for_, errorType, cardType, attempt);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Prompt/> element as a child of this element
-        /// </summary>
-        /// <param name="prompt"> A Prompt instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Pay Prompt(Prompt prompt)
-        {
-            this.Append(prompt);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Parameter/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> The name of the custom parameter </param>
-        /// <param name="value"> The value of the custom parameter </param>
-        public Pay Parameter(string name = null, string value = null)
-        {
-            var newChild = new Parameter(name, value);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Parameter/> element as a child of this element
-        /// </summary>
-        /// <param name="parameter"> A Parameter instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Pay Parameter(Parameter parameter)
-        {
-            this.Append(parameter);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Pay Append(TwiML childElem)
-        {
-            return (Pay) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Pay SetOption(string key, object value)
-        {
-            return (Pay) base.SetOption(key, value);
-        }
-    }
+    public Pay.InputEnum Input { get; set; }
+    /// <summary>
+    /// Action URL
+    /// </summary>
+    public Uri Action { get; set; }
+    /// <summary>
+    /// Bank account type for ach transactions. If set, payment method attribute must be provided and value should be set to ach-debit. defaults to consumer-checking
+    /// </summary>
+    public Pay.BankAccountTypeEnum BankAccountType { get; set; }
+    /// <summary>
+    /// Status callback URL
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// Status callback method
+    /// </summary>
+    public Pay.StatusCallbackMethodEnum StatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Time to wait to gather input
+    /// </summary>
+    public int? Timeout { get; set; }
+    /// <summary>
+    /// Maximum number of allowed retries when gathering input
+    /// </summary>
+    public int? MaxAttempts { get; set; }
+    /// <summary>
+    /// Prompt for security code
+    /// </summary>
+    public bool? SecurityCode { get; set; }
+    /// <summary>
+    /// Prompt for postal code and it should be true/false or default postal code
+    /// </summary>
+    public string PostalCode { get; set; }
+    /// <summary>
+    /// Prompt for minimum postal code length
+    /// </summary>
+    public int? MinPostalCodeLength { get; set; }
+    /// <summary>
+    /// Unique name for payment connector
+    /// </summary>
+    public string PaymentConnector { get; set; }
+    /// <summary>
+    /// Payment method to be used. defaults to credit-card
+    /// </summary>
+    public Pay.PaymentMethodEnum PaymentMethod { get; set; }
+    /// <summary>
+    /// Type of token
+    /// </summary>
+    public Pay.TokenTypeEnum TokenType { get; set; }
+    /// <summary>
+    /// Amount to process. If value is greater than 0 then make the payment else create a payment token
+    /// </summary>
+    public string ChargeAmount { get; set; }
+    /// <summary>
+    /// Currency of the amount attribute
+    /// </summary>
+    public string Currency { get; set; }
+    /// <summary>
+    /// Details regarding the payment
+    /// </summary>
+    public string Description { get; set; }
+    /// <summary>
+    /// Comma separated accepted card types
+    /// </summary>
+    public List<Pay.ValidCardTypesEnum> ValidCardTypes { get; set; }
+    /// <summary>
+    /// Language to use
+    /// </summary>
+    public Pay.LanguageEnum Language { get; set; }
+
+    /// <summary>
+    /// Create a new Pay
+    /// </summary>
+    /// <param name="input"> Input type Twilio should accept </param>
+    /// <param name="action"> Action URL </param>
+    /// <param name="bankAccountType"> Bank account type for ach transactions. If set, payment method attribute must be
+    ///                       provided and value should be set to ach-debit. defaults to consumer-checking </param>
+    /// <param name="statusCallback"> Status callback URL </param>
+    /// <param name="statusCallbackMethod"> Status callback method </param>
+    /// <param name="timeout"> Time to wait to gather input </param>
+    /// <param name="maxAttempts"> Maximum number of allowed retries when gathering input </param>
+    /// <param name="securityCode"> Prompt for security code </param>
+    /// <param name="postalCode"> Prompt for postal code and it should be true/false or default postal code </param>
+    /// <param name="minPostalCodeLength"> Prompt for minimum postal code length </param>
+    /// <param name="paymentConnector"> Unique name for payment connector </param>
+    /// <param name="paymentMethod"> Payment method to be used. defaults to credit-card </param>
+    /// <param name="tokenType"> Type of token </param>
+    /// <param name="chargeAmount"> Amount to process. If value is greater than 0 then make the payment else create a
+    ///                    payment token </param>
+    /// <param name="currency"> Currency of the amount attribute </param>
+    /// <param name="description"> Details regarding the payment </param>
+    /// <param name="validCardTypes"> Comma separated accepted card types </param>
+    /// <param name="language"> Language to use </param>
+    public Pay(Pay.InputEnum input = null,
+               Uri action = null,
+               Pay.BankAccountTypeEnum bankAccountType = null,
+               Uri statusCallback = null,
+               Pay.StatusCallbackMethodEnum statusCallbackMethod = null,
+               int? timeout = null,
+               int? maxAttempts = null,
+               bool? securityCode = null,
+               string postalCode = null,
+               int? minPostalCodeLength = null,
+               string paymentConnector = null,
+               Pay.PaymentMethodEnum paymentMethod = null,
+               Pay.TokenTypeEnum tokenType = null,
+               string chargeAmount = null,
+               string currency = null,
+               string description = null,
+               List<Pay.ValidCardTypesEnum> validCardTypes = null,
+               Pay.LanguageEnum language = null) : base("Pay")
+    {
+      this.Input = input;
+      this.Action = action;
+      this.BankAccountType = bankAccountType;
+      this.StatusCallback = statusCallback;
+      this.StatusCallbackMethod = statusCallbackMethod;
+      this.Timeout = timeout;
+      this.MaxAttempts = maxAttempts;
+      this.SecurityCode = securityCode;
+      this.PostalCode = postalCode;
+      this.MinPostalCodeLength = minPostalCodeLength;
+      this.PaymentConnector = paymentConnector;
+      this.PaymentMethod = paymentMethod;
+      this.TokenType = tokenType;
+      this.ChargeAmount = chargeAmount;
+      this.Currency = currency;
+      this.Description = description;
+      this.ValidCardTypes = validCardTypes;
+      this.Language = language;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Input != null)
+      {
+        attributes.Add(new XAttribute("input", this.Input.ToString()));
+      }
+      if (this.Action != null)
+      {
+        attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
+      }
+      if (this.BankAccountType != null)
+      {
+        attributes.Add(new XAttribute("bankAccountType", this.BankAccountType.ToString()));
+      }
+      if (this.StatusCallback != null)
+      {
+        attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
+      }
+      if (this.StatusCallbackMethod != null)
+      {
+        attributes.Add(new XAttribute("statusCallbackMethod", this.StatusCallbackMethod.ToString()));
+      }
+      if (this.Timeout != null)
+      {
+        attributes.Add(new XAttribute("timeout", this.Timeout.ToString()));
+      }
+      if (this.MaxAttempts != null)
+      {
+        attributes.Add(new XAttribute("maxAttempts", this.MaxAttempts.ToString()));
+      }
+      if (this.SecurityCode != null)
+      {
+        attributes.Add(new XAttribute("securityCode", this.SecurityCode.Value.ToString().ToLower()));
+      }
+      if (this.PostalCode != null)
+      {
+        attributes.Add(new XAttribute("postalCode", this.PostalCode));
+      }
+      if (this.MinPostalCodeLength != null)
+      {
+        attributes.Add(new XAttribute("minPostalCodeLength", this.MinPostalCodeLength.ToString()));
+      }
+      if (this.PaymentConnector != null)
+      {
+        attributes.Add(new XAttribute("paymentConnector", this.PaymentConnector));
+      }
+      if (this.PaymentMethod != null)
+      {
+        attributes.Add(new XAttribute("paymentMethod", this.PaymentMethod.ToString()));
+      }
+      if (this.TokenType != null)
+      {
+        attributes.Add(new XAttribute("tokenType", this.TokenType.ToString()));
+      }
+      if (this.ChargeAmount != null)
+      {
+        attributes.Add(new XAttribute("chargeAmount", this.ChargeAmount));
+      }
+      if (this.Currency != null)
+      {
+        attributes.Add(new XAttribute("currency", this.Currency));
+      }
+      if (this.Description != null)
+      {
+        attributes.Add(new XAttribute("description", this.Description));
+      }
+      if (this.ValidCardTypes != null)
+      {
+        attributes.Add(new XAttribute("validCardTypes", String.Join(" ", this.ValidCardTypes.Select(e => e.ToString()).ToArray())));
+      }
+      if (this.Language != null)
+      {
+        attributes.Add(new XAttribute("language", this.Language.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Prompt/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="for_"> Name of the payment source data element </param>
+    /// <param name="errorType"> Type of error </param>
+    /// <param name="cardType"> Type of the credit card </param>
+    /// <param name="attempt"> Current attempt count </param>
+    public Pay Prompt(Prompt.ForEnum for_ = null,
+                      List<Prompt.ErrorTypeEnum> errorType = null,
+                      List<Prompt.CardTypeEnum> cardType = null,
+                      List<int> attempt = null)
+    {
+      var newChild = new Prompt(for_, errorType, cardType, attempt);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Prompt/> element as a child of this element
+    /// </summary>
+    /// <param name="prompt"> A Prompt instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Pay Prompt(Prompt prompt)
+    {
+      this.Append(prompt);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Parameter/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> The name of the custom parameter </param>
+    /// <param name="value"> The value of the custom parameter </param>
+    public Pay Parameter(string name = null, string value = null)
+    {
+      var newChild = new Parameter(name, value);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Parameter/> element as a child of this element
+    /// </summary>
+    /// <param name="parameter"> A Parameter instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Pay Parameter(Parameter parameter)
+    {
+      this.Append(parameter);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Pay Append(TwiML childElem)
+    {
+      return (Pay)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Pay SetOption(string key, object value)
+    {
+      return (Pay)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Play.cs b/src/Twilio/TwiML/Voice/Play.cs
index 6e9cefb47..c6167f11c 100644
--- a/src/Twilio/TwiML/Voice/Play.cs
+++ b/src/Twilio/TwiML/Voice/Play.cs
@@ -11,82 +11,82 @@
 using Twilio.Converters;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Play TwiML Verb
+  /// </summary>
+  public class Play : TwiML
+  {
     /// <summary>
-    /// Play TwiML Verb
+    /// Media URL
     /// </summary>
-    public class Play : TwiML
-    {
-        /// <summary>
-        /// Media URL
-        /// </summary>
-        public Uri Url { get; set; }
-        /// <summary>
-        /// Times to loop media
-        /// </summary>
-        public int? Loop { get; set; }
-        /// <summary>
-        /// Play DTMF tones for digits
-        /// </summary>
-        public string Digits { get; set; }
-
-        /// <summary>
-        /// Create a new Play
-        /// </summary>
-        /// <param name="url"> Media URL, the body of the TwiML Element. </param>
-        /// <param name="loop"> Times to loop media </param>
-        /// <param name="digits"> Play DTMF tones for digits </param>
-        public Play(Uri url = null, int? loop = null, string digits = null) : base("Play")
-        {
-            this.Url = url;
-            this.Loop = loop;
-            this.Digits = digits;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Url != null ? Serializers.Url(this.Url) : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Loop != null)
-            {
-                attributes.Add(new XAttribute("loop", this.Loop.ToString()));
-            }
-            if (this.Digits != null)
-            {
-                attributes.Add(new XAttribute("digits", this.Digits));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Play Append(TwiML childElem)
-        {
-            return (Play) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Play SetOption(string key, object value)
-        {
-            return (Play) base.SetOption(key, value);
-        }
-    }
+    public Uri Url { get; set; }
+    /// <summary>
+    /// Times to loop media
+    /// </summary>
+    public int? Loop { get; set; }
+    /// <summary>
+    /// Play DTMF tones for digits
+    /// </summary>
+    public string Digits { get; set; }
+
+    /// <summary>
+    /// Create a new Play
+    /// </summary>
+    /// <param name="url"> Media URL, the body of the TwiML Element. </param>
+    /// <param name="loop"> Times to loop media </param>
+    /// <param name="digits"> Play DTMF tones for digits </param>
+    public Play(Uri url = null, int? loop = null, string digits = null) : base("Play")
+    {
+      this.Url = url;
+      this.Loop = loop;
+      this.Digits = digits;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Url != null ? Serializers.Url(this.Url) : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Loop != null)
+      {
+        attributes.Add(new XAttribute("loop", this.Loop.ToString()));
+      }
+      if (this.Digits != null)
+      {
+        attributes.Add(new XAttribute("digits", this.Digits));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Play Append(TwiML childElem)
+    {
+      return (Play)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Play SetOption(string key, object value)
+    {
+      return (Play)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Prompt.cs b/src/Twilio/TwiML/Voice/Prompt.cs
index 261213d43..0d86f1d4a 100644
--- a/src/Twilio/TwiML/Voice/Prompt.cs
+++ b/src/Twilio/TwiML/Voice/Prompt.cs
@@ -13,220 +13,220 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Prompt Twiml Verb
+  /// </summary>
+  public class Prompt : TwiML
+  {
+    public sealed class ForEnum : StringEnum
+    {
+      private ForEnum(string value) : base(value) { }
+      public ForEnum() { }
+      public static implicit operator ForEnum(string value)
+      {
+        return new ForEnum(value);
+      }
+
+      public static readonly ForEnum PaymentCardNumber = new ForEnum("payment-card-number");
+      public static readonly ForEnum ExpirationDate = new ForEnum("expiration-date");
+      public static readonly ForEnum SecurityCode = new ForEnum("security-code");
+      public static readonly ForEnum PostalCode = new ForEnum("postal-code");
+      public static readonly ForEnum PaymentProcessing = new ForEnum("payment-processing");
+      public static readonly ForEnum BankAccountNumber = new ForEnum("bank-account-number");
+      public static readonly ForEnum BankRoutingNumber = new ForEnum("bank-routing-number");
+    }
+
+    public sealed class ErrorTypeEnum : StringEnum
+    {
+      private ErrorTypeEnum(string value) : base(value) { }
+      public ErrorTypeEnum() { }
+      public static implicit operator ErrorTypeEnum(string value)
+      {
+        return new ErrorTypeEnum(value);
+      }
+
+      public static readonly ErrorTypeEnum Timeout = new ErrorTypeEnum("timeout");
+      public static readonly ErrorTypeEnum InvalidCardNumber = new ErrorTypeEnum("invalid-card-number");
+      public static readonly ErrorTypeEnum InvalidCardType = new ErrorTypeEnum("invalid-card-type");
+      public static readonly ErrorTypeEnum InvalidDate = new ErrorTypeEnum("invalid-date");
+      public static readonly ErrorTypeEnum InvalidSecurityCode = new ErrorTypeEnum("invalid-security-code");
+      public static readonly ErrorTypeEnum InternalError = new ErrorTypeEnum("internal-error");
+    }
+
+    public sealed class CardTypeEnum : StringEnum
+    {
+      private CardTypeEnum(string value) : base(value) { }
+      public CardTypeEnum() { }
+      public static implicit operator CardTypeEnum(string value)
+      {
+        return new CardTypeEnum(value);
+      }
+
+      public static readonly CardTypeEnum Visa = new CardTypeEnum("visa");
+      public static readonly CardTypeEnum Mastercard = new CardTypeEnum("mastercard");
+      public static readonly CardTypeEnum Amex = new CardTypeEnum("amex");
+      public static readonly CardTypeEnum Maestro = new CardTypeEnum("maestro");
+      public static readonly CardTypeEnum Discover = new CardTypeEnum("discover");
+      public static readonly CardTypeEnum Optima = new CardTypeEnum("optima");
+      public static readonly CardTypeEnum Jcb = new CardTypeEnum("jcb");
+      public static readonly CardTypeEnum DinersClub = new CardTypeEnum("diners-club");
+      public static readonly CardTypeEnum Enroute = new CardTypeEnum("enroute");
+    }
+
     /// <summary>
-    /// Prompt Twiml Verb
+    /// Name of the payment source data element
     /// </summary>
-    public class Prompt : TwiML
-    {
-        public sealed class ForEnum : StringEnum
-        {
-            private ForEnum(string value) : base(value) {}
-            public ForEnum() {}
-            public static implicit operator ForEnum(string value)
-            {
-                return new ForEnum(value);
-            }
-
-            public static readonly ForEnum PaymentCardNumber = new ForEnum("payment-card-number");
-            public static readonly ForEnum ExpirationDate = new ForEnum("expiration-date");
-            public static readonly ForEnum SecurityCode = new ForEnum("security-code");
-            public static readonly ForEnum PostalCode = new ForEnum("postal-code");
-            public static readonly ForEnum PaymentProcessing = new ForEnum("payment-processing");
-            public static readonly ForEnum BankAccountNumber = new ForEnum("bank-account-number");
-            public static readonly ForEnum BankRoutingNumber = new ForEnum("bank-routing-number");
-        }
-
-        public sealed class ErrorTypeEnum : StringEnum
-        {
-            private ErrorTypeEnum(string value) : base(value) {}
-            public ErrorTypeEnum() {}
-            public static implicit operator ErrorTypeEnum(string value)
-            {
-                return new ErrorTypeEnum(value);
-            }
-
-            public static readonly ErrorTypeEnum Timeout = new ErrorTypeEnum("timeout");
-            public static readonly ErrorTypeEnum InvalidCardNumber = new ErrorTypeEnum("invalid-card-number");
-            public static readonly ErrorTypeEnum InvalidCardType = new ErrorTypeEnum("invalid-card-type");
-            public static readonly ErrorTypeEnum InvalidDate = new ErrorTypeEnum("invalid-date");
-            public static readonly ErrorTypeEnum InvalidSecurityCode = new ErrorTypeEnum("invalid-security-code");
-            public static readonly ErrorTypeEnum InternalError = new ErrorTypeEnum("internal-error");
-        }
-
-        public sealed class CardTypeEnum : StringEnum
-        {
-            private CardTypeEnum(string value) : base(value) {}
-            public CardTypeEnum() {}
-            public static implicit operator CardTypeEnum(string value)
-            {
-                return new CardTypeEnum(value);
-            }
-
-            public static readonly CardTypeEnum Visa = new CardTypeEnum("visa");
-            public static readonly CardTypeEnum Mastercard = new CardTypeEnum("mastercard");
-            public static readonly CardTypeEnum Amex = new CardTypeEnum("amex");
-            public static readonly CardTypeEnum Maestro = new CardTypeEnum("maestro");
-            public static readonly CardTypeEnum Discover = new CardTypeEnum("discover");
-            public static readonly CardTypeEnum Optima = new CardTypeEnum("optima");
-            public static readonly CardTypeEnum Jcb = new CardTypeEnum("jcb");
-            public static readonly CardTypeEnum DinersClub = new CardTypeEnum("diners-club");
-            public static readonly CardTypeEnum Enroute = new CardTypeEnum("enroute");
-        }
-
-        /// <summary>
-        /// Name of the payment source data element
-        /// </summary>
-        public Prompt.ForEnum For_ { get; set; }
-        /// <summary>
-        /// Type of error
-        /// </summary>
-        public List<Prompt.ErrorTypeEnum> ErrorType { get; set; }
-        /// <summary>
-        /// Type of the credit card
-        /// </summary>
-        public List<Prompt.CardTypeEnum> CardType { get; set; }
-        /// <summary>
-        /// Current attempt count
-        /// </summary>
-        public List<int> Attempt { get; set; }
-
-        /// <summary>
-        /// Create a new Prompt
-        /// </summary>
-        /// <param name="for_"> Name of the payment source data element </param>
-        /// <param name="errorType"> Type of error </param>
-        /// <param name="cardType"> Type of the credit card </param>
-        /// <param name="attempt"> Current attempt count </param>
-        public Prompt(Prompt.ForEnum for_ = null,
-                      List<Prompt.ErrorTypeEnum> errorType = null,
-                      List<Prompt.CardTypeEnum> cardType = null,
-                      List<int> attempt = null) : base("Prompt")
-        {
-            this.For_ = for_;
-            this.ErrorType = errorType;
-            this.CardType = cardType;
-            this.Attempt = attempt;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.For_ != null)
-            {
-                attributes.Add(new XAttribute("for_", this.For_.ToString()));
-            }
-            if (this.ErrorType != null)
-            {
-                attributes.Add(new XAttribute("errorType", String.Join(" ", this.ErrorType.Select(e => e.ToString()).ToArray())));
-            }
-            if (this.CardType != null)
-            {
-                attributes.Add(new XAttribute("cardType", String.Join(" ", this.CardType.Select(e => e.ToString()).ToArray())));
-            }
-            if (this.Attempt != null)
-            {
-                attributes.Add(new XAttribute("attempt", String.Join(" ", this.Attempt.Select(e => e.ToString()).ToArray())));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Say/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="message"> Message to say, the body of the TwiML Element. </param>
-        /// <param name="voice"> Voice to use </param>
-        /// <param name="loop"> Times to loop message </param>
-        /// <param name="language"> Message langauge </param>
-        public Prompt Say(string message = null,
-                          Say.VoiceEnum voice = null,
-                          int? loop = null,
-                          Say.LanguageEnum language = null)
-        {
-            var newChild = new Say(message, voice, loop, language);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Say/> element as a child of this element
-        /// </summary>
-        /// <param name="say"> A Say instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Prompt Say(Say say)
-        {
-            this.Append(say);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Play/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="url"> Media URL, the body of the TwiML Element. </param>
-        /// <param name="loop"> Times to loop media </param>
-        /// <param name="digits"> Play DTMF tones for digits </param>
-        public Prompt Play(Uri url = null, int? loop = null, string digits = null)
-        {
-            var newChild = new Play(url, loop, digits);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Play/> element as a child of this element
-        /// </summary>
-        /// <param name="play"> A Play instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Prompt Play(Play play)
-        {
-            this.Append(play);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Pause/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="length"> Length in seconds to pause </param>
-        public Prompt Pause(int? length = null)
-        {
-            var newChild = new Pause(length);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Pause/> element as a child of this element
-        /// </summary>
-        /// <param name="pause"> A Pause instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Prompt Pause(Pause pause)
-        {
-            this.Append(pause);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Prompt Append(TwiML childElem)
-        {
-            return (Prompt) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Prompt SetOption(string key, object value)
-        {
-            return (Prompt) base.SetOption(key, value);
-        }
-    }
+    public Prompt.ForEnum For_ { get; set; }
+    /// <summary>
+    /// Type of error
+    /// </summary>
+    public List<Prompt.ErrorTypeEnum> ErrorType { get; set; }
+    /// <summary>
+    /// Type of the credit card
+    /// </summary>
+    public List<Prompt.CardTypeEnum> CardType { get; set; }
+    /// <summary>
+    /// Current attempt count
+    /// </summary>
+    public List<int> Attempt { get; set; }
+
+    /// <summary>
+    /// Create a new Prompt
+    /// </summary>
+    /// <param name="for_"> Name of the payment source data element </param>
+    /// <param name="errorType"> Type of error </param>
+    /// <param name="cardType"> Type of the credit card </param>
+    /// <param name="attempt"> Current attempt count </param>
+    public Prompt(Prompt.ForEnum for_ = null,
+                  List<Prompt.ErrorTypeEnum> errorType = null,
+                  List<Prompt.CardTypeEnum> cardType = null,
+                  List<int> attempt = null) : base("Prompt")
+    {
+      this.For_ = for_;
+      this.ErrorType = errorType;
+      this.CardType = cardType;
+      this.Attempt = attempt;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.For_ != null)
+      {
+        attributes.Add(new XAttribute("for_", this.For_.ToString()));
+      }
+      if (this.ErrorType != null)
+      {
+        attributes.Add(new XAttribute("errorType", String.Join(" ", this.ErrorType.Select(e => e.ToString()).ToArray())));
+      }
+      if (this.CardType != null)
+      {
+        attributes.Add(new XAttribute("cardType", String.Join(" ", this.CardType.Select(e => e.ToString()).ToArray())));
+      }
+      if (this.Attempt != null)
+      {
+        attributes.Add(new XAttribute("attempt", String.Join(" ", this.Attempt.Select(e => e.ToString()).ToArray())));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Say/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="message"> Message to say, the body of the TwiML Element. </param>
+    /// <param name="voice"> Voice to use </param>
+    /// <param name="loop"> Times to loop message </param>
+    /// <param name="language"> Message langauge </param>
+    public Prompt Say(string message = null,
+                      Say.VoiceEnum voice = null,
+                      int? loop = null,
+                      Say.LanguageEnum language = null)
+    {
+      var newChild = new Say(message, voice, loop, language);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Say/> element as a child of this element
+    /// </summary>
+    /// <param name="say"> A Say instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Prompt Say(Say say)
+    {
+      this.Append(say);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Play/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="url"> Media URL, the body of the TwiML Element. </param>
+    /// <param name="loop"> Times to loop media </param>
+    /// <param name="digits"> Play DTMF tones for digits </param>
+    public Prompt Play(Uri url = null, int? loop = null, string digits = null)
+    {
+      var newChild = new Play(url, loop, digits);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Play/> element as a child of this element
+    /// </summary>
+    /// <param name="play"> A Play instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Prompt Play(Play play)
+    {
+      this.Append(play);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Pause/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="length"> Length in seconds to pause </param>
+    public Prompt Pause(int? length = null)
+    {
+      var newChild = new Pause(length);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Pause/> element as a child of this element
+    /// </summary>
+    /// <param name="pause"> A Pause instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Prompt Pause(Pause pause)
+    {
+      this.Append(pause);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Prompt Append(TwiML childElem)
+    {
+      return (Prompt)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Prompt SetOption(string key, object value)
+    {
+      return (Prompt)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Queue.cs b/src/Twilio/TwiML/Voice/Queue.cs
index 1330fc0cd..67c033f10 100644
--- a/src/Twilio/TwiML/Voice/Queue.cs
+++ b/src/Twilio/TwiML/Voice/Queue.cs
@@ -11,106 +11,106 @@
 using Twilio.Converters;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Queue TwiML Noun
+  /// </summary>
+  public class Queue : TwiML
+  {
     /// <summary>
-    /// Queue TwiML Noun
+    /// Queue name
     /// </summary>
-    public class Queue : TwiML
-    {
-        /// <summary>
-        /// Queue name
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// Action URL
-        /// </summary>
-        public Uri Url { get; set; }
-        /// <summary>
-        /// Action URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-        /// <summary>
-        /// TaskRouter Reservation SID
-        /// </summary>
-        public string ReservationSid { get; set; }
-        /// <summary>
-        /// TaskRouter Activity SID
-        /// </summary>
-        public string PostWorkActivitySid { get; set; }
-
-        /// <summary>
-        /// Create a new Queue
-        /// </summary>
-        /// <param name="name"> Queue name, the body of the TwiML Element. </param>
-        /// <param name="url"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="reservationSid"> TaskRouter Reservation SID </param>
-        /// <param name="postWorkActivitySid"> TaskRouter Activity SID </param>
-        public Queue(string name = null,
-                     Uri url = null,
-                     Twilio.Http.HttpMethod method = null,
-                     string reservationSid = null,
-                     string postWorkActivitySid = null) : base("Queue")
-        {
-            this.Name = name;
-            this.Url = url;
-            this.Method = method;
-            this.ReservationSid = reservationSid;
-            this.PostWorkActivitySid = postWorkActivitySid;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Name != null ? this.Name : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Url != null)
-            {
-                attributes.Add(new XAttribute("url", Serializers.Url(this.Url)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            if (this.ReservationSid != null)
-            {
-                attributes.Add(new XAttribute("reservationSid", this.ReservationSid));
-            }
-            if (this.PostWorkActivitySid != null)
-            {
-                attributes.Add(new XAttribute("postWorkActivitySid", this.PostWorkActivitySid));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Queue Append(TwiML childElem)
-        {
-            return (Queue) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Queue SetOption(string key, object value)
-        {
-            return (Queue) base.SetOption(key, value);
-        }
-    }
+    public string Name { get; set; }
+    /// <summary>
+    /// Action URL
+    /// </summary>
+    public Uri Url { get; set; }
+    /// <summary>
+    /// Action URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+    /// <summary>
+    /// TaskRouter Reservation SID
+    /// </summary>
+    public string ReservationSid { get; set; }
+    /// <summary>
+    /// TaskRouter Activity SID
+    /// </summary>
+    public string PostWorkActivitySid { get; set; }
+
+    /// <summary>
+    /// Create a new Queue
+    /// </summary>
+    /// <param name="name"> Queue name, the body of the TwiML Element. </param>
+    /// <param name="url"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="reservationSid"> TaskRouter Reservation SID </param>
+    /// <param name="postWorkActivitySid"> TaskRouter Activity SID </param>
+    public Queue(string name = null,
+                 Uri url = null,
+                 Twilio.Http.HttpMethod method = null,
+                 string reservationSid = null,
+                 string postWorkActivitySid = null) : base("Queue")
+    {
+      this.Name = name;
+      this.Url = url;
+      this.Method = method;
+      this.ReservationSid = reservationSid;
+      this.PostWorkActivitySid = postWorkActivitySid;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Name != null ? this.Name : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Url != null)
+      {
+        attributes.Add(new XAttribute("url", Serializers.Url(this.Url)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      if (this.ReservationSid != null)
+      {
+        attributes.Add(new XAttribute("reservationSid", this.ReservationSid));
+      }
+      if (this.PostWorkActivitySid != null)
+      {
+        attributes.Add(new XAttribute("postWorkActivitySid", this.PostWorkActivitySid));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Queue Append(TwiML childElem)
+    {
+      return (Queue)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Queue SetOption(string key, object value)
+    {
+      return (Queue)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Record.cs b/src/Twilio/TwiML/Voice/Record.cs
index 9465cc79c..562e28ddf 100644
--- a/src/Twilio/TwiML/Voice/Record.cs
+++ b/src/Twilio/TwiML/Voice/Record.cs
@@ -13,206 +13,206 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Record TwiML Verb
+  /// </summary>
+  public class Record : TwiML
+  {
+    public sealed class TrimEnum : StringEnum
+    {
+      private TrimEnum(string value) : base(value) { }
+      public TrimEnum() { }
+      public static implicit operator TrimEnum(string value)
+      {
+        return new TrimEnum(value);
+      }
+
+      public static readonly TrimEnum TrimSilence = new TrimEnum("trim-silence");
+      public static readonly TrimEnum DoNotTrim = new TrimEnum("do-not-trim");
+    }
+
+    public sealed class RecordingEventEnum : StringEnum
+    {
+      private RecordingEventEnum(string value) : base(value) { }
+      public RecordingEventEnum() { }
+      public static implicit operator RecordingEventEnum(string value)
+      {
+        return new RecordingEventEnum(value);
+      }
+
+      public static readonly RecordingEventEnum InProgress = new RecordingEventEnum("in-progress");
+      public static readonly RecordingEventEnum Completed = new RecordingEventEnum("completed");
+      public static readonly RecordingEventEnum Absent = new RecordingEventEnum("absent");
+    }
+
     /// <summary>
-    /// Record TwiML Verb
-    /// </summary>
-    public class Record : TwiML
-    {
-        public sealed class TrimEnum : StringEnum
-        {
-            private TrimEnum(string value) : base(value) {}
-            public TrimEnum() {}
-            public static implicit operator TrimEnum(string value)
-            {
-                return new TrimEnum(value);
-            }
-
-            public static readonly TrimEnum TrimSilence = new TrimEnum("trim-silence");
-            public static readonly TrimEnum DoNotTrim = new TrimEnum("do-not-trim");
-        }
-
-        public sealed class RecordingEventEnum : StringEnum
-        {
-            private RecordingEventEnum(string value) : base(value) {}
-            public RecordingEventEnum() {}
-            public static implicit operator RecordingEventEnum(string value)
-            {
-                return new RecordingEventEnum(value);
-            }
-
-            public static readonly RecordingEventEnum InProgress = new RecordingEventEnum("in-progress");
-            public static readonly RecordingEventEnum Completed = new RecordingEventEnum("completed");
-            public static readonly RecordingEventEnum Absent = new RecordingEventEnum("absent");
-        }
-
-        /// <summary>
-        /// Action URL
-        /// </summary>
-        public Uri Action { get; set; }
-        /// <summary>
-        /// Action URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-        /// <summary>
-        /// Timeout to begin recording
-        /// </summary>
-        public int? Timeout { get; set; }
-        /// <summary>
-        /// Finish recording on key
-        /// </summary>
-        public string FinishOnKey { get; set; }
-        /// <summary>
-        /// Max time to record in seconds
-        /// </summary>
-        public int? MaxLength { get; set; }
-        /// <summary>
-        /// Play beep
-        /// </summary>
-        public bool? PlayBeep { get; set; }
-        /// <summary>
-        /// Trim the recording
-        /// </summary>
-        public Record.TrimEnum Trim { get; set; }
-        /// <summary>
-        /// Status callback URL
-        /// </summary>
-        public Uri RecordingStatusCallback { get; set; }
-        /// <summary>
-        /// Status callback URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
-        /// <summary>
-        /// Recording status callback events
-        /// </summary>
-        public List<Record.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
-        /// <summary>
-        /// Transcribe the recording
-        /// </summary>
-        public bool? Transcribe { get; set; }
-        /// <summary>
-        /// Transcribe callback URL
-        /// </summary>
-        public Uri TranscribeCallback { get; set; }
-
-        /// <summary>
-        /// Create a new Record
-        /// </summary>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="timeout"> Timeout to begin recording </param>
-        /// <param name="finishOnKey"> Finish recording on key </param>
-        /// <param name="maxLength"> Max time to record in seconds </param>
-        /// <param name="playBeep"> Play beep </param>
-        /// <param name="trim"> Trim the recording </param>
-        /// <param name="recordingStatusCallback"> Status callback URL </param>
-        /// <param name="recordingStatusCallbackMethod"> Status callback URL method </param>
-        /// <param name="recordingStatusCallbackEvent"> Recording status callback events </param>
-        /// <param name="transcribe"> Transcribe the recording </param>
-        /// <param name="transcribeCallback"> Transcribe callback URL </param>
-        public Record(Uri action = null,
-                      Twilio.Http.HttpMethod method = null,
-                      int? timeout = null,
-                      string finishOnKey = null,
-                      int? maxLength = null,
-                      bool? playBeep = null,
-                      Record.TrimEnum trim = null,
-                      Uri recordingStatusCallback = null,
-                      Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                      List<Record.RecordingEventEnum> recordingStatusCallbackEvent = null,
-                      bool? transcribe = null,
-                      Uri transcribeCallback = null) : base("Record")
-        {
-            this.Action = action;
-            this.Method = method;
-            this.Timeout = timeout;
-            this.FinishOnKey = finishOnKey;
-            this.MaxLength = maxLength;
-            this.PlayBeep = playBeep;
-            this.Trim = trim;
-            this.RecordingStatusCallback = recordingStatusCallback;
-            this.RecordingStatusCallbackMethod = recordingStatusCallbackMethod;
-            this.RecordingStatusCallbackEvent = recordingStatusCallbackEvent;
-            this.Transcribe = transcribe;
-            this.TranscribeCallback = transcribeCallback;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Action != null)
-            {
-                attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            if (this.Timeout != null)
-            {
-                attributes.Add(new XAttribute("timeout", this.Timeout.ToString()));
-            }
-            if (this.FinishOnKey != null)
-            {
-                attributes.Add(new XAttribute("finishOnKey", this.FinishOnKey));
-            }
-            if (this.MaxLength != null)
-            {
-                attributes.Add(new XAttribute("maxLength", this.MaxLength.ToString()));
-            }
-            if (this.PlayBeep != null)
-            {
-                attributes.Add(new XAttribute("playBeep", this.PlayBeep.Value.ToString().ToLower()));
-            }
-            if (this.Trim != null)
-            {
-                attributes.Add(new XAttribute("trim", this.Trim.ToString()));
-            }
-            if (this.RecordingStatusCallback != null)
-            {
-                attributes.Add(new XAttribute("recordingStatusCallback", Serializers.Url(this.RecordingStatusCallback)));
-            }
-            if (this.RecordingStatusCallbackMethod != null)
-            {
-                attributes.Add(new XAttribute("recordingStatusCallbackMethod", this.RecordingStatusCallbackMethod.ToString()));
-            }
-            if (this.RecordingStatusCallbackEvent != null)
-            {
-                attributes.Add(new XAttribute("recordingStatusCallbackEvent", String.Join(" ", this.RecordingStatusCallbackEvent.Select(e => e.ToString()).ToArray())));
-            }
-            if (this.Transcribe != null)
-            {
-                attributes.Add(new XAttribute("transcribe", this.Transcribe.Value.ToString().ToLower()));
-            }
-            if (this.TranscribeCallback != null)
-            {
-                attributes.Add(new XAttribute("transcribeCallback", Serializers.Url(this.TranscribeCallback)));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Record Append(TwiML childElem)
-        {
-            return (Record) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Record SetOption(string key, object value)
-        {
-            return (Record) base.SetOption(key, value);
-        }
-    }
+    /// Action URL
+    /// </summary>
+    public Uri Action { get; set; }
+    /// <summary>
+    /// Action URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+    /// <summary>
+    /// Timeout to begin recording
+    /// </summary>
+    public int? Timeout { get; set; }
+    /// <summary>
+    /// Finish recording on key
+    /// </summary>
+    public string FinishOnKey { get; set; }
+    /// <summary>
+    /// Max time to record in seconds
+    /// </summary>
+    public int? MaxLength { get; set; }
+    /// <summary>
+    /// Play beep
+    /// </summary>
+    public bool? PlayBeep { get; set; }
+    /// <summary>
+    /// Trim the recording
+    /// </summary>
+    public Record.TrimEnum Trim { get; set; }
+    /// <summary>
+    /// Status callback URL
+    /// </summary>
+    public Uri RecordingStatusCallback { get; set; }
+    /// <summary>
+    /// Status callback URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod RecordingStatusCallbackMethod { get; set; }
+    /// <summary>
+    /// Recording status callback events
+    /// </summary>
+    public List<Record.RecordingEventEnum> RecordingStatusCallbackEvent { get; set; }
+    /// <summary>
+    /// Transcribe the recording
+    /// </summary>
+    public bool? Transcribe { get; set; }
+    /// <summary>
+    /// Transcribe callback URL
+    /// </summary>
+    public Uri TranscribeCallback { get; set; }
+
+    /// <summary>
+    /// Create a new Record
+    /// </summary>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="timeout"> Timeout to begin recording </param>
+    /// <param name="finishOnKey"> Finish recording on key </param>
+    /// <param name="maxLength"> Max time to record in seconds </param>
+    /// <param name="playBeep"> Play beep </param>
+    /// <param name="trim"> Trim the recording </param>
+    /// <param name="recordingStatusCallback"> Status callback URL </param>
+    /// <param name="recordingStatusCallbackMethod"> Status callback URL method </param>
+    /// <param name="recordingStatusCallbackEvent"> Recording status callback events </param>
+    /// <param name="transcribe"> Transcribe the recording </param>
+    /// <param name="transcribeCallback"> Transcribe callback URL </param>
+    public Record(Uri action = null,
+                  Twilio.Http.HttpMethod method = null,
+                  int? timeout = null,
+                  string finishOnKey = null,
+                  int? maxLength = null,
+                  bool? playBeep = null,
+                  Record.TrimEnum trim = null,
+                  Uri recordingStatusCallback = null,
+                  Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                  List<Record.RecordingEventEnum> recordingStatusCallbackEvent = null,
+                  bool? transcribe = null,
+                  Uri transcribeCallback = null) : base("Record")
+    {
+      this.Action = action;
+      this.Method = method;
+      this.Timeout = timeout;
+      this.FinishOnKey = finishOnKey;
+      this.MaxLength = maxLength;
+      this.PlayBeep = playBeep;
+      this.Trim = trim;
+      this.RecordingStatusCallback = recordingStatusCallback;
+      this.RecordingStatusCallbackMethod = recordingStatusCallbackMethod;
+      this.RecordingStatusCallbackEvent = recordingStatusCallbackEvent;
+      this.Transcribe = transcribe;
+      this.TranscribeCallback = transcribeCallback;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Action != null)
+      {
+        attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      if (this.Timeout != null)
+      {
+        attributes.Add(new XAttribute("timeout", this.Timeout.ToString()));
+      }
+      if (this.FinishOnKey != null)
+      {
+        attributes.Add(new XAttribute("finishOnKey", this.FinishOnKey));
+      }
+      if (this.MaxLength != null)
+      {
+        attributes.Add(new XAttribute("maxLength", this.MaxLength.ToString()));
+      }
+      if (this.PlayBeep != null)
+      {
+        attributes.Add(new XAttribute("playBeep", this.PlayBeep.Value.ToString().ToLower()));
+      }
+      if (this.Trim != null)
+      {
+        attributes.Add(new XAttribute("trim", this.Trim.ToString()));
+      }
+      if (this.RecordingStatusCallback != null)
+      {
+        attributes.Add(new XAttribute("recordingStatusCallback", Serializers.Url(this.RecordingStatusCallback)));
+      }
+      if (this.RecordingStatusCallbackMethod != null)
+      {
+        attributes.Add(new XAttribute("recordingStatusCallbackMethod", this.RecordingStatusCallbackMethod.ToString()));
+      }
+      if (this.RecordingStatusCallbackEvent != null)
+      {
+        attributes.Add(new XAttribute("recordingStatusCallbackEvent", String.Join(" ", this.RecordingStatusCallbackEvent.Select(e => e.ToString()).ToArray())));
+      }
+      if (this.Transcribe != null)
+      {
+        attributes.Add(new XAttribute("transcribe", this.Transcribe.Value.ToString().ToLower()));
+      }
+      if (this.TranscribeCallback != null)
+      {
+        attributes.Add(new XAttribute("transcribeCallback", Serializers.Url(this.TranscribeCallback)));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Record Append(TwiML childElem)
+    {
+      return (Record)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Record SetOption(string key, object value)
+    {
+      return (Record)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Redirect.cs b/src/Twilio/TwiML/Voice/Redirect.cs
index d5fb144a6..9de26d33c 100644
--- a/src/Twilio/TwiML/Voice/Redirect.cs
+++ b/src/Twilio/TwiML/Voice/Redirect.cs
@@ -11,72 +11,72 @@
 using Twilio.Converters;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Redirect TwiML Verb
+  /// </summary>
+  public class Redirect : TwiML
+  {
     /// <summary>
-    /// Redirect TwiML Verb
+    /// Redirect URL
     /// </summary>
-    public class Redirect : TwiML
-    {
-        /// <summary>
-        /// Redirect URL
-        /// </summary>
-        public Uri Url { get; set; }
-        /// <summary>
-        /// Redirect URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-
-        /// <summary>
-        /// Create a new Redirect
-        /// </summary>
-        /// <param name="url"> Redirect URL, the body of the TwiML Element. </param>
-        /// <param name="method"> Redirect URL method </param>
-        public Redirect(Uri url = null, Twilio.Http.HttpMethod method = null) : base("Redirect")
-        {
-            this.Url = url;
-            this.Method = method;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Url != null ? Serializers.Url(this.Url) : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Redirect Append(TwiML childElem)
-        {
-            return (Redirect) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Redirect SetOption(string key, object value)
-        {
-            return (Redirect) base.SetOption(key, value);
-        }
-    }
+    public Uri Url { get; set; }
+    /// <summary>
+    /// Redirect URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+
+    /// <summary>
+    /// Create a new Redirect
+    /// </summary>
+    /// <param name="url"> Redirect URL, the body of the TwiML Element. </param>
+    /// <param name="method"> Redirect URL method </param>
+    public Redirect(Uri url = null, Twilio.Http.HttpMethod method = null) : base("Redirect")
+    {
+      this.Url = url;
+      this.Method = method;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Url != null ? Serializers.Url(this.Url) : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Redirect Append(TwiML childElem)
+    {
+      return (Redirect)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Redirect SetOption(string key, object value)
+    {
+      return (Redirect)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Refer.cs b/src/Twilio/TwiML/Voice/Refer.cs
index 5a708d763..5a8a045f8 100644
--- a/src/Twilio/TwiML/Voice/Refer.cs
+++ b/src/Twilio/TwiML/Voice/Refer.cs
@@ -11,100 +11,100 @@
 using Twilio.Converters;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Refer TwiML Verb
+  /// </summary>
+  public class Refer : TwiML
+  {
     /// <summary>
-    /// Refer TwiML Verb
+    /// Action URL
     /// </summary>
-    public class Refer : TwiML
-    {
-        /// <summary>
-        /// Action URL
-        /// </summary>
-        public Uri Action { get; set; }
-        /// <summary>
-        /// Action URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-
-        /// <summary>
-        /// Create a new Refer
-        /// </summary>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        public Refer(Uri action = null, Twilio.Http.HttpMethod method = null) : base("Refer")
-        {
-            this.Action = action;
-            this.Method = method;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Action != null)
-            {
-                attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Sip/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="sipUrl"> SIP URL, the body of the TwiML Element. </param>
-        public Refer Sip(Uri sipUrl = null)
-        {
-            var newChild = new ReferSip(sipUrl);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Sip/> element as a child of this element
-        /// </summary>
-        /// <param name="referSip"> A ReferSip instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Refer ReferSip(ReferSip referSip)
-        {
-            this.Append(referSip);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Sip/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="sipUrl"> SIP URL, the body of the TwiML Element. </param>
-        [System.Obsolete("This method is deprecated, use .Sip() instead.")]
-        public Refer ReferSip(Uri sipUrl = null)
-        {
-            return Sip(sipUrl);
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Refer Append(TwiML childElem)
-        {
-            return (Refer) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Refer SetOption(string key, object value)
-        {
-            return (Refer) base.SetOption(key, value);
-        }
-    }
+    public Uri Action { get; set; }
+    /// <summary>
+    /// Action URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+
+    /// <summary>
+    /// Create a new Refer
+    /// </summary>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    public Refer(Uri action = null, Twilio.Http.HttpMethod method = null) : base("Refer")
+    {
+      this.Action = action;
+      this.Method = method;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Action != null)
+      {
+        attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Sip/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="sipUrl"> SIP URL, the body of the TwiML Element. </param>
+    public Refer Sip(Uri sipUrl = null)
+    {
+      var newChild = new ReferSip(sipUrl);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Sip/> element as a child of this element
+    /// </summary>
+    /// <param name="referSip"> A ReferSip instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Refer ReferSip(ReferSip referSip)
+    {
+      this.Append(referSip);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Sip/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="sipUrl"> SIP URL, the body of the TwiML Element. </param>
+    [System.Obsolete("This method is deprecated, use .Sip() instead.")]
+    public Refer ReferSip(Uri sipUrl = null)
+    {
+      return Sip(sipUrl);
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Refer Append(TwiML childElem)
+    {
+      return (Refer)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Refer SetOption(string key, object value)
+    {
+      return (Refer)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/ReferSip.cs b/src/Twilio/TwiML/Voice/ReferSip.cs
index 3fc6801d7..2f4e07f0e 100644
--- a/src/Twilio/TwiML/Voice/ReferSip.cs
+++ b/src/Twilio/TwiML/Voice/ReferSip.cs
@@ -10,53 +10,53 @@
 using Twilio.Converters;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Sip TwiML Noun used in Refer
+  /// </summary>
+  public class ReferSip : TwiML
+  {
     /// <summary>
-    /// Sip TwiML Noun used in Refer
+    /// SIP URL
     /// </summary>
-    public class ReferSip : TwiML
-    {
-        /// <summary>
-        /// SIP URL
-        /// </summary>
-        public Uri SipUrl { get; set; }
-
-        /// <summary>
-        /// Create a new ReferSip
-        /// </summary>
-        /// <param name="sipUrl"> SIP URL, the body of the TwiML Element. </param>
-        public ReferSip(Uri sipUrl = null) : base("Sip")
-        {
-            this.SipUrl = sipUrl;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.SipUrl != null ? Serializers.Url(this.SipUrl) : string.Empty;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new ReferSip Append(TwiML childElem)
-        {
-            return (ReferSip) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new ReferSip SetOption(string key, object value)
-        {
-            return (ReferSip) base.SetOption(key, value);
-        }
-    }
+    public Uri SipUrl { get; set; }
+
+    /// <summary>
+    /// Create a new ReferSip
+    /// </summary>
+    /// <param name="sipUrl"> SIP URL, the body of the TwiML Element. </param>
+    public ReferSip(Uri sipUrl = null) : base("Sip")
+    {
+      this.SipUrl = sipUrl;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.SipUrl != null ? Serializers.Url(this.SipUrl) : string.Empty;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new ReferSip Append(TwiML childElem)
+    {
+      return (ReferSip)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new ReferSip SetOption(string key, object value)
+    {
+      return (ReferSip)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Reject.cs b/src/Twilio/TwiML/Voice/Reject.cs
index 0802b6a24..31deba1f7 100644
--- a/src/Twilio/TwiML/Voice/Reject.cs
+++ b/src/Twilio/TwiML/Voice/Reject.cs
@@ -10,71 +10,71 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Reject TwiML Verb
+  /// </summary>
+  public class Reject : TwiML
+  {
+    public sealed class ReasonEnum : StringEnum
+    {
+      private ReasonEnum(string value) : base(value) { }
+      public ReasonEnum() { }
+      public static implicit operator ReasonEnum(string value)
+      {
+        return new ReasonEnum(value);
+      }
+
+      public static readonly ReasonEnum Rejected = new ReasonEnum("rejected");
+      public static readonly ReasonEnum Busy = new ReasonEnum("busy");
+    }
+
     /// <summary>
-    /// Reject TwiML Verb
+    /// Rejection reason
     /// </summary>
-    public class Reject : TwiML
-    {
-        public sealed class ReasonEnum : StringEnum
-        {
-            private ReasonEnum(string value) : base(value) {}
-            public ReasonEnum() {}
-            public static implicit operator ReasonEnum(string value)
-            {
-                return new ReasonEnum(value);
-            }
-
-            public static readonly ReasonEnum Rejected = new ReasonEnum("rejected");
-            public static readonly ReasonEnum Busy = new ReasonEnum("busy");
-        }
-
-        /// <summary>
-        /// Rejection reason
-        /// </summary>
-        public Reject.ReasonEnum Reason { get; set; }
-
-        /// <summary>
-        /// Create a new Reject
-        /// </summary>
-        /// <param name="reason"> Rejection reason </param>
-        public Reject(Reject.ReasonEnum reason = null) : base("Reject")
-        {
-            this.Reason = reason;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Reason != null)
-            {
-                attributes.Add(new XAttribute("reason", this.Reason.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Reject Append(TwiML childElem)
-        {
-            return (Reject) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Reject SetOption(string key, object value)
-        {
-            return (Reject) base.SetOption(key, value);
-        }
-    }
+    public Reject.ReasonEnum Reason { get; set; }
+
+    /// <summary>
+    /// Create a new Reject
+    /// </summary>
+    /// <param name="reason"> Rejection reason </param>
+    public Reject(Reject.ReasonEnum reason = null) : base("Reject")
+    {
+      this.Reason = reason;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Reason != null)
+      {
+        attributes.Add(new XAttribute("reason", this.Reason.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Reject Append(TwiML childElem)
+    {
+      return (Reject)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Reject SetOption(string key, object value)
+    {
+      return (Reject)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Room.cs b/src/Twilio/TwiML/Voice/Room.cs
index 41da43f7b..5f6ae70e8 100644
--- a/src/Twilio/TwiML/Voice/Room.cs
+++ b/src/Twilio/TwiML/Voice/Room.cs
@@ -9,72 +9,72 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Room TwiML Noun
+  /// </summary>
+  public class Room : TwiML
+  {
     /// <summary>
-    /// Room TwiML Noun
+    /// Room name
     /// </summary>
-    public class Room : TwiML
-    {
-        /// <summary>
-        /// Room name
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// Participant identity when connecting to the Room
-        /// </summary>
-        public string ParticipantIdentity { get; set; }
-
-        /// <summary>
-        /// Create a new Room
-        /// </summary>
-        /// <param name="name"> Room name, the body of the TwiML Element. </param>
-        /// <param name="participantIdentity"> Participant identity when connecting to the Room </param>
-        public Room(string name = null, string participantIdentity = null) : base("Room")
-        {
-            this.Name = name;
-            this.ParticipantIdentity = participantIdentity;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Name != null ? this.Name : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.ParticipantIdentity != null)
-            {
-                attributes.Add(new XAttribute("participantIdentity", this.ParticipantIdentity));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Room Append(TwiML childElem)
-        {
-            return (Room) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Room SetOption(string key, object value)
-        {
-            return (Room) base.SetOption(key, value);
-        }
-    }
+    public string Name { get; set; }
+    /// <summary>
+    /// Participant identity when connecting to the Room
+    /// </summary>
+    public string ParticipantIdentity { get; set; }
+
+    /// <summary>
+    /// Create a new Room
+    /// </summary>
+    /// <param name="name"> Room name, the body of the TwiML Element. </param>
+    /// <param name="participantIdentity"> Participant identity when connecting to the Room </param>
+    public Room(string name = null, string participantIdentity = null) : base("Room")
+    {
+      this.Name = name;
+      this.ParticipantIdentity = participantIdentity;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Name != null ? this.Name : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.ParticipantIdentity != null)
+      {
+        attributes.Add(new XAttribute("participantIdentity", this.ParticipantIdentity));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Room Append(TwiML childElem)
+    {
+      return (Room)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Room SetOption(string key, object value)
+    {
+      return (Room)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Say.cs b/src/Twilio/TwiML/Voice/Say.cs
index 50277a402..fbc73e7cd 100644
--- a/src/Twilio/TwiML/Voice/Say.cs
+++ b/src/Twilio/TwiML/Voice/Say.cs
@@ -10,585 +10,585 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Say TwiML Verb
+  /// </summary>
+  public class Say : TwiML
+  {
+    public sealed class VoiceEnum : StringEnum
+    {
+      private VoiceEnum(string value) : base(value) { }
+      public VoiceEnum() { }
+      public static implicit operator VoiceEnum(string value)
+      {
+        return new VoiceEnum(value);
+      }
+
+      public static readonly VoiceEnum Man = new VoiceEnum("man");
+      public static readonly VoiceEnum Woman = new VoiceEnum("woman");
+      public static readonly VoiceEnum Alice = new VoiceEnum("alice");
+      public static readonly VoiceEnum PollyAditi = new VoiceEnum("Polly.Aditi");
+      public static readonly VoiceEnum PollyAmy = new VoiceEnum("Polly.Amy");
+      public static readonly VoiceEnum PollyAstrid = new VoiceEnum("Polly.Astrid");
+      public static readonly VoiceEnum PollyBianca = new VoiceEnum("Polly.Bianca");
+      public static readonly VoiceEnum PollyBrian = new VoiceEnum("Polly.Brian");
+      public static readonly VoiceEnum PollyCamila = new VoiceEnum("Polly.Camila");
+      public static readonly VoiceEnum PollyCarla = new VoiceEnum("Polly.Carla");
+      public static readonly VoiceEnum PollyCarmen = new VoiceEnum("Polly.Carmen");
+      public static readonly VoiceEnum PollyCeline = new VoiceEnum("Polly.Celine");
+      public static readonly VoiceEnum PollyChantal = new VoiceEnum("Polly.Chantal");
+      public static readonly VoiceEnum PollyConchita = new VoiceEnum("Polly.Conchita");
+      public static readonly VoiceEnum PollyCristiano = new VoiceEnum("Polly.Cristiano");
+      public static readonly VoiceEnum PollyDora = new VoiceEnum("Polly.Dora");
+      public static readonly VoiceEnum PollyEmma = new VoiceEnum("Polly.Emma");
+      public static readonly VoiceEnum PollyEnrique = new VoiceEnum("Polly.Enrique");
+      public static readonly VoiceEnum PollyEwa = new VoiceEnum("Polly.Ewa");
+      public static readonly VoiceEnum PollyFiliz = new VoiceEnum("Polly.Filiz");
+      public static readonly VoiceEnum PollyGeraint = new VoiceEnum("Polly.Geraint");
+      public static readonly VoiceEnum PollyGiorgio = new VoiceEnum("Polly.Giorgio");
+      public static readonly VoiceEnum PollyGwyneth = new VoiceEnum("Polly.Gwyneth");
+      public static readonly VoiceEnum PollyHans = new VoiceEnum("Polly.Hans");
+      public static readonly VoiceEnum PollyInes = new VoiceEnum("Polly.Ines");
+      public static readonly VoiceEnum PollyIvy = new VoiceEnum("Polly.Ivy");
+      public static readonly VoiceEnum PollyJacek = new VoiceEnum("Polly.Jacek");
+      public static readonly VoiceEnum PollyJan = new VoiceEnum("Polly.Jan");
+      public static readonly VoiceEnum PollyJoanna = new VoiceEnum("Polly.Joanna");
+      public static readonly VoiceEnum PollyJoey = new VoiceEnum("Polly.Joey");
+      public static readonly VoiceEnum PollyJustin = new VoiceEnum("Polly.Justin");
+      public static readonly VoiceEnum PollyKarl = new VoiceEnum("Polly.Karl");
+      public static readonly VoiceEnum PollyKendra = new VoiceEnum("Polly.Kendra");
+      public static readonly VoiceEnum PollyKimberly = new VoiceEnum("Polly.Kimberly");
+      public static readonly VoiceEnum PollyLea = new VoiceEnum("Polly.Lea");
+      public static readonly VoiceEnum PollyLiv = new VoiceEnum("Polly.Liv");
+      public static readonly VoiceEnum PollyLotte = new VoiceEnum("Polly.Lotte");
+      public static readonly VoiceEnum PollyLucia = new VoiceEnum("Polly.Lucia");
+      public static readonly VoiceEnum PollyLupe = new VoiceEnum("Polly.Lupe");
+      public static readonly VoiceEnum PollyMads = new VoiceEnum("Polly.Mads");
+      public static readonly VoiceEnum PollyMaja = new VoiceEnum("Polly.Maja");
+      public static readonly VoiceEnum PollyMarlene = new VoiceEnum("Polly.Marlene");
+      public static readonly VoiceEnum PollyMathieu = new VoiceEnum("Polly.Mathieu");
+      public static readonly VoiceEnum PollyMatthew = new VoiceEnum("Polly.Matthew");
+      public static readonly VoiceEnum PollyMaxim = new VoiceEnum("Polly.Maxim");
+      public static readonly VoiceEnum PollyMia = new VoiceEnum("Polly.Mia");
+      public static readonly VoiceEnum PollyMiguel = new VoiceEnum("Polly.Miguel");
+      public static readonly VoiceEnum PollyMizuki = new VoiceEnum("Polly.Mizuki");
+      public static readonly VoiceEnum PollyNaja = new VoiceEnum("Polly.Naja");
+      public static readonly VoiceEnum PollyNicole = new VoiceEnum("Polly.Nicole");
+      public static readonly VoiceEnum PollyPenelope = new VoiceEnum("Polly.Penelope");
+      public static readonly VoiceEnum PollyRaveena = new VoiceEnum("Polly.Raveena");
+      public static readonly VoiceEnum PollyRicardo = new VoiceEnum("Polly.Ricardo");
+      public static readonly VoiceEnum PollyRuben = new VoiceEnum("Polly.Ruben");
+      public static readonly VoiceEnum PollyRussell = new VoiceEnum("Polly.Russell");
+      public static readonly VoiceEnum PollySalli = new VoiceEnum("Polly.Salli");
+      public static readonly VoiceEnum PollySeoyeon = new VoiceEnum("Polly.Seoyeon");
+      public static readonly VoiceEnum PollyTakumi = new VoiceEnum("Polly.Takumi");
+      public static readonly VoiceEnum PollyTatyana = new VoiceEnum("Polly.Tatyana");
+      public static readonly VoiceEnum PollyVicki = new VoiceEnum("Polly.Vicki");
+      public static readonly VoiceEnum PollyVitoria = new VoiceEnum("Polly.Vitoria");
+      public static readonly VoiceEnum PollyZeina = new VoiceEnum("Polly.Zeina");
+      public static readonly VoiceEnum PollyZhiyu = new VoiceEnum("Polly.Zhiyu");
+      public static readonly VoiceEnum PollyAmyNeural = new VoiceEnum("Polly.Amy-Neural");
+      public static readonly VoiceEnum PollyEmmaNeural = new VoiceEnum("Polly.Emma-Neural");
+      public static readonly VoiceEnum PollyBrianNeural = new VoiceEnum("Polly.Brian-Neural");
+      public static readonly VoiceEnum PollySalliNeural = new VoiceEnum("Polly.Salli-Neural");
+      public static readonly VoiceEnum PollyIvyNeural = new VoiceEnum("Polly.Ivy-Neural");
+      public static readonly VoiceEnum PollyJoannaNeural = new VoiceEnum("Polly.Joanna-Neural");
+      public static readonly VoiceEnum PollyKendraNeural = new VoiceEnum("Polly.Kendra-Neural");
+      public static readonly VoiceEnum PollyKimberlyNeural = new VoiceEnum("Polly.Kimberly-Neural");
+      public static readonly VoiceEnum PollyJoeyNeural = new VoiceEnum("Polly.Joey-Neural");
+      public static readonly VoiceEnum PollyJustinNeural = new VoiceEnum("Polly.Justin-Neural");
+      public static readonly VoiceEnum PollyMatthewNeural = new VoiceEnum("Polly.Matthew-Neural");
+      public static readonly VoiceEnum PollyCamilaNeural = new VoiceEnum("Polly.Camila-Neural");
+      public static readonly VoiceEnum PollyLupeNeural = new VoiceEnum("Polly.Lupe-Neural");
+      public static readonly VoiceEnum PollyOliviaNeural = new VoiceEnum("Polly.Olivia-Neural");
+      public static readonly VoiceEnum PollyKevinNeural = new VoiceEnum("Polly.Kevin-Neural");
+    }
+
+    public sealed class LanguageEnum : StringEnum
+    {
+      private LanguageEnum(string value) : base(value) { }
+      public LanguageEnum() { }
+      public static implicit operator LanguageEnum(string value)
+      {
+        return new LanguageEnum(value);
+      }
+
+      public static readonly LanguageEnum Arb = new LanguageEnum("arb");
+      public static readonly LanguageEnum CaEs = new LanguageEnum("ca-ES");
+      public static readonly LanguageEnum CyGb = new LanguageEnum("cy-GB");
+      public static readonly LanguageEnum DaDk = new LanguageEnum("da-DK");
+      public static readonly LanguageEnum DeDe = new LanguageEnum("de-DE");
+      public static readonly LanguageEnum EnAu = new LanguageEnum("en-AU");
+      public static readonly LanguageEnum EnCa = new LanguageEnum("en-CA");
+      public static readonly LanguageEnum EnGb = new LanguageEnum("en-GB");
+      public static readonly LanguageEnum EnGbWls = new LanguageEnum("en-GB-WLS");
+      public static readonly LanguageEnum EnIn = new LanguageEnum("en-IN");
+      public static readonly LanguageEnum EnUs = new LanguageEnum("en-US");
+      public static readonly LanguageEnum EsEs = new LanguageEnum("es-ES");
+      public static readonly LanguageEnum EsMx = new LanguageEnum("es-MX");
+      public static readonly LanguageEnum EsUs = new LanguageEnum("es-US");
+      public static readonly LanguageEnum FiFi = new LanguageEnum("fi-FI");
+      public static readonly LanguageEnum FrCa = new LanguageEnum("fr-CA");
+      public static readonly LanguageEnum FrFr = new LanguageEnum("fr-FR");
+      public static readonly LanguageEnum HiIn = new LanguageEnum("hi-IN");
+      public static readonly LanguageEnum IsIs = new LanguageEnum("is-IS");
+      public static readonly LanguageEnum ItIt = new LanguageEnum("it-IT");
+      public static readonly LanguageEnum JaJp = new LanguageEnum("ja-JP");
+      public static readonly LanguageEnum KoKr = new LanguageEnum("ko-KR");
+      public static readonly LanguageEnum NbNo = new LanguageEnum("nb-NO");
+      public static readonly LanguageEnum NlNl = new LanguageEnum("nl-NL");
+      public static readonly LanguageEnum PlPl = new LanguageEnum("pl-PL");
+      public static readonly LanguageEnum PtBr = new LanguageEnum("pt-BR");
+      public static readonly LanguageEnum PtPt = new LanguageEnum("pt-PT");
+      public static readonly LanguageEnum RoRo = new LanguageEnum("ro-RO");
+      public static readonly LanguageEnum RuRu = new LanguageEnum("ru-RU");
+      public static readonly LanguageEnum SvSe = new LanguageEnum("sv-SE");
+      public static readonly LanguageEnum TrTr = new LanguageEnum("tr-TR");
+      public static readonly LanguageEnum ZhCn = new LanguageEnum("zh-CN");
+      public static readonly LanguageEnum ZhHk = new LanguageEnum("zh-HK");
+      public static readonly LanguageEnum ZhTw = new LanguageEnum("zh-TW");
+    }
+
     /// <summary>
-    /// Say TwiML Verb
-    /// </summary>
-    public class Say : TwiML
-    {
-        public sealed class VoiceEnum : StringEnum
-        {
-            private VoiceEnum(string value) : base(value) {}
-            public VoiceEnum() {}
-            public static implicit operator VoiceEnum(string value)
-            {
-                return new VoiceEnum(value);
-            }
-
-            public static readonly VoiceEnum Man = new VoiceEnum("man");
-            public static readonly VoiceEnum Woman = new VoiceEnum("woman");
-            public static readonly VoiceEnum Alice = new VoiceEnum("alice");
-            public static readonly VoiceEnum PollyAditi = new VoiceEnum("Polly.Aditi");
-            public static readonly VoiceEnum PollyAmy = new VoiceEnum("Polly.Amy");
-            public static readonly VoiceEnum PollyAstrid = new VoiceEnum("Polly.Astrid");
-            public static readonly VoiceEnum PollyBianca = new VoiceEnum("Polly.Bianca");
-            public static readonly VoiceEnum PollyBrian = new VoiceEnum("Polly.Brian");
-            public static readonly VoiceEnum PollyCamila = new VoiceEnum("Polly.Camila");
-            public static readonly VoiceEnum PollyCarla = new VoiceEnum("Polly.Carla");
-            public static readonly VoiceEnum PollyCarmen = new VoiceEnum("Polly.Carmen");
-            public static readonly VoiceEnum PollyCeline = new VoiceEnum("Polly.Celine");
-            public static readonly VoiceEnum PollyChantal = new VoiceEnum("Polly.Chantal");
-            public static readonly VoiceEnum PollyConchita = new VoiceEnum("Polly.Conchita");
-            public static readonly VoiceEnum PollyCristiano = new VoiceEnum("Polly.Cristiano");
-            public static readonly VoiceEnum PollyDora = new VoiceEnum("Polly.Dora");
-            public static readonly VoiceEnum PollyEmma = new VoiceEnum("Polly.Emma");
-            public static readonly VoiceEnum PollyEnrique = new VoiceEnum("Polly.Enrique");
-            public static readonly VoiceEnum PollyEwa = new VoiceEnum("Polly.Ewa");
-            public static readonly VoiceEnum PollyFiliz = new VoiceEnum("Polly.Filiz");
-            public static readonly VoiceEnum PollyGeraint = new VoiceEnum("Polly.Geraint");
-            public static readonly VoiceEnum PollyGiorgio = new VoiceEnum("Polly.Giorgio");
-            public static readonly VoiceEnum PollyGwyneth = new VoiceEnum("Polly.Gwyneth");
-            public static readonly VoiceEnum PollyHans = new VoiceEnum("Polly.Hans");
-            public static readonly VoiceEnum PollyInes = new VoiceEnum("Polly.Ines");
-            public static readonly VoiceEnum PollyIvy = new VoiceEnum("Polly.Ivy");
-            public static readonly VoiceEnum PollyJacek = new VoiceEnum("Polly.Jacek");
-            public static readonly VoiceEnum PollyJan = new VoiceEnum("Polly.Jan");
-            public static readonly VoiceEnum PollyJoanna = new VoiceEnum("Polly.Joanna");
-            public static readonly VoiceEnum PollyJoey = new VoiceEnum("Polly.Joey");
-            public static readonly VoiceEnum PollyJustin = new VoiceEnum("Polly.Justin");
-            public static readonly VoiceEnum PollyKarl = new VoiceEnum("Polly.Karl");
-            public static readonly VoiceEnum PollyKendra = new VoiceEnum("Polly.Kendra");
-            public static readonly VoiceEnum PollyKimberly = new VoiceEnum("Polly.Kimberly");
-            public static readonly VoiceEnum PollyLea = new VoiceEnum("Polly.Lea");
-            public static readonly VoiceEnum PollyLiv = new VoiceEnum("Polly.Liv");
-            public static readonly VoiceEnum PollyLotte = new VoiceEnum("Polly.Lotte");
-            public static readonly VoiceEnum PollyLucia = new VoiceEnum("Polly.Lucia");
-            public static readonly VoiceEnum PollyLupe = new VoiceEnum("Polly.Lupe");
-            public static readonly VoiceEnum PollyMads = new VoiceEnum("Polly.Mads");
-            public static readonly VoiceEnum PollyMaja = new VoiceEnum("Polly.Maja");
-            public static readonly VoiceEnum PollyMarlene = new VoiceEnum("Polly.Marlene");
-            public static readonly VoiceEnum PollyMathieu = new VoiceEnum("Polly.Mathieu");
-            public static readonly VoiceEnum PollyMatthew = new VoiceEnum("Polly.Matthew");
-            public static readonly VoiceEnum PollyMaxim = new VoiceEnum("Polly.Maxim");
-            public static readonly VoiceEnum PollyMia = new VoiceEnum("Polly.Mia");
-            public static readonly VoiceEnum PollyMiguel = new VoiceEnum("Polly.Miguel");
-            public static readonly VoiceEnum PollyMizuki = new VoiceEnum("Polly.Mizuki");
-            public static readonly VoiceEnum PollyNaja = new VoiceEnum("Polly.Naja");
-            public static readonly VoiceEnum PollyNicole = new VoiceEnum("Polly.Nicole");
-            public static readonly VoiceEnum PollyPenelope = new VoiceEnum("Polly.Penelope");
-            public static readonly VoiceEnum PollyRaveena = new VoiceEnum("Polly.Raveena");
-            public static readonly VoiceEnum PollyRicardo = new VoiceEnum("Polly.Ricardo");
-            public static readonly VoiceEnum PollyRuben = new VoiceEnum("Polly.Ruben");
-            public static readonly VoiceEnum PollyRussell = new VoiceEnum("Polly.Russell");
-            public static readonly VoiceEnum PollySalli = new VoiceEnum("Polly.Salli");
-            public static readonly VoiceEnum PollySeoyeon = new VoiceEnum("Polly.Seoyeon");
-            public static readonly VoiceEnum PollyTakumi = new VoiceEnum("Polly.Takumi");
-            public static readonly VoiceEnum PollyTatyana = new VoiceEnum("Polly.Tatyana");
-            public static readonly VoiceEnum PollyVicki = new VoiceEnum("Polly.Vicki");
-            public static readonly VoiceEnum PollyVitoria = new VoiceEnum("Polly.Vitoria");
-            public static readonly VoiceEnum PollyZeina = new VoiceEnum("Polly.Zeina");
-            public static readonly VoiceEnum PollyZhiyu = new VoiceEnum("Polly.Zhiyu");
-            public static readonly VoiceEnum PollyAmyNeural = new VoiceEnum("Polly.Amy-Neural");
-            public static readonly VoiceEnum PollyEmmaNeural = new VoiceEnum("Polly.Emma-Neural");
-            public static readonly VoiceEnum PollyBrianNeural = new VoiceEnum("Polly.Brian-Neural");
-            public static readonly VoiceEnum PollySalliNeural = new VoiceEnum("Polly.Salli-Neural");
-            public static readonly VoiceEnum PollyIvyNeural = new VoiceEnum("Polly.Ivy-Neural");
-            public static readonly VoiceEnum PollyJoannaNeural = new VoiceEnum("Polly.Joanna-Neural");
-            public static readonly VoiceEnum PollyKendraNeural = new VoiceEnum("Polly.Kendra-Neural");
-            public static readonly VoiceEnum PollyKimberlyNeural = new VoiceEnum("Polly.Kimberly-Neural");
-            public static readonly VoiceEnum PollyJoeyNeural = new VoiceEnum("Polly.Joey-Neural");
-            public static readonly VoiceEnum PollyJustinNeural = new VoiceEnum("Polly.Justin-Neural");
-            public static readonly VoiceEnum PollyMatthewNeural = new VoiceEnum("Polly.Matthew-Neural");
-            public static readonly VoiceEnum PollyCamilaNeural = new VoiceEnum("Polly.Camila-Neural");
-            public static readonly VoiceEnum PollyLupeNeural = new VoiceEnum("Polly.Lupe-Neural");
-            public static readonly VoiceEnum PollyOliviaNeural = new VoiceEnum("Polly.Olivia-Neural");
-            public static readonly VoiceEnum PollyKevinNeural = new VoiceEnum("Polly.Kevin-Neural");
-        }
-
-        public sealed class LanguageEnum : StringEnum
-        {
-            private LanguageEnum(string value) : base(value) {}
-            public LanguageEnum() {}
-            public static implicit operator LanguageEnum(string value)
-            {
-                return new LanguageEnum(value);
-            }
-
-            public static readonly LanguageEnum Arb = new LanguageEnum("arb");
-            public static readonly LanguageEnum CaEs = new LanguageEnum("ca-ES");
-            public static readonly LanguageEnum CyGb = new LanguageEnum("cy-GB");
-            public static readonly LanguageEnum DaDk = new LanguageEnum("da-DK");
-            public static readonly LanguageEnum DeDe = new LanguageEnum("de-DE");
-            public static readonly LanguageEnum EnAu = new LanguageEnum("en-AU");
-            public static readonly LanguageEnum EnCa = new LanguageEnum("en-CA");
-            public static readonly LanguageEnum EnGb = new LanguageEnum("en-GB");
-            public static readonly LanguageEnum EnGbWls = new LanguageEnum("en-GB-WLS");
-            public static readonly LanguageEnum EnIn = new LanguageEnum("en-IN");
-            public static readonly LanguageEnum EnUs = new LanguageEnum("en-US");
-            public static readonly LanguageEnum EsEs = new LanguageEnum("es-ES");
-            public static readonly LanguageEnum EsMx = new LanguageEnum("es-MX");
-            public static readonly LanguageEnum EsUs = new LanguageEnum("es-US");
-            public static readonly LanguageEnum FiFi = new LanguageEnum("fi-FI");
-            public static readonly LanguageEnum FrCa = new LanguageEnum("fr-CA");
-            public static readonly LanguageEnum FrFr = new LanguageEnum("fr-FR");
-            public static readonly LanguageEnum HiIn = new LanguageEnum("hi-IN");
-            public static readonly LanguageEnum IsIs = new LanguageEnum("is-IS");
-            public static readonly LanguageEnum ItIt = new LanguageEnum("it-IT");
-            public static readonly LanguageEnum JaJp = new LanguageEnum("ja-JP");
-            public static readonly LanguageEnum KoKr = new LanguageEnum("ko-KR");
-            public static readonly LanguageEnum NbNo = new LanguageEnum("nb-NO");
-            public static readonly LanguageEnum NlNl = new LanguageEnum("nl-NL");
-            public static readonly LanguageEnum PlPl = new LanguageEnum("pl-PL");
-            public static readonly LanguageEnum PtBr = new LanguageEnum("pt-BR");
-            public static readonly LanguageEnum PtPt = new LanguageEnum("pt-PT");
-            public static readonly LanguageEnum RoRo = new LanguageEnum("ro-RO");
-            public static readonly LanguageEnum RuRu = new LanguageEnum("ru-RU");
-            public static readonly LanguageEnum SvSe = new LanguageEnum("sv-SE");
-            public static readonly LanguageEnum TrTr = new LanguageEnum("tr-TR");
-            public static readonly LanguageEnum ZhCn = new LanguageEnum("zh-CN");
-            public static readonly LanguageEnum ZhHk = new LanguageEnum("zh-HK");
-            public static readonly LanguageEnum ZhTw = new LanguageEnum("zh-TW");
-        }
-
-        /// <summary>
-        /// Message to say
-        /// </summary>
-        public string Message { get; set; }
-        /// <summary>
-        /// Voice to use
-        /// </summary>
-        public Say.VoiceEnum Voice { get; set; }
-        /// <summary>
-        /// Times to loop message
-        /// </summary>
-        public int? Loop { get; set; }
-        /// <summary>
-        /// Message langauge
-        /// </summary>
-        public Say.LanguageEnum Language { get; set; }
-
-        /// <summary>
-        /// Create a new Say
-        /// </summary>
-        /// <param name="message"> Message to say, the body of the TwiML Element. </param>
-        /// <param name="voice"> Voice to use </param>
-        /// <param name="loop"> Times to loop message </param>
-        /// <param name="language"> Message langauge </param>
-        public Say(string message = null,
-                   Say.VoiceEnum voice = null,
-                   int? loop = null,
-                   Say.LanguageEnum language = null) : base("Say")
-        {
-            this.Message = message;
-            this.Voice = voice;
-            this.Loop = loop;
-            this.Language = language;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Message != null ? this.Message : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Voice != null)
-            {
-                attributes.Add(new XAttribute("voice", this.Voice.ToString()));
-            }
-            if (this.Loop != null)
-            {
-                attributes.Add(new XAttribute("loop", this.Loop.ToString()));
-            }
-            if (this.Language != null)
-            {
-                attributes.Add(new XAttribute("language", this.Language.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        public Say Break(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            var newChild = new SsmlBreak(strength, time);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Break/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Say SsmlBreak(SsmlBreak ssmlBreak)
-        {
-            this.Append(ssmlBreak);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        [System.Obsolete("This method is deprecated, use .Break() instead.")]
-        public Say SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            return Break(strength, time);
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        public Say Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            var newChild = new SsmlEmphasis(words, level);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Emphasis/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Say SsmlEmphasis(SsmlEmphasis ssmlEmphasis)
-        {
-            this.Append(ssmlEmphasis);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
-        public Say SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            return Emphasis(words, level);
-        }
-
-        /// <summary>
-        /// Create a new <Lang/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="xml:Lang"> Specify the language </param>
-        public Say Lang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
-        {
-            var newChild = new SsmlLang(words, xmlLang);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Lang/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlLang"> A SsmlLang instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Say SsmlLang(SsmlLang ssmlLang)
-        {
-            this.Append(ssmlLang);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Lang/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="xml:Lang"> Specify the language </param>
-        [System.Obsolete("This method is deprecated, use .Lang() instead.")]
-        public Say SsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
-        {
-            return Lang(words, xmlLang);
-        }
-
-        /// <summary>
-        /// Create a new <P/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        public Say P(string words = null)
-        {
-            var newChild = new SsmlP(words);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <P/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlP"> A SsmlP instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Say SsmlP(SsmlP ssmlP)
-        {
-            this.Append(ssmlP);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <P/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        [System.Obsolete("This method is deprecated, use .P() instead.")]
-        public Say SsmlP(string words = null)
-        {
-            return P(words);
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        public Say Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            var newChild = new SsmlPhoneme(words, alphabet, ph);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Phoneme/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Say SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
-        {
-            this.Append(ssmlPhoneme);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
-        public Say SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            return Phoneme(words, alphabet, ph);
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        public Say Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
-        {
-            var newChild = new SsmlProsody(words, volume, rate, pitch);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Prosody/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Say SsmlProsody(SsmlProsody ssmlProsody)
-        {
-            this.Append(ssmlProsody);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
-        public Say SsmlProsody(string words = null, string volume = null, string rate = null, string pitch = null)
-        {
-            return Prosody(words, volume, rate, pitch);
-        }
-
-        /// <summary>
-        /// Create a new <S/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        public Say S(string words = null)
-        {
-            var newChild = new SsmlS(words);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <S/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlS"> A SsmlS instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Say SsmlS(SsmlS ssmlS)
-        {
-            this.Append(ssmlS);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <S/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        [System.Obsolete("This method is deprecated, use .S() instead.")]
-        public Say SsmlS(string words = null)
-        {
-            return S(words);
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        public Say SayAs(string words = null, SsmlSayAs.InterpretAsEnum interpretAs = null, SsmlSayAs.RoleEnum role = null)
-        {
-            var newChild = new SsmlSayAs(words, interpretAs, role);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Say-As/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Say SsmlSayAs(SsmlSayAs ssmlSayAs)
-        {
-            this.Append(ssmlSayAs);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
-        public Say SsmlSayAs(string words = null,
-                             SsmlSayAs.InterpretAsEnum interpretAs = null,
-                             SsmlSayAs.RoleEnum role = null)
-        {
-            return SayAs(words, interpretAs, role);
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        public Say Sub(string words = null, string alias = null)
-        {
-            var newChild = new SsmlSub(words, alias);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Sub/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSub"> A SsmlSub instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Say SsmlSub(SsmlSub ssmlSub)
-        {
-            this.Append(ssmlSub);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        [System.Obsolete("This method is deprecated, use .Sub() instead.")]
-        public Say SsmlSub(string words = null, string alias = null)
-        {
-            return Sub(words, alias);
-        }
-
-        /// <summary>
-        /// Create a new <W/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
-        ///            meaning </param>
-        public Say W(string words = null, string role = null)
-        {
-            var newChild = new SsmlW(words, role);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <W/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlW"> A SsmlW instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Say SsmlW(SsmlW ssmlW)
-        {
-            this.Append(ssmlW);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <W/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
-        ///            meaning </param>
-        [System.Obsolete("This method is deprecated, use .W() instead.")]
-        public Say SsmlW(string words = null, string role = null)
-        {
-            return W(words, role);
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Say Append(TwiML childElem)
-        {
-            return (Say) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Say SetOption(string key, object value)
-        {
-            return (Say) base.SetOption(key, value);
-        }
-    }
+    /// Message to say
+    /// </summary>
+    public string Message { get; set; }
+    /// <summary>
+    /// Voice to use
+    /// </summary>
+    public Say.VoiceEnum Voice { get; set; }
+    /// <summary>
+    /// Times to loop message
+    /// </summary>
+    public int? Loop { get; set; }
+    /// <summary>
+    /// Message langauge
+    /// </summary>
+    public Say.LanguageEnum Language { get; set; }
+
+    /// <summary>
+    /// Create a new Say
+    /// </summary>
+    /// <param name="message"> Message to say, the body of the TwiML Element. </param>
+    /// <param name="voice"> Voice to use </param>
+    /// <param name="loop"> Times to loop message </param>
+    /// <param name="language"> Message langauge </param>
+    public Say(string message = null,
+               Say.VoiceEnum voice = null,
+               int? loop = null,
+               Say.LanguageEnum language = null) : base("Say")
+    {
+      this.Message = message;
+      this.Voice = voice;
+      this.Loop = loop;
+      this.Language = language;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Message != null ? this.Message : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Voice != null)
+      {
+        attributes.Add(new XAttribute("voice", this.Voice.ToString()));
+      }
+      if (this.Loop != null)
+      {
+        attributes.Add(new XAttribute("loop", this.Loop.ToString()));
+      }
+      if (this.Language != null)
+      {
+        attributes.Add(new XAttribute("language", this.Language.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    public Say Break(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      var newChild = new SsmlBreak(strength, time);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Break/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Say SsmlBreak(SsmlBreak ssmlBreak)
+    {
+      this.Append(ssmlBreak);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    [System.Obsolete("This method is deprecated, use .Break() instead.")]
+    public Say SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      return Break(strength, time);
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    public Say Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      var newChild = new SsmlEmphasis(words, level);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Emphasis/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Say SsmlEmphasis(SsmlEmphasis ssmlEmphasis)
+    {
+      this.Append(ssmlEmphasis);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
+    public Say SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      return Emphasis(words, level);
+    }
+
+    /// <summary>
+    /// Create a new <Lang/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="xml:Lang"> Specify the language </param>
+    public Say Lang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
+    {
+      var newChild = new SsmlLang(words, xmlLang);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Lang/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlLang"> A SsmlLang instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Say SsmlLang(SsmlLang ssmlLang)
+    {
+      this.Append(ssmlLang);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Lang/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="xml:Lang"> Specify the language </param>
+    [System.Obsolete("This method is deprecated, use .Lang() instead.")]
+    public Say SsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
+    {
+      return Lang(words, xmlLang);
+    }
+
+    /// <summary>
+    /// Create a new <P/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    public Say P(string words = null)
+    {
+      var newChild = new SsmlP(words);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <P/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlP"> A SsmlP instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Say SsmlP(SsmlP ssmlP)
+    {
+      this.Append(ssmlP);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <P/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    [System.Obsolete("This method is deprecated, use .P() instead.")]
+    public Say SsmlP(string words = null)
+    {
+      return P(words);
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    public Say Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      var newChild = new SsmlPhoneme(words, alphabet, ph);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Phoneme/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Say SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
+    {
+      this.Append(ssmlPhoneme);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
+    public Say SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      return Phoneme(words, alphabet, ph);
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    public Say Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
+    {
+      var newChild = new SsmlProsody(words, volume, rate, pitch);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Prosody/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Say SsmlProsody(SsmlProsody ssmlProsody)
+    {
+      this.Append(ssmlProsody);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
+    public Say SsmlProsody(string words = null, string volume = null, string rate = null, string pitch = null)
+    {
+      return Prosody(words, volume, rate, pitch);
+    }
+
+    /// <summary>
+    /// Create a new <S/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    public Say S(string words = null)
+    {
+      var newChild = new SsmlS(words);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <S/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlS"> A SsmlS instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Say SsmlS(SsmlS ssmlS)
+    {
+      this.Append(ssmlS);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <S/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    [System.Obsolete("This method is deprecated, use .S() instead.")]
+    public Say SsmlS(string words = null)
+    {
+      return S(words);
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    public Say SayAs(string words = null, SsmlSayAs.InterpretAsEnum interpretAs = null, SsmlSayAs.RoleEnum role = null)
+    {
+      var newChild = new SsmlSayAs(words, interpretAs, role);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Say-As/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Say SsmlSayAs(SsmlSayAs ssmlSayAs)
+    {
+      this.Append(ssmlSayAs);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
+    public Say SsmlSayAs(string words = null,
+                         SsmlSayAs.InterpretAsEnum interpretAs = null,
+                         SsmlSayAs.RoleEnum role = null)
+    {
+      return SayAs(words, interpretAs, role);
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    public Say Sub(string words = null, string alias = null)
+    {
+      var newChild = new SsmlSub(words, alias);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Sub/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSub"> A SsmlSub instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Say SsmlSub(SsmlSub ssmlSub)
+    {
+      this.Append(ssmlSub);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    [System.Obsolete("This method is deprecated, use .Sub() instead.")]
+    public Say SsmlSub(string words = null, string alias = null)
+    {
+      return Sub(words, alias);
+    }
+
+    /// <summary>
+    /// Create a new <W/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
+    ///            meaning </param>
+    public Say W(string words = null, string role = null)
+    {
+      var newChild = new SsmlW(words, role);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <W/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlW"> A SsmlW instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Say SsmlW(SsmlW ssmlW)
+    {
+      this.Append(ssmlW);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <W/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
+    ///            meaning </param>
+    [System.Obsolete("This method is deprecated, use .W() instead.")]
+    public Say SsmlW(string words = null, string role = null)
+    {
+      return W(words, role);
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Say Append(TwiML childElem)
+    {
+      return (Say)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Say SetOption(string key, object value)
+    {
+      return (Say)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Sim.cs b/src/Twilio/TwiML/Voice/Sim.cs
index bae8ed0ca..0ea4415e5 100644
--- a/src/Twilio/TwiML/Voice/Sim.cs
+++ b/src/Twilio/TwiML/Voice/Sim.cs
@@ -8,53 +8,53 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Sim TwiML Noun
+  /// </summary>
+  public class Sim : TwiML
+  {
     /// <summary>
-    /// Sim TwiML Noun
+    /// SIM SID
     /// </summary>
-    public class Sim : TwiML
-    {
-        /// <summary>
-        /// SIM SID
-        /// </summary>
-        public string SimSid { get; set; }
-
-        /// <summary>
-        /// Create a new Sim
-        /// </summary>
-        /// <param name="simSid"> SIM SID, the body of the TwiML Element. </param>
-        public Sim(string simSid = null) : base("Sim")
-        {
-            this.SimSid = simSid;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.SimSid != null ? this.SimSid.ToString() : string.Empty;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Sim Append(TwiML childElem)
-        {
-            return (Sim) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Sim SetOption(string key, object value)
-        {
-            return (Sim) base.SetOption(key, value);
-        }
-    }
+    public string SimSid { get; set; }
+
+    /// <summary>
+    /// Create a new Sim
+    /// </summary>
+    /// <param name="simSid"> SIM SID, the body of the TwiML Element. </param>
+    public Sim(string simSid = null) : base("Sim")
+    {
+      this.SimSid = simSid;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.SimSid != null ? this.SimSid.ToString() : string.Empty;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Sim Append(TwiML childElem)
+    {
+      return (Sim)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Sim SetOption(string key, object value)
+    {
+      return (Sim)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Sip.cs b/src/Twilio/TwiML/Voice/Sip.cs
index a726a1cb0..0fb9babbd 100644
--- a/src/Twilio/TwiML/Voice/Sip.cs
+++ b/src/Twilio/TwiML/Voice/Sip.cs
@@ -13,154 +13,154 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Sip TwiML Noun
+  /// </summary>
+  public class Sip : TwiML
+  {
+    public sealed class EventEnum : StringEnum
+    {
+      private EventEnum(string value) : base(value) { }
+      public EventEnum() { }
+      public static implicit operator EventEnum(string value)
+      {
+        return new EventEnum(value);
+      }
+
+      public static readonly EventEnum Initiated = new EventEnum("initiated");
+      public static readonly EventEnum Ringing = new EventEnum("ringing");
+      public static readonly EventEnum Answered = new EventEnum("answered");
+      public static readonly EventEnum Completed = new EventEnum("completed");
+    }
+
     /// <summary>
-    /// Sip TwiML Noun
+    /// SIP URL
     /// </summary>
-    public class Sip : TwiML
-    {
-        public sealed class EventEnum : StringEnum
-        {
-            private EventEnum(string value) : base(value) {}
-            public EventEnum() {}
-            public static implicit operator EventEnum(string value)
-            {
-                return new EventEnum(value);
-            }
-
-            public static readonly EventEnum Initiated = new EventEnum("initiated");
-            public static readonly EventEnum Ringing = new EventEnum("ringing");
-            public static readonly EventEnum Answered = new EventEnum("answered");
-            public static readonly EventEnum Completed = new EventEnum("completed");
-        }
-
-        /// <summary>
-        /// SIP URL
-        /// </summary>
-        public Uri SipUrl { get; set; }
-        /// <summary>
-        /// SIP Username
-        /// </summary>
-        public string Username { get; set; }
-        /// <summary>
-        /// SIP Password
-        /// </summary>
-        public string Password { get; set; }
-        /// <summary>
-        /// Action URL
-        /// </summary>
-        public Uri Url { get; set; }
-        /// <summary>
-        /// Action URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-        /// <summary>
-        /// Status callback events
-        /// </summary>
-        public List<Sip.EventEnum> StatusCallbackEvent { get; set; }
-        /// <summary>
-        /// Status callback URL
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-        /// <summary>
-        /// Status callback URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
-
-        /// <summary>
-        /// Create a new Sip
-        /// </summary>
-        /// <param name="sipUrl"> SIP URL, the body of the TwiML Element. </param>
-        /// <param name="username"> SIP Username </param>
-        /// <param name="password"> SIP Password </param>
-        /// <param name="url"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="statusCallbackEvent"> Status callback events </param>
-        /// <param name="statusCallback"> Status callback URL </param>
-        /// <param name="statusCallbackMethod"> Status callback URL method </param>
-        public Sip(Uri sipUrl = null,
-                   string username = null,
-                   string password = null,
-                   Uri url = null,
-                   Twilio.Http.HttpMethod method = null,
-                   List<Sip.EventEnum> statusCallbackEvent = null,
-                   Uri statusCallback = null,
-                   Twilio.Http.HttpMethod statusCallbackMethod = null) : base("Sip")
-        {
-            this.SipUrl = sipUrl;
-            this.Username = username;
-            this.Password = password;
-            this.Url = url;
-            this.Method = method;
-            this.StatusCallbackEvent = statusCallbackEvent;
-            this.StatusCallback = statusCallback;
-            this.StatusCallbackMethod = statusCallbackMethod;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.SipUrl != null ? Serializers.Url(this.SipUrl) : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Username != null)
-            {
-                attributes.Add(new XAttribute("username", this.Username));
-            }
-            if (this.Password != null)
-            {
-                attributes.Add(new XAttribute("password", this.Password));
-            }
-            if (this.Url != null)
-            {
-                attributes.Add(new XAttribute("url", Serializers.Url(this.Url)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            if (this.StatusCallbackEvent != null)
-            {
-                attributes.Add(new XAttribute("statusCallbackEvent", String.Join(" ", this.StatusCallbackEvent.Select(e => e.ToString()).ToArray())));
-            }
-            if (this.StatusCallback != null)
-            {
-                attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
-            }
-            if (this.StatusCallbackMethod != null)
-            {
-                attributes.Add(new XAttribute("statusCallbackMethod", this.StatusCallbackMethod.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Sip Append(TwiML childElem)
-        {
-            return (Sip) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Sip SetOption(string key, object value)
-        {
-            return (Sip) base.SetOption(key, value);
-        }
-    }
+    public Uri SipUrl { get; set; }
+    /// <summary>
+    /// SIP Username
+    /// </summary>
+    public string Username { get; set; }
+    /// <summary>
+    /// SIP Password
+    /// </summary>
+    public string Password { get; set; }
+    /// <summary>
+    /// Action URL
+    /// </summary>
+    public Uri Url { get; set; }
+    /// <summary>
+    /// Action URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+    /// <summary>
+    /// Status callback events
+    /// </summary>
+    public List<Sip.EventEnum> StatusCallbackEvent { get; set; }
+    /// <summary>
+    /// Status callback URL
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+    /// <summary>
+    /// Status callback URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod StatusCallbackMethod { get; set; }
+
+    /// <summary>
+    /// Create a new Sip
+    /// </summary>
+    /// <param name="sipUrl"> SIP URL, the body of the TwiML Element. </param>
+    /// <param name="username"> SIP Username </param>
+    /// <param name="password"> SIP Password </param>
+    /// <param name="url"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="statusCallbackEvent"> Status callback events </param>
+    /// <param name="statusCallback"> Status callback URL </param>
+    /// <param name="statusCallbackMethod"> Status callback URL method </param>
+    public Sip(Uri sipUrl = null,
+               string username = null,
+               string password = null,
+               Uri url = null,
+               Twilio.Http.HttpMethod method = null,
+               List<Sip.EventEnum> statusCallbackEvent = null,
+               Uri statusCallback = null,
+               Twilio.Http.HttpMethod statusCallbackMethod = null) : base("Sip")
+    {
+      this.SipUrl = sipUrl;
+      this.Username = username;
+      this.Password = password;
+      this.Url = url;
+      this.Method = method;
+      this.StatusCallbackEvent = statusCallbackEvent;
+      this.StatusCallback = statusCallback;
+      this.StatusCallbackMethod = statusCallbackMethod;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.SipUrl != null ? Serializers.Url(this.SipUrl) : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Username != null)
+      {
+        attributes.Add(new XAttribute("username", this.Username));
+      }
+      if (this.Password != null)
+      {
+        attributes.Add(new XAttribute("password", this.Password));
+      }
+      if (this.Url != null)
+      {
+        attributes.Add(new XAttribute("url", Serializers.Url(this.Url)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      if (this.StatusCallbackEvent != null)
+      {
+        attributes.Add(new XAttribute("statusCallbackEvent", String.Join(" ", this.StatusCallbackEvent.Select(e => e.ToString()).ToArray())));
+      }
+      if (this.StatusCallback != null)
+      {
+        attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
+      }
+      if (this.StatusCallbackMethod != null)
+      {
+        attributes.Add(new XAttribute("statusCallbackMethod", this.StatusCallbackMethod.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Sip Append(TwiML childElem)
+    {
+      return (Sip)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Sip SetOption(string key, object value)
+    {
+      return (Sip)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Siprec.cs b/src/Twilio/TwiML/Voice/Siprec.cs
index 8d761df76..5f325a868 100644
--- a/src/Twilio/TwiML/Voice/Siprec.cs
+++ b/src/Twilio/TwiML/Voice/Siprec.cs
@@ -10,115 +10,115 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Siprec TwiML Noun
+  /// </summary>
+  public class Siprec : TwiML
+  {
+    public sealed class TrackEnum : StringEnum
+    {
+      private TrackEnum(string value) : base(value) { }
+      public TrackEnum() { }
+      public static implicit operator TrackEnum(string value)
+      {
+        return new TrackEnum(value);
+      }
+
+      public static readonly TrackEnum InboundTrack = new TrackEnum("inbound_track");
+      public static readonly TrackEnum OutboundTrack = new TrackEnum("outbound_track");
+      public static readonly TrackEnum BothTracks = new TrackEnum("both_tracks");
+    }
+
     /// <summary>
-    /// Siprec TwiML Noun
+    /// Friendly name given to SIPREC
     /// </summary>
-    public class Siprec : TwiML
-    {
-        public sealed class TrackEnum : StringEnum
-        {
-            private TrackEnum(string value) : base(value) {}
-            public TrackEnum() {}
-            public static implicit operator TrackEnum(string value)
-            {
-                return new TrackEnum(value);
-            }
-
-            public static readonly TrackEnum InboundTrack = new TrackEnum("inbound_track");
-            public static readonly TrackEnum OutboundTrack = new TrackEnum("outbound_track");
-            public static readonly TrackEnum BothTracks = new TrackEnum("both_tracks");
-        }
-
-        /// <summary>
-        /// Friendly name given to SIPREC
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// Unique name for Connector
-        /// </summary>
-        public string ConnectorName { get; set; }
-        /// <summary>
-        /// Track to be streamed to remote service
-        /// </summary>
-        public Siprec.TrackEnum Track { get; set; }
-
-        /// <summary>
-        /// Create a new Siprec
-        /// </summary>
-        /// <param name="name"> Friendly name given to SIPREC </param>
-        /// <param name="connectorName"> Unique name for Connector </param>
-        /// <param name="track"> Track to be streamed to remote service </param>
-        public Siprec(string name = null, string connectorName = null, Siprec.TrackEnum track = null) : base("Siprec")
-        {
-            this.Name = name;
-            this.ConnectorName = connectorName;
-            this.Track = track;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Name != null)
-            {
-                attributes.Add(new XAttribute("name", this.Name));
-            }
-            if (this.ConnectorName != null)
-            {
-                attributes.Add(new XAttribute("connectorName", this.ConnectorName));
-            }
-            if (this.Track != null)
-            {
-                attributes.Add(new XAttribute("track", this.Track.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Parameter/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> The name of the custom parameter </param>
-        /// <param name="value"> The value of the custom parameter </param>
-        public Siprec Parameter(string name = null, string value = null)
-        {
-            var newChild = new Parameter(name, value);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Parameter/> element as a child of this element
-        /// </summary>
-        /// <param name="parameter"> A Parameter instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Siprec Parameter(Parameter parameter)
-        {
-            this.Append(parameter);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Siprec Append(TwiML childElem)
-        {
-            return (Siprec) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Siprec SetOption(string key, object value)
-        {
-            return (Siprec) base.SetOption(key, value);
-        }
-    }
+    public string Name { get; set; }
+    /// <summary>
+    /// Unique name for Connector
+    /// </summary>
+    public string ConnectorName { get; set; }
+    /// <summary>
+    /// Track to be streamed to remote service
+    /// </summary>
+    public Siprec.TrackEnum Track { get; set; }
+
+    /// <summary>
+    /// Create a new Siprec
+    /// </summary>
+    /// <param name="name"> Friendly name given to SIPREC </param>
+    /// <param name="connectorName"> Unique name for Connector </param>
+    /// <param name="track"> Track to be streamed to remote service </param>
+    public Siprec(string name = null, string connectorName = null, Siprec.TrackEnum track = null) : base("Siprec")
+    {
+      this.Name = name;
+      this.ConnectorName = connectorName;
+      this.Track = track;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Name != null)
+      {
+        attributes.Add(new XAttribute("name", this.Name));
+      }
+      if (this.ConnectorName != null)
+      {
+        attributes.Add(new XAttribute("connectorName", this.ConnectorName));
+      }
+      if (this.Track != null)
+      {
+        attributes.Add(new XAttribute("track", this.Track.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Parameter/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> The name of the custom parameter </param>
+    /// <param name="value"> The value of the custom parameter </param>
+    public Siprec Parameter(string name = null, string value = null)
+    {
+      var newChild = new Parameter(name, value);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Parameter/> element as a child of this element
+    /// </summary>
+    /// <param name="parameter"> A Parameter instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Siprec Parameter(Parameter parameter)
+    {
+      this.Append(parameter);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Siprec Append(TwiML childElem)
+    {
+      return (Siprec)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Siprec SetOption(string key, object value)
+    {
+      return (Siprec)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Sms.cs b/src/Twilio/TwiML/Voice/Sms.cs
index f72235ae0..84a0bd37c 100644
--- a/src/Twilio/TwiML/Voice/Sms.cs
+++ b/src/Twilio/TwiML/Voice/Sms.cs
@@ -11,117 +11,117 @@
 using Twilio.Converters;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Sms TwiML Noun
+  /// </summary>
+  public class Sms : TwiML
+  {
     /// <summary>
-    /// Sms TwiML Noun
+    /// Message body
     /// </summary>
-    public class Sms : TwiML
-    {
-        /// <summary>
-        /// Message body
-        /// </summary>
-        public string Message { get; set; }
-        /// <summary>
-        /// Number to send message to
-        /// </summary>
-        public Types.PhoneNumber To { get; set; }
-        /// <summary>
-        /// Number to send message from
-        /// </summary>
-        public Types.PhoneNumber From { get; set; }
-        /// <summary>
-        /// Action URL
-        /// </summary>
-        public Uri Action { get; set; }
-        /// <summary>
-        /// Action URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-        /// <summary>
-        /// Status callback URL
-        /// </summary>
-        public Uri StatusCallback { get; set; }
-
-        /// <summary>
-        /// Create a new Sms
-        /// </summary>
-        /// <param name="message"> Message body, the body of the TwiML Element. </param>
-        /// <param name="to"> Number to send message to </param>
-        /// <param name="from"> Number to send message from </param>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="statusCallback"> Status callback URL </param>
-        public Sms(string message = null,
-                   Types.PhoneNumber to = null,
-                   Types.PhoneNumber from = null,
-                   Uri action = null,
-                   Twilio.Http.HttpMethod method = null,
-                   Uri statusCallback = null) : base("Sms")
-        {
-            this.Message = message;
-            this.To = to;
-            this.From = from;
-            this.Action = action;
-            this.Method = method;
-            this.StatusCallback = statusCallback;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Message != null ? this.Message : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.To != null)
-            {
-                attributes.Add(new XAttribute("to", this.To.ToString()));
-            }
-            if (this.From != null)
-            {
-                attributes.Add(new XAttribute("from", this.From.ToString()));
-            }
-            if (this.Action != null)
-            {
-                attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            if (this.StatusCallback != null)
-            {
-                attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Sms Append(TwiML childElem)
-        {
-            return (Sms) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Sms SetOption(string key, object value)
-        {
-            return (Sms) base.SetOption(key, value);
-        }
-    }
+    public string Message { get; set; }
+    /// <summary>
+    /// Number to send message to
+    /// </summary>
+    public Types.PhoneNumber To { get; set; }
+    /// <summary>
+    /// Number to send message from
+    /// </summary>
+    public Types.PhoneNumber From { get; set; }
+    /// <summary>
+    /// Action URL
+    /// </summary>
+    public Uri Action { get; set; }
+    /// <summary>
+    /// Action URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+    /// <summary>
+    /// Status callback URL
+    /// </summary>
+    public Uri StatusCallback { get; set; }
+
+    /// <summary>
+    /// Create a new Sms
+    /// </summary>
+    /// <param name="message"> Message body, the body of the TwiML Element. </param>
+    /// <param name="to"> Number to send message to </param>
+    /// <param name="from"> Number to send message from </param>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="statusCallback"> Status callback URL </param>
+    public Sms(string message = null,
+               Types.PhoneNumber to = null,
+               Types.PhoneNumber from = null,
+               Uri action = null,
+               Twilio.Http.HttpMethod method = null,
+               Uri statusCallback = null) : base("Sms")
+    {
+      this.Message = message;
+      this.To = to;
+      this.From = from;
+      this.Action = action;
+      this.Method = method;
+      this.StatusCallback = statusCallback;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Message != null ? this.Message : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.To != null)
+      {
+        attributes.Add(new XAttribute("to", this.To.ToString()));
+      }
+      if (this.From != null)
+      {
+        attributes.Add(new XAttribute("from", this.From.ToString()));
+      }
+      if (this.Action != null)
+      {
+        attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      if (this.StatusCallback != null)
+      {
+        attributes.Add(new XAttribute("statusCallback", Serializers.Url(this.StatusCallback)));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Sms Append(TwiML childElem)
+    {
+      return (Sms)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Sms SetOption(string key, object value)
+    {
+      return (Sms)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/SsmlBreak.cs b/src/Twilio/TwiML/Voice/SsmlBreak.cs
index 756e5ee13..247633056 100644
--- a/src/Twilio/TwiML/Voice/SsmlBreak.cs
+++ b/src/Twilio/TwiML/Voice/SsmlBreak.cs
@@ -10,86 +10,86 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Adding a Pause in Say
+  /// </summary>
+  public class SsmlBreak : TwiML
+  {
+    public sealed class StrengthEnum : StringEnum
+    {
+      private StrengthEnum(string value) : base(value) { }
+      public StrengthEnum() { }
+      public static implicit operator StrengthEnum(string value)
+      {
+        return new StrengthEnum(value);
+      }
+
+      public static readonly StrengthEnum None = new StrengthEnum("none");
+      public static readonly StrengthEnum XWeak = new StrengthEnum("x-weak");
+      public static readonly StrengthEnum Weak = new StrengthEnum("weak");
+      public static readonly StrengthEnum Medium = new StrengthEnum("medium");
+      public static readonly StrengthEnum Strong = new StrengthEnum("strong");
+      public static readonly StrengthEnum XStrong = new StrengthEnum("x-strong");
+    }
+
     /// <summary>
-    /// Adding a Pause in Say
+    /// Set a pause based on strength
     /// </summary>
-    public class SsmlBreak : TwiML
-    {
-        public sealed class StrengthEnum : StringEnum
-        {
-            private StrengthEnum(string value) : base(value) {}
-            public StrengthEnum() {}
-            public static implicit operator StrengthEnum(string value)
-            {
-                return new StrengthEnum(value);
-            }
-
-            public static readonly StrengthEnum None = new StrengthEnum("none");
-            public static readonly StrengthEnum XWeak = new StrengthEnum("x-weak");
-            public static readonly StrengthEnum Weak = new StrengthEnum("weak");
-            public static readonly StrengthEnum Medium = new StrengthEnum("medium");
-            public static readonly StrengthEnum Strong = new StrengthEnum("strong");
-            public static readonly StrengthEnum XStrong = new StrengthEnum("x-strong");
-        }
-
-        /// <summary>
-        /// Set a pause based on strength
-        /// </summary>
-        public SsmlBreak.StrengthEnum Strength { get; set; }
-        /// <summary>
-        /// Set a pause to a specific length of time in seconds or milliseconds, available values: [number]s, [number]ms
-        /// </summary>
-        public string Time { get; set; }
-
-        /// <summary>
-        /// Create a new SsmlBreak
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        public SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null) : base("break")
-        {
-            this.Strength = strength;
-            this.Time = time;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Strength != null)
-            {
-                attributes.Add(new XAttribute("strength", this.Strength.ToString()));
-            }
-            if (this.Time != null)
-            {
-                attributes.Add(new XAttribute("time", this.Time));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new SsmlBreak Append(TwiML childElem)
-        {
-            return (SsmlBreak) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new SsmlBreak SetOption(string key, object value)
-        {
-            return (SsmlBreak) base.SetOption(key, value);
-        }
-    }
+    public SsmlBreak.StrengthEnum Strength { get; set; }
+    /// <summary>
+    /// Set a pause to a specific length of time in seconds or milliseconds, available values: [number]s, [number]ms
+    /// </summary>
+    public string Time { get; set; }
+
+    /// <summary>
+    /// Create a new SsmlBreak
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    public SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null) : base("break")
+    {
+      this.Strength = strength;
+      this.Time = time;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Strength != null)
+      {
+        attributes.Add(new XAttribute("strength", this.Strength.ToString()));
+      }
+      if (this.Time != null)
+      {
+        attributes.Add(new XAttribute("time", this.Time));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new SsmlBreak Append(TwiML childElem)
+    {
+      return (SsmlBreak)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new SsmlBreak SetOption(string key, object value)
+    {
+      return (SsmlBreak)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/SsmlEmphasis.cs b/src/Twilio/TwiML/Voice/SsmlEmphasis.cs
index 4858590fc..0a452f49b 100644
--- a/src/Twilio/TwiML/Voice/SsmlEmphasis.cs
+++ b/src/Twilio/TwiML/Voice/SsmlEmphasis.cs
@@ -10,380 +10,380 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Emphasizing Words in Say
+  /// </summary>
+  public class SsmlEmphasis : TwiML
+  {
+    public sealed class LevelEnum : StringEnum
+    {
+      private LevelEnum(string value) : base(value) { }
+      public LevelEnum() { }
+      public static implicit operator LevelEnum(string value)
+      {
+        return new LevelEnum(value);
+      }
+
+      public static readonly LevelEnum Strong = new LevelEnum("strong");
+      public static readonly LevelEnum Moderate = new LevelEnum("moderate");
+      public static readonly LevelEnum Reduced = new LevelEnum("reduced");
+    }
+
     /// <summary>
-    /// Emphasizing Words in Say
+    /// Words to emphasize
     /// </summary>
-    public class SsmlEmphasis : TwiML
-    {
-        public sealed class LevelEnum : StringEnum
-        {
-            private LevelEnum(string value) : base(value) {}
-            public LevelEnum() {}
-            public static implicit operator LevelEnum(string value)
-            {
-                return new LevelEnum(value);
-            }
-
-            public static readonly LevelEnum Strong = new LevelEnum("strong");
-            public static readonly LevelEnum Moderate = new LevelEnum("moderate");
-            public static readonly LevelEnum Reduced = new LevelEnum("reduced");
-        }
-
-        /// <summary>
-        /// Words to emphasize
-        /// </summary>
-        public string Words { get; set; }
-        /// <summary>
-        /// Specify the degree of emphasis
-        /// </summary>
-        public SsmlEmphasis.LevelEnum Level { get; set; }
-
-        /// <summary>
-        /// Create a new SsmlEmphasis
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        public SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null) : base("emphasis")
-        {
-            this.Words = words;
-            this.Level = level;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Words != null ? this.Words : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Level != null)
-            {
-                attributes.Add(new XAttribute("level", this.Level.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        public SsmlEmphasis Break(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            var newChild = new SsmlBreak(strength, time);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Break/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlEmphasis SsmlBreak(SsmlBreak ssmlBreak)
-        {
-            this.Append(ssmlBreak);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        [System.Obsolete("This method is deprecated, use .Break() instead.")]
-        public SsmlEmphasis SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            return Break(strength, time);
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        public SsmlEmphasis Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            var newChild = new SsmlEmphasis(words, level);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Emphasis/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlEmphasis AppendSsmlEmphasis(SsmlEmphasis ssmlEmphasis)
-        {
-            this.Append(ssmlEmphasis);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
-        public SsmlEmphasis AppendSsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            return Emphasis(words, level);
-        }
-
-        /// <summary>
-        /// Create a new <Lang/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="xml:Lang"> Specify the language </param>
-        public SsmlEmphasis Lang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
-        {
-            var newChild = new SsmlLang(words, xmlLang);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Lang/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlLang"> A SsmlLang instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlEmphasis SsmlLang(SsmlLang ssmlLang)
-        {
-            this.Append(ssmlLang);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Lang/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="xml:Lang"> Specify the language </param>
-        [System.Obsolete("This method is deprecated, use .Lang() instead.")]
-        public SsmlEmphasis SsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
-        {
-            return Lang(words, xmlLang);
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        public SsmlEmphasis Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            var newChild = new SsmlPhoneme(words, alphabet, ph);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Phoneme/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlEmphasis SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
-        {
-            this.Append(ssmlPhoneme);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
-        public SsmlEmphasis SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            return Phoneme(words, alphabet, ph);
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        public SsmlEmphasis Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
-        {
-            var newChild = new SsmlProsody(words, volume, rate, pitch);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Prosody/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlEmphasis SsmlProsody(SsmlProsody ssmlProsody)
-        {
-            this.Append(ssmlProsody);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
-        public SsmlEmphasis SsmlProsody(string words = null, string volume = null, string rate = null, string pitch = null)
-        {
-            return Prosody(words, volume, rate, pitch);
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        public SsmlEmphasis SayAs(string words = null,
-                                  SsmlSayAs.InterpretAsEnum interpretAs = null,
-                                  SsmlSayAs.RoleEnum role = null)
-        {
-            var newChild = new SsmlSayAs(words, interpretAs, role);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Say-As/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlEmphasis SsmlSayAs(SsmlSayAs ssmlSayAs)
-        {
-            this.Append(ssmlSayAs);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
-        public SsmlEmphasis SsmlSayAs(string words = null,
-                                      SsmlSayAs.InterpretAsEnum interpretAs = null,
-                                      SsmlSayAs.RoleEnum role = null)
-        {
-            return SayAs(words, interpretAs, role);
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        public SsmlEmphasis Sub(string words = null, string alias = null)
-        {
-            var newChild = new SsmlSub(words, alias);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Sub/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSub"> A SsmlSub instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlEmphasis SsmlSub(SsmlSub ssmlSub)
-        {
-            this.Append(ssmlSub);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        [System.Obsolete("This method is deprecated, use .Sub() instead.")]
-        public SsmlEmphasis SsmlSub(string words = null, string alias = null)
-        {
-            return Sub(words, alias);
-        }
-
-        /// <summary>
-        /// Create a new <W/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
-        ///            meaning </param>
-        public SsmlEmphasis W(string words = null, string role = null)
-        {
-            var newChild = new SsmlW(words, role);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <W/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlW"> A SsmlW instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlEmphasis SsmlW(SsmlW ssmlW)
-        {
-            this.Append(ssmlW);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <W/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
-        ///            meaning </param>
-        [System.Obsolete("This method is deprecated, use .W() instead.")]
-        public SsmlEmphasis SsmlW(string words = null, string role = null)
-        {
-            return W(words, role);
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new SsmlEmphasis Append(TwiML childElem)
-        {
-            return (SsmlEmphasis) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new SsmlEmphasis SetOption(string key, object value)
-        {
-            return (SsmlEmphasis) base.SetOption(key, value);
-        }
-    }
+    public string Words { get; set; }
+    /// <summary>
+    /// Specify the degree of emphasis
+    /// </summary>
+    public SsmlEmphasis.LevelEnum Level { get; set; }
+
+    /// <summary>
+    /// Create a new SsmlEmphasis
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    public SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null) : base("emphasis")
+    {
+      this.Words = words;
+      this.Level = level;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Words != null ? this.Words : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Level != null)
+      {
+        attributes.Add(new XAttribute("level", this.Level.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    public SsmlEmphasis Break(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      var newChild = new SsmlBreak(strength, time);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Break/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlEmphasis SsmlBreak(SsmlBreak ssmlBreak)
+    {
+      this.Append(ssmlBreak);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    [System.Obsolete("This method is deprecated, use .Break() instead.")]
+    public SsmlEmphasis SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      return Break(strength, time);
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    public SsmlEmphasis Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      var newChild = new SsmlEmphasis(words, level);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Emphasis/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlEmphasis AppendSsmlEmphasis(SsmlEmphasis ssmlEmphasis)
+    {
+      this.Append(ssmlEmphasis);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
+    public SsmlEmphasis AppendSsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      return Emphasis(words, level);
+    }
+
+    /// <summary>
+    /// Create a new <Lang/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="xml:Lang"> Specify the language </param>
+    public SsmlEmphasis Lang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
+    {
+      var newChild = new SsmlLang(words, xmlLang);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Lang/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlLang"> A SsmlLang instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlEmphasis SsmlLang(SsmlLang ssmlLang)
+    {
+      this.Append(ssmlLang);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Lang/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="xml:Lang"> Specify the language </param>
+    [System.Obsolete("This method is deprecated, use .Lang() instead.")]
+    public SsmlEmphasis SsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
+    {
+      return Lang(words, xmlLang);
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    public SsmlEmphasis Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      var newChild = new SsmlPhoneme(words, alphabet, ph);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Phoneme/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlEmphasis SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
+    {
+      this.Append(ssmlPhoneme);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
+    public SsmlEmphasis SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      return Phoneme(words, alphabet, ph);
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    public SsmlEmphasis Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
+    {
+      var newChild = new SsmlProsody(words, volume, rate, pitch);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Prosody/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlEmphasis SsmlProsody(SsmlProsody ssmlProsody)
+    {
+      this.Append(ssmlProsody);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
+    public SsmlEmphasis SsmlProsody(string words = null, string volume = null, string rate = null, string pitch = null)
+    {
+      return Prosody(words, volume, rate, pitch);
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    public SsmlEmphasis SayAs(string words = null,
+                              SsmlSayAs.InterpretAsEnum interpretAs = null,
+                              SsmlSayAs.RoleEnum role = null)
+    {
+      var newChild = new SsmlSayAs(words, interpretAs, role);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Say-As/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlEmphasis SsmlSayAs(SsmlSayAs ssmlSayAs)
+    {
+      this.Append(ssmlSayAs);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
+    public SsmlEmphasis SsmlSayAs(string words = null,
+                                  SsmlSayAs.InterpretAsEnum interpretAs = null,
+                                  SsmlSayAs.RoleEnum role = null)
+    {
+      return SayAs(words, interpretAs, role);
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    public SsmlEmphasis Sub(string words = null, string alias = null)
+    {
+      var newChild = new SsmlSub(words, alias);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Sub/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSub"> A SsmlSub instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlEmphasis SsmlSub(SsmlSub ssmlSub)
+    {
+      this.Append(ssmlSub);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    [System.Obsolete("This method is deprecated, use .Sub() instead.")]
+    public SsmlEmphasis SsmlSub(string words = null, string alias = null)
+    {
+      return Sub(words, alias);
+    }
+
+    /// <summary>
+    /// Create a new <W/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
+    ///            meaning </param>
+    public SsmlEmphasis W(string words = null, string role = null)
+    {
+      var newChild = new SsmlW(words, role);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <W/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlW"> A SsmlW instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlEmphasis SsmlW(SsmlW ssmlW)
+    {
+      this.Append(ssmlW);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <W/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
+    ///            meaning </param>
+    [System.Obsolete("This method is deprecated, use .W() instead.")]
+    public SsmlEmphasis SsmlW(string words = null, string role = null)
+    {
+      return W(words, role);
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new SsmlEmphasis Append(TwiML childElem)
+    {
+      return (SsmlEmphasis)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new SsmlEmphasis SetOption(string key, object value)
+    {
+      return (SsmlEmphasis)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/SsmlLang.cs b/src/Twilio/TwiML/Voice/SsmlLang.cs
index 5cf7ee2e0..9c93c76f5 100644
--- a/src/Twilio/TwiML/Voice/SsmlLang.cs
+++ b/src/Twilio/TwiML/Voice/SsmlLang.cs
@@ -10,466 +10,466 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Specifying Another Language for Specific Words in Say
+  /// </summary>
+  public class SsmlLang : TwiML
+  {
+    public sealed class XmlLangEnum : StringEnum
+    {
+      private XmlLangEnum(string value) : base(value) { }
+      public XmlLangEnum() { }
+      public static implicit operator XmlLangEnum(string value)
+      {
+        return new XmlLangEnum(value);
+      }
+
+      public static readonly XmlLangEnum DaDk = new XmlLangEnum("da-DK");
+      public static readonly XmlLangEnum NlNl = new XmlLangEnum("nl-NL");
+      public static readonly XmlLangEnum EnAu = new XmlLangEnum("en-AU");
+      public static readonly XmlLangEnum EnGb = new XmlLangEnum("en-GB");
+      public static readonly XmlLangEnum EnIn = new XmlLangEnum("en-IN");
+      public static readonly XmlLangEnum EnUs = new XmlLangEnum("en-US");
+      public static readonly XmlLangEnum EnGbWls = new XmlLangEnum("en-GB-WLS");
+      public static readonly XmlLangEnum FrFr = new XmlLangEnum("fr-FR");
+      public static readonly XmlLangEnum FrCa = new XmlLangEnum("fr-CA");
+      public static readonly XmlLangEnum DeDe = new XmlLangEnum("de-DE");
+      public static readonly XmlLangEnum IsIs = new XmlLangEnum("is-IS");
+      public static readonly XmlLangEnum ItIt = new XmlLangEnum("it-IT");
+      public static readonly XmlLangEnum JaJp = new XmlLangEnum("ja-JP");
+      public static readonly XmlLangEnum KoKr = new XmlLangEnum("ko-KR");
+      public static readonly XmlLangEnum NbNo = new XmlLangEnum("nb-NO");
+      public static readonly XmlLangEnum PlPl = new XmlLangEnum("pl-PL");
+      public static readonly XmlLangEnum PtBr = new XmlLangEnum("pt-BR");
+      public static readonly XmlLangEnum PtPt = new XmlLangEnum("pt-PT");
+      public static readonly XmlLangEnum RoRo = new XmlLangEnum("ro-RO");
+      public static readonly XmlLangEnum RuRu = new XmlLangEnum("ru-RU");
+      public static readonly XmlLangEnum EsEs = new XmlLangEnum("es-ES");
+      public static readonly XmlLangEnum EsUs = new XmlLangEnum("es-US");
+      public static readonly XmlLangEnum SvSe = new XmlLangEnum("sv-SE");
+      public static readonly XmlLangEnum TrTr = new XmlLangEnum("tr-TR");
+      public static readonly XmlLangEnum CyGb = new XmlLangEnum("cy-GB");
+    }
+
     /// <summary>
-    /// Specifying Another Language for Specific Words in Say
-    /// </summary>
-    public class SsmlLang : TwiML
-    {
-        public sealed class XmlLangEnum : StringEnum
-        {
-            private XmlLangEnum(string value) : base(value) {}
-            public XmlLangEnum() {}
-            public static implicit operator XmlLangEnum(string value)
-            {
-                return new XmlLangEnum(value);
-            }
-
-            public static readonly XmlLangEnum DaDk = new XmlLangEnum("da-DK");
-            public static readonly XmlLangEnum NlNl = new XmlLangEnum("nl-NL");
-            public static readonly XmlLangEnum EnAu = new XmlLangEnum("en-AU");
-            public static readonly XmlLangEnum EnGb = new XmlLangEnum("en-GB");
-            public static readonly XmlLangEnum EnIn = new XmlLangEnum("en-IN");
-            public static readonly XmlLangEnum EnUs = new XmlLangEnum("en-US");
-            public static readonly XmlLangEnum EnGbWls = new XmlLangEnum("en-GB-WLS");
-            public static readonly XmlLangEnum FrFr = new XmlLangEnum("fr-FR");
-            public static readonly XmlLangEnum FrCa = new XmlLangEnum("fr-CA");
-            public static readonly XmlLangEnum DeDe = new XmlLangEnum("de-DE");
-            public static readonly XmlLangEnum IsIs = new XmlLangEnum("is-IS");
-            public static readonly XmlLangEnum ItIt = new XmlLangEnum("it-IT");
-            public static readonly XmlLangEnum JaJp = new XmlLangEnum("ja-JP");
-            public static readonly XmlLangEnum KoKr = new XmlLangEnum("ko-KR");
-            public static readonly XmlLangEnum NbNo = new XmlLangEnum("nb-NO");
-            public static readonly XmlLangEnum PlPl = new XmlLangEnum("pl-PL");
-            public static readonly XmlLangEnum PtBr = new XmlLangEnum("pt-BR");
-            public static readonly XmlLangEnum PtPt = new XmlLangEnum("pt-PT");
-            public static readonly XmlLangEnum RoRo = new XmlLangEnum("ro-RO");
-            public static readonly XmlLangEnum RuRu = new XmlLangEnum("ru-RU");
-            public static readonly XmlLangEnum EsEs = new XmlLangEnum("es-ES");
-            public static readonly XmlLangEnum EsUs = new XmlLangEnum("es-US");
-            public static readonly XmlLangEnum SvSe = new XmlLangEnum("sv-SE");
-            public static readonly XmlLangEnum TrTr = new XmlLangEnum("tr-TR");
-            public static readonly XmlLangEnum CyGb = new XmlLangEnum("cy-GB");
-        }
-
-        /// <summary>
-        /// Words to speak
-        /// </summary>
-        public string Words { get; set; }
-        /// <summary>
-        /// Specify the language
-        /// </summary>
-        public SsmlLang.XmlLangEnum XmlLang { get; set; }
-
-        /// <summary>
-        /// Create a new SsmlLang
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="xml:Lang"> Specify the language </param>
-        public SsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null) : base("lang")
-        {
-            this.Words = words;
-            this.XmlLang = xmlLang;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Words != null ? this.Words : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.XmlLang != null)
-            {
-                attributes.Add(new XAttribute(XNamespace.Xml + "lang", this.XmlLang.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        public SsmlLang Break(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            var newChild = new SsmlBreak(strength, time);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Break/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlLang SsmlBreak(SsmlBreak ssmlBreak)
-        {
-            this.Append(ssmlBreak);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        [System.Obsolete("This method is deprecated, use .Break() instead.")]
-        public SsmlLang SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            return Break(strength, time);
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        public SsmlLang Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            var newChild = new SsmlEmphasis(words, level);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Emphasis/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlLang SsmlEmphasis(SsmlEmphasis ssmlEmphasis)
-        {
-            this.Append(ssmlEmphasis);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
-        public SsmlLang SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            return Emphasis(words, level);
-        }
-
-        /// <summary>
-        /// Create a new <Lang/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="xml:Lang"> Specify the language </param>
-        public SsmlLang Lang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
-        {
-            var newChild = new SsmlLang(words, xmlLang);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Lang/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlLang"> A SsmlLang instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlLang AppendSsmlLang(SsmlLang ssmlLang)
-        {
-            this.Append(ssmlLang);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Lang/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="xml:Lang"> Specify the language </param>
-        [System.Obsolete("This method is deprecated, use .Lang() instead.")]
-        public SsmlLang AppendSsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
-        {
-            return Lang(words, xmlLang);
-        }
-
-        /// <summary>
-        /// Create a new <P/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        public SsmlLang P(string words = null)
-        {
-            var newChild = new SsmlP(words);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <P/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlP"> A SsmlP instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlLang SsmlP(SsmlP ssmlP)
-        {
-            this.Append(ssmlP);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <P/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        [System.Obsolete("This method is deprecated, use .P() instead.")]
-        public SsmlLang SsmlP(string words = null)
-        {
-            return P(words);
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        public SsmlLang Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            var newChild = new SsmlPhoneme(words, alphabet, ph);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Phoneme/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlLang SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
-        {
-            this.Append(ssmlPhoneme);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
-        public SsmlLang SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            return Phoneme(words, alphabet, ph);
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        public SsmlLang Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
-        {
-            var newChild = new SsmlProsody(words, volume, rate, pitch);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Prosody/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlLang SsmlProsody(SsmlProsody ssmlProsody)
-        {
-            this.Append(ssmlProsody);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
-        public SsmlLang SsmlProsody(string words = null, string volume = null, string rate = null, string pitch = null)
-        {
-            return Prosody(words, volume, rate, pitch);
-        }
-
-        /// <summary>
-        /// Create a new <S/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        public SsmlLang S(string words = null)
-        {
-            var newChild = new SsmlS(words);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <S/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlS"> A SsmlS instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlLang SsmlS(SsmlS ssmlS)
-        {
-            this.Append(ssmlS);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <S/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        [System.Obsolete("This method is deprecated, use .S() instead.")]
-        public SsmlLang SsmlS(string words = null)
-        {
-            return S(words);
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        public SsmlLang SayAs(string words = null,
-                              SsmlSayAs.InterpretAsEnum interpretAs = null,
-                              SsmlSayAs.RoleEnum role = null)
-        {
-            var newChild = new SsmlSayAs(words, interpretAs, role);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Say-As/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlLang SsmlSayAs(SsmlSayAs ssmlSayAs)
-        {
-            this.Append(ssmlSayAs);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
-        public SsmlLang SsmlSayAs(string words = null,
-                                  SsmlSayAs.InterpretAsEnum interpretAs = null,
-                                  SsmlSayAs.RoleEnum role = null)
-        {
-            return SayAs(words, interpretAs, role);
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        public SsmlLang Sub(string words = null, string alias = null)
-        {
-            var newChild = new SsmlSub(words, alias);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Sub/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSub"> A SsmlSub instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlLang SsmlSub(SsmlSub ssmlSub)
-        {
-            this.Append(ssmlSub);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        [System.Obsolete("This method is deprecated, use .Sub() instead.")]
-        public SsmlLang SsmlSub(string words = null, string alias = null)
-        {
-            return Sub(words, alias);
-        }
-
-        /// <summary>
-        /// Create a new <W/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
-        ///            meaning </param>
-        public SsmlLang W(string words = null, string role = null)
-        {
-            var newChild = new SsmlW(words, role);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <W/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlW"> A SsmlW instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlLang SsmlW(SsmlW ssmlW)
-        {
-            this.Append(ssmlW);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <W/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
-        ///            meaning </param>
-        [System.Obsolete("This method is deprecated, use .W() instead.")]
-        public SsmlLang SsmlW(string words = null, string role = null)
-        {
-            return W(words, role);
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new SsmlLang Append(TwiML childElem)
-        {
-            return (SsmlLang) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new SsmlLang SetOption(string key, object value)
-        {
-            return (SsmlLang) base.SetOption(key, value);
-        }
-    }
+    /// Words to speak
+    /// </summary>
+    public string Words { get; set; }
+    /// <summary>
+    /// Specify the language
+    /// </summary>
+    public SsmlLang.XmlLangEnum XmlLang { get; set; }
+
+    /// <summary>
+    /// Create a new SsmlLang
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="xml:Lang"> Specify the language </param>
+    public SsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null) : base("lang")
+    {
+      this.Words = words;
+      this.XmlLang = xmlLang;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Words != null ? this.Words : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.XmlLang != null)
+      {
+        attributes.Add(new XAttribute(XNamespace.Xml + "lang", this.XmlLang.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    public SsmlLang Break(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      var newChild = new SsmlBreak(strength, time);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Break/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlLang SsmlBreak(SsmlBreak ssmlBreak)
+    {
+      this.Append(ssmlBreak);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    [System.Obsolete("This method is deprecated, use .Break() instead.")]
+    public SsmlLang SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      return Break(strength, time);
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    public SsmlLang Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      var newChild = new SsmlEmphasis(words, level);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Emphasis/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlLang SsmlEmphasis(SsmlEmphasis ssmlEmphasis)
+    {
+      this.Append(ssmlEmphasis);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
+    public SsmlLang SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      return Emphasis(words, level);
+    }
+
+    /// <summary>
+    /// Create a new <Lang/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="xml:Lang"> Specify the language </param>
+    public SsmlLang Lang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
+    {
+      var newChild = new SsmlLang(words, xmlLang);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Lang/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlLang"> A SsmlLang instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlLang AppendSsmlLang(SsmlLang ssmlLang)
+    {
+      this.Append(ssmlLang);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Lang/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="xml:Lang"> Specify the language </param>
+    [System.Obsolete("This method is deprecated, use .Lang() instead.")]
+    public SsmlLang AppendSsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
+    {
+      return Lang(words, xmlLang);
+    }
+
+    /// <summary>
+    /// Create a new <P/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    public SsmlLang P(string words = null)
+    {
+      var newChild = new SsmlP(words);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <P/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlP"> A SsmlP instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlLang SsmlP(SsmlP ssmlP)
+    {
+      this.Append(ssmlP);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <P/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    [System.Obsolete("This method is deprecated, use .P() instead.")]
+    public SsmlLang SsmlP(string words = null)
+    {
+      return P(words);
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    public SsmlLang Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      var newChild = new SsmlPhoneme(words, alphabet, ph);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Phoneme/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlLang SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
+    {
+      this.Append(ssmlPhoneme);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
+    public SsmlLang SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      return Phoneme(words, alphabet, ph);
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    public SsmlLang Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
+    {
+      var newChild = new SsmlProsody(words, volume, rate, pitch);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Prosody/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlLang SsmlProsody(SsmlProsody ssmlProsody)
+    {
+      this.Append(ssmlProsody);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
+    public SsmlLang SsmlProsody(string words = null, string volume = null, string rate = null, string pitch = null)
+    {
+      return Prosody(words, volume, rate, pitch);
+    }
+
+    /// <summary>
+    /// Create a new <S/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    public SsmlLang S(string words = null)
+    {
+      var newChild = new SsmlS(words);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <S/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlS"> A SsmlS instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlLang SsmlS(SsmlS ssmlS)
+    {
+      this.Append(ssmlS);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <S/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    [System.Obsolete("This method is deprecated, use .S() instead.")]
+    public SsmlLang SsmlS(string words = null)
+    {
+      return S(words);
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    public SsmlLang SayAs(string words = null,
+                          SsmlSayAs.InterpretAsEnum interpretAs = null,
+                          SsmlSayAs.RoleEnum role = null)
+    {
+      var newChild = new SsmlSayAs(words, interpretAs, role);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Say-As/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlLang SsmlSayAs(SsmlSayAs ssmlSayAs)
+    {
+      this.Append(ssmlSayAs);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
+    public SsmlLang SsmlSayAs(string words = null,
+                              SsmlSayAs.InterpretAsEnum interpretAs = null,
+                              SsmlSayAs.RoleEnum role = null)
+    {
+      return SayAs(words, interpretAs, role);
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    public SsmlLang Sub(string words = null, string alias = null)
+    {
+      var newChild = new SsmlSub(words, alias);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Sub/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSub"> A SsmlSub instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlLang SsmlSub(SsmlSub ssmlSub)
+    {
+      this.Append(ssmlSub);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    [System.Obsolete("This method is deprecated, use .Sub() instead.")]
+    public SsmlLang SsmlSub(string words = null, string alias = null)
+    {
+      return Sub(words, alias);
+    }
+
+    /// <summary>
+    /// Create a new <W/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
+    ///            meaning </param>
+    public SsmlLang W(string words = null, string role = null)
+    {
+      var newChild = new SsmlW(words, role);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <W/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlW"> A SsmlW instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlLang SsmlW(SsmlW ssmlW)
+    {
+      this.Append(ssmlW);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <W/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
+    ///            meaning </param>
+    [System.Obsolete("This method is deprecated, use .W() instead.")]
+    public SsmlLang SsmlW(string words = null, string role = null)
+    {
+      return W(words, role);
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new SsmlLang Append(TwiML childElem)
+    {
+      return (SsmlLang)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new SsmlLang SetOption(string key, object value)
+    {
+      return (SsmlLang)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/SsmlP.cs b/src/Twilio/TwiML/Voice/SsmlP.cs
index 340c61d15..78355f752 100644
--- a/src/Twilio/TwiML/Voice/SsmlP.cs
+++ b/src/Twilio/TwiML/Voice/SsmlP.cs
@@ -8,377 +8,377 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Adding a Pause Between Paragraphs in Say
+  /// </summary>
+  public class SsmlP : TwiML
+  {
     /// <summary>
-    /// Adding a Pause Between Paragraphs in Say
+    /// Words to speak
     /// </summary>
-    public class SsmlP : TwiML
-    {
-        /// <summary>
-        /// Words to speak
-        /// </summary>
-        public string Words { get; set; }
-
-        /// <summary>
-        /// Create a new SsmlP
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        public SsmlP(string words = null) : base("p")
-        {
-            this.Words = words;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Words != null ? this.Words : string.Empty;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        public SsmlP Break(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            var newChild = new SsmlBreak(strength, time);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Break/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlP SsmlBreak(SsmlBreak ssmlBreak)
-        {
-            this.Append(ssmlBreak);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        [System.Obsolete("This method is deprecated, use .Break() instead.")]
-        public SsmlP SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            return Break(strength, time);
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        public SsmlP Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            var newChild = new SsmlEmphasis(words, level);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Emphasis/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlP SsmlEmphasis(SsmlEmphasis ssmlEmphasis)
-        {
-            this.Append(ssmlEmphasis);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
-        public SsmlP SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            return Emphasis(words, level);
-        }
-
-        /// <summary>
-        /// Create a new <Lang/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="xml:Lang"> Specify the language </param>
-        public SsmlP Lang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
-        {
-            var newChild = new SsmlLang(words, xmlLang);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Lang/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlLang"> A SsmlLang instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlP SsmlLang(SsmlLang ssmlLang)
-        {
-            this.Append(ssmlLang);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Lang/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="xml:Lang"> Specify the language </param>
-        [System.Obsolete("This method is deprecated, use .Lang() instead.")]
-        public SsmlP SsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
-        {
-            return Lang(words, xmlLang);
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        public SsmlP Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            var newChild = new SsmlPhoneme(words, alphabet, ph);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Phoneme/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlP SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
-        {
-            this.Append(ssmlPhoneme);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
-        public SsmlP SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            return Phoneme(words, alphabet, ph);
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        public SsmlP Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
-        {
-            var newChild = new SsmlProsody(words, volume, rate, pitch);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Prosody/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlP SsmlProsody(SsmlProsody ssmlProsody)
-        {
-            this.Append(ssmlProsody);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
-        public SsmlP SsmlProsody(string words = null, string volume = null, string rate = null, string pitch = null)
-        {
-            return Prosody(words, volume, rate, pitch);
-        }
-
-        /// <summary>
-        /// Create a new <S/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        public SsmlP S(string words = null)
-        {
-            var newChild = new SsmlS(words);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <S/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlS"> A SsmlS instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlP SsmlS(SsmlS ssmlS)
-        {
-            this.Append(ssmlS);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <S/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        [System.Obsolete("This method is deprecated, use .S() instead.")]
-        public SsmlP SsmlS(string words = null)
-        {
-            return S(words);
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        public SsmlP SayAs(string words = null, SsmlSayAs.InterpretAsEnum interpretAs = null, SsmlSayAs.RoleEnum role = null)
-        {
-            var newChild = new SsmlSayAs(words, interpretAs, role);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Say-As/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlP SsmlSayAs(SsmlSayAs ssmlSayAs)
-        {
-            this.Append(ssmlSayAs);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
-        public SsmlP SsmlSayAs(string words = null,
-                               SsmlSayAs.InterpretAsEnum interpretAs = null,
-                               SsmlSayAs.RoleEnum role = null)
-        {
-            return SayAs(words, interpretAs, role);
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        public SsmlP Sub(string words = null, string alias = null)
-        {
-            var newChild = new SsmlSub(words, alias);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Sub/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSub"> A SsmlSub instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlP SsmlSub(SsmlSub ssmlSub)
-        {
-            this.Append(ssmlSub);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        [System.Obsolete("This method is deprecated, use .Sub() instead.")]
-        public SsmlP SsmlSub(string words = null, string alias = null)
-        {
-            return Sub(words, alias);
-        }
-
-        /// <summary>
-        /// Create a new <W/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
-        ///            meaning </param>
-        public SsmlP W(string words = null, string role = null)
-        {
-            var newChild = new SsmlW(words, role);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <W/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlW"> A SsmlW instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlP SsmlW(SsmlW ssmlW)
-        {
-            this.Append(ssmlW);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <W/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
-        ///            meaning </param>
-        [System.Obsolete("This method is deprecated, use .W() instead.")]
-        public SsmlP SsmlW(string words = null, string role = null)
-        {
-            return W(words, role);
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new SsmlP Append(TwiML childElem)
-        {
-            return (SsmlP) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new SsmlP SetOption(string key, object value)
-        {
-            return (SsmlP) base.SetOption(key, value);
-        }
-    }
+    public string Words { get; set; }
+
+    /// <summary>
+    /// Create a new SsmlP
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    public SsmlP(string words = null) : base("p")
+    {
+      this.Words = words;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Words != null ? this.Words : string.Empty;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    public SsmlP Break(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      var newChild = new SsmlBreak(strength, time);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Break/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlP SsmlBreak(SsmlBreak ssmlBreak)
+    {
+      this.Append(ssmlBreak);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    [System.Obsolete("This method is deprecated, use .Break() instead.")]
+    public SsmlP SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      return Break(strength, time);
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    public SsmlP Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      var newChild = new SsmlEmphasis(words, level);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Emphasis/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlP SsmlEmphasis(SsmlEmphasis ssmlEmphasis)
+    {
+      this.Append(ssmlEmphasis);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
+    public SsmlP SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      return Emphasis(words, level);
+    }
+
+    /// <summary>
+    /// Create a new <Lang/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="xml:Lang"> Specify the language </param>
+    public SsmlP Lang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
+    {
+      var newChild = new SsmlLang(words, xmlLang);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Lang/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlLang"> A SsmlLang instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlP SsmlLang(SsmlLang ssmlLang)
+    {
+      this.Append(ssmlLang);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Lang/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="xml:Lang"> Specify the language </param>
+    [System.Obsolete("This method is deprecated, use .Lang() instead.")]
+    public SsmlP SsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
+    {
+      return Lang(words, xmlLang);
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    public SsmlP Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      var newChild = new SsmlPhoneme(words, alphabet, ph);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Phoneme/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlP SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
+    {
+      this.Append(ssmlPhoneme);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
+    public SsmlP SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      return Phoneme(words, alphabet, ph);
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    public SsmlP Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
+    {
+      var newChild = new SsmlProsody(words, volume, rate, pitch);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Prosody/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlP SsmlProsody(SsmlProsody ssmlProsody)
+    {
+      this.Append(ssmlProsody);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
+    public SsmlP SsmlProsody(string words = null, string volume = null, string rate = null, string pitch = null)
+    {
+      return Prosody(words, volume, rate, pitch);
+    }
+
+    /// <summary>
+    /// Create a new <S/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    public SsmlP S(string words = null)
+    {
+      var newChild = new SsmlS(words);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <S/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlS"> A SsmlS instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlP SsmlS(SsmlS ssmlS)
+    {
+      this.Append(ssmlS);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <S/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    [System.Obsolete("This method is deprecated, use .S() instead.")]
+    public SsmlP SsmlS(string words = null)
+    {
+      return S(words);
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    public SsmlP SayAs(string words = null, SsmlSayAs.InterpretAsEnum interpretAs = null, SsmlSayAs.RoleEnum role = null)
+    {
+      var newChild = new SsmlSayAs(words, interpretAs, role);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Say-As/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlP SsmlSayAs(SsmlSayAs ssmlSayAs)
+    {
+      this.Append(ssmlSayAs);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
+    public SsmlP SsmlSayAs(string words = null,
+                           SsmlSayAs.InterpretAsEnum interpretAs = null,
+                           SsmlSayAs.RoleEnum role = null)
+    {
+      return SayAs(words, interpretAs, role);
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    public SsmlP Sub(string words = null, string alias = null)
+    {
+      var newChild = new SsmlSub(words, alias);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Sub/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSub"> A SsmlSub instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlP SsmlSub(SsmlSub ssmlSub)
+    {
+      this.Append(ssmlSub);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    [System.Obsolete("This method is deprecated, use .Sub() instead.")]
+    public SsmlP SsmlSub(string words = null, string alias = null)
+    {
+      return Sub(words, alias);
+    }
+
+    /// <summary>
+    /// Create a new <W/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
+    ///            meaning </param>
+    public SsmlP W(string words = null, string role = null)
+    {
+      var newChild = new SsmlW(words, role);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <W/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlW"> A SsmlW instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlP SsmlW(SsmlW ssmlW)
+    {
+      this.Append(ssmlW);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <W/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
+    ///            meaning </param>
+    [System.Obsolete("This method is deprecated, use .W() instead.")]
+    public SsmlP SsmlW(string words = null, string role = null)
+    {
+      return W(words, role);
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new SsmlP Append(TwiML childElem)
+    {
+      return (SsmlP)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new SsmlP SetOption(string key, object value)
+    {
+      return (SsmlP)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/SsmlPhoneme.cs b/src/Twilio/TwiML/Voice/SsmlPhoneme.cs
index 7ba7113d6..cbdfaafb3 100644
--- a/src/Twilio/TwiML/Voice/SsmlPhoneme.cs
+++ b/src/Twilio/TwiML/Voice/SsmlPhoneme.cs
@@ -10,95 +10,95 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Using Phonetic Pronunciation in Say
+  /// </summary>
+  public class SsmlPhoneme : TwiML
+  {
+    public sealed class AlphabetEnum : StringEnum
+    {
+      private AlphabetEnum(string value) : base(value) { }
+      public AlphabetEnum() { }
+      public static implicit operator AlphabetEnum(string value)
+      {
+        return new AlphabetEnum(value);
+      }
+
+      public static readonly AlphabetEnum Ipa = new AlphabetEnum("ipa");
+      public static readonly AlphabetEnum XSampa = new AlphabetEnum("x-sampa");
+    }
+
     /// <summary>
-    /// Using Phonetic Pronunciation in Say
+    /// Words to speak
     /// </summary>
-    public class SsmlPhoneme : TwiML
-    {
-        public sealed class AlphabetEnum : StringEnum
-        {
-            private AlphabetEnum(string value) : base(value) {}
-            public AlphabetEnum() {}
-            public static implicit operator AlphabetEnum(string value)
-            {
-                return new AlphabetEnum(value);
-            }
-
-            public static readonly AlphabetEnum Ipa = new AlphabetEnum("ipa");
-            public static readonly AlphabetEnum XSampa = new AlphabetEnum("x-sampa");
-        }
-
-        /// <summary>
-        /// Words to speak
-        /// </summary>
-        public string Words { get; set; }
-        /// <summary>
-        /// Specify the phonetic alphabet
-        /// </summary>
-        public SsmlPhoneme.AlphabetEnum Alphabet { get; set; }
-        /// <summary>
-        /// Specifiy the phonetic symbols for pronunciation
-        /// </summary>
-        public string Ph { get; set; }
-
-        /// <summary>
-        /// Create a new SsmlPhoneme
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        public SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null) : base("phoneme")
-        {
-            this.Words = words;
-            this.Alphabet = alphabet;
-            this.Ph = ph;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Words != null ? this.Words : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Alphabet != null)
-            {
-                attributes.Add(new XAttribute("alphabet", this.Alphabet.ToString()));
-            }
-            if (this.Ph != null)
-            {
-                attributes.Add(new XAttribute("ph", this.Ph));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new SsmlPhoneme Append(TwiML childElem)
-        {
-            return (SsmlPhoneme) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new SsmlPhoneme SetOption(string key, object value)
-        {
-            return (SsmlPhoneme) base.SetOption(key, value);
-        }
-    }
+    public string Words { get; set; }
+    /// <summary>
+    /// Specify the phonetic alphabet
+    /// </summary>
+    public SsmlPhoneme.AlphabetEnum Alphabet { get; set; }
+    /// <summary>
+    /// Specifiy the phonetic symbols for pronunciation
+    /// </summary>
+    public string Ph { get; set; }
+
+    /// <summary>
+    /// Create a new SsmlPhoneme
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    public SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null) : base("phoneme")
+    {
+      this.Words = words;
+      this.Alphabet = alphabet;
+      this.Ph = ph;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Words != null ? this.Words : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Alphabet != null)
+      {
+        attributes.Add(new XAttribute("alphabet", this.Alphabet.ToString()));
+      }
+      if (this.Ph != null)
+      {
+        attributes.Add(new XAttribute("ph", this.Ph));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new SsmlPhoneme Append(TwiML childElem)
+    {
+      return (SsmlPhoneme)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new SsmlPhoneme SetOption(string key, object value)
+    {
+      return (SsmlPhoneme)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/SsmlProsody.cs b/src/Twilio/TwiML/Voice/SsmlProsody.cs
index 234d0b9ca..a0affb186 100644
--- a/src/Twilio/TwiML/Voice/SsmlProsody.cs
+++ b/src/Twilio/TwiML/Voice/SsmlProsody.cs
@@ -9,458 +9,458 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Controling Volume, Speaking Rate, and Pitch in Say
+  /// </summary>
+  public class SsmlProsody : TwiML
+  {
     /// <summary>
-    /// Controling Volume, Speaking Rate, and Pitch in Say
-    /// </summary>
-    public class SsmlProsody : TwiML
-    {
-        /// <summary>
-        /// Words to speak
-        /// </summary>
-        public string Words { get; set; }
-        /// <summary>
-        /// Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud, +ndB, -ndB
-        /// </summary>
-        public string Volume { get; set; }
-        /// <summary>
-        /// Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n%
-        /// </summary>
-        public string Rate { get; set; }
-        /// <summary>
-        /// Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        /// </summary>
-        public string Pitch { get; set; }
-
-        /// <summary>
-        /// Create a new SsmlProsody
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        public SsmlProsody(string words = null,
-                           string volume = null,
-                           string rate = null,
-                           string pitch = null) : base("prosody")
-        {
-            this.Words = words;
-            this.Volume = volume;
-            this.Rate = rate;
-            this.Pitch = pitch;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Words != null ? this.Words : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Volume != null)
-            {
-                attributes.Add(new XAttribute("volume", this.Volume));
-            }
-            if (this.Rate != null)
-            {
-                attributes.Add(new XAttribute("rate", this.Rate));
-            }
-            if (this.Pitch != null)
-            {
-                attributes.Add(new XAttribute("pitch", this.Pitch));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        public SsmlProsody Break(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            var newChild = new SsmlBreak(strength, time);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Break/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlProsody SsmlBreak(SsmlBreak ssmlBreak)
-        {
-            this.Append(ssmlBreak);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        [System.Obsolete("This method is deprecated, use .Break() instead.")]
-        public SsmlProsody SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            return Break(strength, time);
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        public SsmlProsody Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            var newChild = new SsmlEmphasis(words, level);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Emphasis/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlProsody SsmlEmphasis(SsmlEmphasis ssmlEmphasis)
-        {
-            this.Append(ssmlEmphasis);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
-        public SsmlProsody SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            return Emphasis(words, level);
-        }
-
-        /// <summary>
-        /// Create a new <Lang/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="xml:Lang"> Specify the language </param>
-        public SsmlProsody Lang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
-        {
-            var newChild = new SsmlLang(words, xmlLang);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Lang/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlLang"> A SsmlLang instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlProsody SsmlLang(SsmlLang ssmlLang)
-        {
-            this.Append(ssmlLang);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Lang/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="xml:Lang"> Specify the language </param>
-        [System.Obsolete("This method is deprecated, use .Lang() instead.")]
-        public SsmlProsody SsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
-        {
-            return Lang(words, xmlLang);
-        }
-
-        /// <summary>
-        /// Create a new <P/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        public SsmlProsody P(string words = null)
-        {
-            var newChild = new SsmlP(words);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <P/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlP"> A SsmlP instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlProsody SsmlP(SsmlP ssmlP)
-        {
-            this.Append(ssmlP);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <P/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        [System.Obsolete("This method is deprecated, use .P() instead.")]
-        public SsmlProsody SsmlP(string words = null)
-        {
-            return P(words);
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        public SsmlProsody Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            var newChild = new SsmlPhoneme(words, alphabet, ph);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Phoneme/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlProsody SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
-        {
-            this.Append(ssmlPhoneme);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
-        public SsmlProsody SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            return Phoneme(words, alphabet, ph);
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        public SsmlProsody Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
-        {
-            var newChild = new SsmlProsody(words, volume, rate, pitch);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Prosody/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlProsody AppendSsmlProsody(SsmlProsody ssmlProsody)
-        {
-            this.Append(ssmlProsody);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
-        public SsmlProsody AppendSsmlProsody(string words = null,
-                                             string volume = null,
-                                             string rate = null,
-                                             string pitch = null)
-        {
-            return Prosody(words, volume, rate, pitch);
-        }
-
-        /// <summary>
-        /// Create a new <S/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        public SsmlProsody S(string words = null)
-        {
-            var newChild = new SsmlS(words);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <S/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlS"> A SsmlS instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlProsody SsmlS(SsmlS ssmlS)
-        {
-            this.Append(ssmlS);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <S/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        [System.Obsolete("This method is deprecated, use .S() instead.")]
-        public SsmlProsody SsmlS(string words = null)
-        {
-            return S(words);
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        public SsmlProsody SayAs(string words = null,
-                                 SsmlSayAs.InterpretAsEnum interpretAs = null,
-                                 SsmlSayAs.RoleEnum role = null)
-        {
-            var newChild = new SsmlSayAs(words, interpretAs, role);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Say-As/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlProsody SsmlSayAs(SsmlSayAs ssmlSayAs)
-        {
-            this.Append(ssmlSayAs);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
-        public SsmlProsody SsmlSayAs(string words = null,
-                                     SsmlSayAs.InterpretAsEnum interpretAs = null,
-                                     SsmlSayAs.RoleEnum role = null)
-        {
-            return SayAs(words, interpretAs, role);
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        public SsmlProsody Sub(string words = null, string alias = null)
-        {
-            var newChild = new SsmlSub(words, alias);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Sub/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSub"> A SsmlSub instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlProsody SsmlSub(SsmlSub ssmlSub)
-        {
-            this.Append(ssmlSub);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        [System.Obsolete("This method is deprecated, use .Sub() instead.")]
-        public SsmlProsody SsmlSub(string words = null, string alias = null)
-        {
-            return Sub(words, alias);
-        }
-
-        /// <summary>
-        /// Create a new <W/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
-        ///            meaning </param>
-        public SsmlProsody W(string words = null, string role = null)
-        {
-            var newChild = new SsmlW(words, role);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <W/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlW"> A SsmlW instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlProsody SsmlW(SsmlW ssmlW)
-        {
-            this.Append(ssmlW);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <W/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
-        ///            meaning </param>
-        [System.Obsolete("This method is deprecated, use .W() instead.")]
-        public SsmlProsody SsmlW(string words = null, string role = null)
-        {
-            return W(words, role);
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new SsmlProsody Append(TwiML childElem)
-        {
-            return (SsmlProsody) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new SsmlProsody SetOption(string key, object value)
-        {
-            return (SsmlProsody) base.SetOption(key, value);
-        }
-    }
+    /// Words to speak
+    /// </summary>
+    public string Words { get; set; }
+    /// <summary>
+    /// Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud, +ndB, -ndB
+    /// </summary>
+    public string Volume { get; set; }
+    /// <summary>
+    /// Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n%
+    /// </summary>
+    public string Rate { get; set; }
+    /// <summary>
+    /// Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    /// </summary>
+    public string Pitch { get; set; }
+
+    /// <summary>
+    /// Create a new SsmlProsody
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    public SsmlProsody(string words = null,
+                       string volume = null,
+                       string rate = null,
+                       string pitch = null) : base("prosody")
+    {
+      this.Words = words;
+      this.Volume = volume;
+      this.Rate = rate;
+      this.Pitch = pitch;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Words != null ? this.Words : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Volume != null)
+      {
+        attributes.Add(new XAttribute("volume", this.Volume));
+      }
+      if (this.Rate != null)
+      {
+        attributes.Add(new XAttribute("rate", this.Rate));
+      }
+      if (this.Pitch != null)
+      {
+        attributes.Add(new XAttribute("pitch", this.Pitch));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    public SsmlProsody Break(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      var newChild = new SsmlBreak(strength, time);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Break/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlProsody SsmlBreak(SsmlBreak ssmlBreak)
+    {
+      this.Append(ssmlBreak);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    [System.Obsolete("This method is deprecated, use .Break() instead.")]
+    public SsmlProsody SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      return Break(strength, time);
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    public SsmlProsody Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      var newChild = new SsmlEmphasis(words, level);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Emphasis/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlProsody SsmlEmphasis(SsmlEmphasis ssmlEmphasis)
+    {
+      this.Append(ssmlEmphasis);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
+    public SsmlProsody SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      return Emphasis(words, level);
+    }
+
+    /// <summary>
+    /// Create a new <Lang/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="xml:Lang"> Specify the language </param>
+    public SsmlProsody Lang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
+    {
+      var newChild = new SsmlLang(words, xmlLang);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Lang/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlLang"> A SsmlLang instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlProsody SsmlLang(SsmlLang ssmlLang)
+    {
+      this.Append(ssmlLang);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Lang/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="xml:Lang"> Specify the language </param>
+    [System.Obsolete("This method is deprecated, use .Lang() instead.")]
+    public SsmlProsody SsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
+    {
+      return Lang(words, xmlLang);
+    }
+
+    /// <summary>
+    /// Create a new <P/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    public SsmlProsody P(string words = null)
+    {
+      var newChild = new SsmlP(words);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <P/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlP"> A SsmlP instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlProsody SsmlP(SsmlP ssmlP)
+    {
+      this.Append(ssmlP);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <P/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    [System.Obsolete("This method is deprecated, use .P() instead.")]
+    public SsmlProsody SsmlP(string words = null)
+    {
+      return P(words);
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    public SsmlProsody Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      var newChild = new SsmlPhoneme(words, alphabet, ph);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Phoneme/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlProsody SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
+    {
+      this.Append(ssmlPhoneme);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
+    public SsmlProsody SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      return Phoneme(words, alphabet, ph);
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    public SsmlProsody Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
+    {
+      var newChild = new SsmlProsody(words, volume, rate, pitch);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Prosody/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlProsody AppendSsmlProsody(SsmlProsody ssmlProsody)
+    {
+      this.Append(ssmlProsody);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
+    public SsmlProsody AppendSsmlProsody(string words = null,
+                                         string volume = null,
+                                         string rate = null,
+                                         string pitch = null)
+    {
+      return Prosody(words, volume, rate, pitch);
+    }
+
+    /// <summary>
+    /// Create a new <S/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    public SsmlProsody S(string words = null)
+    {
+      var newChild = new SsmlS(words);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <S/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlS"> A SsmlS instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlProsody SsmlS(SsmlS ssmlS)
+    {
+      this.Append(ssmlS);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <S/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    [System.Obsolete("This method is deprecated, use .S() instead.")]
+    public SsmlProsody SsmlS(string words = null)
+    {
+      return S(words);
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    public SsmlProsody SayAs(string words = null,
+                             SsmlSayAs.InterpretAsEnum interpretAs = null,
+                             SsmlSayAs.RoleEnum role = null)
+    {
+      var newChild = new SsmlSayAs(words, interpretAs, role);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Say-As/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlProsody SsmlSayAs(SsmlSayAs ssmlSayAs)
+    {
+      this.Append(ssmlSayAs);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
+    public SsmlProsody SsmlSayAs(string words = null,
+                                 SsmlSayAs.InterpretAsEnum interpretAs = null,
+                                 SsmlSayAs.RoleEnum role = null)
+    {
+      return SayAs(words, interpretAs, role);
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    public SsmlProsody Sub(string words = null, string alias = null)
+    {
+      var newChild = new SsmlSub(words, alias);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Sub/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSub"> A SsmlSub instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlProsody SsmlSub(SsmlSub ssmlSub)
+    {
+      this.Append(ssmlSub);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    [System.Obsolete("This method is deprecated, use .Sub() instead.")]
+    public SsmlProsody SsmlSub(string words = null, string alias = null)
+    {
+      return Sub(words, alias);
+    }
+
+    /// <summary>
+    /// Create a new <W/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
+    ///            meaning </param>
+    public SsmlProsody W(string words = null, string role = null)
+    {
+      var newChild = new SsmlW(words, role);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <W/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlW"> A SsmlW instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlProsody SsmlW(SsmlW ssmlW)
+    {
+      this.Append(ssmlW);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <W/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
+    ///            meaning </param>
+    [System.Obsolete("This method is deprecated, use .W() instead.")]
+    public SsmlProsody SsmlW(string words = null, string role = null)
+    {
+      return W(words, role);
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new SsmlProsody Append(TwiML childElem)
+    {
+      return (SsmlProsody)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new SsmlProsody SetOption(string key, object value)
+    {
+      return (SsmlProsody)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/SsmlS.cs b/src/Twilio/TwiML/Voice/SsmlS.cs
index b2e91c577..e0452f3d3 100644
--- a/src/Twilio/TwiML/Voice/SsmlS.cs
+++ b/src/Twilio/TwiML/Voice/SsmlS.cs
@@ -8,345 +8,345 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Adding A Pause Between Sentences in Say
+  /// </summary>
+  public class SsmlS : TwiML
+  {
     /// <summary>
-    /// Adding A Pause Between Sentences in Say
+    /// Words to speak
     /// </summary>
-    public class SsmlS : TwiML
-    {
-        /// <summary>
-        /// Words to speak
-        /// </summary>
-        public string Words { get; set; }
-
-        /// <summary>
-        /// Create a new SsmlS
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        public SsmlS(string words = null) : base("s")
-        {
-            this.Words = words;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Words != null ? this.Words : string.Empty;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        public SsmlS Break(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            var newChild = new SsmlBreak(strength, time);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Break/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlS SsmlBreak(SsmlBreak ssmlBreak)
-        {
-            this.Append(ssmlBreak);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        [System.Obsolete("This method is deprecated, use .Break() instead.")]
-        public SsmlS SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            return Break(strength, time);
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        public SsmlS Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            var newChild = new SsmlEmphasis(words, level);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Emphasis/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlS SsmlEmphasis(SsmlEmphasis ssmlEmphasis)
-        {
-            this.Append(ssmlEmphasis);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
-        public SsmlS SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            return Emphasis(words, level);
-        }
-
-        /// <summary>
-        /// Create a new <Lang/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="xml:Lang"> Specify the language </param>
-        public SsmlS Lang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
-        {
-            var newChild = new SsmlLang(words, xmlLang);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Lang/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlLang"> A SsmlLang instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlS SsmlLang(SsmlLang ssmlLang)
-        {
-            this.Append(ssmlLang);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Lang/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="xml:Lang"> Specify the language </param>
-        [System.Obsolete("This method is deprecated, use .Lang() instead.")]
-        public SsmlS SsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
-        {
-            return Lang(words, xmlLang);
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        public SsmlS Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            var newChild = new SsmlPhoneme(words, alphabet, ph);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Phoneme/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlS SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
-        {
-            this.Append(ssmlPhoneme);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
-        public SsmlS SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            return Phoneme(words, alphabet, ph);
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        public SsmlS Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
-        {
-            var newChild = new SsmlProsody(words, volume, rate, pitch);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Prosody/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlS SsmlProsody(SsmlProsody ssmlProsody)
-        {
-            this.Append(ssmlProsody);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
-        public SsmlS SsmlProsody(string words = null, string volume = null, string rate = null, string pitch = null)
-        {
-            return Prosody(words, volume, rate, pitch);
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        public SsmlS SayAs(string words = null, SsmlSayAs.InterpretAsEnum interpretAs = null, SsmlSayAs.RoleEnum role = null)
-        {
-            var newChild = new SsmlSayAs(words, interpretAs, role);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Say-As/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlS SsmlSayAs(SsmlSayAs ssmlSayAs)
-        {
-            this.Append(ssmlSayAs);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
-        public SsmlS SsmlSayAs(string words = null,
-                               SsmlSayAs.InterpretAsEnum interpretAs = null,
-                               SsmlSayAs.RoleEnum role = null)
-        {
-            return SayAs(words, interpretAs, role);
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        public SsmlS Sub(string words = null, string alias = null)
-        {
-            var newChild = new SsmlSub(words, alias);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Sub/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSub"> A SsmlSub instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlS SsmlSub(SsmlSub ssmlSub)
-        {
-            this.Append(ssmlSub);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        [System.Obsolete("This method is deprecated, use .Sub() instead.")]
-        public SsmlS SsmlSub(string words = null, string alias = null)
-        {
-            return Sub(words, alias);
-        }
-
-        /// <summary>
-        /// Create a new <W/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
-        ///            meaning </param>
-        public SsmlS W(string words = null, string role = null)
-        {
-            var newChild = new SsmlW(words, role);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <W/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlW"> A SsmlW instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlS SsmlW(SsmlW ssmlW)
-        {
-            this.Append(ssmlW);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <W/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
-        ///            meaning </param>
-        [System.Obsolete("This method is deprecated, use .W() instead.")]
-        public SsmlS SsmlW(string words = null, string role = null)
-        {
-            return W(words, role);
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new SsmlS Append(TwiML childElem)
-        {
-            return (SsmlS) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new SsmlS SetOption(string key, object value)
-        {
-            return (SsmlS) base.SetOption(key, value);
-        }
-    }
+    public string Words { get; set; }
+
+    /// <summary>
+    /// Create a new SsmlS
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    public SsmlS(string words = null) : base("s")
+    {
+      this.Words = words;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Words != null ? this.Words : string.Empty;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    public SsmlS Break(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      var newChild = new SsmlBreak(strength, time);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Break/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlS SsmlBreak(SsmlBreak ssmlBreak)
+    {
+      this.Append(ssmlBreak);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    [System.Obsolete("This method is deprecated, use .Break() instead.")]
+    public SsmlS SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      return Break(strength, time);
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    public SsmlS Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      var newChild = new SsmlEmphasis(words, level);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Emphasis/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlS SsmlEmphasis(SsmlEmphasis ssmlEmphasis)
+    {
+      this.Append(ssmlEmphasis);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
+    public SsmlS SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      return Emphasis(words, level);
+    }
+
+    /// <summary>
+    /// Create a new <Lang/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="xml:Lang"> Specify the language </param>
+    public SsmlS Lang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
+    {
+      var newChild = new SsmlLang(words, xmlLang);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Lang/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlLang"> A SsmlLang instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlS SsmlLang(SsmlLang ssmlLang)
+    {
+      this.Append(ssmlLang);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Lang/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="xml:Lang"> Specify the language </param>
+    [System.Obsolete("This method is deprecated, use .Lang() instead.")]
+    public SsmlS SsmlLang(string words = null, SsmlLang.XmlLangEnum xmlLang = null)
+    {
+      return Lang(words, xmlLang);
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    public SsmlS Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      var newChild = new SsmlPhoneme(words, alphabet, ph);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Phoneme/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlS SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
+    {
+      this.Append(ssmlPhoneme);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
+    public SsmlS SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      return Phoneme(words, alphabet, ph);
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    public SsmlS Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
+    {
+      var newChild = new SsmlProsody(words, volume, rate, pitch);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Prosody/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlS SsmlProsody(SsmlProsody ssmlProsody)
+    {
+      this.Append(ssmlProsody);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
+    public SsmlS SsmlProsody(string words = null, string volume = null, string rate = null, string pitch = null)
+    {
+      return Prosody(words, volume, rate, pitch);
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    public SsmlS SayAs(string words = null, SsmlSayAs.InterpretAsEnum interpretAs = null, SsmlSayAs.RoleEnum role = null)
+    {
+      var newChild = new SsmlSayAs(words, interpretAs, role);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Say-As/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlS SsmlSayAs(SsmlSayAs ssmlSayAs)
+    {
+      this.Append(ssmlSayAs);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
+    public SsmlS SsmlSayAs(string words = null,
+                           SsmlSayAs.InterpretAsEnum interpretAs = null,
+                           SsmlSayAs.RoleEnum role = null)
+    {
+      return SayAs(words, interpretAs, role);
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    public SsmlS Sub(string words = null, string alias = null)
+    {
+      var newChild = new SsmlSub(words, alias);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Sub/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSub"> A SsmlSub instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlS SsmlSub(SsmlSub ssmlSub)
+    {
+      this.Append(ssmlSub);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    [System.Obsolete("This method is deprecated, use .Sub() instead.")]
+    public SsmlS SsmlSub(string words = null, string alias = null)
+    {
+      return Sub(words, alias);
+    }
+
+    /// <summary>
+    /// Create a new <W/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
+    ///            meaning </param>
+    public SsmlS W(string words = null, string role = null)
+    {
+      var newChild = new SsmlW(words, role);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <W/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlW"> A SsmlW instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlS SsmlW(SsmlW ssmlW)
+    {
+      this.Append(ssmlW);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <W/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
+    ///            meaning </param>
+    [System.Obsolete("This method is deprecated, use .W() instead.")]
+    public SsmlS SsmlW(string words = null, string role = null)
+    {
+      return W(words, role);
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new SsmlS Append(TwiML childElem)
+    {
+      return (SsmlS)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new SsmlS SetOption(string key, object value)
+    {
+      return (SsmlS)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/SsmlSayAs.cs b/src/Twilio/TwiML/Voice/SsmlSayAs.cs
index c4d18230a..8e9beab44 100644
--- a/src/Twilio/TwiML/Voice/SsmlSayAs.cs
+++ b/src/Twilio/TwiML/Voice/SsmlSayAs.cs
@@ -10,130 +10,130 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Controlling How Special Types of Words Are Spoken in Say
+  /// </summary>
+  public class SsmlSayAs : TwiML
+  {
+    public sealed class InterpretAsEnum : StringEnum
+    {
+      private InterpretAsEnum(string value) : base(value) { }
+      public InterpretAsEnum() { }
+      public static implicit operator InterpretAsEnum(string value)
+      {
+        return new InterpretAsEnum(value);
+      }
+
+      public static readonly InterpretAsEnum Character = new InterpretAsEnum("character");
+      public static readonly InterpretAsEnum SpellOut = new InterpretAsEnum("spell-out");
+      public static readonly InterpretAsEnum Cardinal = new InterpretAsEnum("cardinal");
+      public static readonly InterpretAsEnum Number = new InterpretAsEnum("number");
+      public static readonly InterpretAsEnum Ordinal = new InterpretAsEnum("ordinal");
+      public static readonly InterpretAsEnum Digits = new InterpretAsEnum("digits");
+      public static readonly InterpretAsEnum Fraction = new InterpretAsEnum("fraction");
+      public static readonly InterpretAsEnum Unit = new InterpretAsEnum("unit");
+      public static readonly InterpretAsEnum Date = new InterpretAsEnum("date");
+      public static readonly InterpretAsEnum Time = new InterpretAsEnum("time");
+      public static readonly InterpretAsEnum Address = new InterpretAsEnum("address");
+      public static readonly InterpretAsEnum Expletive = new InterpretAsEnum("expletive");
+      public static readonly InterpretAsEnum Telephone = new InterpretAsEnum("telephone");
+    }
+
+    public sealed class RoleEnum : StringEnum
+    {
+      private RoleEnum(string value) : base(value) { }
+      public RoleEnum() { }
+      public static implicit operator RoleEnum(string value)
+      {
+        return new RoleEnum(value);
+      }
+
+      public static readonly RoleEnum Mdy = new RoleEnum("mdy");
+      public static readonly RoleEnum Dmy = new RoleEnum("dmy");
+      public static readonly RoleEnum Ymd = new RoleEnum("ymd");
+      public static readonly RoleEnum Md = new RoleEnum("md");
+      public static readonly RoleEnum Dm = new RoleEnum("dm");
+      public static readonly RoleEnum Ym = new RoleEnum("ym");
+      public static readonly RoleEnum My = new RoleEnum("my");
+      public static readonly RoleEnum D = new RoleEnum("d");
+      public static readonly RoleEnum M = new RoleEnum("m");
+      public static readonly RoleEnum Y = new RoleEnum("y");
+      public static readonly RoleEnum Yyyymmdd = new RoleEnum("yyyymmdd");
+    }
+
     /// <summary>
-    /// Controlling How Special Types of Words Are Spoken in Say
+    /// Words to be interpreted
     /// </summary>
-    public class SsmlSayAs : TwiML
-    {
-        public sealed class InterpretAsEnum : StringEnum
-        {
-            private InterpretAsEnum(string value) : base(value) {}
-            public InterpretAsEnum() {}
-            public static implicit operator InterpretAsEnum(string value)
-            {
-                return new InterpretAsEnum(value);
-            }
-
-            public static readonly InterpretAsEnum Character = new InterpretAsEnum("character");
-            public static readonly InterpretAsEnum SpellOut = new InterpretAsEnum("spell-out");
-            public static readonly InterpretAsEnum Cardinal = new InterpretAsEnum("cardinal");
-            public static readonly InterpretAsEnum Number = new InterpretAsEnum("number");
-            public static readonly InterpretAsEnum Ordinal = new InterpretAsEnum("ordinal");
-            public static readonly InterpretAsEnum Digits = new InterpretAsEnum("digits");
-            public static readonly InterpretAsEnum Fraction = new InterpretAsEnum("fraction");
-            public static readonly InterpretAsEnum Unit = new InterpretAsEnum("unit");
-            public static readonly InterpretAsEnum Date = new InterpretAsEnum("date");
-            public static readonly InterpretAsEnum Time = new InterpretAsEnum("time");
-            public static readonly InterpretAsEnum Address = new InterpretAsEnum("address");
-            public static readonly InterpretAsEnum Expletive = new InterpretAsEnum("expletive");
-            public static readonly InterpretAsEnum Telephone = new InterpretAsEnum("telephone");
-        }
-
-        public sealed class RoleEnum : StringEnum
-        {
-            private RoleEnum(string value) : base(value) {}
-            public RoleEnum() {}
-            public static implicit operator RoleEnum(string value)
-            {
-                return new RoleEnum(value);
-            }
-
-            public static readonly RoleEnum Mdy = new RoleEnum("mdy");
-            public static readonly RoleEnum Dmy = new RoleEnum("dmy");
-            public static readonly RoleEnum Ymd = new RoleEnum("ymd");
-            public static readonly RoleEnum Md = new RoleEnum("md");
-            public static readonly RoleEnum Dm = new RoleEnum("dm");
-            public static readonly RoleEnum Ym = new RoleEnum("ym");
-            public static readonly RoleEnum My = new RoleEnum("my");
-            public static readonly RoleEnum D = new RoleEnum("d");
-            public static readonly RoleEnum M = new RoleEnum("m");
-            public static readonly RoleEnum Y = new RoleEnum("y");
-            public static readonly RoleEnum Yyyymmdd = new RoleEnum("yyyymmdd");
-        }
-
-        /// <summary>
-        /// Words to be interpreted
-        /// </summary>
-        public string Words { get; set; }
-        /// <summary>
-        /// Specify the type of words are spoken
-        /// </summary>
-        public SsmlSayAs.InterpretAsEnum InterpretAs { get; set; }
-        /// <summary>
-        /// Specify the format of the date when interpret-as is set to date
-        /// </summary>
-        public SsmlSayAs.RoleEnum Role { get; set; }
-
-        /// <summary>
-        /// Create a new SsmlSayAs
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        public SsmlSayAs(string words = null,
-                         SsmlSayAs.InterpretAsEnum interpretAs = null,
-                         SsmlSayAs.RoleEnum role = null) : base("say-as")
-        {
-            this.Words = words;
-            this.InterpretAs = interpretAs;
-            this.Role = role;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Words != null ? this.Words : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.InterpretAs != null)
-            {
-                attributes.Add(new XAttribute("interpret-as", this.InterpretAs.ToString()));
-            }
-            if (this.Role != null)
-            {
-                attributes.Add(new XAttribute("role", this.Role.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new SsmlSayAs Append(TwiML childElem)
-        {
-            return (SsmlSayAs) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new SsmlSayAs SetOption(string key, object value)
-        {
-            return (SsmlSayAs) base.SetOption(key, value);
-        }
-    }
+    public string Words { get; set; }
+    /// <summary>
+    /// Specify the type of words are spoken
+    /// </summary>
+    public SsmlSayAs.InterpretAsEnum InterpretAs { get; set; }
+    /// <summary>
+    /// Specify the format of the date when interpret-as is set to date
+    /// </summary>
+    public SsmlSayAs.RoleEnum Role { get; set; }
+
+    /// <summary>
+    /// Create a new SsmlSayAs
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    public SsmlSayAs(string words = null,
+                     SsmlSayAs.InterpretAsEnum interpretAs = null,
+                     SsmlSayAs.RoleEnum role = null) : base("say-as")
+    {
+      this.Words = words;
+      this.InterpretAs = interpretAs;
+      this.Role = role;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Words != null ? this.Words : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.InterpretAs != null)
+      {
+        attributes.Add(new XAttribute("interpret-as", this.InterpretAs.ToString()));
+      }
+      if (this.Role != null)
+      {
+        attributes.Add(new XAttribute("role", this.Role.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new SsmlSayAs Append(TwiML childElem)
+    {
+      return (SsmlSayAs)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new SsmlSayAs SetOption(string key, object value)
+    {
+      return (SsmlSayAs)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/SsmlSub.cs b/src/Twilio/TwiML/Voice/SsmlSub.cs
index c71dc29e0..7e406cf91 100644
--- a/src/Twilio/TwiML/Voice/SsmlSub.cs
+++ b/src/Twilio/TwiML/Voice/SsmlSub.cs
@@ -9,73 +9,73 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Pronouncing Acronyms and Abbreviations in Say
+  /// </summary>
+  public class SsmlSub : TwiML
+  {
     /// <summary>
-    /// Pronouncing Acronyms and Abbreviations in Say
+    /// Words to be substituted
     /// </summary>
-    public class SsmlSub : TwiML
-    {
-        /// <summary>
-        /// Words to be substituted
-        /// </summary>
-        public string Words { get; set; }
-        /// <summary>
-        /// Substitute a different word (or pronunciation) for selected text such as an acronym or abbreviation
-        /// </summary>
-        public string Alias { get; set; }
-
-        /// <summary>
-        /// Create a new SsmlSub
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        public SsmlSub(string words = null, string alias = null) : base("sub")
-        {
-            this.Words = words;
-            this.Alias = alias;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Words != null ? this.Words : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Alias != null)
-            {
-                attributes.Add(new XAttribute("alias", this.Alias));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new SsmlSub Append(TwiML childElem)
-        {
-            return (SsmlSub) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new SsmlSub SetOption(string key, object value)
-        {
-            return (SsmlSub) base.SetOption(key, value);
-        }
-    }
+    public string Words { get; set; }
+    /// <summary>
+    /// Substitute a different word (or pronunciation) for selected text such as an acronym or abbreviation
+    /// </summary>
+    public string Alias { get; set; }
+
+    /// <summary>
+    /// Create a new SsmlSub
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    public SsmlSub(string words = null, string alias = null) : base("sub")
+    {
+      this.Words = words;
+      this.Alias = alias;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Words != null ? this.Words : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Alias != null)
+      {
+        attributes.Add(new XAttribute("alias", this.Alias));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new SsmlSub Append(TwiML childElem)
+    {
+      return (SsmlSub)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new SsmlSub SetOption(string key, object value)
+    {
+      return (SsmlSub)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/SsmlW.cs b/src/Twilio/TwiML/Voice/SsmlW.cs
index f6a067f26..9a1899076 100644
--- a/src/Twilio/TwiML/Voice/SsmlW.cs
+++ b/src/Twilio/TwiML/Voice/SsmlW.cs
@@ -9,295 +9,295 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Improving Pronunciation by Specifying Parts of Speech in Say
+  /// </summary>
+  public class SsmlW : TwiML
+  {
     /// <summary>
-    /// Improving Pronunciation by Specifying Parts of Speech in Say
+    /// Words to speak
     /// </summary>
-    public class SsmlW : TwiML
-    {
-        /// <summary>
-        /// Words to speak
-        /// </summary>
-        public string Words { get; set; }
-        /// <summary>
-        /// Customize the pronunciation of words by specifying the word’s part of speech or alternate meaning
-        /// </summary>
-        public string Role { get; set; }
-
-        /// <summary>
-        /// Create a new SsmlW
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
-        ///            meaning </param>
-        public SsmlW(string words = null, string role = null) : base("w")
-        {
-            this.Words = words;
-            this.Role = role;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Words != null ? this.Words : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Role != null)
-            {
-                attributes.Add(new XAttribute("role", this.Role));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        public SsmlW Break(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            var newChild = new SsmlBreak(strength, time);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Break/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlW SsmlBreak(SsmlBreak ssmlBreak)
-        {
-            this.Append(ssmlBreak);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Break/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="strength"> Set a pause based on strength </param>
-        /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
-        ///            [number]s, [number]ms </param>
-        [System.Obsolete("This method is deprecated, use .Break() instead.")]
-        public SsmlW SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
-        {
-            return Break(strength, time);
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        public SsmlW Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            var newChild = new SsmlEmphasis(words, level);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Emphasis/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlW SsmlEmphasis(SsmlEmphasis ssmlEmphasis)
-        {
-            this.Append(ssmlEmphasis);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Emphasis/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
-        /// <param name="level"> Specify the degree of emphasis </param>
-        [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
-        public SsmlW SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
-        {
-            return Emphasis(words, level);
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        public SsmlW Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            var newChild = new SsmlPhoneme(words, alphabet, ph);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Phoneme/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlW SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
-        {
-            this.Append(ssmlPhoneme);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Phoneme/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="alphabet"> Specify the phonetic alphabet </param>
-        /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
-        [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
-        public SsmlW SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
-        {
-            return Phoneme(words, alphabet, ph);
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        public SsmlW Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
-        {
-            var newChild = new SsmlProsody(words, volume, rate, pitch);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Prosody/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlW SsmlProsody(SsmlProsody ssmlProsody)
-        {
-            this.Append(ssmlProsody);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Prosody/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
-        /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
-        ///              +ndB, -ndB </param>
-        /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
-        /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
-        ///             </param>
-        [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
-        public SsmlW SsmlProsody(string words = null, string volume = null, string rate = null, string pitch = null)
-        {
-            return Prosody(words, volume, rate, pitch);
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        public SsmlW SayAs(string words = null, SsmlSayAs.InterpretAsEnum interpretAs = null, SsmlSayAs.RoleEnum role = null)
-        {
-            var newChild = new SsmlSayAs(words, interpretAs, role);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Say-As/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlW SsmlSayAs(SsmlSayAs ssmlSayAs)
-        {
-            this.Append(ssmlSayAs);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Say-As/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
-        /// <param name="interpret-As"> Specify the type of words are spoken </param>
-        /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
-        [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
-        public SsmlW SsmlSayAs(string words = null,
-                               SsmlSayAs.InterpretAsEnum interpretAs = null,
-                               SsmlSayAs.RoleEnum role = null)
-        {
-            return SayAs(words, interpretAs, role);
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        public SsmlW Sub(string words = null, string alias = null)
-        {
-            var newChild = new SsmlSub(words, alias);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Sub/> element as a child of this element
-        /// </summary>
-        /// <param name="ssmlSub"> A SsmlSub instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public SsmlW SsmlSub(SsmlSub ssmlSub)
-        {
-            this.Append(ssmlSub);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Sub/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
-        /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
-        ///             abbreviation </param>
-        [System.Obsolete("This method is deprecated, use .Sub() instead.")]
-        public SsmlW SsmlSub(string words = null, string alias = null)
-        {
-            return Sub(words, alias);
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new SsmlW Append(TwiML childElem)
-        {
-            return (SsmlW) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new SsmlW SetOption(string key, object value)
-        {
-            return (SsmlW) base.SetOption(key, value);
-        }
-    }
+    public string Words { get; set; }
+    /// <summary>
+    /// Customize the pronunciation of words by specifying the word’s part of speech or alternate meaning
+    /// </summary>
+    public string Role { get; set; }
+
+    /// <summary>
+    /// Create a new SsmlW
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="role"> Customize the pronunciation of words by specifying the word’s part of speech or alternate
+    ///            meaning </param>
+    public SsmlW(string words = null, string role = null) : base("w")
+    {
+      this.Words = words;
+      this.Role = role;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Words != null ? this.Words : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Role != null)
+      {
+        attributes.Add(new XAttribute("role", this.Role));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    public SsmlW Break(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      var newChild = new SsmlBreak(strength, time);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Break/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlBreak"> A SsmlBreak instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlW SsmlBreak(SsmlBreak ssmlBreak)
+    {
+      this.Append(ssmlBreak);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Break/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="strength"> Set a pause based on strength </param>
+    /// <param name="time"> Set a pause to a specific length of time in seconds or milliseconds, available values:
+    ///            [number]s, [number]ms </param>
+    [System.Obsolete("This method is deprecated, use .Break() instead.")]
+    public SsmlW SsmlBreak(SsmlBreak.StrengthEnum strength = null, string time = null)
+    {
+      return Break(strength, time);
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    public SsmlW Emphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      var newChild = new SsmlEmphasis(words, level);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Emphasis/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlEmphasis"> A SsmlEmphasis instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlW SsmlEmphasis(SsmlEmphasis ssmlEmphasis)
+    {
+      this.Append(ssmlEmphasis);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Emphasis/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to emphasize, the body of the TwiML Element. </param>
+    /// <param name="level"> Specify the degree of emphasis </param>
+    [System.Obsolete("This method is deprecated, use .Emphasis() instead.")]
+    public SsmlW SsmlEmphasis(string words = null, SsmlEmphasis.LevelEnum level = null)
+    {
+      return Emphasis(words, level);
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    public SsmlW Phoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      var newChild = new SsmlPhoneme(words, alphabet, ph);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Phoneme/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlPhoneme"> A SsmlPhoneme instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlW SsmlPhoneme(SsmlPhoneme ssmlPhoneme)
+    {
+      this.Append(ssmlPhoneme);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Phoneme/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="alphabet"> Specify the phonetic alphabet </param>
+    /// <param name="ph"> Specifiy the phonetic symbols for pronunciation </param>
+    [System.Obsolete("This method is deprecated, use .Phoneme() instead.")]
+    public SsmlW SsmlPhoneme(string words = null, SsmlPhoneme.AlphabetEnum alphabet = null, string ph = null)
+    {
+      return Phoneme(words, alphabet, ph);
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    public SsmlW Prosody(string words = null, string volume = null, string rate = null, string pitch = null)
+    {
+      var newChild = new SsmlProsody(words, volume, rate, pitch);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Prosody/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlProsody"> A SsmlProsody instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlW SsmlProsody(SsmlProsody ssmlProsody)
+    {
+      this.Append(ssmlProsody);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Prosody/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to speak, the body of the TwiML Element. </param>
+    /// <param name="volume"> Specify the volume, available values: default, silent, x-soft, soft, medium, loud, x-loud,
+    ///              +ndB, -ndB </param>
+    /// <param name="rate"> Specify the rate, available values: x-slow, slow, medium, fast, x-fast, n% </param>
+    /// <param name="pitch"> Specify the pitch, available values: default, x-low, low, medium, high, x-high, +n%, -n%
+    ///             </param>
+    [System.Obsolete("This method is deprecated, use .Prosody() instead.")]
+    public SsmlW SsmlProsody(string words = null, string volume = null, string rate = null, string pitch = null)
+    {
+      return Prosody(words, volume, rate, pitch);
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    public SsmlW SayAs(string words = null, SsmlSayAs.InterpretAsEnum interpretAs = null, SsmlSayAs.RoleEnum role = null)
+    {
+      var newChild = new SsmlSayAs(words, interpretAs, role);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Say-As/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSayAs"> A SsmlSayAs instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlW SsmlSayAs(SsmlSayAs ssmlSayAs)
+    {
+      this.Append(ssmlSayAs);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Say-As/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be interpreted, the body of the TwiML Element. </param>
+    /// <param name="interpret-As"> Specify the type of words are spoken </param>
+    /// <param name="role"> Specify the format of the date when interpret-as is set to date </param>
+    [System.Obsolete("This method is deprecated, use .SayAs() instead.")]
+    public SsmlW SsmlSayAs(string words = null,
+                           SsmlSayAs.InterpretAsEnum interpretAs = null,
+                           SsmlSayAs.RoleEnum role = null)
+    {
+      return SayAs(words, interpretAs, role);
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    public SsmlW Sub(string words = null, string alias = null)
+    {
+      var newChild = new SsmlSub(words, alias);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Sub/> element as a child of this element
+    /// </summary>
+    /// <param name="ssmlSub"> A SsmlSub instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public SsmlW SsmlSub(SsmlSub ssmlSub)
+    {
+      this.Append(ssmlSub);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Sub/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="words"> Words to be substituted, the body of the TwiML Element. </param>
+    /// <param name="alias"> Substitute a different word (or pronunciation) for selected text such as an acronym or
+    ///             abbreviation </param>
+    [System.Obsolete("This method is deprecated, use .Sub() instead.")]
+    public SsmlW SsmlSub(string words = null, string alias = null)
+    {
+      return Sub(words, alias);
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new SsmlW Append(TwiML childElem)
+    {
+      return (SsmlW)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new SsmlW SetOption(string key, object value)
+    {
+      return (SsmlW)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Start.cs b/src/Twilio/TwiML/Voice/Start.cs
index 114793d6a..17308764d 100644
--- a/src/Twilio/TwiML/Voice/Start.cs
+++ b/src/Twilio/TwiML/Voice/Start.cs
@@ -11,124 +11,124 @@
 using Twilio.Converters;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Start TwiML Verb
+  /// </summary>
+  public class Start : TwiML
+  {
     /// <summary>
-    /// Start TwiML Verb
+    /// Action URL
     /// </summary>
-    public class Start : TwiML
-    {
-        /// <summary>
-        /// Action URL
-        /// </summary>
-        public Uri Action { get; set; }
-        /// <summary>
-        /// Action URL method
-        /// </summary>
-        public Twilio.Http.HttpMethod Method { get; set; }
-
-        /// <summary>
-        /// Create a new Start
-        /// </summary>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        public Start(Uri action = null, Twilio.Http.HttpMethod method = null) : base("Start")
-        {
-            this.Action = action;
-            this.Method = method;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Action != null)
-            {
-                attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
-            }
-            if (this.Method != null)
-            {
-                attributes.Add(new XAttribute("method", this.Method.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Stream/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> Friendly name given to the Stream </param>
-        /// <param name="connectorName"> Unique name for Stream Connector </param>
-        /// <param name="url"> URL of the remote service where the Stream is routed </param>
-        /// <param name="track"> Track to be streamed to remote service </param>
-        /// <param name="statusCallback"> Status Callback URL </param>
-        /// <param name="statusCallbackMethod"> Status Callback URL method </param>
-        public Start Stream(string name = null,
-                            string connectorName = null,
-                            string url = null,
-                            Stream.TrackEnum track = null,
-                            string statusCallback = null,
-                            Stream.StatusCallbackMethodEnum statusCallbackMethod = null)
-        {
-            var newChild = new Stream(name, connectorName, url, track, statusCallback, statusCallbackMethod);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Stream/> element as a child of this element
-        /// </summary>
-        /// <param name="stream"> A Stream instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Start Stream(Stream stream)
-        {
-            this.Append(stream);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Siprec/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> Friendly name given to SIPREC </param>
-        /// <param name="connectorName"> Unique name for Connector </param>
-        /// <param name="track"> Track to be streamed to remote service </param>
-        public Start Siprec(string name = null, string connectorName = null, Siprec.TrackEnum track = null)
-        {
-            var newChild = new Siprec(name, connectorName, track);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Siprec/> element as a child of this element
-        /// </summary>
-        /// <param name="siprec"> A Siprec instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Start Siprec(Siprec siprec)
-        {
-            this.Append(siprec);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Start Append(TwiML childElem)
-        {
-            return (Start) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Start SetOption(string key, object value)
-        {
-            return (Start) base.SetOption(key, value);
-        }
-    }
+    public Uri Action { get; set; }
+    /// <summary>
+    /// Action URL method
+    /// </summary>
+    public Twilio.Http.HttpMethod Method { get; set; }
+
+    /// <summary>
+    /// Create a new Start
+    /// </summary>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    public Start(Uri action = null, Twilio.Http.HttpMethod method = null) : base("Start")
+    {
+      this.Action = action;
+      this.Method = method;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Action != null)
+      {
+        attributes.Add(new XAttribute("action", Serializers.Url(this.Action)));
+      }
+      if (this.Method != null)
+      {
+        attributes.Add(new XAttribute("method", this.Method.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Stream/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> Friendly name given to the Stream </param>
+    /// <param name="connectorName"> Unique name for Stream Connector </param>
+    /// <param name="url"> URL of the remote service where the Stream is routed </param>
+    /// <param name="track"> Track to be streamed to remote service </param>
+    /// <param name="statusCallback"> Status Callback URL </param>
+    /// <param name="statusCallbackMethod"> Status Callback URL method </param>
+    public Start Stream(string name = null,
+                        string connectorName = null,
+                        string url = null,
+                        Stream.TrackEnum track = null,
+                        string statusCallback = null,
+                        Stream.StatusCallbackMethodEnum statusCallbackMethod = null)
+    {
+      var newChild = new Stream(name, connectorName, url, track, statusCallback, statusCallbackMethod);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Stream/> element as a child of this element
+    /// </summary>
+    /// <param name="stream"> A Stream instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Start Stream(Stream stream)
+    {
+      this.Append(stream);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Siprec/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> Friendly name given to SIPREC </param>
+    /// <param name="connectorName"> Unique name for Connector </param>
+    /// <param name="track"> Track to be streamed to remote service </param>
+    public Start Siprec(string name = null, string connectorName = null, Siprec.TrackEnum track = null)
+    {
+      var newChild = new Siprec(name, connectorName, track);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Siprec/> element as a child of this element
+    /// </summary>
+    /// <param name="siprec"> A Siprec instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Start Siprec(Siprec siprec)
+    {
+      this.Append(siprec);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Start Append(TwiML childElem)
+    {
+      return (Start)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Start SetOption(string key, object value)
+    {
+      return (Start)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Stop.cs b/src/Twilio/TwiML/Voice/Stop.cs
index 35e0a8950..19ccb436a 100644
--- a/src/Twilio/TwiML/Voice/Stop.cs
+++ b/src/Twilio/TwiML/Voice/Stop.cs
@@ -8,94 +8,94 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Stop TwiML Verb
+  /// </summary>
+  public class Stop : TwiML
+  {
     /// <summary>
-    /// Stop TwiML Verb
+    /// Create a new Stop
     /// </summary>
-    public class Stop : TwiML
-    {
-        /// <summary>
-        /// Create a new Stop
-        /// </summary>
-        public Stop() : base("Stop")
-        {
-        }
-
-        /// <summary>
-        /// Create a new <Stream/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> Friendly name given to the Stream </param>
-        /// <param name="connectorName"> Unique name for Stream Connector </param>
-        /// <param name="url"> URL of the remote service where the Stream is routed </param>
-        /// <param name="track"> Track to be streamed to remote service </param>
-        /// <param name="statusCallback"> Status Callback URL </param>
-        /// <param name="statusCallbackMethod"> Status Callback URL method </param>
-        public Stop Stream(string name = null,
-                           string connectorName = null,
-                           string url = null,
-                           Stream.TrackEnum track = null,
-                           string statusCallback = null,
-                           Stream.StatusCallbackMethodEnum statusCallbackMethod = null)
-        {
-            var newChild = new Stream(name, connectorName, url, track, statusCallback, statusCallbackMethod);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Stream/> element as a child of this element
-        /// </summary>
-        /// <param name="stream"> A Stream instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Stop Stream(Stream stream)
-        {
-            this.Append(stream);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Siprec/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> Friendly name given to SIPREC </param>
-        /// <param name="connectorName"> Unique name for Connector </param>
-        /// <param name="track"> Track to be streamed to remote service </param>
-        public Stop Siprec(string name = null, string connectorName = null, Siprec.TrackEnum track = null)
-        {
-            var newChild = new Siprec(name, connectorName, track);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Siprec/> element as a child of this element
-        /// </summary>
-        /// <param name="siprec"> A Siprec instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Stop Siprec(Siprec siprec)
-        {
-            this.Append(siprec);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Stop Append(TwiML childElem)
-        {
-            return (Stop) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Stop SetOption(string key, object value)
-        {
-            return (Stop) base.SetOption(key, value);
-        }
-    }
+    public Stop() : base("Stop")
+    {
+    }
+
+    /// <summary>
+    /// Create a new <Stream/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> Friendly name given to the Stream </param>
+    /// <param name="connectorName"> Unique name for Stream Connector </param>
+    /// <param name="url"> URL of the remote service where the Stream is routed </param>
+    /// <param name="track"> Track to be streamed to remote service </param>
+    /// <param name="statusCallback"> Status Callback URL </param>
+    /// <param name="statusCallbackMethod"> Status Callback URL method </param>
+    public Stop Stream(string name = null,
+                       string connectorName = null,
+                       string url = null,
+                       Stream.TrackEnum track = null,
+                       string statusCallback = null,
+                       Stream.StatusCallbackMethodEnum statusCallbackMethod = null)
+    {
+      var newChild = new Stream(name, connectorName, url, track, statusCallback, statusCallbackMethod);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Stream/> element as a child of this element
+    /// </summary>
+    /// <param name="stream"> A Stream instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Stop Stream(Stream stream)
+    {
+      this.Append(stream);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Siprec/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> Friendly name given to SIPREC </param>
+    /// <param name="connectorName"> Unique name for Connector </param>
+    /// <param name="track"> Track to be streamed to remote service </param>
+    public Stop Siprec(string name = null, string connectorName = null, Siprec.TrackEnum track = null)
+    {
+      var newChild = new Siprec(name, connectorName, track);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Siprec/> element as a child of this element
+    /// </summary>
+    /// <param name="siprec"> A Siprec instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Stop Siprec(Siprec siprec)
+    {
+      this.Append(siprec);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Stop Append(TwiML childElem)
+    {
+      return (Stop)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Stop SetOption(string key, object value)
+    {
+      return (Stop)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Stream.cs b/src/Twilio/TwiML/Voice/Stream.cs
index 49d3bee8b..4df06cbb4 100644
--- a/src/Twilio/TwiML/Voice/Stream.cs
+++ b/src/Twilio/TwiML/Voice/Stream.cs
@@ -10,163 +10,163 @@
 using Twilio.Types;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Stream TwiML Noun
+  /// </summary>
+  public class Stream : TwiML
+  {
+    public sealed class TrackEnum : StringEnum
+    {
+      private TrackEnum(string value) : base(value) { }
+      public TrackEnum() { }
+      public static implicit operator TrackEnum(string value)
+      {
+        return new TrackEnum(value);
+      }
+
+      public static readonly TrackEnum InboundTrack = new TrackEnum("inbound_track");
+      public static readonly TrackEnum OutboundTrack = new TrackEnum("outbound_track");
+      public static readonly TrackEnum BothTracks = new TrackEnum("both_tracks");
+    }
+
+    public sealed class StatusCallbackMethodEnum : StringEnum
+    {
+      private StatusCallbackMethodEnum(string value) : base(value) { }
+      public StatusCallbackMethodEnum() { }
+      public static implicit operator StatusCallbackMethodEnum(string value)
+      {
+        return new StatusCallbackMethodEnum(value);
+      }
+
+      public static readonly StatusCallbackMethodEnum Get = new StatusCallbackMethodEnum("GET");
+      public static readonly StatusCallbackMethodEnum Post = new StatusCallbackMethodEnum("POST");
+    }
+
     /// <summary>
-    /// Stream TwiML Noun
+    /// Friendly name given to the Stream
     /// </summary>
-    public class Stream : TwiML
-    {
-        public sealed class TrackEnum : StringEnum
-        {
-            private TrackEnum(string value) : base(value) {}
-            public TrackEnum() {}
-            public static implicit operator TrackEnum(string value)
-            {
-                return new TrackEnum(value);
-            }
-
-            public static readonly TrackEnum InboundTrack = new TrackEnum("inbound_track");
-            public static readonly TrackEnum OutboundTrack = new TrackEnum("outbound_track");
-            public static readonly TrackEnum BothTracks = new TrackEnum("both_tracks");
-        }
-
-        public sealed class StatusCallbackMethodEnum : StringEnum
-        {
-            private StatusCallbackMethodEnum(string value) : base(value) {}
-            public StatusCallbackMethodEnum() {}
-            public static implicit operator StatusCallbackMethodEnum(string value)
-            {
-                return new StatusCallbackMethodEnum(value);
-            }
-
-            public static readonly StatusCallbackMethodEnum Get = new StatusCallbackMethodEnum("GET");
-            public static readonly StatusCallbackMethodEnum Post = new StatusCallbackMethodEnum("POST");
-        }
-
-        /// <summary>
-        /// Friendly name given to the Stream
-        /// </summary>
-        public string Name { get; set; }
-        /// <summary>
-        /// Unique name for Stream Connector
-        /// </summary>
-        public string ConnectorName { get; set; }
-        /// <summary>
-        /// URL of the remote service where the Stream is routed
-        /// </summary>
-        public string Url { get; set; }
-        /// <summary>
-        /// Track to be streamed to remote service
-        /// </summary>
-        public Stream.TrackEnum Track { get; set; }
-        /// <summary>
-        /// Status Callback URL
-        /// </summary>
-        public string StatusCallback { get; set; }
-        /// <summary>
-        /// Status Callback URL method
-        /// </summary>
-        public Stream.StatusCallbackMethodEnum StatusCallbackMethod { get; set; }
-
-        /// <summary>
-        /// Create a new Stream
-        /// </summary>
-        /// <param name="name"> Friendly name given to the Stream </param>
-        /// <param name="connectorName"> Unique name for Stream Connector </param>
-        /// <param name="url"> URL of the remote service where the Stream is routed </param>
-        /// <param name="track"> Track to be streamed to remote service </param>
-        /// <param name="statusCallback"> Status Callback URL </param>
-        /// <param name="statusCallbackMethod"> Status Callback URL method </param>
-        public Stream(string name = null,
-                      string connectorName = null,
-                      string url = null,
-                      Stream.TrackEnum track = null,
-                      string statusCallback = null,
-                      Stream.StatusCallbackMethodEnum statusCallbackMethod = null) : base("Stream")
-        {
-            this.Name = name;
-            this.ConnectorName = connectorName;
-            this.Url = url;
-            this.Track = track;
-            this.StatusCallback = statusCallback;
-            this.StatusCallbackMethod = statusCallbackMethod;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Name != null)
-            {
-                attributes.Add(new XAttribute("name", this.Name));
-            }
-            if (this.ConnectorName != null)
-            {
-                attributes.Add(new XAttribute("connectorName", this.ConnectorName));
-            }
-            if (this.Url != null)
-            {
-                attributes.Add(new XAttribute("url", this.Url));
-            }
-            if (this.Track != null)
-            {
-                attributes.Add(new XAttribute("track", this.Track.ToString()));
-            }
-            if (this.StatusCallback != null)
-            {
-                attributes.Add(new XAttribute("statusCallback", this.StatusCallback));
-            }
-            if (this.StatusCallbackMethod != null)
-            {
-                attributes.Add(new XAttribute("statusCallbackMethod", this.StatusCallbackMethod.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Create a new <Parameter/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> The name of the custom parameter </param>
-        /// <param name="value"> The value of the custom parameter </param>
-        public Stream Parameter(string name = null, string value = null)
-        {
-            var newChild = new Parameter(name, value);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Parameter/> element as a child of this element
-        /// </summary>
-        /// <param name="parameter"> A Parameter instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public Stream Parameter(Parameter parameter)
-        {
-            this.Append(parameter);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Stream Append(TwiML childElem)
-        {
-            return (Stream) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Stream SetOption(string key, object value)
-        {
-            return (Stream) base.SetOption(key, value);
-        }
-    }
+    public string Name { get; set; }
+    /// <summary>
+    /// Unique name for Stream Connector
+    /// </summary>
+    public string ConnectorName { get; set; }
+    /// <summary>
+    /// URL of the remote service where the Stream is routed
+    /// </summary>
+    public string Url { get; set; }
+    /// <summary>
+    /// Track to be streamed to remote service
+    /// </summary>
+    public Stream.TrackEnum Track { get; set; }
+    /// <summary>
+    /// Status Callback URL
+    /// </summary>
+    public string StatusCallback { get; set; }
+    /// <summary>
+    /// Status Callback URL method
+    /// </summary>
+    public Stream.StatusCallbackMethodEnum StatusCallbackMethod { get; set; }
+
+    /// <summary>
+    /// Create a new Stream
+    /// </summary>
+    /// <param name="name"> Friendly name given to the Stream </param>
+    /// <param name="connectorName"> Unique name for Stream Connector </param>
+    /// <param name="url"> URL of the remote service where the Stream is routed </param>
+    /// <param name="track"> Track to be streamed to remote service </param>
+    /// <param name="statusCallback"> Status Callback URL </param>
+    /// <param name="statusCallbackMethod"> Status Callback URL method </param>
+    public Stream(string name = null,
+                  string connectorName = null,
+                  string url = null,
+                  Stream.TrackEnum track = null,
+                  string statusCallback = null,
+                  Stream.StatusCallbackMethodEnum statusCallbackMethod = null) : base("Stream")
+    {
+      this.Name = name;
+      this.ConnectorName = connectorName;
+      this.Url = url;
+      this.Track = track;
+      this.StatusCallback = statusCallback;
+      this.StatusCallbackMethod = statusCallbackMethod;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Name != null)
+      {
+        attributes.Add(new XAttribute("name", this.Name));
+      }
+      if (this.ConnectorName != null)
+      {
+        attributes.Add(new XAttribute("connectorName", this.ConnectorName));
+      }
+      if (this.Url != null)
+      {
+        attributes.Add(new XAttribute("url", this.Url));
+      }
+      if (this.Track != null)
+      {
+        attributes.Add(new XAttribute("track", this.Track.ToString()));
+      }
+      if (this.StatusCallback != null)
+      {
+        attributes.Add(new XAttribute("statusCallback", this.StatusCallback));
+      }
+      if (this.StatusCallbackMethod != null)
+      {
+        attributes.Add(new XAttribute("statusCallbackMethod", this.StatusCallbackMethod.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Create a new <Parameter/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> The name of the custom parameter </param>
+    /// <param name="value"> The value of the custom parameter </param>
+    public Stream Parameter(string name = null, string value = null)
+    {
+      var newChild = new Parameter(name, value);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Parameter/> element as a child of this element
+    /// </summary>
+    /// <param name="parameter"> A Parameter instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public Stream Parameter(Parameter parameter)
+    {
+      this.Append(parameter);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Stream Append(TwiML childElem)
+    {
+      return (Stream)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Stream SetOption(string key, object value)
+    {
+      return (Stream)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/Task.cs b/src/Twilio/TwiML/Voice/Task.cs
index 49ffeca4f..5a29c8cc3 100644
--- a/src/Twilio/TwiML/Voice/Task.cs
+++ b/src/Twilio/TwiML/Voice/Task.cs
@@ -9,83 +9,83 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// Task TwiML Noun
+  /// </summary>
+  public class Task : TwiML
+  {
     /// <summary>
-    /// Task TwiML Noun
+    /// TaskRouter task attributes
     /// </summary>
-    public class Task : TwiML
-    {
-        /// <summary>
-        /// TaskRouter task attributes
-        /// </summary>
-        public string Body { get; set; }
-        /// <summary>
-        /// Task priority
-        /// </summary>
-        public int? Priority { get; set; }
-        /// <summary>
-        /// Timeout associated with task
-        /// </summary>
-        public int? Timeout { get; set; }
-
-        /// <summary>
-        /// Create a new Task
-        /// </summary>
-        /// <param name="body"> TaskRouter task attributes, the body of the TwiML Element. Also accepts stringified object
-        ///            </param>
-        /// <param name="priority"> Task priority </param>
-        /// <param name="timeout"> Timeout associated with task </param>
-        public Task(string body = null, int? priority = null, int? timeout = null) : base("Task")
-        {
-            this.Body = body;
-            this.Priority = priority;
-            this.Timeout = timeout;
-        }
-
-        /// <summary>
-        /// Return the body of the TwiML tag
-        /// </summary>
-        protected override string GetElementBody()
-        {
-            return this.Body != null ? this.Body : string.Empty;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.Priority != null)
-            {
-                attributes.Add(new XAttribute("priority", this.Priority.ToString()));
-            }
-            if (this.Timeout != null)
-            {
-                attributes.Add(new XAttribute("timeout", this.Timeout.ToString()));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new Task Append(TwiML childElem)
-        {
-            return (Task) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new Task SetOption(string key, object value)
-        {
-            return (Task) base.SetOption(key, value);
-        }
-    }
+    public string Body { get; set; }
+    /// <summary>
+    /// Task priority
+    /// </summary>
+    public int? Priority { get; set; }
+    /// <summary>
+    /// Timeout associated with task
+    /// </summary>
+    public int? Timeout { get; set; }
+
+    /// <summary>
+    /// Create a new Task
+    /// </summary>
+    /// <param name="body"> TaskRouter task attributes, the body of the TwiML Element. Also accepts stringified object
+    ///            </param>
+    /// <param name="priority"> Task priority </param>
+    /// <param name="timeout"> Timeout associated with task </param>
+    public Task(string body = null, int? priority = null, int? timeout = null) : base("Task")
+    {
+      this.Body = body;
+      this.Priority = priority;
+      this.Timeout = timeout;
+    }
+
+    /// <summary>
+    /// Return the body of the TwiML tag
+    /// </summary>
+    protected override string GetElementBody()
+    {
+      return this.Body != null ? this.Body : string.Empty;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.Priority != null)
+      {
+        attributes.Add(new XAttribute("priority", this.Priority.ToString()));
+      }
+      if (this.Timeout != null)
+      {
+        attributes.Add(new XAttribute("timeout", this.Timeout.ToString()));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new Task Append(TwiML childElem)
+    {
+      return (Task)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new Task SetOption(string key, object value)
+    {
+      return (Task)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/Voice/VirtualAgent.cs b/src/Twilio/TwiML/Voice/VirtualAgent.cs
index e4c71fd07..36f4e21da 100644
--- a/src/Twilio/TwiML/Voice/VirtualAgent.cs
+++ b/src/Twilio/TwiML/Voice/VirtualAgent.cs
@@ -9,91 +9,91 @@
 using System.Xml.Linq;
 
 namespace Twilio.TwiML.Voice
-{
-
+{
+
+  /// <summary>
+  /// VirtualAgent TwiML Noun
+  /// </summary>
+  public class VirtualAgent : TwiML
+  {
     /// <summary>
-    /// VirtualAgent TwiML Noun
+    /// Defines the conversation profile Dialogflow needs to use
     /// </summary>
-    public class VirtualAgent : TwiML
-    {
-        /// <summary>
-        /// Defines the conversation profile Dialogflow needs to use
-        /// </summary>
-        public string ConnectorName { get; set; }
-        /// <summary>
-        /// Language to be used by Dialogflow to transcribe speech
-        /// </summary>
-        public string Language { get; set; }
-        /// <summary>
-        /// Whether sentiment analysis needs to be enabled or not
-        /// </summary>
-        public bool? SentimentAnalysis { get; set; }
-        /// <summary>
-        /// URL to post status callbacks from Twilio
-        /// </summary>
-        public string StatusCallback { get; set; }
-
-        /// <summary>
-        /// Create a new VirtualAgent
-        /// </summary>
-        /// <param name="connectorName"> Defines the conversation profile Dialogflow needs to use </param>
-        /// <param name="language"> Language to be used by Dialogflow to transcribe speech </param>
-        /// <param name="sentimentAnalysis"> Whether sentiment analysis needs to be enabled or not </param>
-        /// <param name="statusCallback"> URL to post status callbacks from Twilio </param>
-        public VirtualAgent(string connectorName = null,
-                            string language = null,
-                            bool? sentimentAnalysis = null,
-                            string statusCallback = null) : base("VirtualAgent")
-        {
-            this.ConnectorName = connectorName;
-            this.Language = language;
-            this.SentimentAnalysis = sentimentAnalysis;
-            this.StatusCallback = statusCallback;
-        }
-
-        /// <summary>
-        /// Return the attributes of the TwiML tag
-        /// </summary>
-        protected override List<XAttribute> GetElementAttributes()
-        {
-            var attributes = new List<XAttribute>();
-            if (this.ConnectorName != null)
-            {
-                attributes.Add(new XAttribute("connectorName", this.ConnectorName));
-            }
-            if (this.Language != null)
-            {
-                attributes.Add(new XAttribute("language", this.Language));
-            }
-            if (this.SentimentAnalysis != null)
-            {
-                attributes.Add(new XAttribute("sentimentAnalysis", this.SentimentAnalysis.Value.ToString().ToLower()));
-            }
-            if (this.StatusCallback != null)
-            {
-                attributes.Add(new XAttribute("statusCallback", this.StatusCallback));
-            }
-            return attributes;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new VirtualAgent Append(TwiML childElem)
-        {
-            return (VirtualAgent) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new VirtualAgent SetOption(string key, object value)
-        {
-            return (VirtualAgent) base.SetOption(key, value);
-        }
-    }
+    public string ConnectorName { get; set; }
+    /// <summary>
+    /// Language to be used by Dialogflow to transcribe speech
+    /// </summary>
+    public string Language { get; set; }
+    /// <summary>
+    /// Whether sentiment analysis needs to be enabled or not
+    /// </summary>
+    public bool? SentimentAnalysis { get; set; }
+    /// <summary>
+    /// URL to post status callbacks from Twilio
+    /// </summary>
+    public string StatusCallback { get; set; }
+
+    /// <summary>
+    /// Create a new VirtualAgent
+    /// </summary>
+    /// <param name="connectorName"> Defines the conversation profile Dialogflow needs to use </param>
+    /// <param name="language"> Language to be used by Dialogflow to transcribe speech </param>
+    /// <param name="sentimentAnalysis"> Whether sentiment analysis needs to be enabled or not </param>
+    /// <param name="statusCallback"> URL to post status callbacks from Twilio </param>
+    public VirtualAgent(string connectorName = null,
+                        string language = null,
+                        bool? sentimentAnalysis = null,
+                        string statusCallback = null) : base("VirtualAgent")
+    {
+      this.ConnectorName = connectorName;
+      this.Language = language;
+      this.SentimentAnalysis = sentimentAnalysis;
+      this.StatusCallback = statusCallback;
+    }
+
+    /// <summary>
+    /// Return the attributes of the TwiML tag
+    /// </summary>
+    protected override List<XAttribute> GetElementAttributes()
+    {
+      var attributes = new List<XAttribute>();
+      if (this.ConnectorName != null)
+      {
+        attributes.Add(new XAttribute("connectorName", this.ConnectorName));
+      }
+      if (this.Language != null)
+      {
+        attributes.Add(new XAttribute("language", this.Language));
+      }
+      if (this.SentimentAnalysis != null)
+      {
+        attributes.Add(new XAttribute("sentimentAnalysis", this.SentimentAnalysis.Value.ToString().ToLower()));
+      }
+      if (this.StatusCallback != null)
+      {
+        attributes.Add(new XAttribute("statusCallback", this.StatusCallback));
+      }
+      return attributes;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new VirtualAgent Append(TwiML childElem)
+    {
+      return (VirtualAgent)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new VirtualAgent SetOption(string key, object value)
+    {
+      return (VirtualAgent)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/TwiML/VoiceResponse.cs b/src/Twilio/TwiML/VoiceResponse.cs
index 4344a9863..114659324 100644
--- a/src/Twilio/TwiML/VoiceResponse.cs
+++ b/src/Twilio/TwiML/VoiceResponse.cs
@@ -12,720 +12,720 @@
 using Twilio.TwiML.Voice;
 
 namespace Twilio.TwiML
-{
-
+{
+
+  /// <summary>
+  /// Response TwiML for Voice
+  /// </summary>
+  public class VoiceResponse : TwiML
+  {
     /// <summary>
-    /// Response TwiML for Voice
+    /// Create a new VoiceResponse
     /// </summary>
-    public class VoiceResponse : TwiML
-    {
-        /// <summary>
-        /// Create a new VoiceResponse
-        /// </summary>
-        public VoiceResponse() : base("Response")
-        {
-        }
-
-        /// <summary>
-        /// Create a new <Connect/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        public VoiceResponse Connect(Uri action = null, Twilio.Http.HttpMethod method = null)
-        {
-            var newChild = new Connect(action, method);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Connect/> element as a child of this element
-        /// </summary>
-        /// <param name="connect"> A Connect instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Connect(Connect connect)
-        {
-            this.Append(connect);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Dial/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="number"> Phone number to dial, the body of the TwiML Element. </param>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="timeout"> Time to wait for answer </param>
-        /// <param name="hangupOnStar"> Hangup call on star press </param>
-        /// <param name="timeLimit"> Max time length </param>
-        /// <param name="callerId"> Caller ID to display </param>
-        /// <param name="record"> Record the call </param>
-        /// <param name="trim"> Trim the recording </param>
-        /// <param name="recordingStatusCallback"> Recording status callback URL </param>
-        /// <param name="recordingStatusCallbackMethod"> Recording status callback URL method </param>
-        /// <param name="recordingStatusCallbackEvent"> Recording status callback events </param>
-        /// <param name="answerOnBridge"> Preserve the ringing behavior of the inbound call until the Dialed call picks up
-        ///                      </param>
-        /// <param name="ringTone"> Ringtone allows you to override the ringback tone that Twilio will play back to the caller
-        ///                while executing the Dial </param>
-        /// <param name="recordingTrack"> To indicate which audio track should be recorded </param>
-        /// <param name="sequential"> Used to determine if child TwiML nouns should be dialed in order, one after the other
-        ///                  (sequential) or dial all at once (parallel). Default is false, parallel </param>
-        /// <param name="referUrl"> Webhook that will receive future SIP REFER requests </param>
-        /// <param name="referMethod"> The HTTP method to use for the refer Webhook </param>
-        public VoiceResponse Dial(string number = null,
-                                  Uri action = null,
-                                  Twilio.Http.HttpMethod method = null,
-                                  int? timeout = null,
-                                  bool? hangupOnStar = null,
-                                  int? timeLimit = null,
-                                  string callerId = null,
-                                  Dial.RecordEnum record = null,
-                                  Dial.TrimEnum trim = null,
-                                  Uri recordingStatusCallback = null,
-                                  Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                                  List<Dial.RecordingEventEnum> recordingStatusCallbackEvent = null,
-                                  bool? answerOnBridge = null,
-                                  Dial.RingToneEnum ringTone = null,
-                                  Dial.RecordingTrackEnum recordingTrack = null,
-                                  bool? sequential = null,
-                                  Uri referUrl = null,
-                                  Twilio.Http.HttpMethod referMethod = null)
-        {
-            var newChild = new Dial(
-                number,
-                action,
-                method,
-                timeout,
-                hangupOnStar,
-                timeLimit,
-                callerId,
-                record,
-                trim,
-                recordingStatusCallback,
-                recordingStatusCallbackMethod,
-                recordingStatusCallbackEvent,
-                answerOnBridge,
-                ringTone,
-                recordingTrack,
-                sequential,
-                referUrl,
-                referMethod
-            );
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Dial/> element as a child of this element
-        /// </summary>
-        /// <param name="dial"> A Dial instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Dial(Dial dial)
-        {
-            this.Append(dial);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Echo/> element and append it as a child of this element.
-        /// </summary>
-        public VoiceResponse Echo()
-        {
-            var newChild = new Echo();
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Echo/> element as a child of this element
-        /// </summary>
-        /// <param name="echo"> A Echo instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Echo(Echo echo)
-        {
-            this.Append(echo);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Enqueue/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> Friendly name, the body of the TwiML Element. </param>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="waitUrl"> Wait URL </param>
-        /// <param name="waitUrlMethod"> Wait URL method </param>
-        /// <param name="workflowSid"> TaskRouter Workflow SID </param>
-        public VoiceResponse Enqueue(string name = null,
-                                     Uri action = null,
-                                     Twilio.Http.HttpMethod method = null,
-                                     Uri waitUrl = null,
-                                     Twilio.Http.HttpMethod waitUrlMethod = null,
-                                     string workflowSid = null)
-        {
-            var newChild = new Enqueue(name, action, method, waitUrl, waitUrlMethod, workflowSid);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Enqueue/> element as a child of this element
-        /// </summary>
-        /// <param name="enqueue"> A Enqueue instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Enqueue(Enqueue enqueue)
-        {
-            this.Append(enqueue);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Gather/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="input"> Input type Twilio should accept </param>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="timeout"> Time to wait to gather input </param>
-        /// <param name="speechTimeout"> Time to wait to gather speech input and it should be either auto or a positive
-        ///                     integer. </param>
-        /// <param name="maxSpeechTime"> Max allowed time for speech input </param>
-        /// <param name="profanityFilter"> Profanity Filter on speech </param>
-        /// <param name="finishOnKey"> Finish gather on key </param>
-        /// <param name="numDigits"> Number of digits to collect </param>
-        /// <param name="partialResultCallback"> Partial result callback URL </param>
-        /// <param name="partialResultCallbackMethod"> Partial result callback URL method </param>
-        /// <param name="language"> Language to use </param>
-        /// <param name="hints"> Speech recognition hints </param>
-        /// <param name="bargeIn"> Stop playing media upon speech </param>
-        /// <param name="debug"> Allow debug for gather </param>
-        /// <param name="actionOnEmptyResult"> Force webhook to the action URL event if there is no input </param>
-        /// <param name="speechModel"> Specify the model that is best suited for your use case </param>
-        /// <param name="enhanced"> Use enhanced speech model </param>
-        public VoiceResponse Gather(List<Gather.InputEnum> input = null,
-                                    Uri action = null,
-                                    Twilio.Http.HttpMethod method = null,
-                                    int? timeout = null,
-                                    string speechTimeout = null,
-                                    int? maxSpeechTime = null,
-                                    bool? profanityFilter = null,
-                                    string finishOnKey = null,
-                                    int? numDigits = null,
-                                    Uri partialResultCallback = null,
-                                    Twilio.Http.HttpMethod partialResultCallbackMethod = null,
-                                    Gather.LanguageEnum language = null,
-                                    string hints = null,
-                                    bool? bargeIn = null,
-                                    bool? debug = null,
-                                    bool? actionOnEmptyResult = null,
-                                    Gather.SpeechModelEnum speechModel = null,
-                                    bool? enhanced = null)
-        {
-            var newChild = new Gather(
-                input,
-                action,
-                method,
-                timeout,
-                speechTimeout,
-                maxSpeechTime,
-                profanityFilter,
-                finishOnKey,
-                numDigits,
-                partialResultCallback,
-                partialResultCallbackMethod,
-                language,
-                hints,
-                bargeIn,
-                debug,
-                actionOnEmptyResult,
-                speechModel,
-                enhanced
-            );
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Gather/> element as a child of this element
-        /// </summary>
-        /// <param name="gather"> A Gather instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Gather(Gather gather)
-        {
-            this.Append(gather);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Hangup/> element and append it as a child of this element.
-        /// </summary>
-        public VoiceResponse Hangup()
-        {
-            var newChild = new Hangup();
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Hangup/> element as a child of this element
-        /// </summary>
-        /// <param name="hangup"> A Hangup instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Hangup(Hangup hangup)
-        {
-            this.Append(hangup);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Leave/> element and append it as a child of this element.
-        /// </summary>
-        public VoiceResponse Leave()
-        {
-            var newChild = new Leave();
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Leave/> element as a child of this element
-        /// </summary>
-        /// <param name="leave"> A Leave instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Leave(Leave leave)
-        {
-            this.Append(leave);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Pause/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="length"> Length in seconds to pause </param>
-        public VoiceResponse Pause(int? length = null)
-        {
-            var newChild = new Pause(length);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Pause/> element as a child of this element
-        /// </summary>
-        /// <param name="pause"> A Pause instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Pause(Pause pause)
-        {
-            this.Append(pause);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Play/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="url"> Media URL, the body of the TwiML Element. </param>
-        /// <param name="loop"> Times to loop media </param>
-        /// <param name="digits"> Play DTMF tones for digits </param>
-        public VoiceResponse Play(Uri url = null, int? loop = null, string digits = null)
-        {
-            var newChild = new Play(url, loop, digits);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Play/> element as a child of this element
-        /// </summary>
-        /// <param name="play"> A Play instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Play(Play play)
-        {
-            this.Append(play);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Queue/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="name"> Queue name, the body of the TwiML Element. </param>
-        /// <param name="url"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="reservationSid"> TaskRouter Reservation SID </param>
-        /// <param name="postWorkActivitySid"> TaskRouter Activity SID </param>
-        public VoiceResponse Queue(string name = null,
-                                   Uri url = null,
-                                   Twilio.Http.HttpMethod method = null,
-                                   string reservationSid = null,
-                                   string postWorkActivitySid = null)
-        {
-            var newChild = new Queue(name, url, method, reservationSid, postWorkActivitySid);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Queue/> element as a child of this element
-        /// </summary>
-        /// <param name="queue"> A Queue instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Queue(Queue queue)
-        {
-            this.Append(queue);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Record/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="timeout"> Timeout to begin recording </param>
-        /// <param name="finishOnKey"> Finish recording on key </param>
-        /// <param name="maxLength"> Max time to record in seconds </param>
-        /// <param name="playBeep"> Play beep </param>
-        /// <param name="trim"> Trim the recording </param>
-        /// <param name="recordingStatusCallback"> Status callback URL </param>
-        /// <param name="recordingStatusCallbackMethod"> Status callback URL method </param>
-        /// <param name="recordingStatusCallbackEvent"> Recording status callback events </param>
-        /// <param name="transcribe"> Transcribe the recording </param>
-        /// <param name="transcribeCallback"> Transcribe callback URL </param>
-        public VoiceResponse Record(Uri action = null,
-                                    Twilio.Http.HttpMethod method = null,
-                                    int? timeout = null,
-                                    string finishOnKey = null,
-                                    int? maxLength = null,
-                                    bool? playBeep = null,
-                                    Record.TrimEnum trim = null,
-                                    Uri recordingStatusCallback = null,
-                                    Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
-                                    List<Record.RecordingEventEnum> recordingStatusCallbackEvent = null,
-                                    bool? transcribe = null,
-                                    Uri transcribeCallback = null)
-        {
-            var newChild = new Record(
-                action,
-                method,
-                timeout,
-                finishOnKey,
-                maxLength,
-                playBeep,
-                trim,
-                recordingStatusCallback,
-                recordingStatusCallbackMethod,
-                recordingStatusCallbackEvent,
-                transcribe,
-                transcribeCallback
-            );
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Record/> element as a child of this element
-        /// </summary>
-        /// <param name="record"> A Record instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Record(Record record)
-        {
-            this.Append(record);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Redirect/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="url"> Redirect URL, the body of the TwiML Element. </param>
-        /// <param name="method"> Redirect URL method </param>
-        public VoiceResponse Redirect(Uri url = null, Twilio.Http.HttpMethod method = null)
-        {
-            var newChild = new Redirect(url, method);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Redirect/> element as a child of this element
-        /// </summary>
-        /// <param name="redirect"> A Redirect instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Redirect(Redirect redirect)
-        {
-            this.Append(redirect);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Reject/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="reason"> Rejection reason </param>
-        public VoiceResponse Reject(Reject.ReasonEnum reason = null)
-        {
-            var newChild = new Reject(reason);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Reject/> element as a child of this element
-        /// </summary>
-        /// <param name="reject"> A Reject instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Reject(Reject reject)
-        {
-            this.Append(reject);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Say/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="message"> Message to say, the body of the TwiML Element. </param>
-        /// <param name="voice"> Voice to use </param>
-        /// <param name="loop"> Times to loop message </param>
-        /// <param name="language"> Message langauge </param>
-        public VoiceResponse Say(string message = null,
-                                 Say.VoiceEnum voice = null,
-                                 int? loop = null,
-                                 Say.LanguageEnum language = null)
-        {
-            var newChild = new Say(message, voice, loop, language);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Say/> element as a child of this element
-        /// </summary>
-        /// <param name="say"> A Say instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Say(Say say)
-        {
-            this.Append(say);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Sms/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="message"> Message body, the body of the TwiML Element. </param>
-        /// <param name="to"> Number to send message to </param>
-        /// <param name="from"> Number to send message from </param>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        /// <param name="statusCallback"> Status callback URL </param>
-        public VoiceResponse Sms(string message = null,
-                                 Types.PhoneNumber to = null,
-                                 Types.PhoneNumber from = null,
-                                 Uri action = null,
-                                 Twilio.Http.HttpMethod method = null,
-                                 Uri statusCallback = null)
-        {
-            var newChild = new Sms(message, to, from, action, method, statusCallback);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Sms/> element as a child of this element
-        /// </summary>
-        /// <param name="sms"> A Sms instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Sms(Sms sms)
-        {
-            this.Append(sms);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Pay/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="input"> Input type Twilio should accept </param>
-        /// <param name="action"> Action URL </param>
-        /// <param name="bankAccountType"> Bank account type for ach transactions. If set, payment method attribute must be
-        ///                       provided and value should be set to ach-debit. defaults to consumer-checking </param>
-        /// <param name="statusCallback"> Status callback URL </param>
-        /// <param name="statusCallbackMethod"> Status callback method </param>
-        /// <param name="timeout"> Time to wait to gather input </param>
-        /// <param name="maxAttempts"> Maximum number of allowed retries when gathering input </param>
-        /// <param name="securityCode"> Prompt for security code </param>
-        /// <param name="postalCode"> Prompt for postal code and it should be true/false or default postal code </param>
-        /// <param name="minPostalCodeLength"> Prompt for minimum postal code length </param>
-        /// <param name="paymentConnector"> Unique name for payment connector </param>
-        /// <param name="paymentMethod"> Payment method to be used. defaults to credit-card </param>
-        /// <param name="tokenType"> Type of token </param>
-        /// <param name="chargeAmount"> Amount to process. If value is greater than 0 then make the payment else create a
-        ///                    payment token </param>
-        /// <param name="currency"> Currency of the amount attribute </param>
-        /// <param name="description"> Details regarding the payment </param>
-        /// <param name="validCardTypes"> Comma separated accepted card types </param>
-        /// <param name="language"> Language to use </param>
-        public VoiceResponse Pay(Pay.InputEnum input = null,
-                                 Uri action = null,
-                                 Pay.BankAccountTypeEnum bankAccountType = null,
-                                 Uri statusCallback = null,
-                                 Pay.StatusCallbackMethodEnum statusCallbackMethod = null,
-                                 int? timeout = null,
-                                 int? maxAttempts = null,
-                                 bool? securityCode = null,
-                                 string postalCode = null,
-                                 int? minPostalCodeLength = null,
-                                 string paymentConnector = null,
-                                 Pay.PaymentMethodEnum paymentMethod = null,
-                                 Pay.TokenTypeEnum tokenType = null,
-                                 string chargeAmount = null,
-                                 string currency = null,
-                                 string description = null,
-                                 List<Pay.ValidCardTypesEnum> validCardTypes = null,
-                                 Pay.LanguageEnum language = null)
-        {
-            var newChild = new Pay(
-                input,
-                action,
-                bankAccountType,
-                statusCallback,
-                statusCallbackMethod,
-                timeout,
-                maxAttempts,
-                securityCode,
-                postalCode,
-                minPostalCodeLength,
-                paymentConnector,
-                paymentMethod,
-                tokenType,
-                chargeAmount,
-                currency,
-                description,
-                validCardTypes,
-                language
-            );
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Pay/> element as a child of this element
-        /// </summary>
-        /// <param name="pay"> A Pay instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Pay(Pay pay)
-        {
-            this.Append(pay);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Prompt/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="for_"> Name of the payment source data element </param>
-        /// <param name="errorType"> Type of error </param>
-        /// <param name="cardType"> Type of the credit card </param>
-        /// <param name="attempt"> Current attempt count </param>
-        public VoiceResponse Prompt(Prompt.ForEnum for_ = null,
-                                    List<Prompt.ErrorTypeEnum> errorType = null,
-                                    List<Prompt.CardTypeEnum> cardType = null,
-                                    List<int> attempt = null)
-        {
-            var newChild = new Prompt(for_, errorType, cardType, attempt);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Prompt/> element as a child of this element
-        /// </summary>
-        /// <param name="prompt"> A Prompt instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Prompt(Prompt prompt)
-        {
-            this.Append(prompt);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Start/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        public VoiceResponse Start(Uri action = null, Twilio.Http.HttpMethod method = null)
-        {
-            var newChild = new Start(action, method);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Start/> element as a child of this element
-        /// </summary>
-        /// <param name="start"> A Start instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Start(Start start)
-        {
-            this.Append(start);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Stop/> element and append it as a child of this element.
-        /// </summary>
-        public VoiceResponse Stop()
-        {
-            var newChild = new Stop();
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Stop/> element as a child of this element
-        /// </summary>
-        /// <param name="stop"> A Stop instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Stop(Stop stop)
-        {
-            this.Append(stop);
-            return this;
-        }
-
-        /// <summary>
-        /// Create a new <Refer/> element and append it as a child of this element.
-        /// </summary>
-        /// <param name="action"> Action URL </param>
-        /// <param name="method"> Action URL method </param>
-        public VoiceResponse Refer(Uri action = null, Twilio.Http.HttpMethod method = null)
-        {
-            var newChild = new Refer(action, method);
-            this.Append(newChild);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a <Refer/> element as a child of this element
-        /// </summary>
-        /// <param name="refer"> A Refer instance. </param>
-        [System.Obsolete("This method is deprecated, use .Append() instead.")]
-        public VoiceResponse Refer(Refer refer)
-        {
-            this.Append(refer);
-            return this;
-        }
-
-        /// <summary>
-        /// Append a child TwiML element to this element returning this element to allow chaining.
-        /// </summary>
-        /// <param name="childElem"> Child TwiML element to add </param>
-        public new VoiceResponse Append(TwiML childElem)
-        {
-            return (VoiceResponse) base.Append(childElem);
-        }
-
-        /// <summary>
-        /// Add freeform key-value attributes to the generated xml
-        /// </summary>
-        /// <param name="key"> Option key </param>
-        /// <param name="value"> Option value </param>
-        public new VoiceResponse SetOption(string key, object value)
-        {
-            return (VoiceResponse) base.SetOption(key, value);
-        }
-    }
+    public VoiceResponse() : base("Response")
+    {
+    }
+
+    /// <summary>
+    /// Create a new <Connect/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    public VoiceResponse Connect(Uri action = null, Twilio.Http.HttpMethod method = null)
+    {
+      var newChild = new Connect(action, method);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Connect/> element as a child of this element
+    /// </summary>
+    /// <param name="connect"> A Connect instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Connect(Connect connect)
+    {
+      this.Append(connect);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Dial/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="number"> Phone number to dial, the body of the TwiML Element. </param>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="timeout"> Time to wait for answer </param>
+    /// <param name="hangupOnStar"> Hangup call on star press </param>
+    /// <param name="timeLimit"> Max time length </param>
+    /// <param name="callerId"> Caller ID to display </param>
+    /// <param name="record"> Record the call </param>
+    /// <param name="trim"> Trim the recording </param>
+    /// <param name="recordingStatusCallback"> Recording status callback URL </param>
+    /// <param name="recordingStatusCallbackMethod"> Recording status callback URL method </param>
+    /// <param name="recordingStatusCallbackEvent"> Recording status callback events </param>
+    /// <param name="answerOnBridge"> Preserve the ringing behavior of the inbound call until the Dialed call picks up
+    ///                      </param>
+    /// <param name="ringTone"> Ringtone allows you to override the ringback tone that Twilio will play back to the caller
+    ///                while executing the Dial </param>
+    /// <param name="recordingTrack"> To indicate which audio track should be recorded </param>
+    /// <param name="sequential"> Used to determine if child TwiML nouns should be dialed in order, one after the other
+    ///                  (sequential) or dial all at once (parallel). Default is false, parallel </param>
+    /// <param name="referUrl"> Webhook that will receive future SIP REFER requests </param>
+    /// <param name="referMethod"> The HTTP method to use for the refer Webhook </param>
+    public VoiceResponse Dial(string number = null,
+                              Uri action = null,
+                              Twilio.Http.HttpMethod method = null,
+                              int? timeout = null,
+                              bool? hangupOnStar = null,
+                              int? timeLimit = null,
+                              string callerId = null,
+                              Dial.RecordEnum record = null,
+                              Dial.TrimEnum trim = null,
+                              Uri recordingStatusCallback = null,
+                              Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                              List<Dial.RecordingEventEnum> recordingStatusCallbackEvent = null,
+                              bool? answerOnBridge = null,
+                              Dial.RingToneEnum ringTone = null,
+                              Dial.RecordingTrackEnum recordingTrack = null,
+                              bool? sequential = null,
+                              Uri referUrl = null,
+                              Twilio.Http.HttpMethod referMethod = null)
+    {
+      var newChild = new Dial(
+          number,
+          action,
+          method,
+          timeout,
+          hangupOnStar,
+          timeLimit,
+          callerId,
+          record,
+          trim,
+          recordingStatusCallback,
+          recordingStatusCallbackMethod,
+          recordingStatusCallbackEvent,
+          answerOnBridge,
+          ringTone,
+          recordingTrack,
+          sequential,
+          referUrl,
+          referMethod
+      );
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Dial/> element as a child of this element
+    /// </summary>
+    /// <param name="dial"> A Dial instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Dial(Dial dial)
+    {
+      this.Append(dial);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Echo/> element and append it as a child of this element.
+    /// </summary>
+    public VoiceResponse Echo()
+    {
+      var newChild = new Echo();
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Echo/> element as a child of this element
+    /// </summary>
+    /// <param name="echo"> A Echo instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Echo(Echo echo)
+    {
+      this.Append(echo);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Enqueue/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> Friendly name, the body of the TwiML Element. </param>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="waitUrl"> Wait URL </param>
+    /// <param name="waitUrlMethod"> Wait URL method </param>
+    /// <param name="workflowSid"> TaskRouter Workflow SID </param>
+    public VoiceResponse Enqueue(string name = null,
+                                 Uri action = null,
+                                 Twilio.Http.HttpMethod method = null,
+                                 Uri waitUrl = null,
+                                 Twilio.Http.HttpMethod waitUrlMethod = null,
+                                 string workflowSid = null)
+    {
+      var newChild = new Enqueue(name, action, method, waitUrl, waitUrlMethod, workflowSid);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Enqueue/> element as a child of this element
+    /// </summary>
+    /// <param name="enqueue"> A Enqueue instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Enqueue(Enqueue enqueue)
+    {
+      this.Append(enqueue);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Gather/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="input"> Input type Twilio should accept </param>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="timeout"> Time to wait to gather input </param>
+    /// <param name="speechTimeout"> Time to wait to gather speech input and it should be either auto or a positive
+    ///                     integer. </param>
+    /// <param name="maxSpeechTime"> Max allowed time for speech input </param>
+    /// <param name="profanityFilter"> Profanity Filter on speech </param>
+    /// <param name="finishOnKey"> Finish gather on key </param>
+    /// <param name="numDigits"> Number of digits to collect </param>
+    /// <param name="partialResultCallback"> Partial result callback URL </param>
+    /// <param name="partialResultCallbackMethod"> Partial result callback URL method </param>
+    /// <param name="language"> Language to use </param>
+    /// <param name="hints"> Speech recognition hints </param>
+    /// <param name="bargeIn"> Stop playing media upon speech </param>
+    /// <param name="debug"> Allow debug for gather </param>
+    /// <param name="actionOnEmptyResult"> Force webhook to the action URL event if there is no input </param>
+    /// <param name="speechModel"> Specify the model that is best suited for your use case </param>
+    /// <param name="enhanced"> Use enhanced speech model </param>
+    public VoiceResponse Gather(List<Gather.InputEnum> input = null,
+                                Uri action = null,
+                                Twilio.Http.HttpMethod method = null,
+                                int? timeout = null,
+                                string speechTimeout = null,
+                                int? maxSpeechTime = null,
+                                bool? profanityFilter = null,
+                                string finishOnKey = null,
+                                int? numDigits = null,
+                                Uri partialResultCallback = null,
+                                Twilio.Http.HttpMethod partialResultCallbackMethod = null,
+                                Gather.LanguageEnum language = null,
+                                string hints = null,
+                                bool? bargeIn = null,
+                                bool? debug = null,
+                                bool? actionOnEmptyResult = null,
+                                Gather.SpeechModelEnum speechModel = null,
+                                bool? enhanced = null)
+    {
+      var newChild = new Gather(
+          input,
+          action,
+          method,
+          timeout,
+          speechTimeout,
+          maxSpeechTime,
+          profanityFilter,
+          finishOnKey,
+          numDigits,
+          partialResultCallback,
+          partialResultCallbackMethod,
+          language,
+          hints,
+          bargeIn,
+          debug,
+          actionOnEmptyResult,
+          speechModel,
+          enhanced
+      );
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Gather/> element as a child of this element
+    /// </summary>
+    /// <param name="gather"> A Gather instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Gather(Gather gather)
+    {
+      this.Append(gather);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Hangup/> element and append it as a child of this element.
+    /// </summary>
+    public VoiceResponse Hangup()
+    {
+      var newChild = new Hangup();
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Hangup/> element as a child of this element
+    /// </summary>
+    /// <param name="hangup"> A Hangup instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Hangup(Hangup hangup)
+    {
+      this.Append(hangup);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Leave/> element and append it as a child of this element.
+    /// </summary>
+    public VoiceResponse Leave()
+    {
+      var newChild = new Leave();
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Leave/> element as a child of this element
+    /// </summary>
+    /// <param name="leave"> A Leave instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Leave(Leave leave)
+    {
+      this.Append(leave);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Pause/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="length"> Length in seconds to pause </param>
+    public VoiceResponse Pause(int? length = null)
+    {
+      var newChild = new Pause(length);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Pause/> element as a child of this element
+    /// </summary>
+    /// <param name="pause"> A Pause instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Pause(Pause pause)
+    {
+      this.Append(pause);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Play/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="url"> Media URL, the body of the TwiML Element. </param>
+    /// <param name="loop"> Times to loop media </param>
+    /// <param name="digits"> Play DTMF tones for digits </param>
+    public VoiceResponse Play(Uri url = null, int? loop = null, string digits = null)
+    {
+      var newChild = new Play(url, loop, digits);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Play/> element as a child of this element
+    /// </summary>
+    /// <param name="play"> A Play instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Play(Play play)
+    {
+      this.Append(play);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Queue/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="name"> Queue name, the body of the TwiML Element. </param>
+    /// <param name="url"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="reservationSid"> TaskRouter Reservation SID </param>
+    /// <param name="postWorkActivitySid"> TaskRouter Activity SID </param>
+    public VoiceResponse Queue(string name = null,
+                               Uri url = null,
+                               Twilio.Http.HttpMethod method = null,
+                               string reservationSid = null,
+                               string postWorkActivitySid = null)
+    {
+      var newChild = new Queue(name, url, method, reservationSid, postWorkActivitySid);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Queue/> element as a child of this element
+    /// </summary>
+    /// <param name="queue"> A Queue instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Queue(Queue queue)
+    {
+      this.Append(queue);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Record/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="timeout"> Timeout to begin recording </param>
+    /// <param name="finishOnKey"> Finish recording on key </param>
+    /// <param name="maxLength"> Max time to record in seconds </param>
+    /// <param name="playBeep"> Play beep </param>
+    /// <param name="trim"> Trim the recording </param>
+    /// <param name="recordingStatusCallback"> Status callback URL </param>
+    /// <param name="recordingStatusCallbackMethod"> Status callback URL method </param>
+    /// <param name="recordingStatusCallbackEvent"> Recording status callback events </param>
+    /// <param name="transcribe"> Transcribe the recording </param>
+    /// <param name="transcribeCallback"> Transcribe callback URL </param>
+    public VoiceResponse Record(Uri action = null,
+                                Twilio.Http.HttpMethod method = null,
+                                int? timeout = null,
+                                string finishOnKey = null,
+                                int? maxLength = null,
+                                bool? playBeep = null,
+                                Record.TrimEnum trim = null,
+                                Uri recordingStatusCallback = null,
+                                Twilio.Http.HttpMethod recordingStatusCallbackMethod = null,
+                                List<Record.RecordingEventEnum> recordingStatusCallbackEvent = null,
+                                bool? transcribe = null,
+                                Uri transcribeCallback = null)
+    {
+      var newChild = new Record(
+          action,
+          method,
+          timeout,
+          finishOnKey,
+          maxLength,
+          playBeep,
+          trim,
+          recordingStatusCallback,
+          recordingStatusCallbackMethod,
+          recordingStatusCallbackEvent,
+          transcribe,
+          transcribeCallback
+      );
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Record/> element as a child of this element
+    /// </summary>
+    /// <param name="record"> A Record instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Record(Record record)
+    {
+      this.Append(record);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Redirect/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="url"> Redirect URL, the body of the TwiML Element. </param>
+    /// <param name="method"> Redirect URL method </param>
+    public VoiceResponse Redirect(Uri url = null, Twilio.Http.HttpMethod method = null)
+    {
+      var newChild = new Redirect(url, method);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Redirect/> element as a child of this element
+    /// </summary>
+    /// <param name="redirect"> A Redirect instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Redirect(Redirect redirect)
+    {
+      this.Append(redirect);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Reject/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="reason"> Rejection reason </param>
+    public VoiceResponse Reject(Reject.ReasonEnum reason = null)
+    {
+      var newChild = new Reject(reason);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Reject/> element as a child of this element
+    /// </summary>
+    /// <param name="reject"> A Reject instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Reject(Reject reject)
+    {
+      this.Append(reject);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Say/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="message"> Message to say, the body of the TwiML Element. </param>
+    /// <param name="voice"> Voice to use </param>
+    /// <param name="loop"> Times to loop message </param>
+    /// <param name="language"> Message langauge </param>
+    public VoiceResponse Say(string message = null,
+                             Say.VoiceEnum voice = null,
+                             int? loop = null,
+                             Say.LanguageEnum language = null)
+    {
+      var newChild = new Say(message, voice, loop, language);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Say/> element as a child of this element
+    /// </summary>
+    /// <param name="say"> A Say instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Say(Say say)
+    {
+      this.Append(say);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Sms/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="message"> Message body, the body of the TwiML Element. </param>
+    /// <param name="to"> Number to send message to </param>
+    /// <param name="from"> Number to send message from </param>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    /// <param name="statusCallback"> Status callback URL </param>
+    public VoiceResponse Sms(string message = null,
+                             Types.PhoneNumber to = null,
+                             Types.PhoneNumber from = null,
+                             Uri action = null,
+                             Twilio.Http.HttpMethod method = null,
+                             Uri statusCallback = null)
+    {
+      var newChild = new Sms(message, to, from, action, method, statusCallback);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Sms/> element as a child of this element
+    /// </summary>
+    /// <param name="sms"> A Sms instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Sms(Sms sms)
+    {
+      this.Append(sms);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Pay/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="input"> Input type Twilio should accept </param>
+    /// <param name="action"> Action URL </param>
+    /// <param name="bankAccountType"> Bank account type for ach transactions. If set, payment method attribute must be
+    ///                       provided and value should be set to ach-debit. defaults to consumer-checking </param>
+    /// <param name="statusCallback"> Status callback URL </param>
+    /// <param name="statusCallbackMethod"> Status callback method </param>
+    /// <param name="timeout"> Time to wait to gather input </param>
+    /// <param name="maxAttempts"> Maximum number of allowed retries when gathering input </param>
+    /// <param name="securityCode"> Prompt for security code </param>
+    /// <param name="postalCode"> Prompt for postal code and it should be true/false or default postal code </param>
+    /// <param name="minPostalCodeLength"> Prompt for minimum postal code length </param>
+    /// <param name="paymentConnector"> Unique name for payment connector </param>
+    /// <param name="paymentMethod"> Payment method to be used. defaults to credit-card </param>
+    /// <param name="tokenType"> Type of token </param>
+    /// <param name="chargeAmount"> Amount to process. If value is greater than 0 then make the payment else create a
+    ///                    payment token </param>
+    /// <param name="currency"> Currency of the amount attribute </param>
+    /// <param name="description"> Details regarding the payment </param>
+    /// <param name="validCardTypes"> Comma separated accepted card types </param>
+    /// <param name="language"> Language to use </param>
+    public VoiceResponse Pay(Pay.InputEnum input = null,
+                             Uri action = null,
+                             Pay.BankAccountTypeEnum bankAccountType = null,
+                             Uri statusCallback = null,
+                             Pay.StatusCallbackMethodEnum statusCallbackMethod = null,
+                             int? timeout = null,
+                             int? maxAttempts = null,
+                             bool? securityCode = null,
+                             string postalCode = null,
+                             int? minPostalCodeLength = null,
+                             string paymentConnector = null,
+                             Pay.PaymentMethodEnum paymentMethod = null,
+                             Pay.TokenTypeEnum tokenType = null,
+                             string chargeAmount = null,
+                             string currency = null,
+                             string description = null,
+                             List<Pay.ValidCardTypesEnum> validCardTypes = null,
+                             Pay.LanguageEnum language = null)
+    {
+      var newChild = new Pay(
+          input,
+          action,
+          bankAccountType,
+          statusCallback,
+          statusCallbackMethod,
+          timeout,
+          maxAttempts,
+          securityCode,
+          postalCode,
+          minPostalCodeLength,
+          paymentConnector,
+          paymentMethod,
+          tokenType,
+          chargeAmount,
+          currency,
+          description,
+          validCardTypes,
+          language
+      );
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Pay/> element as a child of this element
+    /// </summary>
+    /// <param name="pay"> A Pay instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Pay(Pay pay)
+    {
+      this.Append(pay);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Prompt/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="for_"> Name of the payment source data element </param>
+    /// <param name="errorType"> Type of error </param>
+    /// <param name="cardType"> Type of the credit card </param>
+    /// <param name="attempt"> Current attempt count </param>
+    public VoiceResponse Prompt(Prompt.ForEnum for_ = null,
+                                List<Prompt.ErrorTypeEnum> errorType = null,
+                                List<Prompt.CardTypeEnum> cardType = null,
+                                List<int> attempt = null)
+    {
+      var newChild = new Prompt(for_, errorType, cardType, attempt);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Prompt/> element as a child of this element
+    /// </summary>
+    /// <param name="prompt"> A Prompt instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Prompt(Prompt prompt)
+    {
+      this.Append(prompt);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Start/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    public VoiceResponse Start(Uri action = null, Twilio.Http.HttpMethod method = null)
+    {
+      var newChild = new Start(action, method);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Start/> element as a child of this element
+    /// </summary>
+    /// <param name="start"> A Start instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Start(Start start)
+    {
+      this.Append(start);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Stop/> element and append it as a child of this element.
+    /// </summary>
+    public VoiceResponse Stop()
+    {
+      var newChild = new Stop();
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Stop/> element as a child of this element
+    /// </summary>
+    /// <param name="stop"> A Stop instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Stop(Stop stop)
+    {
+      this.Append(stop);
+      return this;
+    }
+
+    /// <summary>
+    /// Create a new <Refer/> element and append it as a child of this element.
+    /// </summary>
+    /// <param name="action"> Action URL </param>
+    /// <param name="method"> Action URL method </param>
+    public VoiceResponse Refer(Uri action = null, Twilio.Http.HttpMethod method = null)
+    {
+      var newChild = new Refer(action, method);
+      this.Append(newChild);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a <Refer/> element as a child of this element
+    /// </summary>
+    /// <param name="refer"> A Refer instance. </param>
+    [System.Obsolete("This method is deprecated, use .Append() instead.")]
+    public VoiceResponse Refer(Refer refer)
+    {
+      this.Append(refer);
+      return this;
+    }
+
+    /// <summary>
+    /// Append a child TwiML element to this element returning this element to allow chaining.
+    /// </summary>
+    /// <param name="childElem"> Child TwiML element to add </param>
+    public new VoiceResponse Append(TwiML childElem)
+    {
+      return (VoiceResponse)base.Append(childElem);
+    }
+
+    /// <summary>
+    /// Add freeform key-value attributes to the generated xml
+    /// </summary>
+    /// <param name="key"> Option key </param>
+    /// <param name="value"> Option value </param>
+    public new VoiceResponse SetOption(string key, object value)
+    {
+      return (VoiceResponse)base.SetOption(key, value);
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/src/Twilio/Twilio.cs b/src/Twilio/Twilio.cs
index 3d3aa03b9..4a3a7607f 100644
--- a/src/Twilio/Twilio.cs
+++ b/src/Twilio/Twilio.cs
@@ -2,194 +2,194 @@
 using Twilio.Exceptions;
 
 namespace Twilio
-{
+{
+  /// <summary>
+  /// Default Twilio Client
+  /// </summary>
+  public class TwilioClient
+  {
+    private static string _username;
+    private static string _password;
+    private static string _accountSid;
+    private static string _region;
+    private static string _edge;
+    private static ITwilioRestClient _restClient;
+    private static string _logLevel;
+
+    private TwilioClient() { }
+
     /// <summary>
-    /// Default Twilio Client
+    /// Initialize base client with username and password
     /// </summary>
-    public class TwilioClient
-    {
-        private static string _username;
-        private static string _password;
-        private static string _accountSid;
-        private static string _region;
-        private static string _edge;
-        private static ITwilioRestClient _restClient;
-        private static string _logLevel;
-
-        private TwilioClient() { }
-
-        /// <summary>
-        /// Initialize base client with username and password
-        /// </summary>
-        /// <param name="username">Auth username</param>
-        /// <param name="password">Auth password</param>
-        public static void Init(string username, string password)
-        {
-            SetUsername(username);
-            SetPassword(password);
-        }
-
-        /// <summary>
-        /// Initialize base client with separate account SID
-        /// </summary>
-        /// <param name="username">Auth username</param>
-        /// <param name="password">Auth password</param>
-        /// <param name="accountSid">Account SID to use</param>
-        public static void Init(string username, string password, string accountSid)
-        {
-            SetUsername(username);
-            SetPassword(password);
-            SetAccountSid(accountSid);
-        }
-
-        /// <summary>
-        /// Set the client username
-        /// </summary>
-        /// <param name="username">Auth username</param>
-        public static void SetUsername(string username)
-        {
-            if (username == null)
-            {
-                throw new AuthenticationException("Username can not be null");
-            }
-
-            if (username != _username)
-            {
-                Invalidate();
-            }
-
-            _username = username;
-        }
-
-        /// <summary>
-        /// Set the client password
-        /// </summary>
-        /// <param name="password">Auth password</param>
-        public static void SetPassword(string password)
-        {
-            if (password == null)
-            {
-                throw new AuthenticationException("Password can not be null");
-            }
-
-            if (password != _password)
-            {
-                Invalidate();
-            }
-
-            _password = password;
-        }
-
-        /// <summary>
-        /// Set the client Account SID
-        /// </summary>
-        /// <param name="accountSid">Client Account SID</param>
-        public static void SetAccountSid(string accountSid)
-        {
-            if (accountSid == null)
-            {
-                throw new AuthenticationException("AccountSid can not be null");
-            }
-
-            if (accountSid != _accountSid)
-            {
-                Invalidate();
-            }
-
-            _accountSid = accountSid;
-        }
-
-        /// <summary>
-        /// Set the client region
-        /// </summary>
-        /// <param name="region">Client region</param>
-        public static void SetRegion(string region)
-        {
-            if (region != _region)
-            {
-                Invalidate();
-            }
-
-            _region = region;
-        }
-
-        /// <summary>
-        /// Set the client edge
-        /// </summary>
-        /// <param name="edge">Client edge</param>
-        public static void SetEdge(string edge)
-        {
-            if (edge != _edge)
-            {
-                Invalidate();
-            }
-
-            _edge = edge;
-        }
-
-        /// <summary>
-        /// Set the logging level
-        /// </summary>
-        /// <param name="loglevel">log level</param>
-        public static void SetLogLevel(string loglevel)
-        {
-            if (loglevel != _logLevel)
-            {
-                Invalidate();
-            }
-
-            _logLevel = loglevel;
-        }
-
-        /// <summary>
-        /// Get the rest client
-        /// </summary>
-        /// <returns>The rest client</returns>
-        public static ITwilioRestClient GetRestClient()
-        {
-            if (_restClient != null)
-            {
-                return _restClient;
-            }
-
-            if (_username == null || _password == null)
-            {
-                throw new AuthenticationException(
-                    "TwilioRestClient was used before AccountSid and AuthToken were set, please call TwilioClient.init()"
-                );
-            }
-
-            _restClient = new TwilioRestClient(_username, _password, accountSid: _accountSid, region: _region, edge: _edge)
-            {
-                LogLevel = _logLevel
-            };
-            return _restClient;
-        }
-
-        /// <summary>
-        /// Set the rest client
-        /// </summary>
-        /// <param name="restClient">Rest Client to use</param>
-        public static void SetRestClient(ITwilioRestClient restClient)
-        {
-            _restClient = restClient;
-        }
-
-        /// <summary>
-        /// Clear out the Rest Client
-        /// </summary>
-        public static void Invalidate()
-        {
-            _restClient = null;
-        }
-
-        /// <summary>
-        /// Validates that the Twilio Client can connect to api.twilio.com with
-        /// a new SSL certificate posted at api.twilio.com:8443
-        /// </summary>
-        public static void ValidateSslCertificate()
-        {
-            TwilioRestClient.ValidateSslCertificate();
-        }
-    }
+    /// <param name="username">Auth username</param>
+    /// <param name="password">Auth password</param>
+    public static void Init(string username, string password)
+    {
+      SetUsername(username);
+      SetPassword(password);
+    }
+
+    /// <summary>
+    /// Initialize base client with separate account SID
+    /// </summary>
+    /// <param name="username">Auth username</param>
+    /// <param name="password">Auth password</param>
+    /// <param name="accountSid">Account SID to use</param>
+    public static void Init(string username, string password, string accountSid)
+    {
+      SetUsername(username);
+      SetPassword(password);
+      SetAccountSid(accountSid);
+    }
+
+    /// <summary>
+    /// Set the client username
+    /// </summary>
+    /// <param name="username">Auth username</param>
+    public static void SetUsername(string username)
+    {
+      if (username == null)
+      {
+        throw new AuthenticationException("Username can not be null");
+      }
+
+      if (username != _username)
+      {
+        Invalidate();
+      }
+
+      _username = username;
+    }
+
+    /// <summary>
+    /// Set the client password
+    /// </summary>
+    /// <param name="password">Auth password</param>
+    public static void SetPassword(string password)
+    {
+      if (password == null)
+      {
+        throw new AuthenticationException("Password can not be null");
+      }
+
+      if (password != _password)
+      {
+        Invalidate();
+      }
+
+      _password = password;
+    }
+
+    /// <summary>
+    /// Set the client Account SID
+    /// </summary>
+    /// <param name="accountSid">Client Account SID</param>
+    public static void SetAccountSid(string accountSid)
+    {
+      if (accountSid == null)
+      {
+        throw new AuthenticationException("AccountSid can not be null");
+      }
+
+      if (accountSid != _accountSid)
+      {
+        Invalidate();
+      }
+
+      _accountSid = accountSid;
+    }
+
+    /// <summary>
+    /// Set the client region
+    /// </summary>
+    /// <param name="region">Client region</param>
+    public static void SetRegion(string region)
+    {
+      if (region != _region)
+      {
+        Invalidate();
+      }
+
+      _region = region;
+    }
+
+    /// <summary>
+    /// Set the client edge
+    /// </summary>
+    /// <param name="edge">Client edge</param>
+    public static void SetEdge(string edge)
+    {
+      if (edge != _edge)
+      {
+        Invalidate();
+      }
+
+      _edge = edge;
+    }
+
+    /// <summary>
+    /// Set the logging level
+    /// </summary>
+    /// <param name="loglevel">log level</param>
+    public static void SetLogLevel(string loglevel)
+    {
+      if (loglevel != _logLevel)
+      {
+        Invalidate();
+      }
+
+      _logLevel = loglevel;
+    }
+
+    /// <summary>
+    /// Get the rest client
+    /// </summary>
+    /// <returns>The rest client</returns>
+    public static ITwilioRestClient GetRestClient()
+    {
+      if (_restClient != null)
+      {
+        return _restClient;
+      }
+
+      if (_username == null || _password == null)
+      {
+        throw new AuthenticationException(
+            "TwilioRestClient was used before AccountSid and AuthToken were set, please call TwilioClient.init()"
+        );
+      }
+
+      _restClient = new TwilioRestClient(_username, _password, accountSid: _accountSid, region: _region, edge: _edge)
+      {
+        LogLevel = _logLevel
+      };
+      return _restClient;
+    }
+
+    /// <summary>
+    /// Set the rest client
+    /// </summary>
+    /// <param name="restClient">Rest Client to use</param>
+    public static void SetRestClient(ITwilioRestClient restClient)
+    {
+      _restClient = restClient;
+    }
+
+    /// <summary>
+    /// Clear out the Rest Client
+    /// </summary>
+    public static void Invalidate()
+    {
+      _restClient = null;
+    }
+
+    /// <summary>
+    /// Validates that the Twilio Client can connect to api.twilio.com with
+    /// a new SSL certificate posted at api.twilio.com:8443
+    /// </summary>
+    public static void ValidateSslCertificate()
+    {
+      TwilioRestClient.ValidateSslCertificate();
+    }
+  }
 }
diff --git a/src/Twilio/Twilio.csproj b/src/Twilio/Twilio.csproj
index c02ee2e7d..b9f8bc267 100644
--- a/src/Twilio/Twilio.csproj
+++ b/src/Twilio/Twilio.csproj
@@ -1,59 +1,32 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup Label="NuGet">
-    <TargetFrameworks>netstandard1.4;netstandard2.0;net451;net35</TargetFrameworks>
-    <IsPackable>true</IsPackable>
-    <PackageId>Twilio</PackageId>
-    <Description>Twilio REST API helper library</Description>
-    <Copyright>Copyright © Twilio</Copyright>
-    <AssemblyTitle>Twilio</AssemblyTitle>
-    <NeutralLanguage>en-US</NeutralLanguage>
-    <VersionPrefix>5.69.0</VersionPrefix>
-    <VersionSuffix>
-    </VersionSuffix>
-    <Authors>Twilio</Authors>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>Twilio</AssemblyName>
-    <PackageTags>REST;SMS;voice;telephony;phone;twilio;twiml;video;wireless;api</PackageTags>
-    <PackageIconUrl>https://www.twilio.com/docs/static/company/img/logos/red/twilio-mark-red.898073bba.png</PackageIconUrl>
-    <PackageProjectUrl>http://github.com/twilio/twilio-csharp</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/twilio/twilio-csharp/blob/HEAD/LICENSE</PackageLicenseUrl>
-    <RepositoryUrl>http://github.com/twilio/twilio-csharp</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.4' ">1.6.1</NetStandardImplicitPackageVersion>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.0</NetStandardImplicitPackageVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.1.2" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.1.2" />
-    <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.3.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.3.0" />
-    <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.1.2" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.1.2" />
-    <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
-    <Reference Include="System" />
-    <Reference Include="System.Web" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <PackageReference Include="JWT" Version="1.3.4" />
-  </ItemGroup>
-  <ItemGroup Condition="($(TargetFramework.StartsWith('net3')) OR $(TargetFramework.StartsWith('net4'))) AND '$(MSBuildRuntimeType)' == 'Core' AND '$(OS)' != 'Windows_NT'">
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" PrivateAssets="All" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="NuGet">
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <IsPackable>true</IsPackable>
+    <PackageId>Twilio</PackageId>
+    <Description>Twilio REST API helper library</Description>
+    <Copyright>Copyright © Twilio</Copyright>
+    <AssemblyTitle>Twilio</AssemblyTitle>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Authors>Twilio</Authors>
+    <NoWarn>CS1587;CS1591;CS1570;CS1573;CS1572;CS8618;CS8603;CS8625;CS8604;CS8765</NoWarn>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>Twilio</AssemblyName>
+    <PackageTags>REST;SMS;voice;telephony;phone;twilio;twiml;video;wireless;api</PackageTags>
+    <PackageIconUrl>https://www.twilio.com/docs/static/company/img/logos/red/twilio-mark-red.898073bba.png</PackageIconUrl>
+    <PackageProjectUrl>http://github.com/twilio/twilio-csharp</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/twilio/twilio-csharp/blob/HEAD/LICENSE</PackageLicenseUrl>
+    <RepositoryUrl>http://github.com/twilio/twilio-csharp</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <Version>6.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="6.15.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.0" />
+  </ItemGroup>
+</Project>
diff --git a/src/Twilio/Types/Client.cs b/src/Twilio/Types/Client.cs
index c8b6d2a26..a63b6965e 100644
--- a/src/Twilio/Types/Client.cs
+++ b/src/Twilio/Types/Client.cs
@@ -1,35 +1,35 @@
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// Client Endpoint
+  /// </summary>
+  public class Client : IEndpoint
+  {
+    public const string PREFIX = "client:";
+
+    private readonly string _client;
+
     /// <summary>
-    /// Client Endpoint
+    /// Create new client
     /// </summary>
-    public class Client : IEndpoint
-    {
-        public const string PREFIX = "client:";
-
-        private readonly string _client;
-
-        /// <summary>
-        /// Create new client
-        /// </summary>
-        /// <param name="client">Client name</param>
-        public Client(string client)
-        {
-            if (!client.ToLower().StartsWith(PREFIX))
-            {
-                client = PREFIX + client;
-            }
-
-            _client = client;
-        }
-
-        /// <summary>
-        /// Convert to string
-        /// </summary>
-        /// <returns>String representation</returns>
-        public override string ToString()
-        {
-            return _client;
-        }
-    }
+    /// <param name="client">Client name</param>
+    public Client(string client)
+    {
+      if (!client.ToLower().StartsWith(PREFIX))
+      {
+        client = PREFIX + client;
+      }
+
+      _client = client;
+    }
+
+    /// <summary>
+    /// Convert to string
+    /// </summary>
+    /// <returns>String representation</returns>
+    public override string ToString()
+    {
+      return _client;
+    }
+  }
 }
diff --git a/src/Twilio/Types/EmptyUrl.cs b/src/Twilio/Types/EmptyUrl.cs
index f0880a301..d3f67d813 100644
--- a/src/Twilio/Types/EmptyUrl.cs
+++ b/src/Twilio/Types/EmptyUrl.cs
@@ -1,12 +1,13 @@
 using System.Net;
 
-namespace Twilio.Types {
-
-    public class EmptyUri : System.Uri 
-    {
-        public static readonly string Uri = "https://this.is.empty.url";
-
-        public EmptyUri() : base(Uri) {}
-    }
+namespace Twilio.Types
+{
+
+  public class EmptyUri : System.Uri
+  {
+    public static readonly string Uri = "https://this.is.empty.url";
+
+    public EmptyUri() : base(Uri) { }
+  }
 
 }
diff --git a/src/Twilio/Types/FeedbackIssue.cs b/src/Twilio/Types/FeedbackIssue.cs
index b00b7c013..bb51bd719 100644
--- a/src/Twilio/Types/FeedbackIssue.cs
+++ b/src/Twilio/Types/FeedbackIssue.cs
@@ -1,42 +1,42 @@
 using Newtonsoft.Json;
 
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// Feedback issue POCO
+  /// </summary>
+  public class FeedbackIssue
+  {
     /// <summary>
-    /// Feedback issue POCO
+    /// Number of occurrences
     /// </summary>
-    public class FeedbackIssue
-    {
-        /// <summary>
-        /// Number of occurrences
-        /// </summary>
-        [JsonProperty("count")]
-        public int Count { get; }
-
-        /// <summary>
-        /// Description of issue
-        /// </summary>
-        [JsonProperty("description")]
-        public string Description { get; }
-
-        /// <summary>
-        /// Percentage of calls affected
-        /// </summary>
-        [JsonProperty("percentage_of_total_calls")]
-        public string PercentageOfTotalCalls { get; }
-
-        /// <summary>
-        /// Create new FeedbackIssue
-        /// </summary>
-        /// <param name="count">Number of occurrences</param>
-        /// <param name="description">Description of issue</param>
-        /// <param name="percentageOfTotalCalls">Percentage of calls affected</param>
-        public FeedbackIssue(int count, string description, string percentageOfTotalCalls)
-        {
-            Count = count;
-            Description = description;
-            PercentageOfTotalCalls = percentageOfTotalCalls;
-        }
-    }
+    [JsonProperty("count")]
+    public int Count { get; }
+
+    /// <summary>
+    /// Description of issue
+    /// </summary>
+    [JsonProperty("description")]
+    public string Description { get; }
+
+    /// <summary>
+    /// Percentage of calls affected
+    /// </summary>
+    [JsonProperty("percentage_of_total_calls")]
+    public string PercentageOfTotalCalls { get; }
+
+    /// <summary>
+    /// Create new FeedbackIssue
+    /// </summary>
+    /// <param name="count">Number of occurrences</param>
+    /// <param name="description">Description of issue</param>
+    /// <param name="percentageOfTotalCalls">Percentage of calls affected</param>
+    public FeedbackIssue(int count, string description, string percentageOfTotalCalls)
+    {
+      Count = count;
+      Description = description;
+      PercentageOfTotalCalls = percentageOfTotalCalls;
+    }
+  }
 }
 
diff --git a/src/Twilio/Types/IEndpoint.cs b/src/Twilio/Types/IEndpoint.cs
index bd7ee8e35..7a3fb1048 100644
--- a/src/Twilio/Types/IEndpoint.cs
+++ b/src/Twilio/Types/IEndpoint.cs
@@ -1,15 +1,15 @@
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// Endpoint of a call
+  /// </summary>
+  public interface IEndpoint
+  {
     /// <summary>
-    /// Endpoint of a call
+    /// Generate string representation
     /// </summary>
-    public interface IEndpoint
-    {
-        /// <summary>
-        /// Generate string representation
-        /// </summary>
-        /// <returns>String representation</returns>
-        string ToString();
-    }
+    /// <returns>String representation</returns>
+    string ToString();
+  }
 }
 
diff --git a/src/Twilio/Types/IceServer.cs b/src/Twilio/Types/IceServer.cs
index 83fa187d2..819b6247f 100644
--- a/src/Twilio/Types/IceServer.cs
+++ b/src/Twilio/Types/IceServer.cs
@@ -2,49 +2,50 @@
 using Newtonsoft.Json;
 
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// Ice Server POCO
+  /// </summary>
+  public class IceServer
+  {
     /// <summary>
-    /// Ice Server POCO
+    /// Ice Server credential
     /// </summary>
-    public class IceServer
-    {
-        /// <summary>
-        /// Ice Server credential
-        /// </summary>
-        [JsonProperty("credential")]
-        public string Credential { get; }
-
-        /// <summary>
-        /// Username for server
-        /// </summary>
-        [JsonProperty("username")]
-        public string Username { get; }
-
-        /// <summary>
-        /// Server URL
-        /// </summary>
-        [JsonProperty("url")]
-        public Uri Url { get; }
-
-         /// <summary>
-         /// Server URL
-         /// </summary>
-         [JsonProperty("urls")]
-         public Uri Urls { get; }
-
-        /// <summary>
-        /// Create a new IceServer
-        /// </summary>
-        /// <param name="credential">Ice Server credential</param>
-        /// <param name="username">Server username</param>
-        /// <param name="url">Server URL</param>
-        /// <param name="urls">Server URL</param>
-        public IceServer(string credential, string username, Uri url, Uri urls) {
-            Credential = credential;
-            Username = username;
-            Url = url;
-            Urls = urls;
-        }
-    }
+    [JsonProperty("credential")]
+    public string Credential { get; }
+
+    /// <summary>
+    /// Username for server
+    /// </summary>
+    [JsonProperty("username")]
+    public string Username { get; }
+
+    /// <summary>
+    /// Server URL
+    /// </summary>
+    [JsonProperty("url")]
+    public Uri Url { get; }
+
+    /// <summary>
+    /// Server URL
+    /// </summary>
+    [JsonProperty("urls")]
+    public Uri Urls { get; }
+
+    /// <summary>
+    /// Create a new IceServer
+    /// </summary>
+    /// <param name="credential">Ice Server credential</param>
+    /// <param name="username">Server username</param>
+    /// <param name="url">Server URL</param>
+    /// <param name="urls">Server URL</param>
+    public IceServer(string credential, string username, Uri url, Uri urls)
+    {
+      Credential = credential;
+      Username = username;
+      Url = url;
+      Urls = urls;
+    }
+  }
 }
 
diff --git a/src/Twilio/Types/InboundCallPrice.cs b/src/Twilio/Types/InboundCallPrice.cs
index c25b5d2bd..e6d292c83 100644
--- a/src/Twilio/Types/InboundCallPrice.cs
+++ b/src/Twilio/Types/InboundCallPrice.cs
@@ -2,81 +2,82 @@
 using Twilio.Converters;
 
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// POCO to represent an inbound call price
+  /// </summary>
+  public class InboundCallPrice
+  {
     /// <summary>
-    /// POCO to represent an inbound call price
+    /// Types of inbound numbers
     /// </summary>
-    public class InboundCallPrice
-    {
-        /// <summary>
-        /// Types of inbound numbers
-        /// </summary>
-        public sealed class TypeEnum : StringEnum {
-            private TypeEnum(string value) : base(value) {}
-
-            /// <summary>
-            /// Generic constructor
-            /// </summary>
-            public TypeEnum() {}
-
-            /// <summary>
-            /// Local number type
-            /// </summary>
-            public static readonly TypeEnum Local = new TypeEnum("local");
-
-            /// <summary>
-            /// Mobile number type
-            /// </summary>
-            public static readonly TypeEnum Mobile = new TypeEnum("mobile");
-
-            /// <summary>
-            /// National number type
-            /// </summary>
-            public static readonly TypeEnum National = new TypeEnum("national");
-
-            /// <summary>
-            /// Toll Free number type
-            /// </summary>
-            public static readonly TypeEnum TollFree = new TypeEnum("toll free");
-        }
-
-        /// <summary>
-        /// Base price of calls
-        /// </summary>
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+
+      /// <summary>
+      /// Generic constructor
+      /// </summary>
+      public TypeEnum() { }
+
+      /// <summary>
+      /// Local number type
+      /// </summary>
+      public static readonly TypeEnum Local = new TypeEnum("local");
+
+      /// <summary>
+      /// Mobile number type
+      /// </summary>
+      public static readonly TypeEnum Mobile = new TypeEnum("mobile");
+
+      /// <summary>
+      /// National number type
+      /// </summary>
+      public static readonly TypeEnum National = new TypeEnum("national");
+
+      /// <summary>
+      /// Toll Free number type
+      /// </summary>
+      public static readonly TypeEnum TollFree = new TypeEnum("toll free");
+    }
+
+    /// <summary>
+    /// Base price of calls
+    /// </summary>
+    [JsonProperty("base_price")]
+    public double? BasePrice { get; private set; }
+
+    /// <summary>
+    /// Current price of calls
+    /// </summary>
+    [JsonProperty("current_price")]
+    public double? CurrentPrice { get; private set; }
+
+    /// <summary>
+    /// Type of number
+    /// </summary>
+    [JsonProperty("number_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TypeEnum NumberType { get; private set; }
+
+    /// <summary>
+    /// Empty constructor
+    /// </summary>
+    public InboundCallPrice() { }
+
+    private InboundCallPrice(
         [JsonProperty("base_price")]
-        public double? BasePrice { get; private set; }
-
-        /// <summary>
-        /// Current price of calls
-        /// </summary>
-        [JsonProperty("current_price")]
-        public double? CurrentPrice { get; private set; }
-
-        /// <summary>
-        /// Type of number
-        /// </summary>
+            double? basePrice,
+        [JsonProperty("current_priece")]
+            double? currentPrice,
         [JsonProperty("number_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TypeEnum NumberType { get; private set; }
-
-        /// <summary>
-        /// Empty constructor
-        /// </summary>
-        public InboundCallPrice() {}
-
-        private InboundCallPrice(
-            [JsonProperty("base_price")]
-            double? basePrice,
-            [JsonProperty("current_priece")]
-            double? currentPrice,
-            [JsonProperty("number_type")]
-            TypeEnum numberType
-        )
-        {
-            BasePrice = basePrice;
-            CurrentPrice = currentPrice;
-            NumberType = numberType;
-        }
-    }
+            TypeEnum numberType
+    )
+    {
+      BasePrice = basePrice;
+      CurrentPrice = currentPrice;
+      NumberType = numberType;
+    }
+  }
 }
 
diff --git a/src/Twilio/Types/InboundSmsPrice.cs b/src/Twilio/Types/InboundSmsPrice.cs
index 6222530b8..2c3a59fe5 100644
--- a/src/Twilio/Types/InboundSmsPrice.cs
+++ b/src/Twilio/Types/InboundSmsPrice.cs
@@ -2,81 +2,82 @@
 using Twilio.Converters;
 
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// POCO for inbound SMS prices
+  /// </summary>
+  public class InboundSmsPrice
+  {
     /// <summary>
-    /// POCO for inbound SMS prices
+    /// Phone number types
     /// </summary>
-    public class InboundSmsPrice
-    {
-        /// <summary>
-        /// Phone number types
-        /// </summary>
-        public sealed class TypeEnum : StringEnum {
-            private TypeEnum(string value) : base(value) {}
-
-            /// <summary>
-            /// Generic constructor
-            /// </summary>
-            public TypeEnum() {}
-
-            /// <summary>
-            /// Local number type
-            /// </summary>
-            public static readonly TypeEnum Local = new TypeEnum("local");
-
-            /// <summary>
-            /// Mobile number type
-            /// </summary>
-            public static readonly TypeEnum Mobile = new TypeEnum("mobile");
-
-            /// <summary>
-            /// National number type
-            /// </summary>
-            public static readonly TypeEnum National = new TypeEnum("national");
-
-            /// <summary>
-            /// Toll Free number type
-            /// </summary>
-            public static readonly TypeEnum TollFree = new TypeEnum("toll free");
-        }
-
-        /// <summary>
-        /// Base price for SMS
-        /// </summary>
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+
+      /// <summary>
+      /// Generic constructor
+      /// </summary>
+      public TypeEnum() { }
+
+      /// <summary>
+      /// Local number type
+      /// </summary>
+      public static readonly TypeEnum Local = new TypeEnum("local");
+
+      /// <summary>
+      /// Mobile number type
+      /// </summary>
+      public static readonly TypeEnum Mobile = new TypeEnum("mobile");
+
+      /// <summary>
+      /// National number type
+      /// </summary>
+      public static readonly TypeEnum National = new TypeEnum("national");
+
+      /// <summary>
+      /// Toll Free number type
+      /// </summary>
+      public static readonly TypeEnum TollFree = new TypeEnum("toll free");
+    }
+
+    /// <summary>
+    /// Base price for SMS
+    /// </summary>
+    [JsonProperty("base_price")]
+    public double? BasePrice { get; private set; }
+
+    /// <summary>
+    /// Current price for SMS
+    /// </summary>
+    [JsonProperty("current_price")]
+    public double? CurrentPrice { get; private set; }
+
+    /// <summary>
+    /// Type of number
+    /// </summary>
+    [JsonProperty("number_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TypeEnum NumberType { get; private set; }
+
+    /// <summary>
+    /// Generic constructor
+    /// </summary>
+    public InboundSmsPrice() { }
+
+    private InboundSmsPrice(
         [JsonProperty("base_price")]
-        public double? BasePrice { get; private set; }
-
-        /// <summary>
-        /// Current price for SMS
-        /// </summary>
-        [JsonProperty("current_price")]
-        public double? CurrentPrice { get; private set; }
-
-        /// <summary>
-        /// Type of number
-        /// </summary>
+            double? basePrice,
+        [JsonProperty("current_priece")]
+            double? currentPrice,
         [JsonProperty("number_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TypeEnum NumberType { get; private set; }
-
-        /// <summary>
-        /// Generic constructor
-        /// </summary>
-        public InboundSmsPrice() {}
-
-        private InboundSmsPrice(
-            [JsonProperty("base_price")]
-            double? basePrice,
-            [JsonProperty("current_priece")]
-            double? currentPrice,
-            [JsonProperty("number_type")]
-            TypeEnum numberType
-        )
-        {
-            BasePrice = basePrice;
-            CurrentPrice = currentPrice;
-            NumberType = numberType;
-        }
-    }
+            TypeEnum numberType
+    )
+    {
+      BasePrice = basePrice;
+      CurrentPrice = currentPrice;
+      NumberType = numberType;
+    }
+  }
 }
 
diff --git a/src/Twilio/Types/OutboundCallPrice.cs b/src/Twilio/Types/OutboundCallPrice.cs
index f0fe0e0a6..6844fce9d 100644
--- a/src/Twilio/Types/OutboundCallPrice.cs
+++ b/src/Twilio/Types/OutboundCallPrice.cs
@@ -1,35 +1,35 @@
 using Newtonsoft.Json;
 
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// POCO for outbound call prices
+  /// </summary>
+  public class OutboundCallPrice
+  {
     /// <summary>
-    /// POCO for outbound call prices
+    /// Base price of outbound call
     /// </summary>
-    public class OutboundCallPrice
-    {
-        /// <summary>
-        /// Base price of outbound call
-        /// </summary>
-        [JsonProperty("base_price")]
-        public double? BasePrice { get; }
-
-        /// <summary>
-        /// Current price of outbound call
-        /// </summary>
-        /// <returns></returns>
-        [JsonProperty("current_price")]
-        public double? CurrentPrice { get; }
-
-        /// <summary>
-        /// Create a new OutboundCallPrice
-        /// </summary>
-        /// <param name="basePrice">Base price of call</param>
-        /// <param name="currentPrice">Current price of call</param>
-        public OutboundCallPrice (double basePrice, double currentPrice)
-        {
-            BasePrice = basePrice;
-            CurrentPrice = currentPrice;
-        }
-    }
+    [JsonProperty("base_price")]
+    public double? BasePrice { get; }
+
+    /// <summary>
+    /// Current price of outbound call
+    /// </summary>
+    /// <returns></returns>
+    [JsonProperty("current_price")]
+    public double? CurrentPrice { get; }
+
+    /// <summary>
+    /// Create a new OutboundCallPrice
+    /// </summary>
+    /// <param name="basePrice">Base price of call</param>
+    /// <param name="currentPrice">Current price of call</param>
+    public OutboundCallPrice(double basePrice, double currentPrice)
+    {
+      BasePrice = basePrice;
+      CurrentPrice = currentPrice;
+    }
+  }
 }
 
diff --git a/src/Twilio/Types/OutboundCallPriceWithOrigin.cs b/src/Twilio/Types/OutboundCallPriceWithOrigin.cs
index 6a0a04929..dcb9eb56e 100644
--- a/src/Twilio/Types/OutboundCallPriceWithOrigin.cs
+++ b/src/Twilio/Types/OutboundCallPriceWithOrigin.cs
@@ -2,42 +2,44 @@
 using Newtonsoft.Json;
 
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// POCO for outbound call price with origin
+  /// </summary>
+  public class OutboundCallPriceWithOrigin
+  {
+
     /// <summary>
-    /// POCO for outbound call price with origin
+    /// Base price of outbound call
     /// </summary>
-    public class OutboundCallPriceWithOrigin {
-
-        /// <summary>
-        /// Base price of outbound call
-        /// </summary>
-        [JsonProperty("base_price")]
-        public double? BasePrice { get; }
-
-        /// <summary>
-        /// Current price of outbound call
-        /// </summary>
-        /// <returns></returns>
-        [JsonProperty("current_price")]
-        public double? CurrentPrice { get; }
-
-        /// <summary>
-        /// List of origination prefixes of outbound call
-        /// </summary>
-        /// <returns></returns>
-        [JsonProperty("origination_prefixes")]
-        public List<string> OriginationPrefixes { get; }
-
-        /// <summary>
-        /// Create a new OutboundCallPriceWithOrigin
-        /// </summary>
-        /// <param name="basePrice">Base price of call</param>
-        /// <param name="currentPrice">Current price of call</param>
-        /// <param name="originationPrefixes">List of origination prefixes of call</param>
-        public OutboundCallPriceWithOrigin (double basePrice, double currentPrice, List<string> originationPrefixes) {
-            BasePrice = basePrice;
-            CurrentPrice = currentPrice;
-            OriginationPrefixes = originationPrefixes;
-        }
-    }
+    [JsonProperty("base_price")]
+    public double? BasePrice { get; }
+
+    /// <summary>
+    /// Current price of outbound call
+    /// </summary>
+    /// <returns></returns>
+    [JsonProperty("current_price")]
+    public double? CurrentPrice { get; }
+
+    /// <summary>
+    /// List of origination prefixes of outbound call
+    /// </summary>
+    /// <returns></returns>
+    [JsonProperty("origination_prefixes")]
+    public List<string> OriginationPrefixes { get; }
+
+    /// <summary>
+    /// Create a new OutboundCallPriceWithOrigin
+    /// </summary>
+    /// <param name="basePrice">Base price of call</param>
+    /// <param name="currentPrice">Current price of call</param>
+    /// <param name="originationPrefixes">List of origination prefixes of call</param>
+    public OutboundCallPriceWithOrigin(double basePrice, double currentPrice, List<string> originationPrefixes)
+    {
+      BasePrice = basePrice;
+      CurrentPrice = currentPrice;
+      OriginationPrefixes = originationPrefixes;
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/Twilio/Types/OutboundPrefixPrice.cs b/src/Twilio/Types/OutboundPrefixPrice.cs
index a3ea41f1f..eba377f80 100644
--- a/src/Twilio/Types/OutboundPrefixPrice.cs
+++ b/src/Twilio/Types/OutboundPrefixPrice.cs
@@ -2,55 +2,55 @@
 using Newtonsoft.Json;
 
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// POCO for outbound prefix prices
+  /// </summary>
+  public class OutboundPrefixPrice
+  {
     /// <summary>
-    /// POCO for outbound prefix prices
+    /// Prefix list
     /// </summary>
-    public class OutboundPrefixPrice
-    {
-        /// <summary>
-        /// Prefix list
-        /// </summary>
-        [JsonProperty("prefixes")]
-        public List<string> Prefixes { get; }
-
-        /// <summary>
-        /// Prefix friendly name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Base price for prefix
-        /// </summary>
-        [JsonProperty("base_price")]
-        public double? BasePrice { get; }
-
-        /// <summary>
-        /// Current price of prefix
-        /// </summary>
-        [JsonProperty("current_price")]
-        public double? CurrentPrice { get; }
-
-        /// <summary>
-        /// Create a new OutboundPrefixPrice
-        /// </summary>
-        /// <param name="prefixes">List of prefixes</param>
-        /// <param name="friendlyName">Prefix friendly name</param>
-        /// <param name="basePrice">Base price of prefix</param>
-        /// <param name="currentPrice">Current price of prefix</param>
-        public OutboundPrefixPrice (
-            List<string> prefixes,
-            string friendlyName,
-            double basePrice,
-            double currentPrice
-        )
-        {
-            Prefixes = prefixes;
-            FriendlyName = friendlyName;
-            BasePrice = basePrice;
-            CurrentPrice = currentPrice;
-        }
-    }
+    [JsonProperty("prefixes")]
+    public List<string> Prefixes { get; }
+
+    /// <summary>
+    /// Prefix friendly name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; }
+
+    /// <summary>
+    /// Base price for prefix
+    /// </summary>
+    [JsonProperty("base_price")]
+    public double? BasePrice { get; }
+
+    /// <summary>
+    /// Current price of prefix
+    /// </summary>
+    [JsonProperty("current_price")]
+    public double? CurrentPrice { get; }
+
+    /// <summary>
+    /// Create a new OutboundPrefixPrice
+    /// </summary>
+    /// <param name="prefixes">List of prefixes</param>
+    /// <param name="friendlyName">Prefix friendly name</param>
+    /// <param name="basePrice">Base price of prefix</param>
+    /// <param name="currentPrice">Current price of prefix</param>
+    public OutboundPrefixPrice(
+        List<string> prefixes,
+        string friendlyName,
+        double basePrice,
+        double currentPrice
+    )
+    {
+      Prefixes = prefixes;
+      FriendlyName = friendlyName;
+      BasePrice = basePrice;
+      CurrentPrice = currentPrice;
+    }
+  }
 }
 
diff --git a/src/Twilio/Types/OutboundPrefixPriceWithOrigin.cs b/src/Twilio/Types/OutboundPrefixPriceWithOrigin.cs
index 3dfd2cf8d..008be0d22 100644
--- a/src/Twilio/Types/OutboundPrefixPriceWithOrigin.cs
+++ b/src/Twilio/Types/OutboundPrefixPriceWithOrigin.cs
@@ -2,64 +2,64 @@
 using Newtonsoft.Json;
 
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// POCO for outbound prefix prices with origins
+  /// </summary>
+  public class OutboundPrefixPriceWithOrigin
+  {
     /// <summary>
-    /// POCO for outbound prefix prices with origins
+    /// Destination Prefix list
     /// </summary>
-    public class OutboundPrefixPriceWithOrigin
-    {
-        /// <summary>
-        /// Destination Prefix list
-        /// </summary>
-        [JsonProperty("destination_prefixes")]
-        public List<string> DestinationPrefixes { get; }
-
-        /// <summary>
-        /// Destination Prefix list
-        /// </summary>
-        [JsonProperty("origination_prefixes")]
-        public List<string> OriginationPrefixes { get; }
-
-        /// <summary>
-        /// Prefix friendly name
-        /// </summary>
-        [JsonProperty("friendly_name")]
-        public string FriendlyName { get; }
-
-        /// <summary>
-        /// Base price for prefix
-        /// </summary>
-        [JsonProperty("base_price")]
-        public double? BasePrice { get; }
-
-        /// <summary>
-        /// Current price of prefix
-        /// </summary>
-        [JsonProperty("current_price")]
-        public double? CurrentPrice { get; }
-
-        /// <summary>
-        /// Create a new OutboundPrefixPrice
-        /// </summary>
-        /// <param name="destinationPrefixes">List of destination prefixes</param>
-        /// <param name="originationPrefixes">List of origination prefixes</param>
-        /// <param name="friendlyName">Prefix friendly name</param>
-        /// <param name="basePrice">Base price of prefix</param>
-        /// <param name="currentPrice">Current price of prefix</param>
-        public OutboundPrefixPriceWithOrigin (
-            List<string> destinationPrefixes,
-            List<string> originationPrefixes,
-            string friendlyName,
-            double basePrice,
-            double currentPrice
-        )
-        {
-            DestinationPrefixes = destinationPrefixes;
-            OriginationPrefixes = originationPrefixes;
-            FriendlyName = friendlyName;
-            BasePrice = basePrice;
-            CurrentPrice = currentPrice;
-        }
-    }
+    [JsonProperty("destination_prefixes")]
+    public List<string> DestinationPrefixes { get; }
+
+    /// <summary>
+    /// Destination Prefix list
+    /// </summary>
+    [JsonProperty("origination_prefixes")]
+    public List<string> OriginationPrefixes { get; }
+
+    /// <summary>
+    /// Prefix friendly name
+    /// </summary>
+    [JsonProperty("friendly_name")]
+    public string FriendlyName { get; }
+
+    /// <summary>
+    /// Base price for prefix
+    /// </summary>
+    [JsonProperty("base_price")]
+    public double? BasePrice { get; }
+
+    /// <summary>
+    /// Current price of prefix
+    /// </summary>
+    [JsonProperty("current_price")]
+    public double? CurrentPrice { get; }
+
+    /// <summary>
+    /// Create a new OutboundPrefixPrice
+    /// </summary>
+    /// <param name="destinationPrefixes">List of destination prefixes</param>
+    /// <param name="originationPrefixes">List of origination prefixes</param>
+    /// <param name="friendlyName">Prefix friendly name</param>
+    /// <param name="basePrice">Base price of prefix</param>
+    /// <param name="currentPrice">Current price of prefix</param>
+    public OutboundPrefixPriceWithOrigin(
+        List<string> destinationPrefixes,
+        List<string> originationPrefixes,
+        string friendlyName,
+        double basePrice,
+        double currentPrice
+    )
+    {
+      DestinationPrefixes = destinationPrefixes;
+      OriginationPrefixes = originationPrefixes;
+      FriendlyName = friendlyName;
+      BasePrice = basePrice;
+      CurrentPrice = currentPrice;
+    }
+  }
 }
 
diff --git a/src/Twilio/Types/OutboundSmsPrice.cs b/src/Twilio/Types/OutboundSmsPrice.cs
index d76bbfcbd..48db24115 100644
--- a/src/Twilio/Types/OutboundSmsPrice.cs
+++ b/src/Twilio/Types/OutboundSmsPrice.cs
@@ -2,55 +2,55 @@
 using Newtonsoft.Json;
 
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// POCO to represent an outbound SMS price
+  /// </summary>
+  public class OutboundSmsPrice
+  {
     /// <summary>
-    /// POCO to represent an outbound SMS price
+    /// SMS mcc
     /// </summary>
-    public class OutboundSmsPrice
-    {
-        /// <summary>
-        /// SMS mcc
-        /// </summary>
-        [JsonProperty("mcc")]
-        public string Mcc { get; }
-
-        /// <summary>
-        /// SMS mnc
-        /// </summary>
-        [JsonProperty("mnc")]
-        public string Mnc { get; }
-
-        /// <summary>
-        /// Carrier name
-        /// </summary>
-        [JsonProperty("carrier")]
-        public string Carrier { get; }
-
-        /// <summary>
-        /// List of prices
-        /// </summary>
-        [JsonProperty("prices")]
-        public List<InboundSmsPrice> Prices { get; }
-
-        /// <summary>
-        /// Create a new OutboundSmsPrice
-        /// </summary>
-        /// <param name="mcc">SMS mcc</param>
-        /// <param name="mnc">SMS mnc</param>
-        /// <param name="carrier">Carrier name</param>
-        /// <param name="prices">List of prices</param>
-        public OutboundSmsPrice (
-            string mcc,
-            string mnc,
-            string carrier,
-            List<InboundSmsPrice> prices
-        )
-        {
-            Mcc = mcc;
-            Mnc = mnc;
-            Carrier = carrier;
-            Prices = prices;
-        }
-    }
+    [JsonProperty("mcc")]
+    public string Mcc { get; }
+
+    /// <summary>
+    /// SMS mnc
+    /// </summary>
+    [JsonProperty("mnc")]
+    public string Mnc { get; }
+
+    /// <summary>
+    /// Carrier name
+    /// </summary>
+    [JsonProperty("carrier")]
+    public string Carrier { get; }
+
+    /// <summary>
+    /// List of prices
+    /// </summary>
+    [JsonProperty("prices")]
+    public List<InboundSmsPrice> Prices { get; }
+
+    /// <summary>
+    /// Create a new OutboundSmsPrice
+    /// </summary>
+    /// <param name="mcc">SMS mcc</param>
+    /// <param name="mnc">SMS mnc</param>
+    /// <param name="carrier">Carrier name</param>
+    /// <param name="prices">List of prices</param>
+    public OutboundSmsPrice(
+        string mcc,
+        string mnc,
+        string carrier,
+        List<InboundSmsPrice> prices
+    )
+    {
+      Mcc = mcc;
+      Mnc = mnc;
+      Carrier = carrier;
+      Prices = prices;
+    }
+  }
 }
 
diff --git a/src/Twilio/Types/PhoneNumber.cs b/src/Twilio/Types/PhoneNumber.cs
index 7f8f1fffb..a9fd7f262 100644
--- a/src/Twilio/Types/PhoneNumber.cs
+++ b/src/Twilio/Types/PhoneNumber.cs
@@ -1,39 +1,39 @@
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// Phone number endpoint
+  /// </summary>
+  public class PhoneNumber : IEndpoint
+  {
+    private readonly string _number;
+
     /// <summary>
-    /// Phone number endpoint
+    /// Create a new PhoneNumber
     /// </summary>
-    public class PhoneNumber : IEndpoint
-    {
-        private readonly string _number;
-
-        /// <summary>
-        /// Create a new PhoneNumber
-        /// </summary>
-        /// <param name="number">Phone number</param>
-        public PhoneNumber(string number)
-        {
-            _number = number;
-        }
-
-        /// <summary>
-        /// Add implicit constructor for PhoneNumber to make it assignable from string
-        /// </summary>
-        /// <param name="number">Phone number</param>
-        /// <returns></returns>
-        public static implicit operator PhoneNumber(string number)
-        {
-            return new PhoneNumber(number);
-        }
-
-        /// <summary>
-        /// Convert to string
-        /// </summary>
-        /// <returns>String representation</returns>
-        public override string ToString()
-        {
-            return _number;
-        }
-    }
+    /// <param name="number">Phone number</param>
+    public PhoneNumber(string number)
+    {
+      _number = number;
+    }
+
+    /// <summary>
+    /// Add implicit constructor for PhoneNumber to make it assignable from string
+    /// </summary>
+    /// <param name="number">Phone number</param>
+    /// <returns></returns>
+    public static implicit operator PhoneNumber(string number)
+    {
+      return new PhoneNumber(number);
+    }
+
+    /// <summary>
+    /// Convert to string
+    /// </summary>
+    /// <returns>String representation</returns>
+    public override string ToString()
+    {
+      return _number;
+    }
+  }
 }
 
diff --git a/src/Twilio/Types/PhoneNumberCapabilities.cs b/src/Twilio/Types/PhoneNumberCapabilities.cs
index 1d6b70026..f2f74ea1f 100644
--- a/src/Twilio/Types/PhoneNumberCapabilities.cs
+++ b/src/Twilio/Types/PhoneNumberCapabilities.cs
@@ -1,50 +1,50 @@
 using Newtonsoft.Json;
 
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// Capabilities of a phone number
+  /// </summary>
+  public class PhoneNumberCapabilities
+  {
     /// <summary>
-    /// Capabilities of a phone number
+    /// MMS capable
     /// </summary>
-    public class PhoneNumberCapabilities
-    {
-        /// <summary>
-        /// MMS capable
-        /// </summary>
-        [JsonProperty("mms")]
-        public bool Mms { get; }
-
-        /// <summary>
-        /// SMS capable
-        /// </summary>
-        [JsonProperty("sms")]
-        public bool Sms { get; }
-
-        /// <summary>
-        /// Voice capable
-        /// </summary>
-        [JsonProperty("voice")]
-        public bool Voice { get; }
-
-        /// <summary>
-        /// Fax capable
-        /// </summary>
-        [JsonProperty("fax")]
-        public bool Fax { get; }
-
-        /// <summary>
-        /// Create a new PhoneNumberCapability
-        /// </summary>
-        /// <param name="mms">MMS capable</param>
-        /// <param name="sms">SMS capable</param>
-        /// <param name="voice">Voice capable</param>
-        /// <param name="fax">Fax capable</param>
-        public PhoneNumberCapabilities (bool mms, bool sms, bool voice, bool fax)
-        {
-            Mms = mms;
-            Sms = sms;
-            Voice = voice;
-            Fax = fax;
-        }
-    }
+    [JsonProperty("mms")]
+    public bool Mms { get; }
+
+    /// <summary>
+    /// SMS capable
+    /// </summary>
+    [JsonProperty("sms")]
+    public bool Sms { get; }
+
+    /// <summary>
+    /// Voice capable
+    /// </summary>
+    [JsonProperty("voice")]
+    public bool Voice { get; }
+
+    /// <summary>
+    /// Fax capable
+    /// </summary>
+    [JsonProperty("fax")]
+    public bool Fax { get; }
+
+    /// <summary>
+    /// Create a new PhoneNumberCapability
+    /// </summary>
+    /// <param name="mms">MMS capable</param>
+    /// <param name="sms">SMS capable</param>
+    /// <param name="voice">Voice capable</param>
+    /// <param name="fax">Fax capable</param>
+    public PhoneNumberCapabilities(bool mms, bool sms, bool voice, bool fax)
+    {
+      Mms = mms;
+      Sms = sms;
+      Voice = voice;
+      Fax = fax;
+    }
+  }
 }
 
diff --git a/src/Twilio/Types/PhoneNumberPrice.cs b/src/Twilio/Types/PhoneNumberPrice.cs
index db9c4e874..7ce376004 100644
--- a/src/Twilio/Types/PhoneNumberPrice.cs
+++ b/src/Twilio/Types/PhoneNumberPrice.cs
@@ -2,81 +2,82 @@
 using Twilio.Converters;
 
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// Phone number price POCO
+  /// </summary>
+  public class PhoneNumberPrice
+  {
     /// <summary>
-    /// Phone number price POCO
+    /// Phone numbe types
     /// </summary>
-    public class PhoneNumberPrice
-    {
-        /// <summary>
-        /// Phone numbe types
-        /// </summary>
-        public sealed class TypeEnum : StringEnum {
-            private TypeEnum(string value) : base(value) {}
-
-            /// <summary>
-            /// Generic constructor
-            /// </summary>
-            public TypeEnum() {}
-
-            /// <summary>
-            /// Local number type
-            /// </summary>
-            public static readonly TypeEnum Local = new TypeEnum("local");
-
-            /// <summary>
-            /// Mobile number type
-            /// </summary>
-            public static readonly TypeEnum Mobile = new TypeEnum("mobile");
-
-            /// <summary>
-            /// National number type
-            /// </summary>
-            public static readonly TypeEnum National = new TypeEnum("national");
-
-            /// <summary>
-            /// Toll free number type
-            /// </summary>
-            public static readonly TypeEnum TollFree = new TypeEnum("toll free");
-        }
-
-        /// <summary>
-        /// Base price of number
-        /// </summary>
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+
+      /// <summary>
+      /// Generic constructor
+      /// </summary>
+      public TypeEnum() { }
+
+      /// <summary>
+      /// Local number type
+      /// </summary>
+      public static readonly TypeEnum Local = new TypeEnum("local");
+
+      /// <summary>
+      /// Mobile number type
+      /// </summary>
+      public static readonly TypeEnum Mobile = new TypeEnum("mobile");
+
+      /// <summary>
+      /// National number type
+      /// </summary>
+      public static readonly TypeEnum National = new TypeEnum("national");
+
+      /// <summary>
+      /// Toll free number type
+      /// </summary>
+      public static readonly TypeEnum TollFree = new TypeEnum("toll free");
+    }
+
+    /// <summary>
+    /// Base price of number
+    /// </summary>
+    [JsonProperty("base_price")]
+    public double? BasePrice { get; private set; }
+
+    /// <summary>
+    /// Current price of number
+    /// </summary>
+    [JsonProperty("current_price")]
+    public double? CurrentPrice { get; private set; }
+
+    /// <summary>
+    /// Type of number
+    /// </summary>
+    [JsonProperty("number_type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TypeEnum NumberType { get; private set; }
+
+    /// <summary>
+    /// Generic constructor
+    /// </summary>
+    public PhoneNumberPrice() { }
+
+    private PhoneNumberPrice(
         [JsonProperty("base_price")]
-        public double? BasePrice { get; private set;}
-
-        /// <summary>
-        /// Current price of number
-        /// </summary>
+            double? basePrice,
         [JsonProperty("current_price")]
-        public double? CurrentPrice { get; private set; }
-
-        /// <summary>
-        /// Type of number
-        /// </summary>
+            double? currentPrice,
         [JsonProperty("number_type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TypeEnum NumberType { get; private set; }
-
-        /// <summary>
-        /// Generic constructor
-        /// </summary>
-        public PhoneNumberPrice() {}
-
-        private PhoneNumberPrice(
-            [JsonProperty("base_price")]
-            double? basePrice,
-            [JsonProperty("current_price")]
-            double? currentPrice,
-            [JsonProperty("number_type")]
-            TypeEnum numberType
-        )
-        {
-            BasePrice = basePrice;
-            CurrentPrice = currentPrice;
-            NumberType = numberType;
-        }
-    }
+            TypeEnum numberType
+    )
+    {
+      BasePrice = basePrice;
+      CurrentPrice = currentPrice;
+      NumberType = numberType;
+    }
+  }
 }
 
diff --git a/src/Twilio/Types/RecordingRule.cs b/src/Twilio/Types/RecordingRule.cs
index d8d7de00a..ef56ab646 100644
--- a/src/Twilio/Types/RecordingRule.cs
+++ b/src/Twilio/Types/RecordingRule.cs
@@ -6,65 +6,65 @@
 /// Recording Rule - A single Recording Rule for a Room
 /// </summary>
 namespace Twilio.Types
-{
-    public class RecordingRule
-    {
-
-        public sealed class TypeEnum : StringEnum
-        {
-            private TypeEnum(string value) : base(value) {}
-
-            public TypeEnum() {}
-            public static readonly TypeEnum Include = new TypeEnum("include");
-            public static readonly TypeEnum Exclude = new TypeEnum("exclude");
-        }
-
-        public sealed class KindEnum : StringEnum
-        {
-            private KindEnum(string value) : base(value) {}
-
-            public KindEnum() {}
-
-            public static readonly KindEnum Audio = new KindEnum("audio");
-            public static readonly KindEnum Data = new KindEnum("data");
-            public static readonly KindEnum Video = new KindEnum("video");
-        }
-
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TypeEnum Type { get; private set; }
-
-        [JsonProperty("all")]
-        public bool? All { get; private set; }
-
-        [JsonProperty("publisher")]
-        public string Publisher { get; private set; }
-
-        [JsonProperty("track")]
-        public string Track { get; private set; }
-
-        [JsonProperty("kind")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public KindEnum Kind { get; private set; }
-
-        public RecordingRule (
-                [JsonProperty("type")]
-                TypeEnum type,
-                [JsonProperty("all")]
-                bool? all,
-                [JsonProperty("publisher")]
-                string publisher,
-                [JsonProperty("track")]
-                string track,
-                [JsonProperty("kind")]
-                KindEnum kind
-                )
-        {
-            Type = type;
-            All = all;
-            Publisher = publisher;
-            Track = track;
-            Kind = kind;
-        }
-    }
+{
+  public class RecordingRule
+  {
+
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+
+      public TypeEnum() { }
+      public static readonly TypeEnum Include = new TypeEnum("include");
+      public static readonly TypeEnum Exclude = new TypeEnum("exclude");
+    }
+
+    public sealed class KindEnum : StringEnum
+    {
+      private KindEnum(string value) : base(value) { }
+
+      public KindEnum() { }
+
+      public static readonly KindEnum Audio = new KindEnum("audio");
+      public static readonly KindEnum Data = new KindEnum("data");
+      public static readonly KindEnum Video = new KindEnum("video");
+    }
+
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TypeEnum Type { get; private set; }
+
+    [JsonProperty("all")]
+    public bool? All { get; private set; }
+
+    [JsonProperty("publisher")]
+    public string Publisher { get; private set; }
+
+    [JsonProperty("track")]
+    public string Track { get; private set; }
+
+    [JsonProperty("kind")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public KindEnum Kind { get; private set; }
+
+    public RecordingRule(
+            [JsonProperty("type")]
+                TypeEnum type,
+            [JsonProperty("all")]
+                bool? all,
+            [JsonProperty("publisher")]
+                string publisher,
+            [JsonProperty("track")]
+                string track,
+            [JsonProperty("kind")]
+                KindEnum kind
+            )
+    {
+      Type = type;
+      All = all;
+      Publisher = publisher;
+      Track = track;
+      Kind = kind;
+    }
+  }
 }
diff --git a/src/Twilio/Types/RecordingRulesUpdate.cs b/src/Twilio/Types/RecordingRulesUpdate.cs
index 0027c6a38..70c9cde94 100644
--- a/src/Twilio/Types/RecordingRulesUpdate.cs
+++ b/src/Twilio/Types/RecordingRulesUpdate.cs
@@ -6,18 +6,18 @@
 /// Recording Rule Update - Used to update the list of Recording Rules
 /// </summary>
 namespace Twilio.Types
-{
-    public class RecordingRulesUpdate
-    {
+{
+  public class RecordingRulesUpdate
+  {
+    [JsonProperty("rules")]
+    public List<RecordingRule> Rules { get; private set; }
+
+    public RecordingRulesUpdate(
         [JsonProperty("rules")]
-        public List<RecordingRule> Rules { get; private set; }
-
-        public RecordingRulesUpdate (
-            [JsonProperty("rules")]
-            List<RecordingRule> rules
-        )
-        {
-            Rules = rules;
-        }
-    }
+            List<RecordingRule> rules
+    )
+    {
+      Rules = rules;
+    }
+  }
 }
diff --git a/src/Twilio/Types/StringEnum.cs b/src/Twilio/Types/StringEnum.cs
index 5280cb6b7..ebd209f28 100644
--- a/src/Twilio/Types/StringEnum.cs
+++ b/src/Twilio/Types/StringEnum.cs
@@ -1,87 +1,87 @@
 using System;
 
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// Enum object for strings
+  /// </summary>
+  public abstract class StringEnum
+  {
+    private string _value;
+
     /// <summary>
-    /// Enum object for strings
+    /// Generic constructor
     /// </summary>
-    public abstract class StringEnum
-    {
-        private string _value;
-
-        /// <summary>
-        /// Generic constructor
-        /// </summary>
-        protected StringEnum() {}
-
-        /// <summary>
-        /// Create from string
-        /// </summary>
-        /// <param name="value">String value</param>
-        protected StringEnum(string value)
-        {
-            _value = value;
-        }
-
-        /// <summary>
-        /// Generate from string
-        /// </summary>
-        /// <param name="value">String value</param>
-        public void FromString(string value)
-        {
-            _value = value;
-        }
-
-        /// <summary>
-        /// Convert to string
-        /// </summary>
-        /// <returns>String representation</returns>
-        public override string ToString()
-        {
-            return _value;
-        }
-
-        public override int GetHashCode()
-        {
-            return _value.GetHashCode();
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (obj == null || !obj.GetType().Equals(GetType()))
-            {
-                return false;
-            }
-
-            var o = (StringEnum) Convert.ChangeType(obj, GetType());
-            if (o == null)
-            {
-                return false;
-            }
-
-            return o._value.Equals(_value);
-        }
-
-        public static bool operator ==(StringEnum a, StringEnum b)
-        {
-            if (System.Object.ReferenceEquals(a, b))
-            {
-                return true;
-            }
-
-            if (((object)a == null) || ((object)b == null))
-            {
-                return false;
-            }
-            
-            return a.Equals(b);
-        }
-
-        public static bool operator!=(StringEnum a, StringEnum b)
-        {
-            return !(a == b);
-        }
-
-    }
+    protected StringEnum() { }
+
+    /// <summary>
+    /// Create from string
+    /// </summary>
+    /// <param name="value">String value</param>
+    protected StringEnum(string value)
+    {
+      _value = value;
+    }
+
+    /// <summary>
+    /// Generate from string
+    /// </summary>
+    /// <param name="value">String value</param>
+    public void FromString(string value)
+    {
+      _value = value;
+    }
+
+    /// <summary>
+    /// Convert to string
+    /// </summary>
+    /// <returns>String representation</returns>
+    public override string ToString()
+    {
+      return _value;
+    }
+
+    public override int GetHashCode()
+    {
+      return _value.GetHashCode();
+    }
+
+    public override bool Equals(object obj)
+    {
+      if (obj == null || !obj.GetType().Equals(GetType()))
+      {
+        return false;
+      }
+
+      var o = (StringEnum)Convert.ChangeType(obj, GetType());
+      if (o == null)
+      {
+        return false;
+      }
+
+      return o._value.Equals(_value);
+    }
+
+    public static bool operator ==(StringEnum a, StringEnum b)
+    {
+      if (System.Object.ReferenceEquals(a, b))
+      {
+        return true;
+      }
+
+      if (((object)a == null) || ((object)b == null))
+      {
+        return false;
+      }
+
+      return a.Equals(b);
+    }
+
+    public static bool operator !=(StringEnum a, StringEnum b)
+    {
+      return !(a == b);
+    }
+
+  }
 }
 
diff --git a/src/Twilio/Types/SubscribeRule.cs b/src/Twilio/Types/SubscribeRule.cs
index 635ffdc80..d6163cd9b 100644
--- a/src/Twilio/Types/SubscribeRule.cs
+++ b/src/Twilio/Types/SubscribeRule.cs
@@ -9,82 +9,82 @@
 ///   <a href="https://www.twilio.com/docs/video/api/track-subscriptions#specifying-sr">Specifying Subscribe Rules</a>
 /// </summary>
 namespace Twilio.Types
-{
-    public class SubscribeRule
-    {
-        public sealed class TypeEnum : StringEnum
-        {
-            private TypeEnum(string value) : base(value) {}
-
-            public TypeEnum() {}
-            public static readonly TypeEnum Include = new TypeEnum("include");
-            public static readonly TypeEnum Exclude = new TypeEnum("exclude");
-        }
-
-        public sealed class KindEnum : StringEnum
-        {
-            private KindEnum(string value) : base(value) {}
-
-            public KindEnum() {}
-
-            public static readonly KindEnum Audio = new KindEnum("audio");
-            public static readonly KindEnum Data = new KindEnum("data");
-            public static readonly KindEnum Video = new KindEnum("video");
-        }
-
-        public sealed class PriorityEnum : StringEnum
-        {
-            private PriorityEnum(string value) : base(value) {}
-
-            public PriorityEnum() {}
-
-            public static readonly PriorityEnum Low = new PriorityEnum("low");
-            public static readonly PriorityEnum Standard = new PriorityEnum("standard");
-            public static readonly PriorityEnum High = new PriorityEnum("high");
-        }
-
-        [JsonProperty("type")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public TypeEnum Type { get; private set; }
-
-        [JsonProperty("all")]
-        public bool? All { get; private set; }
-
-        [JsonProperty("publisher")]
-        public string Publisher { get; private set; }
-
-        [JsonProperty("track")]
-        public string Track { get; private set; }
-
-        [JsonProperty("kind")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public KindEnum Kind { get; private set; }
-
-        [JsonProperty("priority")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public PriorityEnum Priority { get; private set; }
-
-        public SubscribeRule (
-                [JsonProperty("type")]
-                TypeEnum type,
-                [JsonProperty("all")]
-                bool? all,
-                [JsonProperty("publisher")]
-                string publisher,
-                [JsonProperty("track")]
-                string track,
-                [JsonProperty("kind")]
-                KindEnum kind,
-                [JsonProperty("priority")]
-                PriorityEnum priority
-                )
-        {
-            Type = type;
-            All = all;
-            Publisher = publisher;
-            Track = track;
-            Kind = kind;
-            Priority = priority;
-        }
-    }
+{
+  public class SubscribeRule
+  {
+    public sealed class TypeEnum : StringEnum
+    {
+      private TypeEnum(string value) : base(value) { }
+
+      public TypeEnum() { }
+      public static readonly TypeEnum Include = new TypeEnum("include");
+      public static readonly TypeEnum Exclude = new TypeEnum("exclude");
+    }
+
+    public sealed class KindEnum : StringEnum
+    {
+      private KindEnum(string value) : base(value) { }
+
+      public KindEnum() { }
+
+      public static readonly KindEnum Audio = new KindEnum("audio");
+      public static readonly KindEnum Data = new KindEnum("data");
+      public static readonly KindEnum Video = new KindEnum("video");
+    }
+
+    public sealed class PriorityEnum : StringEnum
+    {
+      private PriorityEnum(string value) : base(value) { }
+
+      public PriorityEnum() { }
+
+      public static readonly PriorityEnum Low = new PriorityEnum("low");
+      public static readonly PriorityEnum Standard = new PriorityEnum("standard");
+      public static readonly PriorityEnum High = new PriorityEnum("high");
+    }
+
+    [JsonProperty("type")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public TypeEnum Type { get; private set; }
+
+    [JsonProperty("all")]
+    public bool? All { get; private set; }
+
+    [JsonProperty("publisher")]
+    public string Publisher { get; private set; }
+
+    [JsonProperty("track")]
+    public string Track { get; private set; }
+
+    [JsonProperty("kind")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public KindEnum Kind { get; private set; }
+
+    [JsonProperty("priority")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public PriorityEnum Priority { get; private set; }
+
+    public SubscribeRule(
+            [JsonProperty("type")]
+                TypeEnum type,
+            [JsonProperty("all")]
+                bool? all,
+            [JsonProperty("publisher")]
+                string publisher,
+            [JsonProperty("track")]
+                string track,
+            [JsonProperty("kind")]
+                KindEnum kind,
+            [JsonProperty("priority")]
+                PriorityEnum priority
+            )
+    {
+      Type = type;
+      All = all;
+      Publisher = publisher;
+      Track = track;
+      Kind = kind;
+      Priority = priority;
+    }
+  }
 }
diff --git a/src/Twilio/Types/SubscribeRulesUpdate.cs b/src/Twilio/Types/SubscribeRulesUpdate.cs
index b6953c248..29e4af952 100644
--- a/src/Twilio/Types/SubscribeRulesUpdate.cs
+++ b/src/Twilio/Types/SubscribeRulesUpdate.cs
@@ -9,18 +9,18 @@
 ///   <a href="https://www.twilio.com/docs/video/api/track-subscriptions#specifying-sr">Specifying Subscribe Rules</a>
 /// </summary>
 namespace Twilio.Types
-{
-    public class SubscribeRulesUpdate
-    {
+{
+  public class SubscribeRulesUpdate
+  {
+    [JsonProperty("rules")]
+    public List<SubscribeRule> Rules { get; private set; }
+
+    public SubscribeRulesUpdate(
         [JsonProperty("rules")]
-        public List<SubscribeRule> Rules { get; private set; }
-
-        public SubscribeRulesUpdate (
-            [JsonProperty("rules")]
-            List<SubscribeRule> rules
-        )
-        {
-            Rules = rules;
-        }
-    }
+            List<SubscribeRule> rules
+    )
+    {
+      Rules = rules;
+    }
+  }
 }
diff --git a/src/Twilio/Types/Twiml.cs b/src/Twilio/Types/Twiml.cs
index 508bc5f52..c51a364a0 100644
--- a/src/Twilio/Types/Twiml.cs
+++ b/src/Twilio/Types/Twiml.cs
@@ -1,39 +1,39 @@
 namespace Twilio.Types
-{
+{
+  /// <summary>
+  /// Twiml endpoint
+  /// </summary>
+  public class Twiml
+  {
+    private readonly string _twiml;
+
     /// <summary>
-    /// Twiml endpoint
+    /// Create a new Twiml
     /// </summary>
-    public class Twiml
-    {
-        private readonly string _twiml;
-
-        /// <summary>
-        /// Create a new Twiml
-        /// </summary>
-        /// <param name="twiml">Twiml</param>
-        public Twiml(string twiml)
-        {
-            _twiml = twiml;
-        }
-
-        /// <summary>
-        /// Add implicit constructor for Twiml to make it assignable from string
-        /// </summary>
-        /// <param name="twiml">Twiml</param>
-        /// <returns></returns>
-        public static implicit operator Twiml(string twiml)
-        {
-            return new Twiml(twiml);
-        }
-
-        /// <summary>
-        /// Convert to string
-        /// </summary>
-        /// <returns>String representation</returns>
-        public override string ToString()
-        {
-            return _twiml;
-        }
-    }
+    /// <param name="twiml">Twiml</param>
+    public Twiml(string twiml)
+    {
+      _twiml = twiml;
+    }
+
+    /// <summary>
+    /// Add implicit constructor for Twiml to make it assignable from string
+    /// </summary>
+    /// <param name="twiml">Twiml</param>
+    /// <returns></returns>
+    public static implicit operator Twiml(string twiml)
+    {
+      return new Twiml(twiml);
+    }
+
+    /// <summary>
+    /// Convert to string
+    /// </summary>
+    /// <returns>String representation</returns>
+    public override string ToString()
+    {
+      return _twiml;
+    }
+  }
 }
 
diff --git a/test/Twilio.Test/Http/SystemNetHttpClientTest.cs b/test/Twilio.Test/Http/SystemNetHttpClientTest.cs
index a18f3ae23..14484f44d 100644
--- a/test/Twilio.Test/Http/SystemNetHttpClientTest.cs
+++ b/test/Twilio.Test/Http/SystemNetHttpClientTest.cs
@@ -53,7 +53,7 @@ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage reques
             var route = request.RequestUri.ToString().Split('?')[0];
             MockResponse response = responseMap[route];
 
-            Assert.AreEqual(response.requestUri.ToString(), route);
+            Assert.AreEqual(response.requestUri.ToString(), route.ToString());
             if (response.error != null)
             {
                 throw response.error;
diff --git a/test/Twilio.Test/Jwt/AccessToken/AccessTokenTest.cs b/test/Twilio.Test/Jwt/AccessToken/AccessTokenTest.cs
index 1311dd5db..e4413764d 100644
--- a/test/Twilio.Test/Jwt/AccessToken/AccessTokenTest.cs
+++ b/test/Twilio.Test/Jwt/AccessToken/AccessTokenTest.cs
@@ -8,156 +8,159 @@
 
 namespace Twilio.Tests.Jwt.AccessToken
 {
-    class TestToken : Token
+  class TestToken : Token
+  {
+    public TestToken(
+        string accountSid,
+        string signingKeySid,
+        string secret,
+        string identity = null,
+        DateTime? expiration = null,
+        DateTime? nbf = null,
+        HashSet<IGrant> grants = null,
+        string region = null
+    ) : base(accountSid, signingKeySid, secret, identity, expiration, nbf, grants, region) { }
+  }
+
+  [TestFixture]
+  public class AccessTokenTests
+  {
+    private static readonly string Secret = "superdupersecretsecret";
+
+    private Dictionary<string, object> ToDict(object o)
     {
-        public TestToken(
-            string accountSid,
-            string signingKeySid,
-            string secret,
-            string identity = null,
-            DateTime? expiration = null,
-            DateTime? nbf = null,
-            HashSet<IGrant> grants = null,
-            string region = null
-        ) : base(accountSid, signingKeySid, secret, identity, expiration, nbf, grants, region) {}
+      return JsonConvert.DeserializeObject<Dictionary<string, object>>(o.ToString());
     }
 
-    [TestFixture]
-    public class AccessTokenTests
+    [Test]
+    public void TestBuildToken()
     {
-        private static readonly string Secret = "superdupersecretsecret";
-
-        private Dictionary<string, object> ToDict(object o)
-        {
-            return JsonConvert.DeserializeObject<Dictionary<string, object>>(o.ToString());
-        }
-
-        [Test]
-        public void TestBuildToken()
-        {
-            var jwt = new TestToken("AC456", "SK123", Secret).ToJwt();
-
-            var decoded = new DecodedJwt(jwt, Secret);
-            var payload = decoded.Payload;
-            Assert.IsNotNull(payload);
-
-            Assert.AreEqual("SK123", payload["iss"]);
-            Assert.AreEqual("AC456", payload["sub"]);
-
-            Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
-            Assert.AreEqual("{}", payload["grants"].ToString());
-        }
-
-        [Test]
-        public void TestHaveRegion()
-        {
-            var now = DateTime.UtcNow;
-            var token = new TestToken("AC456", "SK123", Secret, region: "foo").ToJwt();
-            Assert.IsNotNull(token);
-            Assert.IsNotEmpty(token);
-
-            var decoded = new DecodedJwt(token, Secret);
-            var header = decoded.Header;
-            Assert.IsNotNull(header);
-            Assert.AreEqual("twilio-fpa;v=1", header["cty"]);
-            Assert.AreEqual("foo", header["twr"]);
-        }
-
-        [Test]
-        public void TestEmptyRegion()
-        {
-            var now = DateTime.UtcNow;
-            var token = new TestToken("AC456", "SK123", Secret).ToJwt();
-            Assert.IsNotNull(token);
-            Assert.IsNotEmpty(token);
-
-            var decoded = new DecodedJwt(token, Secret);
-            var header = decoded.Header;
-            Assert.IsNotNull(header);
-            Assert.AreEqual("twilio-fpa;v=1", header["cty"]);
-            
-            try {
-                var twr = header["twr"];
-                Assert.Fail();
-            } catch (KeyNotFoundException) {
-                // Pass
-            }
-        }
-
-        [Test]
-        public void TestHaveNbf()
-        {
-            var now = DateTime.UtcNow;
-            var token = new TestToken("AC456", "SK123", Secret, nbf: now).ToJwt();
-            Assert.IsNotNull(token);
-            Assert.IsNotEmpty(token);
-
-            var decoded = new DecodedJwt(token, Secret);
-            var payload = decoded.Payload;
-            Assert.IsNotNull(payload);
-
-            Assert.AreEqual("SK123", payload["iss"]);
-            Assert.AreEqual("AC456", payload["sub"]);
-            Assert.AreEqual(BaseJwt.ConvertToUnixTimestamp(now), Convert.ToInt64(payload["nbf"]));
-            Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
-
-            Assert.AreEqual("{}", payload["grants"].ToString());
-        }
-
-        [Test]
-        public void TestAddGrant()
-        {
-            var grants = new HashSet<IGrant>
+      var jwt = new TestToken("AC456", "SK123", Secret).ToJwt();
+
+      var decoded = new DecodedJwt(jwt, Secret);
+      var payload = decoded.Payload;
+      Assert.IsNotNull(payload);
+
+      Assert.AreEqual("SK123", payload["iss"]);
+      Assert.AreEqual("AC456", payload["sub"]);
+
+      Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
+      Assert.AreEqual("{}", payload["grants"].ToString());
+    }
+
+    [Test]
+    public void TestHaveRegion()
+    {
+      var now = DateTime.UtcNow;
+      var token = new TestToken("AC456", "SK123", Secret, region: "foo").ToJwt();
+      Assert.IsNotNull(token);
+      Assert.IsNotEmpty(token);
+
+      var decoded = new DecodedJwt(token, Secret);
+      var header = decoded.Header;
+      Assert.IsNotNull(header);
+      Assert.AreEqual("twilio-fpa;v=1", header["cty"]);
+      Assert.AreEqual("foo", header["twr"]);
+    }
+
+    [Test]
+    public void TestEmptyRegion()
+    {
+      var now = DateTime.UtcNow;
+      var token = new TestToken("AC456", "SK123", Secret).ToJwt();
+      Assert.IsNotNull(token);
+      Assert.IsNotEmpty(token);
+
+      var decoded = new DecodedJwt(token, Secret);
+      var header = decoded.Header;
+      Assert.IsNotNull(header);
+      Assert.AreEqual("twilio-fpa;v=1", header["cty"]);
+
+      try
+      {
+        var twr = header["twr"];
+        Assert.Fail();
+      }
+      catch (KeyNotFoundException)
+      {
+        // Pass
+      }
+    }
+
+    [Test]
+    public void TestHaveNbf()
+    {
+      var now = DateTime.UtcNow;
+      var token = new TestToken("AC456", "SK123", Secret, nbf: now).ToJwt();
+      Assert.IsNotNull(token);
+      Assert.IsNotEmpty(token);
+
+      var decoded = new DecodedJwt(token, Secret);
+      var payload = decoded.Payload;
+      Assert.IsNotNull(payload);
+
+      Assert.AreEqual("SK123", payload["iss"]);
+      Assert.AreEqual("AC456", payload["sub"]);
+      Assert.AreEqual(BaseJwt.ConvertToUnixTimestamp(now), Convert.ToInt64(payload["nbf"]));
+      Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
+
+      Assert.AreEqual("{}", payload["grants"].ToString());
+    }
+
+    [Test]
+    public void TestAddGrant()
+    {
+      var grants = new HashSet<IGrant>
             {
-                { new ConversationsGrant() }
+                { new VideoGrant() }
             };
-            var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
-            Assert.IsNotNull(token);
-            Assert.IsNotEmpty(token);
-
-            var decoded = new DecodedJwt(token, Secret);
-            var payload = decoded.Payload;
-            Assert.IsNotNull(payload);
-
-            Assert.AreEqual("SK123", payload["iss"]);
-            Assert.AreEqual("AC456", payload["sub"]);
-            Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
-
-            var decodedGrants = ToDict(payload["grants"]);
-            Assert.AreEqual(1, decodedGrants.Count);
-            Assert.IsNotNull(decodedGrants["rtc"]);
-        }
-
-        [Test]
-        public void TestAddGrants()
-        {
-            var grants = new HashSet<IGrant>
+      var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
+      Assert.IsNotNull(token);
+      Assert.IsNotEmpty(token);
+
+      var decoded = new DecodedJwt(token, Secret);
+      var payload = decoded.Payload;
+      Assert.IsNotNull(payload);
+
+      Assert.AreEqual("SK123", payload["iss"]);
+      Assert.AreEqual("AC456", payload["sub"]);
+      Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
+
+      var decodedGrants = ToDict(payload["grants"]);
+      Assert.AreEqual(1, decodedGrants.Count);
+      Assert.IsNotNull(decodedGrants["video"]); //rfr: update to refect video grant, rather than RTC
+    }
+
+    [Test]
+    public void TestAddGrants()
+    {
+      var grants = new HashSet<IGrant>
             {
-                { new ConversationsGrant() },
-                { new IpMessagingGrant() }
+                { new VideoGrant() },
+                { new ChatGrant() }
             };
-            var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
-            Assert.IsNotNull(token);
-            Assert.IsNotEmpty(token);
-
-            var decoded = new DecodedJwt(token, Secret);
-            var payload = decoded.Payload;
-            Assert.IsNotNull(payload);
-
-            Assert.AreEqual("SK123", payload["iss"]);
-            Assert.AreEqual("AC456", payload["sub"]);
-            Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
-
-            var decodedGrants = ToDict(payload["grants"]);
-            Assert.AreEqual(2, decodedGrants.Count);
-            Assert.IsNotNull(decodedGrants["rtc"]);
-            Assert.IsNotNull(decodedGrants["ip_messaging"]);
-        }
-
-        [Test]
-        public void TestCreateVoiceGrant()
-        {
-            var grants = new HashSet<IGrant>
+      var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
+      Assert.IsNotNull(token);
+      Assert.IsNotEmpty(token);
+
+      var decoded = new DecodedJwt(token, Secret);
+      var payload = decoded.Payload;
+      Assert.IsNotNull(payload);
+
+      Assert.AreEqual("SK123", payload["iss"]);
+      Assert.AreEqual("AC456", payload["sub"]);
+      Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
+
+      var decodedGrants = ToDict(payload["grants"]);
+      Assert.AreEqual(2, decodedGrants.Count);
+      Assert.IsNotNull(decodedGrants["video"]);
+      Assert.IsNotNull(decodedGrants["chat"]);
+    }
+
+    [Test]
+    public void TestCreateVoiceGrant()
+    {
+      var grants = new HashSet<IGrant>
             {
                 {
                     new VoiceGrant
@@ -168,36 +171,36 @@ public void TestCreateVoiceGrant()
                     }
                 }
             };
-            var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
-            Assert.IsNotNull(token);
-            Assert.IsNotEmpty(token);
+      var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
+      Assert.IsNotNull(token);
+      Assert.IsNotEmpty(token);
 
-            var decoded = new DecodedJwt(token, Secret);
-            var payload = decoded.Payload;
-            Assert.IsNotNull(payload);
+      var decoded = new DecodedJwt(token, Secret);
+      var payload = decoded.Payload;
+      Assert.IsNotNull(payload);
 
-            Assert.AreEqual("SK123", payload["iss"]);
-            Assert.AreEqual("AC456", payload["sub"]);
-            Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
+      Assert.AreEqual("SK123", payload["iss"]);
+      Assert.AreEqual("AC456", payload["sub"]);
+      Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
 
-            var decodedGrants = ToDict(payload["grants"]);
-            Assert.AreEqual(1, decodedGrants.Count);
+      var decodedGrants = ToDict(payload["grants"]);
+      Assert.AreEqual(1, decodedGrants.Count);
 
-            var decodedPvg = decodedGrants["voice"];
-            var incoming = ToDict(decodedPvg.ToString())["incoming"];
-            Assert.AreEqual(true, ToDict(incoming)["allow"]);
+      var decodedPvg = decodedGrants["voice"];
+      var incoming = ToDict(decodedPvg.ToString())["incoming"];
+      Assert.AreEqual(true, ToDict(incoming)["allow"]);
 
-            var outgoing = ToDict(decodedPvg.ToString())["outgoing"];
-            Assert.AreEqual("AP123", ToDict(outgoing)["application_sid"]);
+      var outgoing = ToDict(decodedPvg.ToString())["outgoing"];
+      Assert.AreEqual("AP123", ToDict(outgoing)["application_sid"]);
 
-            var decodedParams = ToDict(outgoing)["params"];
-            Assert.AreEqual("bar", ToDict(decodedParams)["foo"]);
-        }
+      var decodedParams = ToDict(outgoing)["params"];
+      Assert.AreEqual("bar", ToDict(decodedParams)["foo"]);
+    }
 
-        [Test]
-        public void TestCreateChatGrant()
-        {
-            var grants = new HashSet<IGrant>
+    [Test]
+    public void TestCreateChatGrant()
+    {
+      var grants = new HashSet<IGrant>
             {
                 {
                     new ChatGrant
@@ -207,30 +210,30 @@ public void TestCreateChatGrant()
                     }
                 }
             };
-            var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
-            Assert.IsNotNull(token);
-            Assert.IsNotEmpty(token);
-
-            var decoded = new DecodedJwt(token, Secret);
-            var payload = decoded.Payload;
-            Assert.IsNotNull(payload);
-
-            Assert.AreEqual("SK123", payload["iss"]);
-            Assert.AreEqual("AC456", payload["sub"]);
-            Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
-
-            var decodedGrants = ToDict(payload["grants"]);
-            Assert.AreEqual(1, decodedGrants.Count);
-
-            var decodedCg = ToDict(decodedGrants["chat"]);
-            Assert.AreEqual("IS123", decodedCg["service_sid"]);
-            Assert.AreEqual("foobar", decodedCg["endpoint_id"]);
-        }
-
-        [Test]
-        public void TestCreateSyncGrant()
-        {
-            var grants = new HashSet<IGrant>
+      var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
+      Assert.IsNotNull(token);
+      Assert.IsNotEmpty(token);
+
+      var decoded = new DecodedJwt(token, Secret);
+      var payload = decoded.Payload;
+      Assert.IsNotNull(payload);
+
+      Assert.AreEqual("SK123", payload["iss"]);
+      Assert.AreEqual("AC456", payload["sub"]);
+      Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
+
+      var decodedGrants = ToDict(payload["grants"]);
+      Assert.AreEqual(1, decodedGrants.Count);
+
+      var decodedCg = ToDict(decodedGrants["chat"]);
+      Assert.AreEqual("IS123", decodedCg["service_sid"]);
+      Assert.AreEqual("foobar", decodedCg["endpoint_id"]);
+    }
+
+    [Test]
+    public void TestCreateSyncGrant()
+    {
+      var grants = new HashSet<IGrant>
             {
                 {
                     new SyncGrant
@@ -240,57 +243,57 @@ public void TestCreateSyncGrant()
                     }
                 }
             };
-            var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
-            Assert.IsNotNull(token);
-            Assert.IsNotEmpty(token);
+      var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
+      Assert.IsNotNull(token);
+      Assert.IsNotEmpty(token);
 
-            var decoded = new DecodedJwt(token, Secret);
-            var payload = decoded.Payload;
-            Assert.IsNotNull(payload);
+      var decoded = new DecodedJwt(token, Secret);
+      var payload = decoded.Payload;
+      Assert.IsNotNull(payload);
 
-            Assert.AreEqual("SK123", payload["iss"]);
-            Assert.AreEqual("AC456", payload["sub"]);
-            Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
+      Assert.AreEqual("SK123", payload["iss"]);
+      Assert.AreEqual("AC456", payload["sub"]);
+      Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
 
-            var decodedGrants = ToDict(payload["grants"]);
-            Assert.AreEqual(1, decodedGrants.Count);
+      var decodedGrants = ToDict(payload["grants"]);
+      Assert.AreEqual(1, decodedGrants.Count);
 
-            var decodedSg = ToDict(decodedGrants["data_sync"]);
-            Assert.AreEqual("IS123", decodedSg["service_sid"]);
-            Assert.AreEqual("foobar", decodedSg["endpoint_id"]);
+      var decodedSg = ToDict(decodedGrants["data_sync"]);
+      Assert.AreEqual("IS123", decodedSg["service_sid"]);
+      Assert.AreEqual("foobar", decodedSg["endpoint_id"]);
 
-        }
+    }
 
-        [Test]
-        public void TestCreateVideoGrant()
-        {
-            var grants = new HashSet<IGrant>
+    [Test]
+    public void TestCreateVideoGrant()
+    {
+      var grants = new HashSet<IGrant>
             {
                 { new VideoGrant { Room = "RM123" } }
             };
-            var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
-            Assert.IsNotNull(token);
-            Assert.IsNotEmpty(token);
+      var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
+      Assert.IsNotNull(token);
+      Assert.IsNotEmpty(token);
 
-            var decoded = new DecodedJwt(token, Secret);
-            var payload = decoded.Payload;
-            Assert.IsNotNull(payload);
+      var decoded = new DecodedJwt(token, Secret);
+      var payload = decoded.Payload;
+      Assert.IsNotNull(payload);
 
-            Assert.AreEqual("SK123", payload["iss"]);
-            Assert.AreEqual("AC456", payload["sub"]);
-            Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
+      Assert.AreEqual("SK123", payload["iss"]);
+      Assert.AreEqual("AC456", payload["sub"]);
+      Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
 
-            var decodedGrants = ToDict(payload["grants"]);
-            Assert.AreEqual(1, decodedGrants.Count);
+      var decodedGrants = ToDict(payload["grants"]);
+      Assert.AreEqual(1, decodedGrants.Count);
 
-            var decodedVg = ToDict(decodedGrants["video"]);
-            Assert.AreEqual("RM123", decodedVg["room"]);
-        }
+      var decodedVg = ToDict(decodedGrants["video"]);
+      Assert.AreEqual("RM123", decodedVg["room"]);
+    }
 
-        [Test]
-        public void TestCreatePlaybackGrant()
-        {
-            var grants = new HashSet<IGrant>
+    [Test]
+    public void TestCreatePlaybackGrant()
+    {
+      var grants = new HashSet<IGrant>
             {
                 {
                     new PlaybackGrant {
@@ -302,26 +305,26 @@ public void TestCreatePlaybackGrant()
                     }
                 }
             };
-            var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
-            Assert.IsNotNull(token);
-            Assert.IsNotEmpty(token);
+      var token = new TestToken("AC456", "SK123", Secret, grants: grants).ToJwt();
+      Assert.IsNotNull(token);
+      Assert.IsNotEmpty(token);
 
-            var decoded = new DecodedJwt(token, Secret);
-            var payload = decoded.Payload;
-            Assert.IsNotNull(payload);
+      var decoded = new DecodedJwt(token, Secret);
+      var payload = decoded.Payload;
+      Assert.IsNotNull(payload);
 
-            Assert.AreEqual("SK123", payload["iss"]);
-            Assert.AreEqual("AC456", payload["sub"]);
-            Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
+      Assert.AreEqual("SK123", payload["iss"]);
+      Assert.AreEqual("AC456", payload["sub"]);
+      Assert.Greater(Convert.ToInt64(payload["exp"]), BaseJwt.ConvertToUnixTimestamp(DateTime.UtcNow));
 
-            var decodedGrants = ToDict(payload["grants"]);
-            Assert.AreEqual(1, decodedGrants.Count);
-
-            var decodedVg = ToDict(decodedGrants["player"]);
-            Assert.AreEqual(null, decodedVg["requestCredentials"]);
-            Assert.AreEqual("https://000.us-east-1.playback.live-video.net/api/video/v1/us-east-000.channel.000?token=xxxxx", decodedVg["playbackUrl"]);
-            Assert.AreEqual("VJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", decodedVg["playerStreamerSid"]);
-        }
+      var decodedGrants = ToDict(payload["grants"]);
+      Assert.AreEqual(1, decodedGrants.Count);
 
+      var decodedVg = ToDict(decodedGrants["player"]);
+      Assert.AreEqual(null, decodedVg["requestCredentials"]);
+      Assert.AreEqual("https://000.us-east-1.playback.live-video.net/api/video/v1/us-east-000.channel.000?token=xxxxx", decodedVg["playbackUrl"]);
+      Assert.AreEqual("VJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", decodedVg["playerStreamerSid"]);
     }
+
+  }
 }
diff --git a/test/Twilio.Test/Program.cs b/test/Twilio.Test/Program.cs
index 5cdde1c40..ae6e8a1a3 100644
--- a/test/Twilio.Test/Program.cs
+++ b/test/Twilio.Test/Program.cs
@@ -1,18 +1,18 @@
-using System;
-using System.Reflection;
-using NUnitLite;
-
-namespace Twilio.Tests
-{
-    class Program
-    {
-        static int Main(string[] args)
+using System;
+using System.Reflection;
+using NUnitLite;
+
+namespace Twilio.Tests
+{
+    class Program
+    {
+        static int Main(string[] args)
         {
 #if NET35
             return new AutoRun(typeof(TwilioTest).Assembly).Execute(args);
 #else
-            return new AutoRun(typeof(TwilioTest).GetTypeInfo().Assembly).Execute(args);
-#endif
-        }
-    }
+            return new AutoRun(typeof(TwilioTest).GetTypeInfo().Assembly).Execute(args);
+#endif
+        }
+    }
 }
\ No newline at end of file
diff --git a/test/Twilio.Test/Twilio.Test.csproj b/test/Twilio.Test/Twilio.Test.csproj
index 3b44e7ec9..eb03a0df5 100644
--- a/test/Twilio.Test/Twilio.Test.csproj
+++ b/test/Twilio.Test/Twilio.Test.csproj
@@ -1,32 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Twilio.Tests</RootNamespace>
-    <TargetFrameworks>netcoreapp2.0;net451;net35</TargetFrameworks>
-    <RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net451' ">win7-x86</RuntimeIdentifier>
-    <RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net35' ">win7-x86</RuntimeIdentifier>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="3.1.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="NUnit" Version="3.6.0" />
-    <PackageReference Include="NSubstitute" Version="2.0.0-rc" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="NUnitLite" Version="3.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Twilio\Twilio.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="($(TargetFramework.StartsWith('net3')) OR $(TargetFramework.StartsWith('net4'))) AND '$(MSBuildRuntimeType)' == 'Core' AND '$(OS)' != 'Windows_NT'">
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="jnm2.ReferenceAssemblies.net35" Version="1.0.1" PrivateAssets="All" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Twilio.Tests</RootNamespace>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <NoWarn>$(NoWarn);CS1587</NoWarn>
+    <NoWarn>CS8765CS1587;CS1591;CS1570;CS1573;CS1572;CS8618;CS8603;CS8625;CS8604;CS8765</NoWarn>
+    
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.TestPlatform" Version="17.0.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
+    <PackageReference Include="NSubstitute" Version="4.2.2" />
+    <PackageReference Include="NUnitLite" Version="3.13.2" />
+  </ItemGroup>
+ 
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Twilio\Twilio.csproj" />
+  </ItemGroup>
+
+</Project>